优化

src/view/inventory/ruku.vue

@@ -2,10 +2,10 @@
   <div>
     <layout>
 		<el-row :gutter="24" style="margin-bottom: 6px;">
-			  <el-input v-model="records_searchInfo" placeholder="请搜索入库单号、订单编号或生产款号进行查询相关入库记录"  @input="records_handleInput"
+			  <!-- <el-input v-model="records_searchInfo" placeholder="请搜索入库单号、订单编号或生产款号进行查询相关入库记录"  @input="records_handleInput"
 				@keyup.enter="records_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
-			  </el-input>
-			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">面料入库</el-button>
+			  </el-input> -->
+			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料入库</el-button>
 			  <!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
 		</el-row>
       <layout>
@@ -23,10 +23,11 @@
                           :summary-method="getSummaries" tooltip-effect="dark" :data="recordtableData" row-key="ID" >
 				  <!-- <el-table-column   align="center" type="selection" width="40"//> -->
 				  <el-table-column align="left"  label="入库单" prop="出库单"  width="170"/>
-				  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/>
-				  <el-table-column align="left"  label="款号" prop="款号"  width="150"/>
-				  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+				  <!-- <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/> -->
+				  <!-- <el-table-column align="left"  label="款号" prop="款号"  width="150"/> -->
+				  <!-- <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/> -->
 				  <el-table-column align="left"  label="单号类型" prop="单号类型"  width="150"/>
+				  <el-table-column align="left"  label="入库总数" prop="总数"  width="110"/>
 				  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="110"/>
 				  <el-table-column align="left"  label="入库日期" prop="日期"  width="160"/>
 				  
@@ -34,7 +35,7 @@
 				    <template #default="{ row, $index }">
 				      <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
 					  style="font-size: 16px;padding: 0px;width: 90px;">
-				        查看详情
+				        入库明细
 				      </el-button>
 				    </template>
 				  </el-table-column>
@@ -61,26 +62,28 @@
 						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 						:show-overflow-tooltip="true" highlight-current-row="true"
 					  @row-click="detailsclicks" @row-dblclick="Doubleclickdetails"
-					  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+					  @selection-change="detailSelectionChange" style="width: 100%;height: 75vh" border
 						:summary-method="getSummaries" tooltip-effect="dark" :data="rdetailstableData" row-key="ID" >
 			  <!-- <el-table-column   align="center" type="selection" width="40"/> -->
-			  <el-table-column align="left"  label="入库单号" prop="单号"  width="150"/>
+			  <el-table-column align="left"  label="入库单号" prop="出库单据编号"  width="140"/>
 			  <el-table-column align="left"  label="批次号" prop="批次号"  width="90"/>
-			  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="110"/>
-			  <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
-			  <el-table-column align="left"  label="生产款号" prop="生产款号"  width="140"/>
+			  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="105"/>
+			  <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/>
+			  <el-table-column align="left"  label="生产款号" prop="款号"  width="140"/>
 			  <el-table-column align="left"  label="款式" prop="款式"  width="120"/>
+			  <el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/>
 			  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+			  <el-table-column align="left"  label="颜色" prop="颜色"  width="120"/>
 			  <!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
 			  <!-- <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="90"/> -->
 			  <el-table-column align="left"  label="定额用料" prop="定额用料"  width="90"/>
 			  <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="90"/>
-			  <el-table-column align="left"  label="库存数量" prop="库存数量"  width="90"/>
+			  <el-table-column align="left"  label="入库数量" prop="入仓总量"  width="90"/>
+			  <el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
 			  <el-table-column align="left"  label="面料结余" prop="面料结余"  width="90"/>
-			  <el-table-column align="left"  label="入库数量" prop="入库数量"  width="90"/>
-			  <el-table-column align="left"  label="投料单位" prop="投料单位"  width="90"/>
-			  <el-table-column align="left"  label="入库人员" prop="入库人员"  width="100"/>
-			  <el-table-column align="left"  label="入库时间" prop="入库时间"  width="160"/>
+			  <el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
+			  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="100"/>
+			  <el-table-column align="left"  label="入库日期" prop="日期"  width="160"/>
 			  </el-table>
 		  </el-tab-pane>
 		 </el-tabs>
@@ -131,15 +134,16 @@
 		  <el-descriptions class="margin-top" :column="4" :size="size" border>
 		    <el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
 			<el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
-		    <el-descriptions-item label="订单编号">{{ ddhformData['ddh'] }}</el-descriptions-item>
-		    <el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
+		    <el-descriptions-item label="订单编号">{{ mianliaotabData.订单编号 }}</el-descriptions-item>
+		    <el-descriptions-item label="客户">{{ mianliaotabData.客户编号 }}</el-descriptions-item>
 		    <!-- <el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item> -->
 		    <el-descriptions-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
-			<el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
+			<el-descriptions-item label="生产款号">{{ mianliaotabData.生产款号 }}</el-descriptions-item>
 			<el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
 		    <el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
 		    <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
 		    <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
+			<!-- <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item> -->
 			<el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item>
 		    <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
 			<el-descriptions-item label="累计入库数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
@@ -353,7 +357,6 @@ const add_onSubmit = async ()=>{
 		danhao.value = gitReceiptNumberdata.data.number
 		chukuren.value = userStore.userInfo.nickName
 		riqi.value = currentDates
-		Reporting_onSubmit()
 	}else{
 		restableData.splice(0,orderSearchdata.length,...orderSearchdata.data);
 	}
