first commit

src/view/inventory/fabricsummary.vue

@@ -33,8 +33,8 @@
                 <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="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"/>
@@ -47,6 +47,14 @@
                 <el-table-column  align="left" label="关联订单" prop="关联订单" width="150"/>
 				<el-table-column  align="left" label="入仓人员" prop="入仓人员" width="100"/>
 				<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="success" size="small" 
+				  style="font-size: 16px;padding: 0px;width: 90px;">
+					入库明细
+				  </el-button>
+				</template>
+			  </el-table-column>
                 </el-table>
                 <div class="gva-pagination">
               <el-pagination
@@ -88,19 +96,16 @@
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
 					<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="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="160" />
-					<el-table-column  align="left" label="领用人员" prop="领用人员" width="90" />
 					<el-table-column  align="left" label="备注" prop="备注" width="115" />
 					</el-table>
 				</el-tab-pane>
@@ -122,15 +127,13 @@
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
 					<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="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="160" />
@@ -156,18 +159,16 @@
 					<el-table-column  align="left" label="生产款号" prop="生产款号" width="115" />
 					<el-table-column  align="left" label="款式" prop="款式" width="115" />
 					<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="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="115" />
+					<el-table-column  align="left" label="备注" prop="备注" width="160" />
 					</el-table>
 				</el-tab-pane>
 			</el-tabs>
@@ -337,9 +338,17 @@ const tuihuantableData = reactive([])
 
 //双击
 const updateCompanyFunc = async (row)=>{
+	
+}
+
+const record_deleteRow = async (row)=>{
 	console.log(row)
 	_pch.value = row['批次号']
 	FabricVisible.value = true
+	DetaillistrestableData.splice(0,DetaillistrestableData.length);
+	chukutableData.splice(0,chukutableData.length);
+	tuihuantableData.splice(0,tuihuantableData.length);
+	
 	const FabricDetaillistdata = await FabricDetaillist({lotNumber:_pch.value});
 	console.log(FabricDetaillistdata)
 	DetaillistrestableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['入库记录']);
@@ -347,6 +356,7 @@ const updateCompanyFunc = async (row)=>{
 	tuihuantableData.splice(0,FabricDetaillistdata.length,...FabricDetaillistdata.data['退还记录']);
 }
 
+
 // =========== 分页 ===========
 // 分页相关的响应式变量
 const page = ref(1)

src/view/inventory/ruku.vue

@@ -66,12 +66,12 @@
 						: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="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="105"/>
-			  <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/>
+			  <!-- <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/> -->
 			  <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="120"/> -->
+			  <!-- <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="BOM_颜色"  width="120"/>
 			  <!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
