first commit

src/view/inventory/ruku.vue

@@ -2,11 +2,11 @@
   <div>
     <layout>
 		<el-row :gutter="24" style="margin-bottom: 6px;">
-			  <el-input v-model="records_searchInfo" placeholder="请扫描订单编号或输入生产款号模糊查询"  @input="records_handleInput"
-				@keyup.enter="records_onSubmit" id="searchInput"  style="width: 340px;height: 50px;margin-left: 10px;">
+			  <el-input v-model="records_searchInfo" placeholder="请搜索入库单号、订单编号或生产款号进行查询相关入库记录"  @input="records_handleInput"
+				@keyup.enter="records_onSubmit" id="searchInput"  style="width: 460px;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="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button>
+			  <el-button type="primary" @click="Reporting_onSubmit" style="height: 50px;font-size: 20px;">面料入库</el-button>
+			  <!-- <el-button type="danger"  @click="deldetail_delclick" style="width: 80px;height: 50px;"	v-if="del_details=== true" :disabled="details_Selection === '' "  class="bt"   >删除</el-button> -->
 		</el-row>
       <layout>
 		  
@@ -18,45 +18,28 @@
                           :row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :show-overflow-tooltip="true" highlight-current-row="true"
-						  @row-click="tableclick" @row-dblclick="ysupdateCompanyFunc"
+						  @row-click="Recordclicks" @row-dblclick="Doubleclickrecord"
 						  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
-                          :summary-method="getSummaries" tooltip-effect="dark" :data="rukutableData" row-key="ID" >
-				  <el-table-column   align="center" type="selection" width="40"/>
-				  <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="110"/>
-				  <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="100"/>
-				  <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="100"/>
-				  <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="100"/>
-				  <el-table-column align="left"  label="库存数量" prop="库存数量"  width="100"/>
-			      <el-table-column align="left"  label="面料结余" prop="面料结余"  width="100"/>
-				  <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="120"/>
-			      <el-table-column align="left"  label="入库时间" prop="入库时间"  width="160"/>
-				  <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
-				  <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
+                          :summary-method="getSummaries" tooltip-effect="dark" :data="recordtableData" row-key="ID" >
+				  <!-- <el-table-column   align="center" type="selection" width="40"//> -->
+				  <el-table-column align="left"  label="入库单" prop="出库单"  width="170"/>
+				  <el-table-column align="left"  label="订单编号" prop="订单编号"  width="150"/>
+				  <el-table-column align="left"  label="款号" prop="款号"  width="150"/>
+				  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+				  <el-table-column align="left"  label="单号类型" prop="单号类型"  width="150"/>
+				  <el-table-column align="left"  label="入库人员" prop="操作机台"  width="110"/>
+				  <el-table-column align="left"  label="入库日期" prop="日期"  width="160"/>
+				  
+				  <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>
+				    </template>
+				  </el-table-column>
+				  
                 </el-table>
 			  </el-tab-pane>
-
-              <el-tab-pane label="退还记录" @click="showTable('退还记录')" name="second">
-                <el-table ref="multipleTable"
-                          :row-style="{ height: '30px' }":header-cell-style="{ padding: '0px' }"
-                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                          highlight-current-row="true" :show-overflow-tooltip="true"
-                          :cell-class-name="gysatusCellClass"  :row-class-name="rowClassStyle2"
-                          @row-click="clickybupdate2" @row-dblclick="thupdateCompanyFunc"
-                          style="width: 100%;height: 70vh" border tooltip-effect="dark" :data="thtableData" row-key="ID">
-				  <el-table-column align="left" sortable label="订单编号" prop="订单编号"  width="140"/>
-				  <el-table-column align="left" sortable label="款号" prop="款号"  width="180"/>
-				  <el-table-column align="left" sortable label="数量" prop="数量"  width="105"/>
-                  <el-table-column align="left" sortable label="退还时间" prop="退还时间"  width="160"/>
-                  <el-table-column align="left" sortable label="退还机台" prop="退还机台"  width="160"/>
-                </el-table>
-              </el-tab-pane>
 		   </el-tabs>
             <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
 			</div>
@@ -66,6 +49,45 @@
     </layout>
   </div>
   