@@ -414,6 +417,10 @@ const tableRowClick = async (row) => {
     // 将 Detailres.data 中的数据赋值给 mianliaotabData
     if (Detailres.code === 0 && Detailres.data) {
         mianliaotabData.value = {
+			订单编号: row.订单编号,
+			客户编号: row.客户编号,
+			生产款号: row.生产款号,
+			款式: row.款式,
             物料编号: Detailres.data.BOM_物料编码,
             物料名称: Detailres.data.BOM_物料名称,
             关联号: Detailres.data.关联编号,
@@ -423,12 +430,12 @@ const tableRowClick = async (row) => {
             定额用料: Detailres.data.定额用料,
             定额门幅: Detailres.data.BOM_定额门幅,
             入库数量: Detailres.data.入库数量,
-            入仓总数量: Detailres.data.入仓总量,
-            库存数量: Detailres.data.库存数量,
+            入仓总数量: Detailres.data.入仓总量?Detailres.data.入仓总量:0,
+            库存数量: Detailres.data.库存数量?Detailres.data.库存数量:0,
             领用数量: Detailres.data.领用数量,
             关联订单: Detailres.data.关联订单,
             颜色: Detailres.data.BOM_颜色,
-            单位: Detailres.data.单位,
+            单位:'米',
 			实际门幅:Detailres.data.实际门幅
         };
     } else {
@@ -439,13 +446,18 @@ const danjutableData = ref([]); // 使用 ref 定义响应式数组
 
 //添加按钮
 const dj_Dialog = () => {
-    if (mianliaotabData.value) {
-        // 使用 .value 访问 danjutableData 的实际值ddhformData
-        danjutableData.value.push({ ...mianliaotabData.value });
-		
-    } else {
-        console.error('mianliaotabData 为空，无法添加到 danjutableData');
-    }
+  if (mianliaotabData.value) {
+    // 判断实际门幅是否为空
+    const 实际门幅 = mianliaotabData.value.实际门幅 || mianliaotabData.value.定额门幅;
+
+    // 将 mianliaotabData 的数据添加到 danjutableData
+    danjutableData.value.push({
+      ...mianliaotabData.value, // 展开 mianliaotabData 的所有属性
+      实际门幅, // 使用计算后的实际门幅
+    });
+  } else {
+    console.error('mianliaotabData 为空，无法添加到 danjutableData');
+  }
 };
 
 //操作移除按钮
@@ -455,29 +467,6 @@ const deleteRow = (index) => {
 	//移除当前行
 	danjutableData.value.splice(index, 1);
 }
-//查询
-const add_lyonSubmit = async ()=>{
-	const orderSearchdata = await InputOrderSearch({search:add_lysearchInfo.value});
-	if(orderSearchdata.data.length === 1){
-		add_lysearchInfo.value = orderSearchdata.data[0]['订单编号']
-		ddhformData.ddh = orderSearchdata.data[0]['订单编号']
-		ddhformData.kh = orderSearchdata.data[0]['客户编号']
-		ddhformData.sckh = orderSearchdata.data[0]['生产款号']
-		ddhformData.ks = orderSearchdata.data[0]['款式']
-	}
-	try {
-		const Detailres = await getInputDetail({
-		关联编号:ddhformData.glbh,
-		订单编号:ddhformData.ddh,
-		物料编码:ddhformData.wlbh
-		});
-		console.log(Detailres)
-		
-	add_lysearchInfo.value = ''
-  } catch (error) {
-    console.error(error);
-  }
-};
 
 //选择入库弹窗
 const res_bomdialogFormVisible = ref(false)
@@ -513,6 +502,8 @@ const resbom_tableColumns = ref(
 
 //选择入库
 const Reporting_onSubmit = async ()=>{
+	ddhformData.value = []
+	mianliaotabData.value = []	
 	// if(_orderid.value === '' || _orderid.value === null){
 	// 	ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
 	// }else{

src/view/inventory/tuihuan.vue

@@ -2,10 +2,10 @@
     <div>
       <layout>
           <el-row :gutter="24" style="margin-bottom: 6px;">
-                <el-input v-model="records_searchInfo" placeholder="请搜索退还单号、订单编号或生产款号进行查询相关退还记录"  @input="records_handleInput"
+                <!-- <el-input v-model="records_searchInfo" placeholder="请搜索退还单号、订单编号或生产款号进行查询相关退还记录"  @input="records_handleInput"
                   @keyup.enter="records_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
-                </el-input>
-                <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">面料退还</el-button>
+                </el-input> -->
+                <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料退还</el-button>
                 <!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
           </el-row>
         <layout>
@@ -22,11 +22,12 @@
                             @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
                             :summary-method="getSummaries" tooltip-effect="dark" :data="recordtableData" row-key="ID" >
                     <!-- <el-table-column   align="center" type="selection" width="40"//> -->
-                    <el-table-column align="left"  label="退还单" prop="退还单"  width="170"/>
-                    <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/>
-                    <el-table-column align="left"  label="款号" prop="款号"  width="150"/>
-                    <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+                    <el-table-column align="left"  label="退还单" prop="出库单"  width="170"/>
+                    <!-- <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/> -->
+                    <!-- <el-table-column align="left"  label="款号" prop="款号"  width="150"/> -->
+                    <!-- <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/> -->
                     <el-table-column align="left"  label="单号类型" prop="单号类型"  width="150"/>
+                    <el-table-column align="left"  label="退还总数" prop="总数"  width="110"/>
                     <el-table-column align="left"  label="退还人员" prop="操作机台"  width="110"/>
                     <el-table-column align="left"  label="退还日期" prop="日期"  width="160"/>
                     
@@ -34,7 +35,7 @@
                       <template #default="{ row, $index }">
                         <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
                         style="font-size: 16px;padding: 0px;width: 90px;">
-                          查看详情
+                          退还明细
                         </el-button>
                       </template>
                     </el-table-column>
@@ -61,26 +62,28 @@
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :show-overflow-tooltip="true" highlight-current-row="true"
                         @row-click="detailsclicks" @row-dblclick="Doubleclickdetails"
-                        @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+                        @selection-change="detailSelectionChange" style="width: 100%;height: 75vh" border
                           :summary-method="getSummaries" tooltip-effect="dark" :data="rdetailstableData" row-key="ID" >
                 <!-- <el-table-column   align="center" type="selection" width="40"/> -->
-                <el-table-column align="left"  label="退还单号" prop="单号"  width="150"/>
+                <el-table-column align="left"  label="退还单号" prop="出库单据编号"  width="140"/>
                 <el-table-column align="left"  label="批次号" prop="批次号"  width="90"/>
-                <el-table-column align="left"  label="订单编号" prop="订单编号"  width="110"/>
-                <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
-                <el-table-column align="left"  label="生产款号" prop="生产款号"  width="140"/>
+                <el-table-column align="left"  label="订单编号" prop="订单编号"  width="105"/>
+                <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/>
+                <el-table-column align="left"  label="生产款号" prop="款号"  width="140"/>
                 <el-table-column align="left"  label="款式" prop="款式"  width="120"/>
+                <el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/>
                 <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+                <el-table-column align="left"  label="颜色" prop="颜色"  width="120"/>
                 <!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
                 <!-- <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="90"/> -->
                 <el-table-column align="left"  label="定额用料" prop="定额用料"  width="90"/>
                 <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="90"/>
-                <el-table-column align="left"  label="库存数量" prop="库存数量"  width="90"/>
+                <el-table-column align="left"  label="退还数量" prop="入仓总量"  width="90"/>
+                <el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
                 <el-table-column align="left"  label="面料结余" prop="面料结余"  width="90"/>
-                <el-table-column align="left"  label="退还数量" prop="退还数量"  width="90"/>
-                <el-table-column align="left"  label="投料单位" prop="投料单位"  width="90"/>
-                <el-table-column align="left"  label="退还人员" prop="退还人员"  width="100"/>
-                <el-table-column align="left"  label="退还时间" prop="退还时间"  width="160"/>
+                <el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
+                <el-table-column align="left"  label="退还人员" prop="操作机台"  width="100"/>
+                <el-table-column align="left"  label="退还日期" prop="日期"  width="160"/>
                 </el-table>
             </el-tab-pane>
            </el-tabs>
@@ -115,9 +118,9 @@
                         highlight-current-row="true"  @row-dblclick="updateCompanyFunc"
                         @row-click="tableRowClick" :show-overflow-tooltip="true"
                         @selection-change="handleSelectionChange">
+                <el-table-column  align="left" label="关联编号" prop="关联编号" width="90" />
                 <el-table-column  align="left" label="订单编号" prop="订单编号" width="110" />
                 <el-table-column  align="left" label="生产款号" prop="生产款号" width="110" />
-                <el-table-column  align="left" label="关联编号" prop="关联编号" width="90" />
                 <el-table-column  align="left" label="物料名称" prop="物料名称" width="120" />	 
                 <el-table-column  align="left" label="颜色" prop="颜色" width="100" />
               </el-table>
@@ -125,21 +128,22 @@
   
           <!-- 右部分 -->
           <div style="position: relative;width: 1300px;height: 310px;">
-              <el-descriptions class="margin-top" :column="2" :size="size" border>
+              <el-descriptions class="margin-top" :column="1" :size="size" border>
                   <el-descriptions-item label="关联订单">{{ mianliaotabData.关联订单 }}</el-descriptions-item>
               </el-descriptions>
             <el-descriptions class="margin-top" :column="4" :size="size" border>
               <el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
               <el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
-              <el-descriptions-item label="订单编号">{{ ddhformData['ddh'] }}</el-descriptions-item>
-              <el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
+              <el-descriptions-item label="订单编号">{{ mianliaotabData.订单编号 }}</el-descriptions-item>
+              <el-descriptions-item label="客户">{{ mianliaotabData.客户编号 }}</el-descriptions-item>
               <!-- <el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item> -->
               <el-descriptions-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
-              <el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
+              <el-descriptions-item label="生产款号">{{ mianliaotabData.生产款号 }}</el-descriptions-item>
               <el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
               <el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
               <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
               <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
+              <!-- <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item> -->
               <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item>
               <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
               <el-descriptions-item label="累计退还数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
@@ -156,8 +160,6 @@
                 <el-input v-model="mianliaotabData.退还数量" id='rksl' placeholder="" style="margin: 0; width: 100px;"/>
               </el-descriptions-item>
           </el-descriptions>
-
-
           <el-descriptions class="margin-top" :column="2" :size="size" border>
             <el-descriptions-item label="退还类型">
                 <el-radio v-model="radio1" label="退面料" border>退面料</el-radio>
@@ -165,7 +167,6 @@
                 <el-radio v-model="radio1" label="退次品" border>退次品</el-radio>
               </el-descriptions-item>
           </el-descriptions>
-
           <!-- <el-button type="primary" @click="dj_Dialog" style="width: 120px; height: 50px; position: absolute; bottom: 0px; right: 10px;">
             添加面料
           </el-button> -->
@@ -177,7 +178,6 @@
               <el-descriptions-item label="退还日期">{{riqi}}</el-descriptions-item>
               <el-descriptions-item label="退还人员">{{chukuren}}</el-descriptions-item>
           </el-descriptions>
-        
           <br>
             <div>
               <el-table ref="multipleTable" style="width: 100%;height: 25vh" tooltip-effect="dark"
@@ -277,8 +277,8 @@
   import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
   import {ref, reactive} from 'vue'
   import {getInputDetail,
-  inputStash,
-  InputOrderSearch,TuihuoReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail} from '@/api/mes/job'
+  TuihuoReport,
+  InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail} from '@/api/mes/job'
   import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
   import { useUserStore } from '@/pinia/modules/user'
   // import { get } from 'scriptjs';
@@ -320,6 +320,7 @@
   const _orderid = ref('')//订单子编号
   const _kh = ref('')//生产款号
   const radio1 = ref('退面料')
+
   //input实时调用
   const handleInput = async ()=>{
       restableData.splice(0, restableData.length);//清空表格
@@ -334,7 +335,7 @@
           ddhformData.ks = orderSearchdata.data[0]['款式']
           add_lysearchInfo.value = add_searchInfo.value
           
-          const gitReceiptNumberdata = await gitReceiptNumber({number:'TH'});
+          const gitReceiptNumberdata = await gitReceiptNumber({number:'CK'});
           danhao.value = gitReceiptNumberdata.data.number
           chukuren.value = userStore.userInfo.nickName
           riqi.value = currentDates 
@@ -358,12 +359,11 @@
           ddhformData.ks = orderSearchdata.data[0]['款式']
           add_lysearchInfo.value = add_searchInfo.value
           
-          const gitReceiptNumberdata = await gitReceiptNumber({number:'TH'});
+          const gitReceiptNumberdata = await gitReceiptNumber({number:'CK'});
           console.log(gitReceiptNumberdata)
           danhao.value = gitReceiptNumberdata.data.number
           chukuren.value = userStore.userInfo.nickName
           riqi.value = currentDates
-          Reporting_onSubmit()
       }else{
           restableData.splice(0,orderSearchdata.length,...orderSearchdata.data);
       }
@@ -424,6 +424,10 @@
       // 将 Detailres.data 中的数据赋值给 mianliaotabData
       if (Detailres.code === 0 && Detailres.data) {
           mianliaotabData.value = {
+              订单编号: row.订单编号,
+              客户编号: row.客户编号,
+              生产款号: row.生产款号,
+              款式: row.款式,
               物料编号: Detailres.data.BOM_物料编码,
               物料名称: Detailres.data.BOM_物料名称,
               关联号: Detailres.data.关联编号,
@@ -433,12 +437,12 @@
               定额用料: Detailres.data.定额用料,
               定额门幅: Detailres.data.BOM_定额门幅,
               退还数量: Detailres.data.退还数量,
-              入仓总数量: Detailres.data.入仓总量,
-              库存数量: Detailres.data.库存数量,
+              入仓总数量: Detailres.data.入仓总量?Detailres.data.入仓总量:0,
+              库存数量: Detailres.data.库存数量?Detailres.data.库存数量:0,
               领用数量: Detailres.data.领用数量,
               关联订单: Detailres.data.关联订单,
               颜色: Detailres.data.BOM_颜色,
-              单位: Detailres.data.单位,
+              单位:'米',
               实际门幅:Detailres.data.实际门幅
           };
       } else {
@@ -449,13 +453,18 @@
   
   //添加按钮
   const dj_Dialog = () => {
-      if (mianliaotabData.value) {
-          // 使用 .value 访问 danjutableData 的实际值ddhformData
-          danjutableData.value.push({ ...mianliaotabData.value });
-          
-      } else {
-          console.error('mianliaotabData 为空，无法添加到 danjutableData');
-      }
+    if (mianliaotabData.value) {
+      // 判断实际门幅是否为空
+      const 实际门幅 = mianliaotabData.value.实际门幅 || mianliaotabData.value.定额门幅;
+  
+      // 将 mianliaotabData 的数据添加到 danjutableData
+      danjutableData.value.push({
+        ...mianliaotabData.value, // 展开 mianliaotabData 的所有属性
+        实际门幅, // 使用计算后的实际门幅
+      });
+    } else {
+      console.error('mianliaotabData 为空，无法添加到 danjutableData');
+    }
   };
   
   //操作移除按钮
@@ -465,29 +474,6 @@
       //移除当前行
       danjutableData.value.splice(index, 1);
   }
-  //查询
-  const add_lyonSubmit = async ()=>{
-      const orderSearchdata = await InputOrderSearch({search:add_lysearchInfo.value});
-      if(orderSearchdata.data.length === 1){
-          add_lysearchInfo.value = orderSearchdata.data[0]['订单编号']
-          ddhformData.ddh = orderSearchdata.data[0]['订单编号']
-          ddhformData.kh = orderSearchdata.data[0]['客户编号']
-          ddhformData.sckh = orderSearchdata.data[0]['生产款号']
-          ddhformData.ks = orderSearchdata.data[0]['款式']
-      }
-      try {
-          const Detailres = await getInputDetail({
-          关联编号:ddhformData.glbh,
-          订单编号:ddhformData.ddh,
-          物料编码:ddhformData.wlbh
-          });
-          console.log(Detailres)
-          
-      add_lysearchInfo.value = ''
-    } catch (error) {
-      console.error(error);
-    }
-  };
   
   //选择退还弹窗
   const res_bomdialogFormVisible = ref(false)
@@ -523,6 +509,8 @@
   
   //选择退还
   const Reporting_onSubmit = async ()=>{
+      ddhformData.value = []
+      mianliaotabData.value = []	
       // if(_orderid.value === '' || _orderid.value === null){
       // 	ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
       // }else{
@@ -537,7 +525,7 @@
           }, 100);//100毫秒
           
           //获取单据编号接口
-          const gitReceiptNumberdata = await gitReceiptNumber({number:'TH'});
+          const gitReceiptNumberdata = await gitReceiptNumber({number:'CK'});
           danhao.value = gitReceiptNumberdata.data.number
           chukuren.value = userStore.userInfo.nickName
           riqi.value = currentDates
@@ -639,7 +627,7 @@
         ElMessage({ type: 'error', message: '退还失败' });
       }
     } catch (error) {
-      console.error('退还失败:', error);
+      console.error('出库失败:', error);
       ElMessage({ type: 'error', message: '退还失败' });
     }
   }
