ソースを参照

批记录样式修改

lucw 8 ヶ月 前
コミット
53cf2d1836

+ 14 - 11
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,13 @@
             <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 +174,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>
 

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

+ 8 - 1
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'
           },
 
           {

+ 8 - 1
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',

+ 8 - 1
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',

+ 8 - 1
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
@@ -58,7 +64,8 @@
             label: '领料单编号',
             align: 'center',
             minWidth: 110,
-            showOverflowTooltip: true
+            showOverflowTooltip: true,
+            slot: 'code'
           },
           {
             prop: 'workOrderCode',

+ 8 - 1
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',

+ 8 - 1
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',

+ 8 - 1
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',

+ 0 - 1
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)"

+ 2 - 0
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 || '';

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