first commit

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -223,18 +223,13 @@
 				   <!-- <el-table-column type="selection" width="30" /> -->
 					<el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
 					<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="100"/>
-					<el-table-column align="left" label="款式" prop="款式"  width="90"/> -->
 					<el-table-column align="left" label="物料名称" prop="物料名称"  width="210"/>
 					<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="180"/>
-					<el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
-					<el-table-column align="left" label="更新用户" prop="ID"  width="160"/>
+					<el-table-column align="left" label="备注" prop="备注"  width="240"/>
+					<el-table-column align="left" label="更新用户" prop="ID"  width="90"/>
 					<el-table-column align="left" label="更新日期" prop="日期"  width="160"/>
 					<!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
 				  </el-table>
@@ -257,22 +252,17 @@
 					<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="110"/>
-					<el-table-column align="left" label="物料编号" prop="BOM_物料编码"  width="180"/>
+					<el-table-column align="left" label="物料编号" prop="物料编码"  width="220"/>
 					<el-table-column align="left" label="物料名称" prop="物料名称"  width="180"/>
-					<!-- <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="120"/> -->
-					<!-- <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="115"/>
-					<el-table-column align="left" label="面料结余" prop="面料结余"  width="115"/>
-					<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="日期"  width="160"/>
+					<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="60"/>
+					<el-table-column align="left" label="备注" prop="备注"  width="200"/>
+					<el-table-column align="left" label="关联订单" prop="关联订单"  width="200"/>
+					<el-table-column align="left" label="更新用户" prop="Sys_ID"  width="160"/>
+					<el-table-column align="left" label="更新日期" prop="Sys_rq"  width="160"/>
 				  </el-table>
 				</el-tab-pane>
 			  </el-tabs>
@@ -621,16 +611,7 @@
 					<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="90"/> -->
 					<el-table-column align="left" label="单位" prop="投料单位"  width="115"/>
-					<!-- <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>
 				</div>
 			  </el-form>
@@ -902,10 +883,10 @@
 					<el-date-picker v-model="edit_ddformData['Sys_rq']" id='制单日期' disabled style="width: 200px;" type="date" />
 				  </el-form-item>
 				</el-form>
-				<el-button type="primary" @click="edit_Related_fabrics"
+			<!-- 	<el-button type="primary" @click="edit_Related_fabrics"
 							style="width: 160px;height: 45px;font-size: 20px; margin-left: 120px;">
 							  关联订单面料
-				 </el-button>
+				 </el-button> -->
 			  </el-col>
 			</el-row>
 		  
@@ -2510,12 +2491,7 @@ function handleSizeInput(field) {
 		{ 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: '240' },
-	  //   { label: '投料单位', prop: '投料单位', width: '100' },
 	  ]
   )
   //批量修改BOM资料
@@ -2645,7 +2621,9 @@ function handleSizeInput(field) {
 		  '投料单位': '米',
 		  'UNIQID':''
 		};
-		
+		if (!resbomtableData.value || !Array.isArray(resbomtableData.value)) {
+		  resbomtableData.value = []; // 重新初始化
+		}
 		// 将新增的行数据推入到表格数据中
 		resbomtableData.value.push(newRow);
   }

src/view/yunyin/shengchanguanli/yangyipihe.vue

@@ -139,7 +139,7 @@ defineOptions({name: 'Company'})
 const userStore = useUserStore()
 const _username = ref('')
 _username.value = userStore.userInfo.userName + '/' + userStore.userInfo.nickName
-console.log('获取用户名称',_username.value)
+// console.log('获取用户名称',_username.value)
 //全局获取当前日期
 const today = new Date();
 const year = today.getFullYear();
@@ -172,7 +172,6 @@ const currentDates = `${year}-${month}-${day}`;
 const getUnapprovalList = async () => {
   try {
     const UnapprovalListtable  = await UnapprovalList({search:'',page:page.value,limit:pageSize.value});
-	console.log(1484,UnapprovalListtable)
 	const workOrderDetaildata1 = UnapprovalListtable.data.table
 	tableData1.splice(0,tableData1.length,...workOrderDetaildata1);
 	total.value = UnapprovalListtable.data.total
@@ -251,9 +250,9 @@ const handleNodeClick = async (node) => {
 	searchInfo.value = '';  // 清空搜索信息
 
 	if(node.label === '客户编号'){
-		console.log(node.label)
+		// console.log(node.label)
 	}else{
-		console.log(node.label)
+		// console.log(node.label)
 		
 		const workOrderDetaildata2 = [
 			{
@@ -328,7 +327,7 @@ const _Uniqid = ref('');
 const _Sys_id = ref('');
 const multipleTable = ref(null);
 const handleSelectionChange = (selection, type) => {
-    console.log(selection);  
+    // console.log(selection);  
 	if(selection.length >= 1){
 		table_Selection.value = true
 		 // 提取 Uniqid  
@@ -345,8 +344,8 @@ const handleSelectionChange = (selection, type) => {
 
 //核批通过按钮
 const hptg_onClick = async () => {
-	console.log(_Uniqid.value)
-	console.log(_Sys_id.value)
+	// console.log(_Uniqid.value)
+	// console.log(_Sys_id.value)
 	const Approvals = await Approval({Uniqid:_Uniqid.value,sys_id:userStore.userInfo.nickName});
 	if (Approvals.code === 0) {
 		searchInfo.value = ''
@@ -390,7 +389,7 @@ const handleStatusConfirm = async () => {
 
 //状态更改按钮
 const ztgg_onClick = async () => {
-	console.log(_Uniqid.value)
+	// console.log(_Uniqid.value)
 	dialogVisible.value = true;
 }