liuhairui 1 жил өмнө
parent
commit
a5675af19d

+ 4 - 4
src/api/yunyin/yunying.js

@@ -324,11 +324,11 @@ export const ReferenceWorkOrder = (params) => {
     })
 }
 //工艺流程调整->工艺资料修改
-export const ProcessCopy = (params) => {
+export const ProcessCopy = (data) => {
     return service({
         url: '/mes_server/work_order/ProcessCopy',
         method: 'post',
-        params
+        data
     })
 }
 // 查改U8工单(工单删除)
@@ -348,11 +348,11 @@ export const TestCoefficient = (params) => {
     })
 }
 //质检废品系数->质检系数更新
-export const TestCoefficientEdit = (params) => {
+export const TestCoefficientEdit = (data) => {
     return service({
         url: '/mes_server/work_order/TestCoefficientEdit',
         method: 'post',
-        params
+        data
     })
 }
 //修正工单核算参数->数据获取

+ 43 - 3
src/view/yunyin/shengchanguanli/components/addGongYi.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 新增工艺资料弹窗 -->
-  <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 1100px;" :title="'新增工艺资料'" destroy-on-close>
+  <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 70%;margin: 8px auto" :title="'新增工艺资料'" destroy-on-close>
     <el-form>
       <div>
         <el-form-item label="印件编号:"  class="mab" prop="keyOrder">
@@ -192,12 +192,10 @@ const selectHandle = async (value)=>{
     // 如果没有找到目标值或其上级,返回null
     return null;
   }
-
   const node = findParentInTree(cjList.value, value)
   form['车间名称'] = node.parent
   form['工艺名称'] = node.label
   form['设备编号'] = []
-
   //通过车间名称查询机台
   const MachineList_jitai = await gdzl_MachineList({address:node.parent});
   gdzl_MachineList_address.value = MachineList_jitai.data;
@@ -242,6 +240,48 @@ const _capacityList = async () => {
 
 };
 
+// //默认弹窗关闭
+// const add_gdgydialogFormVisible = ref(false)
+// const add_gdgyformData = reactive({});
+// //清空对象的属性值
+// const gdgy_clearFormData = () => {
+//   Object.keys(add_gdgyformData).forEach(key => {
+//     add_gdgyformData[key] = '';
+//   });
+// };
+// //新增工艺资料弹窗
+// const addgdgy_onclick = () => {
+//   if(_Gd_gdbh.value == null){
+//     cgugdlist.value = false;
+//     ElMessage({
+//       type: 'warning',
+//       message: '请选择具体的工单后,再操作此功能'
+//     })
+//   }else{
+//     let gongxu = gytableData.value.map(item => {
+//       return item['印件-工序']
+//     })
+//     addGongYiRef.value.open(_Gd_gdbh.value, gongxu)
+//   }
+// }
+// //新增工艺资料确定
+// const add_gdgyenterDialog = async () => {
+//   console.log(add_gdgyformData)
+//   // const formattedData = {
+//   //   Yj_Gdbh: _Gd_gdbh.value,
+//   //   yj_Yjno: add_gdgyformData['yjno'],
+//   //   yj_Yjdh: add_gdgyformData['yjdh'],
+//   // };
+//   // console.log(formattedData)
+//   // const ProcessDetailAdd_add = await ProcessDetailAdd(formattedData);
+//   // console.log(ProcessDetailAdd_add)
+//   // add_gdgydialogFormVisible.value = false
+// }
+// //新增工艺资料取消
+// const add_gdgycloseDialog = () => {
+//   add_gdgydialogFormVisible.value = false
+// }
+
 defineExpose({ open })
 </script>
 

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 308 - 341
src/view/yunyin/shengchanguanli/components/print.vue


+ 40 - 47
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -14,9 +14,9 @@
               <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" @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>
+<!--                <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>-->
               </div>
 
               <div v-else>
@@ -24,7 +24,7 @@
                 <el-button type="primary" title="暂停工序生产任务,【返回当前设备待产任务清单中】" icon="edit"  @click="onztwgClick" class="bt">暂停排产</el-button>
                 <el-button type="primary" title="将工序佘总为【完工状态】" icon="edit"  @click="ongxwgClick" class="bt">工序完工</el-button>
                 <el-button type="primary" title="设置工单各个工序的【完工】状态" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
-                <el-button type="primary" title="可【批量设置】所选择的生产任务的生产机台" icon="edit" disabled @click="onjztzClick" class="bt">机组调整</el-button>
+                <el-button type="primary" title="可【批量设置】所选择的生产任务的生产机台" icon="edit"  @click="onjztzClick" class="bt">机组调整</el-button>
                 <el-button type="primary" title="给担负起那设备做生产任务排程" icon="edit"  @click="oncjsbpcClick" class="bt">车间设备制程排序</el-button>
               </div>
 
@@ -248,7 +248,7 @@
                         @selection-change="handleSelectionChange" :show-overflow-tooltip="true">
 
                 <template v-for="item in tableFields[currentNode]">
-                  <el-table-column :align="item.align" :label="item.title" sortable :prop="item.prop" :width="item.width" />
+                  <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
                 </template>
               </el-table>
               <!-- 分页 -->
@@ -270,21 +270,21 @@
                 <el-table ref="multipleTable" :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" highlight-current-row="true"
-                          style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" sortable label="重点工序" prop="重点工序"  width="90"/>
-                  <el-table-column align="left" sortable label="印件工序及名称" prop="印件工序及名称"  width="500"/>
-                  <el-table-column align="left" sortable label="工序备注" prop="工序备注"  width="150"/>
-                  <el-table-column align="left" sortable label="机组" prop="机组"  width="80"/>
-                  <el-table-column align="left" sortable label="小时产能" prop="小时产能"  width="90"/>
-                  <el-table-column align="left" sortable label="生产工时" prop="生产工时"  width="90"/>
-                  <el-table-column align="left" sortable label="辅助工时" prop="辅助工时"  width="90"/>
-                  <el-table-column align="left" sortable label="印刷方式" prop="印刷方式"  width="90"/>
-                  <el-table-column align="left" sortable label="版距" prop="版距"  width="70"/>
-                  <el-table-column align="left" sortable label="创建用户" prop="创建用户"  width="100"/>
-                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="90"/>
+                          style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column align="left"  label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left"  label="重点工序" prop="重点工序"  width="90"/>
+                  <el-table-column align="left"  label="印件工序及名称" prop="印件工序及名称"  width="500"/>
+                  <el-table-column align="left"  label="工序备注" prop="工序备注"  width="150"/>
+                  <el-table-column align="left"  label="机组" prop="机组"  width="80"/>
+                  <el-table-column align="left"  label="小时产能" prop="小时产能"  width="90"/>
+                  <el-table-column align="left"  label="生产工时" prop="生产工时"  width="90"/>
+                  <el-table-column align="left"  label="辅助工时" prop="辅助工时"  width="90"/>
+                  <el-table-column align="left"  label="印刷方式" prop="印刷方式"  width="90"/>
+                  <el-table-column align="left"  label="版距" prop="版距"  width="70"/>
+                  <el-table-column align="left"  label="创建用户" prop="创建用户"  width="100"/>
+                  <el-table-column align="left"  label="创建时间" prop="创建时间"  width="110"/>
+                  <el-table-column align="left"  label="修改时间" prop="修改时间"  width="110"/>
+                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
 
@@ -293,23 +293,23 @@
                           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                           :header-cell-style="{ padding: '0px' }" :show-overflow-tooltip="true"
                           :highlight-current-row="true"
-                          style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                  <el-table-column align="left" sortable label="工单编号" prop="工单编号"  width="90"/>
-                  <el-table-column align="left" sortable label="印件号" prop="印件号"  width="70"/>
-                  <el-table-column align="left" sortable label="印件代号" prop="印件代号"  width="100"/>
-                  <el-table-column align="left" sortable label="印件名称" prop="印件名称"  width="240"/>
-                  <el-table-column align="left" sortable label="纸张名称" prop="纸张名称"  width="230"/>
-                  <el-table-column align="left" sortable label="投料规格" prop="投料规格"  width="100"/>
-                  <el-table-column align="left" sortable label="成品数量" prop="成品数量"  width="90"/>
-                  <el-table-column align="left" sortable label="实际投料" prop="实际投料"  width="90"/>
-                  <el-table-column align="left" sortable label="投料单位" prop="投料单位"  width="85"/>
-                  <el-table-column align="left" sortable label="平张投料" prop="平张投料"  width="90"/>
-                  <el-table-column align="left" sortable label="联数" prop="联数"  width="70"/>
-                  <el-table-column align="left" sortable label="开数" prop="开数"  width="70"/>
-                  <el-table-column align="left" sortable label="创建用户" prop="创建用户"  width="110"/>
-                  <el-table-column align="left" sortable label="创建时间" prop="创建时间"  width="110"/>
-                  <el-table-column align="left" sortable label="修改时间" prop="修改时间"  width="110"/>
-                  <el-table-column align="left" sortable label="UNIQID" prop="UNIQID"  width="90"/>
+                          style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
+                  <el-table-column align="left"  label="工单编号" prop="工单编号"  width="90"/>
+                  <el-table-column align="left"  label="印件号" prop="印件号"  width="70"/>
+                  <el-table-column align="left"  label="印件代号" prop="印件代号"  width="100"/>
+                  <el-table-column align="left"  label="印件名称" prop="印件名称"  width="240"/>
+                  <el-table-column align="left"  label="纸张名称" prop="纸张名称"  width="230"/>
+                  <el-table-column align="left"  label="投料规格" prop="投料规格"  width="100"/>
+                  <el-table-column align="left"  label="成品数量" prop="成品数量"  width="90"/>
+                  <el-table-column align="left"  label="实际投料" prop="实际投料"  width="90"/>
+                  <el-table-column align="left"  label="投料单位" prop="投料单位"  width="85"/>
+                  <el-table-column align="left"  label="平张投料" prop="平张投料"  width="90"/>
+                  <el-table-column align="left"  label="联数" prop="联数"  width="70"/>
+                  <el-table-column align="left"  label="开数" prop="开数"  width="70"/>
+                  <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="110"/>
+                  <el-table-column align="left"  label="UNIQID" prop="UNIQID"  width="90"/>
                 </el-table>
               </el-tab-pane>
             </el-tabs>
@@ -321,7 +321,7 @@
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"
                         :cell-class-name="pczc_planUsageCellClass"
-                        style="width: 100%;height: 45vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
+                        style="width: 100%;height: 42vh" border tooltip-effect="dark" :data="bottomData" row-key="ID" @selection-change="handleSelectionChange">
                 <template v-for="item in bottomTableF[currentNode]">
                   <el-table-column :align="item.align" :label="item.title"  :prop="item.prop" :width="item.width" />
                 </template>
@@ -361,7 +361,7 @@
                         :show-overflow-tooltip="true" :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }" :highlight-current-row="true"  @row-click="chejianfuRowClick"
