Browse Source

运营管理

liuhairui 1 year ago
parent
commit
786e78faed

+ 12 - 3
src/api/yunyin/yunying.js

@@ -384,11 +384,11 @@ export const ProcessDetailEdit = (data) => {
 }
 
 //打印作业通知单
-export const PrintJobOrder = (data) => {
+export const PrintJobOrder = (params) => {
     return service({
         url: '/mes_server/work_order/PrintJobOrder',
-        method: 'post',
-        data
+        method: 'get',
+        params
     })
 }
 
@@ -644,4 +644,13 @@ export const getMachineMac = (data) => {
         method: 'get',
         data
     })
+}
+
+//6工单工序产量查核
+export const getOrderProcessCount = (params) => {
+    return service({
+        url:'/mes_server/order_super_loss/getOrderProcessCount',
+        method: 'get',
+        params
+    })
 }

+ 98 - 7
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -16,8 +16,8 @@
               <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"  disabled  @click="addcpyj_onclick"     class="bt">新增印件资料</el-button>
-              <el-button type="primary"  icon="edit"  disabled @click="ddcpgy_onclick"     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-form-item>
@@ -231,8 +231,6 @@
                           @keyup.enter="jsssxzgetProductValue"  placeholder="输入产品编号" style="width: 500px;"/>
               </el-form-item>
             </div>
-
-
             <el-table ref="multipleTable"
                       :show-overflow-tooltip="true"
                       :row-style="{ height: '20px' }"
@@ -769,7 +767,7 @@
             </template>
           </el-dialog>
 
-          <!-- 修改印件资料 弹窗 -->
+          <!-- 修改印件资料-->
           <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="'修改印件资料'" height="80%" width="50%" destroy-on-close>
             <el-row>
               <el-scrollbar >
@@ -843,6 +841,80 @@
             </template>
           </el-dialog>
 
+          <!-- 新增印件资料 -->
+          <el-dialog v-model="add_yjdialogFormVisible" :before-close="add_yjcloseDialog" :title="'修改印件资料'" height="80%" width="50%" 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-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-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-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-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-row>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="12">
+                      <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-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-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-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>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="备注说明:" prop="remark" class="mab">
+                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-scrollbar>
+            </el-row>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="add_yjcloseDialog">取 消</el-button>
+                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
           <!-- 修改工艺资料 弹窗 -->
           <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" destroy-on-close>
             <el-row>
@@ -1833,7 +1905,7 @@ const enterDialog = async () => {
   dialogFormVisible.value = false;
 }
 
