优化

src/view/performance/chukubaogong.vue

@@ -122,27 +122,26 @@
 		 </div>
 		 <br>
 		  <div>
-			  <el-tabs v-model="activeName" @tab-click="handleClick">
-				  
-	            <!--   <el-tab-pane label="出库记录" name="first">
-	                <el-table ref="multipleTable"
-	                          :row-style="{ height: '30px' }"
-	                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-	                          :header-cell-style="{ padding: '0px' }"
-	                          :show-overflow-tooltip="true"
-	                          highlight-current-row="true"
-	                          @row-click="tableclick"
-	                          @row-dblclick="chukuupdateCompanyFunc"
-	                          style="width: 100%;height: 36vh" border
-	                          :summary-method="getSummaries" tooltip-effect="dark" :data="cktableData" row-key="ID" >
-	                  <el-table-column align="left" sortable label="出库单号" prop="单号"  width="140"/>                
-	                  <el-table-column align="left" sortable label="订单编号" prop="订单编号"  width="140"/>
-	                  <el-table-column align="left" sortable label="款号" prop="款号"  width="180"/>
-	                  <el-table-column align="left" sortable label="数量" prop="数量"  width="105"/>
-	                  <el-table-column align="left" sortable label="出库人员" prop="出库人员"  width="160"/>
-	                  <el-table-column align="left" sortable label="出库时间" prop="出库时间"  width="160"/>
-	                </el-table>
-	              </el-tab-pane> -->
+			<el-tabs v-model="activeName" @tab-click="handleClick">
+              <el-tab-pane label="出库记录"  @click="showTable('出库记录')"  name="first">
+                <el-table ref="multipleTable"
+                          :row-style="{ height: '30px' }"
+                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                          :header-cell-style="{ padding: '0px' }"
+                          :show-overflow-tooltip="true"
+                          highlight-current-row="true"
+						  @row-click="tableclick"
+                          @row-dblclick="chukuupdateCompanyFunc"
+                          style="width: 100%;height: 36vh" border
+                          :summary-method="getSummaries" tooltip-effect="dark" :data="cktableData" row-key="ID" >
+				  <el-table-column align="left" sortable label="出库单号" prop="单号"  width="140"/>				  
+                  <el-table-column align="left" sortable label="订单编号" prop="订单编号"  width="140"/>
+				  <el-table-column align="left" sortable label="款号" prop="款号"  width="180"/>
+				  <el-table-column align="left" sortable label="数量" prop="数量"  width="105"/>
+                  <el-table-column align="left" sortable label="出库人员" prop="出库人员"  width="160"/>
+                  <el-table-column align="left" sortable label="出库时间" prop="出库时间"  width="160"/>
+                </el-table>
+              </el-tab-pane>
   
 				<el-tab-pane label="退还记录" name="second">
 				  <el-table ref="multipleTable"
@@ -164,7 +163,44 @@
 		  </div>
 	</el-dialog>
   
-
+ <!--单号详情记录 -->
+ <el-dialog v-model="details_pickingaddvisible" :before-close="()=> details_pickingaddvisible = false" style="width: 100%; margin: 0% auto; height: 100%;" :title="单据详情"
+	destroy-on-close>
+	   <div class="dialog-footer" style="bottom: 10px; right: 10px; width: 100%;">
+		 <el-button  type="primary" @click="details_ckth_closeDialog" style="width: 80px;height: 40px;">关 闭</el-button>
+		 <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 40px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
+	   </div>
+	   <br>
+		<div>
+                <el-table ref="multipleTable"
+                          :row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
+                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                          :show-overflow-tooltip="true" highlight-current-row="true"
+						  @row-click="tableclick" @row-dblclick="ysupdateCompanyFunc"
+						  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+                          :summary-method="getSummaries" tooltip-effect="dark" :data="chuku_detailstableData" row-key="ID" >
+				  <el-table-column   align="center" type="selection" width="40"/>
+				  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="110"/>
+				  <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="100"/>
+				  <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="100"/>
+				  <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="110"/>
+				  <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="100"/>
+				  <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="160"/>
+				  <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
+				  <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
+                </el-table>
+		</div>
+  </el-dialog>
 	
   </template>
   <script>
@@ -492,12 +528,21 @@
   const chuku_detailstableData = reactive([])
   const th_detailstableData = reactive([])
 
+  const chukuupdateCompanyFunc = async (row)=>{
+	dh.value = row.单号
+	type.value = 'ck'
+	details_pickingaddvisible.value = true
+	chuku_detailstableData.splice(0,chuku_detailstableData.length);
+	const FabricDetaillistdata = await FabricDetaillist({order:row.单号,search:''});
+	chuku_detailstableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['出库记录']);
+	console.log(FabricDetaillistdata)
+}
   const thupdateCompanyFunc = async (row)=>{
 	  dh.value = row.单号
 	  type.value = 'th'
 	  details_pickingaddvisible.value = true
 	  console.log(row)
-	  const FabricDetaillistdata = await FabricDetaillist({order:row.单号,search:'退还'});
+	  const FabricDetaillistdata = await FabricDetaillist({order:row.单号,search:''});
 	  console.log(FabricDetaillistdata)
   }
   //详情页取消