+  <!-- 明细数据 -->
+  <el-dialog v-model="recorddialogFormVisible" :before-close="record_bomcloseDialog"  width="100%" style="height: 100%;margin: 0%;padding: 0px 10px 0px 10px;"  destroy-on-close>
+	  <el-button type="primary" @click="record_closeDialog"  style="width: 100px;height: 50px;margin-left: 10px;">关 闭</el-button>
+	  <div class="gva-table-box">
+		<el-tabs v-model="activeName" @tab-click="handleClick">
+		  <el-tab-pane label="入库明细"  name="first">
+			  <el-table ref="multipleTable"
+						:row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
+						:cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+						:show-overflow-tooltip="true" highlight-current-row="true"
+					  @row-click="detailsclicks" @row-dblclick="Doubleclickdetails"
+					  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+						:summary-method="getSummaries" tooltip-effect="dark" :data="rdetailstableData" row-key="ID" >
+			  <!-- <el-table-column   align="center" type="selection" width="40"/> -->
+			  <el-table-column align="left"  label="入库单号" prop="单号"  width="150"/>
+			  <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="140"/>
+			  <el-table-column align="left"  label="款式" prop="款式"  width="120"/>
+			  <el-table-column align="left"  label="物料名称" prop="物料名称"  width="150"/>
+			  <!-- <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="160"/>
+			  </el-table>
+		  </el-tab-pane>
+		 </el-tabs>
+		  <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
+		</div>
+    </div>
+  </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>
 	<div class="dialog-footer" style="margin: 0px;">
@@ -79,7 +101,7 @@
 		<!-- 左部分 -->
 		<div>
 			<el-input v-model="add_searchInfo" placeholder="请扫描订单编号或输入生产款号模糊查询"  @input="handleInput"
-				@keyup.enter="add_onSubmit" id="searchInput"  style="width: 340px;height: 30px;margin-left: 10px;">
+				@keyup.enter="add_onSubmit" id="details_searchInput"  style="width: 470px;height: 50px;">
 			  </el-input>
 			<el-table ref="multipleTable" style="width: 100%;height: 47vh" tooltip-effect="dark"
                       :row-style="{ height: '40px' }"  :header-cell-style="{ padding: '0px' }"
@@ -131,8 +153,7 @@
 		</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-divider><span class="print-title" style="font-size: 18px;">面料入库单</span></el-divider>
 		<el-descriptions class="margin-top" :column="3"  :size="size" border>
 			<el-descriptions-item label="入库单号">{{danhao}}</el-descriptions-item>
 			<el-descriptions-item label="入库日期">{{riqi}}</el-descriptions-item>
@@ -173,15 +194,7 @@
             </el-table>
 		<br>
 		<br>
-		<!-- <div style="display: flex;  align-items: center;">
-			<p style="font-size: 18px;">入库人员:
-				<el-input v-model="chukuren" style="width: 200px;;" disabled/>
-			</p>
-		</div> -->
-		
   	</div>
-
-  
   </el-dialog>
   
 
@@ -193,33 +206,33 @@
 	   </div>
 	   <br>
 		<div>
-                <el-table ref="multipleTable"
-                          :row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
-                          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                          :show-overflow-tooltip="true" highlight-current-row="true"
-						  @row-click="tableclick" @row-dblclick="ysupdateCompanyFunc"
-						  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
-                          :summary-method="getSummaries" tooltip-effect="dark" :data="ruku_detailstableData" row-key="ID" >
-				  <el-table-column   align="center" type="selection" width="40"/>
-				  <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="140"/>
-				  <el-table-column align="left"  label="计划用料" prop="计划用料"  width="100"/>
-				  <el-table-column align="left"  label="定额用料" prop="定额用料"  width="100"/>
-				  <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="100"/>
-				  <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="100"/>
-				  <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="110"/>
-				  <el-table-column align="left"  label="库存总量" prop="入库总量"  width="100"/>
-			      <el-table-column align="left"  label="面料结余" prop="面料结余"  width="100"/>
-				  <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="120"/>
-			      <el-table-column align="left"  label="入库时间" prop="入库时间"  width="160"/>
-				  <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
-				  <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
-                </el-table>
+			<el-table ref="multipleTable"
+					  :row-style="{ height: '30px' }" :header-cell-style="{ padding: '0px' }"
+					  :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+					  :show-overflow-tooltip="true" highlight-current-row="true"
+					  @row-click="tableclick" @row-dblclick="ysupdateCompanyFunc"
+					  @selection-change="detailSelectionChange" style="width: 100%;height: 65vh" border
+					  :summary-method="getSummaries" tooltip-effect="dark" :data="ruku_detailstableData" row-key="ID" >
+			  <el-table-column   align="center" type="selection" width="40"/>
+			  <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="140"/>
+			  <el-table-column align="left"  label="计划用料" prop="计划用料"  width="100"/>
+			  <el-table-column align="left"  label="定额用料" prop="定额用料"  width="100"/>
+			  <el-table-column align="left"  label="计划门幅" prop="计划门幅"  width="100"/>
+			  <el-table-column align="left"  label="定额门幅" prop="定额门幅"  width="100"/>
+			  <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="110"/>
+			  <el-table-column align="left"  label="库存总量" prop="入库总量"  width="100"/>
+			  <el-table-column align="left"  label="面料结余" prop="面料结余"  width="100"/>
+			  <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="120"/>
+			  <el-table-column align="left"  label="入库时间" prop="入库时间"  width="160"/>
+			  <el-table-column align="left"  label="款式" prop="款式"  width="140"/>
+			  <el-table-column align="left"  label="客户" prop="客户编号"  width="80"/>
+			</el-table>
 		</div>
   </el-dialog>
   
