功能调整

src/views/batchRecord/components/editModal.vue

@@ -131,9 +131,7 @@
             <el-table-column label="检查工具">
               <template slot-scope="scope">
                 <div>
-                  {{
-                    scope.row.tools.map((i) => i.toolName).join(',') || '无'
-                  }}
+                  {{ scope.row.tools.map((i) => i.toolName).join(',') || '无' }}
                 </div>
               </template>
             </el-table-column>
@@ -179,7 +177,7 @@
                 <div
                   style="display: flex; align-items: center; cursor: pointer"
                 >
-                  <div>{{ scope.row.remark }}</div>
+                  <div>{{ scope.row.remark || '无' }}</div>
                 </div>
               </template>
             </el-table-column>

src/views/batchRecord/components/tables/materialTable.vue

@@ -28,6 +28,12 @@
       v-if="detailedShow && detailedObj"
       :detailedObj="detailedObj"
     ></detailed>
+
+    <selfDetailed
+      @detailedClose="detailedClose"
+      v-if="selfDetailedShow && detailedObj"
+      :detailedObj="detailedObj"
+    ></selfDetailed>
   </div>
 </template>
 
@@ -36,11 +42,13 @@
   import tableColumnsMixin from '@/mixins/tableColumnsMixin';
   import { batchRecordPage } from '@/api/pickorder/index';
   import detailed from '@/views/produce/components/picking/detailed.vue';
+  import selfDetailed from '@/views/pick/pickApply/components/selfDetailed.vue';
+
   import { getDetails } from '@/api/pick/pickApply';
 
   export default {
     mixins: [dictMixins, tableColumnsMixin],
-    components: { detailed },
+    components: { detailed, selfDetailed },
     props: {
       tableQuery: {
         type: Object,
@@ -184,11 +192,16 @@
         this.detailedObj = JSON.stringify(res);
 
         this.$nextTick(() => {
-          this.detailedShow = true;
+          if (this.detailedObj.type == 1) {
+            this.selfDetailedShow = true;
+          } else {
+            this.detailedShow = true;
+          }
         });
       },
       detailedClose() {
         this.detailedShow = false;
+        this.selfDetailedShow = false;
       }
     }
   };

src/views/checklistManagement/components/selectWorkOrder.vue

@@ -10,7 +10,11 @@
     width="90%"
   >
     <div>
-      <seek-page :seekList="seekList" @search="search"></seek-page>
+      <seek-page
+        :seekList="seekList"
+        :maxLength="4"
+        @search="search"
+      ></seek-page>
       <ele-pro-table
         ref="table"
         key="id"
@@ -126,6 +130,38 @@
             type: 'input',
             placeholder: ''
           },
+          {
+            label: '产品编码',
+            value: 'productCode',
+            type: 'input',
+
+            placeholder: '',
+            width: 240
+          },
+
+          {
+            label: '产品名称：',
+            value: 'productName',
+            type: 'input',
+
+            placeholder: '',
+            width: 240
+          },
+          // {
+          //   label: '批次号：',
+          //   value: 'batchNo',
+          //   type: 'input',
+          //   placeholder: '',
+          //   width: 240
+          // },
+          {
+            label: '型号',
+            value: 'model',
+            type: 'input',
+
+            placeholder: '',
+            width: 240
+          },
           {
             label: '生产工单号：',
             value: 'code',
@@ -163,23 +199,6 @@
             placeholder: '',
             width: 240
           },
-          {
-            label: '产品编码',
-            value: 'productCode',
-            type: 'input',
-
-            placeholder: '',
-            width: 240
-          },
-
-          {
-            label: '产品名称：',
-            value: 'productName',
-            type: 'input',
-
-            placeholder: '',
-            width: 240
-          },
           {
             label: '牌号',
             value: 'brandNo',
@@ -188,14 +207,6 @@
             placeholder: '',
             width: 240
           },
-          {
-            label: '型号',
-            value: 'model',
-            type: 'input',
-
-            placeholder: '',
-            width: 240
-          },
           // {
           //   label: '班组：',
           //   value: 'teamId',

vue.config.js

@@ -34,8 +34,8 @@ module.exports = {
       '/api': {
         // target: 'http://124.71.68.31:50001',
         // target: 'http://192.168.1.251:18086',
-        target: 'http://192.168.1.116:18086', // 赵沙金
-        // target: 'http://192.168.1.251:18086',
+        // target: 'http://192.168.1.116:18086', // 赵沙金
+        target: 'http://192.168.1.251:18086', // 开发环境
         // target: 'http://192.168.1.103:18086',192.168.1.116
         // target: 'http://192.168.1.144:18086',
         // target: 'http://192.168.1.30:18086',