修改bug

src/views/batchRecord/components/editModal.vue

@@ -62,7 +62,7 @@
                 >
                   <template #append>
                     <el-button size="small">选择设备</el-button>
-                  </template> 
+                  </template>
                 </el-input>
               </div>
             </el-form-item>
@@ -131,19 +131,11 @@
             <el-table-column label="检查工具">
               <template slot-scope="scope">
                 <div>
-                  {{ scope.row.tools.map((i) => i.toolName).join(',') }}
-                </div>
-              </template>
-            </el-table-column>
-            <el-table-column label="检查人">
-              <template>
-                <div
-                  style="display: flex; align-items: center; cursor: pointer"
-                >
-                  <div>选择检查人</div>
+                  {{ scope.row.tools.map((i) => i.toolName).join(',') || '无' }}
                 </div>
               </template>
             </el-table-column>
+
             <el-table-column label="检查情况">
               <template slot-scope="scope">
                 <div>
@@ -180,6 +172,15 @@
                 </div>
               </template>
             </el-table-column>
+            <el-table-column label="备注">
+              <template slot-scope="scope">
+                <div
+                  style="display: flex; align-items: center; cursor: pointer"
+                >
+                  <div>{{ scope.row.remark || '无' }}</div>
+                </div>
+              </template>
+            </el-table-column>
           </el-table>
         </div>
 

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

@@ -15,6 +15,11 @@
           详情
         </el-link>
       </template>
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
 
     <detialsModal ref="detialsModalRef"></detialsModal>
@@ -53,7 +58,8 @@
             label: '记录编码',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'ruleName',

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

@@ -14,6 +14,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
 
     <fileBrowse ref="fileBrowseRef"></fileBrowse>
@@ -52,7 +58,8 @@
             prop: 'code',
             width: 180,
             align: 'center',
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
 
           {

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

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
   </div>
 </template>
@@ -49,7 +55,8 @@
             label: '工单单号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'planCode',

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

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
 
     <returnPop
@@ -59,7 +65,8 @@
             label: '退料单编号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'name',

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

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
 
     <detailed
@@ -22,6 +28,12 @@
       v-if="detailedShow && detailedObj"
       :detailedObj="detailedObj"
     ></detailed>
+
+    <selfDetailed
+      @detailedClose="detailedClose"
+      v-if="selfDetailedShow && detailedObj"
+      :detailedObj="detailedObj"
+    ></selfDetailed>
   </div>
 </template>
 
@@ -30,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,
@@ -58,7 +72,8 @@
             label: '领料单编号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'workOrderCode',
@@ -177,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/batchRecord/components/tables/qualityWorkOrderTable.vue

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
   </div>
 </template>
@@ -49,7 +55,8 @@
             label: '质检工单编码',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'name',

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

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:bizNo="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.bizNo
+        }}</el-link>
+      </template>
     </ele-pro-table>
   </div>
 </template>
@@ -51,7 +57,8 @@
             label: '单号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'bizNo'
           },
           {
             prop: 'warehouseName',

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

@@ -15,6 +15,12 @@
           详情
         </el-link>
       </template>
+
+      <template v-slot:code="{ row }">
+        <el-link type="primary" @click="goToDetail(row)">{{
+          row.code
+        }}</el-link>
+      </template>
     </ele-pro-table>
 
     <detailsPop ref="detailsRef"> </detailsPop>
@@ -53,7 +59,8 @@
             label: '生产工单号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'scheduleStatus',

src/views/checklistManagement/checklist.vue

@@ -20,7 +20,6 @@
             >编辑</el-link
           >
           <el-link type="text">提交</el-link>
-          <el-link type="text">详情</el-link>
           <el-popconfirm
             title="您确定要删除这条数据吗？"
             @confirm="deleteRow(row)"

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',

src/views/produceOrder/components/details/index.vue

@@ -146,6 +146,8 @@
             (item) => Number(item.taskId) == Number(this.workOrderInfo.taskId)
           );
 
+          console.log('index', index);
+
           this.desIndex = index;
           console.log(this.routeList, '888888');
           this.newId = this.routeList[this.desIndex]?.taskId || '';

vue.config.js

@@ -34,9 +34,13 @@ 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.125:18086',
+
+        // target: 'http://192.168.1.116: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',