Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-mes into dev

src/views/produceOrder/detail.vue

@@ -1058,18 +1058,18 @@
 				  cancelButtonText: '取消',
             })
 			.then(() => {
-				console.log('row',row)
 				const data = {
 					taskCode:this.taskCode,
 					taskName:this.chooseItem,
 					reportId:row.id,
-					writeOffNum:row.standardNum,
+					writeOffNum:row.standardNum?row.standardNum:row.actualQuantity,
 					...this.request
 				}
 				writeOffWork(data).then(res=>{
 					if(res==1){
 						this.$message.success('冲销成功');
 						this.reload({workOrderId:this.workOrderId, taskCode:this.taskCode})
+						this.refreshData()
 					}else if(res==0){
 						this.$confirm('', {
 							  message:h('div',null, [
@@ -1093,6 +1093,16 @@
 		
 		check(row){
 			this.$refs.bomListRef.open(row);
+		},
+		
+		refreshData(){
+			const res = getInfoById(this.workOrderId)
+			this.infoData = res
+			if(typeof res.taskTypeProcessDiagrams == 'string' ){
+				this.tabList = []
+			}else{
+				this.tabList = res.taskTypeProcessDiagrams
+			}
 		}