@@ -700,7 +688,7 @@
       recorddialogFormVisible.value = true
       rdetailstableData.splice(0,rdetailstableData.length);
       
-      const FabricDetaillists = await ReceiptDetail({receipt:row['退还单']});
+      const FabricDetaillists = await ReceiptDetail({receipt:row['出库单']});
       rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data);
   }
   
@@ -802,7 +790,7 @@
   };
   </script>
   <style scoped>
-  /* 根据退还状态文字颜色 */
+  /* 根据出库状态文字颜色 */
   :deep(.status-plan-usage-low div) {
     color: #8c939d  !important;
   }
@@ -907,9 +895,9 @@
       width: 120px;
   }
   :deep(.el-descriptions__content) {
-    width: 80px !important;
-    min-width: 80px !important;
-    max-width: 80px !important;
+    width: 120px !important;
+    min-width: 120px !important;
+    max-width: 120px !important;
     overflow: hidden !important;
     text-overflow: ellipsis !important;
   }

src/view/performance/caiqiebaogong.vue

@@ -248,7 +248,6 @@
 					  style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;">删除报工</el-button>
 					  <el-button type="primary" @click="cp_gdprintonClick" style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;" >  子订单详情页 </el-button>
 					  <el-button type="primary" @click="add_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >报工</el-button>
