优化

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -194,15 +194,18 @@
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID">
                  <el-table-column type="selection" width="30" />
                   <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="100"/>
+				  <el-table-column align="left" label="款式" prop="款式"  width="90"/> -->
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <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="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="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="60"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
-				  <el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
+				  <el-table-column align="left" label="更新用户" prop="ID"  width="130"/>
 				  <el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
 				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
                 </el-table>
@@ -221,14 +224,18 @@
                           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 type="selection" width="30" /> -->
+				  <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="90"/>
+				  <el-table-column align="left" label="颜色" prop="颜色"  width="90"/>
                   <el-table-column align="left" label="物料编号" prop="BOM_物料编码"  width="180"/>
 				  <el-table-column align="left" label="物料名称" prop="物料名称"  width="180"/>
-				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
-                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="115" />
-				  <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/>
+                  <!-- <el-table-column align="left" label="计划用料" prop="计划用料"  width="115" /> -->
+				  <!-- <el-table-column align="left" label="计划门幅" prop="计划门幅"  width="115"/> -->
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
 				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
-				  <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="115"/>
+				  <!-- <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="115"/> -->
                   <el-table-column align="left" label="裁床实际用料" prop="裁床实际用料"  width="120"/>
                   <el-table-column align="left" label="裁床领用面料" prop="裁床领用面料"  width="120"/>
 				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="140"/>
@@ -605,7 +612,7 @@
 		</el-dialog>		
 		
 		<!-- 修改BOM资料 -->
-		<el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="80%" top="2%" destroy-on-close>
+		<el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="60%" top="2%" destroy-on-close>
 			<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>
@@ -643,7 +650,7 @@
 		</el-dialog>
 		
 		<!-- 批量修改BOM资料弹窗 -->
-		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量修改BOM资料" width="80%" top="1%" destroy-on-close>
+		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量修改BOM资料" width="60%" top="1%" destroy-on-close>
 		  
 		   <el-descriptions class="margin-top" :column="4"  :size="size" border>
 			<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
@@ -1710,20 +1717,11 @@ const add_gdscgdformData = reactive({
   合并: false,
 });
 
