first commit

src/view/performance/chukubaogong.vue

@@ -43,7 +43,7 @@
   </div>
   
   <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;"  destroy-on-close>
-	<div class="dialog-footer" style="margin-top: 5px;">
+	<div class="dialog-footer" style="margin: 0px;">
 		<el-input v-model="add_lysearchInfo" placeholder="请扫描订单号或输入生产款号进行出库领料"
 			@keyup.enter="add_lyonSubmit" id="searchInput" 
 			style="width: 340px;height: 50px;margin-left: 10px;">
@@ -53,22 +53,27 @@
 		<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> -->
 	</div>
-	<el-divider content-position="left">
-		<span style="font-size: 18px;color:red;font-weight: bold;margin-left: 20px;">绿色部分可进行填写</span>
-	</el-divider>
+	
+	<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-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="margin-top: 5px;">
   		<el-table ref="paichengRef"
   		          :show-overflow-tooltip="true"
   				  highlight-current-row="true"
 				  :row-style="{ height: '0px' }"  :header-cell-style="{ padding: '0px' }"
 				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-  		          style="width: 100%;height: 25vh" border tooltip-effect="dark"
+  		          style="width: 100%;height: 22vh" border tooltip-effect="dark"
   		          :data="resbomtableData" row-key="ID"
   		          :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)">
-  		        <el-input v-model="row[item.prop]" :clearable="false"
+  		        <el-input v-model="row[item.prop]" :clearable="false" style='height: 30px;'
   		                  :id="`input${idx}${$index}`" @keyup="resbom_handleKeyDown($event, idx, $index, item.prop)"/>
   		      </div>
   		      <div v-else>{{ row[item.prop] }}</div>
@@ -77,31 +82,43 @@
   		</el-table>
   	</div>
 	
-	<el-divider content-position="left">
-		<span style="font-size: 18px;color:red;font-weight: bold;margin-left: 20px;">面料领用页</span>
-	</el-divider>
-  	<div style="margin-top: 5px;">
-    		<el-table ref="paichengRef1"
-    		          :show-overflow-tooltip="true"
-    				  highlight-current-row="true"
-  				  :row-style="{ height: '40px' }"  :header-cell-style="{ padding: '0px' }"
-  				  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-    		          style="width: 100%;height: 45vh" border tooltip-effect="dark"
-    		          :data="FabriccollartableData" row-key="ID"
-    		          :cell-class-name="scfjfpxsCellClass"
-					  @selection-change="FabriccollarhandleSelectionChange">
-					  <!-- <el-table-column type="selection" width="30" /> -->
-    		  <template v-for="(item, idx) in Fabriccollar_tableColumns">
-    		    <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
-    		      <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>
-    		      <div v-else>{{ row[item.prop] }}</div>
-    		    </el-table-column>
-    		  </template>
-    		</el-table>
-    	</div>
+	    <div class="print-container">
+	      <el-divider>
+	        <span class="print-title" style="font-size: 18px;">面料领用页</span>
+	      </el-divider>
+	      <div style="display: flex; justify-content: space-between; margin-bottom: 10px;">
+	        <p style="font-size: 18px;">单号: LY2502240001</p>
+	        <p style="font-size: 18px;">领用日期: 2025-02-24</p>
+	      </div>
+	      <div style="margin-top: 5px;">
+	        <el-table ref="paichengRef1"
+	                  :show-overflow-tooltip="true"
+	                  highlight-current-row="true"
+	                  :row-style="{ height: '30px' }"  
+	                  :header-cell-style="{ padding: '0px' }"
+	                  :cell-style="{ padding: '0px' }" 
+	                  :header-row-style="{ height: '10px' }"
+	                  style="width: 100%; height: 40vh" 
+	                  border 
+	                  tooltip-effect="dark"
+	                  :data="FabriccollartableData" 
+	                  row-key="ID"
+	                  :cell-class-name="scfjfpxsCellClass"
+	                  @selection-change="FabriccollarhandleSelectionChange">
+			  <!-- <el-table-column type="selection" width="45" /> -->
+	          <template v-for="(item, idx) in Fabriccollar_tableColumns">
+	            <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width">
+	              <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>
+	              <div v-else>{{ row[item.prop] }}</div>
+	            </el-table-column>
+	          </template>
+	        </el-table>
+	      </div>
+	    </div>
   </el-dialog>
   
   
@@ -109,14 +126,14 @@
   <!-- 出库退还记录 -->
   <el-dialog v-model="pickingaddvisible" :before-close="()=> pickingaddvisible = false" style="width: 70%; margin: 5% auto; height: 79%;" :title="'出库退还记录'" destroy-on-close>
 	   <div class="dialog-footer" style="bottom: 10px; right: 10px; width: 100%;">
-		 <el-button  type="primary" @click="ckth_closeDialog" style="width: 80px;height: 40px;">取 消</el-button>
+		 <el-button  type="primary" @click="ckth_closeDialog" style="width: 80px;height: 40px;">关 闭</el-button>
 	   </div>
 	   <br>
 		<div>
 			<el-tabs v-model="activeName" @tab-click="handleClick">
               <el-tab-pane label="出库记录"  @click="showTable('出库记录')"  name="first">
                 <el-table ref="multipleTable"
-                          :row-style="{ height: '20px' }"
+                          :row-style="{ height: '30px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }"
                           :show-overflow-tooltip="true"
@@ -136,7 +153,7 @@
 
               <el-tab-pane label="退还记录" @click="showTable('退还记录')" name="second">
                 <el-table ref="multipleTable"