-						<el-button type="primary" @click="return_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >退还</el-button>
 				</el-main>
 			</div>
 			
@@ -261,41 +260,7 @@
 					</div>
 				</el-dialog>
 				
-				  <!-- 退还 -->
-					<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="报工退还" width="100%" top="2%" destroy-on-close>
-						<div class="dialog-footer">
-						<el-button @click="res_bomcloseDialog" style="height: 40px;font-size: 20px;">关 闭</el-button>
-						<el-button type="primary" @click="res_bomenterDialog" style="height: 40px;font-size: 20px;">退 还</el-button>
-						</div>
-						<el-divider style="margin: 10px 0px 20px;" ><span style="font-size: 18px;color:red;font-weight: bold;margin-left: 20px;">绿色部分填写领用数量</span></el-divider>
-						<el-descriptions class="margin-top" :column="4"  :size="size" border>
-						<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
-						<el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
-						<el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
-						<el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item>
-						</el-descriptions>
-						<div>
-							<el-table ref="paichengRef"
-									:show-overflow-tooltip="true"
-									highlight-current-row="true"
-									:row-style="{ height: '0px' }"
-									:cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-									:header-cell-style="{ padding: '0px' }"
-									style="width: 100%;height: 60vh" border tooltip-effect="dark"
-									:data="resbomtableData" row-key="ID"
-									:cell-class-name="scfjfpxsCellClass">
-							<template v-for="(item, idx) in resbom_tableColumns">
-								<el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
-								<div v-if="['退还'].includes(item.prop)">
-									<el-input v-model="row[item.prop]" :clearable="false"
-											:id="`input${idx}${$index}`" @keyup="resbom_handleKeyDown($event, idx, $index, item.prop)"/>
-								</div>
-								<div v-else>{{ row[item.prop] }}</div>
-								</el-table-column>
-							</template>
-							</el-table>
-						</div>
-					</el-dialog>
+				
 				
         </layout-content>
       </layout>
