Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/api/yunyin/yunying.js

@@ -531,6 +531,14 @@ export const ProcessDetailDel  = (params) => {
         params
     })
 }
+//工艺资料添加->工序损耗代码
+export const WastageList  = (params) => {
+    return service({
+        url: '/mes_server/work_order/WastageList',
+        method: 'get',
+        params
+    })
+}
 
 /**工单生产排单(排产管理)*/
 //计划中工单

src/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue

@@ -296,7 +296,7 @@ const GetMachineDetail = async() => {
 		    textStyle: {
 		      fontWeight: 'bolder',
 		      fontSize: 16,
-		  
+
 		    },
 		  }
 		  option2.value={

src/view/performance/Manualdocuments.vue

@@ -307,22 +307,21 @@ const treeData = reactive([]);
 const getTabdata = async () => {
     //接口调用函数
     const response  = await getInspectCount();
-	console.log(response)
 	
-const transformedData = response.data.map(item => ({
-	      label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
-	      children: item.sys.map(sysItem => ({
-	        label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
-	        params: {
-	          date: item.date.replace(/-/g, '.'),
-	          sys_id: sysItem.sys_id,
-	          total: sysItem.count,
-	        },
-	      })),
-	    }));
-	    treeData.splice(0, treeData.length, ...transformedData);
-        displayMod.value = 'date'
-	}
+	const transformedData = response.data.map(item => ({
+		  label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
+		  children: item.sys.map(sysItem => ({
+			label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
+			params: {
+			  date: item.date.replace(/-/g, '.'),
+			  sys_id: sysItem.sys_id,
+			  total: sysItem.count,
+			},
+		  })),
+	}));
+	treeData.splice(0, treeData.length, ...transformedData);
+	displayMod.value = 'date'
+}
 
 getTabdata();
 
@@ -1364,21 +1363,7 @@ const updateDetailData = async() => {
    sczl_fp12: formData.value.sczl_fp12,
    sys_id:'[1013/洪丽]',
   }
-  // detailData.table.forEach((item, index, array) => {
-  //   const num = index + 1
-  //   restoredData[`sczl_gdbh${num}`] = item.sczl_gdbh
-  //   restoredData[`sczl_yjGx${num}`] = item.sczl_yjGx
-  //   restoredData[`sczl_gxmc${num}`] = item.sczl_gxmc
-  //   // restoredData[`Gd_cpmc${num}`] = item.Gd_cpmc
-  //   restoredData[`sczl_cl${num}`] = item.sczl_cl
-  //   restoredData[`sczl_PgCl${num}`] = item.sczl_PgCl
-  //   restoredData[`sczl_clAdd${num}`] = item.sczl_clAdd
-  // })
   if(ADD.value=='新增'){
-  	 // console.log('新增')
-  	 console.log('新增')
-  	 console.log(ADD.value)
-  	 console.log(restoredData)
   	 const response = await inspectadd(restoredData);
   	 // ADD.value='1'
   	 // console.log(ADD.value)
@@ -1393,9 +1378,6 @@ const updateDetailData = async() => {
   	 dialogFormVisible.value = false
   }else{
   	const response = await shougongedit(restoredData);
-  	 console.log('修改')
-  	  console.log(ADD.value)
-  	  console.log(response)
 	  if(response.code==0){
 	  		 ElMessage({
 	  		   type: 'success',
@@ -1403,17 +1385,7 @@ const updateDetailData = async() => {
 	  		 })
 	  }
 	  dialogFormVisible.value = false
-  	 // ADD.value='0'
-  	 // console.log(ADD.value)
   }
- //  console.log(restoredData)
- //    console.log(lastCellValue)
- //    formData.value.UniqId=lastCellValue
- //    console.log(formData)
-	// restoredData.UniqId='5'
-   
-  // console.log(FormData)
-  // console.log(response)
 }
 // 删除
 function onDel() {

src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -9,17 +9,17 @@
               <el-input v-model="searchInfo" placeholder="搜索产品编号或产品名称"  style="width: 180px;"></el-input>
               <el-button type="primary" icon="search" @click="onSubmit" class="search"></el-button>
               <el-button type="primary" icon="edit" @click="onStatusClick" class="bt"><i class="el-icon-edit"></i>状态设置</el-button>
-              <!-- <el-button type="primary"  class="bt" icon="edit" @click="">工艺方案复制</el-button>-->
-              <el-button type="primary" class="bt" icon="edit"     @click="gygmClick" >工艺方案更名</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="fjClick" >工艺方案附加</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="jsssxzClick" >计损色数修正</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="fjfpxsClick" >质检废品系数</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="pccstzClick" >排产参数调整</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="hscstzClick" >核算参数调整</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="addcpyj_onclick" >新增印件资料</el-button>
-              <el-button type="primary" class="bt" icon="edit"     @click="addcpgy_onclick" >新增工艺资料</el-button>
-              <el-button type="primary" class="bt" icon="Download" @click="cpexportToExcel" disabled>导出产品资料</el-button>
-              <el-button type="primary" class="bt" icon="Download" @click="gyexportToExcel" disabled>导出工艺流程</el-button>
+<!--              <el-button type="primary" class="bt" icon="edit"  @click="cpgyfzclick">产品工艺复制</el-button>-->
+              <el-button type="primary" class="bt" icon="edit"  @click="gygmClick" >工艺方案更名</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="fjClick" >工艺方案附加</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="jsssxzClick" >计损色数修正</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="fjfpxsClick" >质检废品系数</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="pccstzClick" >排产参数调整</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="hscstzClick" >核算参数调整</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="addcpyj_onclick" >新增印件资料</el-button>
+              <el-button type="primary" class="bt" icon="edit"  @click="addcpgy_onclick" >新增工艺资料</el-button>
+<!--              <el-button type="primary" class="bt" icon="Download" @click="cpexportToExcel" disabled>导出产品资料</el-button>-->
+<!--              <el-button type="primary" class="bt" icon="Download" @click="gyexportToExcel" disabled>导出工艺流程</el-button>-->
             </el-form-item>
           </el-form>
 
@@ -39,6 +39,34 @@
             </div>
           </el-dialog>
 
+          <!-- 产品工艺复制-->
+          <el-dialog v-model="cpgyfzlist" title="产品工艺复制"  style="width: 35%;top: 15%;">
+              <el-form-item label="参照产品代号:" prop="process" class="mab">
+                <el-input v-model="cpgyfzformData['process']"  placeholder="" style="width: 160px;"/>
+                <el-input v-model="cpgyfzformData['processName']" placeholder="" style="width: 360px;"/>
+              </el-form-item>
+              <el-form-item label="参照工艺方案:" prop="process" class="mab">
+                <el-input v-model="cpgyfzformData['gongyifa']" placeholder="" style="width: 160px;"/>
+              </el-form-item>
+
+            <el-form-item label="目标产品代号:" prop="process" class="mab">
+              <el-input v-model="cpgyfzformData['mubprocess']"  placeholder="" style="width: 160px;"/>
+              <el-input v-model="cpgyfzformData['mubprocessName']" placeholder="" style="width: 360px;"/>
+            </el-form-item>
+
+            <el-form-item label="" class="mab" >
+              <el-checkbox  v-model="cpgyfzformData['fzgyzl']">复制工艺资料</el-checkbox>
+            </el-form-item>
+            <el-form-item label="" class="mab" >
+              <el-checkbox  v-model="cpgyfzformData['fzybzl']">复制印版资料</el-checkbox>
+            </el-form-item>
+
+              <div class="dialog-footer" style="text-align: right ">
+                <el-button @click="cpgyfzhandleCancel">取消</el-button>
+                <el-button type="primary" @click="cpgyfzhandleConfirm">确定</el-button>
+              </div>
+          </el-dialog>
+
           <!--工艺方案更名-->
           <el-dialog v-model="gygmlist" title="工艺方案更名"  style="width: 35%;top: 15%;">
               <el-form-item label="产品代号:" prop="process" class="mab">
@@ -555,19 +583,19 @@
                       @row-click="tableRowClick"
                       :show-overflow-tooltip="true">
               <el-table-column type="selection" width="30" />
-              <el-table-column sortable  align="left" label="产品编号" prop="产品编号" width="115" />
-              <el-table-column sortable  align="left" label="产品名称" prop="产品名称" width="340" />
-              <el-table-column sortable  align="left" label="版本号" prop="版本号" width="100"/>
-              <el-table-column sortable  align="left" label="成品规格" prop="成品规格" width="100" />
-              <el-table-column sortable  align="left" label="单位" prop="计量单位" width="100"/>
-              <el-table-column sortable  align="left" label="产品分类" prop="产品类别" width="100" />
-              <el-table-column sortable  align="left" label="最近接单时间" prop="receiveDate" width="160" />
-              <el-table-column sortable  align="left" label="印件数" prop="yjData" width="100" />
-              <el-table-column  sortable align="left" label="工艺" prop="gyData" width="100"/>
-              <el-table-column sortable  align="left" label="当前状态" prop="状态"  width="100"/>
-              <el-table-column sortable  align="left" label="最后修改" prop="Sys_id" width="160" />
-              <el-table-column sortable  align="left" label="建档日期" prop="Sys_rq" width="160" />
-              <el-table-column  sortable  align="left" label="更新日期" prop="Mod_rq" width="160" />
+              <el-table-column   align="left" label="产品编号" prop="产品编号" width="115" />
+              <el-table-column   align="left" label="产品名称" prop="产品名称" width="340" />
+              <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="100"/>
+              <el-table-column   align="left" label="产品分类" prop="产品类别" width="100" />
+              <el-table-column   align="left" label="最近接单时间" prop="receiveDate" width="160" />
+              <el-table-column   align="left" label="印件数" prop="yjData" width="100" />
+              <el-table-column   align="left" label="工艺" prop="gyData" width="100"/>
+              <el-table-column   align="left" label="当前状态" prop="状态"  width="100"/>
+              <el-table-column   align="left" label="最后修改" prop="Sys_id" width="160" />
+              <el-table-column   align="left" label="建档日期" prop="Sys_rq" width="160" />
+              <el-table-column    align="left" label="更新日期" prop="Mod_rq" width="160" />
             </el-table>
             <div class="gva-pagination">
               <el-pagination
@@ -594,20 +622,20 @@
                         :header-cell-style="{ padding: '0px' }"
                         @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column sortable type="selection" width="30" />
-                <el-table-column sortable align="left" label="印件号" prop="yj_yjno"  width="80"/>
-                <el-table-column sortable align="left" label="印件代号" prop="yj_yjdh" width="100" />
-                <el-table-column sortable align="left" label="印件名称" prop="yj_yjmc" width="540" />
-                <el-table-column sortable align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
-                <el-table-column sortable align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
-                <el-table-column sortable align="left" label="投料规格" prop="yj_tlgg" width="240"/>
-                <el-table-column sortable align="left" label="开料规格" prop="yj_klgg" width="100"/>
-                <el-table-column sortable align="left" label="开数" prop="yj_ks" width="80" />
-                <el-table-column sortable align="left" label="联数" prop="yj_ls" width="80" />
-                <el-table-column sortable align="left" label="备注" prop="yj_desc" width="200" />
-                <el-table-column sortable align="left" label="建档用户" prop="sys_id" width="130" />
-                <el-table-column sortable align="left" label="建档日期" prop="sys_rq" width="160" />
-                <el-table-column sortable align="left" label="更新日期" prop="mod_rq" width="160"/>
+                <el-table-column  type="selection" width="30" />
+                <el-table-column  align="left" label="印件号" prop="yj_yjno"  width="80"/>
+                <el-table-column  align="left" label="印件代号" prop="yj_yjdh" width="100" />
+                <el-table-column  align="left" label="印件名称" prop="yj_yjmc" width="540" />
+                <el-table-column  align="left" label="纸张单号" prop="yj_zzdh" width="100"/>
+                <el-table-column  align="left" label="纸张名称" prop="yj_zzmc" width="340"/>
+                <el-table-column  align="left" label="投料规格" prop="yj_tlgg" width="240"/>
+                <el-table-column  align="left" label="开料规格" prop="yj_klgg" width="100"/>
+                <el-table-column  align="left" label="开数" prop="yj_ks" width="80" />
+                <el-table-column  align="left" label="联数" prop="yj_ls" width="80" />
+                <el-table-column  align="left" label="备注" prop="yj_desc" width="200" />
+                <el-table-column  align="left" label="建档用户" prop="sys_id" width="130" />
+                <el-table-column  align="left" label="建档日期" prop="sys_rq" width="160" />
+                <el-table-column  align="left" label="更新日期" prop="mod_rq" width="160"/>
               </el-table>
             </el-tab-pane>
 
@@ -623,27 +651,27 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange"
                         @row-click="clickybupdate">
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" sortable  label="方案" prop="方案"  width="70"/>
-                <el-table-column align="left" sortable  label="印件" prop="Gy0_yjno" width="80" />
-                <el-table-column align="left" sortable  label="工序" prop="Gy0_gxh" width="70" />
-                <el-table-column align="left" sortable  label="工序名称" prop="gy0_gxmc" width="120" />
-                <el-table-column align="left" sortable  label="工序名称" prop="add_gxmc" width="340" />
-                <el-table-column align="left" sortable  label="开数" prop="Gy0_Ks" width="70" />
-                <el-table-column align="left" sortable  label="联数" prop="Gy0_ls" width="70" />
-                <el-table-column align="left"  sortable label="备注" prop="备注" width="150" />
-                <el-table-column align="left" sortable  label="工价系数" prop="工价系数" width="100" />
-                <el-table-column align="left" sortable  label="损耗系数" prop="损耗系数" width="100" />
-                <el-table-column align="left" sortable  label="计损色数" prop="Gy0_Ms" width="100" />
-                <el-table-column align="left" sortable  label="人工检_正品版" prop="人工检_正品版" width="120" />
-                <el-table-column align="left" sortable  label="人工检_次品版" prop="人工检_正品版" width="120" />
-                <el-table-column align="left" sortable  label="人工检_废检" prop="人工检_废检" width="120"/>
-                <el-table-column align="left" sortable  label="机检_正品版" prop="机检_正品版" width="120"/>
-                <el-table-column align="left" sortable  label="机检_次品检" prop="机检_次品检" width="120"/>
-                <el-table-column align="left" sortable  label="机检_废检" prop="机检_废检" width="120"/>
-                <el-table-column align="left" sortable  label="设备编号" prop="Gy0_sbmc" width="100"/>
-                <el-table-column align="left" sortable  label="最后修改" prop="最后修改" width="160"/>
-                <el-table-column align="left" sortable  label="建档日期" prop="建档日期" width="160"/>
-                <el-table-column align="left" sortable  label="更新日期" prop="更新日期" width="160"/>
+                <el-table-column align="left"   label="方案" prop="方案"  width="70"/>
+                <el-table-column align="left"   label="印件" prop="Gy0_yjno" width="80" />
+                <el-table-column align="left"   label="工序" prop="Gy0_gxh" width="70" />
+                <el-table-column align="left"   label="工序名称" prop="gy0_gxmc" width="120" />
+                <el-table-column align="left"   label="工序名称" prop="add_gxmc" width="340" />
+                <el-table-column align="left"   label="开数" prop="Gy0_Ks" width="70" />
+                <el-table-column align="left"   label="联数" prop="Gy0_ls" width="70" />
+                <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="100" />
+                <el-table-column align="left"   label="计损色数" prop="Gy0_Ms" width="100" />
+                <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="120"/>
+                <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="120"/>
+                <el-table-column align="left"   label="设备编号" prop="Gy0_sbmc" width="100"/>
+                <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>
             </el-tab-pane>
 
@@ -658,15 +686,15 @@
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
               >
                 <el-table-column type="selection" width="30" />
-                <el-table-column align="left" sortable label="方案" prop="YB_方案"  width="70"/>
-                <el-table-column align="left" sortable label="印件号" prop="YB_Yjno" width="80" />
-                <el-table-column align="left" sortable label="印版类别" prop="印版类别" width="100" />
-                <el-table-column align="left" sortable label="存货编码" prop="存货编码" width="100"/>
-                <el-table-column align="left" sortable label="印版名称" prop="印版名称"  width="440"/>
-                <el-table-column align="left" sortable label="考核印数" prop="考核印数" width="100"/>
-                <el-table-column align="left" sortable label="建档用户" prop="Sys_id" width="120" />
-                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
+                <el-table-column align="left"  label="方案" prop="YB_方案"  width="70"/>
+                <el-table-column align="left"  label="印件号" prop="YB_Yjno" width="80" />
+                <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="440"/>
+                <el-table-column align="left"  label="考核印数" prop="考核印数" width="100"/>
+                <el-table-column align="left"  label="建档用户" prop="Sys_id" width="120" />
+                <el-table-column align="left"  label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left"  label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 
@@ -679,14 +707,14 @@
                         highlight-current-row="true"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="jstableData" row-key="ID" @selection-change="handleSelectionChange">
                 <!--              <el-table-column type="selection" width="55" />-->
-                <el-table-column align="left" sortable label="序号" prop="序号"  width="120"/>
-                <el-table-column align="left" sortable label="适用工序" prop="适用工序" width="120" />
-                <el-table-column align="left" sortable label="备注" prop="备注" width="120" />
-                <el-table-column align="left" sortable label="文件类型" prop="文件类型" width="120"/>
-                <el-table-column align="left" sortable label="关联产品" prop="关联产品"  width="360"/>
-                <el-table-column align="left" sortable label="建档用户" prop="建档用户" width="120"/>
-                <el-table-column align="left" sortable label="建档日期" prop="建档日期" width="160" />
-                <el-table-column align="left" sortable label="更新日期" prop="更新日期" width="160" />
+                <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="120" />
+                <el-table-column align="left"  label="文件类型" prop="文件类型" width="120"/>
+                <el-table-column align="left"  label="关联产品" prop="关联产品"  width="360"/>
+                <el-table-column align="left"  label="建档用户" prop="建档用户" width="120"/>
+                <el-table-column align="left"  label="建档日期" prop="建档日期" width="160" />
+                <el-table-column align="left"  label="更新日期" prop="更新日期" width="160" />
               </el-table>
             </el-tab-pane>
 
@@ -860,7 +888,7 @@
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="备注说明:" prop="remark" class="mab" label-width="105px">
-                        <el-input type="textarea" v-model="yjformDataTest['yj_desc']" rows="4"  placeholder="" resize="none" id="yj_desc"  @keydown="yj_ent($event, '换算系数', 'yj_desc', '印件号')"/>
+                        <el-input type="textarea" v-model="yjformDataTest['yj_desc']" rows="3"  placeholder="" resize="none" id="yj_desc"  @keydown="yj_ent($event, '换算系数', 'yj_desc', '印件号')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -938,7 +966,7 @@
                                   </el-row>
                                 </el-form-item>
                               </el-col>
-          
+
                             </el-row>
                             <el-row>
                               <el-col :span="8">
@@ -963,16 +991,16 @@
                                   <el-input v-model="add_yjzlformdata.ls" placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
                                 </el-form-item>
                               </el-col>
-							  <el-col :span="10">
-							    <el-form-item label="换算系数(公斤到万张):" prop="address" class="mab">
-							      <el-input v-model="add_yjzlformdata.KgToPages" placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
-							    </el-form-item>
-							  </el-col>
+                              <el-col :span="10">
+                                <el-form-item label="换算系数(公斤到万张):" prop="address" class="mab">
+                                  <el-input v-model="add_yjzlformdata.KgToPages" placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
+                                </el-form-item>
+                              </el-col>
                             </el-row>
                             <el-row>
                               <el-col :span="24">
                                 <el-form-item label="备注说明:" prop="remark" class="mab">
-                                  <el-input v-model="add_yjzlformdata['备注说明']" type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+                                  <el-input v-model="add_yjzlformdata['备注说明']" type="textarea" rows="3" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
                                 </el-form-item>
                               </el-col>
                             </el-row>
@@ -986,7 +1014,7 @@
                         </div>
                       </template>
                     </el-dialog>
-		  
+
 		  <!-- 新增印件资料弹窗 -->
 		 <!-- <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
 		             style="width: 70%;margin: 8px auto" :title="'新增印件资料'" destroy-on-close>
@@ -1050,7 +1078,7 @@
 		        <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="3" clearable placeholder=""  />
 		      </el-form-item>
 		    </el-form>
-		  
+
 		    <template #footer>
 		      <div class="dialog-footer" style="text-align: right;">
 		        <el-button @click="add_dyjcloseDialog">取消</el-button>
@@ -1058,7 +1086,7 @@
 		      </div>
 		    </template>
 		  </el-dialog> -->
-		  
+
 		  <!-- 新增查询印件代码 -->
 		  <el-dialog v-model="searchModel" :before-close="() => searchModel = false">
 		    <el-form>
@@ -1075,8 +1103,8 @@
 		      </div>
 		    </el-form>
 		  </el-dialog>
-		  
-		  
+
+
 		  <!-- 新增查询印件纸张 -->
 		  <el-dialog v-model="searchZhiModel" :before-close="() => searchZhiModel = false">
 		    <el-form>
@@ -1193,7 +1221,7 @@
               </div>
             </template>
           </el-dialog>
-		  
+
 		  <!-- 新增工艺资料 弹窗 -->
 		  <el-dialog v-model="addgydialogFormVisible" :before-close="addgycloseDialog" :title="'新增工艺资料'" height="300px" width="900px" destroy-on-close>
 		    <el-row>
@@ -1216,7 +1244,7 @@
 		                <el-input v-model="add_gyformData.Gy0_ls"  placeholder="" style="width: 90px;" id="Gy0_ls"  @keydown="ent($event, '加工开数', 'Gy0_ls', 'gy0_site')"/>
 		              </el-form-item>
 		          </el-row>
-		  
+
 		          <el-row>
 		            <el-col :span="6">
 		              <el-form-item label="车间名称:" prop="address" class="mab">
@@ -1229,7 +1257,7 @@
 		              </el-form-item>
 		            </el-col>
 		          </el-row>
-		  
+
 		          <el-row>
 		            <el-col :span="24">
 		              <el-form-item label="工序名称:" prop="address" class="mab">
@@ -1237,7 +1265,7 @@
 		              </el-form-item>
 		            </el-col>
 		          </el-row>
-		  
+
 		          <el-row>
 		              <el-form-item label="计损色数:" prop="address" class="mab">
 		                <el-input v-model="add_gyformData.Gy0_Ms"  placeholder="" style="width: 140px;" id="Gy0_sbbh"  @keydown="ent($event, 'add_gxmc', 'Gy0_sbbh', 'sys_mc')"/>
@@ -1249,7 +1277,7 @@
 		                <el-input v-model="add_gyformData.难度系数"   placeholder="" style="width: 90px;" id="工价系数" />
 		              </el-form-item>
 		          </el-row>
-		  
+
 		          <el-row>
 		              <el-form-item label="标准损耗:" prop="address" class="mab">
 		                <el-input v-model="add_gyformData.标准损耗"  @keyup.enter="getSH()"  placeholder="" style="width: 150px;" id="Gy0_shdh" />
@@ -1265,7 +1293,7 @@
 		                <el-input v-model="add_gyformData.损耗系数"   placeholder="" style="width: 90px;" id="损耗系数"/>
 		              </el-form-item>
 		          </el-row>
-		  
+
 		          <el-row>
 		            <el-col :span="24">
 		              <el-form-item label="工序备注:" prop="remark" class="mab">
@@ -1293,7 +1321,7 @@
 		      </div>
 		    </template>
 		  </el-dialog>
-		  
+
 		  <!-- 新增查询车间名称 -->
 		  <el-dialog v-model="searchCJModel" :before-close="() => searchCJModel = false">
 		    <el-form>
@@ -1307,11 +1335,11 @@
 		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
 		          <el-tree :data="getCJListdata" :props="defaultProps" @node-click="selectCJNode" />
 		        </div>
-				
+
 		      </div>
 		    </el-form>
 		  </el-dialog>
-		  
+
 		  <!-- 新增查询标准损耗 -->
 		  <el-dialog v-model="searchSHModel" :before-close="() => searchSHModel = false">
 		    <el-form>
@@ -1324,7 +1352,7 @@
 		        </el-form-item> -->
 		        <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
 		          <el-tree :data="getSHListdata" :props="defaultProps" @node-click="selectSHNode" />
-		        </div>		  				
+		        </div>
 		      </div>
 		    </el-form>
 		  </el-dialog>
@@ -1332,7 +1360,7 @@
           <!-- 修改印版资料 弹窗 -->
           <el-dialog v-model="ybdialogFormVisible" :before-close="ybcloseDialog" :title="'修改印版资料'" destroy-on-close>
             <el-row>
-              <el-scrollbar height="500px">
+              <el-scrollbar >
                 <el-form :model="ybformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
                   <el-row>
                     <el-col :span="8">
@@ -1754,6 +1782,32 @@ const fjhandleCancel = () => {
   fjlist.value = false;
 };
 
+// =========== 产品工艺复制 ===========
+const cpgyfzlist = ref(false);
+const cpgyfzformData = reactive({
+  process: '',
+  processName: '',
+  gongyifa:'',
+  mubprocess: '',
+  mubprocessName: '',
+  fzgyzl: '',
+  fzybzl: true,
+});
+const cpgyfzclick = async () => {
+  if(_product_code.value == null){
+    gygmlist.value = false;
+    ElMessage({
+      type: 'warning',
+      message: '请选择分类项目，再操作此功能'
+    })
+  }else{
+    cpgyfzlist.value = true;
+    cpgyfzformData.process = _product_code.value;
+  }
+
+};
+
+
 // =========== 工艺方案更名 ===========
 const gygmlist = ref(false);
 const _gygmstacode = ref(null);
@@ -1802,6 +1856,13 @@ const gygmhandleCancel = () => {gygmlist.value = false;};
 
 // 点击工艺方案更名【执行】按钮
 const gygmhandleConfirm = async () => {
+  if(gyformData.newName === ''){
+    ElMessage({
+      type: 'warning',
+      message: '工艺方案新名不能为空'
+    })
+    return;
+  }
   gygmlist.value = false;
   let params = {}
   params.code = gyformData.process;
@@ -2127,8 +2188,8 @@ const tableRowClick = async (row) => {
 	  tmp = tmp.sort((a,b)=>b-a)
 	  yjzuidahaoma.value = Number(tmp[0]) + 1
   }
-  
-  
+
+
   // console.log(yjzuidahaoma.value)
   // yjzuidahaoma.value = yjtableData.length+1
 };
@@ -2366,7 +2427,7 @@ const selectZhiNode = (v) => {
       add_yjzlformdata['zzmc'] = v.物料名称
 	  console.log(v.物料代码)
 	  console.log(v.物料名称)
-	  
+
     } else {
       add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
       add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
@@ -2443,9 +2504,9 @@ const add_gdyjenterDialog = () => {
   const res=addProductYjInfo(formattedData)
   console.log(res)
   // if(res.code==0){
-	  
+
   // }else{
-	  
+
   // }
   // add_gdyjdialogFormVisible.value = false
 }
@@ -2498,7 +2559,7 @@ const getcjmc = (code) => {
   // if (code.key==='Tab') {
   //   setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
   //   _getCJList();
-      	
+
   // }
   _getCJList()
 }
@@ -2532,10 +2593,10 @@ const _getCJList = async () => {
 };
 const selectCJNode = (nodeData) => {
   console.log(nodeData.level)
-  
+
   if(nodeData.level==2){
 	console.log(nodeData.label)
-	add_gyformData.Gy0_site=nodeData.label 
+	add_gyformData.Gy0_site=nodeData.label
   }
   if(nodeData.level==3){
 	console.log(nodeData.label)
@@ -2561,9 +2622,9 @@ const _getSH = async () => {
 //   console.log(data)
 //   data.forEach(item => {
 //     map[item.sys_bh] = { label: `${item.sys_bh} ${item.sys_mc}`, level: 1, children: [] };
-	
+
 //   });
-  
+
 
 //   data.forEach(item => {
 //     if (item.Parent !== "0_") {
@@ -2611,9 +2672,9 @@ const addgyenterDialog = () => {
   const res=addProductGyInfo(formattedData)
   console.log(res)
   if(res.code==0){
-	  
+
   }else{
-	  
+
   }
   addgydialogFormVisible.value = false
 }

src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -12,19 +12,19 @@
               <el-input v-model="form['工序']"  id="工序编号" @keydown="add_gyzlent($event, '印件编号', '工序编号', '重点工序')"  style="width: 100px;"/>
             </el-form-item>
             <el-form-item label="重点工序:"  class="mab" prop="keyOrder" label-width=" 90">
-              <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 140px;">
+              <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 130px;">
                 <el-option value=""></el-option>
                 <el-option value="重点工序">重点工序</el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="备选工序："  class="mab" prop="isBanciSelected" label-width=" 90">
+            <el-form-item label="备选工序："  class="mab" prop="isBanciSelected" label-width=" 100">
               <el-checkbox v-model="form['备选工序']"></el-checkbox>
             </el-form-item>
-            <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 125">
-              <el-input  v-model="form['开数']"  style="width: 100px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
+            <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 100">
+              <el-input  v-model="form['开数']"  style="width: 80px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
             </el-form-item>
             <el-form-item label="加工联数:"  class="mab" prop="keyOrder" label-width=" 80">
-              <el-input  v-model="form['联数']"  style="width: 100px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
+              <el-input  v-model="form['联数']"  style="width: 80px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
             </el-form-item>
           </div>
           <div style="display: flex; gap: 0px;">
@@ -93,15 +93,16 @@
       </el-form>
 
       <template #footer>
-        <div class="dialog-footer" style="text-align: right;top: auto">
+        <div class="dialog-footer" style="text-align: right;top: auto;">
           <el-button @click="add_gdgycloseDialog">取 消</el-button>
-          <el-button type="primary" @click="add_gdgyenterDialog">确 定</el-button>
+          <el-button type="primary" disabled @click="add_gdgyenterDialog">确 定</el-button>
         </div>
       </template>
     </el-dialog>
 
-    <el-dialog v-model="yjdisplay" :before-close="()=> yjdisplay = false" style="width: 800px;margin: 8px auto" :title="'可选列表'" destroy-on-close>
-      <el-tree :data="yjList" :props="{children: 'children',label: 'name', value: 'no'}" @node-click="changeHandle" default-expand-all style="border: 1px solid #ececec; padding: 10px">
+    <el-dialog v-model="yjdisplay" :before-close="()=> yjdisplay = false" style="width: 800px;" :title="'可选列表'" destroy-on-close>
+      <el-tree :data="yjList" :props="{children: 'children',label: 'name', value: 'no'}" @node-click="changeHandle"
+               default-expand-all style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;">
       </el-tree>
     </el-dialog>
 
@@ -111,23 +112,40 @@
           :render-after-expand="false"
           @node-click="selectHandle"
           :props="{children: 'children',label: 'label', value: 'value'}"
-          style="border: 1px solid #ececec; padding: 10px"
+          style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
           node-key="value"
           :default-expanded-keys="['标准工艺']"
       >
       </el-tree>
     </el-dialog>
+
+<!--    工序损耗列表-->
+    <el-dialog v-model="gxshdisplay" :before-close="()=> gxshdisplay = false" style="width: 800px;" :title="'工序损耗'" destroy-on-close>
+      <el-tree
+          :data="gxshList"
+          :render-after-expand="false"
+          @node-click="gxshselectHandle"
+          :props="{children: 'children',label: 'label', value: 'value'}"
+          style="border: 1px solid #ececec; padding: 10px;height: 400px;overflow: auto;"
+          node-key="value"
+          :default-expanded-keys="form['车间名称']"
+      >
+      </el-tree>
+    </el-dialog>
   </div>
 </template>
 
 <script setup>
 import {ref, reactive} from 'vue'
-import {gdzl_MachineList, PrintDetailList, getDepartName, capacityList} from "@/api/yunyin/yunying";
+import {gdzl_MachineList, PrintDetailList, WastageList,getDepartName, capacityList,
+} from "@/api/yunyin/yunying";
+import { ElMessage } from 'element-plus'
 
 const form = reactive({})
 const visible = ref(false)
 const yjdisplay = ref(false)
 const cjdisplay = ref(false)
+const gxshdisplay = ref(false)
 const id = ref()
 
 const gxList = ref([])
@@ -142,16 +160,26 @@ const cjList = ref([
 const gdzl_MachineList_address = ref()
 
 //新增工艺资料弹窗 键盘 input框跳转
-const add_gyzlent = (event,id1,id2,id3) => {
-  if (id2==='印件编号' && event.key==='Tab') {
+const add_gyzlent = async (event,id1,id2,id3) => {
+  if (id2==='印件编号' && event.key==='Tab' || id2 === '印件编号' && event.key=== 'Enter') {
     const node = yjList.value.find(item => item.no ===form['yjno'])
     if (! node) {
       yjdisplay.value = true
     }
+    document.getElementById(id3).focus()
   }
-  if (id2 === '车间名称' && event.key==='Tab') {
+  if (id2 === '车间名称' && event.key==='Tab' || id2 === '车间名称' && event.key=== 'Enter') {
+    document.getElementById(id3).focus()
     cjdisplay.value = true
   }
+  if (id2 === '工序损耗' &&  event.key==='Tab' || id2 === '工序损耗' && event.key=== 'Enter') {
+    if(form['车间名称']){
+      await getGxshList();
+      if (gxshList.value[0].children.length > 1) {
+        gxshdisplay.value = true
+      }
+    }
+  }
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
     if(id3!=''){
       document.getElementById(id3).focus()
@@ -193,6 +221,31 @@ const open = async (gdbh, gxlist) => {
   visible.value = true
 }
 
+//工序损耗列表
+const gxshList = ref([])
+const getGxshList = async ()=>{
+  const WastageList_data = await WastageList({search: form['车间名称']})
+  gxshList.value = [{
+    label: form['车间名称'],
+    value: form['车间名称'],
+    children: []
+  }]
+  if (WastageList_data.data.length === 0) return
+  if (WastageList_data.data.length > 1) {
+    gxshList.value[0].children = WastageList_data.data.map(item => {
+      return { label: `${item.编号} - ${item.名称}`, label2: item.名称, UniqId: item.UniqId, value: item.编号 }
+    })
+  } else {
+    form['shdh'] = WastageList_data.data[0].编号;
+    form['工序损耗名称'] = WastageList_data.data[0].名称;
+  }
+}
+//点击工序损耗列表数据
+const gxshselectHandle = async (node)=>{
+  form['shdh'] = node.value
+  form['工序损耗名称'] = node.label2
+  gxshdisplay.value = false
+}
 const selectHandle = async (node)=>{
   if (node.children && node.children.length> 0) return
   function findParentInTree(tree, targetValue) {
@@ -201,14 +254,12 @@ const selectHandle = async (node)=>{
       if (node.value === targetValue) {
         return node;
       }
-
       // 如果当前节点有子节点，递归地在子节点中查找
       if (node.children && node.children.length > 0) {
         let parent = findParentInTree(node.children, targetValue);
         if (parent) return parent
       }
     }
-
     // 如果没有找到目标值或其上级，返回null
     return null;
   }
@@ -222,9 +273,11 @@ const selectHandle = async (node)=>{
   form['设备编号'] = []
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:form['车间名称']});
-  console.log(MachineList_jitai)
   gdzl_MachineList_address.value = MachineList_jitai.data;
-
+  form['shdh'] = ''
+  form['工序损耗名称'] = ''
+  //通过车间名称查询工序损耗
+  await getGxshList()
   cjdisplay.value = false
 }
 
@@ -252,60 +305,67 @@ const changeHandle = (v) => {
   form['工序'] = (list.sort((a, b) => b-a)[0] + 1)
   yjdisplay.value = false
 }
-
+const _capacityListsbbh = ref(null)
 const sbbhclick = () => {
   _capacityList();
 }
 
 
 const _capacityList = async () => {
-  if(gdgyformData['设备编号'] === ''){
+  if(form['设备编号'] === ''){
     return false;
   }else{
-    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
+    _capacityListsbbh.value = form['设备编号'].join(' ');
     const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
-    gdgyformData['小时产能'] = editProductedit_machine.data;
+    form['小时产能'] = editProductedit_machine.data;
   }
 
 };
 
-// //默认弹窗关闭
-// const add_gdgydialogFormVisible = ref(false)
-// const add_gdgyformData = reactive({});
-// //清空对象的属性值
-// const gdgy_clearFormData = () => {
-//   Object.keys(add_gdgyformData).forEach(key => {
-//     add_gdgyformData[key] = '';
-//   });
-// };
-// //新增工艺资料弹窗
-// const addgdgy_onclick = () => {
-//   if(_Gd_gdbh.value == null){
-//     cgugdlist.value = false;
-//     ElMessage({
-//       type: 'warning',
-//       message: '请选择具体的工单后，再操作此功能'
-//     })
-//   }else{
-//     let gongxu = gytableData.value.map(item => {
-//       return item['印件-工序']
-//     })
-//     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
-//   }
-// }
-// //新增工艺资料确定
-// const add_gdgyenterDialog = async () => {
-//   console.log(add_gdgyformData)
-//   // const formattedData = {
-//   //   Yj_Gdbh: _Gd_gdbh.value,
-//   //   yj_Yjno: add_gdgyformData['yjno'],
-//   //   yj_Yjdh: add_gdgyformData['yjdh'],
-//   // };
-//   // console.log(formattedData)
-//   // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
-//   // console.log(ProcessDetailAdd_add)
-//   // add_gdgydialogFormVisible.value = false
-// }
+const sbbh = ref(null)
+
+//新增工艺资料确定
+const add_gdgyenterDialog = async () => {
+  if(!form['yjno']){
+    ElMessage({ type: 'warning', message: '印件编号不能为空' });return;
+  }
+  if(!form['工序']){
+    ElMessage({ type: 'warning', message: '工序编号不能为空' });return;
+  }
+  if(!form['车间名称']){
+    ElMessage({ type: 'warning', message: '车间名称不能为空' });return;
+  }
+  if(!form['设备编号']){
+    ElMessage({ type: 'warning', message: '设备编号不能为空' });return;
+  }
+  console.log(form)
+  sbbh.value = form['设备编号'].join(' ');
+  const formattedData = {
+    Gy0_gdbh: id.value,
+    Gy0_yjno: form['yjno'] ? form['yjno'] : "",
+    Gy0_gxh: form['工序'] ? form['工序'] : "",
+    重点工序: form['重点工序'] ? form['重点工序'] : "",
+    备选工序: form['备选工序'] ? form['备选工序'] : "",
+    Gy0_ks: form['开数'] ? form['开数'] : "",
+    Gy0_ls: form['联数'] ? form['联数'] : "",
+    车间名称: form['车间名称'] ? form['车间名称'] : "",
+    工艺名称: form['工艺名称'] ? form['工艺名称'] : "",
+    工序名称: form['工序名称'] ? form['工序名称'] : "",
+    计损色数: form['计损色数'] ? form['计损色数'] : "",
+    设备编号: sbbh.value ? sbbh.value : "",
+    工序损耗: form['shdh'] ? form['shdh'] : "",
+    工序损耗名称: form['工序损耗名称'] ? form['工序损耗名称'] : "",
+    装版工时: form['装版工时'] ? form['装版工时'] : "",
+    小时产能: form['小时产能'] ? form['小时产能'] : "",
+    备注: form['备注'] ? form['备注'] : "",
+    质量要求: form['质量要求'] ? form['质量要求'] : "",
+    质量隐患: form['质量隐患'] ? form['质量隐患'] : "",
+  };
+  console.log(formattedData)
+  // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
+  // console.log(ProcessDetailAdd_add)
+  // add_gdgydialogFormVisible.value = false
+}
 // 新增工艺资料取消
 const add_gdgycloseDialog = () => {
   visible.value = false

src/view/yunyin/shengchanguanli/components/print.vue

@@ -2630,11 +2630,11 @@ const cp_print_handleConfirm = async () => {
   const currentDate = `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
   const printdata  = {
     "minong": "https://shangbiaopic.11467.com/13/85/13855845.jpg",
-    "printcode":print_PrintJobOrder.data['二维码'],
+    "printcode":print_PrintJobOrder.data['生产批次号'],
     "dysj":currentDate,
     "scpch":print_PrintJobOrder.data['生产批次号'],
-    "xsddh":print_PrintJobOrder.data['生产批次号'],
-    // "xsddh":print_PrintJobOrder.data['销售订单号'],
+    // "xsddh":print_PrintJobOrder.data['生产批次号'],
+    "xsddh":print_PrintJobOrder.data['销售订单号'],
     "khdh":  print_PrintJobOrder.data['客户代码'],
     "khmc":  print_PrintJobOrder.data['客户名称'],
     "cpdm":  print_PrintJobOrder.data['产品代码'],

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -22,16 +22,16 @@
               <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="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="批量删除（印件资料或工艺资料）"  >删除</el-button>
+              <el-button type="primary" icon="edit"   @click="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="选择批量删除（印件资料或工艺资料）"  >删除</el-button>
             </el-form-item>
           </el-form>
 
           <!--按钮弹窗部分-->
           <!--U8投料试算-->
           <el-dialog v-model="tlsslist"     title="U8投料试算"   style="height: 100%;width: 100%;margin: 0;padding: 0">
-            <!--            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>-->
-            <!--            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>-->
-            <!--            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>-->
+            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>
+            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>
+            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>
             <el-button type="primary" icon="" @click="oncloneclick" style="margin: 5px">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <!-- 第一行 -->
@@ -152,7 +152,7 @@
               </el-form-item>
               <div class="dialog-footer" style="margin-top: 20px; text-align: right ">
                 <el-button @click="gxclhshandleCancel">取消</el-button>
-                <el-button type="primary"  @click="gxclhshandleConfirm">确定</el-button>
+                <el-button type="primary" disabled  @click="gxclhshandleConfirm">确定</el-button>
               </div>
             </div>
           </el-dialog>
@@ -326,68 +326,6 @@
                 </el-table-column>
               </template>
             </el-table>
-
-
-
-            <!--          <el-table ref="multipleTable"-->
-            <!--                    :show-overflow-tooltip="true"-->
-            <!--                    :row-style="{ height: '0px' }"-->
-            <!--                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"-->
-            <!--                    :header-cell-style="{ padding: '0px' }"-->
-            <!--                    style="width: 100%;height: 70vh" border tooltip-effect="dark"-->
-            <!--                    :data="scfjfpxstableData" row-key="ID" @selection-change="handleSelectionChange">-->
-            <!--            <el-table-column v-slot="scope" align="left" label=产品编号 width="120" >-->
-            <!--              <el-input disabled  v-model="scope.row.产品编号" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=产品名称 width="200" >-->
-            <!--              <el-input disabled  v-model="scope.row.产品名称" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=印件工序及工艺 width="220" >-->
-            <!--              <el-input disabled  v-model="scope.row.印件工序及工艺" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工正品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工次品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原人工废检 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_人工废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检正品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检次品板 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=原机检废检 width="110" >-->
-            <!--              <el-input disabled  v-model="scope.row.scfjfpxsold_机检废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工正品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工次品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新人工废检 width="110" >-->
-            <!--              <el-input   v-model="scope.row.人工废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检正品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检正品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检次品板 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检次品板" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=新机检废检 width="110" >-->
-            <!--              <el-input   v-model="scope.row.机检废检" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=设备编号 width="100" >-->
-            <!--              <el-input disabled  v-model="scope.row.设备编号" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--            <el-table-column v-slot="scope" align="left" label=客户名称 width="200" >-->
-            <!--              <el-input disabled  v-model="scope.row.客户名称" :clearable="false"/>-->
-            <!--            </el-table-column>-->
-            <!--          </el-table>-->
           </el-dialog>
 
           <!--工序产量核查【弹窗】-->
@@ -409,8 +347,7 @@
                       highlight-current-row="true"
                       @row-click="gxclhc_tableRowClick"
                       :data="gxclhc_Data" row-key="ID"
-                      :cell-class-name="gxclhcCellClass"
-            >
+                      :cell-class-name="gxclhcCellClass">
               <template v-for="(item, idx) in gxclhc_Columns">
                 <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
                   {{row[item.prop]}}
@@ -486,7 +423,7 @@
                         @row-dblclick="updateCompanyFunc"
                         @selection-change="handleSelectionChange"
                         :show-overflow-tooltip="true">
-                <el-table-column align="center" type="selection" width="30"/>
+<!--                <el-table-column align="center" type="selection" width="30"/>-->
                 <el-table-column align="left" label="获取状态"   prop="status"  width="81" />
                 <el-table-column align="left" label="工单编号"   prop="工单编号"  width="81" />
                 <el-table-column align="left" label="生产分类"   prop="生产分类" width="81" />
@@ -603,7 +540,7 @@
                           highlight-current-row="true"
                           @row-dblclick="gdbomupdateCompanyFunc"
                           style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column type="selection" width="30" />
+<!--                  <el-table-column type="selection" width="30" />-->
                   <el-table-column align="left" label="方案" prop="方案"  width="120"/>
                   <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
                   <el-table-column align="left" label="物料名称" prop="物料名称"  width="400"/>
@@ -811,10 +748,10 @@
                   </el-row>
                   <el-row :gutter="24">
                     <el-form-item label="印件代码:" prop="customerCode" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['印件代号']"   style="width: 110px;" id="印件代号"  @keydown="add_gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
+                      <el-input v-model="add_gdscgdformData['印件代号']" disabled  style="width: 110px;" id="印件代号"  @keydown="add_gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
                     </el-form-item>
                     <el-form-item label="印件名称:" prop="customerName" class="mab" label-width="75">
-                      <el-input v-model="add_gdscgdformData['印件名称']"  id="印件名称" style="width: 520px;"  @keydown="add_gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
+                      <el-input v-model="add_gdscgdformData['印件名称']" disabled id="印件名称" style="width: 520px;"  @keydown="add_gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
@@ -994,8 +931,8 @@
                 </div>
               </template>
             </el-dialog>
-			
-			
+
+
 			<!-- 新增印件资料 -->
 			          <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
 			            <el-row>
@@ -1059,7 +996,7 @@
 			                        </el-row>
 			                      </el-form-item>
 			                    </el-col>
-			
+
 			                  </el-row>
 			                  <el-row>
 			                    <el-col :span="8">
@@ -1908,8 +1845,8 @@ const add_gdcloseDialog = () => {
 //获取客户代号，客户名称
 const khdhModal = ref(false)
 const cpdhModal = ref(false)
-const khdhDataList = ref()
-const cpdhDataList = ref()
+const khdhDataList = ref([])
+const cpdhDataList = ref([])
 const khdh_keyword = ref('')
 const cpdh_keyword = ref('')
 
@@ -1981,8 +1918,17 @@ const selectGongDanNode = (node, type) => {
 //新增工单资料弹窗 键盘 input框跳转
 const add_gdzlent = async (event,id1,id2,id3) => {
   if (id2 === '客户代号' && event.key==='Tab' || id2 === '客户代号' && event.key=== 'Enter') {
-    await _gClientList()
-    khdhModal.value = true
+    await _gClientList(add_gdscgdformData['客户代号'])
+    if (khdhDataList.value != null) {
+      const row = khdhDataList.value.find(item => item.客户编号 === add_gdscgdformData['客户代号'])
+      if (row) {
+        add_gdscgdformData['客户名称'] = row.客户名称
+      } else {
+        khdhModal.value = true
+      }
+    } else {
+      khdhModal.value = true
+    }
   }
   if (id2 === '产品代号' && event.key==='Tab' || id2 === '产品代号' && event.key=== 'Enter') {
     await _ProductCodeList()
@@ -2088,10 +2034,7 @@ const openSearchZhiModal = (code, idx) => {
 const addgdyj_onclick = () => {
   if(_Gd_gdbh.value == null){
     cgugdlist.value = false;
-    ElMessage({
-      type: 'warning',
-      message: '请选择具体的工单后，再操作此功能'
-    })
+    ElMessage({type: 'warning',message: '请选择具体的工单后，再操作此功能' })
   }else{
     gdyj_clearFormData();
     // console.log(yjzuidahaoma.value)
@@ -2101,6 +2044,18 @@ const addgdyj_onclick = () => {
 //印件新增确定
 const add_gdyjenterDialog =  async  () => {
   // console.log(add_yjzlformdata)
+  if(add_yjzlformdata['yjno'] === ''){
+    ElMessage({type: 'warning',message: '印件号不能为空'})
+    return false;
+  }
+  if(add_yjzlformdata['yjdh'] === ''){
+    ElMessage({type: 'warning',message: '印件代号不能为空'})
+    return false;
+  }
+  if(add_yjzlformdata['zzdh'] === ''){
+    ElMessage({type: 'warning',message: '纸张编号不能为空'})
+    return false;
+  }
   const formattedData = {
     Yj_Gdbh: _Gd_gdbh.value,
     yj_cpdh: _Gd_cpdh.value,
@@ -2857,14 +2812,16 @@ const tableRowClick = async (row) => {
 const type = ref('')
 
 //=========表格列表修改========
-let scgdformData = ref([])
+let scgdformData = ref({})
 //双击修改
 const updateCompanyFunc = async(row) => {
+  console.log(row['工单编号'])
   // if(row['status'] === '*'){
   //   ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
   //   return false;
   // }else{
-    const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
+    const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});
+    console.log(DataCorrection_list)
     scgdformData.value = DataCorrection_list.data;
     dialogFormVisible.value = true
   // }
@@ -3123,21 +3080,6 @@ const _capacityList = async () => {
   }
 
 };
-//=========BOM列表修改========
-// const bomdialogFormVisible = ref(false)
-// //双击修改
-// const gdbomdialogFormVisible = async(row) => {
-//   Object.assign(scgdformData,row);
-//   bomdialogFormVisible.value = true
-// }
-// // BOM列表修改【确定】
-// const bomenterDialog = () => {
-//   bomdialogFormVisible.value = false
-// }
-// // BOM列表修改【关闭弹窗】
-// const bomcloseDialog = () => {
-//   bomdialogFormVisible.value = false
-// }
 
 //截取印件前两位
 const clickybupdate2 = (row,column,event) => {
@@ -3204,8 +3146,17 @@ const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
 //修改工单资料弹窗 键盘 input框跳转
 const gdzlent =async (event,id1,id2,id3) => {
   if (id2 === '客户代号' && event.key==='Tab') {
-    await _gClientList()
-    khdhModal.value = true
+    await _gClientList(scgdformData.value['客户代号'])
+    if (khdhDataList.value != null) {
+      const row = khdhDataList.value.find(item => item.客户编号 === scgdformData.value['客户代号'])
+      if (row) {
+        scgdformData.value['客户名称'] = row.客户名称
+      } else {
+        khdhModal.value = true
+      }
+    } else {
+      khdhModal.value= true
+    }
   }
   if (id2 === '产品代号' && event.key==='Tab') {
     await _ProductCodeList()