Browse Source

运营管理

liuhairui 1 year ago
parent
commit
27df097c44

+ 69 - 10
src/api/yunyin/yunying.js

@@ -221,6 +221,33 @@ export const editProductYbInfo = (data) => {
     })
 }
 
+//3.11印版资料-获取存货名称列表
+export const getProductYbMaterialList = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYbMaterialList',
+        method: 'get',
+        params
+    })
+}
+
+//3.12印版资料-获取详细存货名称
+export const getProductYbMaterialDetail = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYbMaterialDetail',
+        method: 'get',
+        params
+    })
+}
+
+//3.13印版资料-新增产品印版资料
+export const addProductYbInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/addProductYbInfo',
+        method: 'post',
+        data
+    })
+}
+
 
 /** 生产管理 工单资料管理*/
 // 1.工单资料菜单列表
@@ -247,7 +274,6 @@ export const workOrderListDetail = (params) => {
         params
     })
 }
-
 //工单查改->获取工单信息
 export const DataCorrection = (params) => {
     return service({
@@ -256,7 +282,6 @@ export const DataCorrection = (params) => {
         params
     })
 }
-
 //工单差改->修改工单信息
 export const WorkOrderEdit = (data) => {
     return service({
@@ -265,8 +290,6 @@ export const WorkOrderEdit = (data) => {
         data
     })
 }
-
-
 //引用产品资料->获取产品资料
 export const ProductInformation = (params) => {
     return service({
@@ -364,7 +387,6 @@ export const U8workOrder = (params) => {
         params
     })
 }
-
 //印件资料修改
 export const PrintedEdit = (data) => {
     return service({
@@ -373,7 +395,6 @@ export const PrintedEdit = (data) => {
         data
     })
 }
-
 //工艺资料修改
 export const ProcessDetailEdit = (data) => {
     return service({
@@ -382,7 +403,6 @@ export const ProcessDetailEdit = (data) => {
         data
     })
 }
-
 //打印作业通知单
 export const PrintJobOrder = (params) => {
     return service({
@@ -391,7 +411,6 @@ export const PrintJobOrder = (params) => {
         params
     })
 }
-
 //工艺资料编辑->机台列表获取
 export const gdzl_MachineList = (params) => {
     return service({
@@ -400,8 +419,14 @@ export const gdzl_MachineList = (params) => {
         params
     })
 }
-
-
+//工单修改->工单类型下拉列表
+export const WorkOrderTypeList = (params) => {
+    return service({
+        url: '/mes_server/work_order/WorkOrderTypeList',
+        method: 'get',
+        params
+    })
+}
 //机台产量获取
 export const capacityList = (params) => {
     return service({
@@ -410,6 +435,22 @@ export const capacityList = (params) => {
         params
     })
 }
+//新增工单->客户列表
+export const ClientList  = (params) => {
+    return service({
+        url: 'c',
+        method: 'get',
+        params
+    })
+}
+//新增工单->产品代号列表
+export const ProductCodeList  = (params) => {
+    return service({
+        url: '/mes_server/work_order/ProductCodeList',
+        method: 'get',
+        params
+    })
+}
 
 
 /**工单生产排单(排产管理)*/
@@ -653,4 +694,22 @@ export const getOrderProcessCount = (params) => {
         method: 'get',
         params
     })
+}
+
+//5.1流程单查询-工单工序生产进程菜单栏
+export const getOrderProcessLeft = (params) => {
+    return service({
+        url:'/mes_server/work_order_verification/getOrderProcessLeft',
+        method: 'get',
+        params
+    })
+}
+
+//5.2流程单查询-获取工单工序生产进程右侧
+export const getOrderProcessRight = (params) => {
+    return service({
+        url:'/mes_server/work_order_verification/getOrderProcessRight',
+        method: 'get',
+        params
+    })
 }

+ 255 - 148
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -6,20 +6,20 @@
           <!--按钮部分-->
           <el-form ref="elSearchFormRef" :inline="true"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <el-input v-model="searchInfo" placeholder="搜索产品编号或产品名称" clearable style="width: 180px;"></el-input>
+              <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" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
-              <el-button type="primary" icon="edit" @click="gygmClick" class="bt">工艺方案更名</el-button>
-              <el-button type="primary"  icon="edit" @click="fjClick" class="bt">工艺方案附加</el-button>
-              <el-button type="primary" icon="edit" @click="jsssxzClick" class="bt">计损色数修正</el-button>
-              <el-button type="primary" icon="edit" @click="fjfpxsClick" class="bt">质检废品系数</el-button>
-              <el-button type="primary" icon="edit" @click="pccstzClick" class="bt">排产参数调整</el-button>
-              <el-button type="primary" icon="edit" @click="hscstzClick" class="bt">核算参数调整</el-button>
-              <el-button type="primary" icon="edit"  @click="addcpyj_onclick"     class="bt">新增印件资料</el-button>
-              <el-button type="primary" icon="edit"  disabled @click="addcpgy_onclick"     class="bt">新增工艺资料</el-button>
-              <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin: 5px;display: none">导出产品资料</el-button>
-              <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin: 5px;margin-top: 5px;display: none">导出工艺流程</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" disabled>新增印件资料</el-button>
+              <el-button type="primary" class="bt" icon="edit"     @click="addcpgy_onclick" disabled>新增工艺资料</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>
 
@@ -358,10 +358,6 @@
                 <el-input disabled v-model="scope.row.custom_name" :clearable="false"/>
               </el-table-column>
             </el-table>
-<!--            <div class="dialog-footer" style="text-align: right; margin-top: 1%;">-->
-<!--              <el-button type="" @click="fjfpxsCancel">取消</el-button>-->
-<!--              <el-button type="primary" disabled @click="fjfpxsConfirm">确认</el-button>-->
-<!--            </div>-->
           </el-dialog>
 
           <!--排产参数调整-->
@@ -579,6 +575,7 @@
                   @current-change="handleCurrentChange"
                   :current-page="page"
                   :page-sizes="[10, 30, 50, 100]"
+                  :page-size="30"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="total">
               </el-pagination>
@@ -768,33 +765,65 @@
           </el-dialog>
 
           <!-- 修改印件资料-->
-          <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="'修改印件资料'" height="80%" width="50%" destroy-on-close>
+          <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="'修改印件资料'" height="500px" width="800px" destroy-on-close>
             <el-row>
               <el-scrollbar >
                 <el-form :model="yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
                   <el-row>
-                    <el-form-item label="印件号:" prop="address" class="mab"  label-width="70px">
-                      <el-input v-model="yjformDataTest['yj_yjno']" clearable placeholder="请输入印件号" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
+                    <el-form-item label="印件号:" prop="address" class="mab"  label-width="105px">
+                      <el-input v-model="yjformDataTest['yj_yjno']"  placeholder="" style="width: 140px;"  id="印件号"  @keydown="yj_ent($event, '', '印件号', '印件代号')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
-                    <el-form-item label="印件代号:" prop="address" class="mab">
-                      <el-input v-model="yjformDataTest['yj_yjdh']" clearable placeholder="请输入印件代码" style="width: 140px;"  id="印件代号"  @keydown="ent($event, '印件号', '印件代号', '印件名称')" />
+                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="105px">
+                      <el-input v-model="yjformDataTest['yj_yjdh']"  placeholder="" style="width: 140px;"  id="印件代号"  @keydown="yj_ent($event, '印件号', '印件代号', 'yj_zzdh')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="印件名称:" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_yjmc']" clearable placeholder="请输入印件代码" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
+                    <el-col :span="22">
+                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="105px">
+                        <el-input v-model="yjformDataTest['yj_yjmc']" disabled placeholder="" id="印件名称"  @keydown="yj_ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="纸张:" prop="address" class="mab" label-width="70px">
+                      <el-form-item label="纸张:" prop="address" class="mab"  label-width="105px">
+                        <el-row>
+                          <el-input v-model="yjformDataTest['yj_zzdh']"  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="yj_ent($event, '印件代号', 'yj_zzdh', 'yj_zzmc')" />
+                          <el-input v-model="yjformDataTest['yj_zzmc']"  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="yj_ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张1:" prop="address" class="mab"  label-width="105px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh']" clearable placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />
-                          <el-input v-model="yjformDataTest['yj_zzmc']" clearable placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_tlgg')"  />
+                          <el-input v-model="yjformDataTest['yj_zzdh1']"  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="yj_ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
+                          <el-input v-model="yjformDataTest['yj_zzmc1']"  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="yj_ent($event, 'yj_zzdh1', 'yj_zzmc1', 'yj_zzdh2')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张2:" prop="address" class="mab"  label-width="105px">
+                        <el-row>
+                          <el-input v-model="yjformDataTest['yj_zzdh2']"  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="yj_ent($event, 'yj_zzdh2', 'yj_zzdh2', 'yj_zzmc2')" />
+                          <el-input v-model="yjformDataTest['yj_zzmc2']"  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="yj_ent($event, 'yj_zzdh2', 'yj_zzmc2', 'yj_zzdh3')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张3:" prop="address" class="mab"  label-width="105px">
+                        <el-row>
+                          <el-input v-model="yjformDataTest['yj_zzdh3']"  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="yj_ent($event, 'yj_zzmc2', 'yj_zzdh3', 'yj_zzmc3')" />
+                          <el-input v-model="yjformDataTest['yj_zzmc3']"  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="yj_ent($event, 'yj_zzdh3', 'yj_zzmc3', 'yj_zzdh4')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张4:" prop="address" class="mab"  label-width="105px">
+                        <el-row>
+                          <el-input v-model="yjformDataTest['yj_zzdh4']"  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="yj_ent($event, 'yj_zzmc3', 'yj_zzdh4', 'yj_zzmc4')" />
+                          <el-input v-model="yjformDataTest['yj_zzmc4']"  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="yj_ent($event, 'yj_zzdh', 'yj_zzmc4', 'yj_tlgg')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
@@ -802,31 +831,36 @@
                   <el-row>
                     <el-col :span="12">
                       <el-form-item label="投料(mm*mm):" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_tlgg']" clearable placeholder="请输入投料规格"  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
+                        <el-input v-model="yjformDataTest['yj_tlgg']"  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="yj_ent($event, 'yj_zzmc4', 'yj_tlgg', 'yj_klgg')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="12">
                       <el-form-item label="开料(mm*mm):" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_klgg']" clearable placeholder="请输入开料规格" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
+                        <el-input v-model="yjformDataTest['yj_klgg']"  placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="yj_ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="12">
-                      <el-form-item label="开数:" prop="address" class="mab" label-width="70px">
-                        <el-input v-model="yjformDataTest['yj_ks']" clearable placeholder="请输入开数" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
+                    <el-col :span="6">
+                      <el-form-item label="开数:" prop="address" class="mab"  label-width="105px">
+                        <el-input v-model="yjformDataTest['yj_ks']"  placeholder="" style="width: 100px;" id="yj_ks"  @keydown="yj_ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="联数:" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_ls']" clearable placeholder="请输入联数"  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
+                    <el-col :span="6">
+                      <el-form-item label="联数:" prop="address" class="mab"  >
+                        <el-input v-model="yjformDataTest['yj_ls']"  placeholder=""  style="width: 100px;" id="yj_ls"  @keydown="yj_ent($event, 'yj_ks', 'yj_ls', '换算系数')"/>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="10">
+                      <el-form-item label="换算系数(公斤到万张):" prop="address" class="mab">
+                        <el-input v-model="yjformDataTest['KgToPages']"  placeholder=""  style="width: 170px;" id="换算系数"  @keydown="yj_ent($event, '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 type="textarea" v-model="yjformDataTest['yj_desc']" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+                      <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-form-item>
                     </el-col>
                   </el-row>
@@ -836,62 +870,95 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="yjcloseDialog">取 消</el-button>
-                <el-button type="primary" disabled @click="yjenterDialog">确 定</el-button>
+                <el-button type="primary"  @click="yjenterDialog">确 定</el-button>
               </div>
             </template>
           </el-dialog>
 
           <!-- 新增印件资料 -->
-          <el-dialog v-model="add_yjdialogFormVisible" :before-close="add_yjcloseDialog" :title="'修改印件资料'" height="80%" width="50%" destroy-on-close>
+          <el-dialog v-model="add_yjdialogFormVisible" :before-close="add_yjcloseDialog" :title="'新增印件资料'" height="500px" width="800px" destroy-on-close>
             <el-row>
               <el-scrollbar >
                 <el-form :model="add_yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
                   <el-row>
-                    <el-form-item label="印件号:" prop="address" class="mab"  label-width="70px">
+                    <el-form-item label="印件号:" prop="address" class="mab" label-width="100px">
                       <el-input  placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
-                    <el-form-item label="印件代号:" prop="address" class="mab">
+                    <el-form-item label="印件代号:" prop="address" class="mab" label-width="100px">
                       <el-input  placeholder="" style="width: 140px;"  id="印件代号"  @keydown="ent($event, '印件号', '印件代号', '印件名称')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
-                    <el-col :span="24">
-                      <el-form-item label="印件名称:" prop="address" class="mab">
+                    <el-col :span="18">
+                      <el-form-item label="印件名称:" prop="address" class="mab" label-width="100px">
                         <el-input  placeholder="" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="纸张:" prop="address" class="mab" label-width="70px">
+                      <el-form-item label="纸张:" prop="address" class="mab" label-width="100px">
                         <el-row>
                           <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh"  @keydown="ent($event, '印件名称', 'yj_zzdh', 'yj_zzmc')" />
-                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_tlgg')"  />
+                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc"  @keydown="ent($event, 'yj_zzdh', 'yj_zzmc', 'yj_zzdh1')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张1:" prop="address" class="mab" label-width="100px">
+                        <el-row>
+                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh1"  @keydown="ent($event, 'yj_zzmc', 'yj_zzdh1', 'yj_zzmc1')" />
+                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc1"  @keydown="ent($event, 'yj_zzdh1', 'yj_zzmc', 'yj_zzdh2')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张2:" prop="address" class="mab" label-width="100px">
+                        <el-row>
+                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh2"  @keydown="ent($event, 'yj_zzmc1', 'yj_zzdh', 'yj_zzmc2')" />
+                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc2"  @keydown="ent($event, 'yj_zzdh2', 'yj_zzmc', 'yj_zzdh3')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张3:" prop="address" class="mab" label-width="100px">
+                        <el-row>
+                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh3"  @keydown="ent($event, 'yj_zzmc2', 'yj_zzdh', 'yj_zzmc3')" />
+                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc3"  @keydown="ent($event, 'yj_zzdh3', 'yj_zzmc', 'yj_zzdh4')"  />
                         </el-row>
                       </el-form-item>
                     </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="备用纸张4:" prop="address" class="mab" label-width="100px">
+                        <el-row>
+                          <el-input  placeholder="" style="width: 140px;"  id="yj_zzdh4"  @keydown="ent($event, 'yj_zzmc3', 'yj_zzdh', 'yj_zzmc4')" />
+                          <el-input  placeholder=""  style="width: 460px;" id="yj_zzmc4"  @keydown="ent($event, 'yj_zzdh4', 'yj_zzmc', 'yj_tlgg')"  />
+                        </el-row>
+                      </el-form-item>
+                    </el-col>
+
                   </el-row>
                   <el-row>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item label="投料(mm*mm):" prop="address" class="mab">
                         <el-input  placeholder=""  style="width: 140px;"  id="yj_tlgg"  @keydown="ent($event, 'yj_zzmc', 'yj_tlgg', 'yj_klgg')"/>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="8">
                       <el-form-item label="开料(mm*mm):" prop="address" class="mab">
                         <el-input placeholder="" style="width: 140px;"  id="yj_klgg"  @keydown="ent($event, 'yj_tlgg', 'yj_klgg', 'yj_ks')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
-                    <el-col :span="12">
-                      <el-form-item label="开数:" prop="address" class="mab" label-width="70px">
+                    <el-col :span="10">
+                      <el-form-item label="开数:" prop="address" class="mab" label-width="100px">
                         <el-input  placeholder="" style="width: 140px;" id="yj_ks"  @keydown="ent($event, 'yj_tlgg', 'yj_ks', 'yj_ls')"/>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="12">
+                    <el-col :span="10">
                       <el-form-item label="联数:" prop="address" class="mab">
                         <el-input  placeholder=""  style="width: 140px;" id="yj_ls"  @keydown="ent($event, 'yj_ks', 'yj_ls', 'yj_desc')"/>
                       </el-form-item>
@@ -916,47 +983,37 @@
           </el-dialog>
 
           <!-- 修改工艺资料 弹窗 -->
-          <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" destroy-on-close>
+          <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" height="300px" width="900px" destroy-on-close>
             <el-row>
-              <el-scrollbar height="500px">
-                <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
+              <el-scrollbar>
+                <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule"  >
                   <el-row>
-                    <el-col :span="5">
-                      <el-form-item label="工序方案:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['方案']" clearable placeholder="" style="width: 90px;" id="方案"  @keydown="ent($event, '备注', '方案', 'Gy0_yjno')"/>
+                      <el-form-item label="工序方案:" prop="address" class="mab" >
+                        <el-input v-model="gyformDataTest['Gy0_方案']"  placeholder="" style="width: 90px;" id="方案"  @keydown="ent($event, '备注', '方案', '加工开数')"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="印件编号:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_yjno']" clearable placeholder="" style="width: 90px;" id="Gy0_yjno"  @keydown="ent($event, '方案', 'Gy0_yjno', 'Gy0_gxh')"/>
+                      <el-form-item label="印件编号:" prop="address" class="mab"  label-width="90">
+                        <el-input v-model="gyformDataTest['Gy0_yjno']" disabled  placeholder="" style="width: 90px;" id="Gy0_yjno"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="工序编号:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_gxh']" clearable placeholder="" style="width: 90px;" id="Gy0_gxh"  @keydown="ent($event, 'Gy0_yjno', 'Gy0_gxh', 'Gy0_Ks')"/>
+                      <el-form-item label="工序编号:" prop="address" class="mab" >
+                        <el-input v-model="gyformDataTest['Gy0_gxh']" disabled  placeholder="" style="width: 90px;" id="Gy0_gxh" />
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
                       <el-form-item label="加工开数" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_Ks']" clearable placeholder="" style="width: 90px;" id="Gy0_Ks"  @keydown="ent($event, 'Gy0_gxh', 'Gy0_Ks', 'Gy0_ls')"/>
+                        <el-input v-model="gyformDataTest['Gy0_Ks']"  placeholder="" style="width: 90px;" id="加工开数"  @keydown="ent($event, 'Gy0_gxh', '加工开数', 'Gy0_ls')"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="4">
-                      <el-form-item label="加工联数:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_ls']" clearable placeholder="" style="width: 90px;" id="Gy0_ls"  @keydown="ent($event, 'Gy0_Ks', 'Gy0_ls', 'gy0_site')"/>
+                      <el-form-item label="加工联数:" prop="address" class="mab" >
+                        <el-input v-model="gyformDataTest['Gy0_ls']"  placeholder="" style="width: 90px;" id="Gy0_ls"  @keydown="ent($event, '加工开数', 'Gy0_ls', 'gy0_site')"/>
                       </el-form-item>
-                    </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="6">
                       <el-form-item label="车间名称:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['gy0_site']" clearable placeholder="" style="width: 140px;" id="gy0_site"  @keydown="ent($event, 'Gy0_ls', 'gy0_site', 'gy0_gxmc')"/>
+                        <el-input v-model="gyformDataTest['Gy0_site']"  placeholder="" style="width: 140px;" id="gy0_site"  @keydown="ent($event, 'Gy0_ls', 'gy0_site', 'gy0_gxmc')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item label="工艺名称:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['gy0_gxmc']" clearable placeholder="" style="width: 140px;" id="gy0_gxmc"  @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
+                      <el-form-item label="工艺名称:" prop="address" class="mab"  label-width="100">
+                        <el-input v-model="gyformDataTest['gy0_gxmc']"  placeholder="" style="width: 140px;" id="gy0_gxmc"  @keydown="ent($event, 'gy0_site', 'gy0_gxmc', 'add_gxmc')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -964,51 +1021,53 @@
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="工序名称:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['add_gxmc']" clearable placeholder="" style="width: 100%;" id="add_gxmc"  @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
+                        <el-input v-model="gyformDataTest['Add_gxmc']"  placeholder="" style="width: 100%;" id="add_gxmc"  @keydown="ent($event, 'gy0_gxmc', 'add_gxmc', 'Gy0_sbbh')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
 
                   <el-row>
-                    <el-col :span="6">
-                      <el-form-item label="可用设备:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_sbbh']" clearable placeholder="" style="width: 140px;" id="Gy0_sbbh"  @keydown="ent($event, 'add_gxmc', 'Gy0_sbbh', 'Gy0_shdh')"/>
+                      <el-form-item label="计损色数:" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['Gy0_Ms']"  placeholder="" style="width: 140px;" id="Gy0_sbbh"  @keydown="ent($event, 'add_gxmc', 'Gy0_sbbh', 'sys_mc')"/>
+                      </el-form-item>
+                    <el-form-item label="可用设备:" prop="address" class="mab"  label-width="100">
+                        <el-input v-model="gyformDataTest['Gy0_sbbh']" disabled  placeholder="" style="" id="可用设备" />
+                      </el-form-item>
+                    <el-form-item label="难度系数:" prop="address" class="mab" label-width="237">
+                        <el-input v-model="gyformDataTest['工价系数']" disabled  placeholder="" style="width: 90px;" id="工价系数" />
                       </el-form-item>
-                    </el-col>
                   </el-row>
 
                   <el-row>
-                    <el-col :span="5">
                       <el-form-item label="标准损耗:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['Gy0_shdh']" clearable placeholder="" style="width: 90px;" id="Gy0_shdh"  @keydown="ent($event, 'Gy0_sbbh', 'Gy0_shdh', '基础损耗')"/>
+                        <el-input v-model="gyformDataTest['Gy0_shdh']" disabled  placeholder="" style="width: 150px;" id="Gy0_shdh" />
+                        <el-input v-model="gyformDataTest['sys_mc']"  placeholder="" style="width: 160px;" id="sys_mc"  @keydown="ent($event, 'Gy0_sbbh', 'sys_mc', '基础损耗')"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="5">
                       <el-form-item label="基础损耗:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['基础损耗']" clearable placeholder="" style="width: 90px;" id="基础损耗"  @keydown="ent($event, 'Gy0_shdh', '基础损耗', '损耗率')"/>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="损耗率" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['损耗率']" clearable placeholder="" style="width: 90px;" id="损耗率"  @keydown="ent($event, '基础损耗', '损耗率', '工价系数')"/>
+                        <el-input v-model="gyformDataTest['sys_rate0']"  placeholder="" style="width: 70px;" id="基础损耗"  @keydown="ent($event, 'sys_mc', '基础损耗', '损耗率')"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="工价系数:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['工价系数']" clearable placeholder="" style="width: 90px;" id="工价系数"  @keydown="ent($event, '损耗率', '工价系数', '损耗系数')"/>
+                      <el-form-item label="损耗率" prop="address" class="mab" >
+                        <el-input v-model="gyformDataTest['sys_rate1']"  placeholder="" style="width: 90px;" id="损耗率"  @keydown="ent($event, '基础损耗', '损耗率', '工序备注')"/>
                       </el-form-item>
-                    </el-col>
-                    <el-col :span="6">
-                      <el-form-item label="损耗系数:" prop="address" class="mab">
-                        <el-input v-model="gyformDataTest['损耗系数']" clearable placeholder="" style="width: 90px;" id="损耗系数"  @keydown="ent($event, '工价系数', '损耗系数', '备注')"/>
+                      <el-form-item label="损耗系数:" prop="address" class="mab" >
+                        <el-input v-model="gyformDataTest['损耗系数']"  disabled placeholder="" style="width: 90px;" id="损耗系数"/>
                       </el-form-item>
-                    </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="工序备注:" prop="remark" class="mab">
-                        <el-input type="textarea" v-model="gyformDataTest['备注']" rows="4" clearable placeholder="请输入备注说明"  id="备注"  @keydown="ent($event, '损耗系数', '备注', '方案')" />
+                        <el-input type="textarea" v-model="gyformDataTest['工序备注']" rows="2" resize="none" placeholder=""  id="工序备注"  @keydown="ent($event, '损耗率', '工序备注', '质量要求')" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="质量要求:" prop="remark" class="mab">
+                        <el-input type="textarea" v-model="gyformDataTest['质量要求']" rows="2" resize="none" placeholder=""  id="质量要求"  @keydown="ent($event, '工序备注', '质量要求', '质量隐患')" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="质量隐患:" prop="remark" class="mab">
+                        <el-input type="textarea" v-model="gyformDataTest['质量隐患']" rows="2" resize="none" placeholder=""  id="质量隐患"  @keydown="ent($event, '质量要求', '质量隐患', '方案')" />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1018,7 +1077,7 @@
             <template #footer>
               <div class="dialog-footer">
                 <el-button @click="gycloseDialog">取 消</el-button>
-                <el-button type="primary" disabled @click="gyenterDialog">确 定</el-button>
+                <el-button type="primary" disabled  @click="gyenterDialog">确 定</el-button>
               </div>
             </template>
           </el-dialog>
@@ -1142,8 +1201,8 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { Layout, LayoutSider, LayoutContent } from '@arco-design/web-vue';
 import { ref, reactive } from 'vue'
 import {
-  DataList,editGyName, editGyNo, editProduct,
-  getCustom,getDepartment,getProduct,editGy,getProductData,
+  DataList,editGyName, editGyNo, editProduct,editProductYjInfo,getProductGyInfo,
+  getCustom,getDepartment,getProduct,editGy,getProductData,getProductYjInfo,
   getProductGy,editGyWaste,editGyMs,getStaffList,setProductStatus} from "@/api/yunyin/yunying";
 defineOptions({   name: 'Company'})
 
@@ -1847,17 +1906,16 @@ const _getProduct = async ()=>{
 // 分页
 const page = ref(1)
 const total = ref(0)
-const pageSize = ref(50)
+const pageSize = ref(30)
 const handleCurrentChange = (val) => {
   page.value = val;
-  _WorkList_page();
+  _getProduct();
 };
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-  page.value = 1;
   pageSize.value = val;
-  _WorkList_page();
+  _getProduct();
 };
 
 //=========修改产品基本资料产品表格弹窗========
@@ -1906,8 +1964,9 @@ const enterDialog = async () => {
 let yjformDataTest = reactive({})
 //双击修改
 const yjupdateCompanyFunc = async (row) => {
-  Object.assign(yjformDataTest,row);
-  // yjformDataTest = row;
+  //3.1获取产品印件资料
+  const getProductYjInfo_edit = await getProductYjInfo({UniqId:row.UniqId})
+  Object.assign(yjformDataTest,getProductYjInfo_edit.data[0]);
   yjdialogFormVisible.value = true;
 };
 // 弹窗
@@ -1920,25 +1979,35 @@ const yjcloseDialog = () => {
 const yjenterDialog = async () => {
   console.log(yjformDataTest)
   const formattedData = {
-    '印件号': yjformDataTest['yj_yjno'],
-    '印件代号': yjformDataTest['yj_yjdh'],
-    '印件名称': yjformDataTest['yj_yjmc'],
-    '纸张单号': yjformDataTest['yj_zzdh'],
-    '纸张名称': yjformDataTest['yj_zzmc'],
-    '投料': yjformDataTest['yj_tlgg'],
-    '开料': yjformDataTest['yj_klgg'],
-    '开数': yjformDataTest['yj_ks'],
-    '联数': yjformDataTest['yj_ls'],
-    '备注说明': yjformDataTest['yj_desc'],
+    UniqId: yjformDataTest['UniqId'],
+    yj_yjno: yjformDataTest['yj_yjno'],
+    yj_yjdh: yjformDataTest['yj_yjdh'],
+    yj_yjmc: yjformDataTest['yj_yjmc'],
+    yj_zzdh: yjformDataTest['yj_zzdh'],
+    yj_zzdh1: yjformDataTest['yj_zzdh1'],
+    yj_zzdh2: yjformDataTest['yj_zzdh2'],
+    yj_zzdh3: yjformDataTest['yj_zzdh3'],
+    yj_zzdh4: yjformDataTest['yj_zzdh4'],
+    yj_zzmc: yjformDataTest['yj_zzmc'],
+    yj_zzmc1: yjformDataTest['yj_zzmc1'],
+    yj_zzmc2: yjformDataTest['yj_zzmc2'],
+    yj_zzmc3: yjformDataTest['yj_zzmc3'],
+    yj_zzmc4: yjformDataTest['yj_zzmc4'],
+    yj_tlgg: yjformDataTest['yj_tlgg'],
+    yj_klgg: yjformDataTest['yj_klgg'],
+    yj_ks: yjformDataTest['yj_ks'],
+    yj_ls: yjformDataTest['yj_ls'],
+    KgToPages: yjformDataTest['KgToPages'],
+    yj_desc: yjformDataTest['yj_desc'],
   };
-  console.log(formattedData)
-  // const editdata = await 修改印件接口函数(formattedData);
-  // if (editdata.code === 0) {
-  //   ElMessage({type: 'success',message: '更新成功'})
-  // } else {
-  //   ElMessage({ type: 'error',message: '更新失败'})
-  // }
-  // yjdialogFormVisible.value = false;
+  //3.2修改产品印件资料
+  const editProductYjInfo_edit = await editProductYjInfo(formattedData);
+  if (editProductYjInfo_edit.code === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+  } else {
+    ElMessage({ type: 'error',message: '更新失败'})
+  }
+  yjdialogFormVisible.value = false;
 }
 
 //=========新增印件资料========
@@ -1964,34 +2033,42 @@ const add_yjenterDialog = () => {
 let gyformDataTest = reactive({})
 //双击修改
 const gyupdateCompanyFunc = async (row) => {
-  Object.assign(gyformDataTest,row);
-  // gyformDataTest = row;
+  //3.6工艺资料-获取产品工艺资料
+  const getProductGyInfo_edit = await getProductGyInfo({UniqID:row.UniqID})
+  console.log(getProductGyInfo_edit)
+  Object.assign(gyformDataTest,getProductGyInfo_edit.data);
   gydialogFormVisible.value = true;
 };
-//弹窗
+//默认关闭弹窗
 const gydialogFormVisible = ref(false)
-//打开修改弹窗
+//工艺修改确定
 const gyenterDialog = () => {
-  console.log(gyformDataTest)
+  // console.log(gyformDataTest)
   const formattedData = {
-    '工序方案': gyformDataTest['方案'],
-    '印件编号': gyformDataTest['Gy0_yjno'],
-    '工序编号': gyformDataTest['Gy0_gxh'],
-    '加工开数': gyformDataTest['Gy0_Ks'],
-    '加工联数': gyformDataTest['Gy0_ls'],
-    '车间名称': gyformDataTest['gy0_site'],
-    '工艺名称': gyformDataTest['gy0_gxmc'],
-    '工序名称': gyformDataTest['add_gxmc'],
-    '可用设备': gyformDataTest['Gy0_sbbh'],
-    '标准损耗': gyformDataTest['Gy0_shdh'],
-    '基础损耗': gyformDataTest['基础损耗'],
-    '损耗率': gyformDataTest['损耗率'],
-    '工价系数': gyformDataTest['工价系数'],
-    '损耗系数': gyformDataTest['损耗系数'],
-    '工序备注': gyformDataTest['备注'],
+    Gy0_方案: gyformDataTest['Gy0_方案'],
+    Gy0_yjno: gyformDataTest['Gy0_yjno'],
+    Gy0_gxh: gyformDataTest['Gy0_gxh'],
+    Gy0_Ks: gyformDataTest['Gy0_Ks'],
+    Gy0_ls: gyformDataTest['Gy0_ls'],
+    Gy0_site: gyformDataTest['Gy0_site'],
+    gy0_gxmc: gyformDataTest['gy0_gxmc'],
+    Add_gxmc: gyformDataTest['Add_gxmc'],
+    Gy0_Ms: gyformDataTest['Gy0_Ms'],
+    Gy0_sbbh: gyformDataTest['Gy0_sbbh'],
+    工价系数: gyformDataTest['工价系数'],
+    Gy0_shdh: gyformDataTest['Gy0_shdh'],
+    sys_mc: gyformDataTest['sys_mc'],
+    sys_rate0: gyformDataTest['sys_rate0'],
+    sys_rate1: gyformDataTest['sys_rate1'],
+    损耗系数: gyformDataTest['损耗系数'],
+    工序备注: gyformDataTest['工序备注'],
+    质量要求: gyformDataTest['质量要求'],
+    质量隐患: gyformDataTest['质量隐患'],
+
   };
   console.log(formattedData)
   // const editdata = await 修改工艺接口函数(formattedData);
+
   // if (editdata.code === 0) {
   //   ElMessage({type: 'success',message: '更新成功'})
   // } else {
@@ -2051,7 +2128,37 @@ const setInputCellStyle = (data) => {
 //键盘 input框跳转
 const ent = (event,id1,id2,id3) => {
 
-  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+  if (event.keyCode === 13 ||  event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    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()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
+// const  _yjdh = ref(null);
+const yj_ent = (event,id1,id2,id3) => {
+  // if(event.keyCode == 13){
+  //   if(yjformDataTest['yj_yjdh']){
+  //     _getProductDatat()
+  //   }
+  // }
+  if ( event.keyCode === 40) { // Enter 或向下箭头
     if(id3!=''){
       document.getElementById(id3).focus()
     }

+ 0 - 2
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -1,7 +1,6 @@
 <template>
   <div>
     <layout>
-
       <layout-header>
         <div class="">
           <!--          按钮部分-->
@@ -19,7 +18,6 @@
 
 
       <layout>
-
         <!--    左侧树侧形结构-->
         <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
           <div class="JKWTree-tree" style="height: 200px">

+ 166 - 31
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -13,7 +13,7 @@
 
               <div v-if="treeType === 'customTree'">
                 <el-button type="primary" title="设置工单各个工序的 【完工】 状态" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
-                <el-button type="primary" title="引用当前产品最近一次的生产参数【设备、显示产能、辅助工时】" icon="edit" disabled @click="pd_yysjcsonClick" class="bt">引用实际参数</el-button>
+                <el-button type="primary" title="引用当前产品最近一次的生产参数【设备、显示产能、辅助工时】" icon="edit" @click="pd_yysjcsonClick" class="bt">引用实际参数</el-button>
                 <el-button type="primary" title="批量维护工序生产的排程参数" icon="edit" disabled @click="pd_pccswhonClick" class="bt">排程参数维护</el-button>
                 <el-button type="primary" title="将已经维护好的排产参数,复制给对应产品的对应工艺" icon="edit" disabled @click="pd_pdcsfzonClick" class="bt">排单参数复制</el-button>
                 <el-button type="primary" title="根据当前生产任务设备状态排程 编辑生产计划" icon="edit" disabled @click="pd_editscjhonClick" class="bt">编辑生产计划</el-button>
@@ -30,7 +30,7 @@
 
               <el-button type="primary" title="打印生产工单" disabled icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button>
               <el-button type="primary" icon="edit" @click="pd_gxclhconClick" class="bt">工序产量核查</el-button>
-              <el-button type="primary" icon="edit" disabled @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
+              <el-button type="primary" icon="edit" @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
 
             </el-form-item>
           </el-form>
@@ -107,7 +107,7 @@
                   <el-input v-model="cjsbpcformData['sbdh']" disabled placeholder="" />
                 </el-form-item>
                 <el-form-item label="班次选择:" prop="originalName" style="margin-left: 20px;">
-                  <el-select v-model="cjsbpcformData.banci" placeholder="请选择" allow-create filterable @change="setBanci">
+                  <el-select v-model="cjsbpcformData.banci" placeholder="请选择" style="width: 230px;" allow-create filterable @change="setBanci">
                     <el-option
                         v-for="(option, index) in cjsbpcformData.bancis"
                         :key="index"
@@ -208,10 +208,6 @@
           </el-dialog>
 
 
-
-
-
-
           <!--工序产量核查【弹窗】-->
           <el-dialog v-model="pd_gxclhclist" title="工序产量核查" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
             <el-button type="" @click="gxclhcCancel">退出</el-button>
@@ -242,6 +238,42 @@
             </el-table>
           </el-dialog>
 
+          <!--流程单查询【弹窗】-->
+          <el-dialog v-model="pd_lcdlist" title="工单工序生产进程" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
+            <div style="width: 100%;height: 100%;">
+              <el-button type="" @click="pd_lcdCancel">退出</el-button>
+            </div>
+            <div style="width: 100%; height: 100%; display: flex; align-items: center;">
+              <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
+                <el-input v-model="pd_lcdformData['gdbh']" @keyup.enter="pd_lcdProductValue"/>
+              </el-form-item>
+              <el-form-item label="" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['code']" disabled/>
+              </el-form-item>
+              <el-form-item label="" style="margin-right: 5px; padding: 0;">
+                <el-input v-model="pd_lcdformData['name']" disabled style="width: 500px"/>
+              </el-form-item>
+            </div>
+            <div style="width: 100%; height: 70vh; display: flex;">
+              <layout>
+                <layout-sider :resize-directions="['right']" :width="240" style="margin-right: 10px;height: 70vh;">
+                  <div class="JKWTree-tree">
+                    <el-tree :data="pd_lcd_treeData" @node-click="pd_lcd_handleNodeClick" default-expand-all></el-tree>
+                  </div>
+                </layout-sider>
+                <layout-main>
+                  <!-- 这里放右侧的内容 -->
+                  <el-space wrap>
+                    <!-- 右侧内容 -->
+                    <template v-for="item in processList.total_process">
+                      <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button>
+                    </template>
+                  </el-space>
+                </layout-main>
+              </layout>
+            </div>
+          </el-dialog>
+
 
         </div>
       </layout-header>
@@ -449,10 +481,29 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ref, reactive } from 'vue'
 import {
-  DataList, getProduct, getProductData,scheduleProcess,ProductionSchedulingAdd,
-  Project, StatusEdit, EquipmentScheduling, ScheduleSelection,MachineWorkOrderList,
-  projectCraft, ProcessStatusCorrection,ProductionSchedulingPause,ProcessStatusCorrectionEdit,
-  projectPrint, setProductStatus, workbench, ProcessFlow, Schedule,complete,getOrderProcessCount
+  DataList,
+  getProduct,
+  getProductData,
+  scheduleProcess,
+  ProductionSchedulingAdd,
+  Project,
+  StatusEdit,
+  EquipmentScheduling,
+  ScheduleSelection,
+  MachineWorkOrderList,
+  projectCraft,
+  ProcessStatusCorrection,
+  ProductionSchedulingPause,
+  ProcessStatusCorrectionEdit,
+  projectPrint,
+  setProductStatus,
+  workbench,
+  ProcessFlow,
+  Schedule,
+  complete,
+  getOrderProcessCount,
+  getOrderProcessLeft,
+  getOrderProcessRight
 } from "@/api/yunyin/yunying";
 defineOptions({name: 'Company'})
 
@@ -1036,6 +1087,26 @@ const _getOrderProcessCount = async () => {
   });
   gxclhc_Data.value = concatenatedData;
 };
+//工序产量核查
+const gxclhcCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if (column.label === '实际上报产量' ||column.label === '制程废品'  || column.label === '制程废品率' ||
+      column.label === '来料异常' || column.label === '流程单数' || column.label === '当前设备') {
+    return 'lan-plan-usage-lows';
+  }
+  if (column.label === '折算车头产量') {
+    return 'gxclhc—color-column-red';
+  }
+  // 如果不是 'PD_WG' 列,返回空字符串或其他样式类
+  if (column.label === '工序状态'){
+    if(row['PD_WG'] === '完工'){
+      return 'lan-plan-usage-lowshui';
+    }else{
+      return 'pczccolor-column-lan';
+    }
+  }
+}
+
+
 //===========工单状态设置按钮=======
 const onstatuslist = ref(false);
 const statusformData = reactive({gdbh: '',});
@@ -1159,6 +1230,16 @@ const onjztzClick = async () => {
 
 };
 
+//=============引用实际参数================
+const pd_yysjcsonClick = () => {
+  if(_Gd_gdbh.value == null){
+    gxztgzzlist.value = false;
+    ElMessage({type: 'warning',message: '请选择树形后,再操作此功能'})
+  }else{
+    console.log(_Gd_gdbh.value)
+    ElMessage({type: 'warning',message: '没有找到该产品的入仓完工记录,不能继续进行'})
+  }
+};
 
 //=============车间设备排程================
 const paichengColumns = ref(
@@ -1367,11 +1448,83 @@ const cjsbpcCancel = () => {
   cjsbpclist.value = false;
 };
 
-//流程单查询按钮
+
+// =========== 流程单查询 ===========
+
+const pd_lcdlist = ref(false);
+const pd_lcdformData = reactive({
+  gdbh: '',
+  code: '',
+  name: '',
+});
+// 流程单查询按钮
+const processList = ref([]);
 const pd_lcdlistonClick = async () => {
-  console.log("流程单查询")
+  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
+    ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
+    return false;
+  }else{
+    pd_lcdformData['gdbh'] = _Gd_gdbh.value;
+    pd_lcdlist.value = true;
+    processList.value = []
+    _getOrderProcessLeft_list();
+  }
+}
+const pd_lcdProductValue = async () => {
+  _getOrderProcessLeft_list();
+}
+const pd_lcd_treeData = ref([]);
+const _getOrderProcessLeft_list = async () => {
+  const order = pd_lcdformData['gdbh'];
+  // console.log(order)
+  try {
+    //5.1流程单查询-工单工序生产进程菜单栏
+    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order});
+    console.log(getOrderProcessLeft_list)
+    pd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code'];
+    pd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name'];
+    pd_lcd_treeData.value = [{
+      label: order + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      // label: order + '-' + getOrderProcessLeft_list.data.Gd_info['code'] + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      value: undefined,
+      children: []
+    }]
+    const newData = [];
+    for (let key in getOrderProcessLeft_list.data.Gy_info) {
+      let temp = getOrderProcessLeft_list.data.Gy_info[key];
+      let concatenatedValue = `${temp.Gy0_yjno}-${temp.Gy0_gxh} ---> ${temp.Gy0_gxmc}`;
+      newData.push({ label: concatenatedValue,value: temp.Gy0_gxh });
+    }
+    pd_lcd_treeData.value[0].children = newData;
+    //5.2流程单查询-获取工单工序生产进程右侧【进入页面默认显示第一个】
+    const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:newData[0].value});
+    processList.value = getOrderProcessRight_list.data
+  } catch (error) {
+    console.error(error);
+  }
 };
 
+const pd_lcd_handleNodeClick = async (node) => {
+  if (node.value === undefined) return
+  const order = pd_lcdformData['gdbh'];
+  ////5.2流程单查询-获取工单工序生产进程右侧
+  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value});
+  console.log(getOrderProcessRight_list)
+  processList.value = getOrderProcessRight_list.data
+};
+
+// 流程单查询退出
+const pd_lcdCancel = async () => {
+  pd_lcdlist.value = false;
+}
+
+
+
+
+
+
+
+
 
 //颜色
 //工序状态更正颜色
@@ -1391,25 +1544,7 @@ const cjzcCellClass = ({row, column, rowIndex, columnIndex}) =>{
     return 'color-column-lan';
   }
 }
-//工序产量核查
-const gxclhcCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  if (column.label === '实际上报产量' ||column.label === '制程废品'  || column.label === '制程废品率' ||
-      column.label === '来料异常' || column.label === '流程单数' || column.label === '当前设备') {
-    return 'lan-plan-usage-lows';
-  }
-  if (column.label === '折算车头产量') {
-    return 'gxclhc—color-column-red';
-  }
-  // 如果不是 'PD_WG' 列,返回空字符串或其他样式类
-  if (column.label === '工序状态'){
-    if(row['PD_WG'] === '完工'){
-      return 'lan-plan-usage-lowshui';
-    }else{
-      return 'pczccolor-column-lan';
-    }
-  }
 
-}
 //排程中、制程中 下方表格文字变色
 const pczc_planUsageCellClass = ({row, column, rowIndex, columnIndex}) =>{
   if (row['工序完工'].substring(0, 2) === "20") {

+ 357 - 43
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -7,20 +7,20 @@
         <el-form ref="elSearchFormRef"  class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
           <el-form-item>
             <el-input v-model="searchInfo"  placeholder="搜索工单编号、产品代号" style="width: 180px;"></el-input>
-            <el-button type="primary" title="搜索"  icon="search" @click="onSubmit"></el-button>
-            <el-button type="primary" title="按工序投料反馈,试算某产量的投料"  icon="edit"   @click="ontlssclick"       class="bt">U8投料试算</el-button>
-            <el-button type="primary" title="重新引用 产品资料!"  icon="edit"   @click="onyycpzlclick"     class="bt">引用产品资料</el-button>
-            <el-button type="primary" title="工序产量核算"  icon="edit"   @click="oneditgxclhsclick" class="bt">工序产量核算</el-button>
-            <el-button type="primary" title="根据实际生产需要,对工艺流程做调整"  icon="edit"   @click="oneditgylctzclick" class="bt">工艺流程调整</el-button>
-            <el-button type="primary" title="删除U8工单异常数据"  icon="edit"   @click="oneditugdclick"    class="bt">查改U8工单</el-button>
-            <!--<el-button type="primary" title="初始化中间表更新状态,便于数据重新获取" disabled icon="edit" @click="oneditztfwclick" class="bt">状态复位</el-button>-->
-            <el-button type="primary" title="修正核算参数"  icon="edit"   @click="onxzhscsclick"     class="bt" >修正核算参数</el-button>
-            <el-button type="primary" title="批量调整质检废品系数"  icon="edit"   @click="onzjfpxsclick"     class="bt" >质检废品系数</el-button>
-            <el-button type="primary" title="打印生产工单"  icon="edit"   @click="cp_gdprintonClick"     class="bt" disabled>工单打印</el-button>
-            <el-button type="primary" title="工序产量核查"  icon="edit"   @click="gdgxclhconlick"    class="bt" disabled>工序产量核查</el-button>
-            <el-button type="primary" title="流程单查询"  icon="edit"   @click="gdlcdcxconlick"    class="bt" disabled>流程单查询</el-button>
-            <el-button type="primary" title="新增印件资料"  icon="edit"   @click="addgdyj_onclick"   class="bt" disabled>新增印件资料</el-button>
-            <el-button type="primary" title="新增工艺资料"  icon="edit"   @click="ddgdgy_onclick"    class="bt" disabled>新增工艺资料</el-button>
+            <el-button type="primary" icon="search" @click="onSubmit" title="搜索"  ></el-button>
+            <el-button type="primary" icon="edit"   @click="ontlssclick"       class="bt" title="按工序投料反馈,试算某产量的投料">U8投料试算</el-button>
+            <el-button type="primary" icon="edit"   @click="onyycpzlclick"     class="bt" title="重新引用 产品资料!">引用产品资料</el-button>
+            <el-button type="primary" icon="edit"   @click="oneditgxclhsclick" class="bt" title="工序产量核算">工序产量核算</el-button>
+            <el-button type="primary" icon="edit"   @click="oneditgylctzclick" class="bt" title="根据实际生产需要,对工艺流程做调整">工艺流程调整</el-button>
+            <el-button type="primary" icon="edit"   @click="oneditugdclick"    class="bt" title="删除U8工单异常数据">查改U8工单</el-button>
+<!--            <el-button type="primary" icon="edit"   @click="oneditztfwclick"   class="bt" title="初始化中间表更新状态,便于数据重新获取" disabled>状态复位</el-button>-->
+            <el-button type="primary" icon="edit"   @click="onxzhscsclick"     class="bt" title="修正核算参数">修正核算参数</el-button>
+            <el-button type="primary" icon="edit"   @click="onzjfpxsclick"     class="bt" title="批量调整质检废品系数">质检废品系数</el-button>
+            <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产工单" disabled>工单打印</el-button>
+            <el-button type="primary" icon="edit"   @click="gd_gxclhconClick"  class="bt" title="工序产量核查">工序产量核查</el-button>
+            <el-button type="primary" icon="edit"   @click="gdlcdcxconlick"    class="bt" title="流程单查询">流程单查询</el-button>
+            <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增印件资料" disabled>新增印件资料</el-button>
+            <el-button type="primary" icon="edit"   @click="ddgdgy_onclick"    class="bt" title="新增工艺资料" disabled>新增工艺资料</el-button>
           </el-form-item>
         </el-form>
 
@@ -109,8 +109,8 @@
           </el-table>
         </el-dialog>
 
-        <!--用产品资料-->
-        <el-dialog v-model="onyycpzllist" title="获取产品资料"  style="width: 45%;height: 45%;">
+        <!--用产品资料-->
+        <el-dialog v-model="onyycpzllist" title="获取产品资料"  style="width: 45%;height: 47%;">
           <div style=" padding: 0px; align-items: center;">
             <el-form-item label="工单编号" prop="processName" class="mab">
               <el-input v-model="yycpzlformData['gdbh']" @keyup.enter="yycpzlProductValue" placeholder="" style="width: 23%;" />
@@ -123,19 +123,21 @@
               <el-input v-model="yycpzlformData['cpdh']"  disabled placeholder="" style="width: 23%;" />
             </el-form-item>
             <el-form-item label="产品名称" prop="processName" class="mab" >
-              <el-input v-model="yycpzlformData['cpmc']" disabled  placeholder="" style="width: 69%; height: 70px" type="textarea" rows="2" :resize="false" />
+              <el-input v-model="yycpzlformData['cpmc']" disabled  placeholder="" style="width: 69%; height: 70px" type="textarea" resize="none" rows="2" :resize="false" />
             </el-form-item>
             <el-form-item label="创建选择" class="mab" >
                 <div>
                   <el-checkbox disabled v-model="yycpzlformData['yjzl']">获取印件资料</el-checkbox>
                   <el-checkbox disabled v-model="yycpzlformData['gyap']">获取工艺安排</el-checkbox>
                 </div>
-<!--                <el-form-item label="工艺方案" prop="processName">-->
-<!--                  <el-input v-model="yycpzlformData['gyfa']"  placeholder="" />-->
-<!--                </el-form-item>-->
             </el-form-item>
           </div>
-
+<!--          <template #footer>-->
+<!--            <div class="dialog-footer">-->
+<!--              <el-button @click="yycpzlhandleCancel">放弃</el-button>-->
+<!--              <el-button type="primary" @click="yycpzlhandleConfirm">执行</el-button>-->
+<!--            </div>-->
+<!--          </template>-->
           <div slot="footer" class="dialog-footer" style="text-align: right;margin-left: 25%">
               <el-button @click="yycpzlhandleCancel">放弃</el-button>
               <el-button type="primary" @click="yycpzlhandleConfirm">执行</el-button>
@@ -390,7 +392,6 @@
 <!--          </el-table>-->
         </el-dialog>
 
-
         <!--工单打印【弹窗】-->
         <el-dialog v-model="cp_print_gdlist" title="生产工单打印" style="width: 700px;height: 400px;top: 5%">
 
@@ -438,13 +439,79 @@
           </div>
 
         </el-dialog>
+
+        <!--工序产量核查【弹窗】-->
+        <el-dialog v-model="gd_gxclhclist" title="工序产量核查" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
+          <el-button type="" @click="gxclhcCancel">退出</el-button>
+          <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
+            <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
+              <el-form-item label="工单编号" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+                <el-input v-model="gxclhcformData['gdbh']"  @keyup.enter="gxclhcProductValue" placeholder="" />
+              </el-form-item>
+            </div>
+          </div>
+          <el-table ref="paichengRef"
+                    :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"
+                    highlight-current-row="true"
+                    @row-click="gxclhc_tableRowClick"
+                    :data="gxclhc_Data" row-key="ID"
+                    :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]}}
+              </el-table-column>
+            </template>
+          </el-table>
+        </el-dialog>
+
+        <!--流程单查询【弹窗】-->
+        <el-dialog v-model="gd_lcdlist" title="工单工序生产进程" style="width: 100%;height: 100%;margin: 0px;padding: 0px;">
+          <div style="width: 100%;height: 100%;">
+            <el-button type="" @click="gd_lcdCancel">退出</el-button>
+          </div>
+          <div style="width: 100%; height: 100%; display: flex; align-items: center;">
+            <el-form-item label="工单编号" style="margin-right: 20px; padding: 0;">
+              <el-input v-model="gd_lcdformData['gdbh']" @keyup.enter="gd_lcdProductValue"/>
+            </el-form-item>
+            <el-form-item label="" style="margin-right: 5px; padding: 0;">
+              <el-input v-model="gd_lcdformData['code']" disabled/>
+            </el-form-item>
+            <el-form-item label="" style="margin-right: 5px; padding: 0;">
+              <el-input v-model="gd_lcdformData['name']" disabled style="width: 500px"/>
+            </el-form-item>
+          </div>
+          <div style="width: 100%; height: 70vh; display: flex;">
+            <layout>
+              <layout-sider :resize-directions="['right']" :width="240" style="margin-right: 10px;height: 70vh;">
+                <div class="JKWTree-tree">
+                  <el-tree :data="lcd_treeData" @node-click="lcd_handleNodeClick" default-expand-all></el-tree>
+                </div>
+              </layout-sider>
+              <layout-main>
+                <!-- 这里放右侧的内容 -->
+                <el-space wrap>
+                  <!-- 右侧内容 -->
+                  <template v-for="item in processList.total_process">
+                    <el-button disabled :type="! processList.process.includes(item) ? 'danger' : 'info'" plain style="width: 50px">{{ item }}</el-button>
+                  </template>
+                </el-space>
+              </layout-main>
+            </layout>
+          </div>
+        </el-dialog>
+
       </div>
 
       </layout-header>
       <layout>
 <!-- 左侧树形结构 -->
-        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;">
-          <div class="JKWTree-tree" style="height: 200px">
+        <layout-sider :resize-directions="['right']" :width="190" style="margin-right: 10px;height: 100%">
+          <div class="JKWTree-tree" style="height: 100%">
           <h3>工单管理</h3>
           <el-tree :data="treeData.data"  @node-click="handleNodeClick"></el-tree>
         </div>
@@ -469,27 +536,27 @@
                       @row-dblclick="updateCompanyFunc"
                       @selection-change="handleSelectionChange"
                       :show-overflow-tooltip="true">
-<!--                <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" />
-                <el-table-column align="left" label="销售订单号"  prop="销售订单号" width="100" />
-                <el-table-column align="left" label="产品代号"    prop="产品代号" width="99" />
-                <el-table-column align="left" label="产品名称"    prop="产品名称" width="370" />
-                <el-table-column align="left" label="订单数量"    prop="订单数量" width="100" />
-                <el-table-column align="left" label="单位"       prop="单位" width="54"/>
-                <el-table-column align="left" label="折合大箱"    prop="折合大箱" width="81" />
+                <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" />
+                <el-table-column align="left" label="销售订单号" prop="销售订单号" width="100" />
+                <el-table-column align="left" label="产品代号"   prop="产品代号"  width="99" />
+                <el-table-column align="left" label="产品名称"   prop="产品名称" width="370" />
+                <el-table-column align="left" label="订单数量"   prop="订单数量" width="100" />
+                <el-table-column align="left" label="单位"       prop="单位"   width="54"/>
+                <el-table-column align="left" label="折合大箱"   prop="折合大箱" width="81" />
                 <el-table-column align="left" label="投料率"     prop="投料率" width="80" />
                 <el-table-column align="left" label="平均合格率"  prop="平均合格率" width="95" />
                 <el-table-column align="left" label="开单日期"    prop="开单日期" width="98" />
                 <el-table-column align="left" label="交货日期"    prop="交货日期" width="98" />
                 <el-table-column align="left" label="工单类型"    prop="工单类型" width="98" />
-                <el-table-column align="left" label="工单状态"    prop="工单状态" width="81" />
+                <el-table-column align="left" label="工单状态"    prop="工单状态" width="85" />
                 <el-table-column align="left" label="当前生产工序" prop="当前生产工序" width="110" />
                 <el-table-column align="left" label="产量提交时间" prop="产量提交时间" width="110" />
-                <el-table-column align="left" label="建档用户"    prop="建档用户" width="100" />
+                <el-table-column align="left" label="建档用户"    prop="建档用户" width="130" />
                 <el-table-column align="left" label="建档时间"    prop="建档时间" width="115" />
-                <el-table-column align="left" label="更新时间"   prop="更新时间" width="160" />
+                <el-table-column align="left" label="更新时间"    prop="更新时间" width="160" />
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -795,6 +862,78 @@
             </template>
           </el-dialog>
 
+          <!-- 新增印件资料 -->
+          <el-dialog v-model="add_gdyjdialogFormVisible" :before-close="add_gdyjcloseDialog"
+                     style="width: 1000px; height: 730px; margin-top: 0;margin-bottom: 0;top: 7%" :title="'新增印件资料'" destroy-on-close>
+            <el-form label-width="100px">
+              <el-form-item label="印件号:" prop="keyOrder">
+                <el-input placeholder="" style="width: 140px;"/>
+              </el-form-item>
+              <el-form-item label="印件代码:" prop="keyOrder">
+                <el-input  placeholder="" style="width: 140px;"/>
+                <el-input  placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <el-form-item label="纸张编号:" prop="keyOrder">
+                <el-input  placeholder="" style="width: 140px;"/>
+                <el-input  placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <el-form-item label="备用纸张1:" prop="keyOrder">
+                <el-input  placeholder="" style="width: 140px;"/>
+                <el-input  placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <el-form-item label="备用纸张2:" prop="keyOrder">
+                <el-input  placeholder="" style="width: 140px;"/>
+                <el-input  placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <el-form-item label="备用纸张3:" prop="keyOrder">
+                <el-input  placeholder="" style="width: 140px;"/>
+                <el-input  placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <el-form-item label="备用纸张4:" prop="keyOrder">
+                <el-input placeholder="" style="width: 140px;"/>
+                <el-input placeholder="" style="width: 80%; margin-left: 10px"/>
+              </el-form-item>
+              <div style="display: flex; gap: 0px;">
+                <el-form-item label="订单数量:" prop="keyOrder">
+                  <el-input placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="平张投料:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="万小张:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="纸张规格:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 240px;"/>
+                </el-form-item>
+              </div>
+              <div style="display: flex; gap: 0px;">
+                <el-form-item label="投料规格:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="开料开数:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="开料联数:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 100px;"/>
+                </el-form-item>
+                <el-form-item label="核算规格:" prop="keyOrder">
+                  <el-input  placeholder="" style="width: 240px;"/>
+                </el-form-item>
+              </div>
+              <el-form-item label="备注说明:" prop="remark">
+                <el-input type="textarea"   resize="none" rows="4" clearable placeholder=""  />
+              </el-form-item>
+            </el-form>
+
+            <template #footer>
+              <div class="dialog-footer" style="text-align: right;">
+                <el-button @click="add_dyjcloseDialog">取消</el-button>
+                <el-button type="primary"  @click="add_gdyjenterDialog">确定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
           <!-- 修改工艺资料弹窗 -->
           <el-dialog v-model="gdgydialogFormVisible" :before-close="gycloseDialog" style="width: 1100px;" :title="'修改工艺资料'" destroy-on-close>
               <el-form>
@@ -938,12 +1077,12 @@ import {
   DataList,
   WorkList, gdzl_MachineList,
   U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,
-  WorkOrderEdit, ReferenceWorkOrder,
+  WorkOrderEdit, ReferenceWorkOrder,getOrderProcessLeft,
   editGyWaste, U8DataCorrection, AccountingParameterEdit,
-  ProductInformation, TestCoefficient,capacityList,
+  ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
   DataCorrection, U8Trial, ProcessFlow, AccountingParameter,
   setProductStatus,
-  getProduct, getProductGy, ProductInformationEdit, workOrderListDetail, editProduct,
+  getProduct, getProductGy, ProductInformationEdit, workOrderListDetail, editProduct, getOrderProcessCount, StatusEdit,
 } from "@/api/yunyin/yunying";
 defineOptions({name: 'Company'})
 
@@ -1072,14 +1211,15 @@ const xzhscsConfirm = async () => {
     const formattedData = sxzhscstableData.value.map(item => {
       return {
         Uniqid: parseInt(item.UniqId),
-        chromatic: parseFloat(item.计损色数),
-        difficulty: parseFloat(item.难度系数),
+        chromatic: parseFloat(item.计损色数) ?? '',
+        difficulty: parseFloat(item.难度系数) ?? '',
         loss: item.损耗代号 ??'',
-        plate: parseInt(item.版距),
+        plate: parseInt(item.版距) ?? '',
         printMode: item.印刷方式 ?? '',
         wastage: parseFloat(item.损耗系数),
       }
     });
+    // console.log(formattedData)
       const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
       if (AccountingParameterEditdata.code === 0) {
         xzhscslist.value = false;
@@ -1357,8 +1497,170 @@ const _PrintJobOrder = async () => {
 
 
 
+//=========工序产量核查===========
+const gd_gxclhclist = ref(false);
+const gxclhc_Data = ref([]);
+const gxclhc_Columns = ref(
+    [
+      { label: '印件及工序名称', prop: 'concatenatedData', width: '380' },
+      // { label: '印件', prop: 'Gy0_yjno', width: '130' },
+      // { label: '工序', prop: 'Gy0_gxh', width: '130' },
+      // { label: '名称', prop: 'Gy0_gxmc', width: '130' },
+      { label: '工序计划产量', prop: 'Gy0_计划接货数', width: '120' },
+      { label: '联数', prop: 'Gy0_ls', width: '70' },
+      { label: '折算车头产量', prop: '折算车头产量', width: '120' },
+      { label: '实际上报产量', prop: 'sczl_cl', width: '120' },
+      { label: '制程废品', prop: 'sczl_zcfp', width: '120' },
+      { label: '制程废品率', prop: '制程废品率', width: '120' },
+      { label: '来料异常', prop: '来料异常', width: '90' },
+      { label: '流程单数', prop: 'process_num', width: '90' },
+      { label: '当前设备', prop: 'Gy0_sbbh', width: '120' },
+      { label: '工序状态', prop: 'PD_WG', width: '90'},
+      { label: '首板生产日期', prop: 'sczl_rq', width: '160' },
+    ]
+)
+const gxclhcformData = reactive({
+  gdbh: '',
+  gdmc: '',
+});
+// 工序产量核查按钮
+const gd_gxclhconClick = async () => {
+  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
+    ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
+    return false;
+  }
+  gxclhcformData['gdbh'] = _Gd_gdbh.value;
+  gd_gxclhclist.value = true;
+  _getOrderProcessCount();
+};
+//工序产量核查回车
+const gxclhcProductValue = async () => {
+  _getOrderProcessCount();
+}
+//工序产量核查退出
+const gxclhcCancel = async () => {
+  gd_gxclhclist.value = false;
+};
+//工序产量核查方法接口
+const _getOrderProcessCount = async () => {
+  const order = gxclhcformData['gdbh'];
+  const getOrderProcessCount_list = await getOrderProcessCount({order:order});
+  const concatenatedData = getOrderProcessCount_list.data.map(item => {
+    // 优化后的代码,使用模板字符串连接字段值并在单个数字前添加零
+    const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
+    const formattedGxh = item.Gy0_gxh.length === 1 ? `0${item.Gy0_gxh}` : item.Gy0_gxh;
+    const concatenatedValue = `${formattedYjno}-${formattedGxh} ${item.Gy0_gxmc}`;
+    return {
+      ...item,
+      concatenatedData: concatenatedValue, // 使用新属性名
+    };
+  });
+  gxclhc_Data.value = concatenatedData;
+};
+
+//工序产量核查
+const gxclhcCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if (column.label === '实际上报产量' ||column.label === '制程废品'  || column.label === '制程废品率' ||
+      column.label === '来料异常' || column.label === '流程单数' || column.label === '当前设备') {
+    return 'lan-plan-usage-lows';
+  }
+  if (column.label === '折算车头产量') {
+    return 'gxclhc—color-column-red';
+  }
+  // 如果不是 'PD_WG' 列,返回空字符串或其他样式类
+  if (column.label === '工序状态'){
+    if(row['PD_WG'] === '完工'){
+      return 'lan-plan-usage-lowshui';
+    }else{
+      return 'pczccolor-column-lan';
+    }
+  }
+}
+
+// =========== 流程单查询 ===========
+const gd_lcdlist = ref(false);
+const gd_lcdformData = reactive({
+  gdbh: '',
+  code: '',
+  name: '',
+});
+// 流程单查询按钮
+const processList = ref([]);
+const gdlcdcxconlick = async () => {
+  if(_Gd_gdbh.value === '' || _Gd_gdbh.value === null){
+    ElMessage({type: 'warning',message: '请选择具体的工单,在进行操作'})
+    return false;
+  }else{
+    gd_lcdformData['gdbh'] = _Gd_gdbh.value;
+    _getOrderProcessLeft_list();
+    gd_lcdlist.value = true;
+    processList.value = []
+  }
+}
+//流程单查询回车
+const gd_lcdProductValue = async () => {
+  _getOrderProcessLeft_list();
+}
+const lcd_treeData = ref([]);
+const _getOrderProcessLeft_list = async () => {
+  const order = gd_lcdformData['gdbh'];
+  try {
+    //5.1流程单查询-工单工序生产进程菜单栏
+    const getOrderProcessLeft_list = await getOrderProcessLeft({ order:order});
+    gd_lcdformData['code'] = getOrderProcessLeft_list.data.Gd_info['code'];
+    gd_lcdformData['name'] = getOrderProcessLeft_list.data.Gd_info['name'];
+    lcd_treeData.value = [{
+      label: order + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      // label: getOrderProcessLeft_list.data.Gd_info['code'] + '-' + getOrderProcessLeft_list.data.Gd_info['name'],
+      value: undefined,
+      children: []
+    }]
+    const newData = [];
+    for (let key in getOrderProcessLeft_list.data.Gy_info) {
+      let temp = getOrderProcessLeft_list.data.Gy_info[key];
+      let concatenatedValue = `${temp.Gy0_yjno}-${temp.Gy0_gxh} ---> ${temp.Gy0_gxmc}`;
+      newData.push({ label: concatenatedValue,value: temp.Gy0_gxh });
+    }
+    lcd_treeData.value[0].children = newData;
+    //5.2流程单查询-获取工单工序生产进程右侧【接口】【进入页面默认显示第一个数据】
+    const getOrderProcessRight_list = await getOrderProcessRight({order: order, gxNo:newData[0].value});
+    processList.value = getOrderProcessRight_list.data
+  } catch (error) {
+    console.error(error);
+  }
+};
+//点击左侧获取工序显示右侧数据
+const lcd_handleNodeClick = async (node) => {
+  if (node.value === undefined) return
+  const order = gd_lcdformData['gdbh'];
+  //5.2流程单查询-获取工单工序生产进程右侧【接口】
+  const getOrderProcessRight_list = await getOrderProcessRight({order:order, gxNo:node.value});
+  processList.value = getOrderProcessRight_list.data
+};
+
+// 流程单查询退出
+const gd_lcdCancel = async () => {
+  gd_lcdlist.value = false;
+}
 
 
+// =========== 新增印件资料 ===========
+//默认弹窗关闭
+const add_gdyjdialogFormVisible = ref(false)
+//新增弹窗
+const addgdyj_onclick = () => {
+  add_gdyjdialogFormVisible.value = true
+}
+//印件新增确定
+const add_gdyjenterDialog = () => {
+  console.log()
+}
+  // add_gdyjdialogFormVisible.value = false
+// }
+//印件新增取消
+const add_dyjcloseDialog = () => {
+  add_gdyjdialogFormVisible.value = false
+}
 
 
 
@@ -2298,6 +2600,18 @@ const gyzlent = (event,id1,id2,id3) => {
     text-align: center;
   }
 }
+/*工序产量核查*/
+:deep(.gxclhc—color-column-red div) {
+  color: red !important;
+}
+:deep(.lan-plan-usage-lows div) {
+  color: blue !important;
+  font-weight: bold;
+}
+:deep(.lan-plan-usage-lowshui div) {
+  color: #8c939d !important;
+}
+
 /*背景颜色*/
 /*印件背景颜色变黄*/
 :deep(.el-table__body .warning-row) {