@@ -878,145 +843,8 @@ const del_delclick = async () => {
 const _orderid = ref('')//订单子编号
 const _kh = ref('')//生产款号
 
-//===========报工==========
-const res_bomdialogFormVisible = ref(false)
-const resbomtableData = ref([]);
-const ddhformData = reactive({
-  ddh: '',
-  kh:'',
-  sckh:'',
-  ks:'',
-});
-const resbom_tableColumns = ref(
-    [
-		// { label: '订单编号', prop: '订单编号', width: '90' },
-		// { label: '客户', prop: '客户编号', width: '70' },
-		// { label: '生产款号', prop: '生产款号', width: '100' },
-		// { label: '款式', prop: '款式', width: '100' },
-		{ label: '物料名称', prop: '物料名称', width: '160' },
-		{ label: '计划用料', prop: '计划用料', width: '105' },
-		{ label: '定额用料', prop: '定额用料', width: '100' },
-		{ label: '门封', prop: '门封', width: '80' },
-		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
-		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
-		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
-		{ label: '入库总量', prop: '入库总量', width: '90' },
-		{ label: '面料结余', prop: '面料结余', width: '90' },
-		{ label: '退还', prop: '退还', width: '110' },
-		// { label: '备注', prop: '备注', width: '120' },
-		{ label: '投料单位', prop: '投料单位', width: '90' },
-		// { label: 'UNIQID', prop: 'UNIQID', width: '80' },
-    ]
-)
-//退还按钮
-const return_Dialog = async ()=>{
-	_orderid.value = add_searchInfo.value.split('-')[0]
-	if(_orderid.value === '' || _orderid.value === null){
-		ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
-	}else{
-		const orderSearchdata = await OutOrderSearch({search:_orderid.value});
-		console.log(orderSearchdata)
-		_kh.value = orderSearchdata.data[0].生产款号
-		res_bomdialogFormVisible.value = true
-		ddhformData.ddh = _orderid.value
-		ddhformData.kh = _kh.value
-		ddhformData.sckh = orderSearchdata.data[0].客户编号
-		ddhformData.ks = orderSearchdata.data[0].款式
-		const orderBomListlsit = await orderBomList({order:_orderid.value});
-		console.log(orderBomListlsit)
-		_TestCoefficient();
-	}
-}
-//bom数据获取
-const _TestCoefficient = async ()=>{
-  try {
-    const orderBomListdata = await orderBomList({order:_orderid.value});
-	console.log(orderBomListdata)
-	resbomtableData.value = orderBomListdata.data;
-    const formattedData = orderBomListdata.data.map(item=>{
-      item.物料名称 = item.物料名称;
-      item.计划用料 = item.计划用料;
-	  item.定额用料 = item.定额用料;
-	  item.裁床实际用料 = item.裁床实际用料;
-	  item.裁床领用面料 = item.裁床领用面料;
-	  item.裁床退回仓库面料 = item.裁床退回仓库面料;
-	  item.备注 = item.备注;
-	  item.UNIQID = item.UNIQID;
-	  item.领用 = '';
-      return item
-    });
-  } catch (error) {
-    console.error(error);
-  }
-}
-const resbom_handleKeyDown = (event, x, y, prop) => {
-  const currentElement = document.getElementById(`input${x}${y}`);
-  if (currentElement === null && currentElement === undefined) return
-  let move = 0
-  switch (event.keyCode) {
-    case 13: // Enter
-    case 40: // 向下箭头
-      if (y < resbomtableData.value.length )
-        document.getElementById(`input${x}${y + 1}`).focus();
-      break;
-    case 38: // 向上箭头
-      if ( y > 0) {
-        document.getElementById(`input${x}${y - 1}`).focus();
-      }
-      break;
-    case 39: // 向左箭头
-      if (x >= 0 && x <=6) {
-        move = x + 1
-      }
-      document.getElementById(`input${move}${y}`).focus();
-      break;
-    case 37: // 向右箭头
-      if (x = 0  && x <=6) {
-        move = x - 1
-      }
-      document.getElementById(`input${move}${y}`).focus();
-      break;
-    default:
-      break;
-  }
-}
-//质检废品系数颜色
-const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  if (column.label === '退还') {
-    return 'background-plan-usage-low';
-  }
-}
 