-//=========印件修改========
+//=========修改印件资料========
 let yjformDataTest = reactive({})
 //双击修改
 const yjupdateCompanyFunc = async (row) => {
@@ -1872,7 +1944,26 @@ const yjenterDialog = async () => {
   // yjdialogFormVisible.value = false;
 }
 
-//=========工艺修改========
+//=========新增印件资料========
+//默认弹窗关闭
+const add_yjdialogFormVisible = ref(false)
+//新增弹窗
+const addcpyj_onclick = () => {
+  add_yjdialogFormVisible.value = true
+}
+//印件新增确定
+const add_yjcloseDialog = () => {
+  add_yjdialogFormVisible.value = true
+}
+//印件新增取消
+const add_yjenterDialog = () => {
+  add_yjdialogFormVisible.value = true
+}
+
+
+
+
+//=========修改工艺资料========
 let gyformDataTest = reactive({})
 //双击修改
 const gyupdateCompanyFunc = async (row) => {

File diff suppressed because it is too large
+ 512 - 373
src/view/yunyin/shengchanguanli/gongdanshengchan.vue


+ 368 - 252
src/view/yunyin/shengchanguanli/gongdanziliao.vue

@@ -6,21 +6,21 @@
 <!--按钮部分-->
         <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"  icon="search" @click="onSubmit"></el-button>
-            <el-button type="primary"  icon="edit"   @click="ontlssclick"       class="bt">U8投料试算</el-button>
-            <el-button type="primary"  icon="edit"   @click="onyycpzlclick"     class="bt">引用产品资料</el-button>
-            <el-button type="primary"  icon="edit"   @click="oneditgxclhsclick" class="bt">工序产量核算</el-button>
-            <el-button type="primary"  icon="edit"   @click="oneditgylctzclick" class="bt">工艺流程调整</el-button>
-            <el-button type="primary"  icon="edit"   @click="oneditugdclick"    class="bt">查改U8工单</el-button>
-            <!--<el-button type="primary" disabled icon="edit" @click="oneditztfwclick" class="bt">状态复位</el-button>-->
-            <el-button type="primary"  icon="edit"   @click="onxzhscsclick"     class="bt" >修正核算参数</el-button>
-            <el-button type="primary"  icon="edit"   @click="onzjfpxsclick"     class="bt" >质检废品系数</el-button>
-            <el-button type="primary"  icon="edit"   @click="gdprintonlick"     class="bt" disabled>工单打印</el-button>
-            <el-button type="primary"  icon="edit"   @click="gdgxclhconlick"    class="bt" disabled>工序产量核查</el-button>
-            <el-button type="primary"  icon="edit"   @click="gdlcdcxconlick"    class="bt" disabled>流程单查询</el-button>
-            <el-button type="primary"  icon="edit"   @click="addgdyj_onclick"   class="bt" disabled>新增印件资料</el-button>
-            <el-button type="primary"  icon="edit"   @click="ddgdgy_onclick"    class="bt" disabled>新增工艺资料</el-button>
+            <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-form-item>
         </el-form>
 
@@ -157,7 +157,7 @@
 
         <!--工艺流程调整-->
         <el-dialog v-model="gylctzlist"   title="工艺方案附加"  style="width: 100%;height: 100%;margin: 0px;padding: 0px">
-          <el-button type="primary" disabled @click="gylctz_gxdqcpgx" style="margin: 5px;">更新当前产品工序</el-button>
+          <el-button type="primary"  @click="gylctz_gxdqcpgx" style="margin: 5px;">更新当前产品工序</el-button>
           <el-button type="primary"  @click="gylctz_fjbzgx" style="margin: 5px;">附加标准工序</el-button>
 
           <!--工艺流程调整中 附加标准工序-->
@@ -176,68 +176,33 @@
                   </el-select>
                 </el-form-item>
               </div>
-              <el-table ref="multipleTable"
+              <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"
-                        :data="gdzlfjxxtableData" row-key="ID" @selection-change="attachChange">
-                <el-table-column type="selection" width="30" />
-                <el-table-column v-slot="scope" align="left" label="方案" width="70">
-                  <el-input disabled v-model="scope.row.方案" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="印件号" width="70">
-                  <el-input disabled v-model="scope.row.印件号" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="工序号" width="70">
-                  <el-input disabled v-model="scope.row.工序号" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="工序名称" width="350">
-                  <el-input disabled v-model="scope.row.工序名称" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="工价系数" width="90">
-                  <el-input disabled v-model="scope.row.工价系数" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="损耗系数" width="90">
-                  <el-input disabled v-model="scope.row.损耗系数" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="开数" width="70">
-                  <el-input disabled v-model="scope.row.ks" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="联数" width="70">
-                  <el-input disabled v-model="scope.row.ls" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="备注" width="200">
-                  <el-input disabled v-model="scope.row.备注" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="车间" width="105">
-                  <el-input disabled v-model="scope.row.车间" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="设备编号" width="100">
-                  <el-input disabled v-model="scope.row.设备编号" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="设备名称" width="100">
-                  <el-input disabled v-model="scope.row.设备名称" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="建档用户" width="120">
-                  <el-input disabled v-model="scope.row.建档用户" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="建档时间" width="160">
-                  <el-input disabled v-model="scope.row.建档时间" :clearable="false"/>
-                </el-table-column>
-                <el-table-column v-slot="scope" align="left" label="更新时间" width="160">
-                  <el-input disabled v-model="scope.row.更新时间" :clearable="false"/>
-                </el-table-column>
+                        style="width: 100%;height: 74vh" border tooltip-effect="dark"
+                        :data="gdzlfjxxtableData" row-key="ID"
+                        highlight-current-row="true" @selection-change="attachChange"
+                        :cell-class-name="gdzlfjxxCellClass">
+                <el-table-column align="center" type="selection" width="30"/>
+                <template v-for="(item, idx) in gdzlfjxxtableColumns">
+                  <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
+                    <div v-if="[''].includes(item.prop)">
+                      <el-input v-model="row[item.prop]" :clearable="false"
+                                :id="`input${idx}${$index}`" @keyup="gylctz_handleKeyDown($event, idx, $index, item.prop)"/>
+                    </div>
+                    <div v-else>{{ row[item.prop] }}</div>
+                  </el-table-column>
+                </template>
               </el-table>
             </div>
           </el-dialog>
 
-
           <el-button type="primary" @click="gylctzhandleCancel" style="margin: 5px">放弃操作</el-button>
           <div>
             <div style="align-items: center;">
-              <el-form-item label="当前工单:" prop="currentProcess">
+              <el-form-item label="当前工单:" prop="currentProcess" class="mab">
                 <el-input v-model="gylctzformData['gdbh']"  @keyup.enter="gylctzProductValue"  placeholder="" style="width: 160px;margin: 10px"/>
                 <el-input v-model="gylctzformData['gddh']"  disabled  placeholder="" style="width: 170px;margin-left: 10px;margin: 10px"/>
                 <el-input v-model="gylctzformData['gdmc']"  disabled  placeholder="" style="width: 340px;margin-left: 10px;margin: 10px"/>
@@ -424,6 +389,55 @@
 <!--            </el-table-column>-->
 <!--          </el-table>-->
         </el-dialog>
+
+
+        <!--工单打印【弹窗】-->
+        <el-dialog v-model="cp_print_gdlist" title="生产工单打印" style="width: 700px;height: 400px;top: 5%">
+
+          <div style="width: 600px;">
+            <el-row>
+              <el-form-item label="工单编号:" prop="currentProcess" class="mab">
+                <el-input v-model="cp_print_formData['gdbh']"  @keyup.enter="cp_print_ProductValue" placeholder="" />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="印件号:" prop="currentProcess" class="mab" label-width="70">
+                <el-input v-model="cp_print_formData['yjh']" placeholder="" />
+              </el-form-item>
+              <el-form-item label="终止工序号:" prop="currentProcess" class="mab" label-width="100">
+                <el-input v-model="cp_print_formData['zzgxh']" placeholder="" />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="印件名称:" prop="currentProcess" class="mab">
+                <el-input v-model="cp_print_formData['yjmc']" placeholder="" style="width: 480px;" />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="报表输出到:" prop="currentProcess">
+                <el-radio-group v-model="cp_print_formData['status']" style="margin-left: 10px;">
+                  <el-radio label="显示器">显示器</el-radio>
+                  <el-radio label="打印机">打印机</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="制单:" prop="currentProcess" class="mab" label-width="70">
+                <el-input v-model="cp_print_formData['zd']" placeholder="" style="width: 480px;" />
+              </el-form-item>
+            </el-row>
+            <el-row>
+              <el-form-item label="审核:" prop="currentProcess" class="mab" label-width="70">
+                <el-input v-model="cp_print_formData['sh']" placeholder="" style="width: 480px;"/>
+              </el-form-item>
+            </el-row>
+          </div>
+          <div class="dialog-footer" style="text-align: right; margin-top: 40px;">
+            <el-button @click="cp_print_handleCancel">取消</el-button>
+            <el-button type="primary"  @click="cp_print_handleConfirm">确认</el-button>
+          </div>
+
+        </el-dialog>
       </div>
 
       </layout-header>
@@ -507,11 +521,11 @@
                 <el-table-column align="left" label="印件名称" prop="印件名称"  width="340"/>
                 <el-table-column align="left" label="纸张代号" prop="纸张代号"  width="98"/>
                 <el-table-column align="left" label="纸张名称" prop="纸张名称"  width="340"/>
-                <el-table-column align="left" label="投料规格" prop="投料规格"  width="91"/>
+                <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="115"/>
+                <el-table-column align="left" label="建档用户" prop="建档用户"  width="100"/>
                 <el-table-column align="left" label="建档时间" prop="建档时间"  width="160"/>
                 <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
               </el-table>
@@ -548,15 +562,15 @@
                 <el-table-column align="left" label="机检_次品板" prop="机检_次品板"  width="110"/>
                 <el-table-column align="left" label="机检_废检" prop="机检_废检"  width="90"/>
                 <!--<el-table-column align="left" label="开数*联数" prop="开数*联数"  width="100"/>-->
-                <el-table-column align="left" label="开数" prop="开数"  width="70"/>
-                <el-table-column align="left" label="联数" prop="联数"  width="70"/>
+                <el-table-column align="center" label="开数" prop="开数"  width="45"/>
+                <el-table-column align="center" label="联数" prop="联数"  width="45"/>
                 <el-table-column align="left" label="备注" prop="备注"  width="230"/>
                 <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="80"/>
-                <el-table-column align="left" label="版距" prop="版距"  width="50"/>
-                <el-table-column align="left" label="建档用户" prop="建档用户"  width="100"/>
-                <el-table-column align="left" label="建档日期" prop="建档日期"  width="160"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
-                <el-table-column align="left" label="更新时间" prop="更新时间"  width="160"/>
+                <el-table-column align="center" label="版距" prop="版距"  width="45"/>
+                <el-table-column align="left" label="建档用户" prop="建档用户"  width="90"/>
+                <el-table-column align="left" label="建档日期" prop="建档日期"  width="150"/>
+                <el-table-column align="left" label="更新时间" prop="更新时间"  width="150"/>
+                <el-table-column align="left" label="更新时间" prop="更新时间"  width="150"/>
               </el-table>
             </el-tab-pane>
 
@@ -584,178 +598,128 @@
           </el-tabs>
 
          <!-- 修改工单资料弹窗 -->
-<!--         <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" style="width: 75%;height: 80%; bottom: 7%" :title="'修改工单资料'" destroy-on-close>-->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" style="width: 75%; height: 80%; bottom: 7%;" :title="'修改工单资料'" destroy-on-close>
-<!--             <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >-->
-             <el-row style="height: 100%;">
-               <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" style="width: 100%; height: 100%; display: flex; flex-direction: column;">
-
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" style="width: 60%;bottom: 5%;" :title="'修改工单资料'" destroy-on-close>
+             <el-row>
+               <el-form :model="scgdformData" label-position="right" ref="elFormRef" :rules="rule" >
                <!-- 第一排 -->
               <el-row :gutter="24">
-                  <el-col :span="6">
-                    <el-form-item label="重点工单:" prop="keyOrder" class="mab">
-                      <el-input v-model="scgdformData['重点工单']"  placeholder="" style="width: 170px;"  id="重点工单"  @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />
+                    <el-form-item label="重点工单:" prop="keyOrder" class="mab" label-width="90">
+                      <el-input v-model="scgdformData['重点工单']"  style="width: 110px;"  id="重点工单"  @keydown="gdzlent($event, '备注', '重点工单', '开单日期')" />
                     </el-form-item>
-                  </el-col>
-                  <el-col :span="6">
-                    <el-form-item label="开单日期" prop="orderDate" class="mab">
-                      <el-date-picker v-model="scgdformData['开单日期']" type="date" placeholder=""  style="width: 280px;" id="开单日期"  @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
+                    <el-form-item label="开单日期" prop="orderDate" class="mab" label-width="70">
+                      <el-date-picker v-model="scgdformData['开单日期']" type="date"  style="width: 120px;"   id="开单日期"  @keydown="gdzlent($event, '重点工单', '开单日期', '工单编号')" />
                     </el-form-item>
-                  </el-col>
-                  <el-col :span="5">
-                    <el-form-item label="工单编号:" prop="orderNumber" class="mab">
-                      <el-input v-model="scgdformData['工单编号']"  placeholder="" style="width: 140px;" id="工单编号"  @keydown="gdzlent($event, '开单日期', '工单编号', '生产类型')" />
+                    <el-form-item label="工单编号:" prop="orderNumber" class="mab" label-width="90">
+                      <el-input v-model="scgdformData['工单编号']"  style="width: 85px;" id="工单编号"  @keydown="gdzlent($event, '开单日期', '工单编号', '生产类型')" />
                     </el-form-item>
-                  </el-col>
-                  <el-col :span="5">
-                    <el-form-item label="生产类型:" prop="productionType" class="mab">
-                      <el-input v-model="scgdformData['生产类型']" placeholder="" style="width: 140px;"  id="生产类型"  @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />
+                    <el-form-item label="生产类型:" prop="productionType" class="mab" label-width="90">
+                      <el-input v-model="scgdformData['生产类型']" style="width: 100px;"  id="生产类型"  @keydown="gdzlent($event, '工单编号', '生产类型', '客户代号')" />
                     </el-form-item>
-                  </el-col>
                 </el-row>
               <!-- 第二排 -->
               <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="客户代号:" prop="customerCode" class="mab">
-                <el-input v-model="scgdformData['客户代号']"  placeholder="" style="width: 180px;" id="客户代号"  @keydown="gdzlent($event, '生产类型', '客户代号', '客户名称')"/>
+                <el-form-item label="客户代号:" prop="customerCode" class="mab" label-width="90">
+                <el-input v-model="scgdformData['客户代号']" style="width: 110px;" id="客户代号"  @keydown="gdzlent($event, '生产类型', '客户代号', '客户名称')"/>
                 </el-form-item>
-              </el-col>
-              <el-col :span="16">
-                <el-form-item label="客户名称:" prop="customerName" class="mab">
-                <el-input v-model="scgdformData['客户名称']"  placeholder=""  id="客户名称"  @keydown="gdzlent($event, '客户代号', '客户名称', '产品代号')"/>
+                <el-form-item label="客户名称:" prop="customerName" class="mab" label-width="75">
+                <el-input v-model="scgdformData['客户名称']" style="width: 520px;" id="客户名称"  @keydown="gdzlent($event, '客户代号', '客户名称', '产品代号')"/>
                 </el-form-item>
-              </el-col>
               </el-row>
               <!-- 第三排 -->
               <el-row :gutter="24">
-              <el-col :span="6">
-                <el-form-item label="产品代码:" prop="productCode" class="mab">
-                <el-input v-model="scgdformData['产品代号']"  placeholder="" style="width: 180px;" id="产品代号"  @keydown="gdzlent($event, '客户名称', '产品代号', '产品名称')"/>
+                <el-form-item label="产品代码:" prop="productCode" class="mab" label-width="90">
+                <el-input v-model="scgdformData['产品代号']" style="width: 110px;" id="产品代号"  @keydown="gdzlent($event, '客户名称', '产品代号', '产品名称')"/>
                 </el-form-item>
-              </el-col>
-              <el-col :span="16">
-                <el-form-item label="产品名称:" prop="productName" class="mab">
-                <el-input v-model="scgdformData['产品名称']"  placeholder="" id="产品名称"  @keydown="gdzlent($event, '产品代号', '产品名称', '印件代号')" />
+                <el-form-item label="产品名称:" prop="productName" class="mab" label-width="75">
+                <el-input v-model="scgdformData['产品名称']" style="width: 520px;"  id="产品名称"  @keydown="gdzlent($event, '产品代号', '产品名称', '印件代号')" />
                 </el-form-item>
-              </el-col>
               </el-row>
               <!-- 第四排 -->
               <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="印件代码:" prop="customerCode" class="mab">
-                    <el-input v-model="scgdformData['印件代号']"  placeholder="" style="width: 180px;" id="印件代号"  @keydown="gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
+                  <el-form-item label="印件代码:" prop="customerCode" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['印件代号']"   style="width: 110px;" id="印件代号"  @keydown="gdzlent($event, '产品名称', '印件代号', '印件名称')"/>
                   </el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <el-form-item label="印件名称:" prop="customerName" class="mab">
-                    <el-input v-model="scgdformData['印件名称']" placeholder="" id="印件名称"  @keydown="gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
+                  <el-form-item label="印件名称:" prop="customerName" class="mab" label-width="75">
+                    <el-input v-model="scgdformData['印件名称']"  id="印件名称" style="width: 520px;"  @keydown="gdzlent($event, '印件代号', '印件名称', '订单数量')"  />
                   </el-form-item>
-                </el-col>
               </el-row>
               <!-- 第五排 -->
              <el-row :gutter="24">
-                 <el-col :span="6">
-                   <el-form-item label="订单数量:" prop="orderQuantity" class="mab">
-                     <el-input v-model="scgdformData['订单数量']"  placeholder="" style="width: 180px;" id="订单数量"  @keydown="gdzlent($event, '印件名称', '订单数量', '交货日期')" />
+                   <el-form-item label="订单数量:" prop="orderQuantity" class="mab" label-width="90">
+                     <el-input v-model="scgdformData['订单数量']"   style="width: 110px;" id="订单数量"  @keydown="gdzlent($event, '印件名称', '订单数量', '交货日期')" />
                    </el-form-item>
-                 </el-col>
-                 <el-col :span="6">
-                   <el-form-item label="交货日期:" prop="deliveryDate" class="mab">
-                     <el-date-picker v-model="scgdformData['交货日期']" type="date" placeholder="选择日期"  style="width: 280px;"  id="交货日期"  @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
+                   <el-form-item label="交货日期:" prop="deliveryDate" class="mab" label-width="75">
+                     <el-date-picker v-model="scgdformData['交货日期']" type="date"  style="width: 120px;"  id="交货日期"  @keydown="gdzlent($event, '订单数量', '交货日期', '投料率')"/>
                    </el-form-item>
-                 </el-col>
-                 <el-col :span="5">
-                   <el-form-item label="投料率:" prop="feedRate" class="mab">
-                     <el-input v-model="scgdformData['投料率']"  placeholder="" style="width: 140px;"  id="投料率"  @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
+                   <el-form-item label="投料率:" prop="feedRate" class="mab" label-width="80">
+                     <el-input v-model="scgdformData['投料率']"   style="width: 100px;"  id="投料率"  @keydown="gdzlent($event, '交货日期', '投料率', '平均合格率')"/>
                    </el-form-item>
-                 </el-col>
-                 <el-col :span="5">
-                   <el-form-item label="平均合格率:" prop="passRate" class="mab">
-                     <el-input v-model="scgdformData['平均合格率']"  placeholder="" style="width: 140px;"  id="平均合格率"  @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
+                   <el-form-item label="平均合格率:" prop="passRate" class="mab" label-width="90">
+                     <el-input v-model="scgdformData['平均合格率']"   style="width: 130px;"  id="平均合格率"  @keydown="gdzlent($event, '投料率', '平均合格率', '平张投料')"/>
                    </el-form-item>
-                 </el-col>
                </el-row>
               <!-- 第六排 -->
               <el-row :gutter="24">
-                <el-col :span="6">
-                  <el-form-item label="平张投料:" prop="flatFeed" class="mab">
-                    <el-input v-model="scgdformData['平张投料']" placeholder="" style="width: 180px;"  id="平张投料"  @keydown="gdzlent($event, '平均合格率', '平张投料', '万小张')"/>
+                  <el-form-item label="平张投料:" prop="flatFeed" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['平张投料']"  style="width: 110px;"  id="平张投料"  @keydown="gdzlent($event, '平均合格率', '平张投料', '万小张')"/>
                   </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="万小张:" prop="perTenThousand" class="mab">
-                    <el-input v-model="scgdformData['万小张']"  placeholder="" style="width: 100px;"  id="万小张"  @keydown="gdzlent($event, '平张投料', '万小张', '单位')"/>
-                    <el-input v-model="scgdformData['单位']"  placeholder="" style="width: 50px;"  id="单位"  @keydown="gdzlent($event, '万小张', '单位', '投料大箱')"/>
+                  <el-form-item label="万小张:" prop="perTenThousand" class="mab" label-width="70">
+                    <el-input v-model="scgdformData['万小张']"   style="width: 95px;"  id="万小张"  @keydown="gdzlent($event, '平张投料', '万小张', '单位')"/>
+                    <el-input v-model="scgdformData['单位']"   style="width: 50px;"  id="单位"  @keydown="gdzlent($event, '万小张', '单位', '投料大箱')"/>
                   </el-form-item>
-                </el-col>
-                <el-col :span="5">
-                  <el-form-item label="投料大箱:" prop="feedBox" class="mab">
-                    <el-input v-model="scgdformData['投料大箱']" placeholder="" style="width: 140px;"  id="投料大箱"  @keydown="gdzlent($event, '单位', '投料大箱', '库存大箱')"/>
+                  <el-form-item label="投料大箱:" prop="feedBox" class="mab" label-width="75">
+                    <el-input v-model="scgdformData['投料大箱']"  style="width: 90px;"  id="投料大箱"  @keydown="gdzlent($event, '单位', '投料大箱', '库存大箱')"/>
                   </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item label="库存大箱:" prop="stockBox" class="mab">
-                    <el-input v-model="scgdformData['库存大箱']"  placeholder="" style="width: 140px;"  id="库存大箱"  @keydown="gdzlent($event, '投料大箱', '库存大箱', '销售订单号')"/>
+                  <el-form-item label="库存大箱:" prop="stockBox" class="mab" label-width="80">
+                    <el-input v-model="scgdformData['库存大箱']"   style="width: 135px;"  id="库存大箱"  @keydown="gdzlent($event, '投料大箱', '库存大箱', '销售订单号')"/>
                   </el-form-item>
-                </el-col>
               </el-row>
               <!-- 第七排 -->
               <el-row :gutter="20">
-                <el-col :span="20">
-                  <el-form-item label="销售订单号:" prop="salesOrder" class="mab">
-                    <el-input v-model="scgdformData['销售订单号']"  placeholder=""  id="销售订单号"  @keydown="gdzlent($event, '库存大箱', '销售订单号', '警语版面')"/>
+                  <el-form-item label="销售订单号:" prop="salesOrder" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['销售订单号']"  style="width: 700px;"   id="销售订单号"  @keydown="gdzlent($event, '库存大箱', '销售订单号', '警语版面')"/>
                   </el-form-item>
-                </el-col>
               </el-row>
               <!-- 第八排 -->
               <el-row :gutter="20">
-                <el-col :span="20">
-                  <el-form-item label="警语版面:" prop="warningLayout" class="mab" label-width="85px">
-                    <el-input v-model="scgdformData['警语版面']"  placeholder=""   id="警语版面"  @keydown="gdzlent($event, '销售订单号', '警语版面', '版本号')"/>
+                  <el-form-item label="警语版面:" prop="warningLayout" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['警语版面']"  style="width: 700px;"    id="警语版面"  @keydown="gdzlent($event, '销售订单号', '警语版面', '版本号')"/>
                   </el-form-item>
-                </el-col>
               </el-row>
               <!-- 第九排 -->
               <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-form-item label="版本号:" prop="versionNumber" class="mab" label-width="85px">
-                    <el-input v-model="scgdformData['版本号']"  placeholder="" id="版本号"  @keydown="gdzlent($event, '警语版面', '版本号', '客户ERP编码')" />
+                  <el-form-item label="版本号:" prop="versionNumber" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['版本号']"   id="版本号" style="width: 180px;"  @keydown="gdzlent($event, '警语版面', '版本号', '客户ERP编码')" />
                   </el-form-item>
-                </el-col>
-                <el-col :span="14">
-                  <el-form-item label="客户ERP编码:" prop="customerErpCode" class="mab">
-                    <el-input v-model="scgdformData['客户ERP编码']"  placeholder=""  id="客户ERP编码"  @keydown="gdzlent($event, '版本号', '客户ERP编码', '码源数量')"/>
+                  <el-form-item label="客户ERP编码:" prop="customerErpCode" class="mab" label-width="120">
+                    <el-input v-model="scgdformData['客户ERP编码']"   style="width: 400px;"  id="客户ERP编码"  @keydown="gdzlent($event, '版本号', '客户ERP编码', '码源数量')"/>
                   </el-form-item>
-                </el-col>
               </el-row>
               <!-- 第十排 -->
               <el-row :gutter="20">
-                <el-col :span="6">
-                  <el-form-item label="码源数量:" prop="codeSourceQuantity" class="mab">
-                    <el-input v-model="scgdformData['码源数量']"  placeholder="" style="width: 170px;" id="码源数量"  @keydown="gdzlent($event, '客户ERP编码', '码源数量', '进程备注')" />
+                  <el-form-item label="码源数量:" prop="codeSourceQuantity" class="mab" label-width="90">
+                    <el-input v-model="scgdformData['码源数量']" style="width: 180px;"  id="码源数量"  @keydown="gdzlent($event, '客户ERP编码', '码源数量', '进程备注')" />
                   </el-form-item>
-                </el-col>
-                <el-col :span="14">
-                  <el-form-item label="进程备注:" prop="processNote" class="mab">
-                    <el-input v-model="scgdformData['进程备注']"  placeholder="" id="进程备注"  @keydown="gdzlent($event, '码源数量', '进程备注', '备注')"/>
-                  </el-form-item>
-                </el-col>
               </el-row>
+                 <el-row :gutter="20">
+                     <el-form-item label="进程备注:" prop="processNote" class="mab" label-width="90">
+                       <el-input v-model="scgdformData['进程备注']"  style="width: 700px;"  id="进程备注"  @keydown="gdzlent($event, '码源数量', '进程备注', '备注')"/>
+                     </el-form-item>
+                 </el-row>
                <!-- 第十一排 -->
              <el-row :gutter="20">
-               <el-col :span="20">
-                 <el-form-item label="备注说明:" prop="remark" class="mab">
-                   <el-input type="textarea" v-model="scgdformData['备注']" :rows="2" :clearable="true" placeholder="" style="width: 100%;" id="备注"  @keydown="gdzlent($event, '进程备注', '备注', '重点工单')"/>
+                 <el-form-item label="备注说明:" prop="remark" class="mab" label-width="90">
+                   <el-input type="textarea" v-model="scgdformData['备注']" :rows="2" :clearable="true" style="width: 700px;" resize="none"  id="备注"  @keydown="gdzlent($event, '进程备注', '备注', '重点工单')"/>
                  </el-form-item>
-               </el-col>
              </el-row>
-
-                 <div class="dialog-footer" style="text-align: right;">
-                   <el-button @click="closeDialog">取 消</el-button>
-                   <el-button type="primary"  @click="enterDialog">确 定</el-button>
-                 </div>
              </el-form>
            </el-row>
+            <template #footer>
+              <div class="dialog-footer" style="text-align: right;">
+                <el-button @click="closeDialog">取 消</el-button>
+                <el-button type="primary"  @click="enterDialog">确 定</el-button>
+              </div>
+            </template>
 
 		   </el-dialog>
 
@@ -819,7 +783,7 @@
                 </el-form-item>
               </div>
               <el-form-item label="备注说明:" prop="remark">
-                <el-input type="textarea" v-model="gdyjformData['备注说明']" rows="4" clearable placeholder=""  />
+                <el-input type="textarea" v-model="gdyjformData['备注说明']"  resize="none" rows="4" clearable placeholder=""  />
               </el-form-item>
             </el-form>
 
@@ -832,45 +796,45 @@
           </el-dialog>
 
           <!-- 修改工艺资料弹窗 -->
-          <el-dialog v-model="gdgydialogFormVisible" :before-close="gycloseDialog" style="width: 65%;height: 66%;" :title="'修改工艺资料'" destroy-on-close>
+          <el-dialog v-model="gdgydialogFormVisible" :before-close="gycloseDialog" style="width: 1100px;" :title="'修改工艺资料'" destroy-on-close>
               <el-form>
                 <div>
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="印件编号:"  class="mab" prop="keyOrder">
-                    <el-input disabled v-model="gdgyformData['印件']" placeholder=""  style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['印件']"   style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="工序编号:"  class="mab" prop="keyOrder" label-width=" 90">
-                    <el-input disabled v-model="gdgyformData['工序']" placeholder=""   style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['工序']"  style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="重点工序:"  class="mab" prop="keyOrder" label-width=" 90">
-                    <el-input  v-model="gdgyformData['重点工序']" placeholder="" id="重点工序"  @keydown="gyzlent($event, '', '重点工序', '设备编号')"  style="flex: 1;"/>
+                    <el-input  v-model="gdgyformData['重点工序']"  id="重点工序"   @keydown="gyzlent($event, '', '重点工序', '设备编号')"  style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="备选工序:"  class="mab" prop="isBanciSelected" label-width=" 90">
                     <el-checkbox v-model="gdgyformData['备选工序']"></el-checkbox>
                   </el-form-item>
-                  <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 90">
-                    <el-input disabled v-model="gdgyformData['开数']" placeholder="" style="flex: 1;"/>
+                  <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 125">
+                    <el-input disabled v-model="gdgyformData['开数']"  style="width: 100px;"/>
                   </el-form-item>
                   <el-form-item label="加工联数:"  class="mab" prop="keyOrder" label-width=" 80">
-                    <el-input disabled v-model="gdgyformData['联数']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['联数']"  style="width: 100px;"/>
                   </el-form-item>
                 </div>
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="车间名称:"  class="mab" prop="keyOrder">
-                    <el-input disabled v-model="gdgyformData['车间名称']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['车间名称']"  style="width: 130px;"/>
                   </el-form-item>
                   <el-form-item label="工艺名称:"  class="mab" prop="keyOrder" label-width=" 90">
-                    <el-input disabled v-model="gdgyformData['工艺名称']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['工艺名称']"  style="width: 140px;"/>
                   </el-form-item>
                   <el-form-item label="工序名称:"  class="mab" prop="keyOrder" label-width=" 90">
-                    <el-input disabled v-model="gdgyformData['工序名称']" placeholder=""  style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['工序名称']"  style="width: 400px;"/>
                   </el-form-item>
                   <el-form-item label="计损色数"  class="mab" prop="keyOrder" label-width=" 80">
-                    <el-input disabled v-model="gdgyformData['计损色数']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['计损色数']" style="width: 90px;"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="设备编号:"  class="mab" prop="remark">
-                  <el-select v-model="gdgyformData['设备编号']" multiple placeholder="请选择设备编号"
+                  <el-select v-model="gdgyformData['设备编号']" multiple
                              id="设备编号"  @keydown="gyzlent($event, '重点工序', '设备编号', '工序损耗')"
                              style="flex: 1; height: auto;">
                     <el-option
@@ -885,45 +849,46 @@
                   </el-select>
                 </el-form-item>
                   <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
-                    <el-input v-model="gdgyformData['shdh']" placeholder="" style="width: 10%;" id="工序损耗"  @keydown="gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
-                    <el-input disabled v-model="gdgyformData['工序名称']" placeholder="" style="width: 90%;"/>
+                    <el-input v-model="gdgyformData['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="gyzlent($event, '设备编号', '工序损耗', '损耗系数')"/>
+                    <el-input disabled v-model="gdgyformData['工序名称']"  style="width: 88.7%;margin-left: 10px"/>
                   </el-form-item>
                 <div style="display: flex; gap: 0px;">
                   <el-form-item label="损耗系数:"  class="mab" prop="keyOrder">
-                    <el-input v-model="gdgyformData['损耗系数']" placeholder="" style="flex: 1;"  id="损耗系数"  @keydown="gyzlent($event, '工序损耗', '损耗系数', '难度系数')"/>
+                    <el-input v-model="gdgyformData['损耗系数']"  style="flex: 1;"  id="损耗系数"  @keydown="gyzlent($event, '工序损耗', '损耗系数', '难度系数')"/>
                   </el-form-item>
                   <el-form-item label="难度系数"  class="mab" prop="keyOrder">
-                    <el-input v-model="gdgyformData['难度系数']" placeholder="" style="flex: 1;" id="难度系数"  @keydown="gyzlent($event, '设备编号', '难度系数', '小时产能')"/>
+                    <el-input v-model="gdgyformData['难度系数']"  style="flex: 1;" id="难度系数"  @keydown="gyzlent($event, '设备编号', '难度系数', '小时产能')"/>
                   </el-form-item>
                   <el-form-item label="装版工时:"  class="mab" prop="keyOrder">
-                    <el-input disabled v-model="gdgyformData['装版工时']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['装版工时']"  style="flex: 1;"/>
                   </el-form-item>
                   <el-form-item label="排产小时产能:"  class="mab" prop="keyOrder" label-width=" 120px">
-                    <el-input  v-model="gdgyformData['小时产能']" placeholder="" style="flex: 1;" id="小时产能"  @keydown="gyzlent($event, '难度系数', '小时产能', '')"/>
+                    <el-input  v-model="gdgyformData['小时产能']"  style="flex: 1;" id="小时产能"  @keydown="gyzlent($event, '难度系数', '小时产能', '')"/>
                   </el-form-item>
                   <el-form-item label="印刷方式"  class="mab" prop="keyOrder">
-                    <el-input disabled v-model="gdgyformData['印刷方式']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['印刷方式']"  style="flex: 1;"/>
                   </el-form-item>
                   <el-form-item label="版距"  class="mab" prop="keyOrder">
-                    <el-input disabled v-model="gdgyformData['版距']" placeholder="" style="flex: 1;"/>
+                    <el-input disabled v-model="gdgyformData['版距']"  style="flex: 1;"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="工序备注:"  class="mab" prop="remark">
-                  <el-input disabled type="textarea" v-model="gdgyformData['备注']" rows="2" clearable placeholder=""  style="flex: 1;resize: none" />
+                  <el-input disabled type="textarea" resize="none" v-model="gdgyformData['备注']" rows="3" clearable   style="flex: 1;resize: none" />
                 </el-form-item>
                 <el-form-item  label="质量要求:"  class="mab" prop="remark">
-                  <el-input disabled type="textarea" v-model="gdgyformData['质量要求']" rows="2" clearable placeholder=""  style="flex: 1;resize: both;"/>
+                  <el-input disabled type="textarea" resize="none" v-model="gdgyformData['质量要求']" rows="2" clearable   style="flex: 1;resize: both;"/>
                 </el-form-item>
                 <el-form-item label="质量隐患:"  class="mab" prop="remark">
-                  <el-input disabled type="textarea" v-model="gdgyformData['质量隐患']" rows="2" clearable placeholder=""  style="flex: 1;"/>
+                  <el-input disabled type="textarea" resize="none" v-model="gdgyformData['质量隐患']" rows="2" clearable   style="flex: 1;"/>
                 </el-form-item>
                 </div>
+              </el-form>
+              <template #footer>
                 <div class="dialog-footer" style="text-align: right;top: auto">
                   <el-button @click="gdgycloseDialog">取 消</el-button>
                   <el-button type="primary" @click="gdgyenterDialog">确 定</el-button>
                 </div>
-              </el-form>
-
+              </template>
           </el-dialog>
 
           <!-- 修改BOM资料弹窗【MES系统没有修改功能】 -->
@@ -1116,7 +1081,6 @@ const xzhscsConfirm = async () => {
       }
     });
       const AccountingParameterEditdata = await AccountingParameterEdit(formattedData);
