first commit

src/view/inventory/ruku.vue

@@ -32,8 +32,9 @@
 				  
 				  <el-table-column fixed="right" label="操作" width="130">
 				    <template #default="{ row, $index }">
-				      <el-button @click="record_deleteRow(row,$index)" type="text" size="small" style="font-size: 16px;padding: 0px;">
-				        查看入库明细
+				      <el-button @click="record_deleteRow(row,$index)" type="success" size="small" 
+					  style="font-size: 16px;padding: 0px;width: 90px;">
+				        查看详情
 				      </el-button>
 				    </template>
 				  </el-table-column>
@@ -89,21 +90,24 @@
   </el-dialog>
   
   <!-- 选择入库弹窗 -->
-  <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destroy-on-close>
+  <el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" style="width: 100%;height: 100%;margin: 0px;padding: 0px;"  destroy-on-close>
 	<div class="dialog-footer" style="margin: 0px;">
 		<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="dj_Dialog"  style="width: 120px; height: 50px;">
+		  添加面料
+		</el-button>
+		<el-button type="primary"  @click="res_bomenterDialog"  style="width: 100px;height: 50px;">一键入库</el-button>
 	</div>
 
-	 <el-divider><span class="print-title" style="font-size: 18px;">面料入库明细</span></el-divider>
+	 <el-divider style='margin: 10px 0px 10px 0px;'><span class="print-title" style="font-size: 18px;">面料入库明细</span></el-divider>
 
 	 <div style="display: flex; gap: 20px; align-items: center;">
 		<!-- 左部分 -->
-		<div>
-			<el-input v-model="add_searchInfo" placeholder="请扫描订单编号或输入生产款号模糊查询"  @input="handleInput"
-				@keyup.enter="add_onSubmit" id="details_searchInput"  style="width: 470px;height: 50px;">
+		<div style="">
+			<el-input v-model="add_searchInfo" placeholder="请扫描订单编号或输入生产款号查询"  @input="handleInput"
+				@keyup.enter="add_onSubmit" id="details_searchInput"  style="width: 470px;height: 50px;margin-left: 10px;">
 			  </el-input>
-			<el-table ref="multipleTable" style="width: 100%;height: 47vh" tooltip-effect="dark"
+			<el-table ref="multipleTable" style="width: 100%;height: 40vh" tooltip-effect="dark"
                       :row-style="{ height: '40px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="restableData"  border row-key="ID" size="small"  
@@ -111,47 +115,52 @@
                       highlight-current-row="true"  @row-dblclick="updateCompanyFunc"
                       @row-click="tableRowClick" :show-overflow-tooltip="true"
                       @selection-change="handleSelectionChange">
-			        <!-- <el-table-column type="selection" width="80" /> -->
-			  <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="80" />
+			  <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="120" />	 
+			  <el-table-column  align="left" label="颜色" prop="颜色" width="100" />
             </el-table>
 		</div>
 
 		<!-- 右部分 -->