-// 确定
-const res_bomenterDialog = async() => {
-	const rawValueArray = resbomtableData._rawValue;
-	const formattedData = rawValueArray.map(item => {
-	  return {
-	    order_id: ddhformData.ddh,
-	    款号: ddhformData.kh,
-	    物料名称: item.物料名称 ? item.物料名称 : "",
-	    number: item.退还  ? item.退还 : "",
-	    rq: currentDate,
-	    name: "退还",
-		sys_id: _username.value,
-		// receipt_number:danhao.value,
-		// recipient:_username.value
-	  }
-	});
-	console.log(formattedData);
-	const add_outReport = await outReport(formattedData);
-	if (add_outReport.code === 0) {
-		res_bomdialogFormVisible.value = false;
-		ElMessage({type: 'success',message: '退还成功'})
-	} else {
-		ElMessage({ type: 'error',message: '退还失败'})
-	}
-}
 
-// 取消
-const res_bomcloseDialog = () => {
-	res_bomdialogFormVisible.value = false;
-}
 
 // =========== 分页 ===========
 // 分页相关的响应式变量

src/view/performance/chukubaogong.vue

@@ -2,10 +2,10 @@
 	<div>
 	  <layout>
 		  <el-row :gutter="24" style="margin-bottom: 6px;">
-				<el-input v-model="records_searchInfo" placeholder="请搜索出库单号、订单编号或生产款号进行查询相关出库记录"  @input="records_handleInput"
+				<!-- <el-input v-model="records_searchInfo" placeholder="请搜索出库单号、订单编号或生产款号进行查询相关出库记录"  @input="records_handleInput"
 				  @keyup.enter="records_onSubmit" id="searchInput"  style="width: 460px;height: 50px;margin-left: 10px;">
-				</el-input>
-				<el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">面料出库</el-button>
+				</el-input> -->
+				<el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;margin-left: 20px;">面料出库</el-button>
 				<!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
 		  </el-row>
 		<layout>
@@ -23,10 +23,11 @@
 							:summary-method="getSummaries" tooltip-effect="dark" :data="recordtableData" row-key="ID" >
 					<!-- <el-table-column   align="center" type="selection" width="40"//> -->
 					<el-table-column align="left"  label="出库单" prop="出库单"  width="170"/>