-      console.log(AccountingParameterEditdata);
       if (AccountingParameterEditdata.code === 0) {
         xzhscslist.value = false;
         ElMessage({ type: 'success', message: '更新成功' });
@@ -1259,6 +1223,145 @@ const scfjfpxsCancel = () => {
   scfjfpxslist.value = false;
 };
 
+
+
+
+//==============工单打印=============
+const cp_print_gdlist = ref(false);
+const cp_print_formData = reactive({
+  gdbh: '',
+  yjh: '',
+  zzgxh: '',
+  yjmc: '',
+  zd: '',
+  sh: '',
+  status: '显示器',
+});
+//工单打印按钮
+const cp_gdprintonClick = async () => {
+  cp_print_formData['gdbh'] = '2310777';
+  cp_print_formData['yjmc'] = _Gd_cpmc.value;
+  cp_print_formData['zd'] = "刘玲";
+  cp_print_formData['sh'] ="谭鸿忠";
+  cp_print_gdlist.value = true;
+}
+//工单打印回车
+const cp_print_ProductValue = async () => {
+
+}
+//工单打印确定
+const cp_print_handleConfirm = async () => {
+  // if(cp_print_formData['status'] === '显示器'){
+  //
+  // }
+  // 打开新窗口进行打印预览
+  const printWindow = window.open('', '_blank');
+
+  // 在新窗口中写入打印内容
+  printWindow.document.write(`
+    <html>
+  <head>
+    <title>打印预览</title>
+    <style>
+      body {
+        font-size: 12pt;
+      }
+
+      .container {
+        width: 80%;
+        height: 70%;
+        border: 1px red solid;
+        position: absolute;
+        top: 40%;
+        left: 50%;
+        transform: translate(-50%, -50%);
+        padding: 20px; /* 添加内边距,以便内容不紧贴边框 */
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+      }
+
+      h3 {
+        text-align: center;
+        margin: 0; /* 去除标题的默认外边距 */
+      }
+
+      .info-container {
+        display: flex;
+        justify-content: space-between;
+        margin-top: 10px; /* 信息行之间的垂直间距 */
+        width: 100%;
+      }
+
+      .qrcode {
+        width: 100px;
+        height: 100px;
+        border: 2px black solid;
+        align-self: flex-end; /* 使二维码位于右上角 */
+        margin-top: 20px; /* 二维码与其他内容之间的垂直间距 */
+      }
+
+      table {
+        width: 100%;
+        border-collapse: collapse;
+        margin-top: 20px; /* 表格与信息之间的垂直间距 */
+      }
+
+      table, th, td {
+        border: 1px solid black;
+        text-align: center;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <h3>生产作业通知单</h3>
+      <div class="info-container">
+        <div>
+          <h4>生产批次号:2310777 销售订单号:利群(软长嘴)(二维码改版)231003</h4>
+          <h4>打印时间:2024-01-27</h4> <!-- 这里使用实际的打印时间 -->
+        </div>
+      </div>
+      <div class="qrcode" style="width: 100px; height: 100px; border: 2px black solid">
+        <!-- 这里放置二维码的代码 -->
+        <!-- 根据实际情况插入二维码图片或其他内容 -->
+      </div>
+      <table>
+        <!-- 表格内容 -->
+      </table>
+    </div>
+  </body>
+</html>
+      `);
+  // _PrintJobOrder();
+  // cp_print_gdlist.value = false;
+}
+//工单打印取消
+const cp_print_handleCancel = async () => {
+  cp_print_gdlist.value = false;
+}
+//调用打印接口
+const _PrintJobOrder = async () => {
+  let params = {};
+  params.workOrder = cp_print_formData['gdbh'];
+  // params.PrepareDocument = cp_print_formData['zd'];
+  // params.examine = cp_print_formData['sh'];
+  params.PrepareDocument = "刘玲";
+  params.examine = "谭鸿忠";
+  const print_PrintJobOrder = await PrintJobOrder(params);
+  console.log(print_PrintJobOrder)
+  // cp_print_formData['yjh'] = print_PrintJobOrder.data['印件'];
+  // cp_print_gdlist.value = false;
+}
+
+
+
+
+
+
+
+
+
 // =========== 查改U8工单 ===========
 const cgugdlist = ref(false);
 const cgugdformData = reactive({
@@ -1295,7 +1398,6 @@ const _U8workOrder = async ()=>{
   // console.log(workOrder)
   try {
     const U8workOrderdata = await U8workOrder({workOrder:workOrder});
-    // console.log(U8workOrderdata)
     cgugdtableData.value = U8workOrderdata.data;
   } catch (error) {
     console.error(error);
@@ -1317,7 +1419,6 @@ const _U8workOrder = async ()=>{
 //查改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) {
@@ -1342,20 +1443,19 @@ const oncgugdcloneclick = () => {
 // =========== 工艺流程调整 ===========
 const gylctztableColumns = ref(
     [
-      { label: '方案', prop: '方案', width: '80' },
-      { label: '印件号', prop: '印件号', width: '90' },
-      { label: '工序号', prop: '工序号', width: '100' },
-      { label: '工序名称', prop: '工序名称', width: '340' },
+      { label: '方案', prop: '方案', width: '60' },
+      { label: '印件号', prop: '印件号', width: '70' },
+      { label: '工序号', prop: '工序号', width: '80' },
+      { label: '工序名称', prop: '工序名称', width: '440' },
       { label: '工价系数', prop: '工价系数', width: '100' },
       { label: '损耗系数', prop: '损耗系数', width: '100' },
-      { label: '联数', prop: 'ls', width: '80' },
-      { label: '开数', prop: 'ks', width: '80' },
-      { label: '备注', prop: '备注', width: '100' },
-      { label: '车间', prop: '车间', width: '120' },
-      { label: '设备编号', prop: '设备编号', width: '120' },
+      { label: '开数', prop: 'ks', width: '60' },
+      { label: '联数', prop: 'ls', width: '60' },
+      { label: '备注', prop: '备注', width: '200' },
+      { label: '车间', prop: '车间', width: '90' },
       { label: '设备编号', prop: '设备编号', width: '100' },
       { label: '设备名称', prop: '设备名称', width: '100' },
-      { label: '建档用户', prop: '建档用户', width: '160' },
+      { label: '建档用户', prop: '建档用户', width: '100' },
       { label: '建档时间', prop: '建档时间', width: '160' },
       { label: '更新时间', prop: '更新时间', width: '160' },
     ]
@@ -1453,8 +1553,27 @@ const attachChange = (val) => {
 //工艺方案附加【执行】
 const addGongyiAttach = () => {
   attachList.value.map(row => gylctztableData.value.push(row))
-  // gdzlfjxx.value = false
+  gdzlfjxx.value = false
 }
+const gdzlfjxxtableColumns = ref(
+    [
+      { label: '方案', prop: '方案', width: '70' },
+      { label: '印件号', prop: '印件号', width: '70' },
+      { label: '工序号', prop: '工序号', width: '70' },
+      { label: '工序名称', prop: '工序名称', width: '370' },
+      { label: '工价系数', prop: '工价系数', width: '87' },
+      { label: '损耗系数', prop: '损耗系数', width: '87' },
+      { label: '开数', prop: 'ks', width: '65' },
+      { label: '联数', prop: 'ls', width: '65' },
+      { label: '备注', prop: '备注', width: '240' },
+      { label: '车间', prop: '车间', width: '105' },
+      { label: '设备编号', prop: '设备编号', width: '100' },
+      { label: '设备名称', prop: '设备名称', width: '100' },
+      { label: '建档用户', prop: '建档用户', width: '100' },
+      { label: '建档时间', prop: '建档时间', width: '160' },
+      { label: '更新时间', prop: '更新时间', width: '160' },
+    ]
+)
 //工艺方案附加【放弃】
 const gylcfj_fangqi = () => {
   gdzlfjxx.value = false
@@ -1462,7 +1581,6 @@ const gylcfj_fangqi = () => {
 
 //点击附加标准工序【按钮】
 const gylctz_fjbzgx = async () => {
-  console.log(_Gd_cpdh.value)
   gdzlfjxxformData['cpdh'] = gylctzformData['gddh'];
   gdzlfjxxformData['cpmc'] = gylctzformData['gdmc'];
   gdzlfjxxtableData.value = [];
@@ -1477,7 +1595,6 @@ const _ReferenceWorkOrder = async ()=>{
   try {
     const ReferenceWorkOrder_data = await ReferenceWorkOrder(params);
     if(ReferenceWorkOrder_data.code === 0){
-      // console.log(ReferenceWorkOrder_data);
       // 从数据中提取方案
       const schemes = ReferenceWorkOrder_data.data || [];
       // 直接将数组作为工艺方案数组
@@ -1488,7 +1605,6 @@ const _ReferenceWorkOrder = async ()=>{
       }
       //默认获取下拉框第一个值
       const workOrder = gdzlfjxxformData.cpgyfan[0]
-      console.log(gdzlfjxxformData.cpgyfans)
       gdzlfjxxformData.cpgyfan = gdzlfjxxformData.cpgyfans[0]
       _ProcessFlow_xiala(workOrder)
     }else{
@@ -1500,9 +1616,22 @@ const _ReferenceWorkOrder = async ()=>{
 }
 
 //更新当前产品工序【按钮】
-const gylctz_gxdqcpgx = () => {
-  console.log("更新当前产品工序【按钮】")
-  console.log(gylctztableData)
+const gylctz_gxdqcpgx = async () => {
+  const rawValueArray = gylctztableData.value;
+  const formattedData = rawValueArray.map(item => {
+    return {
+      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: '更新失败' })
+  // }
 };
 
 //放弃操作【按钮】
@@ -1625,7 +1754,6 @@ const _ProductInformations = async ()=>{
   let workOrder = yycpzlformData['gdbh'];
   // try {
     const ProductInformations = await ProductInformation({workOrder:workOrder});
-    console.log(ProductInformation);
     if(ProductInformations.msg === '未找到工单信息'){
       yycpzlformData['khdh'] = '';
       yycpzlformData['khmc'] = '';
@@ -1739,12 +1867,11 @@ const _cha_WorkList = async (node) => {
   const search = searchInfo.value;
   try {
     const WorkListdata = await WorkList({ search:search,limit:1,page:1});//接口调用函数
-    console.log(WorkListdata.data.total)
     if(WorkListdata.data.total === 0){
       ElMessage({type: 'warning',message: '未搜索具体查询条件'})
     }
     tableData.splice(0,tableData.length,...WorkListdata.data.data);//表格数据
-    total.value = tableData.length;//共多少条
+    total.value = WorkListdata.data.total;//共多少条
   } catch (error) {
     console.error(error);
   }
@@ -1761,7 +1888,7 @@ const handleCurrentChange = (val) => {
 
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
-  page.value = 1;
+  // page.value = 10;
   pageSize.value = val;
   _WorkList_page();
 };
@@ -1784,11 +1911,7 @@ const tableRowClick = async (row) => {
   _Gd_gdbh.value = row.工单编号;
   _Gd_cpdh.value = row.产品代号;
   _Gd_cpmc.value = row.产品名称;
-  console.log(_Gd_gdbh.value)
   const workOrderListDetail_data = await workOrderListDetail({Gd_gdbh:_Gd_gdbh.value});
-  console.log(workOrderListDetail_data.data.printList)
-  console.log(workOrderListDetail_data.data.processList)
-  console.log(workOrderListDetail_data.data.BOM)
   yjtableData.value = workOrderListDetail_data.data.printList;
   gytableData.value = workOrderListDetail_data.data.processList;
   bomtableData.value = workOrderListDetail_data.data.BOM;
@@ -1809,7 +1932,6 @@ let scgdformData = ref([])
 //双击修改
 const updateCompanyFunc = async(row) => {
   const DataCorrection_list = await DataCorrection({ Gd_gdbh:row['工单编号']});//接口调用函数
-  console.log(DataCorrection_list)
   scgdformData.value = DataCorrection_list.data;
   dialogFormVisible.value = true
 }
@@ -1876,7 +1998,6 @@ const gdyjupdateCompanyFunc = async(row) => {
 }
 //印件列表修改【确定】
 const gdyjenterDialog = async () => {
-  console.log(gdyjformData)
   const formattedData = {
     Uniqid: gdyjformData['Uniqid'],
     yjno: gdyjformData['印件号'] ? gdyjformData['印件号'] : "",
@@ -1925,7 +2046,6 @@ const gdzl_MachineList_address = reactive({
 const _cjmc = ref(null);
 //双击修改
 const gdgyupdateCompanyFunc = async(row) => {
-  console.log(row)
   gdgyformData['设备编号'] = [];
   if(row['车间名称']){
     _cjmc.value = row['车间名称']
@@ -2003,7 +2123,6 @@ const gdgyenterDialog = async () => {
       UniqId: gdgyformData['UniqId'],
       workOrder: _Gd_gdbh.value,
     };
-    console.log(formattedData)
     const ProcessDetailEdit_edit = await ProcessDetailEdit(formattedData);
     if (ProcessDetailEdit_edit.code === 0) {
       gdgydialogFormVisible.value = false
@@ -2031,14 +2150,11 @@ const sbbhclick = () => {
 
 
 const _capacityList = async () => {
-  console.log(gdgyformData['设备编号']);
   if(gdgyformData['设备编号'] === ''){
     return false;
   }else{
     _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
-    console.log(_capacityListsbbh.value);
     const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
-    console.log(editProductedit_machine)
     gdgyformData['小时产能'] = editProductedit_machine.data;
   }
 
@@ -2135,7 +2251,7 @@ const gdzlent = (event,id1,id2,id3) => {
     if(id1!='' && document.getElementById(id2).value==''){
       document.getElementById(id1).focus()
     }
-    console.log(document.getElementById(id2).value)
+    // console.log(document.getElementById(id2).value)
   }else if (event.keyCode === 37) { // 向左箭头
     if(id1!='' && document.getElementById(id2).selectionStart==0){
       document.getElementById(id1).focus()
@@ -2161,7 +2277,7 @@ const gyzlent = (event,id1,id2,id3) => {
     if(id1!='' && document.getElementById(id2).value==''){
       document.getElementById(id1).focus()
     }
-    console.log(document.getElementById(id2).value)
+    // console.log(document.getElementById(id2).value)
   }else if (event.keyCode === 37) { // 向左箭头
     if(id1!='' && document.getElementById(id2).selectionStart==0){
       document.getElementById(id1).focus()

Some files were not shown because too many files changed in this diff