添加关闭工单功能及优化任务列表显示

src/api/inspectionWork/index.js

@@ -144,3 +144,11 @@ export async function verificationQualityInspector(id) {
 
   return res.data.code;
 }
+// 关闭
+export async function closeWork(data) {
+  const res = await request.post(`/qms/quality_work_order/close`, data);
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/views/produce/components/workPlan/index.vue

@@ -130,7 +130,7 @@
             <el-popconfirm
               class="ele-action"
               title="确定要关闭吗？"
-              @confirm="close(row)"
+              @confirm="closeWork(row)"
               v-if="row.status == 0 && row.qualityType == 2"
             >
               <template v-slot:reference>
@@ -208,7 +208,8 @@
     getList,
     removeItem,
     updateCertificateNumber,
-    verificationQualityInspector
+    verificationQualityInspector,
+    closeWork
   } from '@/api/inspectionWork';
   import dictMixins from '@/mixins/dictMixins';
   import tabMixins from '@/mixins/tableColumnsMixin';
@@ -400,7 +401,13 @@
             align: 'center',
             width: 80,
             formatter: (row, column, cellValue) => {
-              return cellValue == 0 ? '未报工' : cellValue == 1 ? '已报工' : '';
+              return cellValue == 0
+                ? '未报工'
+                : cellValue == 1
+                ? '已报工'
+                : cellValue == 2
+                ? '已关闭'
+                : '';
             },
             fixed: 'right'
           },
@@ -626,9 +633,11 @@
         this.visible = false;
         this.$emit('closeWorkPlan', '1');
       },
-
+      async closeWork(row) {
+        await closeWork(row);
+        this.done();
+      },
       close() {
-        console.log('关闭报工界面');
         this.done();
       },
 

src/views/taskList/index.vue

@@ -17,7 +17,7 @@
         ></el-tab-pane>
 
         <el-tab-pane
-          label="NC任务"
+          label="NC编程任务"
           name="4"
           v-if="$hasPermission('mes:taskreport:teamorder')"
         ></el-tab-pane>
@@ -53,7 +53,7 @@
           </el-link>
         </template>
         <template v-slot:disposalStatus="{ row }">
-          <el-tag v-if="row.disposalStatus == 1" type="success">已接受</el-tag>
+          <el-tag v-if="row.disposalStatus == 1" type="success">已接收</el-tag>
           <el-tag v-if="row.disposalStatus == 2" type="danger">已拒绝</el-tag>
         </template>
 
@@ -213,7 +213,7 @@
           {
             slot: 'assigneeCode',
             prop: 'assigneeCode',
-            label: '任务编码',
+            label: '任务编号',
             align: 'center',
             showOverflowTooltip: true,
             width: 210
@@ -221,14 +221,14 @@
           {
             slot: 'workOrderCode',
             prop: 'workOrderCode',
-            label: '生产订单编码',
+            label: '生产订单号',
             align: 'center',
             showOverflowTooltip: true,
             width: 210
           },
           {
             prop: 'mesWorkOrderCode',
-            label: '生产工单编码',
+            label: '生产工单号',
             align: 'center',
             showOverflowTooltip: true,
             width: 210