first commit

src/api/mes/job.js

@@ -303,11 +303,11 @@ export const CfdataDel = (params) => {
 }
 
 //获取报工历史记录
-export const getTab = (params) => {
+export const getTab = (data) => {
   return service({
     url: '/mes_server/work_order_verification/getTab',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }
 
@@ -357,7 +357,7 @@ export const ProcessDetailDel = (params) => {
 }
 
 
-//出库报工搜索列表
+//出库报工列表
 export const getSpotList = (params) => {
   return service({
     url: '/mes_server/work_order_spot_check/getList',
@@ -649,11 +649,11 @@ export const FieldInspectionRecord = (params) => {
 }
 
 // 订单BOM修改接口
-export const FabricEdit = (params) => {
+export const FabricEdit = (data) => {
   return service({
     url: '/mes_server/work_order/FabricEdit',
-    method: 'get',
-    params
+    method: 'post',
+    data
   })
 }
 // 订单BOM显示接口
@@ -672,3 +672,19 @@ export const FabricDetail = (params) => {
     params
   })
 }
+//订单信息数据查询
+export const orderSearch = (params) => {
+  return service({
+    url: '/mes_server/work_order_spot_check/orderSearch',
+    method: 'get',
+    params
+  })
+}
+//订单面料出库报工
+export const outReport = (data) => {
+  return service({
+    url: '/mes_server/work_order_spot_check/outReport',
+    method: 'post',
+    data
+  })
+}

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -13,7 +13,7 @@
               <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt"   title="新增工单资料">新增订单资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增颜色资料">新增颜色资料</el-button>
               <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工序资料" >新增工序资料</el-button>
-			  <el-button type="primary" icon="edit"   @click="BOMclick"   class="bt"   title="BOM面料">新增BOM面料</el-button>
+			  <el-button type="primary" icon="edit"   @click="BOMclick"   class="bt"   title="BOM面料">修改BOM资料</el-button>
               <el-button type="primary" icon="edit"   @click="del_ddzlClick" 	v-if="table_del=== true" :disabled="table_Selection === ''"  class="bt" title="删除订单资料"  >删除订单资料</el-button>
               <el-button type="primary" icon="edit"   @click="delgd_delclick" 	v-if="delall=== true" :disabled="ysSelection === '' && gySelection === ''"  class="bt"   >删除颜色工艺资料</el-button>
               <!-- <el-button type="primary" icon="edit"   @click="CSclick"   class="bt"   title="库存测试">库存测试</el-button> -->
@@ -517,12 +517,16 @@
 		
 		
 		<!-- 新增BOM资料弹窗 -->
-		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="新增BOM资料" width="70%" top="3%" destroy-on-close>
+		<el-dialog v-model="res_bomdialogFormVisible" :before-close="res_bomcloseDialog" title="修改BOM资料" width="70%" top="2%" destroy-on-close>
 		  <div class="dialog-footer">
 		    <el-button @click="res_bomcloseDialog">取消</el-button>
 		    <el-button type="primary" @click="res_bomenterDialog">确定</el-button>
 		  </div>
-		  <br>
+		  <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
+		    <el-form-item label="订单编号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+		      <el-input v-model="ddhformData['ddh']" disabled style="width: 200px;"/>
+		    </el-form-item>
+		  </div>
 			<div>
 				<el-table ref="paichengRef"
 				          :show-overflow-tooltip="true"
@@ -530,7 +534,7 @@
 				          :row-style="{ height: '0px' }"
 				          :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
 				          :header-cell-style="{ padding: '0px' }"
-				          style="width: 100%;height: 74vh" border tooltip-effect="dark"
+				          style="width: 100%;height: 60vh" border tooltip-effect="dark"
 				          :data="resbomtableData" row-key="ID"
 				          :cell-class-name="scfjfpxsCellClass">
 				  <template v-for="(item, idx) in resbom_tableColumns">
@@ -547,81 +551,6 @@
 		</el-dialog>
 		
 		
-		<!-- 修改BOM资料弹窗 -->
-		<el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="70%" top="3%" destroy-on-close>
-		  
-		  <div style="display: flex; justify-content: space-between;">
-		    <div style="flex: 2;">
-		      <el-form :model="edit_bomscgdformData">
-		        <div style="display: flex;">
-		          <div style="flex: 1; margin-right: 20px;">
-		            <el-form-item label="BOM_工单编号" label-width="135px">
-		              <el-input v-model="edit_bomscgdformData.BOM_工单编号" disabled />
-		            </el-form-item>
-		            <el-form-item label="BOM_物料名称" label-width="135px">
-		              <el-input
-		                v-model="edit_bomscgdformData['BOM_物料名称']" id="BOM_物料名称"
-		                @keydown="add_bomlent($event, '粘衬', '生产款号', '订单数量')" 
-		              />
-		            </el-form-item>
-		            <el-form-item label="BOM_投料单位" label-width="135px">
-		              <el-input
-		                v-model="edit_bomscgdformData['BOM_投料单位']" id="BOM_投料单位"
-		                @keydown="add_bomlent($event, '订单数量', '款式', '落货日期')"
-		              />
-		            </el-form-item>
-					<el-form-item label="BOM_计划用量" label-width="135px">
-					  <el-input v-model="edit_bomscgdformData.BOM_计划用量" id="BOM_计划用量"
-					   @keydown="add_bomlent($event, '生产款号', '订单数量', '款式')" 
-					  />
-					</el-form-item>
-		          </div>
-				  
-				  
-		          <div style="flex: 1;">
-		            <el-form-item label="BOM_标准用量" label-width="135px">
-		              <el-input v-model="edit_bomscgdformData.BOM_标准用量" id="BOM_标准用量" />
-		            </el-form-item>
-		            <el-form-item label="BOM_实际用量" label-width="135px">
-		              <el-input v-model="edit_bomscgdformData.BOM_实际用量" id="BOM_实际用量"
-		               @keydown="add_bomlent($event, '生产款号', '订单数量', '款式')" 
-		              />
-		            </el-form-item>
-					<el-form-item label="Bom_领用数量" label-width="135px">
-					  <el-input v-model="edit_bomscgdformData.Bom_领用数量" id="Bom_领用数量"
-					   @keydown="add_bomlent($event, '生产款号', '订单数量', '款式')" 
-					  />
-					</el-form-item>
-					<el-form-item label="BOM_退还数量" label-width="135px">
-					  <el-input v-model="edit_bomscgdformData.BOM_退还数量" id="BOM_退还数量"
-					   @keydown="add_bomlent($event, '生产款号', '订单数量', '款式')" 
-					  />
-					</el-form-item>
-		          </div>
-		        </div>
-		        <!-- 备注 -->
-		        <el-form-item label="备注" label-width="135px">
-		          <el-input
-		            type="textarea"
-		            v-model="edit_bomscgdformData['BOM_desc']" id="BOM_desc"
-		            @keydown="add_gdzlent($event, '箱唛要求', '备注', '船样描述')"
-		            rows="2"
-		            resize="none"
-		          />
-		        </el-form-item>
-		      </el-form>
-		    </div>
-		  </div>
-		  <!-- 底部操作按钮 -->
-		  <template #footer>
-		    <div class="dialog-footer" style="text-align: right;">
-		      <el-button @click="edit_bomcloseDialog">取消</el-button>
-		      <el-button type="primary" @click="edit_bomenterDialog">确定</el-button>
-		    </div>
-		  </template>
-		</el-dialog>
-		
-            
 		<el-dialog
 		  v-model="ddzl_dialogFormVisible"
 		  :before-close="dd_closeDialog"
@@ -2091,6 +2020,9 @@ const cp_gdprintonClick = () => {
 // =========== BOM资料 ===========
 const res_bomdialogFormVisible = ref(false)
 const resbomtableData = ref([]);
+const ddhformData = reactive({
+  ddh: '',
+});
 const resbom_tableColumns = ref(
     [
       { label: '物料名称', prop: '物料名称', width: '170' },
@@ -2110,7 +2042,7 @@ const BOMclick = () => {
 		ElMessage({type: 'warning',message: '请选择订单后，再操作此功能'})
 	}else{
 		res_bomdialogFormVisible.value = true
-		// res_bomscgdformData.BOM_工单编号 = _Gd_gdbh.value
+		ddhformData.ddh = _Gd_gdbh.value
 		_TestCoefficient();
 	}
 }
@@ -2176,21 +2108,19 @@ const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
 
 // 确定
 const res_bomenterDialog = async() => {
-	const formattedData = 
-	 [
-		 {
-		   BOM_工单编号: add_bomscgdformData['BOM_工单编号'],
-		   BOM_物料名称: add_bomscgdformData['BOM_物料名称'],
-		   BOM_投料单位: add_bomscgdformData['BOM_投料单位'],
-		   BOM_计划用量: add_bomscgdformData['BOM_计划用量'],
-		   BOM_标准用量: add_bomscgdformData['BOM_标准用量'],
-		   BOM_实际用量: add_bomscgdformData['BOM_实际用量'],
-		   Bom_领用数量: add_bomscgdformData['Bom_领用数量'],
-		   BOM_退还数量: add_bomscgdformData['BOM_退还数量'],
-		   BOM_desc: add_bomscgdformData['BOM_desc'],
-		   UNIQID: add_bomscgdformData['UNIQID']
-		 },
-	 ];
+	const rawValueArray = resbomtableData._rawValue;
+	const formattedData = rawValueArray.map(item => {
+	  return {
+	    UNIQID: item.UNIQID,
+	    BOM_物料名称: item.物料名称 !== null ? item.物料名称 : "",
+	    BOM_计划用量: item.计划用料 !== null ? item.计划用料 : "",
+	    BOM_标准用量: item.定额用料 !== null ? item.定额用料 : "",
+	    BOM_实际用量: item.裁床实际用料 !== null ? item.裁床实际用料 : "",
+	    Bom_领用数量: item.裁床领用面料 !== null ? item.裁床领用面料 : "",
+	    BOM_退还数量: item.裁床退回仓库面料 !== null ? item.裁床退回仓库面料 : "",
+		BOM_desc: item.备注 !== null ? item.备注 : ""
+	  }
+	});
 	
 	console.log(formattedData);
 
@@ -2212,68 +2142,12 @@ const res_bomcloseDialog = () => {
 }
 
 
-//表格双击
+//BOM资料表格双击
 const bombomupdateCompanyFunc = async (row) => {
-	// console.log(row.UNIQID)
-	edit_bomdialogFormVisible.value = true;
-	console.log(row)
-	edit_bomscgdformData['BOM_工单编号'] = _Gd_gdbh.value
-	edit_bomscgdformData['BOM_物料名称'] = row['物料名称']
-	edit_bomscgdformData['BOM_投料单位'] = row['投料单位']
-	edit_bomscgdformData['BOM_计划用量'] = row['计划用料']
-	edit_bomscgdformData['BOM_标准用量'] = row['定额用料']
-	edit_bomscgdformData['BOM_实际用量'] = row['裁床实际用料']
-	edit_bomscgdformData['Bom_领用数量'] = row['裁床领用面料']
-	edit_bomscgdformData['BOM_退还数量'] = row['裁床退回仓库面料']
-	edit_bomscgdformData['BOM_desc'] = row['备注']
-	edit_bomscgdformData['UNIQID'] = row['UNIQID']
-}
-
-// =========== BOM资料修改 ===========
-const edit_bomdialogFormVisible = ref(false)
-const edit_bomscgdformData = reactive({
-  BOM_工单编号: '',
-  BOM_物料名称: '',
-  BOM_投料单位: '',
-  BOM_计划用量: '',
-  BOM_标准用量: '',
-  BOM_实际用量: '',
-  Bom_领用数量: '',
-  BOM_退还数量: '',
-  BOM_desc: "",
-  UNIQID: '',
-});
-// 确定
-const edit_bomenterDialog = async() => {
-	const formattedData = {
-		BOM_物料名称: edit_bomscgdformData['BOM_物料名称'],
-		BOM_投料单位: edit_bomscgdformData['BOM_投料单位'],
-		BOM_计划用量: edit_bomscgdformData['BOM_计划用量'],
-		BOM_标准用量: edit_bomscgdformData['BOM_标准用量'],
-		BOM_实际用量: add_bomscgdformData['BOM_实际用量'],
-		Bom_领用数量: edit_bomscgdformData['Bom_领用数量'],
-		BOM_退还数量: edit_bomscgdformData['BOM_退还数量'],
-		BOM_desc: edit_bomscgdformData['BOM_desc'],
-		UNIQID: edit_bomscgdformData['UNIQID']
-	};
-	
-	console.log(formattedData);
-	
-	const edit_FabricEditdata = await FabricEdit(formattedData);
-	if (edit_FabricEditdata.code === 0) {
-		edit_bomdialogFormVisible.value = false;
-		ElMessage({type: 'success',message: '修改成功'})
-		const orderBomListdata = await orderBomList({order:_Gd_gdbh.value});
-		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
-	} else {
-		ElMessage({ type: 'error',message: '修改失败'})
-	}
 	
 }
-// 取消
-const edit_bomcloseDialog = () => {
-	edit_bomdialogFormVisible.value = false;
-}
+
+
 
 //点击表格行获取下方表格数据列表
 // =========== 颜色资料、工艺资料、技术资料附件 ===========