@@ -543,7 +588,7 @@
 	  }
 	  // 重新获取BOM列表数据
 	  const FabricDetaillistdata = await FabricDetaillist({order:dh.value,search:''});
-	  ruku_detailstableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['入库记录']);
+	  chuku_detailstableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['入库记录']);
 	} catch (error) {
 	  // 用户点击“取消”或弹框关闭
 	  console.log('用户取消删除操作');

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -517,7 +517,36 @@
 		      </div>
 		    </el-form>
 		  </div>
-		
+		  <el-table ref="multipleTable"
+                          :row-style="{ height: '30px' }"
+                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                          :header-cell-style="{ padding: '0px' }"
+                          :show-overflow-tooltip="true"
+                          :cell-class-name="planUsageCellClass"
+                          highlight-current-row="true"
+                          @row-dblclick="bombomupdateCompanyFunc2"
+						  @selection-change="glddSelectionChange2"
+                          style="width: 100%;height: 30vh" border tooltip-effect="dark" :data="zsglddtableData" row-key="ID">
+                 <el-table-column type="selection" width="40" />
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="160"/>
+				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="160"/>
+				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
+                  <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
+                  <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="110"/>
+				  <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="110"/>
+				  <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="100" /> -->
+				  <!-- <el-table-column align="left" label="id" prop="ID"  width="100"/> -->
+				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
+                </el-table>
 		  <!-- 底部操作按钮 -->
 		  <template #footer>
 		    <div class="dialog-footer" style="text-align: right;">
@@ -525,6 +554,7 @@
 		      <el-button type="primary" @click="add_gdenterDialog">确定</el-button>
 		    </div>
 		  </template>
+
 		</el-dialog>
 
 		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="关联订单面料" style="width: 100%;height: 100%;margin: 0px;" top="2%" destroy-on-close>
@@ -1780,33 +1810,65 @@ const ddsearchHandle = async (v) => {
   if (response.data && response.data.length === 0) {
     ElMessage({type: 'warning',message: '未查询到搜索条件'})
   }else{
-    glddtableData.splice(0, response.data.table.total, ...response.data.table);
+ // 确保 response.data 和 response.data.table 存在
+ if (response?.data?.table) {
+      glddtableData.value = response.data.table.map(item => ({
+        ...item,
+        checked: false, // 初始化时默认未勾选
+      }));
+	  glddtableData.splice(0, response.data.table.total, ...response.data.table);
+    } else {
+      console.error("response.data.table 不存在或为空：", response.data);
+    }
   }
 }
 
 const gldd_Selection = ref('')//存储选中Uniqid
 const gldd_Selection_ddbh = ref('')//存储选中订单编号
-const glddSelectionChange = (selection, type) => {
-  console.log(selection);
+const glddSelectionChange = (selection) => {
+  console.log("当前选中的数据：", selection);
+
+  // 更新 glddtableData 中每一行的 checked 状态
+  glddtableData.value = glddtableData.value.map(item => {
+    return {
+      ...item,
+      checked: selection.some(selectedItem => selectedItem.UNIQID === item.UNIQID), // 判断是否被勾选
+    };
+  });
+
+  // 获取所有行的 UNIQID 和订单编号
   const ids = selection.map(item => item.UNIQID);
   const dds = selection.map(item => item.订单编号);
-  // 使用 Set 去重
+
+  // 去重
   const uniqueIds = [...new Set(ids)];
   const uniqueDds = [...new Set(dds)];
+
+  // 存储选中的 UNIQID 和订单编号
   gldd_Selection.value = uniqueIds.join(',');
   gldd_Selection_ddbh.value = uniqueDds.join(',');
+
   console.log("关联订单复选框", gldd_Selection.value);
   console.log("关联订单编号", gldd_Selection_ddbh.value);
-}
+};
+
 //关联订单取消
 const Related_fabricscloseDialog = () => {
 	gldd_Selection.value = ''
 	Related_fabricsVisible.value = false
 }
 //关联订单确定
+const zsglddtableData = ref([])
 const Related_fabricsenterDialog = () => {
-	Related_fabricsVisible.value = false
-}
+  // 过滤出勾选的数据
+  const filteredData = glddtableData.value.filter(item => item.checked);
+
+  // 将过滤后的数据添加到 zsglddtableData
+  zsglddtableData.value.push(...filteredData);
+
+  // 关闭弹窗
+  Related_fabricsVisible.value = false;
+};