@@ -540,6 +540,7 @@ const resbom_tableColumns = ref(
 
 //选择入库
 const Reporting_onSubmit = async ()=>{
+	
 	ddhformData.value = []
 	mianliaotabData.value = []	
 	// if(_orderid.value === '' || _orderid.value === null){
@@ -547,7 +548,6 @@ const Reporting_onSubmit = async ()=>{
 	// }else{
 		//打开选择入库弹窗
 		res_bomdialogFormVisible.value = true
-		
 		setTimeout(() => {
 			  const inputElement = document.getElementById('details_searchInput');
 			  if (inputElement) {

src/view/inventory/tuihuan.vue

@@ -66,12 +66,12 @@
                           :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="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="105"/>
-			  <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/>
+			  <!-- <el-table-column align="left"  label="客户" prop="客户编号"  width="70"/> -->
 			  <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="120"/> -->
+			  <!-- <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="BOM_颜色"  width="120"/>
 			  <!-- <el-table-column align="left"  label="计划用料" prop="计划用料"  width="90"/> -->
@@ -81,6 +81,7 @@
 			  <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"/>
@@ -461,9 +462,10 @@
         // 根据退还类型决定是加还是减
         if (item.退还类型 === '退面料') {
           return sum + Number(item.退还数量); // 退面料，增加退还数量
-        } else if (item.退还类型 === '退厂商') {
-          return sum - Number(item.退还数量); // 退厂商，减少退还数量
         }
+		// else if (item.退还类型 === '退厂商') {
+		//   return sum - Number(item.退还数量); // 退厂商，减少退还数量
+		// }
         return sum; // 其他退还类型不处理
       }, 0);
 
@@ -525,10 +527,11 @@ const dj_Dialog = () => {
   if(radio1.value === '退面料'){
 	  // 更新 mianliaotabData 的库存数量
 	 mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 + Number(退还数量);
-  }else if(radio1.value === '退厂商'){
-	  // 更新 mianliaotabData 的库存数量
-	 mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 - Number(退还数量);
   }
+  // else if(radio1.value === '退厂商'){
+  // 	  // 更新 mianliaotabData 的库存数量
+  // 	 mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 - Number(退还数量);
+  // }
   // mianliaotabData.value.库存数量 = mianliaotabData.value.库存数量 - Number(退还数量);
 };
   

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -239,9 +239,9 @@
                   <el-table-column align="left" label="定额用料" prop="定额用料"  width="90"/>
 				  <el-table-column align="left" label="定额门幅" prop="定额门幅"  width="115"/>
 				  <!-- <el-table-column align="left" label="实际门幅" prop="实际门幅"  width="115"/> -->
-                  <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="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="115"/>
 				  <el-table-column align="left" label="面料结余" prop="面料结余"  width="115"/>
 				  <el-table-column align="left" label="单位" prop="投料单位"  width="60"/>
@@ -584,7 +584,7 @@
                           :show-overflow-tooltip="true"
                           :cell-class-name="planUsageCellClass"
                           highlight-current-row="true"
-                          @row-dblclick="bombomupdateCompanyFunc2"
+                          @row-dblclick="updateCompanyFunc2"
 						  @selection-change="glddSelectionChange"
                           style="width: 100%;height: 65vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
                  <el-table-column type="selection" width="50" />
@@ -653,7 +653,7 @@
 		</el-dialog>
 		
 		<!-- 批量修改BOM资料弹窗 -->
-		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量新增或修改BOM资料" width="60%" top="1%" destroy-on-close>
+		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="批量新增或修改BOM资料" width="63%" top="1%" destroy-on-close>
 		  
 		   <el-descriptions class="margin-top" :column="4"  :size="size" border>
 			<el-descriptions-item label="订单编号" class="ddh">{{ ddhformData['ddh'] }}</el-descriptions-item>
@@ -669,26 +669,56 @@
 			<div style="margin-top: 5px;">
 				<el-table ref="paichengRef"
 				          :show-overflow-tooltip="true"
-						  highlight-current-row="true"
+				          highlight-current-row="true"
 				          :row-style="{ height: '0px' }"
-				          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+				          :cell-style="{ padding: '0px' }" 
+				          :header-row-style="{ height: '0px' }"
 				          :header-cell-style="{ padding: '0px' }"
-				          style="width: 100%;height: 58vh" border tooltip-effect="dark"
+				          style="width: 100%;height: 58vh" 
+				          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"
-							:id="`input${idx}${$index}`"
-							@input="handleInput($event, row, item.prop)"
-							/>
+				    <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width">
+				      
+				      <!-- 如果是物料名称且UNIQID没有值，则显示输入框，否则显示内容 -->
+				      <div v-if="item.prop === '物料名称'">
+				        <el-input
+				          v-if="!row.UNIQID" 
+				          v-model="row[item.prop]"
+				          :clearable="false"
+				          :id="`input${idx}${$index}`"
+				          @input="handleInput($event, row, item.prop)"
+				        />
+				        <span v-else>{{ row[item.prop] }}</span>  <!-- 如果UNIQID有值，则直接显示内容 -->
+				      </div>
+				
+				      <!-- 其他列的处理 -->
+				      <div v-else-if="['计划用料', '定额用料', '计划门幅', '定额门幅', '备注'].includes(item.prop)">
+				        <el-input
+				          v-model="row[item.prop]"
+				          :clearable="false"
+				          :id="`input${idx}${$index}`"
+				          @input="handleInput($event, row, item.prop)"
+				        />
 				      </div>
+				      
+				      <!-- 非输入框列 -->
 				      <div v-else>{{ row[item.prop] }}</div>
+				
 				    </el-table-column>
 				  </template>
+				
+		<!-- 		  <el-table-column fixed="right" label="操作" width="80">
+				    <template #default="{ row, $index }">
+				      <el-button @click="record_deleteRow(row,$index)" type="danger" size="small" 
+				                 style="font-size: 16px;padding: 0px;width: 60px;background-color: red;">
+				        删除
+				      </el-button>
+				    </template>
+				  </el-table-column> -->
+				  
 				</el-table>
 			</div>
 			<div class="dialog-footer" style="text-align: right;margin-top: 5px;">
@@ -2456,7 +2486,6 @@ const resbom_handleKeyDown = (event, x, y, prop) => {
       break;
   }
 }
-//质检废品系数颜色
 const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (
 		column.label === '计划门幅' ||
@@ -2490,6 +2519,25 @@ const add_bomenterDialog = async() => {
 }
 
 
+
+// BOM删除
+const record_deleteRow = async(row, index) => {
+	console.log(row.UNIQID)
+	if(row.UNIQID === '' || row.UNIQID === null || row.UNIQID === undefined){
+		// 删除当前行数据
+		resbomtableData.value.splice(index, 1);
+	}else{
+		// 调用接口删除
+		// const add_FabricEditdata = await FabricEdit({row.UNIQID});
+		// if (add_FabricEditdata.code === 0) {
+		// 	ElMessage({type: 'success',message: '删除成功'})
+		// } else {
+		// 	ElMessage({ type: 'error',message: '删除失败'})
+		// }
+	}
+ 
+}
+
 //修改
 const res_bomenterDialog = async () => {
 	const rawValueArray = resbomtableData._rawValue;
@@ -2553,15 +2601,15 @@ const edit_resbom_tableColumns = ref(
 )
 
 const UNIQID = ref('')
-const bombomupdateCompanyFunc = async (row) => {
-	edit_bomdialogFormVisible.value = true
-	ddhformData.ddh = _Gd_gdbh.value
-	ddhformData.kh = _Gd_kh.value
-	ddhformData.sckh = _Gd_sckh.value
-	ddhformData.ks = _Gd_ks.value
-	UNIQID.value = row.UNIQID
-	_editTestCoefficient()
-}
+// const bombomupdateCompanyFunc = async (row) => {
+// 	edit_bomdialogFormVisible.value = true
+// 	ddhformData.ddh = _Gd_gdbh.value
+// 	ddhformData.kh = _Gd_kh.value
+// 	ddhformData.sckh = _Gd_sckh.value
+// 	ddhformData.ks = _Gd_ks.value
+// 	UNIQID.value = row.UNIQID
+// 	_editTestCoefficient()
+// }
 
 
 // BOM数据获取