优化

src/view/inventory/ruku.vue

@@ -22,13 +22,18 @@
                       @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="105" />
+			  <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="80"/>
               <el-table-column  align="left" label="生产款号" prop="生产款号" width="170"/>
+			  <el-table-column  align="left" label="物料名称" prop="物料名称" width="105" />	 
+			  <el-table-column  align="left" label="物料编码" prop="物料编码" width="105" />	 
+			  <el-table-column  align="left" label="颜色" prop="颜色" width="80" />
               <el-table-column  align="left" label="款式" 	 prop="款式" 	width="170"/>
 			  <el-table-column  align="left" label="订单数量" 	 prop="订单数量" 	width="110"/>
+			  <el-table-column  align="left" label="接单日期" prop="接单日期" width="160"/>
 			  <el-table-column  align="left" label="落货日期" prop="落货日期" width="160"/>
-              <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="160"/>
             </el-table>
             <div class="dialog-footer" style="text-align: left;margin-right: 60px;">
@@ -260,7 +265,7 @@ export default {
 // 全量引入格式化工具 请按需保留
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import {ref, reactive} from 'vue'
-import {getSpotList,getSpotTab,orderSearch,outReport,orderBomList,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel} from '@/api/mes/job'
+import {getSpotList,getSpotTab,InputOrderSearch,outReport,orderBomList,FabricDetail,gitReceiptNumber,FabricDetaillist,FabricDetaildel} from '@/api/mes/job'
 import { ElMessage, ElMessageBox,ElUpload, ElButton } from 'element-plus';
 import { useUserStore } from '@/pinia/modules/user'
 // import { get } from 'scriptjs';
@@ -304,7 +309,7 @@ const _kh = ref('')//生产款号
 const handleInput = async ()=>{
 	restableData.splice(0, restableData.length);//清空表格
 	//订单信息数据查询【接口】
-	const orderSearchdata = await orderSearch({search:add_searchInfo.value});
+	const orderSearchdata = await InputOrderSearch({search:add_searchInfo.value});
 	if(orderSearchdata.data.length === 1){
 		_orderid.value = orderSearchdata.data[0]['订单编号']
 		add_searchInfo.value = orderSearchdata.data[0]['订单编号']
@@ -328,7 +333,7 @@ const handleInput = async ()=>{
 const add_onSubmit = async ()=>{
 	restableData.splice(0, restableData.length);//清空表格
 	//订单信息数据查询【接口】
-	const orderSearchdata = await orderSearch({search:add_searchInfo.value});
+	const orderSearchdata = await InputOrderSearch({search:add_searchInfo.value});
 	if(orderSearchdata.data.length === 1){
 		res_bomdialogFormVisible.value = true
 		_orderid.value = orderSearchdata.data[0]['订单编号']
@@ -366,7 +371,7 @@ const tableRowClick = async (row)=>{
 
 //查询
 const add_lyonSubmit = async ()=>{
-	const orderSearchdata = await orderSearch({search:add_lysearchInfo.value});
+	const orderSearchdata = await InputOrderSearch({search:add_lysearchInfo.value});
 	if(orderSearchdata.data.length === 1){
 		add_lysearchInfo.value = orderSearchdata.data[0]['订单编号']
 		ddhformData.ddh = orderSearchdata.data[0]['订单编号']
@@ -415,6 +420,7 @@ const resbom_tableColumns = ref(
 		{ label: '定额用料', prop: '定额用料', width: '110' },
 		{ label: '计划门幅', prop: '计划门幅', width: '100' },
 		{ label: '定额门幅', prop: '定额门幅', width: '100' },
+		{ label: '实际门幅', prop: '实际门幅', width: '100' },
 		{ label: '裁床实际用料', prop: '裁床实际用料', width: '115' },
 		{ label: '裁床领用面料', prop: '裁床领用面料', width: '115' },
 		{ label: '裁床退回仓库面料', prop: '裁床退回仓库面料', width: '150' },
@@ -521,7 +527,7 @@ const resbom_handleKeyDown = (event, x, y, prop) => {
   }
 }
 const scfjfpxsCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  if (column.label === '入库数量') {
+  if (column.label === '入库数量' ||column.label === '实际门幅') {
     return 'background-plan-usage-low';
   }
 }

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -472,6 +472,7 @@
 		          />
 		        </el-form-item>
 		      </el-form>
+			  <el-button type="primary" @click="Related_fabrics" style="height: 50px;font-size: 20px;">关联订单面料</el-button>
 		    </div>
 		  </div>
 		
@@ -522,6 +523,28 @@
 		    </div>
 		  </template>
 		</el-dialog>
+
+		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="新增订单资料" width="70%" top="2%" destroy-on-close>
+            <el-form>
+              <div>
+                <el-form-item label="关键字:"  class="mab" prop="keyOrder">
+                  <el-space>
+                    <el-input v-model="cpyjdh_keyword" style="width: 100%;"/>
+                    <el-button @click="cpsearchHandle(cpyjdh_keyword)">搜索</el-button>
+                  </el-space>
+                </el-form-item>
+                <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
+                  <el-tree :data="getProductYjListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectNode" />
+                </div>
+              </div>
+            </el-form>
+			<template #footer>
+		    <div class="dialog-footer" style="text-align: right;">
+		      <el-button @click="Related_fabricscloseDialog">取消</el-button>
+		      <el-button type="primary" @click="Related_fabricsenterDialog">确定</el-button>
+		    </div>
+		  </template>	
+		</el-dialog>		
 		
 		<!-- 修改BOM资料 -->
 		<el-dialog v-model="edit_bomdialogFormVisible" :before-close="edit_bomcloseDialog" title="修改BOM资料" width="80%" top="2%" destroy-on-close>
@@ -1699,6 +1722,12 @@ const add_gdcloseDialog = () => {
   add_gddialogFormVisible.value = false
 }
 
+const Related_fabricsVisible = ref(false)
+const Related_fabrics = () => {
+	Related_fabricsVisible.value = true
+}
+
+
 // =========== 新增颜色资料 ===========
 const add_gdyjdialogFormVisible = ref(false)
 const add_yszlformdata = reactive({