-let isClickable = true;
+
 const add_gddialogFormVisible = ref(false)
 //点击新增订单资料按钮
 const addgd_onclick = async () => {
-	if (!isClickable) {
-        return;
-    }
-    // 禁用按钮
-    isClickable = false;
 
-    // 设置定时器，2 秒后重新启用按钮
-    setTimeout(() => {
-        isClickable = true;
-    }, 2000);
 
   console.log("用户信息", _username.value);
   // 判断客户代号是否为空
@@ -1739,16 +1737,16 @@ const addgd_onclick = async () => {
 	add_gdscgdformData['客户编号'] = _Gd_khdh.value
 	add_gdscgdformData['Sys_id'] = _username.value 
 	add_gdscgdformData['制单日期'] = currentDates
-	add_gdscgdformData['生产款号'] = ''
-	add_gdscgdformData['款式'] = ''
-	add_gdscgdformData['落货日期'] = ''
-	add_gdscgdformData['面料'] = ''
-	add_gdscgdformData['要求'] = ''
-	add_gdscgdformData['船样描述'] = ''
-	add_gdscgdformData['船样合计'] = ''
-	add_gdscgdformData['箱唛要求'] = ''
-	add_gdscgdformData['粘衬'] = ''
-	add_gdscgdformData['订单数量'] = ''
+	// add_gdscgdformData['生产款号'] = ''
+	// add_gdscgdformData['款式'] = ''
+	// add_gdscgdformData['落货日期'] = ''
+	// add_gdscgdformData['面料'] = ''
+	// add_gdscgdformData['备注'] = ''
+	// add_gdscgdformData['船样描述'] = ''
+	// add_gdscgdformData['船样合计'] = ''
+	// add_gdscgdformData['箱唛要求'] = ''
+	// add_gdscgdformData['粘衬'] = ''
+	// add_gdscgdformData['订单数量'] = ''
 	// add_gdscgdformData['合并'] = false
 }
 
@@ -1761,8 +1759,20 @@ const deleteRow = (index) => {
 	zsglddtableData.value.splice(index, 1);
 }
 
+let isClickable = true;
 //新增工单资料确定
 const add_gdenterDialog = async ()=>{
+	if (!isClickable) {
+        return;
+    }
+    // 禁用按钮
+    isClickable = false;
+
+    // 设置定时器，2 秒后重新启用按钮
+    setTimeout(() => {
+        isClickable = true;
+    }, 2000);
+	
 	// 定义需要校验的字段和对应的提示信息
 	const fields = [
 	  { key: '款式', message: '款式不能为空' },
@@ -1837,7 +1847,7 @@ const add_gdenterDialog = async ()=>{
 		add_gddialogFormVisible.value = false;
 		ElMessage({type: 'success',message: '新增成功'})
 		//新增后刷新表格，保证表格显示最新数据
-		const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:1,limit:1});
+		const WorkListdata = await WorkOrderList({search:_Gd_khdh.value,page:1,limit:50});
 		tableData.value=WorkListdata.data.data
 	} else {
 		ElMessage({ type: 'error',message: '新增失败'})
@@ -2327,10 +2337,10 @@ const resbom_tableColumns = ref(
 	  { label: '计划门幅', prop: '计划门幅', width: '130' },
 	  { label: '定额用料', prop: '定额用料', width: '130' },
 	  { label: '定额门幅', prop: '定额门幅', width: '130' },
-	  { label: '实际门幅', prop: '实际门幅', width: '130' },
-	  { label: '裁床实际用料', prop: '裁床实际用料', width: '130' },
-	  { label: '裁床领用面料', prop: '裁床领用面料', width: '130' },
-	  { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '170' },
+	//   { label: '实际门幅', prop: '实际门幅', width: '130' },
+	//   { label: '裁床实际用料', prop: '裁床实际用料', width: '130' },
+	//   { label: '裁床领用面料', prop: '裁床领用面料', width: '130' },
+	//   { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '170' },
 	  { label: '备注', prop: '备注', width: '170' },
 	  { label: '投料单位', prop: '投料单位', width: '100' },
     ]
@@ -2519,9 +2529,9 @@ const edit_resbom_tableColumns = ref(
 	  { label: '定额用料', prop: '定额用料', width: '130' },
 	  { label: '计划门幅', prop: '计划门幅', width: '170' },
 	  { label: '定额门幅', prop: '定额门幅', width: '170' },
-	  { label: '裁床实际用料', prop: '裁床实际用料', width: '130' },
-	  { label: '裁床领用面料', prop: '裁床领用面料', width: '130' },
-	  { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '170' },
+	//   { label: '裁床实际用料', prop: '裁床实际用料', width: '130' },
+	//   { label: '裁床领用面料', prop: '裁床领用面料', width: '130' },
+	//   { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '170' },
 	  { label: '备注', prop: '备注', width: '170' },
 	  { label: '投料单位', prop: '投料单位', width: '100' },
     ]
@@ -2655,16 +2665,16 @@ const tableRowClick = async (row) => {
 		bomtableData.value = orderBomListdata.data
 		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
 		
-		const fabricListdata = await fabricList({ order: _Gd_gdbh.value,});
-		// console.log(fabricListdata)
-		if (fabricListdata.code === 0 && Array.isArray(fabricListdata.data.table)) {
-			// 如果 data 是空数组，表示没有找到相关数据
-			mltableData.splice(0, mltableData.length); // 清空表格数据
-			} else if (fabricListdata.data.table && Array.isArray(fabricListdata.data.table)) {
-			// 如果 data 是数组且不为空，更新表格数据
-			mltableData.splice(0, fabricListdata.data.table.length, ...fabricListdata.data.table);
-			} else {
-		}
+        const fabricListdata = await fabricList({ order: _Gd_gdbh.value });
+        console.log("fabricListdata:", fabricListdata); // 打印接口返回的数据
+
+        if (fabricListdata.code === 0 && Array.isArray(fabricListdata.data.table)) {
+            // 如果 data.table 是数组且不为空，更新表格数据
+            mltableData.splice(0, mltableData.length, ...fabricListdata.data.table);
+        } else {
+            // 如果 data.table 为空或无效，清空表格数据
+            mltableData.splice(0, mltableData.length);
+        }
 		
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){