@@ -244,9 +257,9 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {getSpotList,getSpotTab,getInputDetail,
+import {getInputDetail,
 inputStash,
-InputOrderSearch,outReport,orderBomList,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel} from '@/api/mes/job'
+InputOrderSearch,outReport,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel,ReceiptList} from '@/api/mes/job'
 import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
 import { useUserStore } from '@/pinia/modules/user'
 // import { get } from 'scriptjs';
@@ -267,15 +280,15 @@ const seconds = String(today.getSeconds()).padStart(2, '0');
 const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
 const currentDates = `${year}-${month}-${day}`;
 //自动聚焦光标input
-const getMachineMacdata = async () => {
-	setTimeout(() => {
-		const inputElement = document.getElementById('searchInput');
-		if (inputElement) {
-			inputElement.focus();		
-		}
-	}, 100); // 延迟100毫秒
-}
-getMachineMacdata();
+// const getMachineMacdata = async () => {
+// 	setTimeout(() => {
+// 		const inputElement = document.getElementById('searchInput');
+// 		if (inputElement) {
+// 			inputElement.focus();		
+// 		}
+// 	}, 100); // 延迟100毫秒
+// }
+// getMachineMacdata();
 
 //全局调用参数
 const danhao = ref('')
@@ -488,6 +501,14 @@ const Reporting_onSubmit = async ()=>{
 	// }else{
 		//打开选择入库弹窗
 		res_bomdialogFormVisible.value = true
+		
+		setTimeout(() => {
+			  const inputElement = document.getElementById('details_searchInput');
+			  if (inputElement) {
+				  inputElement.focus();		
+			  }
+		}, 100);//100毫秒
+		
 		//获取单据编号接口
 		const gitReceiptNumberdata = await gitReceiptNumber({number:'RK'});
 		danhao.value = gitReceiptNumberdata.data.number
@@ -504,7 +525,6 @@ const _TestCoefficient = async () => {
       订单编号: ddhformData.ddh,
       物料编码: ddhformData.wlbh
     });
-
     console.log(Detailres);
 
     // 如果接口返回的data是单条数据（对象），可以直接赋值
@@ -571,7 +591,7 @@ const res_bomenterDialog = async () => {
     sys_id: userStore.userInfo.nickName,
     receipt_number: danhao.value,
     客户编号: ddhformData.kh,
-    款式: ddhformData.ks, 
+    款式: ddhformData.ks,
     rq: currentDate,
     批次号: item['批次号'],
     关联编号: item['关联号'],
@@ -595,9 +615,6 @@ const res_bomenterDialog = async () => {
   }
 }
 
-
-
-
 // 取消
 const res_bomcloseDialog = () => {
 	_orderid.value =  '';
@@ -612,12 +629,10 @@ const handleInput2 = (value, row, prop) => {
 	if(prop != "物料名称" && prop != "备注" ){
 		// 使用正则表达式过滤非数字和小数点的字符
 		let filteredValue = value.replace(/[^\d.]/g, '');
-
 		// 不允许以 . 开头
 		if (filteredValue.startsWith('.')) {
 		filteredValue = filteredValue.slice(1); // 去掉开头的 .
 		}
-
 		// 确保只有一个小数点
 		const parts = filteredValue.split('.');
 		if (parts.length > 2) {
@@ -627,32 +642,53 @@ const handleInput2 = (value, row, prop) => {
 		// 否则直接赋值
 		row[prop] = filteredValue;
 		}
-		}
+	}
+};
 
+//表格
+const recordtableData = reactive([])
+const records_onSubmit = async () => {
+  // 清空数组
+  recordtableData.splice(0, recordtableData.length);
+  // 获取入库单数据
+  const ReceiptList_res = await ReceiptList({ mouth: '', search: '', page: 1, limit: 50 });
+  if (ReceiptList_res && ReceiptList_res.data && Array.isArray(ReceiptList_res.data.table)) {
+    const filteredData = ReceiptList_res.data.table.filter(item => item.单号类型 === '入库');
+    // 更新数据
+    recordtableData.splice(0, 0, ...filteredData);
+  } else {
+    console.error("数据获取失败");
+  }
 };
+records_onSubmit();
 
 
-//=============出库退还记录==================
+const recorddialogFormVisible = ref(false)
+const rdetailstableData = reactive([])
+//查看明细
+const record_deleteRow = async (row) => {
+	console.log(row)
+	recorddialogFormVisible.value = true
+	rdetailstableData.splice(0,rdetailstableData.length);
+	
+	const FabricDetaillists = await FabricDetaillist({order:row['订单编号']});
+	rdetailstableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['入库记录']);
+}
 
