first commit

src/view/performance/chukubaogong.vue

@@ -468,7 +468,7 @@ const res_bomenterDialog = async() => {
 	    rq: currentDate,
 	    name: "出库",
 		sys_id: _username.value,
-		// receipt_number:
+		receipt_number:danhao.value,
 		recipient:linguser.value
 	  }
 	});

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -189,15 +189,19 @@
                           @row-dblclick="bombomupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
 <!--                  <el-table-column type="selection" width="30" />-->
-                  <!-- <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/> -->
+                  <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <el-table-column align="left" label="计划用料" prop="计划用料"  width="170" />
-                  <el-table-column align="left" label="定额用料" prop="定额用料"  width="170"/>
-                  <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="90"/>
+				  <el-table-column align="left" label="门封" prop="门封"  width="80"/>
+                  <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="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="85"/>
 				  <el-table-column align="left" label="备注" prop="备注"  width="180"/>
+				  <el-table-column align="left" label="日期" prop="日期"  width="160"/>
 				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
                 </el-table>
               </el-tab-pane>
@@ -517,7 +521,7 @@
 		
 		<!-- 修改BOM资料 -->
 		<el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="80%" top="2%" destroy-on-close>
-			<el-descriptions class="margin-top" :column="2"  :size="size" border>
+			<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>
 				<el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
@@ -549,34 +553,19 @@
 			</div>
 			<div class="dialog-footer" style="text-align: right;margin-top: 5px;">
 			  <el-button @click="editres_bomcloseDialog">取 消</el-button>
-			  <el-button type="primary"  @click="editres_bomenterDialog">一键修改</el-button>
+			  <el-button type="primary"  @click="editres_bomenterDialog">修改</el-button>
 			</div>
 		</el-dialog>
 		
 		<!-- 批量修改BOM资料弹窗 -->
 		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量修改BOM资料" width="70%" top="1%" destroy-on-close>
 		  
-		   <el-descriptions class="margin-top" :column="2"  :size="size" border>
+		   <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>
 			<el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
 			<el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item>
 		   </el-descriptions>
-		
-		<!-- <div style="width: 100%; height: 60px; padding: 0px; margin: 0px 0px 0px 0px; display: flex; align-items: center;">
-		    <el-form-item label="订单编号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-		      <el-input v-model="ddhformData['ddh']" disabled style="width: 170px;"/>
-		    </el-form-item>
-			<el-form-item label="客户 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-			  <el-input v-model="ddhformData['kh']" disabled style="width: 100px;"/>
-			</el-form-item>
-			<el-form-item label="生产款号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-			  <el-input v-model="ddhformData['sckh']" disabled style="width: 200px;"/>
-			</el-form-item>
-			<el-form-item label="款式 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-			  <el-input v-model="ddhformData['ks']" disabled style="width: 200px;"/>
-			</el-form-item>
-		  </div> -->
 		  	
 			<el-divider content-position="left">
 				<el-button type="primary" icon="plus" @click="add_bomenterDialog">新增一行</el-button>
@@ -594,7 +583,7 @@
 				          :cell-class-name="scfjfpxsCellClass">
 				  <template v-for="(item, idx) in resbom_tableColumns">
 				    <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
-				      <div v-if="['物料名称', '计划用料', '定额用料', '裁床实际用料', '备注'].includes(item.prop)">
+				      <div v-if="['物料名称', '计划用料', '定额用料','门封', '备注'].includes(item.prop)">
 				        <el-input v-model="row[item.prop]" :clearable="false"
 				                  :id="`input${idx}${$index}`" @keyup="resbom_handleKeyDown($event, idx, $index, item.prop)"/>
 				      </div>