-                          :row-style="{ height: '20px' }"
+                          :row-style="{ height: '30px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }"
                           highlight-current-row="true"
@@ -225,6 +242,10 @@ const add_onSubmit = async ()=>{
 		res_bomdialogFormVisible.value = true
 		_orderid.value = orderSearchdata.data[0]['订单编号']
 		add_searchInfo.value = orderSearchdata.data[0]['订单编号']
+		ddhformData.ddh = orderSearchdata.data[0]['订单编号']
+		ddhformData.kh = orderSearchdata.data[0]['客户编号']
+		ddhformData.sckh = orderSearchdata.data[0]['生产款号']
+		ddhformData.ks = orderSearchdata.data[0]['款式']
 		add_lysearchInfo.value = add_searchInfo.value
 		Reporting_onSubmit()
 	}else{
@@ -238,6 +259,11 @@ const tableRowClick = async (row)=>{
 	add_searchInfo.value = row.订单编号
 	_orderid.value = row.订单编号
 	_kh.value = row.生产款号
+	
+	ddhformData.ddh = row['订单编号']
+	ddhformData.kh = row['客户编号']
+	ddhformData.sckh = row['生产款号']
+	ddhformData.ks = row['款式']
 }
 
 
@@ -246,6 +272,10 @@ const add_lyonSubmit = async ()=>{
 	const orderSearchdata = await orderSearch({search:add_lysearchInfo.value});
 	if(orderSearchdata.data.length === 1){
 		add_lysearchInfo.value = orderSearchdata.data[0]['订单编号']
+		ddhformData.ddh = orderSearchdata.data[0]['订单编号']
+		ddhformData.kh = orderSearchdata.data[0]['客户编号']
+		ddhformData.sckh = orderSearchdata.data[0]['生产款号']
+		ddhformData.ks = orderSearchdata.data[0]['款式']
 	}
 	try {
     const orderBomListdata = await orderBomList({order:add_lysearchInfo.value});
@@ -279,43 +309,43 @@ const ddhformData = reactive({
 });
 const resbom_tableColumns = ref(
     [
-		{ label: '订单编号', prop: '订单编号', width: '110' },
-		{ label: '客户', prop: '客户编号', width: '100' },
-		{ label: '生产款号', prop: '生产款号', width: '150' },
-		{ label: '款式', prop: '款式', width: '150' },
-		{ label: '物料名称', prop: '物料名称', width: '170' },
-		{ label: '计划用料', prop: '计划用料', width: '110' },
+		// { 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: '115' },
 		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
 		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
-		{ label: '入库总量', prop: '入库总量', width: '100' },
-		{ label: '面料结余', prop: '面料结余', width: '110' },
+		{ label: '入库总量', prop: '入库总量', width: '90' },
+		{ label: '面料结余', prop: '面料结余', width: '90' },
 		{ label: '本次领用', prop: '领用', width: '110' },
 		// { label: '备注', prop: '备注', width: '120' },
-		{ label: '投料单位', prop: '投料单位', width: '100' },
-		{ label: 'UNIQID', prop: 'UNIQID', width: '80' },
+		{ label: '投料单位', prop: '投料单位', width: '90' },
+		// { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
 
 const Fabriccollar_tableColumns = ref(
     [
-		{ label: '订单编号', prop: '订单编号', width: '110' },
-		{ label: '客户', prop: '客户编号', width: '100' },
-		{ label: '生产款号', prop: '生产款号', width: '150' },
-		{ label: '款式', prop: '款式', width: '150' },
-		{ label: '物料名称', prop: '物料名称', width: '170' },
-		{ label: '计划用料', prop: '计划用料', width: '110' },
+		{ label: '订单编号', prop: '订单编号', width: '90' },
+		{ label: '客户', prop: '客户编号', width: '90' },
+		{ label: '生产款号', prop: '生产款号', width: '100' },
+		{ label: '款式', prop: '款式', width: '100' },
+		{ label: '物料名称', prop: '物料名称', width: '160' },
+		{ label: '计划用料', prop: '计划用料', width: '105' },
 		{ label: '定额用料', prop: '定额用料', width: '110' },
 		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
 		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
 		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
-		{ label: '入库总量', prop: '入库总量', width: '100' },
-		{ label: '面料结余', prop: '面料结余', width: '110' },
+		{ label: '入库总量', prop: '入库总量', width: '90' },
+		{ label: '面料结余', prop: '面料结余', width: '90' },
 		{ label: '本次领用', prop: '领用', width: '110' },
 		// { label: '备注', prop: '备注', width: '120' },
-		{ label: '投料单位', prop: '投料单位', width: '100' },
-		{ label: 'UNIQID', prop: 'UNIQID', width: '80' },
+		{ label: '投料单位', prop: '投料单位', width: '90' },
+		// { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
 //报工按钮
@@ -326,8 +356,8 @@ const Reporting_onSubmit = async ()=>{
 		add_lysearchInfo.value = add_searchInfo.value
 		res_bomdialogFormVisible.value = true
 		FabriccollartableData.value = []; 
-		const orderBomListlsit = await orderBomList({order:_orderid.value});
-		console.log(orderBomListlsit)
+		// const orderBomListlsit = await orderBomList({order:_orderid.value});
+		// console.log(orderBomListlsit)
 		_TestCoefficient();
 	}
 }
@@ -429,6 +459,7 @@ const print_lingyong = async () => {
 	const filteredData = resbomtableData.value.filter(item => item.领用 && item.领用.trim() !== "");
   // 将过滤后的数据添加到 FabriccollartableData
   FabriccollartableData.value.push(...filteredData);
+  add_lyonSubmit()
 }
 
 // //删除