-const thtableData = reactive([])
-const rukutableData = reactive([])
 
-const records_onSubmit = async ()=>{
-	thtableData.splice(0,thtableData.length);
-	rukutableData.splice(0,rukutableData.length);
-	const FabricDetaillists = await FabricDetaillist({order:records_searchInfo.value});
-	console.log(FabricDetaillists)
-	rukutableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['入库记录']);
-	thtableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['退还记录']);
+const record_closeDialog = async (row) => {
+	console.log(row)
+	recorddialogFormVisible.value = false
 }
-records_onSubmit();
+
+
+
+
 
 
 
 const details_pickingaddvisible = ref(false)
 const ruku_detailstableData = reactive([])
-const chuku_detailstableData = reactive([])
-const th_detailstableData = reactive([])
 const rukuupdateCompanyFunc = async (row)=>{
 	details_pickingaddvisible.value = true
 	ruku_detailstableData.splice(0,ruku_detailstableData.length);
@@ -686,38 +722,38 @@ const detailSelectionChange = (selection, type) => {
   console.log("复选框",details_Selection.value)
 }
 
-// 删除详情按钮
-const deldetail_delclick = async () => {
-  try {
-    // 弹出确认框
-    await ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
-      confirmButtonText: '确定',
-      cancelButtonText: '取消',
-      type: 'warning',
-    });
-    // 用户点击“确定”后执行以下逻辑
-    const params = {
-		id: details_Selection._value,
-		Mod_id: userStore.userInfo.nickName,
-    };
-    console.log('删除参数:', params);
-    // 调用删除接口
-    const res1 = await FabricDetaildel(params);
-    if (res1.code === 0) {
-      ElMessage.success('删除成功');
-    } else {
-      ElMessage.error('删除失败');
-      return; // 如果删除失败，直接返回
-    }
-    // 重新获取BOM列表数据
-	rukutableData.splice(0,ruku_detailstableData.length);
-	const FabricDetaillists = await FabricDetaillist({order:records_searchInfo.value});
-	rukutableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['入库记录']);
-  } catch (error) {
-    // 用户点击“取消”或弹框关闭
-    console.log('用户取消删除操作');
-  }
-};
+// // 删除详情按钮
+// const deldetail_delclick = async () => {
+//   try {
+//     // 弹出确认框
+//     await ElMessageBox.confirm('此操作将永久删除, 是否继续?', '提示', {
+//       confirmButtonText: '确定',
+//       cancelButtonText: '取消',
+//       type: 'warning',
+//     });
+//     // 用户点击“确定”后执行以下逻辑
+//     const params = {
+// 		id: details_Selection._value,
+// 		Mod_id: userStore.userInfo.nickName,
+//     };
+//     console.log('删除参数:', params);
+//     // 调用删除接口
+//     const res1 = await FabricDetaildel(params);
+//     if (res1.code === 0) {
+//       ElMessage.success('删除成功');
+//     } else {
+//       ElMessage.error('删除失败');
+//       return; // 如果删除失败，直接返回
+//     }
+//     // 重新获取BOM列表数据
+// 	rukutableData.splice(0,ruku_detailstableData.length);
+// 	const FabricDetaillists = await FabricDetaillist({order:records_searchInfo.value});
+// 	rukutableData.splice(0,FabricDetaillists.length,...FabricDetaillists.data['入库记录']);
+//   } catch (error) {
+//     // 用户点击“取消”或弹框关闭
+//     console.log('用户取消删除操作');
+//   }
+// };
 // =========== 分页 ===========
 // 分页相关的响应式变量
 const page = ref(1)