-                        style="width: 100%;height: 50vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
+                        style="width: 100%;height: 49vh;margin-top: 10px" border tooltip-effect="dark" :data="chejianfuData" row-key="ID" @selection-change="ZP_handleChange">
                 <el-table-column type="selection" width="30" />
                 <template v-for="item in [
                   { align:'left', title: '工单编号', prop: '工单编号', width: 85  },
@@ -1144,7 +1144,7 @@ const gxztgzzCancel = () => {
 
 //机组调整按钮
 const onjztzClick = async () => {
-
+  console.log(_Gd_gdbh)
 };
 
 //=============引用实际参数================
@@ -1441,13 +1441,6 @@ const pd_lcdCancel = async () => {
 }
 
 
-
-
-
-
-
-
-
 //颜色
 //工序状态更正颜色
 const gxztgzzCellClass = ({row, column, rowIndex, columnIndex}) =>{

+ 133 - 74
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -19,19 +19,19 @@
               <el-button type="primary" icon="edit"   @click="cp_gdprintonClick" class="bt" title="打印生产工单" >工单打印</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="addgd_onclick"   class="bt" title="新增工单资料" >新增工单资料</el-button>
-              <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增印件资料" >新增印件资料</el-button>
-              <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工艺资料" >新增工艺资料</el-button>
-              <el-button type="primary" icon="edit"   @click="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="删除(印件资料或工艺资料)" >删除</el-button>
+              <el-button type="primary" icon="edit"   @click="addgd_onclick"   class="bt" title="新增工单资料">新增工单资料</el-button>
+              <el-button type="primary" icon="edit"   @click="addgdyj_onclick"   class="bt" title="新增印件资料" style="margin: 5px 0px 0px 0px" >新增印件资料</el-button>
+              <el-button type="primary" icon="edit"   @click="addgdgy_onclick"   class="bt" title="新增工艺资料" style="margin: 5px 0px 0px 0px" >新增工艺资料</el-button>
+              <el-button type="primary" icon="edit"   @click="delgd_delclick"  :disabled="yjSelection === '' && gySelection === ''"  class="bt" title="批量删除(印件资料或工艺资料)" style="margin: 5px 0px 0px 0px" >删除</el-button>
             </el-form-item>
           </el-form>
 
           <!--按钮弹窗部分-->
           <!--U8投料试算-->
           <el-dialog v-model="tlsslist"     title="U8投料试算"   style="height: 100%;width: 100%;margin: 0;padding: 0">
-            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>
-            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>
-            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>
+<!--            <el-button type="primary" icon="" disabled @click="ontlssclicks" class="bt">投料试算</el-button>-->
+<!--            <el-button type="primary" icon="" disabled @click="onbxgxclicks" class="bt">备选工序</el-button>-->
+<!--            <el-button type="primary" icon="" disabled @click="onsjgxclicks" class="bt">实际工序</el-button>-->
             <el-button type="primary" icon="" @click="oncloneclick" style="margin: 5px">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
               <!-- 第一行 -->
@@ -112,7 +112,7 @@
           </el-dialog>
 
           <!--引用产品资料-->
-          <el-dialog v-model="onyycpzllist" title="获取产品资料"  style="width: 45%;height: 50%;">
+          <el-dialog v-model="onyycpzllist" title="获取产品资料">
             <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%;" />
@@ -233,10 +233,8 @@
 
           <!--查改U8工单-->
           <el-dialog v-model="cgugdlist"    title="查改U8工单"   style="width: 100%;height: 100%;margin: 0;padding: 0">
-
             <el-button type="primary"  icon=""  @click="oncgugdclickdel" :disabled="multipleSelection.length === 0" style="margin: 0px 0px 20px 0px">删除</el-button>
             <el-button type="primary"  icon="" @click="oncgugdcloneclick" style="margin: 0px 0px 20px 10px">退出</el-button>
-
             <div>
               <div style="width: 100%; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;margin: 0px 0px 20px 0px">
                 <el-form-item label="当前工单:" prop="currentProcess" style="margin-right: 20px;padding: 0px">
@@ -475,7 +473,7 @@
             <!-- 表格列表 -->
             <div class="gva-table-box">
               <el-table ref="multipleTable"
-                        style="width: 100%;height: 30vh"
+                        style="width: 100%;height: 28vh"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
                         :header-cell-style="{ padding: '0px' }"
@@ -534,7 +532,7 @@
                           highlight-current-row="true"
                           @row-dblclick="gdyjupdateCompanyFunc"
                           @selection-change="selectionChange($event, '印件资料')"
-                          style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID">
+                          style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID">
                   <el-table-column type="selection" width="30" />
                   <el-table-column align="left" label="印件号" prop="印件号"  width="70"/>
                   <el-table-column align="left" label="印件代号" prop="印件代号"  width="98"/>
@@ -564,7 +562,7 @@
                           @row-click="clickybupdate2"
                           :row-class-name="rowClassStyle2"
                           @selection-change="selectionChange($event, '工艺资料')"
-                          style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID">
+                          style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="gytableData" row-key="ID">
                   <el-table-column type="selection" width="30" />
                   <el-table-column align="left" label="完工状态" prop="status"  width="75"/>
                   <el-table-column align="left" label="重点工序" prop="重点工序"  width="80"/>
@@ -604,7 +602,7 @@
                           :cell-class-name="planUsageCellClass"
                           highlight-current-row="true"
                           @row-dblclick="gdbomupdateCompanyFunc"
-                          style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
+                          style="width: 100%;height: 36vh" border tooltip-effect="dark" :data="bomtableData" row-key="ID" @selection-change="handleSelectionChange">
                   <el-table-column type="selection" width="30" />
                   <el-table-column align="left" label="方案" prop="方案"  width="120"/>
                   <el-table-column align="left" label="物料编号" prop="物料编号"  width="100"/>
@@ -624,7 +622,24 @@
                 <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-input v-model="scgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />
+                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 100px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
+                        <el-option label="" value=""></el-option>
+                        <el-option label="打样工单" value="打样工单"></el-option>
+                        <el-option label="来料加工" value="来料加工"></el-option>
+                        <el-option label="新产品工单" value="新产品工单"></el-option>
+                        <el-option label="异常工单" value="异常工单"></el-option>
+                        <el-option label="客诉工单" value="客诉工单"></el-option>
+                        <el-option label="中试工单" value="中试工单"></el-option>
+                        <el-option label="大试工单" value="大试工单"></el-option>
+                        <el-option label="补数工单" value="补数工单"></el-option>
+                        <el-option label="试机工单" value="试机工单"></el-option>
+                        <el-option label="打样工单" value="打样工单"></el-option>
+                        <el-option label="外发加工" value="外发加工"></el-option>
+                        <el-option label="新华订单" value="新华订单"></el-option>
+                        <el-option label="研发打样" value="研发打样"></el-option>
+                        <el-option label="废码利用" value="废码利用"></el-option>
+                      </el-select>
+<!--                      <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, '重点工单', '开单日期', '工单编号')" />
@@ -633,7 +648,12 @@
                       <el-input v-model="scgdformData['工单编号']"  style="width: 80px;" id="工单编号"  @keydown="gdzlent($event, '开单日期', '工单编号', '生产类型')" />
                     </el-form-item>
                     <el-form-item label="生产类型:" prop="productionType" class="mab" label-width="90">
-                      <el-input v-model="scgdformData['生产类型']" style="width: 100px;"  id="生产类型"  @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />
+                      <el-select v-model="add_gdscgdformData['生产类型']" style="width: 100px;" id="生产类型" @keydown="add_gdzlent($event, '工单编号', '生产类型', '客户代号')">
+                        <el-option label="" value=""></el-option>
+                        <el-option label="备货" value="备货"></el-option>
+                        <el-option label="面彩" value="面彩"></el-option>
+                      </el-select>
+<!--                      <el-input v-model="scgdformData['生产类型']" style="width: 100px;"  id="生产类型"  @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />-->
                     </el-form-item>
                   </el-row>
                   <el-row :gutter="24">
@@ -740,7 +760,24 @@
                   <!-- 第一排 -->
                   <el-row :gutter="24">
                     <el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
-                      <el-input v-model="add_gdscgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')" />
+                      <el-select v-model="add_gdscgdformData['重点工单']" style="width: 100px;" id="重点工单" @keydown="add_gdzlent($event, '备注', '重点工单', '开单日期')">
+                        <el-option label="" value=""></el-option>
+                        <el-option label="打样工单" value="打样工单"></el-option>
+                        <el-option label="来料加工" value="来料加工"></el-option>
+                        <el-option label="新产品工单" value="新产品工单"></el-option>
+                        <el-option label="异常工单" value="异常工单"></el-option>
+                        <el-option label="客诉工单" value="客诉工单"></el-option>
+                        <el-option label="中试工单" value="中试工单"></el-option>
+                        <el-option label="大试工单" value="大试工单"></el-option>
+                        <el-option label="补数工单" value="补数工单"></el-option>
+                        <el-option label="试机工单" value="试机工单"></el-option>
+                        <el-option label="打样工单" value="打样工单"></el-option>
+                        <el-option label="外发加工" value="外发加工"></el-option>
+                        <el-option label="新华订单" value="新华订单"></el-option>
+                        <el-option label="研发打样" value="研发打样"></el-option>
+                        <el-option label="废码利用" value="废码利用"></el-option>
+                      </el-select>
+<!--                      <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, '重点工单', '开单日期', '工单编号')" />
@@ -1199,7 +1236,7 @@ import {
   WorkList, gdzl_MachineList,PrintCodeList,getProductYjList, getProductZzList,
   U8workOrder, ProcessDetailEdit, PrintedEdit, PrintJobOrder,WorkOrderAdd,
   WorkOrderEdit, ReferenceWorkOrder,getOrderProcessLeft,ClientList,ProductCodeList,
-  editGyWaste, U8DataCorrection, AccountingParameterEdit,
+  editGyWaste, U8DataCorrection, AccountingParameterEdit,ProcessCopy,
   ProductInformation, TestCoefficient, capacityList,getOrderProcessRight,
   DataCorrection, U8Trial, ProcessFlow, AccountingParameter,
   setProductStatus,
@@ -1885,11 +1922,17 @@ const gdyj_clearFormData = () => {
   Object.keys(add_yjzlformdata).forEach(key => {
     add_yjzlformdata[key] = '';
   });
-  add_yjzlformdata.yjno = yjzuidahaoma.value;
+  if (isNaN(yjzuidahaoma.value)) {
+    add_yjzlformdata.yjno = 1;
+  } else {
+    add_yjzlformdata.yjno = yjzuidahaoma.value;
+  }
   add_yjzlformdata['pztl'] = 0;
   add_yjzlformdata['ks'] = 0;
   add_yjzlformdata['ls'] = 0;
   add_yjzlformdata['万小张'] = 0;
+  console.log(add_yjzlformdata.yjno)
+
 };
 
 const searchModel = ref(false)
@@ -1929,7 +1972,7 @@ const addgdyj_onclick = () => {
   }
 }
 //印件新增确定
