侧边栏

src/api/jixiaoguanli/baogong.js

@@ -41,4 +41,20 @@ export const ModelChangeRecord = (params) => {
     method: 'get',
     params
   })
+}
+export const RemodelDetail = (params) => {
+  return service({
+    url: '/mes_server/Facility/RemodelDetail',
+    method: 'get',
+    params
+  })
+}
+
+//客诉记录
+export const  ComplaintRecord= (params) => {
+  return service({
+    url:'/mes_server/facility/ComplaintRecord',
+    method: 'get',
+	params
+  })
 }

src/api/mes_api_gty/orderAccounting.js

@@ -4,7 +4,7 @@ import service from '@/utils/request'
 * 工单超节损核算
 */
 
-// 1.1获取左侧菜单栏
+// 1.1获取左侧菜单栏（2.22修改）
 export const getSide = (params) => {
   return service({
     url: '/mes_server/order_super_loss/getTab',
@@ -13,7 +13,7 @@ export const getSide = (params) => {
   })
 }
 
-// 1.2获取超节损工单列表-筛选
+// 1.2获取超节损工单列表-筛选（2.22修改）
 export const getTable = (params) => {
   return service({
     url: '/mes_server/order_super_loss/getList',

src/api/yunyin/yunying.js

@@ -438,7 +438,7 @@ export const capacityList = (params) => {
 //新增工单->客户列表
 export const ClientList  = (params) => {
     return service({
-        url: 'c',
+        url: '/mes_server/work_order/ClientList',
         method: 'get',
         params
     })
@@ -475,7 +475,46 @@ export const ProcessCodeList  = (params) => {
         params
     })
 }
-
+//新增印件资料->印件资料添加
+export const PrintDetailAdd  = (data) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailAdd',
+        method: 'post',
+        params
+    })
+}
+//新增工艺资料->工艺资料添加
+export const ProcessDetailAdd  = (data) => {
+    return service({
+        url: '/mes_server/work_order/ProcessDetailAdd',
+        method: 'post',
+        params
+    })
+}
+//新增工艺资料->印件编号获取
+export const PrintDetailList  = (params) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailList',
+        method: 'get',
+        params
+    })
+}
+//印件资料删除
+export const PrintDetailDel  = (params) => {
+    return service({
+        url: '/mes_server/work_order/PrintDetailDel',
+        method: 'get',
+        params
+    })
+}
+//工艺资料删除
+export const ProcessDetailDel  = (params) => {
+    return service({
+        url: '/mes_server/work_order/ProcessDetailDel',
+        method: 'get',
+        params
+    })
+}
 
 /**工单生产排单(排产管理)*/
 //计划中工单
@@ -610,7 +649,14 @@ export const MachineWorkOrderList = (params) => {
         params
     })
 }
-
+//机组调整
+export const MachineTeamEdit = (params) => {
+    return service({
+        url: '/mes_server/Manufacture/MachineTeamEdit',
+        method: 'get',
+        params
+    })
+}
 
 /** 7.设备运行跟踪*/
 //左侧菜单

src/view/performance/12-orderAccounting/componets/detail.vue

@@ -1,9 +1,9 @@
 <template>
   <el-dialog
-    :model-value="modelValue"
+    :model-value="isShow"
     title="产品工艺流程"
     destroy-on-close
-    :before-close="()=>{emits('update:modelValue', false )}"
+    :before-close="()=>{emits('destroy')}"
     style="width: 80vw; height: 80vh"
   >
     <el-form
@@ -89,7 +89,7 @@
 
     <template #footer>
       <div class="dialog-footer">
-        <el-button @click="()=>{emits('update:modelValue', false )}">取 消</el-button>
+        <el-button @click="()=>{emits('destroy')}">取 消</el-button>
         <el-button
           type="primary"
           @click="handleUpdateDatail"
@@ -129,8 +129,18 @@ const updateOrderGy = (data) => {
 import { defineEmits, defineProps, ref } from 'vue'
 import { ElMessage } from 'element-plus'
 
-const props = defineProps(['modelValue', 'gdbh'])
-const emits = defineEmits(['update:modelValue'])
+// const props = defineProps(['isShow', 'gdbh'])
+const props = defineProps({
+  isShow: {
+    type: Boolean,
+    default: false,
+  },
+  gdbh: {
+    type: String,
+    default: '',
+  },
+})
+const emits = defineEmits(['destroy'])
 const detailData = ref([])
 const input = ref(props['gdbh'])
 

src/view/performance/12-orderAccounting/index.vue

@@ -78,8 +78,9 @@
             <!-- 查改 -->
             <Detail
               v-if="dialogDetail"
-              v-model="dialogDetail"
+              :is-show="dialogDetail"
               :gdbh="gdbh"
+              @destroy="()=>{dialogDetail = false}"
             />
 
             <!-- 工单超节损统计 -->
@@ -155,6 +156,7 @@
               highlight-current-row
               border
               :row-class-name="rowClassName"
+              :cell-class-name="cellClassName"
               :row-style="{ height: '20px' }"
               :cell-style="{ padding: '0px' }"
               :header-row-style="{ height: '20px' }"
@@ -260,30 +262,30 @@ getSideData()
 
 // 表格数据
 const tableCols1 = [
-  { label: '超损工单', prop: '', width: '90' },
+  { label: '超损工单', prop: 'csgd', width: '90' },
   { label: '工单编号', prop: 'Gd_gdbh', width: '100' },
-  { label: '印件号', prop: 'yj_Yjno', width: '100' },
+  { label: '印件号', prop: 'jjcp_yjno', width: '100' },
   { label: '联数', prop: 'yj_ls', width: '80' },
-  { label: '产品代号', prop: 'Gd_cpdh', width: '150' },
-  { label: '产品名称', prop: 'Gd_cpmc', width: '250' },
+  { label: '产品代号', prop: '成品编码', width: '150' },
+  { label: '产品名称', prop: '成品名称', width: '250' },
   { label: '实际投料', prop: '实际投料', width: '100' },
   { label: '计量单位', prop: '计量单位', width: '100' },
   { label: '入仓日期', prop: 'warehousing_date', width: '120' },
   { label: '入仓数量', prop: 'warehousing_num', width: '100' },
   { label: '目标合格率', prop: 'target_rate', width: '100' },
   { label: '实际合格率', prop: 'real_rate', width: '100' },
-  { label: '奖惩系数', prop: '', width: '100' },
+  { label: '奖惩系数', prop: 'reward_rate', width: '100' },
   { label: '奖罚金额合计', prop: '', width: '120' },
   { label: '废品合计', prop: '废品合计', width: '100' },
-  { label: '工单无形损', prop: 'intangible_loss', width: '100' },
-  { label: '材料废', prop: 'material_waste', width: '100' },
-  { label: '零头处理', prop: '', width: '100' },
-  { label: '处发废', prop: 'waste_out', width: '100' },
-  { label: '外摊废', prop: '', width: '100' },
-  { label: '工单计划损耗', prop: 'plan_loss', width: '120' },
-  { label: '工单制程废', prop: 'zcfp', width: '100' },
-  { label: '工单检验废', prop: 'waste_quality', width: '100' },
-  { label: '年月', prop: '年月', width: '100' },
+  { label: '工单无形损', prop: '工单无形损', width: '100' },
+  { label: '材料废', prop: '材料废', width: '100' },
+  { label: '零头处理', prop: '零头处理', width: '100' },
+  { label: '处发废', prop: '外发废', width: '100' },
+  { label: '外摊废', prop: '分摊废', width: '100' },
+  { label: '工单计划损耗', prop: '工单计划损耗', width: '120' },
+  { label: '工单制程废', prop: '', width: '100' },
+  { label: '工单检验废', prop: '工单质检废', width: '100' },
+  { label: '年月', prop: '', width: '100' },
 ]
 const tableCols2 = [
   { label: '工单编号', prop: 'Gy0_gdbh', width: '100' },
@@ -313,10 +315,14 @@ watch(currentRow, (value, oldValue, onCleanup) => {
 
 // 显示上方表格
 const handleNodeClick = async(node) => {
-  if (node.children) {
-    const { date } = node
-    const res = await getTable({ date, limit: 9999, page: 1 })
-    tableData1.value = res.data.data
+  console.log(node)
+  if (!node.children) {
+    const { date, code } = node
+    const res = await getTable({ date, code, limit: 9999, page: 1 })
+    tableData1.value = res.data.data.map(item => ({
+      ...item,
+      csgd: parseFloat(item['target_rate']) - parseFloat(item['real_rate']) > 0 ? '√' : '',
+    }))
     console.log(res.data)
   } else {
     // console.log(node.date, node.code)
@@ -345,7 +351,17 @@ const handleSearch = () => {
   }
 }
 const rowClassName = ({ row, rowIndex }) => {
+  if (row['csgd'] === '√') {
+    return 'yellow-row'
+  }
+  return ''
+}
 
+const cellClassName = ({ row, column, rowIndex, columnIndex }) => {
+  if ([7, 11, 13, 21].includes(columnIndex)) {
+    return 'red-cell'
+  }
+  return ''
 }
 </script>
 
@@ -376,8 +392,12 @@ const rowClassName = ({ row, rowIndex }) => {
   flex: 1;
 }
 
-:deep(.el-table__body .warning-row) {
-  background: #FFFF80 !important;
+:deep(.el-table .yellow-row) {
+  background: #FFFF80;
+}
+
+:deep(.red-cell div) {
+  color: #FF0000 !important;
 }
 
 /* 选中某行时的背景色 */
@@ -385,10 +405,6 @@ const rowClassName = ({ row, rowIndex }) => {
   background: #ff80ff !important;
 }
 
-:deep(.el-table .bg-yellow) {
-  background: yellow;
-}
-
 </style>
 <style scoped>
 :deep(.el-table td .cell) {

src/view/performance/Dayreportattached.vue

@@ -51,16 +51,16 @@
 			  @selection-change="handleSelectionChange" @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column align="left" label="生产日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="设备编号" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="设备名称" prop="sczl_sbmc" width="340"/>
-              <el-table-column align="left" label="班组编号" prop="sczl_bzdh" width="120"/>
-              <el-table-column align="left" label="排班工时" prop="sczl_设备运行工时" width="120"/>
-              <el-table-column align="left" label="备注" prop="sczl_desc" width="120"/>
-              <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>
+              <el-table-column align="left" sortable label="生产日期" prop="sczl_rq" width="105"/>
+              <el-table-column align="left" sortable label="设备编号" prop="sczl_jtbh" width="105"/>
+              <el-table-column align="left" sortable label="设备名称" prop="sczl_sbmc" width="250"/>
+              <el-table-column align="left" sortable label="班组编号" prop="sczl_bzdh" width="105"/>
+              <el-table-column align="left" sortable label="排班工时" prop="sczl_设备运行工时" width="105"/>
+              <el-table-column align="left" sortable label="备注" prop="sczl_desc" width="120"/>
+              <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

src/view/performance/Dayreports.vue

@@ -35,8 +35,8 @@
             <el-form-item>
 			  <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
-			  <el-button type="primary" class="bt" icon="copy-document" @click="onCountByGdbh">切换显示方式</el-button>
 			  <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
+              <el-button type="primary" class="bt" icon="copy-document" @click="onCountByGdbh">切换显示方式</el-button>
               <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" class="bt" icon="download" @click="exportExcel">导出到Excel</el-button>
@@ -51,45 +51,45 @@
 			  :show-overflow-tooltip="true" @row-click="Click"
 			  @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
               <!-- <el-table-column type="selection" width="55" /> -->
-              <el-table-column fixed align="left" label="工单编号" prop="sczl_gdbh" width="90"/>
-              <el-table-column fixed align="left" label="产品名称" prop="Gd_cpmc"  width="250"/>
-              <el-table-column align="left" label="印件及工序" prop="jyno_gxmc"  width="120"/>
-              <el-table-column align="left" label="生产日期" prop="sczl_rq"  width="100"/>
-              <el-table-column align="left" label="机台" prop="sczl_jtbh"  width="80"/>
-              <el-table-column align="left" label="班组" prop="sczl_bzdh"  width="60"/>
-              <el-table-column align="left" label="流程单" prop="sczl_num"  width="80"/>
-              <el-table-column align="left" label="车头产量" prop="sczl_cl"  width="100"/>
-              <el-table-column align="left" label="色度数" prop="sczl_ms" width="80" />
-			  <el-table-column align="left" label="制程废" prop="sczl_zcfp" width="80" />
-			  <el-table-column align="left" label="次品" prop="sczl_zccp"  width="80"/>
-			  <el-table-column align="left" label="来料异常" prop="incomingerror"  width="90"/>
-			  <el-table-column align="left" label="装版工时" prop="sczl_装版工时"  width="90"/>
-			  <el-table-column align="left" label="保养工时" prop="sczl_保养工时"  width="90"/>
-			  <el-table-column align="left" label="打样工时" prop="sczl_打样工时"  width="90"/>
-			  <el-table-column align="left" label="异常停机工时" prop="sczl_异常停机工时"  width="120"/>
-			  <el-table-column align="left" label="设备运行工时" prop="sczl_设备运行工时"  width="120"/>
-			  <el-table-column align="left" label="组员编号1" prop="sczl_bh1" width="100"/>
-			  <el-table-column align="left" label="组员姓名1" prop="name1"  width="100"/>
-			  <el-table-column align="left" label="组员编号2" prop="sczl_bh2"  width="100"/>
-			  <el-table-column align="left" label="组员姓名2" prop="name2" width="100" />
-			  <el-table-column align="left" label="组员编号3" prop="sczl_bh3"  width="100"/>
-			  <el-table-column align="left" label="组员姓名3" prop="name3" width="100"/>
-			  <el-table-column align="left" label="组员编号4" prop="sczl_bh4" width="100"/>
-			  <el-table-column align="left" label="组员姓名4" prop="name4"width="100" />
-			  <el-table-column align="left" label="组员编号5" prop="sczl_bh5" width="100"/>
-			  <el-table-column align="left" label="组员姓名5" prop="name5" width="100"/>
-			  <el-table-column align="left" label="组员编号6" prop="sczl_bh6"width="100" />
-			  <el-table-column align="left" label="组员姓名6" prop="name6" width="100"/> 
-			  <el-table-column align="left" label="拆片联拼系数" prop="拆片联拼系数" width="120"/>
-			  <el-table-column align="left" label="拆片条小盒系数" prop="拆片条小盒系数" width="130"/>
-			  <el-table-column align="left" label="工价系数" prop="sczl_工价系数" width="100"/>
-			  <el-table-column align="left" label="日定额" prop="日定额" width="80"/>
-			  <el-table-column align="left" label="千件工价" prop="piecesprice " width="100"/>
-			  <el-table-column align="left" label="补产标准" prop="addstandards " width="100"/>
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="100"/>
+              <el-table-column fixed align="left" sortable label="工单编号" prop="sczl_gdbh" width="105"/>
+              <el-table-column fixed align="left" sortable label="产品名称" prop="Gd_cpmc"  width="250"/>
+              <el-table-column align="left" sortable label="印件及工序" prop="jyno_gxmc"  width="120"/>
+              <el-table-column align="left" sortable label="生产日期" prop="sczl_rq"  width="120"/>
+              <el-table-column align="left" sortable label="机台" prop="sczl_jtbh"  width="77"/>
+              <el-table-column align="left" sortable label="班组" prop="sczl_bzdh"  width="77"/>
+              <el-table-column align="left" sortable label="流程单" prop="sczl_num"  width="91"/>
+              <el-table-column align="left" sortable label="车头产量" prop="sczl_cl"  width="120"/>
+              <el-table-column align="left" sortable label="色度数" prop="sczl_ms" width="91" />
+			  <el-table-column align="left" sortable label="制程废" prop="sczl_zcfp" width="91" />
+			  <el-table-column align="left" sortable label="次品" prop="sczl_zccp"  width="77"/>
+			  <el-table-column align="left" sortable label="来料异常" prop="incomingerror"  width="105"/>
+			  <el-table-column align="left" sortable label="装版工时" prop="sczl_装版工时"  width="105"/>
+			  <el-table-column align="left" sortable label="保养工时" prop="sczl_保养工时"  width="105"/>
+			  <el-table-column align="left" sortable label="打样工时" prop="sczl_打样工时"  width="105"/>
+			  <el-table-column align="left" sortable label="异常停机工时" prop="sczl_异常停机工时"  width="133"/>
+			  <el-table-column align="left" sortable label="设备运行工时" prop="sczl_设备运行工时"  width="133"/>
+			  <el-table-column align="left" sortable label="组员编号1" prop="sczl_bh1" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名1" prop="name1"  width="113"/>
+			  <el-table-column align="left" sortable label="组员编号2" prop="sczl_bh2"  width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名2" prop="name2" width="113" />
+			  <el-table-column align="left" sortable label="组员编号3" prop="sczl_bh3"  width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名3" prop="name3" width="113"/>
+			  <el-table-column align="left" sortable label="组员编号4" prop="sczl_bh4" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名4" prop="name4"width="113" />
+			  <el-table-column align="left" sortable label="组员编号5" prop="sczl_bh5" width="113"/>
+			  <el-table-column align="left" sortable label="组员姓名5" prop="name5" width="113"/>
+			  <el-table-column align="left" sortable label="组员编号6" prop="sczl_bh6"width="113" />
+			  <el-table-column align="left" sortable label="组员姓名6" prop="name6" width="113"/> 
+			  <el-table-column align="left" sortable label="拆片联拼系数" prop="拆片联拼系数" width="133"/>
+			  <el-table-column align="left" sortable label="拆片条小盒系数" prop="拆片条小盒系数" width="147"/>
+			  <el-table-column align="left" sortable label="工价系数" prop="sczl_工价系数" width="105"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="91"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="piecesprice " width="105"/>
+			  <el-table-column align="left" sortable label="补产标准" prop="addstandards " width="105"/>
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="100"/>
 			  <!-- <el-table-column align="left" label="table_type"  prop="table_type" width="120"/> -->
 			<tbody>
 			  <tr v-for="row in filteredRows" :key="row.sczl_gdbh">

src/view/performance/MachineDocuments.vue

@@ -11,21 +11,10 @@
       </el-aside> -->
 	  
 	  
-	  <layout-sider
-	     :resize-directions="['right']"
-	     :width="220"
-	     style="margin-right: 10px;"
-	   >
-	     <div
-	       class="JKWTree-tree"
-	       style="height: 70vh;"
-	     >
+	  <layout-sider :resize-directions="['right']" :width="220" style="margin-right: 10px;" >
+	     <div class="JKWTree-tree" style="height: 70vh;" >
 	       <h3>机器检验计件单据维护</h3>
-	       <el-tree
-	         :data="treeData"
-	         highlight-current
-	         @node-click="handleNodeClick"
-	       />
+	       <el-tree :data="treeData" highlight-current @node-click="handleNodeClick" />
 	     </div>
 	   </layout-sider>
       <el-container>
@@ -33,46 +22,43 @@
         <el-main>
           <!-- 按钮区域 -->
           <div class="gva-table-box">
-            <div class="gva-btn-list">
-              <el-row :span="6">
-                <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
-              </el-row>
-              <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
-              <el-button type="primary" :icon="Refresh" @click="onRefresh">刷新质检系数</el-button>
-			   <el-button type="primary"  @click="onCountByGdbh">切换显示方式</el-button>
-			   <el-button type="primary" :icon="Refresh" @click="onAdd">新增</el-button>
-			  <el-button type="primary" :icon="Refresh" @click="onDel">删除</el-button>
+            <el-form-item>
+              <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
+              <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
+              <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
+			  <el-button type="primary" class="bt"  icon="copy-document" @click="onCountByGdbh">切换显示方式</el-button>
+			  <el-button type="primary" class="bt" icon="refresh" @click="onRefresh">刷新质检系数</el-button>
+			  <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
               </div>
-            </div>
+            </el-form-item>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
               highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
-              <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="分类" prop="sczl_单据类型" width="120"/>
-              <el-table-column align="left" label="工单印件" prop="combinedProp"width="340"/>
-              <el-table-column align="left" label="印件工序" prop="combinedProp2" width="220"/>
-              <el-table-column align="left" label="机台编号" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="机台" prop="sczl_jtbh" width="120"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
-              <el-table-column align="left" label="计件产量" prop="sczl_cl" width="120"/>
-              <el-table-column align="left" label="检验类别" prop="sczl_检验类别" width="120"/>
-              <el-table-column align="left" label="废品率系数" prop="sczl_废品率系数" width="120"/>
-			  <el-table-column align="left" label="日定额" prop="日定额" width="120"/>
-			  <el-table-column align="left" label="员工姓名1" prop="sczl_bh1_name" width="120"/>
-			  <el-table-column align="left" label="员工姓名2" prop="sczl_bh2_name"width="120" />
-			  <el-table-column align="left" label="员工姓名3" prop="sczl_bh3_name" width="120"/>
-			  <el-table-column align="left" label="员工姓名4" prop="sczl_bh4_name"width="120" />
-			  <el-table-column align="left" label="班组代号" prop="sczl_bzdh" width="120"/>
-			  <el-table-column align="left" label="千件工价" prop="千件工价" width="120"/>
-			  <el-table-column align="left" label="日通电工时" prop="sczl_设备运行工时" width="120"/>
-			  <el-table-column align="left" label="流程单备注" prop="qczl_NumDesc" width="120"/>			
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120"/>
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160"/>
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160"/>
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120"/>			
+              <el-table-column align="left" sortable label="分类" prop="sczl_单据类型" width="77"/>
+              <el-table-column align="left" sortable label="工单印件" prop="combinedProp"width="250"/>
+              <el-table-column align="left" sortable label="印件工序" prop="combinedProp2" width="120"/>
+              <el-table-column align="left" sortable label="机台编号" prop="sczl_jtbh" width="105"/>
+              <el-table-column align="left" sortable label="机台" prop="sczl_jtbh" width="77"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="105"/>
+              <el-table-column align="left" sortable label="计件产量" prop="sczl_cl" width="105"/>
+              <el-table-column align="left" sortable label="检验类别" prop="sczl_检验类别" width="105"/>
+              <el-table-column align="left" sortable label="废品率系数" prop="sczl_废品率系数" width="120"/>
+			  <el-table-column align="left" sortable label="日定额" prop="日定额" width="91"/>
+			  <el-table-column align="left" sortable label="员工姓名1" prop="sczl_bh1_name" width="113"/>
+			  <el-table-column align="left" sortable label="员工姓名2" prop="sczl_bh2_name"width="113" />
+			  <el-table-column align="left" sortable label="员工姓名3" prop="sczl_bh3_name" width="113"/>
+			  <el-table-column align="left" sortable label="员工姓名4" prop="sczl_bh4_name"width="113" />
+			  <el-table-column align="left" sortable label="班组代号" prop="sczl_bzdh" width="105"/>
+			  <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="105"/>
+			  <el-table-column align="left" sortable label="日通电工时" prop="sczl_设备运行工时" width="120"/>
+			  <el-table-column align="left" sortable label="流程单备注" prop="qczl_NumDesc" width="120"/>			
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120"/>
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160"/>
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160"/>
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120"/>			
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">
@@ -84,270 +70,136 @@
           </div>
           <!-- 弹出框 -->
           <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type === 'create' ? '添加' : '修改'"
-            destroy-on-close width="1200px">
+            destroy-on-close width="1000px">
             <!-- <el-scrollbar height="500px"> -->
-             <el-form :model="formData" label-position="left" ref="elFormRef" :rules="rule">
-				 
-				 
-				 
-			  <el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="日期" prop="id">
-						 <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, '其他备注', '日期', '组别')" :clearable="true" placeholder="" />
-					   </el-form-item>
-					 </el-col>
-					 <el-col :span="6">
-					   <el-form-item label="组别" prop="name">
-						 <el-row :gutter="20">
-						   <el-col :span="12">
-							 <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '日期', '组别', '工单编号')" :clearable="true" placeholder="" />
-						   </el-col>                      
-						 </el-row>
-					   </el-form-item>
-					 </el-col>
-				   </el-row> 
-				   
-				   
-				<el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="工单编号" prop="id">
-						 <el-input v-model="formData.sczl_gdbh"id="工单编号"  @keydown="ent($event, '日期', '工单编号', 'sczl_yjgx')"  @keyup.enter.native="getMachineGxMcsubmit" :clearable="true" placeholder="" />
-					   </el-form-item>
-					 </el-col>
-					 <el-col :span="20">
-					   <!-- <el-form-item label="组别" prop="name"> -->
-						 <el-row :gutter="20">
-						   <el-col :span="5">
-							 <el-input v-model="formData.sczl_yjgx" id="sczl_yjgx"  @keydown="ent($event, '工单编号', 'sczl_yjgx', 'sczl_gxmc')" :clearable="true" placeholder="" />
-						   </el-col>
-							<el-col :span="5">
-							 <el-input v-model="formData.sczl_gxmc" id="sczl_gxmc"  @keydown="ent($event, 'sczl_yjgx', 'sczl_gxmc', 'yj_yjmc')" :clearable="true" placeholder="" />
-							</el-col>  
-							<el-col :span="5">
-							 <el-input v-model="formData.yj_yjmc" id="yj_yjmc"  @keydown="ent($event, 'sczl_gxmc', 'yj_yjmc', '机台编号')" :clearable="true" placeholder="" />
-							</el-col>  					 
-						 </el-row>
-					   <!-- </el-form-item> -->
-					 </el-col>					 
-				   </el-row>
+             <el-form :model="formData" label-position="right" ref="elFormRef" :rules="rule" label-width="70px" >
+			  <el-row :gutter="24">
+				 <el-col :span="4">
+				   <el-form-item label="日期" prop="id" class="mab">
+					 <el-input type="date" max="9999-12-31" v-model="formData.sczl_rq" id="日期"  @keydown="ent1($event, '其他备注', '日期', '组别')"   />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="4">
+				   <el-form-item label="组别" prop="name" label-width="90px" class="mab">
+						 <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent1($event, '日期', '组别', '工单编号')"   />
+				   </el-form-item>
+				 </el-col>
+			   </el-row>  
+				<el-row :gutter="24">
+					<el-col :span="24">
+						  <el-form-item label="工单编号" prop="id" class="mab">
+							<el-input v-model="formData.sczl_gdbh" id="工单编号"  @keydown="ent1($event, '每箱数', '工单编号', 'yjgx')" @blur="getGxMcsubmit" style="width: 118px; margin-right: 5px;"/>
+							<el-input v-model="formData.sczl_yjgx" id="yjgx"  @keydown="ent1($event, '工单编号', 'yjgx', 'gxmc')" style="width: 80px; margin-right: 5px;"/>
+							<el-input v-model="formData.sczl_gxmc" id="gxmc"  @keydown="ent1($event, 'yjgx', 'gxmc', 'yjmc')" style="width: 135px; margin-right: 5px;"/>
+							<el-input v-model="formData.yj_yjmc" id="yjmc"  @keydown="ent1($event, 'gxmc', 'yjmc', '产量合计')" style="width: 542px;"/>
+						  </el-form-item>
+					</el-col>	 
+				</el-row>
 						   
-  
-					<el-row :gutter="20">
-					 <el-col :span="4">
-					   <el-form-item label="机台编号" prop="id">
-						 <el-input v-model="formData.sczl_jtbh" id="机台编号"  @keydown="ent($event, 'yj_yjmc', '机台编号', '检验类型')" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="" />
+					<el-row :gutter="24">
+					 <el-col :span="6">
+					   <el-form-item label="机台编号" prop="id" class="mab">
+						 <el-input v-model="formData.sczl_jtbh" id="机台编号"  @keydown="ent1($event, 'yj_yjmc', '机台编号', '检验类型')" @keyup.enter.native="getJtbhsubmit" style="width: 80px;" />
 					   </el-form-item>
 					 </el-col>
-					 <el-col :span="6">          
-						 <el-row :gutter="20">
-						   <el-col :span="12">
-							<el-form-item label="检验类型" prop="id">
-							 <el-input v-model="formData.sczl_单据类型" id="检验类型"  @keydown="ent($event, '机台编号', '检验类型', '检验类别')" :clearable="true" placeholder="" />
-							</el-form-item>
-						   </el-col>
-						 </el-row>
+					 <el-col :span="6">
+						<el-form-item label="检验类型" prop="id" class="mab">
+						 <el-input v-model="formData.sczl_单据类型" id="检验类型"  @keydown="ent1($event, '机台编号', '检验类型', '检验类别')" style="width: 150px;" />
+						</el-form-item>
 					 </el-col>
-					 <el-col :span="3">
-					   <el-form-item label="检验类别" prop="name">
-						 <el-input v-model="formData.sczl_检验类别" id="检验类别"  @keydown="ent($event, '检验类型', '检验类别', '废品率系数')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+					   <el-form-item label="检验类别" prop="name" class="mab">
+						 <el-input v-model="formData.sczl_检验类别" id="检验类别"  @keydown="ent1($event, '检验类型', '检验类别', '废品率系数')" style="width: 150px;" />
 					   </el-form-item>
 					 </el-col>
-					 <el-col :span="3">
-					   <el-form-item label="废品率系数" prop="name">
-						 <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent($event, '检验类别', '废品率系数', '计件箱数')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+					   <el-form-item label="废品率系数" prop="name" class="mab" label-width="100px">
+						 <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent1($event, '检验类别', '废品率系数', '计件箱数')" style="width: 150px;" />
 					   </el-form-item>
 					 </el-col>
 				   </el-row>
 						   
-					   <el-row :gutter="20">
-					   <el-col :span="4">
-						 <el-form-item label="计件箱数" prop="id">
-						   <el-input v-model="formData.sczl_cl" id="计件箱数"  @keydown="ent($event, '废品率系数', '计件箱数', '每箱数量')" :clearable="true" placeholder="" />
-						 </el-form-item>
-					   </el-col>
-					 <el-col :span="3">
-						 <el-form-item label="每箱数量" prop="name">
-						   <el-input v-model="formData.sczl_PgCl" id="每箱数量"  @keydown="ent($event, '计件箱数', '每箱数量', '定额代号')" :clearable="true" placeholder="" />
+					<el-row :gutter="24">
+					   <el-col :span="6">
+						 <el-form-item label="计件箱数" prop="id" class="mab">
+						   <el-input v-model="formData.sczl_cl" id="计件箱数"  @keydown="ent1($event, '废品率系数', '计件箱数', '每箱数量')" style="width: 118px;"/>
 						 </el-form-item>
 					   </el-col>
-					   <el-col :span="3">
-						 <el-form-item label="定额代号"   prop="name">
-						   <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getMachineDedhsubmit"  id="定额代号"  @keydown="ent($event, '计件箱数', '定额代号', '流程单号')" :clearable="true" placeholder="" />
+					 <el-col :span="6">
+						 <el-form-item label="每箱数量" prop="name" class="mab">
+						   <el-input v-model="formData.sczl_PgCl" id="每箱数量"  @keydown="ent1($event, '计件箱数', '每箱数量', '定额代号')"   />
 						 </el-form-item>
+					   </el-col>
+					   <el-col :span="6">
+							<el-form-item label="定额代号" prop="id" class="mab">
+								<el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent1($event, '产量合计', '定额代号', '检验类别')" @blur="getDedhsubmit" style="width: 150px;" />
+							</el-form-item>
 					   </el-col>
-					 </el-row>
+					</el-row>
 					 
 					 
 					 
-					 <el-row :gutter="1">
-					 			     <el-col :span="4">
-					 			       <el-form-item label="流程单号" prop="id">
-					 			         <el-input v-model="formData.address" id="流程单号"  @keydown="ent($event, '定额代号', '流程单号', '流程单号1')" :clearable="true" placeholder="" />
-					 			       </el-form-item>
-					 			     </el-col>
-					 							 <el-col :span="1">
-					 							   <el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent($event, '流程单号', '流程单号1', '流程单号2')" :clearable="true" placeholder="" />
-					 							 </el-col>
-					 				            <el-col :span="1">
-					 				              <el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent($event, '流程单号1', '流程单号2', '流程单号3')" :clearable="true" placeholder="" />
-					 				            </el-col>
-					 			  				  <el-col :span="1">			  			
-					 			  				    <el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent($event, '流程单号2', '流程单号3', '流程单号4')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 							  
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent($event, '流程单号3', '流程单号4', '流程单号5')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent($event, '流程单号4', '流程单号5', '流程单号6')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent($event, '流程单号5', '流程单号6', '流程单号7')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent($event, '流程单号6', '流程单号7', '流程单号8')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent($event, '流程单号7', '流程单号8', '流程单号9')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 							  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent($event, '流程单号8', '流程单号9', '备注')" :clearable="true" placeholder="" />
-					 			  				  </el-col>
-					 			     <el-col :span="6">          
-					 			         <el-row :gutter="20">
-					 			           <el-col :span="12">
-					 			  						 <el-form-item label="备注" prop="id">
-					 			             <el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent($event, '流程单号9', '备注', '换模补产工时')" :clearable="true" placeholder="" />
-					 			  						 </el-form-item>
-					 			           </el-col>
-					 			         </el-row>
-					 			     </el-col>
-					 			   </el-row>
+					 <el-row :gutter="24">
+						 <el-col :span="17">
+						   <el-form-item label="流程单号" prop="id" class="mab">
+								<!-- <el-input v-model="formData.address" id="流程单号"  @keydown="ent1($event, '定额代号', '流程单号', '流程单号1')" style="width: 60px; margin-right: 5px;"/> -->
+								<el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent1($event, '冲月定额', '流程单号1', '流程单号2')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent1($event, '流程单号1', '流程单号2', '流程单号3')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent1($event, '流程单号2', '流程单号3', '流程单号4')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent1($event, '流程单号3', '流程单号4', '流程单号5')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent1($event, '流程单号4', '流程单号5', '流程单号6')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent1($event, '流程单号5', '流程单号6', '流程单号7')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent1($event, '流程单号6', '流程单号7', '流程单号8')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent1($event, '流程单号7', '流程单号8', '流程单号9')" style="width: 60px; margin-right: 5px;"/>
+								<el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent1($event, '流程单号8', '流程单号9', '备注')" style="width: 60px;"/>
+							</el-form-item>			  			
+						 </el-col>
+						 <el-col :span="7">
+							<el-form-item label="备注" prop="id" class="mab" label-width="50px">
+								<el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent1($event, '流程单号9', '备注', 'bh1')"   />
+							</el-form-item>
+						 </el-col>
+					   </el-row>
 								   
 								   
-				<el-row :gutter="20">
-							     <el-col :span="4">
-							       <el-form-item label="换模补产工时" prop="id">
-							         <el-input v-model="formData.sczl_装版工时" id="换模补产工时"  @keydown="ent($event, '备注', '换模补产工时', '设备保养工时')" :clearable="true" placeholder="" />
-							       </el-form-item>
-							     </el-col>
-							     <el-col :span="6">          
-							         <el-row :gutter="20">
-							           <el-col :span="12">
-							  						<el-form-item label="设备保养工时" prop="id">
-							             <el-input v-model="formData.sczl_保养工时" id="设备保养工时"  @keydown="ent($event, '换模补产工时', '设备保养工时', '异常停机')" :clearable="true" placeholder="" />
-							  						</el-form-item>
-							           </el-col>
-							         </el-row>
-							     </el-col>
-							     <el-col :span="3">
-							       <el-form-item label="异常停机" prop="name">
-							         <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '设备保养工时', '异常停机', '设备通电工时')" :clearable="true" placeholder="" />
-							       </el-form-item>
-							     </el-col>
-								 <el-col :span="3">
-								   <el-form-item label="设备通电工时" prop="name">
-									 <el-input v-model="formData.sczl_设备运行工时" id="设备通电工时"  @keydown="ent($event, '异常停机', '设备通电工时', 'sczl_bh1')" :clearable="true" placeholder="" />
-								   </el-form-item>
-								 </el-col>
-							   </el-row>				   
-						   
-				             <el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span>组员信息</span>
-								 </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh1"id="sczl_bh1"  @keydown="ent($event, '异常停机', 'sczl_bh1', 'sczl_bh2')" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh2" id="sczl_bh2"  @keydown="ent($event, 'sczl_bh1', 'sczl_bh2', 'sczl_bh3')" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh3" id="sczl_bh3"  @keydown="ent($event, 'sczl_bh2', 'sczl_bh3', 'sczl_bh4')" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh4" id="sczl_bh4"  @keydown="ent($event, 'sczl_bh3', 'sczl_bh4', 'sczl_bh5')" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
-				                </el-col>
-				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh5" id="sczl_bh5"  @keydown="ent($event, 'sczl_bh4', 'sczl_bh5', 'sczl_bh6')" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
-				                </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6" id="sczl_bh6"  @keydown="ent($event, 'sczl_bh5', 'sczl_bh6', 'sczl_bh7')" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7" id="sczl_bh7"  @keydown="ent($event, 'sczl_bh6', 'sczl_bh7', 'sczl_bh8')" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8" id="sczl_bh8"  @keydown="ent($event, 'sczl_bh7', 'sczl_bh8', 'name1')" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
-								</el-col>
-				              </el-row>
-										 
-				<el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span></span>
-								 </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent($event, 'sczl_bh8', 'name1', 'name2')"  :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')"  :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')" :clearable="true" placeholder="" />
-							    </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6_name" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent($event, 'name7', 'name8', 'NumDesc1')" :clearable="true" placeholder="" />
-								</el-col>
-							  </el-row>
-													   
-													   
-				<el-row :gutter="10" style="margin-top: 10px;">
-								 <el-col :span="2">
-								   <span></span>
-								 </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc1"  @keydown="ent($event, 'name8', 'NumDesc1', 'NumDesc2')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc2"  @keydown="ent($event, 'NumDesc1', 'NumDesc2', 'NumDesc3')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc3"  @keydown="ent($event, 'NumDesc2', 'NumDesc3', 'NumDesc4')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc4"  @keydown="ent($event, 'NumDesc3', 'NumDesc4', 'NumDesc5')" :clearable="true" placeholder="" />
-							    </el-col>
-							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc5"  @keydown="ent($event, 'NumDesc4', 'NumDesc5', 'NumDesc6')" :clearable="true" placeholder="" />
-							    </el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc6"  @keydown="ent($event, 'NumDesc5', 'NumDesc6', 'NumDesc7')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc7"  @keydown="ent($event, 'NumDesc6', 'NumDesc7', 'NumDesc8')" :clearable="true" placeholder="" />
-								</el-col>
-								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc8"  @keydown="ent($event, 'NumDesc7', 'NumDesc8', '其他备注')" :clearable="true" placeholder="" />
-								</el-col>
-							  </el-row>
-																	 
-																	 
-				<el-row :gutter="20">
-			   <el-col :span="20">
+				<el-row :gutter="24">
+					 <el-col :span="6">
+					   <el-form-item label="换模补产工时" prop="id" class="mab" label-width="96px">
+						 <el-input v-model="formData.sczl_装版工时" id="换模补产工时"  @keydown="ent1($event, '备注', '换模补产工时', '设备保养工时')"   />
+					   </el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+						<el-form-item label="设备保养工时" prop="id" class="mab" label-width="100px">
+							<el-input v-model="formData.sczl_保养工时" id="设备保养工时"  @keydown="ent1($event, '换模补产工时', '设备保养工时', '异常停机')"   />
+						</el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+					   <el-form-item label="异常停机" prop="name" class="mab" >
+						 <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent1($event, '设备保养工时', '异常停机', '设备通电工时')"   />
+					   </el-form-item>
+					 </el-col>
+					 <el-col :span="6">
+					   <el-form-item label="设备通电工时" prop="name" class="mab" label-width="100px">
+						 <el-input v-model="formData.sczl_设备运行工时" id="设备通电工时"  @keydown="ent1($event, '异常停机', '设备通电工时', 'sczl_bh1')"   />
+					   </el-form-item>
+					 </el-col>
+				</el-row>				   
+						   
+				<el-row :gutter="24" class="mab" >
+					<el-col :span="2"><span>组员信息</span></el-col>
+					<div v-for="index in 8" :key="index">
+					  <div style="width: 50px;margin-right: 50px;">
+						<el-input style="width: 90px; margin-right: 5px; margin-bottom: 5px;" v-model="formData['sczl_bh' + index]" :id="'bh' + index" @keydown="ent1($event, index.toString())" />
+						<el-input style="width: 90px; margin-right: 5px; margin-bottom: 5px; color: red;" :readonly="true" :value="formData['sczl_bh' + index + '_name']" :id="'name' + index" @keydown="ent1($event)"/>
+						<el-input style="width: 90px; margin-right: 5px;" v-model="formData['sczl_rate' + index]" :id="'rate' + index" @keydown="ent1($event)"/>
+					  </div>
+					</div>
+				</el-row>	
+																 
+				<el-row :gutter="24">
+			   <el-col :span="24">
 			     <el-form-item label="其他备注" prop="id">
-			       <el-input v-model="formData.流程单号" id="其他备注"  @keydown="ent($event, 'NumDesc8', '其他备注', '日期')" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_desc" id="其他备注"  @keydown="ent1($event, 'NumDesc8', '其他备注', '日期')"   />
 			     </el-form-item>
 			   </el-col>
 			 </el-row>													 
@@ -468,7 +320,7 @@ import {
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
-import { ref, reactive, onMounted, onBeforeMount } from 'vue'
+import { ref, reactive, nextTick, onMounted, onBeforeMount } from 'vue'
 import { getPackingSideTable, getPackingTable } from '@/api/mes_api_gty/myapi'
 import { login } from '@/api/user'
 import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
@@ -519,15 +371,7 @@ const formData = ref({
           sczl_设备运行工时: '',
           sczl_废品率系数: '',
           sczl_检验类别: '',
-          sczl_bh1: '',
-          sczl_bh2: '',
-          sczl_bh3: '',
-          sczl_bh4: '',
-          sczl_bh5: '',
-          sczl_bh6: '',
-          sczl_bh7: '',
-          sczl_bh8: '',
-          流程单号 :'',
+          流程单号1 :'',
           流程单号2: '',
           流程单号3: '',
           流程单号4: '',
@@ -537,7 +381,14 @@ const formData = ref({
           流程单号8: '',
           流程单号9:'',
           qczl_NumDesc:'',
-          sczl_desc:'',                                           
+		  sczl_bh1: '',
+		  sczl_bh2: '',
+		  sczl_bh3: '',
+		  sczl_bh4: '',
+		  sczl_bh5: '',
+		  sczl_bh6: '',
+		  sczl_bh7: '',
+		  sczl_bh8: '',
           sczl_bh1_name:'',
           sczl_bh2_name:'',
           sczl_bh3_name: '',
@@ -545,7 +396,16 @@ const formData = ref({
           sczl_bh5_name: '',
           sczl_bh6_name: '',
           sczl_bh7_name: '',
-          sczl_bh8_name: '',
+          sczl_bh8_name: '',
+		  sczl_rate1: '',
+		  sczl_rate2: '',
+		  sczl_rate3: '',
+		  sczl_rate4: '',
+		  sczl_rate5: '',
+		  sczl_rate6: '',
+		  sczl_rate7: '',
+		  sczl_rate8: '',
+          sczl_desc:'',
           yj_yjmc: '',
 })
 
@@ -671,7 +531,105 @@ const GetMachineInfo = async (value) => {
   if (response.code === 0) {
 	formData.value=response.data;
   }
-}
+}
+
+//键盘 input框跳转
+const ent1 = (event) => {
+  const inputs = document.getElementsByTagName('input');
+  const currentIndex = Array.from(inputs).indexOf(event.target);
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+	  if(event.target.id=='其他备注'){
+		  ElMessageBox.confirm('数据存盘?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				  }).then(() => {
+					enterDialog()
+				})
+	  }
+    for (let i = currentIndex + 1; i < inputs.length; i++) {
+      if (!inputs[i].readOnly) {
+		  nextTick(()=>{
+			  inputs[i].focus();
+			  inputs[i].select();
+		  })
+        break;
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  } else if (event.keyCode === 38) { // 向上箭头
+    for (let i = currentIndex - 1; i >= 0; i--) {
+      if (!inputs[i].readOnly) {
+        nextTick(()=>{
+        	inputs[i].focus();
+			inputs[i].select();
+        })
+        break;
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  } else if (event.keyCode === 8) { // 删除箭头
+    if (event.target.selectionStart === 0) {
+      for (let i = currentIndex - 1; i >= 0; i--) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].setSelectionRange(0, 0);
+          })
+          break;
+        }
+      }
+	  if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+	  	ent_sum()
+	  }
+    }
+  } else if (event.keyCode === 37) { // 向左箭头
+    if (event.target.selectionStart === 0) {
+      for (let i = currentIndex - 1; i >= 0; i--) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].select();
+          })
+          break;
+        }
+      }
+	  if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+	  	ent_sum()
+	  }
+    }
+  } else if (event.keyCode === 39) { // 向右箭头
+	  if(event.target.id=='其他备注'){
+		  ElMessageBox.confirm('数据存盘?', '提示', {
+					confirmButtonText: '确定',
+					cancelButtonText: '取消',
+					type: 'warning'
+				  }).then(() => {
+					enterDialog()
+				})
+	  }
+    if (event.target.selectionStart === event.target.value.length) {
+      for (let i = currentIndex + 1; i < inputs.length; i++) {
+        if (!inputs[i].readOnly) {
+          nextTick(()=>{
+          	inputs[i].focus();
+			inputs[i].select();
+          })
+          break;
+        }
+      }
+    }
+	if(event.target.id.substring(0, 2)=='cl' || event.target.id.substring(0, 2)=='fp'){
+		ent_sum()
+	}
+  }
+}
+
+
 //获取员工信息
 const GetYg = async (value,inputName) => {
   const response = await getYg({sczl_bh:value});
@@ -864,17 +822,17 @@ const updateDetailData = async() => {
 	sczl_废品率系数: formData.value.sczl_废品率系数,
 	sczl_cl: formData.value.sczl_cl,
 	sczl_PgCl: formData.value.sczl_PgCl,
-	sczl_dedh: formData.value.sczl_desc,
-	qczl_Num: formData.value.qczl_NumDesc,
-	qczl_NumDesc1: formData.value.流程单号1,
-	qczl_NumDesc2: formData.value.流程单号2,
-	qczl_NumDesc3: formData.value.流程单号3,
-	qczl_NumDesc4: formData.value.流程单号4,
-	qczl_NumDesc5: formData.value.流程单号5,
-	qczl_NumDesc6: formData.value.流程单号6,
-	qczl_NumDesc7: formData.value.流程单号7,
-	qczl_NumDesc8: formData.value.流程单号8,
-	qczl_NumDesc: formData.value.流程单号9,
+	sczl_dedh: formData.value.sczl_dedh,
+	qczl_Num: formData.value.流程单号1,
+	qczl_NumDesc1: formData.value.流程单号2,
+	qczl_NumDesc2: formData.value.流程单号3,
+	qczl_NumDesc3: formData.value.流程单号4,
+	qczl_NumDesc4: formData.value.流程单号5,
+	qczl_NumDesc5: formData.value.流程单号6,
+	qczl_NumDesc6: formData.value.流程单号7,
+	qczl_NumDesc7: formData.value.流程单号8,
+	qczl_NumDesc8: formData.value.流程单号9,
+	qczl_NumDesc: formData.value.qczl_NumDesc,
 	sczl_装版工时: formData.value.sczl_装版工时,
 	sczl_保养工时: formData.value.sczl_保养工时,
 	sczl_异常停机工时: formData.value.sczl_异常停机工时,
@@ -886,7 +844,15 @@ const updateDetailData = async() => {
 	sczl_bh5: formData.value.sczl_bh5,
 	sczl_bh6: formData.value.sczl_bh6,
 	sczl_bh7: formData.value.sczl_bh7,
-	sczl_bh8: formData.value.sczl_bh8,
+	sczl_bh8: formData.value.sczl_bh8,
+	sczl_rate1: formData.value.sczl_rate1,
+	sczl_rate2: formData.value.sczl_rate2,
+	sczl_rate3: formData.value.sczl_rate3,
+	sczl_rate4: formData.value.sczl_rate4,
+	sczl_rate5: formData.value.sczl_rate5,
+	sczl_rate6: formData.value.sczl_rate6,
+	sczl_rate7: formData.value.sczl_rate7,
+	sczl_rate8: formData.value.sczl_rate8,
 	sczl_desc: formData.value.sczl_desc,
 	sys_id:'[1008/姜剑娟]',
   }
@@ -983,9 +949,11 @@ function onRefresh() {
 const ADD=ref('0')
 //新增
 function onAdd() {
-	GetMachineInfo(lastCellValue)
-	ADD.value='新增'
-	console.log(ADD.value)
+	ADD.value='新增'
+	type.value = 'create'
+	if(typeof(lastCellValue)=='number'){
+		GetMachineInfo(lastCellValue)
+	}
 	dialogFormVisible.value = true
 	// Productionadd()
 }
@@ -1263,4 +1231,30 @@ onMounted(async () => {
   background: #ff80ff !important;
   /* 背景颜色 */
 }
+</style>
+<style scoped>
+:deep(.el-table td .cell) {
+  line-height: 20px !important;
+}
+:deep(.el-tabs__header){
+  margin-bottom: 0;
+}
+.search{
+  margin-left: 0px !important;
+  margin-right: 10px !important;
+}
+.bt{
+  margin-left: 2px !important;
+  padding: 3px !important;
+  font-size: 12px;
+}
+.el-tabs__header{
+  margin: 0px !important;
+}
+.gva-table-box{
+  padding: 0px !important;
+}
+.mab{
+  margin-bottom: 5px;
+}
 </style>

src/view/performance/Manualdocuments.vue

@@ -38,8 +38,8 @@
               <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" style="width: 180px;" />
               <el-button type="primary" class="search" icon="search" @click="onSearch"></el-button>
 			  <el-button type="primary" class="bt" icon="plus" @click="onAdd">新增</el-button>
-			  <el-button type="primary" class="bt" icon="refresh"  @click="onRefresh">刷新质检系数</el-button>
-			  <el-button type="primary" class="bt" icon="thumb"  @click="onCountByGdbh">切换显示方式</el-button>
+			  <el-button type="primary" class="bt" icon="copy-document"  @click="onCountByGdbh">切换显示方式</el-button>
+              <el-button type="primary" class="bt" icon="refresh"  @click="onRefresh">刷新质检系数</el-button>
               <el-button type="primary" class="bt" icon="delete" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -50,21 +50,21 @@
               highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
-              <el-table-column align="left" label="工单印件" prop="combinedProp" width="340"/>
-              <el-table-column align="left" label="印件工序" prop="combinedProp2" width="340"/>
-              <el-table-column align="left" label="日期" prop="sczl_rq" width="120" />
-              <el-table-column align="left" label="产量" prop="sczl_cl" width="120" />
-              <el-table-column align="left" label="千件工价" prop="千件工价" width="120" />
-              <el-table-column align="left" label="检验类别" prop="sczl_检验类别" width="120" />
-              <el-table-column align="left" label="废品率系数" prop="sczl_废品率系数" width="120" />
-              <el-table-column align="left" label="日定额" prop="日定额" width="120" />
-              <el-table-column align="left" label="组长编号" prop="sczl_bh0" width="120" />
-			  <el-table-column align="left" label="组长姓名" prop="员工姓名" width="120" />
-			  <el-table-column align="left" label="流程单备注" prop="qczl_NumDesc" width="120" />
-			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
-              <el-table-column align="left" label="创建时间" prop="sys_rq" width="160" />
-              <el-table-column align="left" label="修改时间" prop="mod_rq" width="160" />
-              <el-table-column align="left" label="UNIQID" prop="UniqId" width="120" />
+              <el-table-column align="left" sortable label="工单印件" prop="combinedProp" width="340"/>
+              <el-table-column align="left" sortable label="印件工序" prop="combinedProp2" width="150"/>
+              <el-table-column align="left" sortable label="日期" prop="sczl_rq" width="120" />
+              <el-table-column align="left" sortable label="产量" prop="sczl_cl" width="77" />
+              <el-table-column align="left" sortable label="千件工价" prop="千件工价" width="105" />
+              <el-table-column align="left" sortable label="检验类别" prop="sczl_检验类别" width="105" />
+              <el-table-column align="left" sortable label="废品率系数" prop="sczl_废品率系数" width="120" />
+              <el-table-column align="left" sortable label="日定额" prop="日定额" width="91" />
+              <el-table-column align="left" sortable label="组长编号" prop="sczl_bh0" width="105" />
+			  <el-table-column align="left" sortable label="组长姓名" prop="员工姓名" width="105" />
+			  <el-table-column align="left" sortable label="流程单备注" prop="qczl_NumDesc" width="120" />
+			  <el-table-column align="left" sortable label="创建用户" prop="sys_id" width="120" />
+              <el-table-column align="left" sortable label="创建时间" prop="sys_rq" width="160" />
+              <el-table-column align="left" sortable label="修改时间" prop="mod_rq" width="160" />
+              <el-table-column align="left" sortable label="UNIQID" prop="UniqId" width="120" />
             </el-table>
             <!-- 分页 -->
             <div class="gva-pagination">

src/view/performance/Packagingoutput.vue

@@ -63,7 +63,8 @@
 				  :key="column.prop"
 				  :prop="column.prop"
 				  :label="column.label"
-				  :width="column.width"
+				  :width="column.width"
+				  sortable
 				  show-overflow-tooltip="true"
 				/>
             </el-table>
@@ -93,23 +94,15 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-
-
-								<el-table
-                               :data="detailData.table"
-                               border
-                               tooltip-effect="dark"
-                               :row-style="{ height: '20px' }"
-                               :cell-style="{ padding: '0px' }"
-                               :header-row-style="{ height: '20px' }"
-                               :header-cell-style="{ padding: '0px' }"
-                             >
-                               <el-table-column
-                                 label="工单编号"
-                                 width="100"
-                               >
-                                 <template #default="{ row, $index }">
-                                   <el-input
+				<el-table :data="detailData.table" border
+                    tooltip-effect="dark" :row-style="{ height: '20px' }"
+                    :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+                    :header-cell-style="{ padding: '0px' }"
+					>
+					
+                    <el-table-column label="工单编号" width="100" >
+                    <template #default="{ row, $index }">
+						<el-input
                                      v-model="row.sczl_gdbh"
 									 id="工单编号"  @keydown="ent($event, '零头', '工单编号', '印件工序')"
                                      @keyup.enter="handleEnter($index, row)"
@@ -552,13 +545,13 @@ const tableData = reactive([])
 const GxMctableData = reactive([])
 
 const tableColumns = [
-  { label: '创建用户', prop: 'sys_id', width: '240' },
+  { label: '创建用户', prop: 'sys_id', width: '120' },
   { label: '日期', prop: 'sczl_rq', width: '100' },
-  { label: '包装产量', prop: 'sczl_cl', width: '100' },
-  { label: '包装数量', prop: 'sczl_PgCl', width: '100' },
-  { label: '创建时间', prop: 'sys_rq', width: '180' },
-  { label: '修改时间', prop: 'mod_rq', width: '180' },
-  { label: 'UNIQID', prop: 'UniqId', width: '100' },
+  { label: '包装产量', prop: 'sczl_cl', width: '105' },
+  { label: '包装数量', prop: 'sczl_PgCl', width: '105' },
+  { label: '创建时间', prop: 'sys_rq', width: '160' },
+  { label: '修改时间', prop: 'mod_rq', width: '160' },
+  { label: 'UNIQID', prop: 'UniqId', width: '120' },
 ]
 
 const detailData = reactive([])

src/view/performance/chejianbaogong.vue

@@ -12,6 +12,7 @@
 			<el-button type="primary" @click="onstatus" >设置机台状态</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 			<el-button type="primary" @click="onClear" >换型清场</el-button>
+			<el-button type="primary" @click="oncomplaints" >客诉记录</el-button>
 			
 			
 			
@@ -313,7 +314,7 @@
           </el-tabs>
           </el-dialog>
 
-          <el-dialog v-model="detailShow" style="width: 1000px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 140vh" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
                         :row-style="{ height: '20px' }"
                         :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
@@ -361,7 +362,7 @@
 			 </el-col>
 			</el-row> 	
 			<div style="display: flex;">
-			<div class="groupbox float-div" style="height: 17vh; width: 800px;">
+			<div class="groupbox float-div" style="height: 17vh; width: 130vh;">
 			    <span class="grouptitle">组员及分配比例</span>
 				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
 								 <el-col :span="2">
@@ -558,10 +559,10 @@
 			  				</el-col> -->
 			  </el-row>
 			</div>
-			<div style="height: 17vh; width: 100px;margin-top: 30px;">
+			<div style="height: 17vh; width: 15vh;margin-top: 5vh;">
 				<el-button type="text"></el-button>
 				<!-- <el-button style="margin-bottom: 5px;" @click="" >新增</el-button> -->
-				<el-button style="margin-bottom: 5px;" @click="selectBz" >更新当前班组</el-button>
+				<el-button style="margin-bottom: 1vh;" @click="selectBz" >更新当前班组</el-button>
 				<!-- <el-button @click="delBz" >删除当前班组</el-button> -->
 			</div>
 			</div>
@@ -570,13 +571,115 @@
 
         
 		
+		<el-dialog v-model="complaintsShow" style="width: 140vh; height:78vh;" lock-scroll :before-close="closecomplaintsShow" title="产品客诉查询" destroy-on-close>
+		  <el-table ref="multipleTable"
+		           :row-style="{ height: '20px' }"
+		           :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+		           :header-cell-style="{ padding: '0px' }"
+		           :show-overflow-tooltip="true"
+		           highlight-current-row="true" @row-click="complaintshandle"
+		           style="width: 100%;height: 30vh;margin-top: 0px;" border tooltip-effect="dark" 
+				  :data="complaintsData" row-key="ID" @selection-change="complaintsSelectionChange">
+		    <!-- <el-table-column type="selection" width="55" /> -->
+		    <el-table-column align="left" label="产品编号" prop="产品编号" width="120"/>
+		    <el-table-column align="left" label="产品名称" prop="产品名称" width="200"/>
+		    <el-table-column align="left" label="客诉日期" prop="客诉日期" width="120"/>
+		    <el-table-column align="left" label="客诉单号" prop="客诉单号" width="120"/>
+			<el-table-column align="left" label="客诉方式" prop="客诉方式" width="100"/>
+		    <el-table-column align="left" label="订单编号" prop="订单编号" width="100"/>
+		    <el-table-column align="left" label="缺陷关键字" prop="缺陷关键字" width="140"/>
+		    <el-table-column align="left" label="客诉性质" prop="客诉性质" width="100"/>
+		    <el-table-column align="left" label="主要责任部门" prop="主要责任部门" width="140"/>
+		    <el-table-column align="left" label="次要责任部门" prop="次要责任部门" width="140"/>
+		  </el-table>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户编号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客户编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="15" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客户名称" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客户名称" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>	
+					
+					 
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="6" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉单号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉单号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="客诉日期" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.客诉日期" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="方式" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.客诉方式" style="margin-bottom: 1px;margin-top: 0px;" :clearable="true" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="批次号" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				 	<el-input v-model="selectedRowData.订单编号" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>		
+				
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="反馈问题" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉描述" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="缺陷关键字" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.缺陷关键字" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="性质" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.客诉性质" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>
+				 <el-col :span="5" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="扣分" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+					<el-input v-model="selectedRowData.扣分" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />			 
+				   </el-form-item>
+				 </el-col>
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="主责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.主要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+				<el-row :gutter="20" style="margin-bottom: 1px;margin-top: 0px;">
+				 <el-col :span="20" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-form-item label="次责任部门" prop="id" style="margin-bottom: 1px;margin-top: 0px;">
+				   <el-input v-model="selectedRowData.次要责任部门" :clearable="true" style="margin-bottom: 1px;margin-top: 0px;" placeholder="" />
+				   </el-form-item>
+				 </el-col>				 
+				</el-row>
+		</el-dialog>
 		
 		<el-dialog
 		  v-model="dianjianVisible"
 		  title="设备点检记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-bottom: 0px;margin-top: 0px;">
 		    <el-col :span="4" style="margin-bottom: 0px;margin-top: 0px;">
@@ -595,7 +698,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;margin-top: 0px;">
-		      <el-aside width="180px" style="margin: 0; margin-top: 0px;">
+		      <el-aside width="25vh" style="margin: 0; height: 50vh; margin-top: 0px;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="dianjiantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="dianjianNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -610,7 +713,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:100%; height:320px; margin-top: 5px;"
+		        style="width:100%; height:45vh; margin-top: 5px;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -657,7 +760,7 @@
 		      </el-table>
 			  <el-row :gutter="24">
 			    <el-col :span="24">			      
-			        <el-input v-model="pandingfangfa"  style="height: 50px;" :clearable="true"  />			      
+			        <el-input v-model="pandingfangfa" style="margin-top=0px; height: 40px; margin-bottom: 0px;" :clearable="true"  />			      
 			    </el-col>
 			  </el-row>
 		    </div>
@@ -674,8 +777,8 @@
 		  v-model="zhichengVisible"
 		  title="制程检验记录"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="150vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -716,7 +819,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="25vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="zhichengtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="zhichengNodeClick"></el-tree>
@@ -733,7 +836,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:310px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -791,7 +894,7 @@
 		            highlight-current-row="true"
 		          				:show-overflow-tooltip="true"
 		            border  @row-click="dianjianhandle"
-		            style="width:100%; height:320px;"
+		            style="width:100%; height:40vh;"
 		            @row-dblclick="handleSelectClick"
 		            :row-class-name="rowClassName"
 		          >
@@ -829,12 +932,12 @@
 		  v-model="huanxingVisible"
 		  title="换型清场"
 		  destroy-on-close
-		  width="1100px"
-		  style="height: 78%;"
+		  width="145vh"
+		  style="height: 78vh;"
 		>
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="180px" style="margin: 0;">
+		      <el-aside width="26vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 55vh; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="huanxingtreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="huanxingNodeClick"></el-tree>
@@ -998,7 +1101,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 1;">
-		      <el-aside width="250px" style="margin: 0;">
+		      <el-aside width="34vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="yinbantreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="yinbanNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1013,7 +1116,7 @@
 		        highlight-current-row="true"
 				:show-overflow-tooltip="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:1000px; height:400px;"
+		        style="width:140vh; height:50vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 		      >
@@ -1096,8 +1199,8 @@
 		  v-model="xunchaVisible"
 		  title="管理人员现场巡查记录"
 		  destroy-on-close
-		  width="1200px"
-		  style="height: 78%;"
+		  width="162vh"
+		  style="height: 78vh;"
 		>
 		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
 		    <el-col :span="4" style="margin-top=0px; margin-bottom: 0px;">
@@ -1159,7 +1262,7 @@
 		
 		  <div style="display: flex;">
 		    <div style="flex: 0.1;">
-		      <el-aside width="150px" style="margin: 0;">
+		      <el-aside width="20vh" style="margin: 0;">
 		        <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
 		          <el-tree :data="xunchatreeData" :props="defaultProps" highlight-current="true"
 		            @node-click="xunchaNodeClick" @node-dblclick="handleNodeDoubleClick"></el-tree>
@@ -1173,7 +1276,7 @@
 		        row-key="ID"
 		        highlight-current-row="true"
 		        border  @row-click="dianjianhandle"
-		        style="width:70%; height:330px;"
+		        style="width:138vh; height:42vh;"
 		        @row-dblclick="handleSelectClick"
 		        :row-class-name="rowClassName"
 				:show-overflow-tooltip="true"
@@ -1255,179 +1358,176 @@
 		  v-model="chanliangVisible"
 		  title="日产量上报"
 		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
+		  width="160vh"
+		  style="height: 110vh;"
 		>
-		  <el-row :gutter="20">
-		        <el-row :gutter="20">
-		          <el-col :span="15">
-		          <el-form-item label="工单编号" prop="id">
-		            <el-input v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
+		  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+		          <el-form-item label="工单编号" prop="id" style="margin-top=0px; margin-bottom: 0px;">
+		            <el-input style="margin-top=0px; margin-bottom: 1px;" v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
 		          </el-form-item>
 		          </el-col>
-		        </el-row>
 
-			  <el-col :span="8">
-			  <el-form-item label="产品名称" prop="id">
-			    <el-input v-model="formData3.product_name" id="产品名称"  @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="产品名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.product_name" id="产品名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			  <el-form-item label="工序名称" prop="id">
-			    <el-input v-model="formData3.gxmc" id="工序名称"  @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
+			  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+			  <el-form-item label="工序名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-input v-model="formData3.gxmc" id="工序名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
-			  <el-col :span="8">
-			    <el-row :gutter="20">
-			      
-			    </el-row>
-			  </el-col>
+			  
 		    </el-row>
 			
-			<el-row :gutter="20">
-			      <el-row :gutter="20">
-			        <el-col :span="15">
-			        <el-form-item label="印件号" prop="id">
-			          <el-input v-model="formData3.yjno" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-form-item label="印件号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-input v-model="formData3.yjno" style="margin-top=0px; margin-bottom: 1px;" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
-			      </el-row>
 			
-				  <el-col :span="8">
-				  <el-form-item label="印件名称" prop="id">
-					<el-input v-model="formData3.yj_name" id="印件名称"  @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
+				  <el-col :span="10" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="印件名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.yj_name" id="印件名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="8">
-				  <el-form-item label="工艺名称" prop="id">
-					<el-input v-model="formData3.gy_name" id="工艺名称"  @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
+				  <el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="工艺名称" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.gy_name" id="工艺名称" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="2">
-				  <el-form-item label="" prop="id">
-				    <el-input v-model="formData3.gxh" id="gxh"  @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
+				  <el-col :span="2" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				    <el-input v-model="formData3.gxh" id="gxh" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>						  
 			  </el-row>
 			  
 			  
 			  
-			  <el-row :gutter="20">
-			        <el-row :gutter="20">
-			          <el-col :span="15">
-			          <el-form-item label="日期" prop="id">
-			            <el-input v-model="formData3.日期" id="日期"  @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
+			  <el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+				  </el-col>
+			          <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			          <el-form-item label="日期" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			            <el-input v-model="formData3.日期" id="日期" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
 			          </el-form-item>
 			          </el-col>
-			        </el-row>
 			  
-			  	  <el-col :span="5">
-			  	  <el-form-item label="流程标牌" prop="id">
-			  		<el-input v-model="formData3.流程标牌" id="流程标牌"  @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="流程标牌" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.流程标牌" id="流程标牌" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="上机时间" prop="id">
-			  		<el-input v-model="formData3.上机时间" id="上机时间"  @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="上机时间" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.上机时间" id="上机时间" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
-			  	  <el-col :span="5">
-			  	  <el-form-item label="下机时间" prop="">
-			  	    <el-input v-model="formData3.下机时间"  id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
+			  	  <el-col :span="5" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="下机时间" prop="" style="margin-top=0px; margin-bottom: 1px;">
+			  	    <el-input v-model="formData3.下机时间" style="margin-top=0px; margin-bottom: 1px;" id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
-			  	  </el-col>						  
+			  	  </el-col>	
+				 <el-col :span="3">
+			     </el-col>
 			    </el-row>
 		    
 			
 			
-			<el-row :gutter="20">
-			      
-			    <el-col :span="3">
-			    <el-form-item label="产量" prop="id">
-			      <el-input v-model="formData3.产量" id="产量"  @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
+			<el-row :gutter="24" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-col :span="1" style="margin-top=0px; margin-bottom: 1px;">
+			    </el-col>
+			    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			    <el-form-item label="产量" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-input v-model="formData3.产量" id="产量" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
 			    </el-form-item>
 			    </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程废品" prop="id">
-					<el-input v-model="formData3.制程废品" id="制程废品"  @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
+				  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程废品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程废品" id="制程废品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="制程次品" prop="id">
-					<el-input v-model="formData3.制程次品" id="制程次品"  @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
+				  <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="制程次品" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+					<el-input v-model="formData3.制程次品" id="制程次品" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
-				  <el-col :span="3">
-				  <el-form-item label="前工序废" prop="">
-				    <el-input v-model="formData3.前工序废" id="前工序废"  @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
+				  <el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-form-item label="前工序废" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				    <el-input v-model="formData3.前工序废" id="前工序废" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>	
-				<el-col :span="3">
-				<el-form-item label="来料异常" prop="">
-				  <el-input v-model="formData3.来料异常" id="来料异常"  @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="来料异常" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.来料异常" id="来料异常" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="联数" prop="">
-				  <el-input v-model="formData3.联数" id="联数"  @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="联数" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.联数" id="联数" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
-				<el-col :span="3">
-				<el-form-item label="墨色" prop="">
-				  <el-input v-model="formData3.墨色" id="墨色"  @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
+				<el-col :span="3" style="margin-top=0px; margin-bottom: 1px;">
+				<el-form-item label="墨色" prop="" style="margin-top=0px; margin-bottom: 1px;">
+				  <el-input v-model="formData3.墨色" id="墨色" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 			  </el-row>
 			  
 			  
-			  <el-row :gutter="20">			        
-			      <el-col :span="3">
-			      <el-form-item label="装版总时长" prop="id">
-			        <el-input v-model="formData3.装版总时长" id="装版总时长"  @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
+			  <el-row :gutter="20" style="margin-top=0px; margin-bottom: 1px;">			        
+			      <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			      <el-form-item label="装版总时长" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			        <el-input v-model="formData3.装版总时长" id="装版总时长" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
 			      </el-form-item>
 			      </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="打样总工时" prop="id">
-			  		<el-input v-model="formData3.打样总工时" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="打样总工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.打样总工时" style="margin-top=0px; margin-bottom: 1px;" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
-			  	  <el-col :span="3">
-			  	  <el-form-item label="通电工时" prop="id">
-			  		<el-input v-model="formData3.通电工时" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
+			  	  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+			  	  <el-form-item label="通电工时" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+			  		<el-input v-model="formData3.通电工时" style="margin-top=0px; margin-bottom: 1px;" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			    </el-row>
 				
 				
-				<el-row :gutter="20">      
-				    <el-col :span="3">
-				    <el-form-item label="定额代号" prop="id">
-				      <el-input v-model="formData3.定额代号" id="定额代号"  @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
+				<el-row :gutter="20" style="margin-top=0px; margin-bottom: 1vh;">      
+				    <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;"> 
+				    <el-form-item label="定额代号" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+				      <el-input v-model="formData3.定额代号" id="定额代号" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
 				    </el-form-item>
 				    </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="码包" prop="id">
-						<el-input v-model="formData3.码包" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
+					<el-col :span="8" style="margin-top=0px; margin-bottom: 1px;">
+					</el-col>
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="码包" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.码包" style="margin-top=0px; margin-bottom: 1px;" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
 					  </el-form-item>
 					  </el-col>
-					  <el-col :span="3">
-					  <el-form-item label="主电表" prop="id">
-						<el-input v-model="formData3.主电表"  id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="主电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.主电表" style="margin-top=0px; margin-bottom: 1px;" id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>					  
-					  <el-col :span="3">
-					  <el-form-item label="辅电表" prop="id">
-						<el-input v-model="formData3.辅电表" id="辅电表"  @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
+					  <el-col :span="4" style="margin-top=0px; margin-bottom: 1px;">
+					  <el-form-item label="辅电表" prop="id" style="margin-top=0px; margin-bottom: 1px;">
+						<el-input v-model="formData3.辅电表" id="辅电表" style="margin-top=0px; margin-bottom: 1px;" @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>
 				  </el-row>
 		  <div style="display: flex;">
-			  <div style="width: 136vh;">组员及分配比例</div>
-			  <div style="width: 15vh;">特殊组员</div>
+			  <div style="width: 131vh;">组员及分配比例</div>
+			  <div style="width: 13vh;">特殊组员</div>
 			  <div>拉料人员</div>
 		  </div>
-		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  <el-row :gutter="10" style="margin-top: 1vh;">
+		  	 <el-col :span="2">
 		  	   <el-input v-model="formData3.sczl_bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" :clearable="true" placeholder="ZI00401" />
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1468,7 +1568,7 @@
 		   
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1507,7 +1607,7 @@
 		   </el-row>
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
-		  	 <el-col :span="1">
+		  	 <el-col :span="2">
 		  	   
 		  	 </el-col>						 
 		     <el-col :span="2">
@@ -1551,7 +1651,7 @@
 		     highlight-current-row="true"
 		     border
 		     style="width:100%"
-		     height="400px"
+		     height="40vh"
 		     @row-dblclick="batchaddSelectClick"
 		     :selectable="row => rowSelectable(row)"
 		     @selection-change="chanliangSelectionChange"
@@ -1598,87 +1698,6 @@
 		  </template>
 		</el-dialog>
 		
-		
-		<el-dialog
-		  v-model="ClearVisible"
-		  title="换型清场"
-		  destroy-on-close
-		  width="1300px"
-		  style="height: 115%;"
-		>
-		  
-		   
-		   <div style="display: flex;">
-		     <div style="flex: 1;">
-		       <el-aside width="250px" style="margin: 0;">
-		         <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
-		           <el-tree :data="CleartreeData" :props="defaultProps" highlight-current="true"
-		             @node-click="ClearNodeClick" @node-dblclick="ClearDoubleClick"></el-tree>
-		         </div>
-		       </el-aside>
-		     </div>
-		     <div style="flex: 1; margin: 0;">
-		      <el-tabs v-model="activeName" type="card" @tab-click="duohandleClick"   >
-		      
-		                  <el-tab-pane label="换型清场明细信息"  @click="showTable('印件资料')"   name="first">
-		                    
-							
-							
-							
-		                  </el-tab-pane>
-		      
-		                  <el-tab-pane label="当前设备换型记录" @click="showTable('工艺资料')" name="second">
-		                    <el-table ref="multipleTable"
-		                              highlight-current-row="true"
-		                              :show-overflow-tooltip="true"
-		                              :row-style="{ height: '20px' }"
-		                              :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-		                              :header-cell-style="{ padding: '0px' }"
-		                              @row-dblclick="gyupdateCompanyFunc"
-		                              :row-class-name="rowClassStyle"
-		                              style="width: 100%;height: 400px" border tooltip-effect="dark" :data="ClearData" row-key="ID" @selection-change="handleSelectionChange"
-		                              @row-click="clickybupdate">
-		                     <el-table-column type="selection" label="选择" width="55" />
-		                      
-		                      <el-table-column align="left" label="日期" prop="班组号" width="80" />
-		                      <el-table-column align="left" label="机台编号" prop="0" width="240" />
-		                      <el-table-column align="left" label="班组" prop="1" width="240" />
-		                      <el-table-column align="left" label="工单编号A" prop="2" width="240" />
-		                      <el-table-column align="left" label="印件名称A" prop="3" width="240" />
-		                      <el-table-column align="left" label="印件工序A" prop="4" width="100" />
-		                      <el-table-column align="left" label="码包号A" prop="5" width="100" />
-		                      <el-table-column align="left" label="工单编号B" prop="6" width="100" />
-		                      <el-table-column align="left" label="印件名称B" prop="7" width="100" />
-		                      <el-table-column align="left" label="印件工序B" prop="8" width="100" />
-		                      <el-table-column align="left" label="码包号B" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="菲林_标样_签样品_留样品" prop="6" width="100" />
-							  <el-table-column align="left" label="板材_纸张_电化铝_油墨" prop="7" width="100" />
-							  <el-table-column align="left" label="过版纸_废品_次品" prop="8" width="100" />
-							  <el-table-column align="left" label="半成品_成品_零头" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="操作台桌面_抽屉_地面" prop="8" width="100" />
-							  <el-table-column align="left" label="机长" prop="9_正品版" width="120" />
-							  <el-table-column align="left" label="带班长" prop="6" width="100" />
-							  <el-table-column align="left" label="质量巡查员" prop="7" width="100" />
-							  <el-table-column align="left" label="创建时间" prop="8" width="100" />
-							  <el-table-column align="left" label="UNIQID" prop="9_正品版" width="120" />
-		                    </el-table>
-		                  </el-tab-pane>
-
-		      
-		                </el-tabs>
-		     </div>
-		   </div>
-		   
-		  <!-- </el-scrollbar> -->
-		  <template #footer>
-		    <div class="dialog-footer">
-		      <el-button @click="closeDialog">取 消</el-button>
-		      <el-button type="primary" @click="chanliangenterDialog">确 定</el-button>
-		    </div>
-		  </template>
-		</el-dialog>
-		
-		
 		<Shebeizhuangtai
 		  v-if="dialogSbyxgl"
 		  v-model="dialogSbyxgl"
@@ -1715,7 +1734,9 @@ import {
   getMac,
   remodelGetTab,
   setMachineTeam,
-  ModelChangeRecord
+  ModelChangeRecord,
+  ComplaintRecord,
+  RemodelDetail
 } from '@/api/jixiaoguanli/baogong'
 
 import {
@@ -1773,6 +1794,7 @@ const detailData = reactive([])
 const treeData=ref([])
 const huanxingtreeData=ref([])
 const huanxingselectData = ref([])
+const huanxingData = ref({})
 const huanxingstatus=ref(false)
 const zhichengtreeData=ref([{
 	label: '首件与过程确认'
@@ -1834,7 +1856,9 @@ const ent = (event,id1,id2,id3) => {
 const huanxingNodeClick = (node) => {
   //存放当前节点的nodeId
   if(node.machine){
+	  console.log(node.label.split('/')[1])
 	  huanxingstatus.value=true
+	  remodelDetail(node.label.split('/')[1])
 	  modelChangeRecord(node.machine)
   }else{
 	  console.log('2')
@@ -1846,6 +1870,12 @@ const modelChangeRecord = async (val) => {
 	huanxingselectData.value=response.data
   }
 }
+const remodelDetail = async (val) => {
+  const response = await RemodelDetail({UniqId:val});
+  if (response.code === 0) {
+	huanxingData.value=response.data
+  }
+}
 const handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){
@@ -1923,7 +1953,6 @@ const FacilityProduction = async () => {
 				// // console.log(sczl_name)
 	   //        }
 	   //      }
-	   console.log()
 	   const responses = await MachineDetailList({workshop:CJMC});
 	   if(responses.code===0){
 		   responses.data.map(item=>{
@@ -1945,12 +1974,16 @@ const FacilityProduction = async () => {
 const FacilityWorklist = async () => {
   const response = await facilityWorklist({machine:JTMC});
   if (response.code === 0) {
-	// console.log(response)
 	sbzyData.splice(0, sbzyData.length, ...response.data);
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
+	response.data.map(item=>{
+		if(item['工单编号|质量信息'].substring(0, 7)==formData.value.工单编号){
+			formData.value.productCode=item.产品代号
+		}
+	})
 	selectData.value=[]
 	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
-	formData.value.productCode= response.data[0]['产品代号']
+	// formData.value.productCode= response.data[0]['产品代号']
 	console.log(res)
 	if (res.code === 0) {
 	    selectData.value = res.data
@@ -2261,7 +2294,36 @@ const chanliangselectData = reactive([])
 const chanliangVisible = ref(false)
 const huanxingVisible = ref(false)
 const xunchaVisible = ref(false)
+//客诉记录
+const complaintsShow = ref(false)
+const complaintsData = ref([])
+function oncomplaints() {
+	Complaints()
+	
+}
+// 客诉记录表格填充
+const Complaints = async() => {
+	complaintsData.value=[]
+	selectedRowData.value={}
+    const res = await ComplaintRecord({productCode :formData.value.productCode})
+    if (res.msg === '成功') {
+		complaintsData.value=res.data;
+		selectedRowData.value=complaintsData.value[0]
+		complaintsShow.value=true
+    }else{
+		ElMessage({
+		  type: 'success',
+		  message: '未找到该产品客诉记录！'
+		})
+	}
+}
+const selectedRowData = ref({
 
+})
+//客诉表格单击
+const complaintshandle = (val, row) => {
+	selectedRowData.value=val
+};
 //设置机台状态
 function onstatus() {
 	dialogSbyxgl.value=true
@@ -2520,11 +2582,6 @@ const GetMachineMac = async () => {
     };
     treeData.value.push(newNode);
 	CJMC=newNode.label
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log('1231231233')
-	console.log(CJMC)
     JTMC = newNode.children[0].label;
     FacilityProduction();
   }
@@ -2640,6 +2697,7 @@ const SubmitDailyProduction = async () => {
 	sczl_bh8: formData3.value.sczl_bh8,
 	sczl_bh9: formData3.value.sczl_bh9,
 	sczl_bh10: formData3.value.sczl_bh10,
+	sczl_bh98:formData3.value.sczl_bh11,
 	sczl_rate1: formData3.value.sczl_rate1,
 	sczl_rate2: formData3.value.sczl_rate2,
 	sczl_rate3: formData3.value.sczl_rate3,
@@ -2979,6 +3037,7 @@ const formData3= ref({
 	sczl_bh8:'',
 	sczl_bh9:'',
 	sczl_bh10:'',
+	sczl_bh11:'',
 	sczl_name1:'',
 	sczl_name2:'',
 	sczl_name3:'',
@@ -2989,6 +3048,7 @@ const formData3= ref({
 	sczl_name8:'',
 	sczl_name9:'',
 	sczl_name10:'',
+	sczl_name11:'',
 	sczl_rate1:'',
 	sczl_rate2:'',
 	sczl_rate3:'',

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

@@ -0,0 +1,250 @@
+<template>
+  <!-- 新增工艺资料弹窗 -->
+  <el-dialog v-model="visible" :before-close="()=> visible = false" style="width: 1100px;" :title="'新增工艺资料'" destroy-on-close>
+    <el-form>
+      <div>
+        <el-form-item label="印件编号:"  class="mab" prop="keyOrder">
+          <el-select v-model="form.yjno" id="印件编号" @keydown="add_gyzlent($event, '质量隐患', '印件编号', '工序编号')" @change="changeHandle">
+            <el-option v-for="item in yjList"
+                       :label="item.name"  :value="item.no"
+            />
+          </el-select>
+        </el-form-item>
+        <div style="display: flex; gap: 0px;">
+          <el-form-item label="工序编号:" class="mab" prop="keyOrder">
+            <el-input v-model="form['工序']"  id="工序编号" @keydown="add_gyzlent($event, '印件编号', '工序编号', '重点工序')"  style="width: 100px;"/>
+          </el-form-item>
+          <el-form-item label="重点工序:"  class="mab" prop="keyOrder" label-width=" 90">
+            <el-select  v-model="form['重点工序']" id="重点工序"  @keydown="add_gyzlent($event, '', '重点工序', '开数')"  style="width: 140px;">
+              <el-option value=""></el-option>
+              <el-option value="重点工序">重点工序</el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="备选工序："  class="mab" prop="isBanciSelected" label-width=" 90">
+            <el-checkbox v-model="form['备选工序']"></el-checkbox>
+          </el-form-item>
+          <el-form-item label="加工开数:"  class="mab" prop="keyOrder" label-width=" 125">
+            <el-input  v-model="form['开数']"  style="width: 100px;" id="开数"  @keydown="add_gyzlent($event, '重点工序  ', '开数', '联数')" />
+          </el-form-item>
+          <el-form-item label="加工联数:"  class="mab" prop="keyOrder" label-width=" 80">
+            <el-input  v-model="form['联数']"  style="width: 100px;" id="联数"  @keydown="add_gyzlent($event, '开数', '联数', '车间名称')" />
+          </el-form-item>
+        </div>
+        <div style="display: flex; gap: 0px;">
+          <el-form-item label="车间名称:"  class="mab" prop="keyOrder">
+            <el-tree-select
+                v-model="form['车间名称']"
+                :data="cjList"
+                :render-after-expand="false"
+                @change="selectHandle"
+                id="车间名称"   @keydown="add_gyzlent($event, '联数', '车间名称', '工序名称')"
+                style="width: 240px"
+            >
+            </el-tree-select>
+          </el-form-item>
+          <el-form-item label="工艺名称:"  class="mab" prop="keyOrder" label-width=" 90">
+            <el-input disabled v-model="form['工艺名称']"  style="width: 140px;"/>
+          </el-form-item>
+          <el-form-item label="工序名称:"  class="mab" prop="keyOrder" label-width=" 90">
+            <el-input  v-model="form['工序名称']"  style="width: 300px;" id="工序名称"   @keydown="add_gyzlent($event, '车间名称', '工序名称', '设备编号')" />
+          </el-form-item>
+          <el-form-item label="计损色数"  class="mab" prop="keyOrder" label-width=" 80">
+            <el-input disabled v-model="form['计损色数']" style="width: 90px;"/>
+          </el-form-item>
+        </div>
+        <el-form-item label="设备编号:"  class="mab" prop="remark">
+          <el-select v-model="form['设备编号']" multiple
+                     id="设备编号"  @keydown="add_gyzlent($event, '工序名称', '设备编号', '工序损耗')"
+                     style="flex: 1; height: auto;">
+            <el-option
+                @keydown.tab.prevent="sbbhclick"
+                @click="sbbhclick"
+                v-for="(item, index) in gdzl_MachineList_address"
+                :key="index"
+                :label="item.split('-->')[0].trim()"
+                :value="item.split('-->')[0].trim()">
+              {{ item }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="工序损耗:"  class="mab" prop="keyOrder" >
+          <el-input v-model="form['shdh']"  style="width: 10%;" id="工序损耗"  @keydown="add_gyzlent($event, '设备编号', '工序损耗', '装版工时')"/>
+          <el-input disabled v-model="form['工序损耗名称']"  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 disabled v-model="form['损耗系数']"  style="flex: 1;" />
+          </el-form-item>
+          <el-form-item label="难度系数"  class="mab" prop="keyOrder">
+            <el-input disabled v-model="form['难度系数']"  style="flex: 1;" />
+          </el-form-item>
+          <el-form-item label="装版工时:"  class="mab" prop="keyOrder">
+            <el-input  v-model="form['装版工时']"  style="flex: 1;" id="装版工时"  @keydown="add_gyzlent($event, '工序损耗', '装版工时', '排产小时产能')"/>
+          </el-form-item>
+          <el-form-item label="排产小时产能:"  class="mab" prop="keyOrder" label-width=" 120px">
+            <el-input  v-model="form['小时产能']"  style="flex: 1;" id="排产小时产能"  @keydown="add_gyzlent($event, '装版工时', '排产小时产能', '备注')"/>
+          </el-form-item>
+          <el-form-item label="印刷方式"  class="mab" prop="keyOrder">
+            <el-input disabled v-model="form['印刷方式']"  style="flex: 1;"/>
+          </el-form-item>
+          <el-form-item label="版距"  class="mab" prop="keyOrder">
+            <el-input disabled v-model="form['版距']"  style="flex: 1;"/>
+          </el-form-item>
+        </div>
+        <el-form-item label="工序备注:"  class="mab" prop="remark">
+          <el-input  type="textarea" resize="none" v-model="form['备注']" rows="3" clearable   style="flex: 1;resize: none" id="备注"  @keydown="add_gyzlent($event, '排产小时产能', '备注', '质量要求')"/>
+        </el-form-item>
+        <el-form-item  label="质量要求:"  class="mab" prop="remark">
+          <el-input  type="textarea" resize="none" v-model="form['质量要求']" rows="2" clearable   style="flex: 1;resize: both;" id="质量要求"  @keydown="add_gyzlent($event, '备注', '质量要求', '质量隐患')"/>
+        </el-form-item>
+        <el-form-item label="质量隐患:"  class="mab" prop="remark">
+          <el-input  type="textarea" resize="none" v-model="form['质量隐患']" rows="2" clearable   style="flex: 1;" id="质量隐患"  @keydown="add_gyzlent($event, '质量要求', '质量隐患', '印件编号')"/>
+        </el-form-item>
+      </div>
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer" style="text-align: right;top: auto">
+        <el-button @click="add_gdgycloseDialog">取 消</el-button>
+        <el-button type="primary" @click="add_gdgyenterDialog">确 定</el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script setup>
+import {ref, reactive} from 'vue'
+import {gdzl_MachineList, PrintDetailList, getDepartName, capacityList} from "@/api/yunyin/yunying";
+
+const form = reactive({})
+const visible = ref(false)
+const id = ref()
+
+const gxList = ref([])
+const yjList = ref()
+const cjList = ref([
+  {
+    label: '标准工艺',
+    value: '标准工艺',
+    children: []
+  }
+])
+const gdzl_MachineList_address = ref()
+
+//新增工艺资料弹窗 键盘 input框跳转
+const add_gyzlent = (event,id1,id2,id3) => {
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value==''){
+      document.getElementById(id1).focus()
+    }
+    // console.log(document.getElementById(id2).value)
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
+
+const open = async (gdbh, gxlist) => {
+  id.value = gdbh
+  const res = await PrintDetailList({workOrder: id.value})
+  const chejian = await getDepartName()
+  cjList.value = [
+    {
+      label: '标准工艺',
+      value: '标准工艺',
+      children: []
+    }
+  ]
+  initChejian(chejian.data['标准工艺'])
+  yjList.value = res.data
+  gxList.value = gxlist
+  visible.value = true
+}
+
+const selectHandle = async (value)=>{
+  function findParentInTree(tree, targetValue) {
+    for (let node of tree) {
+      // 如果找到了目标值，返回当前节点作为上级
+      if (node.value === targetValue) {
+        return node;
+      }
+
+      // 如果当前节点有子节点，递归地在子节点中查找
+      if (node.children && node.children.length > 0) {
+        let parent = findParentInTree(node.children, targetValue);
+        if (parent) return parent
+      }
+    }
+
+    // 如果没有找到目标值或其上级，返回null
+    return null;
+  }
+
+  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;
+}
+
+const initChejian = (data) => {
+  Object.keys(data).map( (name, index)=>{
+    const tmp = {
+      label: name, value: name, children: []
+    }
+    data[name].map(item => {
+      tmp.children.push({
+        label: item, value: item,parent: name,
+      })
+    })
+    cjList.value[0].children.push(tmp)
+  })
+}
+
+const changeHandle = (v) => {
+  const no = '0' + v
+  let list = gxList.value.map(item => {
+    const yj = item.split('-')[0]
+    if (yj === no) return Number(item.split('-')[1])
+  })
+  form['工序'] = (list.sort((a, b) => b-a)[0] + 1)
+}
+
+const sbbhclick = () => {
+  _capacityList();
+}
+
+
+const _capacityList = async () => {
+  if(gdgyformData['设备编号'] === ''){
+    return false;
+  }else{
+    _capacityListsbbh.value = gdgyformData['设备编号'].join(' ');
+    const editProductedit_machine = await capacityList({machine:_capacityListsbbh.value});
+    gdgyformData['小时产能'] = editProductedit_machine.data;
+  }
+
+};
+
+defineExpose({ open })
+</script>
+
+<style scoped>
+
+</style>

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -28,7 +28,7 @@
                 <el-button type="primary" title="给担负起那设备做生产任务排程" icon="edit"  @click="oncjsbpcClick" class="bt">车间设备制程排序</el-button>
               </div>
 
-              <el-button type="primary" title="打印生产工单" disabled icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button>
+              <el-button type="primary" title="打印生产工单" icon="edit" @click="pd_gdprintonClick" class="bt">工单打印</el-button>
               <el-button type="primary" icon="edit" @click="pd_gxclhconClick" class="bt">工序产量核查</el-button>
               <el-button type="primary" icon="edit" @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
 
@@ -76,10 +76,10 @@
                       :cell-class-name="gxztgzzCellClass">
               <template v-for="(item, idx) in gxztgzztableColumns">
                 <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]"-->
-<!--                              :id="`input${idx}${$index}`" @keyup="gxztgzz_handleKeyDown($event, idx, $index, item.prop)"/>-->
-<!--                  </div>-->
+                  <!--                  <div v-if="['完工时间'].includes(item.prop)">-->
+                  <!--                    <el-input v-model="row[item.prop]"-->
+                  <!--                              :id="`input${idx}${$index}`" @keyup="gxztgzz_handleKeyDown($event, idx, $index, item.prop)"/>-->
+                  <!--                  </div>-->
                   <div v-if="['完工时间'].includes(item.prop)">
                     <el-date-picker
                         v-model="row[item.prop]"
@@ -123,32 +123,32 @@
                 </el-form-item>
 
                 <el-form-item label="" prop="" style="margin-left: 25px;">
-                <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
+                  <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
                 </el-form-item>
               </div>
 
               <el-table ref="paichengRef"
-                :show-overflow-tooltip="true"
-                :row-style="{ height: '0px' }"
-                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-                :header-cell-style="{ padding: '0px' }"
-                style="width: 100%;height: 74vh" border tooltip-effect="dark"
-                highlight-current-row="true"
-                @row-click="cjpc_tableRowClick"
-                :data="paichengData" row-key="ID"
-                :cell-class-name="cjzcCellClass"
+                        :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: 74vh" border tooltip-effect="dark"
+                        highlight-current-row="true"
+                        @row-click="cjpc_tableRowClick"
+                        :data="paichengData" row-key="ID"
+                        :cell-class-name="cjzcCellClass"
               >
                 <template v-for="(item, idx) in paichengColumns">
                   <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="handleKeyDown($event, idx, $index, item.prop)"
+                                :id="`input${idx}${$index}`"
+                                @keyup="handleKeyDown($event, idx, $index, item.prop)"
                       />
-<!--                      <el-date-picker v-model="row[item.prop]" v-if="['最早开工时间', '计划开工时间'].includes(item.prop)" type="datetime" :clearable="false"-->
-<!--                        :id="`input${idx}${$index}`"-->
-<!--                        @keyup="handleKeyDown($event, idx, $index , item.prop)"-->
-<!--                      />-->
+                      <!--                      <el-date-picker v-model="row[item.prop]" v-if="['最早开工时间', '计划开工时间'].includes(item.prop)" type="datetime" :clearable="false"-->
+                      <!--                        :id="`input${idx}${$index}`"-->
+                      <!--                        @keyup="handleKeyDown($event, idx, $index , item.prop)"-->
+                      <!--                      />-->
                     </div>
                     <div v-else>
                       {{ row[item.prop] }}
@@ -159,54 +159,6 @@
             </div>
 
           </el-dialog>
-          <!--工单打印【弹窗】-->
-          <el-dialog v-model="print_gdlist" title="生产工单打印" style="width: 700px;height: 400px;">
-
-            <div style="border: 1px black solid;width: 600px;">
-            <el-row>
-                <el-form-item label="工单编号:" prop="currentProcess" class="mab">
-                  <el-input v-model="print_formData['gdbh']"  @keyup.enter="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="print_formData['yjh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-              <el-form-item label="终止工序号:" prop="currentProcess" class="mab">
-                <el-input v-model="print_formData['zzgxh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-            </el-row>
-              <el-row>
-                <el-form-item label="印件名称:" prop="currentProcess" class="mab">
-                  <el-input v-model="print_formData['yjmc']"  @keyup.enter="print_ProductValue" placeholder="" />
-                </el-form-item>
-              </el-row>
-            <el-row>
-              <el-form-item label="报表输出到:" prop="currentProcess">
-                <el-radio-group v-model="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="print_formData['zd']"  @keyup.enter="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="print_formData['sh']"  @keyup.enter="print_ProductValue" placeholder="" />
-              </el-form-item>
-            </el-row>
-            </div>
-            <div class="dialog-footer" style="text-align: right; margin-top: 40px;">
-              <el-button @click="print_handleCancel">取消</el-button>
-              <el-button type="primary"  @click="print_handleConfirm">确认</el-button>
-            </div>
-
-          </el-dialog>
-
 
           <!--工序产量核查【弹窗】-->
           <el-dialog v-model="pd_gxclhclist" title="工序产量核查" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
@@ -449,6 +401,8 @@
 
       </layout>
     </layout>
+
+    <PrintPage ref="printPageRef" />
   </div>
 </template>
 <script>
@@ -505,8 +459,12 @@ import {
   getOrderProcessLeft,
   getOrderProcessRight
 } from "@/api/yunyin/yunying";
+
+import PrintPage from './components/print.vue'
 defineOptions({name: 'Company'})
 
+const printPageRef = ref()
+
 // =========== 左侧树侧形结构 ===========
 const sctreeData = ref([
   {
@@ -522,76 +480,76 @@ const sctreeData = ref([
 //上方表格
 const tableFields = ref({
   "计划中": [
-      { title:'获取状态', prop: 'statusColumn', width: 80, align:'center'},
-      { title:'生产分类', prop: '生产分类', width: 80, align:'left', },
-      { title: '工单编号', prop: '工单编号', width: 80, align:'center', },
-      { title: '产品代号', prop: '产品代号', width: 90, align:'center', },
-      { title: '产品名称', prop: '产品名称', width: 280, align:'left', },
-      { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-      { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-      { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-      { title: '计量单位', prop: '计量单位', width: 80, align:'center', },
-      { title: '客户名称', prop: '客户名称', width: 200, align:'left', },
-      { title: '客户编号', prop: '客户编号', width: 80, align:'center', },
-      { title: '备注', prop: '备注', width: 230, align:'left', },
-      { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-      { title: '创建用户', prop: '创建用户', width: 110, align:'left', },
-      { title: '创建时间', prop: '创建时间', width: 110, align:'left', },
-      { title: '修改时间', prop: '修改时间', width: 110, align:'left', },
-      { title: 'UNIQID', prop: 'UNIQID', width: 80  , align:'left', },
-      { title: '投料率', prop: '投料率', width: 100, align:'left', },
-      { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
-      ],
+    { title:'获取状态', prop: 'statusColumn', width: 80, align:'center'},
+    { title:'生产分类', prop: '生产分类', width: 80, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'center', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'center', },
+    { title: '产品名称', prop: '产品名称', width: 280, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'center', },
+    { title: '客户名称', prop: '客户名称', width: 200, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 80, align:'center', },
+    { title: '备注', prop: '备注', width: 230, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
+    { title: '创建用户', prop: '创建用户', width: 110, align:'left', },
+    { title: '创建时间', prop: '创建时间', width: 110, align:'left', },
+    { title: '修改时间', prop: '修改时间', width: 110, align:'left', },
+    { title: 'UNIQID', prop: 'UNIQID', width: 80  , align:'left', },
+    { title: '投料率', prop: '投料率', width: 100, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
+  ],
   "排程中": [
-      // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-      { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-      { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-      { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-      { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-      { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-      { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-      { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-      { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-      // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-      { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-      { title: '客户名称', prop: '客户名称', width: 230, align:'left', },
-      { title: '创建用户', prop: '创建用户', width: 120, align:'left', },
-      // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-      { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
-      ],
+    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 230, align:'left', },
+    { title: '创建用户', prop: '创建用户', width: 120, align:'left', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+  ],
   "制程中": [
-        // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
-        { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-        { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
-        { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-        { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-        { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-        { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-        { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-        { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
-        // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-        { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
-        { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-        { title: '客户料号', prop: '客户料号', width: 160, align:'left', },
-        // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
-        { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
-      ],
+    // { title: '最早开工时间', prop: '最早开工时间', width: 120, align:'left', },
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 90, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 200, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 120, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 160, align:'left', },
+    // { title: 'GDUID', prop: 'GDUID', width: 120, align:'left', },
+    { title: 'GYUID', prop: 'GYUID', width: 100, align:'left', },
+  ],
   "已完工": [
-        { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
-        { title: '产品代号', prop: '产品代号', width: 110, align:'left', },
-        { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
-        { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
-        { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
-        { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
-        { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
-        { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
-        { title: '客户编号', prop: '客户编号', width: 80, align:'left', },
-        { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
-        { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
-        // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
-        { title: 'GDUID', prop: 'GDUID', width: 80, align:'left', },
-      ]
-    })
+    { title: '工单编号', prop: '工单编号', width: 80, align:'left', },
+    { title: '产品代号', prop: '产品代号', width: 110, align:'left', },
+    { title: '产品名称', prop: '产品名称', width: 340, align:'left', },
+    { title: '接单日期', prop: '接单日期', width: 110, align:'left', },
+    { title: '交货日期', prop: '交货日期', width: 110, align:'left', },
+    { title: '订单数量', prop: '订单数量', width: 80, align:'left', },
+    { title: '计量单位', prop: '计量单位', width: 80, align:'left', },
+    { title: '销售订单号', prop: '销售订单号', width: 120, align:'left', },
+    { title: '客户编号', prop: '客户编号', width: 80, align:'left', },
+    { title: '客户名称', prop: '客户名称', width: 120, align:'left', },
+    { title: '客户料号', prop: '客户料号', width: 120, align:'left', },
+    // { title: '排程类型', prop: '排程类型', width: 120, align:'left', },
+    { title: 'GDUID', prop: 'GDUID', width: 80, align:'left', },
+  ]
+})
 //排程中、制程中下方表格列表
 const bottomTableF = ref({
   "排程中": [
@@ -635,7 +593,7 @@ const bottomTableF = ref({
     { title:'排单备注', prop: '排单备注', width: 120, align:'left', },
     { title:'工序完工', prop: '工序完工', width: 160, align:'left', },
     { title:'UNIQID', prop: 'UNIQID', width: 120, align:'left', },
-      ],
+  ],
 })
 //左侧左边栏
 const treeData = ref([]);
@@ -835,13 +793,13 @@ const onSubmit = () => {
     return false;
   }
   if(!_machine.value){
-      if (currentNode.value === '计划中' || currentNode.value === '已完工') {
-        _Project();
-      } else if (currentNode.value === '排程中' || currentNode.value === '制程中') {
-        _Schedule();
-      } else {
-        ElMessage({ type: 'warning', message: '查询不到具体条件的工单' });
-      }
+    if (currentNode.value === '计划中' || currentNode.value === '已完工') {
+      _Project();
+    } else if (currentNode.value === '排程中' || currentNode.value === '制程中') {
+      _Schedule();
+    } else {
+      ElMessage({ type: 'warning', message: '查询不到具体条件的工单' });
+    }
   }else{
     _MachineWorkOrderList();
   }
@@ -918,20 +876,20 @@ const onztwgClick = async () => {
   if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
     ElMessage({type: 'warning', message: '请勾选制程中工单'})
   }else{
-      let params = {}
-      params.workOrder = _ZC_gdbh.value;
-      params.machine = _machine.value;
-      params.printCode = _ZC_yjno.value;
-      params.processCode =  _ZC_gxh.value;
-      const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
-      if (ProductionSchedulingAdd_stop.code === 0) {
-        const pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
-        chejianData.value = pc_zc_table.data['排程'];
-        chejianfuData.value = pc_zc_table.data['制程'];
-        ElMessage({type: 'success',message: '暂停排产 更新成功'});
-      } else {
-        ElMessage({ type: 'error',message: '更新失败'})
-      }
+    let params = {}
+    params.workOrder = _ZC_gdbh.value;
+    params.machine = _machine.value;
+    params.printCode = _ZC_yjno.value;
+    params.processCode =  _ZC_gxh.value;
+    const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
+    if (ProductionSchedulingAdd_stop.code === 0) {
+      const pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
+      chejianData.value = pc_zc_table.data['排程'];
+      chejianfuData.value = pc_zc_table.data['制程'];
+      ElMessage({type: 'success',message: '暂停排产 更新成功'});
+    } else {
+      ElMessage({ type: 'error',message: '更新失败'})
+    }
   }
 };
 //工序完工按钮
@@ -986,47 +944,6 @@ const ZP_handleChange = (arr) => {
   _ZC_xscn.value = xscn;
 }
 
-
-//==============工单打印=============
-const print_gdlist = ref(false);
-const print_formData = ref({
-  gdbh: '',
-  yjh: '',
-  zzgxh: '',
-  yjmc: '',
-  zd: '',
-  sh: '',
-  outputType: ''
-});
-//工单打印按钮
-const pd_gdprintonClick = async () => {
-  console.log(213)
-  // print_formData['gdbh'] = _Gd_gdbh.value;
-  print_formData['gdbh'] = '2310777';
-  print_gdlist.value = true;
-}
-//工单打印回车
-const print_ProductValue = async () => {
-
-}
-//工单打印确定
-const print_handleConfirm = async () => {
-  // print_gdlist.value = false;
-}
-//工单打印取消
-const print_handleCancel = async () => {
-  print_gdlist.value = false;
-}
-//调用打印接口
-const _PrintJobOrder = async () => {
-  const print_PrintJobOrder = await PrintJobOrder();
-  console.log(print_PrintJobOrder)
-  print_gdlist.value = false;
-}
-
-
-
-
 //=========工序产量核查===========
 const pd_gxclhclist = ref(false);
 const gxclhc_Data = ref([]);
@@ -1077,9 +994,9 @@ const _getOrderProcessCount = async () => {
   const getOrderProcessCount_list = await getOrderProcessCount({order:order});
   const concatenatedData = getOrderProcessCount_list.data.map(item => {
     // 优化后的代码，使用模板字符串连接字段值并在单个数字前添加零
-      const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
-      const formattedGxh = item.Gy0_gxh.length === 1 ? `0${item.Gy0_gxh}` : item.Gy0_gxh;
-      const concatenatedValue = `${formattedYjno}-${formattedGxh} ${item.Gy0_gxmc}`;
+    const formattedYjno = item.Gy0_yjno.length === 1 ? `0${item.Gy0_yjno}` : item.Gy0_yjno;
+    const formattedGxh = item.Gy0_gxh.length === 1 ? `0${item.Gy0_gxh}` : item.Gy0_gxh;
+    const concatenatedValue = `${formattedYjno}-${formattedGxh} ${item.Gy0_gxmc}`;
     return {
       ...item,
       concatenatedData: concatenatedValue, // 使用新属性名
@@ -1368,6 +1285,11 @@ const cjsbpcformData = reactive({
   banci: '',
   isBanciSelected: false,
 });
+
+const pd_gdprintonClick = () => {
+  printPageRef.value.open(_Gd_gdbh.value)
+}
+
 //车间设备排程【按钮】
 const oncjsbpcClick = () => {
   cjsbpcformData['sbdh'] = _machine.value;