优化

src/view/inventory/fabricsummary.vue

@@ -87,7 +87,7 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {getSpotList,getSpotTab,orderSearch,outReport,orderBomList,FabricDetail,fabricList,fabricListmonth} from '@/api/mes/job'
+import {getSpotList,getSpotTab,outReport,orderBomList,FabricDetail,fabricList,fabricListmonth} from '@/api/mes/job'
 import {ElMessage} from "element-plus";
 import * as XLSX from 'xlsx';
 import FileSaver from 'file-saver';

src/view/inventory/pickinglist.vue

@@ -110,7 +110,7 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {getSpotList,getSpotTab,orderSearch,outReport,orderBomList,FabricDetail,getReceiptTab,
+import {getSpotList,getSpotTab,outReport,orderBomList,FabricDetail,getReceiptTab,
 ReceiptList,
 ReceiptDetail
 } from '@/api/mes/job'

src/view/inventory/ruku.vue

@@ -84,7 +84,7 @@
   		    <el-table-column :label="item.label" :width="item.width">
   		      <template #default="{ row, column, $index }">
   		        <!-- 判断该列是否需要输入框 -->
-  		        <div v-if="['领用','实际门幅'].includes(item.prop)">
+  		        <div v-if="['入库数量','实际门幅'].includes(item.prop)">
   		          <el-input
   		            v-model="row[item.prop]"
   		            :clearable="false"
@@ -360,22 +360,22 @@ const ddhformData = reactive({
 });
 const resbom_tableColumns = ref(
     [
-		{ label: '批次号', prop: '批次号', width: '80' },
-		{ label: '关联号', prop: '关联号', width: '80' },
-		{ label: '物料编号', prop: '物料编号', width: '160' },
-		{ label: '物料名称', prop: '物料名称', width: '90' },
-		{ label: '计划用料', prop: '计划用料', width: '90' },
-		{ label: '计划门幅', prop: 'BOM_计划门幅', width: '90' },
-		{ label: '定额用料', prop: '定额用料', width: '90' },
-		{ label: '定额门幅', prop: 'BOM_定额门幅', width: '90' },
-		{ label: '实际门幅', prop: '实际门幅', width: '100' },
-		{ label: '领用', prop: '领用', width: '100' },
-		{ label: '入仓总量', prop: '入仓总量', width: '90' },
-		{ label: '库存数量', prop: '库存数量', width: '90' },
-		{ label: '领用数量', prop: '领用数量', width: '90' },
-		{ label: '颜色', prop: 'BOM_颜色', width: '100' },
-		{ label: '关联订单', prop: '关联订单', width: '110' },
-		{ label: '单位', prop: '单位', width: '100' },
+	      { label: '物料编号', prop: '物料编号', width: '160' },
+	  	  { label: '物料名称', prop: '物料名称', width: '100' },
+		  { label: '计划用料', prop: '计划用料', width: '90' },
+		  { label: '计划门幅', prop: 'BOM_计划门幅', width: '90' },
+		  { label: '定额用料', prop: '定额用料', width: '90' },
+		  { label: '定额门幅', prop: 'BOM_定额门幅', width: '90' },
+		  { label: '实际门幅', prop: '实际门幅', width: '100' },
+		  { label: '入库数量', prop: '入库数量', width: '90' },
+		  { label: '入仓总数量', prop: '入仓总量', width: '100' },
+		  { label: '库存数量', prop: '库存数量', width: '90' },
+		  { label: '领用数量', prop: '领用数量', width: '100' },
+		  { label: '批次号', prop: '批次号', width: '80' },
+		  { label: '关联号', prop: '关联号', width: '80' },
+		  { label: '颜色', prop: 'BOM_颜色', width: '100' },
+		  { label: '关联订单', prop: '关联订单', width: '160' },
+		  { label: '单位', prop: '单位', width: '90' },
     ]
 )
 
@@ -446,7 +446,7 @@ const resbom_handleKeyDown = (event, x, y, prop) => {
   }
 }
 const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  if (column.label === '领用' ||column.label === '实际门幅') {
+  if (column.label === '入库数量' ||column.label === '实际门幅') {
     return 'background-plan-usage-low';
   }
 }

src/view/performance/caiqiebaogong.vue

@@ -248,7 +248,7 @@
 					  style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;">删除报工</el-button>
 					  <el-button type="primary" @click="cp_gdprintonClick" style="width: 150px; height: 40px; font-size: 20px; margin-left: 10px;" >  子订单详情页 </el-button>
 					  <el-button type="primary" @click="add_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >报工</el-button>
-					  <el-button type="primary" @click="return_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >退还</el-button>
+						<!-- <el-button type="primary" @click="return_Dialog" style="width: 100px; height: 40px; font-size: 20px; margin-left: 10px;" >退还</el-button> -->
 				</el-main>
 			</div>
 			
@@ -365,7 +365,7 @@ import $ from 'jquery';
 import LuckyExcel from 'luckyexcel';
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue';
-import {getSpotList,getInfo,OrderAttachments,getTabByGdbh,search,spotcheckdel,SubWorkOrderStatusList,Mabaolist,orderBomList,orderSearch,outReport} from '@/api/mes/job';
+import {getSpotList,getInfo,OrderAttachments,getTabByGdbh,search,spotcheckdel,SubWorkOrderStatusList,Mabaolist,orderBomList,outReport} from '@/api/mes/job';
 import {getMachineMac} from '@/api/jixiaoguanli/jitairibaobiao'
 import {getMac} from '@/api/jixiaoguanli/baogong'
 import {ElMessage} from "element-plus";