-const add_gdyjenterDialog = () => {
+const add_gdyjenterDialog =  async  () => {
   console.log(add_yjzlformdata)
   const formattedData = {
     Yj_Gdbh: _Gd_gdbh.value,
@@ -1959,6 +2002,8 @@ const add_gdyjenterDialog = () => {
     // 万小张: add_yjzlformdata['万小张'],
   };
   console.log(formattedData)
+  // const PrintDetailAdd_add = await PrintDetailAdd(formattedData);
+  // console.log(PrintDetailAdd_add)
   // add_gdyjdialogFormVisible.value = false
 }
 //印件新增取消
@@ -1966,7 +2011,6 @@ const add_dyjcloseDialog = () => {
   add_gdyjdialogFormVisible.value = false
 }
 
-
 const handleTreeData = (treeData) => {
   let data = []
   Object.keys(treeData).map((key, index) => {
@@ -2111,8 +2155,16 @@ const addgdgy_onclick = () => {
   }
 }
 //新增工艺资料确定
-const add_gdgyenterDialog = () => {
-  console.log(add_gdgyformData)
+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
 }
 //新增工艺资料取消
@@ -2163,26 +2215,30 @@ const _U8workOrder = async ()=>{
   }
 }
 
-// // 多选数据
-// const multipleSelection = ref([]);
-//
-// // 多选
-// const cguzlgd_del = (val) => {
-//   if (Array.isArray(val) && val.length === 0) {
-//     multipleSelection.value = [];
-//   } else {
-//     multipleSelection.value.push(...val.map(item => item.序号));
-//   }
-// }
+// 多选数据
+const multipleSelection = ref([]);
+
+// 多选
+const cguzlgd_del = (val) => {
+  if (Array.isArray(val) && val.length === 0) {
+    multipleSelection.value = [];
+  } else {
+    multipleSelection.value = [];
+    multipleSelection.value.push(...val.map(item => item.序号));
+  }
+}
 
 //查改U8工单(工单删除)
 const oncgugdclickdel = async ()=>{
   const Uniqid = multipleSelection.value.join(',');
+  // console.log(Uniqid)
   try {
     const U8DataCorrection_del = await U8DataCorrection({Uniqid:Uniqid});
     if (U8DataCorrection_del.code === 0) {
       multipleSelection.value = [];
       ElMessage({type: 'success',message: '删除成功'})
+      const U8workOrderdata = await U8workOrder({workOrder:cgugdformData['gdbh']});
+      cgugdtableData.value = U8workOrderdata.data;
     } else {
       ElMessage({type: 'error',message: '删除失败'})
     }
@@ -2376,21 +2432,22 @@ const _ReferenceWorkOrder = async ()=>{
 
 //更新当前产品工序【按钮】
 const gylctz_gxdqcpgx = async () => {
+  console.log(gylctztableData)
   const rawValueArray = gylctztableData.value;
   const formattedData = rawValueArray.map(item => {
     return {
-      workOrder: gylctzformData['gdbh'],
-      UniqId: item.UniqId,
-      gxh: item['工序号'],
+      workOrder:gylctzformData['gdbh'],
+      UniqId:item.UniqId,
+      gxh:item['工序号']
     }
   });
   const ProcessCopy_edit = await ProcessCopy(formattedData);
-  console.log(ProcessCopy_edit)
-  // if(ProcessCopy_edit.code === 0) {
-  //   ElMessage({type: 'success',message: '更新成功'})
-  // } else {
-  //   ElMessage({type: 'error',message: '更新失败' })
-  // }
+  if(ProcessCopy_edit.code === 0) {
+    ElMessage({type: 'success',message: '更新成功'})
+  } else {
+    ElMessage({type: 'error',message: '更新失败' })
+  }
+  gylctzlist.value = false;
 };
 
 //放弃操作【按钮】
@@ -2417,8 +2474,14 @@ const oneditgxclhsclick = () => {
   }
 };
 //工序产量核算【确定】
-const gxclhshandleConfirm = () => {
+const gxclhshandleConfirm = async () => {
   console.log(gxclhsformData['gdbh'])
+  // const  = await ({:gxclhsformData['gdbh']});
+  // if (.code === 0) {
+  //   ElMessage({type: 'success', message: '更新成功'})
+  // } else {
+  //   ElMessage({type: 'error',message: '更新失败'})
+  // }
   // gxclhslist.value = false;
 };
 //工序产量核算【取消】
@@ -2445,19 +2508,19 @@ const ontlssclick = () => {
     })
   }else{
     // //产品代号
-    // if( _Gd_cpdh.value === ''){
-    //   tlsslist.value = false;
-    //   ElMessage({
-    //     type: 'warning',
-    //     message: '该产品号未查询到'
-    //   })
-    // }else{
-    // tlssformData['cpdh'] =  _Gd_cpdh.value;
-    tlssformData['cpdh'] =  '100401101';
+    if( _Gd_cpdh.value === ''){
+      tlsslist.value = false;
+      ElMessage({
+        type: 'warning',
+        message: '该产品号未查询到'
+      })
+    }else{
+    tlssformData['cpdh'] =  _Gd_cpdh.value;
+    // tlssformData['cpdh'] =  '100401101';
     tlssformData['cpmc'] = _Gd_cpmc.value;
     tlsslist.value = true;
     _U8Trial();
-    // }
+    }
   }
 };
 //点击U8投料试算【回车】
@@ -2471,12 +2534,9 @@ const tlsscpzsgetProductValue = async () => {
 //U8投料试算
 const _U8Trial = async ()=>{
   let productCode = tlssformData['cpdh'];
-  console.log(productCode)
   try {
     const U8Trialdata = await U8Trial({productCode:productCode});
-    console.log(U8Trialdata)
     tlsstableData.value = U8Trialdata.data;
-
   } catch (error) {
     console.error(error);
   }
@@ -2547,15 +2607,9 @@ const _ProductInformationEdit = async ()=>{
   try {
     const ProductInformationEditdata = await ProductInformationEdit(params);
     if (ProductInformationEditdata.code === 0) {
-      ElMessage({
-        type: 'success',
-        message: '更新成功'
-      })
+      ElMessage({type: 'success', message: '更新成功'})
     } else {
-      ElMessage({
-        type: 'error',
-        message: '更新失败'
-      })
+      ElMessage({type: 'error',message: '更新失败'})
     }
   } catch (error) {
     console.error(error);
@@ -2682,12 +2736,12 @@ const tableRowClick = async (row) => {
   yjzuidahaoma.value = Number(tmp[0]) + 1
 };
 
-// 多选数据
-const multipleSelection = ref([])
-// 多选
-const handleSelectionChange = (val) => {
-  multipleSelection.value = val
-}
+// // 多选数据
+// const multipleSelection = ref([])
+// // 多选
+// const handleSelectionChange = (val) => {
+//   multipleSelection.value = val
+// }
 
 // 行为控制标记(弹窗内部需要增还是改)
 const type = ref('')
@@ -2696,9 +2750,14 @@ const type = ref('')
 let scgdformData = ref([])
 //双击修改
 const updateCompanyFunc = async(row) => {
-  const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
-  scgdformData.value = DataCorrection_list.data;
-  dialogFormVisible.value = true
+  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)

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно