first commit

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -356,7 +356,8 @@
       
 			
 			<!-- 新增订单资料弹窗 -->
-		<el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog" title="新增订单资料" width="70%" top="2%" destroy-on-close>
+		<el-dialog v-model="add_gddialogFormVisible" :before-close="add_gdcloseDialog" title="新增订单资料" 
+			style="height: 98%;width:67%;margin: 10px 0px 0px 15%;" top="1%" destroy-on-close>
 		  <div style="display: flex; justify-content: space-between;">
 		    <div style="flex: 2;">
 		      <el-form :model="add_gdscgdformData">
@@ -462,17 +463,18 @@
 			<h4 style="font-size: 18px; margin-left: 150px;">上传图片</h4>
 		      <el-form>
 		        <el-form-item label="制单人" label-width="120px">
-		          <el-input v-model="add_gdscgdformData['Sys_id']" disabled />
+		          <el-input v-model="add_gdscgdformData['Sys_id']" disabled style='width: 200px;'/>
 		        </el-form-item>
 		        <el-form-item label="制单日期" label-width="120px">
-		          <el-date-picker
-		            v-model="add_gdscgdformData['制单日期']"
-		            disabled
-		            type="date"
-		          />
+		          <el-date-picker v-model="add_gdscgdformData['制单日期']" disabled type="date"  style='width: 200px;'/>
 		        </el-form-item>
 		      </el-form>
-			  <el-button type="primary" @click="Related_fabrics" style="height: 50px;font-size: 20px; margin-left: 70px;">关联订单面料</el-button>
+			  <el-button type="primary" @click="Related_fabrics" 
+				  style="height: 50px;font-size: 20px; margin-left: 120px;
+						
+				  ">
+					关联订单面料
+			  </el-button>
 		    </div>
 		  </div>
 		
@@ -502,14 +504,15 @@
 		          </el-form-item>
 		        </div>
 				<div style="flex: 1;">
-				  <el-form-item label="" class="mab" prop="isBanciSelected" label-width="90">
+					
+				  <!-- <el-form-item label="" class="mab" prop="isBanciSelected" label-width="90">
 				    <el-checkbox 
 				      v-model="add_gdscgdformData['合并']" 
 				      class="custom-checkbox"
 				    >
 				      <span style="color: red;">需要将订单数据合并请勾选</span>
 				    </el-checkbox>
-				  </el-form-item>
+				  </el-form-item> -->
 				</div>
 		      </div>
 		    </el-form>
@@ -524,17 +527,25 @@
 		  </template>
 		</el-dialog>
 
-		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="关联订单资料" width="55%" top="2%" destroy-on-close>
-            <el-form>
+		<el-dialog v-model="Related_fabricsVisible" :before-close="Related_fabricscloseDialog" title="关联订单面料" style="width: 100%;height: 100%;margin: 0px;" top="2%" destroy-on-close>
+         <!--   <div class="dialog-footer" style="text-align: left;">
+              <el-button @click="Related_fabricscloseDialog">取消</el-button>
+              <el-button type="primary" @click="Related_fabricsenterDialog">确定</el-button>
+            </div>
+			<br> -->
+			<el-form>
               <div>
-                <el-form-item label="关键字:"  class="mab" prop="keyOrder">
                   <el-space>
-                    <el-input v-model="glddzl_keyword" style="width: 100%;"/>
-                    <el-button @click="ddsearchHandle(glddzl_keyword)">搜索</el-button>
+					  <el-button @click="Related_fabricscloseDialog">关闭</el-button>
+					  <el-button type="primary" @click="Related_fabricsenterDialog">确定关联</el-button>
+                    <el-input v-model="glddzl_keyword" style="width: 300px;"  placeholder="请搜索订单编号或款号在进行关联" @input="real_handleInput"/>
+                    <el-button type="primary" @click="ddsearchHandle(glddzl_keyword)">搜索</el-button>
+					<span style="color: red;">请选择需要关联复用的颜色物料</span>
                   </el-space>
-                </el-form-item>
+				  <br>
+				  <br>
                 <el-table ref="multipleTable"
-                          :row-style="{ height: '20px' }"
+                          :row-style="{ height: '30px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }"
                           :show-overflow-tooltip="true"
@@ -542,34 +553,31 @@
                           highlight-current-row="true"
                           @row-dblclick="bombomupdateCompanyFunc2"
 						  @selection-change="glddSelectionChange"
-                          style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
-                 <el-table-column type="selection" width="30" />
+                          style="width: 100%;height: 80vh" border tooltip-effect="dark" :data="glddtableData" row-key="ID">
+                 <el-table-column type="selection" width="40" />
                   <el-table-column align="left" label="订单编号" prop="订单编号"  width="105"/>
+				  <el-table-column align="left" label="生产款号" prop="生产款号"  width="160"/>
+				  <el-table-column align="left" label="BOM_物料编码" prop="BOM_物料编码"  width="160"/>
+				  <el-table-column align="left" label="颜色" prop="颜色"  width="100"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="170"/>
-                  <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="100"/>
-                  <el-table-column align="left" label="id" prop="ID"  width="100"/>
+                  <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="110"/>
+				  <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="60"/>
+				  <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="180"/>
-				  <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="BOM_物料编码" prop="BOM_物料编码"  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="160"/>
-				  <el-table-column align="left" label="裁床退回仓库面料" prop="裁床退回仓库面料"  width="160"/>
+				  <!-- <el-table-column align="left" label="客户编号" prop="客户编号"  width="100" /> -->
+				  <!-- <el-table-column align="left" label="id" prop="ID"  width="100"/> -->
 				  <!-- <el-table-column align="left" label="UNIQID" prop="UNIQID"  width="80"/> -->
                 </el-table>
               </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>		
 		
@@ -1680,7 +1688,7 @@ const addgd_onclick = async () => {
 	add_gdscgdformData['箱唛要求'] = ''
 	add_gdscgdformData['粘衬'] = ''
 	add_gdscgdformData['订单数量'] = ''
-	add_gdscgdformData['合并'] = false
+	// add_gdscgdformData['合并'] = false
 }
 
 //新增工单资料确定
@@ -1727,7 +1735,7 @@ const add_gdenterDialog = async ()=>{
 		粘衬: add_gdscgdformData['粘衬'],
 		订单数量: add_gdscgdformData['订单数量'],
 		单位: add_gdscgdformData['单位'],
-		water: add_gdscgdformData['合并'] ? 1 : null,
+		// water: add_gdscgdformData['合并'] ? 1 : null,
 		Sys_id: _username.value,
 		接单日期: currentDates,
 		img: add_gdscgdformData.img,
@@ -1755,11 +1763,20 @@ const add_gdcloseDialog = () => {
 const Related_fabricsVisible = ref(false)
 const glddzl_keyword = ref('')
 const glddtableData = reactive([])
+// 关联订单面料按钮
 const Related_fabrics = () => {
 	Related_fabricsVisible.value = true
+	ddsearchHandle()
 }
+
+//实时触发input
+const real_handleInput = async ()=>{
+	glddtableData.splice(0, glddtableData.length);//清空表格
+	ddsearchHandle()
+}
+
 const ddsearchHandle = async (v) => {
-  const response = await fabricList({order:v});
+	const response = await fabricList({order:v});
   if (response.data && response.data.length === 0) {
     ElMessage({type: 'warning',message: '未查询到搜索条件'})
   }else{