生产管理

src/api/yunyin/yunying.js

@@ -172,7 +172,7 @@ export const getProductYjList = (params) => {
         params
     })
 }
-//3.5获取纸张代号及名称
+/3.5获取纸张代号及名称/
 export const getProductZzList = (params) => {
     return service({
         url: '/mes_server/Product/getProductZzList',
@@ -480,7 +480,7 @@ export const PrintDetailAdd  = (data) => {
     return service({
         url: '/mes_server/work_order/PrintDetailAdd',
         method: 'post',
-        params
+        data
     })
 }
 //新增工艺资料->工艺资料添加

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

@@ -2188,7 +2188,7 @@ const jsondata = {
             "bottom": 371.3181818181818,
             "vCenter": 420.8181776566939,
             "hCenter": 297.8181818181818,
-            "maxRows": 13,
+            "maxRows": 12,
             "gridColumns": 2,
             "columns": [
               [

src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -470,7 +470,7 @@
         <!-- 右侧内容区域 -->
         <layout-content >
           <el-main>
-            <!-- 表格列表 -->
+            <!-- 工单表格列表 -->
             <div class="gva-table-box">
               <el-table ref="multipleTable"
                         style="width: 100%;height: 28vh"
@@ -622,7 +622,7 @@
                 <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
                   <el-row :gutter="24">
                     <el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
-                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 100px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
+                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
                         <el-option label="" value=""></el-option>
                         <el-option label="打样工单" value="打样工单"></el-option>
                         <el-option label="来料加工" value="来料加工"></el-option>
@@ -642,7 +642,7 @@
                       <!--                      <el-input v-model="scgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />-->
                     </el-form-item>
                     <el-form-item label="开单日期" prop="orderDate" class="mab" label-width="70">
-                      <el-date-picker v-model="scgdformData['开单日期']" type="date"  style="width: 115px;" id="开单日期"  @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
+                      <el-date-picker v-model="scgdformData['开单日期']" type="date"  style="width: 140px;" id="开单日期"  @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
                     </el-form-item>
                     <el-form-item label="工单编号:" prop="orderNumber" class="mab" label-width="90">
                       <el-input v-model="scgdformData['工单编号']"  style="width: 80px;" id="工单编号"  @keydown="gdzlent($event, '开单日期', '工单编号', '生产类型')" />
@@ -685,13 +685,13 @@
                       <el-input v-model="scgdformData['订单数量']"   style="width: 110px;" id="订单数量"  @keydown="gdzlent($event, '印件名称', '订单数量', '交货日期')" />
                     </el-form-item>
                     <el-form-item label="交货日期:" prop="deliveryDate" class="mab" label-width="75">
-                      <el-date-picker v-model="scgdformData['交货日期']" type="date"  style="width: 120px;"  id="交货日期"  @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
+                      <el-date-picker v-model="scgdformData['交货日期']" type="date"  style="width: 140px;"  id="交货日期"  @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
                     </el-form-item>
-                    <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="80">
-                      <el-input v-model="scgdformData['投料率']"   style="width: 100px;"  id="投料率"  @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
+                    <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="75">
+                      <el-input v-model="scgdformData['投料率']"   style="width: 90px;"  id="投料率"  @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
                     </el-form-item>
                     <el-form-item label="平均合格率:" prop="passRate" class="mab" label-width="90">
-                      <el-input v-model="scgdformData['平均合格率']"   style="width: 130px;"  id="平均合格率"  @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
+                      <el-input v-model="scgdformData['平均合格率']"   style="width: 125px;"  id="平均合格率"  @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
@@ -760,7 +760,7 @@
                   <!-- 第一排 -->
                   <el-row :gutter="24">
                     <el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
-                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 100px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
+                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 110px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
                         <el-option label="" value=""></el-option>
                         <el-option label="打样工单" value="打样工单"></el-option>
                         <el-option label="来料加工" value="来料加工"></el-option>
@@ -780,7 +780,7 @@
                       <!--                      <el-input v-model="add_gdscgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')" />-->
                     </el-form-item>
                     <el-form-item label="开单日期" prop="orderDate" class="mab" label-width="70">
-                      <el-date-picker v-model="add_gdscgdformData['开单日期']" type="date"  style="width: 120px;"   id="开单日期"  @keydown="add_gdzlent($event, '重点工单', '开单日期', '工单编号')" />
+                      <el-date-picker v-model="add_gdscgdformData['开单日期']" type="date"  style="width: 140px;"   id="开单日期"  @keydown="add_gdzlent($event, '重点工单', '开单日期', '工单编号')" />
                     </el-form-item>
                     <el-form-item label="工单编号:" prop="orderNumber" class="mab" label-width="90">
                       <el-input v-model="add_gdscgdformData['工单编号']"  style="width: 85px;" id="工单编号"  @keydown="add_gdzlent($event, '开单日期', '工单编号', '生产类型')" />
@@ -822,13 +822,13 @@
                       <el-input v-model="add_gdscgdformData['订单数量']"   style="width: 110px;" id="订单数量"  @keydown="add_gdzlent($event, '印件名称', '订单数量', '交货日期')" />
                     </el-form-item>
                     <el-form-item label="交货日期:" prop="deliveryDate" class="mab" label-width="75">
-                      <el-date-picker v-model="add_gdscgdformData['交货日期']" type="date"  style="width: 120px;"  id="交货日期"  @keydown="add_gdzlent($event, '订单数量', '交货日期', '投料率')"/>
+                      <el-date-picker v-model="add_gdscgdformData['交货日期']" type="date"  style="width: 140px;"  id="交货日期"  @keydown="add_gdzlent($event, '订单数量', '交货日期', '投料率')"/>
                     </el-form-item>
-                    <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="80">
-                      <el-input v-model="add_gdscgdformData['投料率']"   style="width: 100px;"  id="投料率"  @keydown="add_gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
+                    <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="75">
+                      <el-input v-model="add_gdscgdformData['投料率']"   style="width: 90px;"  id="投料率"  @keydown="add_gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
                     </el-form-item>
                     <el-form-item label="平均合格率:" prop="passRate" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['平均合格率']"   style="width: 130px;"  id="平均合格率"  @keydown="add_gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
+                      <el-input v-model="add_gdscgdformData['平均合格率']"   style="width: 125px;"  id="平均合格率"  @keydown="add_gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
@@ -895,12 +895,12 @@
                 <div>
                   <el-form-item label="关键字:"  class="mab" prop="keyOrder">
                     <el-space>
-                      <el-input v-model="khdh_keyword" style="width: 100%;"/>
+                      <el-input v-model="khdh_keyword" @keyup.enter="khdh_ProductValue"  style="width: 100%;"/>
                       <el-button @click="gongdanSearchHandle(khdh_keyword, '客户代号')">刷新</el-button>
                     </el-space>
                   </el-form-item>
                   <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
-                    <el-tree :data="khdhDataList" :props="{children: 'children',label: '客户名称', value: '客户编号'}" @node-click="selectGongDanNode($event, '客户代号')" />
+                    <el-tree :data="khdhDataList" :props="{children: 'children',label: 'name', value: '客户编号'}" @node-click="selectGongDanNode($event, '客户代号')" />
                   </div>
                 </div>
               </el-form>
@@ -912,12 +912,12 @@
                 <div>
                   <el-form-item label="关键字:"  class="mab" prop="keyOrder">
                     <el-space>
-                      <el-input v-model="cpdh_keyword" style="width: 100%;"/>
+                      <el-input v-model="cpdh_keyword" @keyup.enter="cpdh_ProductValue" style="width: 100%;"/>
                       <el-button @click="gongdanSearchHandle(cpdh_keyword, '产品代号')">刷新</el-button>
                     </el-space>
                   </el-form-item>
                   <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
-                    <el-tree :data="cpdhDataList" :props="{children: 'children',label: '产品名称', value: '产品编号'}" @node-click="selectGongDanNode($event, '产品代号')" />
+                    <el-tree :data="cpdhDataList" :props="{children: 'children',label: 'name', value: '产品编号'}" @node-click="selectGongDanNode($event, '产品代号')" />
                   </div>
                 </div>
               </el-form>
@@ -925,65 +925,65 @@
 
             <!-- 修改印件表格资料弹窗 -->
             <el-dialog v-model="gdyjdialogFormVisible" :before-close="gdyjcloseDialog"
-                       style="width: 70%;margin: 8px auto"  :title="'修改印件资料'" destroy-on-close>
+                       style="width: 60%;"  :title="'修改印件资料'" destroy-on-close>
               <el-form label-width="100px">
-                <el-form-item label="印件号:" prop="keyOrder">
+                <el-form-item label="印件号:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['印件号']" placeholder="" style="width: 140px;"  id="印件号"  @keydown="edit_gdyjent($event, '备注说明', '印件号', '印件代号')"/>
                 </el-form-item>
-                <el-form-item label="印件代码:" prop="keyOrder">
+                <el-form-item label="印件代码:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['印件代号']" placeholder="" style="width: 140px;"  id="印件代号"  @keydown="edit_gdyjent($event, '印件号', '印件代号', '印件名称')"/>
                   <el-input v-model="gdyjformData['印件名称']" placeholder="" style="width: 80%; margin-left: 10px"  id="印件名称"  @keydown="edit_gdyjent($event, '印件代号', '印件名称', '纸张代号')"/>
                 </el-form-item>
-                <el-form-item label="纸张编号:" prop="keyOrder">
+                <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['纸张代号']" placeholder="" style="width: 140px;" id="纸张代号"  @keydown="edit_gdyjent($event, '印件名称', '纸张代号', '纸张名称')"/>
                   <el-input v-model="gdyjformData['纸张名称']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称"  @keydown="edit_gdyjent($event, '纸张代号', '纸张名称', '备用纸张1')"/>
                 </el-form-item>
-                <el-form-item label="备用纸张1:" prop="keyOrder">
+                <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['备用纸张1']" placeholder="" style="width: 140px;" id="备用纸张1"  @keydown="edit_gdyjent($event, '纸张名称', '备用纸张1', '纸张名称11')"/>
                   <el-input v-model="gdyjformData['纸张名称11']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称11"  @keydown="edit_gdyjent($event, '备用纸张1', '纸张名称11', '备用纸张2')"/>
                 </el-form-item>
-                <el-form-item label="备用纸张2:" prop="keyOrder">
+                <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['备用纸张2']" placeholder="" style="width: 140px;" id="备用纸张2"  @keydown="edit_gdyjent($event, '纸张名称11', '备用纸张2', '纸张名称22')"/>
                   <el-input v-model="gdyjformData['纸张名称22']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称22"  @keydown="edit_gdyjent($event, '备用纸张2', '纸张名称22', '备用纸张3')"/>
                 </el-form-item>
-                <el-form-item label="备用纸张3:" prop="keyOrder">
+                <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['备用纸张3']" placeholder="" style="width: 140px;" id="备用纸张3"  @keydown="edit_gdyjent($event, '纸张名称22', '备用纸张3', '纸张名称33')"/>
                   <el-input v-model="gdyjformData['纸张名称33']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称33"  @keydown="edit_gdyjent($event, '备用纸张3', '纸张名称33', '备用纸张4')"/>
                 </el-form-item>
-                <el-form-item label="备用纸张4:" prop="keyOrder">
+                <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
                   <el-input v-model="gdyjformData['备用纸张4']" placeholder="" style="width: 140px;" id="备用纸张4"  @keydown="edit_gdyjent($event, '纸张名称33', '备用纸张4', '纸张名称44')"/>
                   <el-input v-model="gdyjformData['纸张名称44']" placeholder="" style="width: 80%; margin-left: 10px" id="纸张名称44"  @keydown="edit_gdyjent($event, '备用纸张4', '纸张名称44', '订单数量')"/>
                 </el-form-item>
                 <div style="display: flex; gap: 0px;">
-                  <el-form-item label="订单数量:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 100px;" id="订单数量"  @keydown="edit_gdyjent($event, '纸张名称44', '订单数量', '平张投料')"/>
+                  <el-form-item label="订单数量:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['订单数量']" placeholder="" style="width: 80px;" id="订单数量"  @keydown="edit_gdyjent($event, '纸张名称44', '订单数量', '平张投料')"/>
                   </el-form-item>
-                  <el-form-item label="平张投料:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 100px;" id="平张投料"  @keydown="edit_gdyjent($event, '订单数量', '平张投料', '万小张')"/>
+                  <el-form-item label="平张投料:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['平张投料']" placeholder="" style="width: 80px;" id="平张投料"  @keydown="edit_gdyjent($event, '订单数量', '平张投料', '万小张')"/>
                   </el-form-item>
-                  <el-form-item label="万小张:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 100px;" id="万小张"  @keydown="edit_gdyjent($event, '平张投料', '万小张', '开料规格')"/>
+                  <el-form-item label="万小张:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['万小张']" placeholder="" style="width: 80px;" id="万小张"  @keydown="edit_gdyjent($event, '平张投料', '万小张', '开料规格')"/>
                   </el-form-item>
-                  <el-form-item label="纸张规格:" prop="keyOrder">
+                  <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
                     <el-input disabled v-model="gdyjformData['投料规格']" placeholder="" style="width: 240px;" />
                   </el-form-item>
                 </div>
                 <div style="display: flex; gap: 0px;">
-                  <el-form-item label="投料规格:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 100px;" id="开料规格"  @keydown="edit_gdyjent($event, '万小张', '开料规格', '开数')"/>
+                  <el-form-item label="投料规格:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['开料规格']" placeholder="" style="width: 80px;" id="开料规格"  @keydown="edit_gdyjent($event, '万小张', '开料规格', '开数')"/>
                   </el-form-item>
-                  <el-form-item label="开料开数:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 100px;" id="开数"  @keydown="edit_gdyjent($event, '开料规格', '开数', '联数')"/>
+                  <el-form-item label="开料开数:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['开数']" placeholder="" style="width: 80px;" id="开数"  @keydown="edit_gdyjent($event, '开料规格', '开数', '联数')"/>
                   </el-form-item>
-                  <el-form-item label="开料联数:" prop="keyOrder">
-                    <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 100px;" id="联数"  @keydown="edit_gdyjent($event, '开数', '联数', '核算规格')"/>
+                  <el-form-item label="开料联数:" class="mab" prop="keyOrder">
+                    <el-input v-model="gdyjformData['联数']" placeholder="" style="width: 80px;" id="联数"  @keydown="edit_gdyjent($event, '开数', '联数', '核算规格')"/>
                   </el-form-item>
-                  <el-form-item label="核算规格:" prop="keyOrder">
+                  <el-form-item label="核算规格:" class="mab" prop="keyOrder">
                     <el-input v-model="gdyjformData['核算规格']" placeholder="" style="width: 240px;" id="核算规格"  @keydown="edit_gdyjent($event, '联数', '核算规格', '备注说明')"/>
                   </el-form-item>
                 </div>
-                <el-form-item label="备注说明:" prop="remark">
-                  <el-input type="textarea" v-model="gdyjformData['备注说明']"  resize="none" rows="3" clearable placeholder="" id="备注说明"  @keydown="edit_gdyjent($event, '核算规格', '备注说明', '印件号')"/>
+                <el-form-item label="备注说明:" class="mab" prop="remark">
+                  <el-input type="textarea" v-model="gdyjformData['备注']"  resize="none" rows="2" clearable placeholder="" id="备注说明"  @keydown="edit_gdyjent($event, '核算规格', '备注说明', '印件号')"/>
                 </el-form-item>
               </el-form>
 
@@ -997,65 +997,65 @@
 
             <!-- 新增印件资料弹窗 -->
             <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
-                       style="width: 70%;margin: 8px auto" :title="'新增印件资料'" destroy-on-close>
+                       style="width: 60%;" :title="'新增印件资料'" destroy-on-close>
               <el-form label-width="100px" :model="add_yjzlformdata">
-                <el-form-item label="印件号:" prop="yjno">
+                <el-form-item label="印件号:" class="mab" prop="yjno" >
                   <el-input v-model="add_yjzlformdata.yjno" placeholder="" style="width: 140px;"/>
                 </el-form-item>
-                <el-form-item label="印件代码:" prop="keyOrder">
+                <el-form-item label="印件代码:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.yjdh" id="yjdhId" @keydown="openSearchModal" placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.yjmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
-                <el-form-item label="纸张编号:" prop="keyOrder">
+                <el-form-item label="纸张编号:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.zzdh"  class="zhi" @keydown="openSearchZhiModal($event, 0)" placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc"  placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
-                <el-form-item label="备用纸张1:" prop="keyOrder">
+                <el-form-item label="备用纸张1:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.zzdh1" class="zhi" @keydown="openSearchZhiModal($event, 1)"  placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc1"  placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
-                <el-form-item label="备用纸张2:" prop="keyOrder">
+                <el-form-item label="备用纸张2:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.zzdh2" class="zhi" @keydown="openSearchZhiModal($event, 2)"  placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc2"  placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
-                <el-form-item label="备用纸张3:" prop="keyOrder">
+                <el-form-item label="备用纸张3:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.zzdh3" class="zhi" @keydown="openSearchZhiModal($event, 3)"  placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc3"  placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
-                <el-form-item label="备用纸张4:" prop="keyOrder">
+                <el-form-item label="备用纸张4:" class="mab" prop="keyOrder">
                   <el-input v-model="add_yjzlformdata.zzdh4"  class="zhi" @keydown="openSearchZhiModal($event, 4)" placeholder="" style="width: 140px;"/>
                   <el-input v-model="add_yjzlformdata.zzmc4" placeholder="" style="width: 80%; margin-left: 10px"/>
                 </el-form-item>
                 <div style="display: flex; gap: 0px;">
-                  <el-form-item label="订单数量:" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 100px;"/>
+                  <el-form-item label="订单数量:" class="mab" prop="keyOrder">
+                    <el-input v-model="add_yjzlformdata.cpsl" placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="平张投料:" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.pztl"  placeholder="" style="width: 100px;"/>
+                  <el-form-item label="平张投料:" class="mab" prop="keyOrder">
+                    <el-input v-model="add_yjzlformdata.pztl"  placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="万小张:" prop="keyOrder">
-                    <el-input disabled v-model="add_yjzlformdata.万小张"  placeholder="" style="width: 100px;"/>
+                  <el-form-item label="万小张:" class="mab" prop="keyOrder">
+                    <el-input disabled v-model="add_yjzlformdata.万小张"  placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="纸张规格:" prop="keyOrder">
+                  <el-form-item label="纸张规格:" class="mab" prop="keyOrder">
                     <el-input disabled v-model="add_yjzlformdata.tlgg"  placeholder="" style="width: 240px;"/>
                   </el-form-item>
                 </div>
                 <div style="display: flex; gap: 0px;">
-                  <el-form-item label="投料规格:" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.klgg"  placeholder="" style="width: 100px;"/>
+                  <el-form-item label="投料规格:" class="mab" prop="keyOrder">
+                    <el-input v-model="add_yjzlformdata.klgg"  placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="开料开数:" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.ks"  placeholder="" style="width: 100px;"/>
+                  <el-form-item label="开料开数:" class="mab" prop="keyOrder">
+                    <el-input v-model="add_yjzlformdata.ks"  placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="开料联数:" prop="keyOrder">
-                    <el-input v-model="add_yjzlformdata.ls"  placeholder="" style="width: 100px;"/>
+                  <el-form-item label="开料联数:" class="mab" prop="keyOrder">
+                    <el-input v-model="add_yjzlformdata.ls"  placeholder="" style="width: 80px;"/>
                   </el-form-item>
-                  <el-form-item label="核算规格:" prop="keyOrder">
+                  <el-form-item label="核算规格:" class="mab" prop="keyOrder">
                     <el-input v-model="add_yjzlformdata.hsgg"  placeholder="" style="width: 240px;"/>
                   </el-form-item>
                 </div>
-                <el-form-item label="备注说明:" prop="remark">
-                  <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="3" clearable placeholder=""  />
+                <el-form-item label="备注说明:" class="mab" prop="remark">
+                  <el-input v-model="add_yjzlformdata.desc" type="textarea" resize="none" rows="2" clearable placeholder=""  />
                 </el-form-item>
               </el-form>
 
@@ -1078,7 +1078,7 @@
                     </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: '物料名称', value: '物料代码'}" @node-click="selectNode" />
+                    <el-tree :data="getProductYjListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectNode" />
                   </div>
                 </div>
               </el-form>
@@ -1095,7 +1095,7 @@
                     </el-space>
                   </el-form-item>
                   <div style="border:1px solid #eee; width:100%; height: 400px; overflow-y: auto">
-                    <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: '物料名称', value: '物料代码'}" @node-click="selectZhiNode" />
+                    <el-tree :data="getProductZhiListdata" :props="{children: 'children',label: 'label', value: '物料代码'}" @node-click="selectZhiNode" />
                   </div>
                 </div>
               </el-form>
@@ -1234,7 +1234,7 @@ import { ref, reactive, computed } from 'vue'
 import {
   DataList,
   WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
-  U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,
+  U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,PrintDetailAdd,
   WorkOrderEdit, ReferenceWorkOrder,getOrderProcessLeft,ClientList,ProductCodeList,
   editGyWaste, U8DataCorrection, AccountingParameterEdit,ProcessCopy,
   ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
@@ -1804,19 +1804,41 @@ const khdhDataList = ref()
 const cpdhDataList = ref()
 const khdh_keyword = ref('')
 const cpdh_keyword = ref('')
+
+//新增工单资料客户代号【回车】
+const khdh_ProductValue = async (v) => {
+  // console.log(khdh_keyword.value)
+  await _gClientList(khdh_keyword.value)
+};
+//新增工单资料产品代号【回车】
+const cpdh_ProductValue = async (v) => {
+  // console.log(khdh_keyword.value)
+  await _ProductCodeList(cpdh_keyword.value)
+};
+//新增工单->客户列表
 const _gClientList = async (v = '')=>{
   try {
-    const ClientListdata = await ClientList({client: v});
-    khdhDataList.value = ClientListdata.data
+    // if(add_gdscgdformData['客户代号']){
+    //   const ClientListdata = await ClientList({search: add_gdscgdformData['客户代号']});
+    //   khdhDataList.value = ClientListdata.data
+    // }else{
+      const ClientListdata = await ClientList({search: v});
+      khdhDataList.value = ClientListdata.data
+    // }
   } catch (error) {
     console.error(error);
   }
 }
-//获取产品代号，产品名称
-const _ProductCodeList = async (v = '1001')=>{
+//新增工单->产品代号列表
+const _ProductCodeList = async (v = '')=>{
   try {
-    const ProductCodeListdata = await ProductCodeList({cilent: v});
-    cpdhDataList.value = ProductCodeListdata.data
+    // if(add_gdscgdformData['产品代号']){
+    //   const ProductCodeListdata = await ProductCodeList({cilent: add_gdscgdformData['产品代号']});
+    //   cpdhDataList.value = ProductCodeListdata.data
+    // }else{
+      const ProductCodeListdata = await ProductCodeList({cilent: v});
+      cpdhDataList.value = ProductCodeListdata.data
+    // }
   } catch (error) {
     console.error(error);
   }
@@ -1824,13 +1846,13 @@ const _ProductCodeList = async (v = '1001')=>{
 
 const gongdanSearchHandle = async (v, type) => {
   if (type === '客户代号') {
-    await _gClientList(v)
+      await _gClientList(v)
   }
   if (type === '产品代号') {
     await _ProductCodeList(v)
   }
 }
-
+//点击客户代号
 const selectGongDanNode = (node, type) => {
   if (type === '客户代号') {
     add_gdscgdformData['客户代号'] = node.客户编号
@@ -1850,13 +1872,11 @@ const selectGongDanNode = (node, type) => {
 
 //新增工单资料弹窗 键盘 input框跳转
 const add_gdzlent = async (event,id1,id2,id3) => {
-  // console.log(event.keyCode)
-
-  if (id2 === '客户代号' && event.key==='Tab') {
+  if (id2 === '客户代号' && event.key==='Tab' || id2 === '客户代号' && event.key=== 'Enter') {
     await _gClientList()
     khdhModal.value = true
   }
-  if (id2 === '产品代号' && event.key==='Tab') {
+  if (id2 === '产品代号' && event.key==='Tab' || id2 === '产品代号' && event.key=== 'Enter') {
     await _ProductCodeList()
     cpdhModal.value = true
   }
@@ -1876,7 +1896,6 @@ const add_gdzlent = async (event,id1,id2,id3) => {
     if(id1!='' && document.getElementById(id2).value==''){
       document.getElementById(id1).focus()
     }
-    // console.log(document.getElementById(id2).value)
   }else if (event.keyCode === 37) { // 向左箭头
     if(id1!='' && document.getElementById(id2).selectionStart==0){
       document.getElementById(id1).focus()
@@ -1939,7 +1958,7 @@ const searchModel = ref(false)
 const searchZhiModel = ref(false)
 
 const openSearchModal = (code) => {
-  if (code.key==='Tab') {
+  if (code.key==='Tab' || code.key=== 'Enter') {
     setTimeout(() =>document.querySelector('#yjdhId').focus(), 50)
     _getProductYjList();
     searchModel.value = true
@@ -1948,7 +1967,7 @@ const openSearchModal = (code) => {
 
 const zzdhIndex = ref(null)
 const openSearchZhiModal = (code, idx) => {
-  if (code.key==='Tab') {
+  if (code.key==='Tab'  || code.key=== 'Enter') {
     setTimeout(() => document.querySelector('.zhi').focus(), 50)
     _getProductZzList()
     searchZhiModel.value = true
@@ -1973,9 +1992,10 @@ const addgdyj_onclick = () => {
 }
 //印件新增确定
 const add_gdyjenterDialog =  async  () => {
-  console.log(add_yjzlformdata)
+  // console.log(add_yjzlformdata)
   const formattedData = {
     Yj_Gdbh: _Gd_gdbh.value,
+    yj_cpdh: _Gd_cpdh.value,
     yj_Yjno: add_yjzlformdata['yjno'],
     yj_Yjdh: add_yjzlformdata['yjdh'],
     yj_yjmc: add_yjzlformdata['yjmc'],
@@ -2001,84 +2021,65 @@ const add_gdyjenterDialog =  async  () => {
     Sys_id  : "[1031/谭鸿忠]",
     // 万小张: add_yjzlformdata['万小张'],
   };
-  console.log(formattedData)
-  // const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
+  // console.log(formattedData)
+  const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
   // console.log(PrintDetailAdd_add)
-  // add_gdyjdialogFormVisible.value = false
+  if(PrintDetailAdd_add.code === 0) {
+    ElMessage({type: 'success',message: '添加成功'})
+    add_gdyjdialogFormVisible.value = false
+  } else {
+    ElMessage({type: 'error',message: '添加失败' })
+  }
 }
 //印件新增取消
 const add_dyjcloseDialog = () => {
   add_gdyjdialogFormVisible.value = false
 }
-
+//印件新增【印件代码】树状图
 const handleTreeData = (treeData) => {
-  let data = []
-  Object.keys(treeData).map((key, index) => {
-    data.push({
-      物料代码:key.match(/\d+/)[0],
-      物料名称:key,
-      children: []
-    })
-    if (typeof treeData[key] === 'object') {
-      Object.keys(treeData[key]).map((c_key) => {
-        data[index].children.push({
-          物料代码: c_key.match(/\d+/)[0],
-          物料名称: c_key,
-          children: []
-        })
-      })
-    } else if (typeof treeData[key] === 'array') {
-      treeData[key].map(item => data[index].children.push(item))
-    }
-  })
-
+ const data = Object.keys(treeData).map((key)=>({
+   label:key,
+    children: Object.keys(treeData[key]).map((keys)=>({
+      label:keys,
+      children:treeData[key][keys].map(item=>({
+        label:`${item.物料代码} ${item.物料名称}`,
+        物料代码:item.物料代码,
+        物料名称:item.物料名称
+
+      }))
+    }))
+  }))
   return data
 }
 
-// "1401/糊盒类产品（含贴码）":
-// {
-//   "140101/浙江中烟":
-//   [
-//     {
-//       "物料代码": "140101001",
-//       "物料名称": "利群（红利）2盒装礼盒面彩"
-//     },
-//     {
-//       "物料代码": "140101002",
-//       "物料名称": "利群（红利）两条装手提袋（糊盒前）"
-//     },
-//     {
-//       "物料代码": "140101003",
-//       "物料名称": "利群（红利）五盒装手提袋（糊盒前）（半拼，2张算1张）"
-//     }]
-// }
-
-// [
-//   { 物料代码: '1401/糊盒类产品（含贴码）',物料名称:'1401/糊盒类产品（含贴码）',
-//     children: [{
-//       物料代码: '140101/浙江中烟',物料名称:'140101/浙江中烟', children: [
-//         {
-//           "物料代码": "140101001",
-//           "物料名称": "利群（红利）2盒装礼盒面彩"
-//         },
-//         {
-//           "物料代码": "140101002",
-//           "物料名称": "利群（红利）两条装手提袋（糊盒前）"
-//         },
-//         {
-//           "物料代码": "140101003",
-//           "物料名称": "利群（红利）五盒装手提袋（糊盒前）（半拼，2张算1张）"
-//         }
-//       ]
-//     }]
-//   }
-// ]
+//印件新增【纸张】树状图
+const handleTreeDatas = (treeData) => {
+  console.log(treeData)
+  const data = Object.keys(treeData).map((key)=>({
+    label:key,
+    children: Object.keys(treeData[key]).map((keys)=>({
+      label:keys,
+      children:Object.keys(treeData[key][keys]).map((keyss)=>({
+        label:keyss,
+        children:treeData[key][keys][keyss].map(item=>({
+          label:`${item.物料代码} ${item.物料名称}`,
+          规格:item.规格,
+          物料代码:item.物料代码,
+          物料名称:item.物料名称
+        }))
+      }))
+
+    }))
+  }))
+  return data
+}
 
 //3.4获取印件代码及名称
 const getProductYjListdata = ref()
 const getProductZhiListdata = ref()
 const yjdh_keyword = ref('')
 const zhi_keyword = ref('')
+//3.4获取印件代码及名称
 const _getProductYjList = async ()=>{
   try {
     const response = await getProductYjList({search:''});
@@ -2087,43 +2088,44 @@ const _getProductYjList = async ()=>{
     console.error(error);
   }
 }
-
+//3.5获取纸张代号及名称
 const _getProductZzList = async ()=>{
   try {
     const response = await getProductZzList({search:''});
-    getProductZhiListdata.value = handleTreeData(response.data)
+    getProductZhiListdata.value = handleTreeDatas(response.data)
   } catch (error) {
     console.error(error);
   }
 }
-
+//3.4获取印件代码及名称
 const searchHandle = async (v) => {
   const response = await getProductYjList({search:v});
   getProductYjListdata.value = handleTreeData(response.data)
 }
-
+//3.5获取纸张代号及名称
 const searchZhiHandle = async(v) => {
   const response = await getProductZzList({search:v});
-  getProductZhiListdata.value = handleTreeData(response.data)
+  getProductZhiListdata.value = handleTreeDatas(response.data)
 }
-
+//印件代码tab 点击事件
 const selectNode = (v) => {
-  if (v.children.length === 0) {
+  if(v.物料名称){
     add_yjzlformdata['yjdh'] = v.物料代码
-    add_yjzlformdata['yjmc'] = v.物料名称
-    searchModel.value= false
+      add_yjzlformdata['yjmc'] = v.物料名称
+      searchModel.value= false
   }
 }
-
+//纸张tab 点击事件
 const selectZhiNode = (v) => {
-  if (v.children.length === 0) {
+  if(v.物料名称){
     if (zzdhIndex.value == 0) {
-      add_yjzlformdata['zzdh'] = v.物料代码
-      add_yjzlformdata['zzmc'] = v.物料名称
-    } else {
-      add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
-      add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
-    }
+          add_yjzlformdata['zzdh'] = v.物料代码
+          add_yjzlformdata['zzmc'] = v.物料名称
+          add_yjzlformdata['tlgg'] = v.规格
+        } else {
+          add_yjzlformdata['zzdh' + zzdhIndex.value] = v.物料代码
+          add_yjzlformdata['zzmc' + zzdhIndex.value] = v.物料名称
+        }
     searchZhiModel.value = false
   }
 }
@@ -2154,23 +2156,23 @@ const addgdgy_onclick = () => {
     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
   }
 }
-//新增工艺资料确定
-const add_gdgyenterDialog = async () => {
-  console.log(1)
-  // 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 add_gdgyenterDialog = async () => {
+//   console.log(1)
+//   // 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 add_gdgycloseDialog = () => {
-  add_gdgydialogFormVisible.value = false
-}
+// const add_gdgycloseDialog = () => {
+//   add_gdgydialogFormVisible.value = false
+// }
 
 
 // =========== 查改U8工单 ===========
@@ -2750,14 +2752,14 @@ const type = ref('')
 let scgdformData = ref([])
 //双击修改
 const updateCompanyFunc = async(row) => {
-  if(row['status'] === '*'){
-    ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
-    return false;
-  }else{
+  // if(row['status'] === '*'){
+  //   ElMessage({ type: 'warning', message: '未找到该工单印件资料' });
+  //   return false;
+  // }else{
     const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
     scgdformData.value = DataCorrection_list.data;
     dialogFormVisible.value = true
-  }
+  // }
 }
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
@@ -3093,7 +3095,6 @@ const planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
 
 //修改工单资料弹窗 键盘 input框跳转
 const gdzlent =async (event,id1,id2,id3) => {
-
   if (id2 === '客户代号' && event.key==='Tab') {
     await _gClientList()
     khdhModal.value = true
@@ -3102,7 +3103,6 @@ const gdzlent =async (event,id1,id2,id3) => {
     await _ProductCodeList()
     cpdhModal.value = true
   }
-
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
     if(id3!=''){
       document.getElementById(id3).focus()