优化

src/api/mes/job.js

@@ -688,7 +688,7 @@ export const outReport = (data) => {
     data
   })
 }
-//订单面料出库报工
+//面料库存
 export const fabricList = (params) => {
   return service({
     url: '/mes_server/work_order/fabricList',

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -16,7 +16,6 @@
 			  <el-button type="primary" icon="edit"   @click="BOMclick"   class="bt"   title="BOM面料">批量修改BOM资料</el-button>
               <el-button type="primary" icon="edit"   @click="del_ddzlClick" 	v-if="table_del=== true" :disabled="table_Selection === ''"  class="bt" title="删除订单资料"  >删除订单资料</el-button>
               <el-button type="primary" icon="edit"   @click="delgd_delclick" 	v-if="delall=== true" :disabled="ysSelection === '' && gySelection === ''"  class="bt"   >删除颜色工艺资料</el-button>
-              <!-- <el-button type="primary" icon="edit"   @click="CSclick"   class="bt"   title="库存测试">库存测试</el-button> -->
 			</el-form-item>
           </el-form>
         </div> 
@@ -199,6 +198,8 @@
 				  <el-table-column align="left" label="投料单位" prop="投料单位"  width="90"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
 				  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/>
+				  <el-table-column align="left" label="建档用户" prop="ID"  width="160"/>
+				  <el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
                 </el-table>
               </el-tab-pane>
 
@@ -213,14 +214,22 @@
                           @row-dblclick="mlupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="mltableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
-                  <el-table-column align="left" label="面料" prop="面料"  width="240"/>
+                  <!-- <el-table-column align="left" label="面料" prop="面料"  width="240"/>
                   <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="210"/>
                   <el-table-column align="left" label="领用数量" prop="领用数量"  width="100" />
                   <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="160"/>
+                  <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="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="150"/>
+				  <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>
               </el-tab-pane>
             </el-tabs>
@@ -1032,33 +1041,23 @@
       <el-dialog v-model="mlinventoryVisible" :before-close="mlcloseDialog" title="面料库存出入库记录" 
 					style="margin-top: 40px" height="300px" width="1000px" destroy-on-close>
 			  <el-form :model="mlformdata" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
-          <el-table
-			  ref="table"
-			  highlight-current-row
-			  show-overflow-tooltip
-			  border
-			  :data="historytableData"
-			  :row-style="{ height: '25px' }"
-			  :cell-style="{ padding: '0px' }"
-			  :header-row-style="{ height: '20px' }"
-			  :header-cell-style="{ padding: '0px' }"
-			  style="width: 100%;height: 75vh;" >
-		
-		  <el-table-column label="订单编号" prop="订单编号"width="110" ></el-table-column>
-		  <el-table-column label="面料" prop="面料" width="110"></el-table-column>
-		  <el-table-column label="颜色" prop="颜色" width="110"></el-table-column>
-		  <el-table-column label="入库数量" prop="入库数量" width="110"></el-table-column>
-		  <el-table-column label="出库数量" prop="出库数量" width="110"></el-table-column>
-		  <el-table-column label="领料部门" prop="领料部门" width="110"></el-table-column>
-		  <el-table-column label="领料时间" prop="领料时间" width="110"></el-table-column>
-		</el-table>
+				<el-descriptions class="margin-top" :column="2"  :size="size" border>
+			<el-descriptions-item label="订单编号" class="ddh">{{ mlkcdata['订单编号'] }}</el-descriptions-item>
+			<el-descriptions-item label="客户编号">{{ mlkcdata['客户编号'] }}</el-descriptions-item>
+			<el-descriptions-item label="生产款号">{{ mlkcdata['生产款号'] }}</el-descriptions-item>
+			<el-descriptions-item label="款式">{{ mlkcdata['款式'] }}</el-descriptions-item>
+			<el-descriptions-item label="物料名称">{{ mlkcdata['物料名称'] }}</el-descriptions-item>
+			<el-descriptions-item label="投料单位">{{ mlkcdata['投料单位'] }}</el-descriptions-item>
+			<el-descriptions-item label="库存总量">{{ mlkcdata['库存总量'] }}</el-descriptions-item>
+			<el-descriptions-item label="面料结余">{{ mlkcdata['面料结余'] }}</el-descriptions-item>
+		   </el-descriptions>
 				<br>
 			  </el-form>
 			  <template #footer>
 				  <br>
 				<div class="dialog-footer">
-				  <el-button @click="mlcloseDialog">取 消</el-button>
-				  <el-button type="primary"  @click="mlenterDialog">确 定</el-button>
+				  <el-button type="primary" @click="mlcloseDialog">关 闭</el-button>
+				  <!-- <el-button type="primary"  @click="mlenterDialog">确 定</el-button> -->
 				</div>
 			  </template>
 			</el-dialog>
@@ -1107,7 +1106,7 @@ import * as XLSX from 'xlsx';
 import jsPDF from 'jspdf';
 import {Datalist,WorkOrderList,WorkOrderAdd,PrintListData,
 printDetailAdd,PrintDetailDel,orderDataDel,getWorkOrder,
-getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments,getPonumber,FabricEdit,orderBomList,FabricDetail} from '@/api/mes/job'
+getSuborder,PrintDataEdit,WorkOrderEdit,gdAnnexAdd,upload,OrderAttachments,getPonumber,FabricEdit,orderBomList,FabricDetail,fabricList} from '@/api/mes/job'
 import PrintPage from './components/print.vue'
 import luckyexcelPage from './components/luckyexcel.vue'
 import AddGongYi from './components/addGongYi.vue'  
@@ -1551,17 +1550,19 @@ const ys_edit_closeDialog = async (row) => {
 };
 const mlinventoryVisible = ref(false)
 const historytableData = ref([])
+const mlkcdata = ref([])
 //双击面料库存
 const mlupdateCompanyFunc = async (row) => {
+  // 打开面料库存弹窗
   mlinventoryVisible.value = true;
+  console.log(row)
+  mlkcdata.value = row
+  console.log(mlkcdata.value)
 }
 
-//库存测试
-const CSclick = async (row) => {
-  mlinventoryVisible.value = true;
-}
 
-//技术附件弹窗取消
+
+//面料库存弹窗取消
 const mlcloseDialog = () => {
   mlinventoryVisible.value = false
 }
@@ -2185,23 +2186,25 @@ const add_bomenterDialog = async() => {
 
 
 // 一键确定
-const res_bomenterDialog = async () => {
-	const rawValueArray = resbomtableData._rawValue;
-	const formattedData = rawValueArray
-	.filter(item => item.物料名称 !== null && item.物料名称 !== "")  // 过滤掉物料名称为空的行
-	.map(item => {
-	  return {
-		UNIQID: item.UNIQID !== undefined ? item.UNIQID : "",
-		BOM_物料名称: item.物料名称 !== null ? item.物料名称 : "",
-		BOM_计划用量: item.计划用料 !== null ? item.计划用料 : "",
-		BOM_标准用量: item.定额用料 !== null ? item.定额用料 : "",
-		BOM_实际用量: item.裁床实际用料 !== null ? item.裁床实际用料 : "",
-		Bom_领用数量: item.裁床领用面料 !== null ? item.裁床领用面料 : "",
-		BOM_退还数量: item.裁床退回仓库面料 !== null ? item.裁床退回仓库面料 : "",
-		BOM_desc: item.备注 !== null ? item.备注 : ""
-	  }
-	});
-	console.log(formattedData);
+const res_bomenterDialog = async () => {
+	const rawValueArray = resbomtableData._rawValue;
+	const formattedData = rawValueArray
+	.filter(item => item.物料名称 !== null && item.物料名称 !== "")  // 过滤掉物料名称为空的行
+	.map(item => {
+	  return {
+		UNIQID: item.UNIQID !== undefined ? item.UNIQID : "",
+		BOM_物料名称: item.物料名称 !== null ? item.物料名称 : "",
+		BOM_计划用量: item.计划用料 !== null ? item.计划用料 : "",
+		BOM_标准用量: item.定额用料 !== null ? item.定额用料 : "",
+		BOM_实际用量: item.裁床实际用料 !== null ? item.裁床实际用料 : "",
+		Bom_领用数量: item.裁床领用面料 !== null ? item.裁床领用面料 : "",
+		BOM_退还数量: item.裁床退回仓库面料 !== null ? item.裁床退回仓库面料 : "",
+		BOM_desc: item.备注 !== null ? item.备注 : "",
+		Sys_ID: _username.value,
+		Sys_rq: currentDate
+	  }
+	});
+	console.log(formattedData);
 
 	const add_FabricEditdata = await FabricEdit(formattedData);
 	if (add_FabricEditdata.code === 0) {
@@ -2250,32 +2253,32 @@ const bombomupdateCompanyFunc = async (row) => {
 }
 
 
-// BOM数据获取
-const _editTestCoefficient = async () => {
-  try {
-    // 获取 BOM 数据
-    const orderBomListdata = await orderBomList({ order: _Gd_gdbh.value });
-    console.log(orderBomListdata);
-
-    // 过滤数据，只保留 UNIQID 相同的项
-    const filteredData = orderBomListdata.data.filter(item => item.UNIQID === UNIQID.value);
-
-    // 处理数据
-    edit_resbomtableData.value = filteredData.map(item => ({
-      物料名称: item.物料名称,
-      计划用料: item.计划用料,
-      定额用料: item.定额用料,
-      裁床实际用料: item.裁床实际用料,
-      裁床领用面料: item.裁床领用面料,
-      裁床退回仓库面料: item.裁床退回仓库面料,
-      备注: item.备注,
-      UNIQID: item.UNIQID // 保留 UNIQID 以便后续使用
-    }));
-
-  } catch (error) {
-    console.error(error);
-  }
-};
+// BOM数据获取
+const _editTestCoefficient = async () => {
+  try {
+    // 获取 BOM 数据
+    const orderBomListdata = await orderBomList({ order: _Gd_gdbh.value });
+    console.log(orderBomListdata);
+
+    // 过滤数据，只保留 UNIQID 相同的项
+    const filteredData = orderBomListdata.data.filter(item => item.UNIQID === UNIQID.value);
+
+    // 处理数据
+    edit_resbomtableData.value = filteredData.map(item => ({
+      物料名称: item.物料名称,
+      计划用料: item.计划用料,
+      定额用料: item.定额用料,
+      裁床实际用料: item.裁床实际用料,
+      裁床领用面料: item.裁床领用面料,
+      裁床退回仓库面料: item.裁床退回仓库面料,
+      备注: item.备注,
+      UNIQID: item.UNIQID // 保留 UNIQID 以便后续使用
+    }));
+
+  } catch (error) {
+    console.error(error);
+  }
+};
 
 
 //确定
@@ -2292,7 +2295,9 @@ const editres_bomenterDialog = async () => {
 		BOM_实际用量: item.裁床实际用料 !== null ? item.裁床实际用料 : "",
 		Bom_领用数量: item.裁床领用面料 !== null ? item.裁床领用面料 : "",
 		BOM_退还数量: item.裁床退回仓库面料 !== null ? item.裁床退回仓库面料 : "",
-		BOM_desc: item.备注 !== null ? item.备注 : ""
+		BOM_desc: item.备注 !== null ? item.备注 : "",
+		Sys_ID: _username.value,
+		Sys_rq: currentDate
 	  }
 	});
 	console.log(formattedData);
@@ -2354,10 +2359,8 @@ const tableRowClick = async (row) => {
         const PrintListDatas = await PrintListData({order:_Gd_gdbh.value})
         const jsOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'技术附件'})
         const ddOrderAttachments = await OrderAttachments({order:_Gd_gdbh.value,desc:'订单资料附件'})
-		
 		const orderBomListdata = await orderBomList({order:_Gd_gdbh.value});
-		bomtableData.value = orderBomListdata.data
-		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
+		const fabricListdata = await fabricList({order:_Gd_gdbh.value});
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0
@@ -2380,9 +2383,12 @@ const tableRowClick = async (row) => {
           jstableData.splice(0,jsOrderAttachments.data.length,...jsOrderAttachments.data);
           ddtableData.splice(0,ddOrderAttachments.data.length,...ddOrderAttachments.data);
         }
-    //BOM资料
-
-    //面料库存
+    	//BOM资料
+		bomtableData.value = orderBomListdata.data
+		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
+    	//面料库存
+		mltableData.value = fabricListdata.data
+		mltableData.splice(0,fabricListdata.data.length,...fabricListdata.data);//面料库存表格数据
       } catch (error) {
         console.error(error);
     }