-					<el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/>
-					<el-table-column align="left"  label="款号" prop="款号"  width="150"/>
-					<el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+					<!-- <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/> -->
+					<!-- <el-table-column align="left"  label="款号" prop="款号"  width="150"/> -->
+					<!-- <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/> -->
 					<el-table-column align="left"  label="单号类型" prop="单号类型"  width="150"/>
+					<el-table-column align="left"  label="出库总数" prop="总数"  width="110"/>
 					<el-table-column align="left"  label="出库人员" prop="操作机台"  width="110"/>
 					<el-table-column align="left"  label="出库日期" prop="日期"  width="160"/>
 					
@@ -34,7 +35,7 @@
 					  <template #default="{ row, $index }">
 						<el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
 						style="font-size: 16px;padding: 0px;width: 90px;">
-						  查看详情
+						  出库明细
 						</el-button>
 					  </template>
 					</el-table-column>
@@ -61,26 +62,28 @@
 						  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
 						  :show-overflow-tooltip="true" highlight-current-row="true"
 						@row-click="detailsclicks" @row-dblclick="Doubleclickdetails"
-						@selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+						@selection-change="detailSelectionChange" style="width: 100%;height: 75vh" border
 						  :summary-method="getSummaries" tooltip-effect="dark" :data="rdetailstableData" row-key="ID" >
 				<!-- <el-table-column   align="center" type="selection" width="40"/> -->
-				<el-table-column align="left"  label="出库单号" prop="单号"  width="150"/>
+				<el-table-column align="left"  label="出库单号" prop="出库单据编号"  width="140"/>
 				<el-table-column align="left"  label="批次号" prop="批次号"  width="90"/>
-				<el-table-column align="left"  label="订单编号" prop="订单编号"  width="110"/>
-				<el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
-				<el-table-column align="left"  label="生产款号" prop="生产款号"  width="140"/>
+				<el-table-column align="left"  label="订单编号" prop="订单编号"  width="105"/>
+				<el-table-column align="left"  label="客户" prop="客户编号"  width="70"/>
+				<el-table-column align="left"  label="生产款号" prop="款号"  width="140"/>
 				<el-table-column align="left"  label="款式" prop="款式"  width="120"/>
+				<el-table-column align="left"  label="物料编码" prop="物料编码"  width="150"/>
 				<el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+				<el-table-column align="left"  label="颜色" prop="颜色"  width="120"/>
 				<!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
 				<!-- <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="90"/> -->
 				<el-table-column align="left"  label="定额用料" prop="定额用料"  width="90"/>
 				<el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="90"/>
-				<el-table-column align="left"  label="库存数量" prop="库存数量"  width="90"/>
+				<el-table-column align="left"  label="出库数量" prop="入仓总量"  width="90"/>
+				<el-table-column align="left"  label="库存总量" prop="库存数量"  width="90"/>
 				<el-table-column align="left"  label="面料结余" prop="面料结余"  width="90"/>
-				<el-table-column align="left"  label="出库数量" prop="出库数量"  width="90"/>
-				<el-table-column align="left"  label="投料单位" prop="投料单位"  width="90"/>
-				<el-table-column align="left"  label="出库人员" prop="出库人员"  width="100"/>
-				<el-table-column align="left"  label="出库时间" prop="出库时间"  width="160"/>
+				<el-table-column align="left"  label="投料单位" prop="单位"  width="90"/>
+				<el-table-column align="left"  label="出库人员" prop="操作机台"  width="100"/>
+				<el-table-column align="left"  label="出库日期" prop="日期"  width="160"/>
 				</el-table>
 			</el-tab-pane>
 		   </el-tabs>
@@ -115,9 +118,9 @@
 						highlight-current-row="true"  @row-dblclick="updateCompanyFunc"
 						@row-click="tableRowClick" :show-overflow-tooltip="true"
 						@selection-change="handleSelectionChange">
+				<el-table-column  align="left" label="关联编号" prop="关联编号" width="90" />
 				<el-table-column  align="left" label="订单编号" prop="订单编号" width="110" />
 				<el-table-column  align="left" label="生产款号" prop="生产款号" width="110" />
-				<el-table-column  align="left" label="关联编号" prop="关联编号" width="90" />
 				<el-table-column  align="left" label="物料名称" prop="物料名称" width="120" />	 
 				<el-table-column  align="left" label="颜色" prop="颜色" width="100" />
 			  </el-table>
@@ -131,15 +134,16 @@
 			<el-descriptions class="margin-top" :column="4" :size="size" border>
 			  <el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
 			  <el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
-			  <el-descriptions-item label="订单编号">{{ ddhformData['ddh'] }}</el-descriptions-item>
-			  <el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
+			  <el-descriptions-item label="订单编号">{{ mianliaotabData.订单编号 }}</el-descriptions-item>
+			  <el-descriptions-item label="客户">{{ mianliaotabData.客户编号 }}</el-descriptions-item>
 			  <!-- <el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item> -->
 			  <el-descriptions-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
-			  <el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
+			  <el-descriptions-item label="生产款号">{{ mianliaotabData.生产款号 }}</el-descriptions-item>
 			  <el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
 			  <el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
 			  <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
 			  <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
+			  <!-- <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item> -->
 			  <el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item>
 			  <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
 			  <el-descriptions-item label="累计出库数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