-		<div>
-			<el-descriptions class="margin-top" :column="5"  :size="size" border>
-				<el-descriptions-item label="订单编号">{{ 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-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
-				<el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
-				<el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
-				<el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
-				<el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item>
-				<el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item>
-				<el-descriptions-item label="定额用料">{{ mianliaotabData.定额用料 }}</el-descriptions-item>
-				<el-descriptions-item label="定额门幅">{{ mianliaotabData.定额门幅 }}</el-descriptions-item>
-				<el-descriptions-item label="入仓总数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
-				<el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
-				<el-descriptions-item label="领用数量">{{ mianliaotabData.领用数量 }}</el-descriptions-item>
+		<div style="position: relative;width: 1300px;height: 310px;">
+			<el-descriptions class="margin-top" :column="1" :size="size" border>
 				<el-descriptions-item label="关联订单">{{ mianliaotabData.关联订单 }}</el-descriptions-item>
-				<el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
-				<el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item>
-
-				<el-descriptions-item label="入库数量">
-					<el-input v-model="mianliaotabData.入库数量" placeholder="" style="margin: 0; width: 100px;"/>
-				</el-descriptions-item>
-
-				<el-descriptions-item label="实际门幅">
-					<el-input v-model="mianliaotabData.实际门幅" placeholder="" style="margin: 0; width: 100px	;"/>
-				</el-descriptions-item>
-
 			</el-descriptions>
-			
+		  <el-descriptions class="margin-top" :column="4" :size="size" border>
+		    <el-descriptions-item label="批次号">{{ mianliaotabData.批次号 }}</el-descriptions-item>
+			<el-descriptions-item label="关联号">{{ mianliaotabData.关联号 }}</el-descriptions-item>
+		    <el-descriptions-item label="订单编号">{{ ddhformData['ddh'] }}</el-descriptions-item>
+		    <el-descriptions-item label="客户">{{ ddhformData['kh'] }}</el-descriptions-item>
+		    <!-- <el-descriptions-item label="款式">{{ ddhformData['ks'] }}</el-descriptions-item> -->
+		    <el-descriptions-item label="物料编号">{{ mianliaotabData.物料编号 }}</el-descriptions-item>
+			<el-descriptions-item label="生产款号">{{ ddhformData['sckh'] }}</el-descriptions-item>
+			<el-descriptions-item label="颜色">{{ mianliaotabData.颜色 }}</el-descriptions-item>
+		    <el-descriptions-item label="物料名称">{{ mianliaotabData.物料名称 }}</el-descriptions-item>
+		    <!-- <el-descriptions-item label="计划用料">{{ mianliaotabData.计划用料 }}</el-descriptions-item> -->
+		    <!-- <el-descriptions-item label="计划门幅">{{ mianliaotabData.计划门幅 }}</el-descriptions-item> -->
+			<el-descriptions-item label="单位">{{ mianliaotabData.单位 }}</el-descriptions-item>
+		    <el-descriptions-item label="库存数量">{{ mianliaotabData.库存数量 }}</el-descriptions-item>
+			<el-descriptions-item label="累计入库数量">{{ mianliaotabData.入仓总数量 }}</el-descriptions-item>
+		    <!-- <el-descriptions-item label="领用数量">{{ mianliaotabData.领用数量 }}</el-descriptions-item> -->
+		  </el-descriptions>
+		  
+		<el-descriptions class="margin-top" :column="4" :size="size" border>
+			<el-descriptions-item label="定额用料">{{ mianliaotabData.定额用料 }}</el-descriptions-item>
+			<el-descriptions-item label="定额门幅">{{ mianliaotabData.定额门幅 }}</el-descriptions-item>
+			<el-descriptions-item label="实际门幅">
+			  <el-input v-model="mianliaotabData.实际门幅" placeholder="" style="margin: 0; width: 100px;"/>
+			</el-descriptions-item>
+			<el-descriptions-item label="入库数量">
+			  <el-input v-model="mianliaotabData.入库数量" id='rksl' placeholder="" style="margin: 0; width: 100px;"/>
+			</el-descriptions-item>
+		</el-descriptions>
+		
+		<!-- <el-button type="primary" @click="dj_Dialog" style="width: 120px; height: 50px; position: absolute; bottom: 0px; right: 10px;">
+		  添加面料
+		</el-button> -->
 		</div>
-		<el-button type="primary" @click="dj_Dialog"  style="width: 100px;height: 50px;">添加</el-button>
 	</div>
 		<el-divider><span class="print-title" style="font-size: 18px;">面料入库单</span></el-divider>
 		<el-descriptions class="margin-top" :column="3"  :size="size" border>
@@ -161,30 +170,30 @@
 		</el-descriptions>
 		<br>
 	  	<div>
-			<el-table ref="multipleTable" style="width: 100%;height: 20vh" tooltip-effect="dark"
+			<el-table ref="multipleTable" style="width: 100%;height: 25vh" tooltip-effect="dark"
                       :row-style="{ height: '40px' }"  :header-cell-style="{ padding: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                       :data="danjutableData"  border row-key="ID" size="small"  
-					  :cell-class-name="tableDataCellClass"
+					  :cell-class-name="danju_tableDataCellClass"
                       highlight-current-row="true"  :show-overflow-tooltip="true">
 			        <!-- <el-table-column type="selection" width="80" /> -->
-			  <el-table-column  align="left" label="物料编号" prop="物料编号" width="160" />	 
-			  <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="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="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="90"/>
-			  <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="60"/>
-			  <el-table-column fixed="right" label="操作" width="120">
+				<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="160" />	 
+				<el-table-column  align="left" label="物料名称" prop="物料名称" width="130" />
+				<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="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="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="300"/>
+				<el-table-column fixed="right" label="操作" width="120">
 				    <template #default="{ row, $index }">
 				      <el-button @click="deleteRow($index)" type="text" size="small">
 				        移除
@@ -259,7 +268,7 @@ import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
 import {getInputDetail,
 inputStash,
-InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList} from '@/api/mes/job'
+InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList,ReceiptDetail} from '@/api/mes/job'
 import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
 import { useUserStore } from '@/pinia/modules/user'
 // import { get } from 'scriptjs';
@@ -370,6 +379,13 @@ const mianliaotabData = ref({
 });
 //表格行点击
 const tableRowClick = async (row) => {
+	setTimeout(() => {
+		  const inputElement = document.getElementById('rksl');
+		  if (inputElement) {
+			  inputElement.focus();		
+		  }
+	}, 100);//100毫秒
+	
     add_searchInfo.value = row.订单编号;
     _orderid.value = row.订单编号;
     _kh.value = row.生产款号;
@@ -424,8 +440,9 @@ const danjutableData = ref([]); // 使用 ref 定义响应式数组
 //添加按钮
 const dj_Dialog = () => {
     if (mianliaotabData.value) {
-        // 使用 .value 访问 danjutableData 的实际值
+        // 使用 .value 访问 danjutableData 的实际值ddhformData
         danjutableData.value.push({ ...mianliaotabData.value });
+		
     } else {
         console.error('mianliaotabData 为空，无法添加到 danjutableData');
     }
@@ -672,8 +689,8 @@ const record_deleteRow = async (row) => {
 	recorddialogFormVisible.value = true
 	rdetailstableData.splice(0,rdetailstableData.length);
 	
-	const FabricDetaillists = await FabricDetaillist({order:row['订单编号']});
-	rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['入库记录']);
+	const FabricDetaillists = await ReceiptDetail({receipt:row['出库单']});
+	rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data);
 }