From 5528edad1117ed2b44a2ca592db4f3fa2116f43c Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Mon, 11 Mar 2024 22:10:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5=E7=95=8C=E9=9D=A2-=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=B6=88=E8=80=97=EF=BC=8C=E6=88=90=E5=93=81=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plan/workorder.js          | 11 ++++++++++-
 src/views/mes/reportWork/index.vue | 25 +++++++++++++++----------
 src/views/plan/workorder/index.vue | 12 ++++++------
 3 files changed, 31 insertions(+), 17 deletions(-)

diff --git a/src/api/plan/workorder.js b/src/api/plan/workorder.js
index 0c9508d4..5dae5ffd 100644
--- a/src/api/plan/workorder.js
+++ b/src/api/plan/workorder.js
@@ -24,6 +24,15 @@ export function subChangeWorkOrder(data){
   })
 }
 
+// 提交修改工单接口
+export function subChangeWorkOrderPro(data){
+	return request({
+	  url:'/plan/pro/workorder/subChangeWorkOrderPro',
+	  method:'post',
+	  data:data
+	})
+  }
+
 // 通过子工单查询父工单对应的批次list
 export function getWorkBatchList(data){
   return request({
@@ -117,4 +126,4 @@ export function subChangeWorkOrderM(data){
 	  method:'post',
 	  data:data
 	})
-  }
\ No newline at end of file
+  }
diff --git a/src/views/mes/reportWork/index.vue b/src/views/mes/reportWork/index.vue
index ddb217e3..d6bb0cb9 100644
--- a/src/views/mes/reportWork/index.vue
+++ b/src/views/mes/reportWork/index.vue
@@ -206,7 +206,7 @@
 						:value="scope.row.uploadStatus"
 					/>
 				</template>
-			</el-table-column>	
+			</el-table-column>
 			<el-table-column label="SAP报工时间" align="center" prop="uploadTime" width="150"/>
 			<el-table-column label="SAP报工信息" align="center" prop="uploadMsg" width="150" :show-overflow-tooltip="true"/>
 		</el-table>
@@ -462,7 +462,7 @@
 		<!-- 报工信息详情 -->
 		<el-dialog :title="titleReport" :visible.sync="openReport" width="1200px">
 			<el-tabs v-model="activeNameR">
-				<el-tab-pane 
+				<el-tab-pane
 					v-for="(item, index) in libTabs"
 					:key="index"
 					:label="item.title"
@@ -475,6 +475,8 @@
 					    <el-table-column width="50" align="center" type="selection"/>
 						<el-table-column label="id" align="center" prop="id" v-if="false"/>
 						<el-table-column label="工单编码" width="150" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
+						<el-table-column label="订单编码" width="150" align="left" prop="workorderCodeSap" :show-overflow-tooltip="true"
+						:formatter="orderCodeFormate"/>
 						<el-table-column label="报工单号" width="150" align="left" prop="reportCode" :show-overflow-tooltip="true" />
 						<el-table-column label="批次" width="250" align="left" prop="batch" :show-overflow-tooltip="true" />
 						<el-table-column label="单位" align="center" prop="unit"/>
@@ -506,17 +508,19 @@
 		<!-- 报工损耗 -->
 		<el-dialog :title="titleConsume" :visible.sync="openConsume" width="1200px">
 			<el-tabs v-model="activeNameC" >
-				<el-tab-pane 
+				<el-tab-pane
 					v-for="(item, index) in libConsumeTabs"
 					:key="index"
 					:label="item.title"
 					:name="item.libId"
 					>
-					<el-button size="mini" type="primary" @click="addConsumeTableRow(item.libList)">新增物料</el-button>
+					<!--<el-button size="mini" type="primary" @click="addConsumeTableRow(item.libList)">新增物料</el-button>-->
 					<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="工单编码" width="140" align="left" prop="workorderCode" :show-overflow-tooltip="true" />
+						<el-table-column label="订单编码" width="150" align="left" prop="workorderCodeSap" :show-overflow-tooltip="true"
+						:formatter="orderCodeFormate"/>
 						<el-table-column label="物料编码" width="180" align="left" prop="materialCode" :show-overflow-tooltip="true" />
 						<el-table-column label="物料名称" width="280" align="left" prop="materialName" :show-overflow-tooltip="true" />
 						<el-table-column label="消耗数量" width="120" align="left" prop="quantity" :show-overflow-tooltip="true" >