@@ -2083,14 +2072,14 @@ const ddhformData = reactive({
 const resbom_tableColumns = ref(
     [
       { label: '物料名称', prop: '物料名称', width: '170' },
-      { 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' },
-	  // { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
 //修改BOM资料按钮
@@ -2121,6 +2110,7 @@ const _TestCoefficient = async ()=>{
 	  item.裁床领用面料 = item.裁床领用面料;
 	  item.裁床退回仓库面料 = item.裁床退回仓库面料;
 	  item.备注 = item.备注;
+	  item.投料单位 = "米";
 	  // item.UNIQID = item.UNIQID;
       return item
     });
@@ -2128,37 +2118,37 @@ const _TestCoefficient = async ()=>{
     console.error(error);
   }
 }
-// const resbom_handleKeyDown = (event, x, y, prop) => {
-//   const currentElement = document.getElementById(`input${x}${y}`);
-//   if (currentElement === null && currentElement === undefined) return
-//   let move = 0
-//   switch (event.keyCode) {
-//     case 13: // Enter
-//     case 40: // 向下箭头
-//       if (y < resbomtableData.value.length )
-//         document.getElementById(`input${x}${y + 1}`).focus();
-//       break;
-//     case 38: // 向上箭头
-//       if ( y > 0) {
-//         document.getElementById(`input${x}${y - 1}`).focus();
-//       }
-//       break;
-//     case 39: // 向左箭头
-//       if (x >= 0 && x <=6) {
-//         move = x + 1
-//       }
-//       document.getElementById(`input${move}${y}`).focus();
-//       break;
-//     case 37: // 向右箭头
-//       if (x = 0  && x <=6) {
-//         move = x - 1
-//       }
-//       document.getElementById(`input${move}${y}`).focus();
-//       break;
-//     default:
-//       break;
-//   }
-// }
+const resbom_handleKeyDown = (event, x, y, prop) => {
+  const currentElement = document.getElementById(`input${x}${y}`);
+  if (currentElement === null && currentElement === undefined) return
+  let move = 0
+  switch (event.keyCode) {
+    case 13: // Enter
+    case 40: // 向下箭头
+      if (y < resbomtableData.value.length )
+        document.getElementById(`input${x}${y + 1}`).focus();
+      break;
+    case 38: // 向上箭头
+      if ( y > 0) {
+        document.getElementById(`input${x}${y - 1}`).focus();
+      }
+      break;
+    case 39: // 向左箭头
+      if (x >= 0 && x <=6) {
+        move = x + 1
+      }
+      document.getElementById(`input${move}${y}`).focus();
+      break;
+    case 37: // 向右箭头
+      if (x = 0  && x <=6) {
+        move = x - 1
+      }
+      document.getElementById(`input${move}${y}`).focus();
+      break;
+    default:
+      break;
+  }
+}
 //质检废品系数颜色
 const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (
@@ -2183,7 +2173,7 @@ const add_bomenterDialog = async() => {
 	    '裁床领用面料': '',
 	    '裁床退回仓库面料': '',
 	    '备注': '',
-	    '投料单位': ''
+	    '投料单位': '米'
 	  };
 	  
 	  // 将新增的行数据推入到表格数据中
@@ -2191,7 +2181,7 @@ const add_bomenterDialog = async() => {
 }
 
 
-// 一键确定
+//修改
 const res_bomenterDialog = async () => {
 	const rawValueArray = resbomtableData._rawValue;
 	const formattedData = rawValueArray
@@ -2205,7 +2195,11 @@ const res_bomenterDialog = async () => {
 		BOM_实际用量: item.裁床实际用料 !== null ? item.裁床实际用料 : "",
 		Bom_领用数量: item.裁床领用面料 !== null ? item.裁床领用面料 : "",
 		BOM_退还数量: item.裁床退回仓库面料 !== null ? item.裁床退回仓库面料 : "",
-		BOM_desc: item.备注 !== null ? item.备注 : ""
+		BOM_desc: item.备注 !== null ? item.备注 : "",
+		BOM_门封: item.门封 !== null ? item.门封 : "",
+		BOM_投料单位: "米",
+		Sys_ID: userStore.userInfo.nickName,
+		Sys_rq: currentDate
 	  }
 	});
 	console.log(formattedData);
@@ -2234,15 +2228,14 @@ const edit_resbomtableData = ref([]);
 const edit_resbom_tableColumns = ref(
     [
       { label: '物料名称', prop: '物料名称', width: '170' },
-      { label: '计划用料', prop: '计划用料', width: '170' },
+      { label: '计划用料', prop: '计划用料', width: '130' },
+	  { 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: '170' },
 	  { label: '投料单位', prop: '投料单位', width: '100' },
-	  // { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
 
@@ -2276,7 +2269,9 @@ const _editTestCoefficient = async () => {
       裁床实际用料: item.裁床实际用料,
       裁床领用面料: item.裁床领用面料,
       裁床退回仓库面料: item.裁床退回仓库面料,
-      备注: item.备注,
+      备注: item.备注,
+	  门封: item.门封,
+	  投料单位 : "米",
       UNIQID: item.UNIQID // 保留 UNIQID 以便后续使用
     }));
 
@@ -2286,7 +2281,7 @@ const _editTestCoefficient = async () => {
 };
 
 
-//确定
+//一键修改
 const editres_bomenterDialog = async () => {
 	const rawValueArray = edit_resbomtableData._rawValue;
 	const formattedData = rawValueArray
@@ -2300,7 +2295,11 @@ 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.备注 : "",
+		BOM_门封: item.门封 !== null ? item.门封 : "",
+		BOM_投料单位: "米",
+		Sys_ID: userStore.userInfo.nickName,
+		Sys_rq: currentDate
 	  }
 	});
 	console.log(formattedData);
@@ -2840,7 +2839,7 @@ const jsfjenterDialog = () => {
   left: 30%;
 }
 ::v-deep(.el-descriptions__table tbody tr .is-bordered-label){
-	width: 30px;
+	width: 40px;
 }
 ::v-deep(.el-descriptions__table tbody tr .el-descriptions__content){
 	width: 120px;