详情提交

src/api/produceOrder/index.js

@@ -92,7 +92,7 @@ export async function reportCount (params) {
 
 // 详情页-tab列表
 export async function reportPage (data) {
-  const res = await request.get('/mes/workreport/page', { params: data });
+  const res = await request.post('/mes/workreport/page', data );
   if (res.data.code == 0) {
     return res.data.data;
   }

src/views/produceOrder/components/progressBox.vue

@@ -7,7 +7,7 @@
           :key="index"
           :class="{ active: active >= index }"
         >
-		   <el-tooltip class="item" effect="dark" :content="item.taskTypeName" placement="top-start">
+		   <el-tooltip class="item" effect="dark" :content="item.taskTypeName" placement="top">
 			  <p>{{ item.taskTypeName }}</p>
 		   </el-tooltip>
           <div

src/views/produceOrder/detail.vue

@@ -153,8 +153,8 @@
             > -->
           </div>
         </template>
-        <template v-slot:action>
-          <el-link type="primary">冲销</el-link>
+        <template v-slot:action="{ row }">
+          <el-link type="primary" @click="writeOff(row)">冲销</el-link>
         </template>
       </ele-pro-table>
     </el-card>
@@ -854,7 +854,7 @@
             },
             {
               label: '包装数量',
-              prop: 'packagingQuantity',
+              prop: 'packNum',
 			  minWidth: 100,
 			  align: 'center'
             },
@@ -866,7 +866,7 @@
             },
             {
               label: '尾料数量',
-              prop: 'tailingsQuantity',
+              prop: 'surplusNum',
 			  minWidth: 100,
 			  align: 'center'
             },
@@ -1015,9 +1015,25 @@
 		  });
 		  this.countMsg = res;
 		},
-		  openOther () {
+		openOther () {
 			this.$refs.otherMissionRef.open();
-		  }
+		},
+		
+		// 冲销
+		writeOff(row){
+			this.$confirm(`<span style="color: red;">是否要撤销本次报工?</span>`, '冲销', {
+			  confirmButtonText: '确认',
+			  cancelButtonText: '取消',
+			  type: 'warning'
+			})
+			.then(() => {
+			    // batchCompletion([row.id]).then((res) => {
+			    //   this.$message.success('成功');
+			    //   this.reload();
+			    // });
+			})
+			.catch(() => {});
+		}
 		  
     }
   };

src/views/produceOrder/index.vue

@@ -334,7 +334,7 @@
       // 完结与批量完结
       toEnd (row) {
         if (row) {
-          this.$confirm(`是否要完结工单【${row.code}】？`, '提醒', {
+          this.$confirm(`是否要完结工单 <span style="color: red;">【${row.code}】</span>？`, '提醒', {
             confirmButtonText: '确认',
             cancelButtonText: '取消',
             type: 'warning'