@@ -527,13 +531,14 @@
 						<el-table-column label="单位" width="50" align="center" prop="unit"/>
 						<el-table-column label="反冲标识" align="center" prop="recoil"/>
 						<el-table-column label="创建时间" align="center" prop="createTime" width="150"/>
+						<!--
 						<el-table-column fixed="right" label="操作" width="90">
 							<template slot-scope="scope">
 								<el-button @click.native.prevent="deleteBomRow(scope.$index, item.libList)"
 								 size="small" type="danger" plain>
 								移除</el-button>
 							</template>
-						</el-table-column>
+						</el-table-column>-->
 					</el-table>
 				</el-tab-pane>
 
@@ -693,7 +698,7 @@
 				</el-table>
 
 				<br/>
-				<!-- 底部 
+				<!-- 底部
 				<el-row class="my-print-foot">
 					<el-col :offset="1" :span="3">SAP-No:{{ printData.SAPNo }}</el-col>
 					<el-col :offset="1" :span="3">Z-PM-F-030-A.1</el-col>
@@ -704,7 +709,7 @@
 				</el-row>
 			-->
 			</el-form>
-			
+
 
 		</div>
 		<span slot="footer" class="dialog-footer">
@@ -1307,13 +1312,13 @@ export default {
 		},
 		// 多选框选中数据
 		pConsumeSelection(selection) {
-		  this.pConsumeRows = selection
+		  this.pConsumeRows = this.pConsumeRows.concat(selection)
 		},
 		sConsumeSelection(selection) {
 		  this.sConsumeRows = selection
 		},
 		submitConsume() {
-            this.consumeRows = this.pConsumeRows.concat(this.sConsumeRows)
+            this.consumeRows = this.pConsumeRows;
 
 			if ( this.consumeRows==0) {
 				this.$modal.msgError(`请选择数据`);
@@ -1449,7 +1454,7 @@ export default {
 	margin-bottom: 15px;
 	margin-left: 10px;
 }
-.center-text {  
+.center-text {
 	text-align: center;
 }
 .report-logo {
diff --git a/src/views/plan/workorder/index.vue b/src/views/plan/workorder/index.vue
index a8ed9260..2b7fb718 100644
--- a/src/views/plan/workorder/index.vue
+++ b/src/views/plan/workorder/index.vue
@@ -635,7 +635,7 @@ import {
   downWorkorder,
   getOrderAndWork,getProSortNo,
   getWorkBatchList,
-  subChangeWorkOrder,subChangeWorkOrderM,
+  subChangeWorkOrderPro,subChangeWorkOrderM,
   checkWorkOrder
 } from '@/api/plan/workorder'
 import moment from 'moment';
@@ -1296,7 +1296,7 @@ export default {
         materialName: this.splitForm.materialName
       }
 
-      subChangeWorkOrder(data).then(response => {
+      subChangeWorkOrderPro(data).then(response => {
         if (response.code == 500) {
           this.$modal.msgError(response.msg)
           return
@@ -1458,7 +1458,7 @@ export default {
           getOrderAndWork(this.selectWork).then(response => {
             this.splitData.push(response.data.workOrder)
             this.productData.push(response.data.order)
-            
+
             //订单产品类型
             this.splitForm.prodType = this.splitData[0].prodType
             this.checkType = false
@@ -1501,7 +1501,7 @@ export default {
 
               // 递归将拆分数量还原
               function setAtrr1(order, work) {
-                
+
                 order.quantitySplit = Number(order.quantitySplit) - Number(work.quantitySplit);
                 order.atrr1 = work.quantitySplit;
 
@@ -1723,7 +1723,7 @@ export default {
         });
       }, 222);
     },
- 
+
     // @expand-change="getOpenNextLevel"
     // 点击展开节点
     //getOpenNextLevel(row, column, event) {
@@ -1732,7 +1732,7 @@ export default {
     //      return resolve(data);
     //    });
     //}
-    
+
   }
 };
 </script>