@@ -268,7 +272,7 @@
   import {ref, reactive} from 'vue'
   import {getInputDetail,
   inputStash,
-  InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail} from '@/api/mes/job'
+  OutOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail} from '@/api/mes/job'
   import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
   import { useUserStore } from '@/pinia/modules/user'
   // import { get } from 'scriptjs';
@@ -314,7 +318,7 @@
   const handleInput = async ()=>{
 	  restableData.splice(0, restableData.length);//清空表格
 	  //订单信息数据查询【接口】
-	  const orderSearchdata = await InputOrderSearch({search:add_searchInfo.value});
+	  const orderSearchdata = await OutOrderSearch({search:add_searchInfo.value});
 	  if(orderSearchdata.data.length === 1){
 		  _orderid.value = orderSearchdata.data[0]['订单编号']
 		  add_searchInfo.value = orderSearchdata.data[0]['订单编号']
@@ -337,7 +341,7 @@
   const add_onSubmit = async ()=>{
 	  //清空表格
 	  restableData.splice(0, restableData.length);
-	  const orderSearchdata = await InputOrderSearch({search:add_searchInfo.value});
+	  const orderSearchdata = await OutOrderSearch({search:add_searchInfo.value});
 	  if(orderSearchdata.data.length === 1){
 		  res_bomdialogFormVisible.value = true
 		  _orderid.value = orderSearchdata.data[0]['订单编号']
@@ -353,7 +357,6 @@
 		  danhao.value = gitReceiptNumberdata.data.number
 		  chukuren.value = userStore.userInfo.nickName
 		  riqi.value = currentDates
-		  Reporting_onSubmit()
 	  }else{
 		  restableData.splice(0,orderSearchdata.length,...orderSearchdata.data);
 	  }
@@ -414,6 +417,10 @@
 	  // 将 Detailres.data 中的数据赋值给 mianliaotabData
 	  if (Detailres.code === 0 && Detailres.data) {
 		  mianliaotabData.value = {
+			  订单编号: row.订单编号,
+			  客户编号: row.客户编号,
+			  生产款号: row.生产款号,
+			  款式: row.款式,
 			  物料编号: Detailres.data.BOM_物料编码,
 			  物料名称: Detailres.data.BOM_物料名称,
 			  关联号: Detailres.data.关联编号,
@@ -423,12 +430,12 @@
 			  定额用料: Detailres.data.定额用料,
 			  定额门幅: Detailres.data.BOM_定额门幅,
 			  出库数量: Detailres.data.出库数量,
-			  入仓总数量: Detailres.data.入仓总量,
-			  库存数量: Detailres.data.库存数量,
+			  入仓总数量: Detailres.data.入仓总量?Detailres.data.入仓总量:0,
+			  库存数量: Detailres.data.库存数量?Detailres.data.库存数量:0,
 			  领用数量: Detailres.data.领用数量,
 			  关联订单: Detailres.data.关联订单,
 			  颜色: Detailres.data.BOM_颜色,
-			  单位: Detailres.data.单位,
+			  单位:'米',
 			  实际门幅:Detailres.data.实际门幅
 		  };
 	  } else {
@@ -439,13 +446,18 @@
   
   //添加按钮
   const dj_Dialog = () => {
-	  if (mianliaotabData.value) {
-		  // 使用 .value 访问 danjutableData 的实际值ddhformData
-		  danjutableData.value.push({ ...mianliaotabData.value });
-		  
-	  } else {
-		  console.error('mianliaotabData 为空，无法添加到 danjutableData');
-	  }
+	if (mianliaotabData.value) {
+	  // 判断实际门幅是否为空
+	  const 实际门幅 = mianliaotabData.value.实际门幅 || mianliaotabData.value.定额门幅;
+  
+	  // 将 mianliaotabData 的数据添加到 danjutableData
+	  danjutableData.value.push({
+		...mianliaotabData.value, // 展开 mianliaotabData 的所有属性
+		实际门幅, // 使用计算后的实际门幅
+	  });
+	} else {
+	  console.error('mianliaotabData 为空，无法添加到 danjutableData');
+	}
   };
   
   //操作移除按钮
@@ -455,29 +467,6 @@
 	  //移除当前行
 	  danjutableData.value.splice(index, 1);
   }
-  //查询
-  const add_lyonSubmit = async ()=>{
-	  const orderSearchdata = await InputOrderSearch({search:add_lysearchInfo.value});
-	  if(orderSearchdata.data.length === 1){
-		  add_lysearchInfo.value = orderSearchdata.data[0]['订单编号']
-		  ddhformData.ddh = orderSearchdata.data[0]['订单编号']
-		  ddhformData.kh = orderSearchdata.data[0]['客户编号']
-		  ddhformData.sckh = orderSearchdata.data[0]['生产款号']
-		  ddhformData.ks = orderSearchdata.data[0]['款式']
-	  }
-	  try {
-		  const Detailres = await getInputDetail({
-		  关联编号:ddhformData.glbh,
-		  订单编号:ddhformData.ddh,
-		  物料编码:ddhformData.wlbh
-		  });
-		  console.log(Detailres)
-		  
-	  add_lysearchInfo.value = ''
-	} catch (error) {
-	  console.error(error);
-	}
-  };
   
   //选择出库弹窗
   const res_bomdialogFormVisible = ref(false)
@@ -513,6 +502,8 @@
   
   //选择出库
   const Reporting_onSubmit = async ()=>{
+	  ddhformData.value = []
+	  mianliaotabData.value = []	
 	  // if(_orderid.value === '' || _orderid.value === null){
 	  // 	ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
 	  // }else{