chensibo 1 week ago
parent
commit
4cd97586bc

+ 2 - 2
.env.dev

@@ -5,9 +5,9 @@ NODE_ENV = 'development'
 VUE_APP_TITLE = WMS开发环境
 
 # 芋道管理系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.1.94:48080'
+# VUE_APP_BASE_API = 'http://192.168.1.94:48080'
 # VUE_APP_BASE_API = 'http://192.168.1.26:48080'
-# VUE_APP_BASE_API = 'http://113.105.183.190:48028'
+VUE_APP_BASE_API = 'http://113.105.183.190:48028'
 # VUE_APP_BASE_API = 'http://61.155.26.34:36936'
 # VUE_APP_BASE_API = 'http://127.0.0.1:48080'
 # VUE_APP_BASE_API = 'http://2227el9013.iok.la'

+ 4 - 2
.env.rtk.prod

@@ -6,12 +6,14 @@ VUE_APP_TITLE = 瑞泰克WMS开发环境
 
 # 芋道管理系统/开发环境
 # VUE_APP_BASE_API = 'http://113.105.183.190:48028'
-VUE_APP_BASE_API = 'http://113.105.183.190:15980'
+# VUE_APP_BASE_API = 'http://113.105.183.190:15980'
+VUE_APP_BASE_API = 'http://192.168.1.32:48080'
 
 
 # 积木报表API
 # VUE_APP_REPORT_API = 'http://113.105.183.190:48028'
-VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
+# VUE_APP_REPORT_API = 'http://113.105.183.190:15980'
+VUE_APP_REPORT_API = 'http://192.168.1.32:48080'
 
 
 # 路由懒加载

BIN
dist.zip


+ 1 - 1
src/views/mes/queryManage/queryNew.vue

@@ -398,7 +398,7 @@ export default {
         printSoft,
         operateType,
         paramList = [],
-        ifArray, // ← 新增字段
+        ifArray,
       } = btn;
 
       // 统一校验函数

+ 11 - 2
src/views/wms/quality/iqcInspection/components/AlreadyIqcInspection.vue

@@ -99,6 +99,15 @@
             width="150"
             show-overflow-tooltip
           />
+          <el-table-column
+            v-if="columnsList[24].visible"
+            :key="Math.random()"
+            label="客户料号"
+            align="center"
+            prop="customerMaterialNo"
+            width="150"
+            show-overflow-tooltip
+          />
           <el-table-column
             v-if="columnsList[17].visible"
             :key="Math.random()"
@@ -161,7 +170,7 @@
             show-overflow-tooltip
           />
           <el-table-column
-            v-if="columnsList[24].visible"
+            v-if="columnsList[2].visible"
             :key="Math.random()"
             label="采购订单"
             align="center"
@@ -359,7 +368,7 @@ export default {
         { key: 21, label: "处理结果", visible: true },
         { key: 22, label: "检验结果", visible: true },
         { key: 23, label: "图号", visible: true },
-        { key: 24, label: "采购订单", visible: true },
+        { key: 24, label: "客户料号", visible: true },
       ],
       // 显示隐藏持久化参数
       columnsList: [],

+ 10 - 0
src/views/wms/quality/iqcInspection/components/AwaitIqcInspection.vue

@@ -71,6 +71,15 @@
             width="150"
             show-overflow-tooltip
           />
+          <el-table-column
+            v-if="columnsList[24].visible"
+            :key="Math.random()"
+            label="客户料号"
+            align="center"
+            prop="customerMaterialNo"
+            width="150"
+            show-overflow-tooltip
+          />
           <el-table-column
             v-if="columnsList[6].visible"
             :key="Math.random()"
@@ -300,6 +309,7 @@ export default {
         { key: 21, label: "处理结果", visible: true },
         { key: 22, label: "检验结果", visible: true },
         { key: 23, label: "图号", visible: true },
+        { key: 24, label: "客户料号", visible: true },
       ],
       // 显示隐藏持久化参数
       columnsList: [],

+ 10 - 0
src/views/wms/quality/iqcInspection/components/InspectDetail.vue

@@ -257,6 +257,16 @@
             />
           </el-form-item>
         </el-col>
+        <el-col :span="8">
+          <el-form-item label="客户料号" prop="customerMaterialNo ">
+            <el-input
+              v-model="formParams.customerMaterialNo"
+              placeholder="请输入客户料号"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
+        </el-col>
         <el-col :span="8">
           <el-form-item
             v-if="

+ 10 - 0
src/views/wms/quality/iqcInspection/components/inspectionResultApproval.vue

@@ -81,6 +81,15 @@
             width="150"
             show-overflow-tooltip
           />
+          <el-table-column
+            v-if="columnsList[24].visible"
+            :key="Math.random()"
+            label="客户料号"
+            align="center"
+            prop="customerMaterialNo"
+            width="150"
+            show-overflow-tooltip
+          />
           <el-table-column
             v-if="columnsList[7].visible"
             :key="Math.random()"
@@ -350,6 +359,7 @@ export default {
         { key: 21, label: "处理结果", visible: true },
         { key: 22, label: "检验结果", visible: true },
         { key: 23, label: "图号", visible: true },
+        { key: 24, label: "客户料号", visible: true },
       ],
       // 显示隐藏持久化参数
       columnsList: [],