@@ -864,25 +864,25 @@ const resbom_tableColumns = ref(
 		// { label: 'UNIQID', prop: 'UNIQID', width: '80' },
     ]
 )
-//退还按钮
-const return_Dialog = async ()=>{
-	_orderid.value = add_searchInfo.value.split('-')[0]
-	if(_orderid.value === '' || _orderid.value === null){
-		ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
-	}else{
-		const orderSearchdata = await orderSearch({search:_orderid.value});
-		console.log(orderSearchdata)
-		_kh.value = orderSearchdata.data[0].生产款号
-		res_bomdialogFormVisible.value = true
-		ddhformData.ddh = _orderid.value
-		ddhformData.kh = _kh.value
-		ddhformData.sckh = orderSearchdata.data[0].客户编号
-		ddhformData.ks = orderSearchdata.data[0].款式
-		const orderBomListlsit = await orderBomList({order:_orderid.value});
-		console.log(orderBomListlsit)
-		_TestCoefficient();
-	}
-}
+// //退还按钮
+// const return_Dialog = async ()=>{
+// 	_orderid.value = add_searchInfo.value.split('-')[0]
+// 	if(_orderid.value === '' || _orderid.value === null){
+// 		ElMessage({type: 'warning',message: '请扫描订单后，再操作此功能'})
+// 	}else{
+// 		const orderSearchdata = await orderSearch({search:_orderid.value});
+// 		console.log(orderSearchdata)
+// 		_kh.value = orderSearchdata.data[0].生产款号
+// 		res_bomdialogFormVisible.value = true
+// 		ddhformData.ddh = _orderid.value
+// 		ddhformData.kh = _kh.value
+// 		ddhformData.sckh = orderSearchdata.data[0].客户编号
+// 		ddhformData.ks = orderSearchdata.data[0].款式
+// 		const orderBomListlsit = await orderBomList({order:_orderid.value});
+// 		console.log(orderBomListlsit)
+// 		_TestCoefficient();
+// 	}
+// }
 //bom数据获取
 const _TestCoefficient = async ()=>{
   try {

src/view/performance/chukubaogong.vue

@@ -368,23 +368,22 @@
 	wlbh:'',
   });
   const resbom_tableColumns = ref(
-	  [
-		  { label: '批次号', prop: '批次号', width: '80' },
-		  { label: '关联号', prop: '关联号', width: '80' },
-		  { label: '物料编号', prop: '物料编号', width: '160' },
-		  { label: '物料名称', prop: '物料名称', width: '90' },
+	  [   { label: '物料编号', prop: '物料编号', width: '160' },
+	  	  { label: '物料名称', prop: '物料名称', width: '100' },
 		  { label: '计划用料', prop: '计划用料', width: '90' },
 		  { label: '计划门幅', prop: 'BOM_计划门幅', width: '90' },
 		  { label: '定额用料', prop: '定额用料', width: '90' },
 		  { label: '定额门幅', prop: 'BOM_定额门幅', width: '90' },
 		  { label: '实际门幅', prop: '实际门幅', width: '100' },
-		  { label: '领用数量', prop: '领用数量', width: '100' },
-		  { label: '入仓总量', prop: '入仓总量', width: '90' },
-		  { label: '库存数量', prop: '库存数量', width: '90' },
 		  { label: '出库数量', prop: '出库数量', width: '90' },
+		  { label: '入仓总数量', prop: '入仓总量', width: '100' },
+		  { label: '库存数量', prop: '库存数量', width: '90' },
+		  { label: '出库总数量', prop: '领用数量', width: '100' },
+		  { label: '批次号', prop: '批次号', width: '80' },
+		  { label: '关联号', prop: '关联号', width: '80' },
 		  { label: '颜色', prop: 'BOM_颜色', width: '100' },
-		  { label: '关联订单', prop: '关联订单', width: '110' },
-		  { label: '单位', prop: '单位', width: '100' },
+		  { label: '关联订单', prop: '关联订单', width: '160' },
+		  { label: '单位', prop: '单位', width: '90' },
 	  ]
   )
   

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -2608,8 +2608,17 @@ const tableRowClick = async (row) => {
 		bomtableData.value = orderBomListdata.data
 		bomtableData.splice(0,orderBomListdata.data.length,...orderBomListdata.data);//bom表格数据
 		
-		const fabricListdata = await fabricList({order:_Gd_gdbh.value});
-		mltableData.splice(0,fabricListdata.data.length,...fabricListdata.data.table);//bom表格数据
+		const fabricListdata = await fabricList({ order: _Gd_gdbh.value });
+
+		if (fabricListdata.code === 0 && Array.isArray(fabricListdata.data) && fabricListdata.data.length === 0) {
+			// 如果 data 是空数组，表示没有找到相关数据
+			mltableData.splice(0, mltableData.length); // 清空表格数据
+			} else if (fabricListdata.data && Array.isArray(fabricListdata.data)) {
+			// 如果 data 是数组且不为空，更新表格数据
+			mltableData.splice(0, fabricListdata.data.length, ...fabricListdata.data);
+			} else {
+			console.error("接口返回的数据格式不正确：", fabricListdata);
+		}
 		//颜色资料
         if(PrintListDatas.data.列表.length === 0 ){
           ystableData.length = 0