first commit

src/view/inventory/tuihuan.vue

@@ -27,17 +27,16 @@
                             @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="140"/>
-                      <el-table-column align="left"  label="订单编号" prop="订单编号"  width="180"/>
-                      <el-table-column align="left"  label="款号" prop="款号"  width="180"/>
-                      <el-table-column align="left"  label="款式" prop="款式"  width="180"/>
-                      <el-table-column align="left"  label="物料名称" prop="物料名称"  width="180"/>
-                      <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="120"/>
+                      <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="140"/>
+                      <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
+                      <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="100"/>
                       <el-table-column align="left"  label="创建日期" prop="创建日期"  width="160"/>
-                    
+                      <el-table-column align="left"  label="类型" prop="单号类型"  width="90"/>
                     <el-table-column fixed="right" label="操作" width="130">
                       <template #default="{ row, $index }">
                         <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
@@ -83,29 +82,30 @@
                         @row-click="detailsclicks" @row-dblclick="Doubleclickdetails"
                         @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="140"/>
-			  <!-- <el-table-column align="left"  label="批次号" prop="批次号"  width="90"/> -->
-			  <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="BOM_颜色"  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="departname"  width="90"/>
-			  <el-table-column align="left"  label="备注" prop="remark"  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="140"/>
+               <!-- <el-table-column align="left"  label="批次号" prop="批次号"  width="90"/> -->
+               <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="140"/>
+               <el-table-column align="left"  label="颜色" prop="BOM_颜色"  width="100"/>
+               <!-- <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="departname"  width="110"/>
+               <el-table-column align="left"  label="备注" prop="remark"  width="300"/>
+               <el-table-column align="left"  label="退还人员" prop="操作机台"  width="100"/>
+               <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>
@@ -163,9 +163,7 @@
             </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="累计退还数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
+			  <el-descriptions-item label="累计退还数量">{{ mianliaotabData.退还数量 }}</el-descriptions-item>
 			  <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
 			  <el-descriptions-item label="单位" >
 			    <el-radio-group v-model="mianliaotabData.单位" >
@@ -244,26 +242,16 @@
                   <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="110"/>
+                  <!-- <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="160" />	 
+                  <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="130" />
-                  <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="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="110"/>
-                  <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="60"/>
-                  <el-table-column  align="left" label="部门" prop="部门" width="100"/>
-				  <el-table-column  align="left" label="备注" prop="备注" width="100"/>
-                  <!-- <el-table-column  align="left" label="关联订单" prop="关联订单" width="300"/> -->
+                  <el-table-column  align="left" label="部门" prop="部门" width="60"/> 
+                  <el-table-column  align="left" label="备注" prop="备注" width="300"/>
                   <el-table-column fixed="right" label="操作" width="120">
                       <template #default="{ row, $index }">
                         <el-button @click="deleteRow($index)" type="text" size="small">
@@ -546,7 +534,7 @@ const search_onSubmit = async ()  => {
       定额用料: '',
       定额门幅: '',
       退还数量: '',
-      入仓总数量: '',
+      入仓总量: '',
       库存数量: '',
       领用数量: '',
       // 关联订单: '',
@@ -604,8 +592,8 @@ const search_onSubmit = async ()  => {
       计划门幅: Detailres.data.BOM_计划门幅,
       定额用料: Detailres.data.定额用料,
       定额门幅: Detailres.data.BOM_定额门幅,
-      退还数量: '',
-      入仓总数量: Detailres.data.退还数量 ? Detailres.data.退还数量 : 0,
+      退还数量: Detailres.data.退还数量,
+      入仓总量: Detailres.data.入仓总量 ? Detailres.data.入仓总量 : 0,
       库存数量: Detailres.data.库存数量 ? Detailres.data.库存数量 : 0,
       领用数量: Detailres.data.领用数量,
       关联订单: Detailres.data.关联订单,
@@ -827,17 +815,14 @@ const dj_Dialog = () => {
   // 确定
   const res_bomenterDialog = async () => {
       console.log(danjutableData);
-      if(danjutableData.value[0]['退还数量'] === ''|| danjutableData.value[0]['退还数量'] === undefined){
-          ElMessage({type: 'warning',message: '退还数量不能为空'})
-          return
-      }
-      //日期转换
-let lhrq_formattedDeliveryDate = '';  
+	//退还日期转换
+	let lhrq_formattedDeliveryDate = '';  
 	if (riqi.value) {  
 		const date = new Date(riqi.value);  
 		lhrq_formattedDeliveryDate = `${date.getFullYear()}-${('0' + (date.getMonth() + 1)).slice(-2)}-${('0' + date.getDate()).slice(-2)}`;  
 	}  
-   // 构造一个包含所有数据的数组
+	
+   //退还数组
    const formattedDataArray = danjutableData.value.map(item => ({
       order_id: item['订单编号'],
       款号: item['生产款号'],
@@ -868,8 +853,11 @@ let lhrq_formattedDeliveryDate = '';
         ElMessage({ type: 'success', message: '退还成功' });
         add_searchInfo.value = '';
         restableData.splice(0, restableData.length);
-        danjutableData.value.splice(0, danjutableData.value.length); // 清空表格数据
+		// 清空表格数据
+        danjutableData.value.splice(0, danjutableData.value.length); 
+		// 刷新左侧菜单栏
         getTreeData();
+		//刷新表格
         records_onSubmit();
       } else {
         ElMessage({ type: 'error', message: '退还失败' });