first commit

src/view/performance/caiqiebaogong.vue

@@ -775,16 +775,23 @@ const ddhformData = reactive({
 });
 const resbom_tableColumns = ref(
     [
-      { label: '物料名称', prop: '物料名称', width: '200' },
-      { label: '计划用料', prop: '计划用料', width: '110' },
-	  { label: '定额用料', prop: '定额用料', width: '90' },
-	  { label: '裁床实际用料', prop: '裁床实际用料', width: '120' },
-	  { label: '裁床领用面料', prop: '裁床领用面料', width: '120' },
-	  { label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '160' },
-	  { label: '退还', prop: '退还', width: '110' },
-	  // { label: '备注', prop: '备注', width: '120' },
-	  { label: '投料单位', prop: '投料单位', width: '100' },
-	  // { label: 'UNIQID', prop: 'UNIQID', width: '80' },
+		// { label: '订单编号', prop: '订单编号', width: '90' },
+		// { label: '客户', prop: '客户编号', width: '70' },
+		// { label: '生产款号', prop: '生产款号', width: '100' },
+		// { label: '款式', prop: '款式', width: '100' },
+		{ label: '物料名称', prop: '物料名称', width: '160' },
+		{ label: '计划用料', prop: '计划用料', width: '105' },
+		{ label: '定额用料', prop: '定额用料', width: '110' },
+		{ label: '门封', prop: '门封', width: '110' },
+		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
+		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
+		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
+		{ label: '入库总量', prop: '入库总量', width: '90' },
+		{ label: '面料结余', prop: '面料结余', width: '90' },
+		{ label: '退还', prop: '退还', width: '110' },
+		// { label: '备注', prop: '备注', width: '120' },
+		{ label: '投料单位', prop: '投料单位', width: '90' },
+		// { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
 //退还按钮

src/view/performance/chukubaogong.vue

@@ -2,14 +2,14 @@
   <div>
     <layout>
         <div class="gva-table-box">
-			<h1 style="margin: 0%;margin-bottom: 6px;">出库</h1>
+			<h1 style="margin: 0%;margin-bottom: 6px;">出库领用</h1>
 			<el-row :gutter="24" style="margin-bottom: 6px;">
 				  <el-input v-model="add_searchInfo" placeholder="请扫描订单号或输入生产款号进行出库领料"
 				  			  @keyup.enter="add_onSubmit"
 								  id="searchInput" 
 				  			  style="width: 340px;height: 50px;margin-left: 10px;">
 				  			  </el-input>
-				  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">出库</el-button>
+				  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">选择领用</el-button>
 				  <el-button type="primary" icon="reading" @click="details_onSubmit" style="height: 50px;font-size: 20px;">出库退还记录</el-button>
 			</el-row>
 		</div>
@@ -49,13 +49,13 @@
 			style="width: 340px;height: 50px;margin-left: 10px;">
 		</el-input>
 		<el-button type="primary" @click="res_bomcloseDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
-		<el-button type="primary" @click="res_bomenterDialog"  style="width: 100px;height: 50px;">确定领用</el-button>
+		
 		<el-button type="primary" @click="print_lingyong"  style="width: 100px;height: 50px;">增加至领用页</el-button>
-		<!-- <el-button type="primary" @click="del_lingyong"  style="width: 100px;height: 50px;">删除</el-button> -->
+		<!-- <el-button type="primary" @click="del_lingyong"  style="width: 100px;height: 50px;">删除面料领用</el-button> -->
 	</div>
 	
 	<el-divider><span style="font-size: 18px;color:red;font-weight: bold;margin-left: 20px;">绿色部分可进行填写</span></el-divider>
-	<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>
@@ -83,6 +83,7 @@
   	</div>
 	
 	    <div class="print-container">
+			<el-button type="primary" @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键领用</el-button>
 	      <el-divider>
 	        <span class="print-title" style="font-size: 18px;">面料领用页</span>
 	      </el-divider>
@@ -316,6 +317,7 @@ const resbom_tableColumns = ref(
 		{ label: '物料名称', prop: '物料名称', width: '160' },
 		{ label: '计划用料', prop: '计划用料', width: '105' },
 		{ label: '定额用料', prop: '定额用料', width: '110' },
+		{ label: '门封', prop: '门封', width: '110' },
 		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
 		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
 		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
@@ -337,6 +339,7 @@ const Fabriccollar_tableColumns = ref(
 		{ label: '物料名称', prop: '物料名称', width: '160' },
 		{ label: '计划用料', prop: '计划用料', width: '105' },
 		{ label: '定额用料', prop: '定额用料', width: '110' },
+		{ label: '门封', prop: '门封', width: '110' },
 		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
 		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
 		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
@@ -628,7 +631,7 @@ const handleSizeChange = (val) => {
   font-size: 16px; 
 }  
 ::v-deep(.el-descriptions__table tbody tr .is-bordered-label){
-	width: 30px;
+	width: 60px;
 }
 ::v-deep(.el-descriptions__table tbody tr .el-descriptions__content){
 	width: 120px;

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -198,7 +198,7 @@
 				  <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="180"/>
-				  <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/>
+				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
                 </el-table>
               </el-tab-pane>