From 67f80306095c5eb32483a1d6ad9eb2d2e4612515 Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Fri, 22 Mar 2024 21:15:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=95=8C=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4+=E8=AE=A1=E5=88=92=E9=A1=B5=E9=9D=A2=E8=B0=83?=
 =?UTF-8?q?=E6=95=B42?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/mes/reportWork/index.vue |  8 ++++++--
 src/views/plan/order/index.vue     | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index 2a0f588..2ea2656 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -518,6 +518,7 @@
 					<el-table v-loading="loading" :data="item.libList" ref="mypConsumeTable"  @selection-change="pConsumeSelection">
 						<el-table-column width="50" align="center" type="selection"/>
 						<el-table-column label="recordId" align="center" prop="recordId" v-if="false"/>
+						<el-table-column label="parentOrder" align="center" prop="parentOrder" v-if="false"/>
 						<el-table-column label="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
 						<el-table-column label="订单编码" width="130" align="left" prop="workorderCodeSap" :show-overflow-tooltip="true"
 						:formatter="orderCodeFormate"/>
@@ -539,6 +540,7 @@
 								<el-select v-model="scope.row.warehouseCode" placeholder="请选择仓库" width="50%" 
 								@change="handleEdit(scope.$index,scope.row)"
 								v-if="scope.row.workorderCodeSap == null||scope.row.attr1"
+								clearable
 								>
 								<el-option
 									v-for="work in cwarehouseList"
@@ -1363,6 +1365,7 @@ export default {
 				this.$modal.msgError(`请选择数据`);
 				return false;
 			}
+
 			submitConsumePS(this.consumeRows).then(response => {
 				this.$modal.msgSuccess("报工信息修改成功");
 				this.openConsume = false;
@@ -1491,7 +1494,7 @@ export default {
 		},
 		//物料损耗表格--新增确认
 		onSelectNewPrepare(obj) {
-			debugger
+			let sr = this.selectRow[0]
 		   for(let i=0;i<obj.length;i++){
 				const row = {
 					workorderCode: obj[i].workorderCode,
@@ -1499,7 +1502,8 @@ export default {
 					materialName: obj[i].componentName,
 					quantity: obj[i].quantity,
 					unit: obj[i].unit,
-					recoil:"X"
+					recoil:"X",
+					parentOrder:sr.workorderCode
 				};
 				this.consumeList.push(row);
 		   }
diff --git a/src/views/plan/order/index.vue b/src/views/plan/order/index.vue
index e6ca92b..fe98c49 100644
--- a/src/views/plan/order/index.vue
+++ b/src/views/plan/order/index.vue
@@ -89,7 +89,7 @@
           icon="el-icon-s-release"
           size="mini"
           @click="handleDeleteOrder"
-          :disabled="single"
+          :disabled="nodelete"
           v-hasPermi="['mes:pro:order:edit']"
         >关闭订单</el-button>
       </el-col>
@@ -637,6 +637,7 @@ export default {
       proline: [],
       // 非单个禁用
       single: true,
+      nodelete: true,
       //
       splitnum: null,
       // 班次
@@ -1437,6 +1438,7 @@ export default {
     // 多选框选中数据
 		handleAutoSplitSelection(selection) {
       this.single = selection.length !== 1
+      this.nodelete = selection.length!==1||selection[0].delFlag==1
 			this.orderCodes = selection
 		},
     //排产优先级
@@ -1455,14 +1457,21 @@ export default {
             return false;
         }
     },
-    //关闭订单
+    //关闭订单 
     handleDeleteOrder(){
       this.loading = true;
       let _this = this;
       const orderIds = this.orderCodes.map(item => item.id);
       const orderCodes = this.orderCodes.map(item => item.orderCode);
       this.$modal.confirm('是否确认关闭订单"' + orderCodes + '"？').then(function () {
-        return deleteOrder(orderIds);
+        deleteOrder(orderIds).then(response => {
+          if(response.code == 200){
+            this.$modal.msgSuccess("操作成功");
+          }else{
+            this.$modal.msgError(response.mgs);
+          }
+          
+        });
       }).then(() => {
         this.loading = false;
         this.getList();