Merge branch 'master' of https://git.7in6.com/Minong/mes-admin-backend-ui

src/api/jixiaoguanli/jitairibaobiao.js

@@ -903,4 +903,18 @@ export const getMachineMac = (params) => {
     method: 'get',
     params
   })
+}
+export const InspectionItemAdd = (data) => {
+  return service({
+    url:'/mes_server/facility/InspectionItemAdd',
+    method: 'post',
+    data
+  })
+}
+export const ProcessInspectionRecordsItem = (params) => {
+  return service({
+    url:'/mes_server/facility/ProcessInspectionRecordsItem',
+    method: 'get',
+    params
+  })
 }

src/api/mes_api_gty/orderAccounting.js

@@ -68,11 +68,38 @@ export const getOrderYj = (params) => {
 }
 
 // 4.2考核设置-更新工单印件资料
+export const updateOrderYj = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/updateOrderYj',
+    method: 'get',
+    params
+  })
+}
 
 // 5.1修正工单实际投料-获取列表
-
+export const getOrderFeedList = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderFeedList',
+    method: 'get',
+    params
+  })
+}
 // 5.2更新工单实际投料
-
+export const updateOrderFeed = (data) => {
+  return service({
+    url: '/mes_server/order_super_loss/updateOrderFeed',
+    method: 'post',
+    data
+  })
+}
 // 6工单工序产量查核
-
-//
+export const getOrderProcessCount = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderProcessCount',
+    method: 'get',
+    params
+  })
+}
+// 7核检废品分布（工单核检单维护3.1）
+// 8流程单查询（工单核检单维护5.1,5.2）
+// 9工单质检废品统计（工单核检单维护8）

src/api/yunyin/yunying.js

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

src/view/performance/09-workOrderVerification/gongdanzhijianfeipintongji.vue → src/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog
-    :model-value="props.isShow"
+    :model-value="modelValue"
     title="核检废品日统计"
     fullscreen
     destroy-on-close
-    @close="handleExit"
+    :before-close="() => emits('update:modelValue', false )"
   >
     <el-container>
       <!-- 按钮部分 -->
@@ -18,7 +18,7 @@
         <el-button
           type="primary"
           size="large"
-          @click="handleExit"
+          @click="() => emits('update:modelValue', false )"
         >退出
         </el-button>
       </el-header>
@@ -44,7 +44,6 @@
         />
         <el-table
           ref="multipleTable"
-          width="100%"
           height="70vh"
           :data="tableData"
           row-key="ID"
@@ -91,8 +90,8 @@ export const getOrderWasteTotal = (params) => {
 <script setup>
 import { watch, ref, reactive, defineProps, defineEmits } from 'vue'
 
-const props = defineProps(['isShow', 'val'])
-const emits = defineEmits(['myClose'])
+const props = defineProps(['modelValue', 'val'])
+const emits = defineEmits(['update:modelValue'])
 
 const tableColumns = reactive([
   { label: '工单编号', prop: 'gdbh', width: '150' },
@@ -114,19 +113,10 @@ const tableColumns = reactive([
   { label: '数量', prop: 'fp_sl', width: '150' },
 ])
 const tableData = ref([])
-const input = ref('')
+const input = ref(props.val)
 const inputCpmc = ref('')
 const isLoading = ref(false)
 
-watch(props, (value, oldValue, onCleanup) => {
-  if (value.isShow === true) {
-    input.value = value.val
-  }
-})
-const handleExit = () => {
-  emits('myClose')
-}
-
 const handleExcel = () => {
 }
 
@@ -152,7 +142,6 @@ const handleSearch = async() => {
 <style scoped>
 
 :deep(.el-table td .cell) {
-  line-height: 30px !important;
+  line-height: 20px !important;
 }
-
 </style>

src/view/performance/09-workOrderVerification/meirihejiantongji.vue → src/view/performance/09-workOrderVerification/componets/meirihejiantongji.vue

@@ -1,10 +1,10 @@
 <template>
   <el-dialog
-    :model-value="props.isShow"
+    :model-value="modelValue"
     title="核检废品日统计"
     fullscreen
     destroy-on-close
-    @close="handleExit"
+    :before-close="() => emits('update:modelValue', false )"
   >
     <el-container>
       <!-- 按钮部分 -->
@@ -18,7 +18,7 @@
         <el-button
           type="primary"
           size="large"
-          @click="handleExit"
+          @click="() => emits('update:modelValue', false )"
         >退出
         </el-button>
       </el-header>
@@ -90,8 +90,8 @@ const getDaysWast = (params) => {
 <script setup>
 import { ref, reactive, defineProps, defineEmits } from 'vue'
 
-const props = defineProps(['isShow'])
-const emits = defineEmits(['myClose'])
+const props = defineProps(['modelValue'])
+const emits = defineEmits(['update:modelValue'])
 
 const tableColumns = reactive([
   { label: '日期', prop: 'qczl_rq', width: '150' },
@@ -107,10 +107,6 @@ const tableData = reactive([])
 const date = ref()
 const isLoading = ref(false)
 
-const handleExit = () => {
-  emits('myClose')
-}
-
 const handleExcel = () => {
 }
 

src/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue

@@ -0,0 +1,310 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    fullscreen
+    :title="props.title"
+    destroy-on-close
+    :before-close="() => emits('update:modelValue', false )"
+  >
+    <el-row>
+      <el-col :span="20">
+        <el-row
+          style="height: 20vh"
+        >
+          <v-chart
+            class="chart1"
+            autoresize
+            :option="option1"
+          />
+        </el-row>
+
+        <el-row
+          style="height: 20vh"
+        >
+          <v-chart
+            class="chart2"
+            autoresize
+            :option="option2"
+          />
+        </el-row>
+
+        <el-row
+          style="height: 20vh"
+        >
+          <v-chart
+            class="chart3"
+            autoresize
+            :option="option3"
+          />
+        </el-row>
+
+        <el-col style="height: 10vh; text-align: center; margin-top: 10px">
+          <el-button
+            class="btn-right"
+            style="background: #5B79D7;"
+          >
+            上一班次
+          </el-button>
+
+          <span
+            style="font-size: 26px;vertical-align: middle;margin: 20px"
+          >当前班次:{{ currentFrequency }}</span>
+
+          <el-button
+            class="btn-right"
+            style="background: #5B79D7;"
+          >
+            下一班次
+          </el-button>
+        </el-col>
+
+      </el-col>
+
+      <el-col :span="4">
+        <div
+          style="font-size: 22px; margin-left: 30px"
+        >设备状态：</div><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '待单'}"
+          @click="handleBtnActive"
+        >待单</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '维修' }"
+          @click="handleBtnActive"
+        >维修</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '保养' }"
+          @click="handleBtnActive"
+        >保养</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '测试' }"
+          @click="handleBtnActive"
+        >测试</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '打样' }"
+          @click="handleBtnActive"
+        >打样</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '待料' }"
+          @click="handleBtnActive"
+        >待料</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '装版' }"
+          @click="handleBtnActive"
+        >装版</el-button><br>
+        <el-button
+          class="btn-right"
+          :class="{ 'active': activeBtn === '生产' }"
+          @click="handleBtnActive"
+        >生产</el-button><br>
+      </el-col>
+    </el-row>
+  </el-dialog>
+
+</template>
+<script>
+export default {
+  name: 'Shebeizhuangtai',
+}
+// 机台数据详情
+import service from '@/utils/request'
+export const getMachineDetail = (params) => {
+  return service({
+    url: '/mes_server/facility/MachineDetail',
+    method: 'get',
+    params
+  })
+}
+
+</script>
+
+<script setup>
+import { use } from 'echarts/core'
+import { CanvasRenderer } from 'echarts/renderers'
+import { BarChart, LineChart, PieChart, ScatterChart } from 'echarts/charts'
+import { GridComponent, LegendComponent, TitleComponent, TooltipComponent } from 'echarts/components'
+import VChart, { THEME_KEY } from 'vue-echarts'
+import { defineEmits, defineProps, provide, ref } from 'vue'
+
+const props = defineProps(['modelValue', 'title'])
+const emits = defineEmits(['update:modelValue'])
+
+use([
+  CanvasRenderer,
+  PieChart,
+  BarChart,
+  LineChart,
+  ScatterChart,
+  GridComponent,
+  TitleComponent,
+  TooltipComponent,
+  LegendComponent,
+])
+// provide(THEME_KEY, 'dark')
+
+const activeBtn = ref(null)
+const handleBtnActive = (e) => {
+  activeBtn.value = e.target.innerText
+}
+
+const currentFrequency = ref('2023-01-02 08:30')
+
+const option1 = ref({
+  xAxis: {
+    data: ['待单', '维修', '保养', '测试', '打样', '待料', '装版', '生产'],
+  },
+  yAxis: {
+    name: '状态时长（小时）',
+    nameLocation: 'end',
+    nameGap: 5,
+    nameTextStyle: {
+      align: 'left',
+      verticalAlign: 'bottom',
+    },
+  },
+  grid: {
+    left: '8%',
+    right: '2%',
+    top: '22%',
+    bottom: '15%',
+  },
+  series: {
+    type: 'bar',
+    label: {
+      show: true,
+      position: 'top',
+    },
+    data: [
+      0, 0, 0, 0, 0, 0, 2.39, 19.36,
+    ],
+  },
+  textStyle: {
+    fontWeight: 'bolder',
+    fontSize: 16,
+
+  },
+})
+
+// 生成横坐标（每分钟一个点，显示时间格式为 "HH:mm"）
+const data = []
+for (let i = 510; i <= 1230; i++) { // 08:30 到 20:30 的分钟数范围
+  const hours = Math.floor(i / 60)
+  const minutes = i % 60
+  const time = (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
+  data.push([time, Math.random() * 1000])
+}
+const xAxisData = data.map(item => item?.[0])
+
+const option2 = ref({
+  xAxis: {
+    type: 'category',
+    axisLabel: {
+      interval: 59, // 控制显示的刻度标签间隔，每小时一个
+    },
+  },
+  yAxis: {
+    name: '实时产量',
+    nameLocation: 'end',
+    nameGap: 5,
+    nameTextStyle: {
+      align: 'left',
+      verticalAlign: 'bottom',
+    }
+  },
+  grid: {
+    left: '8%',
+    right: '2%',
+    top: '22%',
+    bottom: '15%',
+  },
+  tooltip: {
+    trigger: 'axis'
+  },
+  series: {
+    name: '速度',
+    type: 'line',
+    data: data,
+  },
+  textStyle: {
+    fontWeight: 'bolder',
+    fontSize: 16,
+  },
+})
+
+const option3 = ref({
+  xAxis: {
+    // type: 'value',
+    data: xAxisData,
+    axisLabel: {
+      interval: 59, // 控制显示的刻度标签间隔，每小时一个
+    },
+  },
+  yAxis: {
+    name: '检验时间',
+    nameLocation: 'end',
+    nameGap: 5,
+    nameTextStyle: {
+      align: 'left',
+      verticalAlign: 'bottom'
+    },
+    axisLine: {
+      show: true,
+    },
+    data: ['IPQC检验', '机台检验', '首件与过程'],
+  },
+  tooltip: {
+    trigger: 'item'
+  },
+  grid: {
+    left: '8%',
+    right: '2%',
+    top: '22%',
+    bottom: '15%',
+  },
+  series: {
+    type: 'scatter',
+    symbol: 'arrow',
+    symbolSize: 20,
+    label: {
+      show: true,
+      position: 'right',
+      formatter: '{@value}' // 点旁边显示label，这里使用name: '横坐标'这样写也可以，鼠标移入出现提示。
+    },
+    data: [
+      ['08:30', 'IPQC检验'],
+      ['10:30', 'IPQC检验'],
+      ['11:30', '机台检验'],
+      ['17:30', '机台检验'],
+    ],
+  },
+  textStyle: {
+    fontWeight: 'bolder',
+    fontSize: 16,
+  },
+})
+
+</script>
+
+<style scoped>
+.active {
+  background-color: #528B34 !important;
+}
+
+.btn-right {
+  width: 100px;
+  height: 50px;
+  margin-bottom: 5px;
+  margin-left: 30px;
+  color: #FFFFFF;
+  background-color: #C6BEC4;
+  font-size: 20px;
+  font-style: italic;
+}
+</style>

src/view/performance/09-workOrderVerification/index.vue

@@ -35,7 +35,7 @@
               <el-button
                 type="primary"
                 :icon="Search"
-                @click="isShowMrhjtj = true"
+                @click="dialogMrhjtj = true"
               >每日核检统计
               </el-button>
               <el-button
@@ -44,7 +44,7 @@
                 @click="showGdzjfptj"
               >工单质检废品统计
               </el-button>
-			 <el-button
+              <el-button
                 type="primary"
                 :icon="Search"
                 @click="handleShowAdd"
@@ -399,26 +399,25 @@
             </el-table>
           </el-dialog>
 
-          <!-- 核验废品日统计弹出框 -->
+          <!-- 废品日统计 -->
           <Meirihejiantongji
-            :is-show="isShowMrhjtj"
-            @my-close="isShowMrhjtj = false"
+            v-if="dialogMrhjtj"
+            v-model="dialogMrhjtj"
           />
 
           <!-- 工单质检废品统计 -->
           <Gongdanzhijianfeipintongji
-            :is-show="isShowGdzjfptj"
+            v-if="dialogGdzjfptj"
+            v-model="dialogGdzjfptj"
             :val="value1"
-            @my-close="isShowGdzjfptj =false"
           />
 
           <!-- 测试图表 -->
-          <el-dialog
-            title="【01.24 08:30】【JY01#--海德堡对开八色平版胶印机(JY08-01)】【2311116-->钻石(荷花）盒包装纸】【01--胶印】"
-            fullscreen
-          >
-            <Shebeizhuangtai />
-          </el-dialog>
+          <Shebeizhuangtai
+            v-if="dialogSbyxgl"
+            v-model="dialogSbyxgl"
+            title="【01.30 08:30】【JY01#--海德堡对开八色平版胶印机(JY08-01)】【2311116-->钻石(荷花）盒包装纸】【01--胶印】"
+          />
 
         </el-main>
       </el-container>
@@ -441,10 +440,10 @@ import {
 import { ElMessage } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive } from 'vue'
-import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData,add } from '@/api/mes_api_gty/workOrderVerification'
-import Meirihejiantongji from './meirihejiantongji.vue'
-import Gongdanzhijianfeipintongji from './gongdanzhijianfeipintongji.vue'
-import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/shebeizhuangtai.vue'
+import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData, add } from '@/api/mes_api_gty/workOrderVerification'
+import Meirihejiantongji from '@/view/performance/09-workOrderVerification/componets/meirihejiantongji.vue'
+import Gongdanzhijianfeipintongji from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
+import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.vue'
 
 defineOptions({
   name: '06PackingDocuments'
@@ -743,19 +742,17 @@ const handleSelectClick = (row, column, event) => {
   detailData.table[index].fp_bh = sczl_bh1
   detailData.table[index].fp_name = name
   dialogSelectVisible2.value = false
-  
 }
 
 // 弹窗确定
 const enterDialog = async() => {
-	
-	if (type.value === 'update') {
+  if (type.value === 'update') {
 	  updateDetailData()
-	} else if (type.value === 'add') {
+  } else if (type.value === 'add') {
 	  addDetailData()
-	}
+  }
 }
-//新增
+// 新增
 const addDetailData = async() => {
   const restoredData = {
     UniqId: detailData.UniqId,
@@ -775,7 +772,7 @@ const addDetailData = async() => {
     qczl_NumDesc6: detailData.qczl_NumDesc6,
     qczl_NumDesc7: detailData.qczl_NumDesc7,
     qczl_NumDesc8: detailData.qczl_NumDesc8,
-	sys_id:'[1003/洪桂芬]',
+    sys_id: '[1003/洪桂芬]',
   }
   detailData.table.forEach((item, index) => {
 	  const num = index + 1
@@ -784,11 +781,11 @@ const addDetailData = async() => {
 	  restoredData[`fp_bh${num}`] = item.fp_bh
 	  restoredData[`fp_bz${num}`] = item.fp_bz
 	  restoredData[`fp_gxmc${num}`] = item.fp_gxmc
-	})
+  })
   console.log(restoredData)
   const res = await add(restoredData)
   console.log(res)
-  
+
   if (res.code === 0) {
     ElMessage({
       type: 'success',
@@ -797,9 +794,9 @@ const addDetailData = async() => {
     dialogFormVisible.value = false
   }
 }
-//修改
+// 修改
 const updateDetailData = async() => {
-	const restoredData = {
+  const restoredData = {
 	  UniqId: detailData.UniqId,
 	  qczl_gdbh: detailData.qczl_gdbh,
 	  qczl_yjno: detailData.qczl_yjno,
@@ -817,23 +814,23 @@ const updateDetailData = async() => {
 	  qczl_NumDesc6: detailData.qczl_NumDesc6,
 	  qczl_NumDesc7: detailData.qczl_NumDesc7,
 	  qczl_NumDesc8: detailData.qczl_NumDesc8,
-	}
-	detailData.table.forEach((item, index) => {
+  }
+  detailData.table.forEach((item, index) => {
 	  const num = index + 1
 	  restoredData[`fp_lb${num}`] = item.fp_lb
 	  restoredData[`fp_sl${num}`] = item.fp_sl
 	  restoredData[`fp_bh${num}`] = item.fp_bh
 	  restoredData[`fp_bz${num}`] = item.fp_bz
 	  restoredData[`fp_gxmc${num}`] = item.fp_gxmc
-	})
-	const res = await updateData(restoredData)
-	if (res.code === 0) {
+  })
+  const res = await updateData(restoredData)
+  if (res.code === 0) {
 	  ElMessage({
 	    type: 'success',
 	    message: res.msg,
 	  })
 	  dialogFormVisible.value = false
-	}
+  }
 }
 
 // 多选
@@ -887,17 +884,18 @@ const closeDialog = () => {
 // 导出excel
 function exportExcel() {
   console.log('导出到excel')
+  dialogSbyxgl.value = true
 }
 
-const isShowMrhjtj = ref(false)
-const isShowGdzjfptj = ref(false)
+const dialogMrhjtj = ref(false)
+const dialogGdzjfptj = ref(false)
+const dialogSbyxgl = ref(false)
 const value1 = ref('')
 const table = ref(null)
 
-
 const showGdzjfptj = () => {
   value1.value = currentRow.value?.qczl_gdbh
-  isShowGdzjfptj.value = true
+  dialogGdzjfptj.value = true
 }
 const currentRow = ref()
 const handleSelectChange = (row, column, event) => {
@@ -905,15 +903,13 @@ const handleSelectChange = (row, column, event) => {
 }
 
 // 新增数据
-const handleShowAdd = async () => {
-  
-    type.value='add'
-    getDetailData(currentRow.value)
-	// type.value='add'
- //    Object.assign(detailData);
-	// dialogFormVisible.value = true
-  
-};
+const handleShowAdd = async() => {
+  type.value = 'add'
+  getDetailData(currentRow.value)
+  // type.value='add'
+  //    Object.assign(detailData);
+  // dialogFormVisible.value = true
+}
 </script>
 
 <style scoped>

src/view/performance/09-workOrderVerification/shebeizhuangtai.vue

@@ -1,879 +0,0 @@
-<template>
-  <div>
-    <el-container>
-      <!-- 左侧树形结构 -->
-      <el-scrollbar max-height="75vh">
-        <el-aside>
-          <div class="JKWTree-tree">
-            <h3>工单核验单维护</h3>
-            <el-tree
-              :data="treeData"
-              highlight-current
-              @node-click="handleNodeClick"
-            />
-          </div>
-        </el-aside>
-      </el-scrollbar>
-
-      <el-container>
-        <el-main>
-          <div class="gva-table-box">
-            <!-- 按钮区域 -->
-            <div class="gva-btn-list">
-              <el-row :span="6">
-                <el-input
-                  v-model="searchInfo"
-                  placeholder="输入工单编号"
-                />
-              </el-row>
-              <el-button
-                type="primary"
-                :icon="Search"
-                @click="handleSearch"
-              >搜索
-              </el-button>
-              <el-button
-                type="primary"
-                :icon="Search"
-                @click="isShowMrhjtj = true"
-              >每日核检统计
-              </el-button>
-
-              <el-button
-                type="primary"
-                :icon="Search"
-                @click="showGdzjfptj"
-              >工单质检废品统计
-              </el-button>
-
-              <div style="margin-left: auto;">
-                <el-button
-                  type="primary"
-                  :icon="Download"
-                  @click="exportExcel"
-                >导出到Excel</el-button>
-              </div>
-            </div>
-            <!-- 数据展示 -->
-            <el-table
-              ref="table"
-              style="width: 100%"
-              :data="tableData"
-              row-key="ID"
-              highlight-current-row
-              border
-              show-overflow-tooltip
-              :row-style="{ height: '20px' }"
-              :cell-style="{ padding: '0px' }"
-              :header-row-style="{ height: '20px' }"
-              :header-cell-style="{ padding: '0px' }"
-              @row-click="handleSelectChange"
-              @row-dblclick="doubleClick"
-            >
-              <el-table-column
-                type="selection"
-                width="55"
-              />
-              <!-- 循环渲染表格列 -->
-              <el-table-column
-                v-for="column in tableColumns"
-                :key="column.prop"
-                :prop="column.prop"
-                :label="column.label"
-                :width="column.width"
-              />
-
-            </el-table>
-            <!-- 分页 -->
-            <div class="gva-pagination">
-              <el-pagination
-                v-model:current-page="page"
-                v-model:page-size="limit"
-                layout="total, sizes, prev, pager, next, jumper"
-                :page-sizes="[10, 30, 50, 100]"
-                :total="total"
-                @current-change="handleCurrentChange"
-                @size-change="handleSizeChange"
-              />
-            </div>
-          </div>
-
-          <!-- 弹出框 -->
-          <el-dialog
-            v-model="dialogFormVisible"
-            :before-close="closeDialog"
-            :title="type === 'create' ? '添加' : '修改'"
-            destroy-on-close
-            width="70%"
-            style="position: fixed; top: 35%; left: 50%; transform: translate(-50%, -50%);"
-          >
-
-            <el-form
-              ref="elFormRef"
-              :model="detailData"
-              inline
-              label-position="left"
-              :rules="rule"
-            >
-              <el-form-item
-                label="日期"
-              >
-                <el-date-picker
-                  v-model="detailData.qczl_rq"
-                  type="date"
-                  style="width: 150px;"
-                />
-                <!--                <el-input
-                  v-model="detailData.qczl_rq"
-                  style="width: 120px;"
-                />-->
-              </el-form-item>
-              <el-form-item
-                label="工单编号"
-              >
-                <el-input
-                  v-model="detailData.qczl_gdbh"
-                  style="width: 100px;"
-                  @keyup.enter="handleGdbhEnter"
-                />
-              </el-form-item>
-              <el-form-item label="拼印主工单">
-                <el-input
-                  v-model="detailData.qczl_Pygd"
-                  style="width: 100px;"
-                />
-              </el-form-item>
-              <el-form-item
-                label="产品名称"
-              >
-                <el-input
-                  v-model="detailData.Gd_cpmc"
-                  style="width: 400px;"
-                  readonly
-                />
-              </el-form-item>
-              <br>
-              <el-form-item
-                label="印件号"
-              >
-                <el-input
-                  v-model="detailData.qczl_yjno"
-                  style="width: 60px;"
-                />
-              </el-form-item>
-              <el-form-item
-                label="印件名称"
-                style="margin-left: 47px"
-              >
-                <el-input
-                  v-model="detailData.yj_yjmc"
-                  style="width: 500px;"
-                  readonly
-                />
-              </el-form-item>
-              <el-form-item
-                label="废品总数"
-              >
-                <el-input
-                  v-model="detailData.qczl_fp"
-                  style="width: 100px;"
-                />
-              </el-form-item>
-              <br>
-
-              <el-form-item
-                label="工序"
-              >
-                <el-input
-                  v-model="detailData.qczl_gxmc"
-                  style="width: 200px;"
-                />
-              </el-form-item>
-              <el-form-item
-                label="工序号"
-              >
-                <el-input
-                  v-model="detailData.qczl_gxh"
-                  style="width: 100px;"
-                  readonly
-                />
-              </el-form-item>
-              <el-form-item
-                label="总流程号"
-              >
-                <el-input
-                  v-model="detailData.total_liucheng"
-                  style="width: 100px;"
-                  readonly
-                />
-              </el-form-item>
-
-              <el-form-item
-                label="流程单号"
-              >
-                <el-input
-                  v-model="detailData.qczl_num"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc1"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc2"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc3"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc4"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc5"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc6"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc7"
-                  style="width: 60px; margin-left: 5px;"
-                />
-                <el-input
-                  v-model="detailData.qczl_NumDesc8"
-                  style="width: 60px; margin-left: 5px;"
-                />
-              </el-form-item>
-
-              <el-form-item
-                label="备注"
-              >
-                <el-input
-                  v-model="detailData.qczl_NumDesc"
-                  style="width: 200px;"
-                />
-              </el-form-item>
-
-              <el-scrollbar height="400px">
-                <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="200"
-                  >
-                    <template #default="{ row, $index }">
-                      <el-input
-                        v-model="row.fp_lb"
-                        @keyup.enter="handleFplbEnter($index, row)"
-                      />
-                    </template>
-                  </el-table-column>
-
-                  <el-table-column
-                    label="数量"
-                    width="100"
-                  >
-                    <template #default="{ row, $index }">
-                      <el-input
-                        v-model="row.fp_sl"
-                        @keyup.enter="handleFpslEnter($index, row)"
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label="工序及责任机长"
-                    width="500"
-                  >
-                    <template #default="{ row }">
-                      <el-input
-                        v-model="row.fp_gxmc"
-                        readonly
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label=""
-                    width="100"
-                  >
-                    <template #default="{ row }">
-                      <el-input
-                        v-model="row.fp_bz"
-                        readonly
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label=""
-                    width="100"
-                  >
-                    <template #default="{ row }">
-                      <el-input
-                        v-model="row.fp_bh"
-                        readonly
-                      />
-                    </template>
-                  </el-table-column>
-                  <el-table-column
-                    label=""
-                    width="100"
-                  >
-                    <template #default="{ row }">
-                      <el-input
-                        v-model="row.fp_name"
-                        readonly
-                      />
-                    </template>
-                  </el-table-column>
-
-                </el-table>
-
-              </el-scrollbar>
-
-            </el-form>
-
-            <template #footer>
-              <div class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
-                <el-button
-                  type="primary"
-                  @click="enterDialog"
-                >确 定
-                </el-button>
-              </div>
-            </template>
-          </el-dialog>
-
-          <!-- 废品类别弹出选项框 -->
-          <el-dialog
-            v-model="dialogSelectVisible1"
-            title="选择"
-            destroy-on-close
-            width="600px"
-          >
-            <el-tree
-              :data="selecTreeData"
-              :props="defaultProps"
-              highlight-current
-              @node-click="handleFplbClick"
-            />
-          </el-dialog>
-
-          <!-- 弹出选项框 数量 -->
-          <el-dialog
-            v-model="dialogSelectVisible2"
-            title="选择"
-            destroy-on-close
-            width="800px"
-          >
-            <el-table
-              tooltip-effect="dark"
-              :data="selectData"
-              row-key="ID"
-              highlight-current-row
-              border
-              style="width:100%"
-              @row-dblclick="handleSelectClick"
-            >
-              <el-table-column
-                v-for=" column in selectColumns "
-                :key="column.prop"
-                :prop="column.prop"
-                :label="column.label"
-                :width="column.width"
-              />
-            </el-table>
-          </el-dialog>
-
-          <!-- 核验废品日统计弹出框 -->
-          <Meirihejiantongji
-            :is-show="isShowMrhjtj"
-            @my-close="isShowMrhjtj = false"
-          />
-
-          <!-- 工单质检废品统计 -->
-          <Gongdanzhijianfeipintongji
-            :is-show="isShowGdzjfptj"
-            :val="value1"
-            @my-close="isShowGdzjfptj =false"
-          />
-
-          <!-- 测试图表 -->
-          <el-dialog
-            title="【01.24 08:30】【JY01#--海德堡对开八色平版胶印机(JY08-01)】【2311116-->钻石(荷花）盒包装纸】【01--胶印】"
-            fullscreen
-          >
-            <Shebeizhuangtai />
-          </el-dialog>
-
-        </el-main>
-      </el-container>
-    </el-container>
-
-  </div>
-</template>
-
-<script setup>
-import {
-  createCompany,
-  deleteCompany,
-  deleteCompanyByIds,
-  updateCompany,
-  findCompany,
-  getCompanyList
-} from '@/api/company'
-
-// 全量引入格式化工具 请按需保留
-import { ElMessage } from 'element-plus'
-import { Search, Refresh, Download } from '@element-plus/icons-vue'
-import { ref, reactive } from 'vue'
-import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData } from '@/api/mes_api_gty/workOrderVerification'
-import Meirihejiantongji from './meirihejiantongji.vue'
-import Gongdanzhijianfeipintongji from './gongdanzhijianfeipintongji.vue'
-import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/shebeizhuangtai.vue'
-
-defineOptions({
-  name: '06PackingDocuments'
-})
-
-// 侧边栏数据请求
-const treeData = reactive([])
-const getSideData = async() => {
-  const response = await getSide()
-  if (response.code === 0) {
-    const transformedData = response.data.map(item => ({
-      label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
-      children: item.sys.map(sysItem => ({
-        label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
-        params: {
-          date: item.date.replace(/\./g, '-'),
-          sys_id: sysItem.sys_id,
-        },
-      })),
-    }))
-    treeData.splice(0, treeData.length, ...transformedData)
-  }
-}
-
-getSideData()
-
-// 验证规则
-const rule = reactive({
-})
-
-const elFormRef = ref()
-const elSearchFormRef = ref()
-
-// =========== 表格控制部分 ===========
-const tableColumns = [
-  { label: '工单编号', prop: 'qczl_gdbh', width: '100' },
-  { label: '印件号', prop: 'qczl_yjno', width: '100' },
-  { label: '印件名称', prop: 'Gd_cpmc', width: '400' },
-  { label: '日期', prop: 'qczl_rq', width: '100' },
-  { label: '流程单号', prop: 'qczl_num', width: '100' },
-  { label: '流程单备注', prop: 'qczl_NumDesc', width: '100' },
-  { label: '总废品', prop: 'qczl_fp', width: '100' },
-  { label: '废品1', prop: 'sl_lb1', width: '250' },
-  { label: '废品2', prop: 'sl_lb2', width: '250' },
-  { label: '废品3', prop: 'sl_lb3', width: '250' },
-  { label: '废品4', prop: 'sl_lb4', width: '250' },
-  { label: '废品5', prop: 'sl_lb5', width: '250' },
-  { label: '废品6', prop: 'sl_lb6', width: '250' },
-  { label: '废品7', prop: 'sl_lb7', width: '250' },
-  { label: '废品8', prop: 'sl_lb8', width: '250' },
-  { label: '废品9', prop: 'sl_lb9', width: '250' },
-  { label: '废品10', prop: 'sl_lb10', width: '250' },
-  { label: '废品11', prop: 'sl_lb11', width: '250' },
-  { label: '废品12', prop: 'sl_lb12', width: '250' },
-  { label: '废品13', prop: 'sl_lb13', width: '250' },
-  { label: '废品14', prop: 'sl_lb14', width: '250' },
-  { label: '废品15', prop: 'sl_lb15', width: '250' },
-  { label: '废品16', prop: 'sl_lb16', width: '250' },
-  { label: '废品17', prop: 'sl_lb17', width: '250' },
-  { label: '创建用户', prop: 'sys_id', width: '200' }
-]
-const tableData = reactive([])
-
-const total = ref(0)
-const page = ref(1)
-const limit = ref(10)
-
-const searchInfo = ref('')
-const params = {
-  date: '',
-  sys_id: '',
-  order: '',
-  page: page.value.toString(),
-  limit: limit.value.toString(),
-}
-
-// 批量删除控制标记
-const deleteVisible = ref(false)
-const multipleSelection = ref([])
-
-const getTableData = async() => {
-  const response = await getTable(params)
-  if (response.code === 0) {
-    total.value = response.data.total
-    // Object.assign(tableData, response.data.rows)
-    tableData.splice(0, tableData.length, ...response.data.rows)
-  }
-}
-
-// 左侧树结构点击
-const handleNodeClick = (node, check) => {
-  if (node.params) {
-    params.date = node.params.date
-    params.sys_id = node.params.sys_id
-    page.value = 1
-    handleCurrentChange()
-  }
-}
-
-// 搜索
-function handleSearch() {
-  params.sys_id = ''
-  params.date = ''
-  params.order = searchInfo.value
-  page.value = 1
-  handleCurrentChange()
-}
-
-// 分页
-const handleSizeChange = () => {
-  params.limit = limit.value.toString()
-  getTableData()
-}
-
-// 页面跳转
-const handleCurrentChange = () => {
-  params.page = page.value.toString()
-  getTableData()
-}
-
-// ============== 详情页面 ==============
-const detailData = reactive({})
-const selectData = reactive([])
-const selectColumns = [
-  { label: '', prop: 'sczl_gxmc', width: '600' },
-  { label: '', prop: 'sczl_bzdh', width: '100' },
-  { label: '', prop: 'name', width: '100' },
-]
-let selecTreeData = []
-
-// 行为控制标记（弹窗内部需要增还是改）
-const type = ref('')
-
-// 弹窗控制标记
-const dialogFormVisible = ref(false)
-const dialogSelectVisible1 = ref(false)
-const dialogSelectVisible2 = ref(false)
-
-let selectIndex = 0
-
-const getDetailData = async(id) => {
-  try {
-    const res = await getOneWorkOrder({ UniqId: id })
-    if (res.code === 0) {
-      const obj = res.data
-      // 裁剪返回数据的前后空格
-      for (const key in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === 'string') {
-          obj[key] = obj[key].trim()
-        }
-      }
-      // 修改日期格式
-      if (Object.prototype.hasOwnProperty.call(obj, 'qczl_rq') && typeof obj['qczl_rq'] === 'string') {
-        obj['qczl_rq'] = obj['qczl_rq'].split(' ')[0]
-      }
-
-      Object.assign(detailData, obj)
-      const table = []
-
-      // 循环13行数据
-      for (let i = 1; i <= 13; i++) {
-        table.push({
-          fp_lb: detailData[`fp_lb${i}`] || '',
-          fp_sl: detailData[`fp_sl${i}`] || '',
-          fp_gxmc: detailData[`fp_gxmc${i}`] || '',
-          fp_bz: detailData[`fp_bz${i}`] || '',
-          fp_bh: detailData[`fp_bh${i}`] || '',
-          fp_name: detailData[`fp_name${i}`] || '',
-        })
-        // 从原对象中删除这些属性
-        delete detailData[`fp_lb${i}`]
-        delete detailData[`fp_sl${i}`]
-        delete detailData[`fp_gxmc${i}`]
-        delete detailData[`fp_bz${i}`]
-        delete detailData[`fp_bh${i}`]
-        delete detailData[`fp_name${i}`]
-      }
-      detailData.table = table
-      try {
-        const res = await getOrderInfo({ order: detailData.qczl_gdbh })
-        if (res.code === 0) {
-          detailData.Gd_cpmc = res.data.Gd_cpmc
-          dialogFormVisible.value = true
-        }
-      } catch (e) {
-        console.log(e)
-      }
-    }
-  } catch (e) {
-    console.log(e)
-  }
-}
-
-// 工单编号回车
-const handleGdbhEnter = async() => {
-  const res = await getOrderInfo({ order: detailData.qczl_gdbh })
-  if (res.code === 0) {
-    const { Gd_cpmc, yj_Yjno, yj_yjmc } = res.data
-    detailData.Gd_cpmc = Gd_cpmc
-    detailData.qczl_yjno = yj_Yjno
-    detailData.yj_yjmc = yj_yjmc
-  }
-}
-
-// 废品类别回车
-const handleFplbEnter = async(index, row) => {
-  let res
-  try {
-    res = await getWastInfo({ search: row.fp_lb })
-    if (res.code !== 0) {
-      return
-    }
-  } catch (e) {
-    console.log(e)
-    return
-  }
-
-  const obj = res.data
-  const treeData = []
-  for (const category in obj) {
-    if (Object.prototype.hasOwnProperty.call(obj, category)) {
-      const children = []
-
-      for (const subCategory in obj[category]) {
-        if (Object.prototype.hasOwnProperty.call(obj[category], subCategory)) {
-          const subChildren = obj[category][subCategory].map(item => {
-            return { label: item }
-          })
-
-          children.push({
-            label: subCategory,
-            children: subChildren
-          })
-        }
-      }
-
-      treeData.push({
-        label: category,
-        children: children
-      })
-    }
-  }
-  selecTreeData = treeData
-  selectIndex = index
-  dialogSelectVisible1.value = true
-}
-
-const handleFplbClick = (node, check) => {
-  if (!node.children) {
-    detailData.table[selectIndex].fp_lb = node.label
-    dialogSelectVisible1.value = false
-  }
-}
-
-// 废品数量回车
-const handleFpslEnter = async(index, row) => {
-  if (row.fp_sl === '0') {
-    detailData.table[index].fp_gxmc = ''
-    detailData.table[index].fp_bz = ''
-    detailData.table[index].fp_bh = ''
-    detailData.table[index].fp_name = ''
-    return
-  }
-
-  const params = {
-    type: row.fp_lb,
-    order: detailData.qczl_gdbh,
-  }
-  let res
-  try {
-    res = await getGxAndLeader(params)
-    if (res.code !== 0) {
-      return
-    }
-  } catch (e) {
-    console.log(e)
-    return
-  }
-  selectIndex = index
-  Object.assign(selectData, res.data)
-  dialogSelectVisible2.value = true
-}
-
-// 双击表格操作
-function doubleClick(row, column, event) {
-  type.value = 'update'
-  getDetailData(row.UniqId)
-}
-
-// 处理选择框回车操作
-const handleSelectClick = (row, column, event) => {
-  const { sczl_gxmc, sczl_bzdh, sczl_bh1, name } = row
-  const index = selectIndex
-  detailData.table[index].fp_gxmc = sczl_gxmc
-  detailData.table[index].fp_bz = sczl_bzdh
-  detailData.table[index].fp_bh = sczl_bh1
-  detailData.table[index].fp_name = name
-  dialogSelectVisible2.value = false
-}
-
-// 弹窗确定
-const enterDialog = async() => {
-  const restoredData = {
-    UniqId: detailData.UniqId,
-    qczl_gdbh: detailData.qczl_gdbh,
-    qczl_yjno: detailData.qczl_yjno,
-    qczl_gxh: detailData.qczl_gxh,
-    qczl_gxmc: detailData.qczl_gxmc,
-    qczl_rq: detailData.qczl_rq,
-    qczl_fp: detailData.qczl_fp,
-    qczl_num: detailData.qczl_num,
-    qczl_NumDesc: detailData.qczl_NumDesc,
-    qczl_NumDesc1: detailData.qczl_NumDesc1,
-    qczl_NumDesc2: detailData.qczl_NumDesc2,
-    qczl_NumDesc3: detailData.qczl_NumDesc3,
-    qczl_NumDesc4: detailData.qczl_NumDesc4,
-    qczl_NumDesc5: detailData.qczl_NumDesc5,
-    qczl_NumDesc6: detailData.qczl_NumDesc6,
-    qczl_NumDesc7: detailData.qczl_NumDesc7,
-    qczl_NumDesc8: detailData.qczl_NumDesc8,
-  }
-  detailData.table.forEach((item, index) => {
-    const num = index + 1
-    restoredData[`fp_lb${num}`] = item.fp_lb
-    restoredData[`fp_sl${num}`] = item.fp_sl
-    restoredData[`fp_bh${num}`] = item.fp_bh
-    restoredData[`fp_bz${num}`] = item.fp_bz
-    restoredData[`fp_gxmc${num}`] = item.fp_gxmc
-  })
-  const res = await updateData(restoredData)
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: res.msg,
-    })
-    dialogFormVisible.value = false
-  }
-}
-
-// 多选
-const handleSelectionChange = (val) => {
-  multipleSelection.value = val
-}
-
-// 多选删除
-const onDelete = async() => {
-  const ids = []
-  if (multipleSelection.value.length === 0) {
-    ElMessage({
-      type: 'warning',
-      message: '请选择要删除的数据'
-    })
-    return
-  }
-  multipleSelection.value &&
-    multipleSelection.value.map(item => {
-      ids.push(item.ID)
-    })
-  const res = await deleteCompanyByIds({ ids })
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '删除成功'
-    })
-    if (tableData.value.length === ids.length && page.value > 1) {
-      page.value--
-    }
-    deleteVisible.value = false
-    getTableData()
-  }
-}
-
-// 更新行
-const updateCompanyFunc = async(row) => {
-  const res = await findCompany({ ID: row.ID })
-  type.value = 'update'
-  if (res.code === 0) {
-    formData.value = res.data.recompany
-    dialogFormVisible.value = true
-  }
-}
-
-// 关闭弹窗
-const closeDialog = () => {
-  dialogFormVisible.value = false
-}
-
-// 导出excel
-function exportExcel() {
-  console.log('导出到excel')
-}
-
-const isShowMrhjtj = ref(false)
-const isShowGdzjfptj = ref(false)
-const value1 = ref('')
-const table = ref(null)
-const currentRow = ref()
-
-const showGdzjfptj = () => {
-  value1.value = currentRow.value?.qczl_gdbh
-  isShowGdzjfptj.value = true
-}
-
-const handleSelectChange = (row, column, event) => {
-  currentRow.value = row
-}
-
-</script>
-
-<style scoped>
-.JKWTree-container {
-  display: flex;
-}
-
-.JKWTree-tree {
-  width: 300px;
-  background-color: #fff;
-  padding: 10px;
-  margin-right: 20px;
-}
-
-.JKWTree-tree h3 {
-  font-size: 15px;
-  font-weight: 700;
-  margin: 10px 0;
-}
-
-.JKWTree-content {
-  flex: 1;
-}
-
-/* 选中某行时的背景色 */
-:deep(.el-table__body tr.current-row) > td {
-  background: #ff80ff !important;
-}
-</style>

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

@@ -0,0 +1,166 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="产品工艺流程"
+    destroy-on-close
+    :before-close="()=>{emits('update:modelValue', false )}"
+    style="width: 80vw; height: 80vh"
+  >
+    <el-form
+      inline
+      label-position="left"
+    >
+      <el-form-item
+        label="工单编号"
+      >
+        <el-input
+          v-model="input"
+          style="width: 120px;"
+          @keyup.enter="handleShowDetail"
+        />
+      </el-form-item>
+
+      <el-table
+        :data="detailData"
+        border
+        height="50vh"
+        :row-style="{ height: '20px' }"
+        :cell-style="{ padding: '0px' }"
+        :header-row-style="{ height: '20px' }"
+        :header-cell-style="{ padding: '0px' }"
+      >
+        <el-table-column
+          label="印件及工序"
+          width="100"
+          prop="Gy0_yjno"
+        />
+
+        <el-table-column
+          label="工序名称"
+          width="300"
+          prop="Gy0_gxmc"
+        />
+
+        <el-table-column
+          label="基础损耗"
+          width="100"
+          prop="Gy0_rate0"
+        />
+
+        <el-table-column
+          label="损耗率"
+          width="100"
+          prop="Gy0_rate1"
+        />
+
+        <el-table-column
+          label="损耗系数"
+          width="100"
+          prop="损耗系数"
+        />
+        <el-table-column
+          label="无形损减免比例"
+          width="150"
+        >
+          <template #default="{ row }">
+            <el-input v-model="row['loss_one']" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="超节损承担比例"
+          width="150"
+        >
+          <template #default="{ row }">
+            <el-input v-model="row['loss_two']" />
+          </template>
+        </el-table-column>
+        <el-table-column
+          label="超节损核算单价"
+          width="150"
+        >
+          <template #default="{ row }">
+            <el-input v-model="row['loss_thr']" />
+          </template>
+        </el-table-column>
+
+      </el-table>
+
+    </el-form>
+
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="()=>{emits('update:modelValue', false )}">取 消</el-button>
+        <el-button
+          type="primary"
+          @click="handleUpdateDatail"
+        >更 新
+        </el-button>
+      </div>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: 'Detail',
+}
+import service from '@/utils/request'
+// 3.1查改-获取工单工艺流程
+const getOrderGy = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderGy',
+    method: 'get',
+    params
+  })
+}
+
+// 3.2查改-更新产品工艺资料
+const updateOrderGy = (data) => {
+  return service({
+    url: '/mes_server/order_super_loss/updateOrderGy',
+    method: 'post',
+    data
+  })
+}
+
+</script>
+<script setup>
+
+import { defineEmits, defineProps, ref } from 'vue'
+import { ElMessage } from 'element-plus'
+
+const props = defineProps(['modelValue', 'gdbh'])
+const emits = defineEmits(['update:modelValue'])
+const detailData = ref([])
+const input = ref(props['gdbh'])
+
+const handleShowDetail = async() => {
+  const res = await getOrderGy({ order: input.value })
+  if (res['code'] === 0) {
+    const { data } = res
+    detailData.value = data.map(item => ({
+      ...item,
+      Gy0_yjno: item['Gy0_yjno'] + '-' + item['Gy0_gxh'],
+    }))
+  }
+}
+const handleUpdateDatail = async() => {
+  const val = detailData.value.map(item => ({
+    UniqId: item['UniqId'],
+    loss_one: item['loss_one'],
+    loss_two: item['loss_two'],
+    loss_thr: item['loss_thr'],
+  }))
+  const res = await updateOrderGy(val)
+  if (res['code'] === 0) {
+    ElMessage({
+      type: 'success',
+      message: '更新成功',
+    })
+  }
+}
+
+</script>
+
+<style scoped>
+</style>

src/view/performance/12-orderAccounting/gdcjstj.vue → src/view/performance/12-orderAccounting/componets/gdcjstj.vue

@@ -1,5 +1,6 @@
 <template>
-  <div>
+  <div style="width: 30vw; height: 50vh">
+    <el-input v-model="input" />
     <el-button
       @click="handlePrint"
     >打印测试
@@ -746,10 +747,7 @@ const jsonData = {
   }],
 }
 const props = defineProps(['gdbh'])
-console.log(props)
-watch(props, (value, oldValue, onCleanup) => {
-  console.log(value)
-})
+const input = ref(props?.['gdbh'])
 
 // 引入后使用示例
 hiprint.init()
@@ -759,7 +757,7 @@ const hiprintTemplate = new hiprint.PrintTemplate({ template: jsonData })
 
 const handlePrint = async() => {
   const params = {
-    order: '2310720',
+    order: input.value,
     type: '1',
   }
   const res = await getOrderSuperLossCount(params)

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

@@ -0,0 +1,167 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="工序产量核查"
+    fullscreen
+    :before-close="()=>{emits('update:modelValue', false )}"
+  >
+    <el-button
+      type="primary"
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click="emits('update:modelValue', false )"
+    >退出</el-button>
+
+    <el-form inline>
+      <el-form-item label="工单编号">
+        <el-input
+          v-model="input"
+          style="width: 100px"
+          @keyup.enter="handleGetTable"
+        />
+        <el-input
+          v-model="cpmc"
+          class="cpmc"
+          readonly
+          style="width: 400px;margin-left: 3px"
+        />
+      </el-form-item>
+
+      <el-table
+        :data="tableData"
+        border
+        highlight-current-row
+        show-overflow-tooltip
+        height="70vh"
+        :row-style="{ height: '20px' }"
+        :cell-style="{ padding: '0px' }"
+        :header-row-style="{ height: '20px' }"
+        :header-cell-style="{ padding: '0px' }"
+      >
+        <el-table-column
+          label="印件及工序名称"
+          width="250"
+          prop="Gy0_yjno"
+        />
+
+        <el-table-column
+          label="工序计划产量"
+          width="120"
+          prop="Gy0_计划接货数"
+        />
+
+        <el-table-column
+          label="联数"
+          width="80"
+          prop="Gy0_ls"
+        />
+
+        <el-table-column
+          label="折算车头产量"
+          width="120"
+          prop=""
+        />
+
+        <el-table-column
+          label="实际上报产量"
+          width="120"
+          prop="Gy0_ls"
+        />
+        <el-table-column
+          label="制程废品"
+          width="120"
+          prop=""
+        />
+        <el-table-column
+          label="制程废品率"
+          width="120"
+          prop="制程废品率"
+        />
+        <el-table-column
+          label="来料异常"
+          width="120"
+          prop="来料异常"
+        />
+        <el-table-column
+          label="流程单数"
+          width="120"
+          prop="process_num"
+        />
+        <el-table-column
+          label="当前设备"
+          width="120"
+          prop="Gy0_sbbh"
+        />
+        <el-table-column
+          label="工序状态"
+          width="120"
+          prop="PD_WG"
+        />
+        <el-table-column
+          label="首板生产日期"
+          width="120"
+          prop="sczl_rq"
+        />
+
+      </el-table>
+
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+  name: 'Gxclhc',
+}
+
+// 4.1考核设置-获取工单印件资料
+import service from '@/utils/request'
+const getOrderProcessCount = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderProcessCount',
+    method: 'get',
+    params
+  })
+}
+
+const getGxMc = (params) => {
+  return service({
+    url: '/mes_server/packaging_count_document/getGxMc',
+    method: 'get',
+    params
+  })
+}
+
+</script>
+
+<script setup>
+import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount } from 'vue'
+
+const props = defineProps(['modelValue', 'gdbh'])
+const emits = defineEmits(['update:modelValue'])
+const input = ref(props.gdbh)
+const cpmc = ref('')
+const tableData = ref([])
+const handleGetTable = async() => {
+  const ret = await getGxMc({ gdbh: input.value })
+  if (ret['code'] === 0) {
+    cpmc.value = ret['data'][0]['Gd_cpmc']
+    console.log(ret['data'])
+  }
+  const res = await getOrderProcessCount({ order: input.value })
+  if (res['code'] === 0) {
+    const { data } = res
+    tableData.value = data.map(item => ({
+      ...item,
+      Gy0_yjno: `${item['Gy0_yjno']}-${item['Gy0_gxh']} ${item['Gy0_gxmc']} ${item['Add_gxmc']}`,
+    }))
+  }
+}
+handleGetTable()
+</script>
+
+<style scoped>
+:deep(.cpmc .el-input__inner) {
+  color: red !important;
+}
+</style>

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

@@ -0,0 +1,138 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    title="修正工单印件质量考核设置"
+    fullscreen
+    :before-close="()=>{emits('update:modelValue', false )}"
+  >
+    <el-button
+      type="primary"
+      disabled
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click=""
+    >更新</el-button>
+    <el-button
+      type="primary"
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click="emits('update:modelValue', false )"
+    >退出</el-button>
+
+    <el-form inline>
+      <el-form-item label="工单编号">
+        <el-input
+          v-model="input"
+          autocomplete="off"
+          style="width: 100px"
+          @keyup.enter="handleGetTable"
+        />
+      </el-form-item>
+
+      <el-table
+        :data="tableData"
+        border
+        height="70vh"
+        :row-style="{ height: '20px' }"
+        :cell-style="{ padding: '0px' }"
+        :header-row-style="{ height: '20px' }"
+        :header-cell-style="{ padding: '0px' }"
+      >
+        <el-table-column
+          label="工单编号"
+          width="100"
+          prop="Yj_gdbh"
+        />
+
+        <el-table-column
+          label="印件编码"
+          width="100"
+          prop="yj_Yjdh"
+        />
+
+        <el-table-column
+          label="印件号"
+          width="100"
+          prop="yj_Yjno"
+        />
+
+        <el-table-column
+          label="印件名称"
+          width="400"
+          prop="yj_yjmc"
+        />
+
+        <el-table-column
+          label="当前考核设置"
+          width="150"
+          prop="当前考核设置"
+        />
+        <el-table-column
+          label="新考核设置"
+          width="150"
+        >
+
+          <template #default="{ row }">
+            <!-- 使用 el-select 来创建选择框 -->
+            <el-select
+              v-model="row.新考核设置"
+              placeholder="请选择"
+            >
+              <el-option
+                label="参与"
+                value="参与"
+              />
+              <el-option
+                label="剔除"
+                value="剔除"
+              />
+            </el-select>
+          </template>
+
+        </el-table-column>
+
+      </el-table>
+
+    </el-form>
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+  name: 'Khsz',
+}
+
+// 4.1考核设置-获取工单印件资料
+import service from '@/utils/request'
+export const getOrderYj = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderYj',
+    method: 'get',
+    params
+  })
+}
+
+</script>
+
+<script setup>
+import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount } from 'vue'
+
+const props = defineProps(['modelValue', 'gdbh'])
+const emits = defineEmits(['update:modelValue'])
+const input = ref(props.gdbh)
+const tableData = ref([])
+const handleGetTable = async() => {
+  const res = await getOrderYj({ order: input.value })
+  if (res['code'] === 0) {
+    const { data } = res
+    data['当前考核设置'] = data['质量考核'] === 0 ? '参与' : '剔除'
+    data['新考核设置'] = data['当前考核设置']
+    const arr = [data]
+    console.log(arr)
+    tableData.value = arr
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,228 @@
+<template>
+  <el-dialog
+    :model-value="modelValue"
+    :title="`修正工单实际投料(${props?.['date']})`"
+    fullscreen
+    :before-close="()=>{emits('update:modelValue', false )}"
+  >
+    <el-button
+      type="primary"
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click="handleUpdate"
+    >更新</el-button>
+
+    <el-button
+      type="primary"
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click="handleSearch"
+    >定位</el-button>
+
+    <el-button
+      type="primary"
+      style="width:80px; height: 40px;margin-bottom: 20px"
+      @click="emits('update:modelValue', false )"
+    >退出</el-button>
+
+    <el-table
+      ref="table"
+      highlight-current-row
+      show-overflow-tooltip
+      border
+      :data="tableData"
+      :row-style="{ height: '25px' }"
+      :cell-style="{ padding: '0px' }"
+      :header-row-style="{ height: '20px' }"
+      :header-cell-style="{ padding: '0px' }"
+      style="width: 100%;height: 75vh;"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column
+        type="selection"
+        width="55"
+      />
+      <el-table-column
+        label="工单编号"
+        prop="Gd_gdbh"
+        width="100"
+      />
+      <el-table-column
+        label="印件号"
+        prop="yj_Yjno"
+        width="100"
+      />
+      <el-table-column
+        label="印件代号"
+        prop="yj_yjdh"
+        width="100"
+      />
+      <el-table-column
+        label="开数*联数"
+        prop="yj_ls"
+        width="120"
+      />
+      <el-table-column
+        label="物料代码"
+        prop="yj_zzdh"
+        width="100"
+      />
+      <el-table-column
+        label="物料名称"
+        prop="BOM_物料名称"
+        width="250"
+      />
+      <el-table-column
+        label="规格"
+        prop="yj_tlgg"
+        width="100"
+      />
+      <el-table-column
+        label="领用单位"
+        prop="BOM_投料单位"
+        width="100"
+      />
+      <el-table-column
+        label="订单数量（万张）"
+        prop="订单数量"
+        width="150"
+      />
+      <el-table-column
+        label="当前投料"
+        prop="yj_平张投料"
+        width="100"
+      />
+      <el-table-column
+        label="实际用量"
+        prop="BOM_实际用量"
+        width="100"
+      />
+      <el-table-column
+        label="换算率"
+        prop=""
+        width="100"
+      />
+      <el-table-column
+        label="折算投料（万张）"
+        width="150"
+      >
+        <template #default="{ row }">
+          <el-input v-model="row['实际投料']" />
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="投料确认"
+        prop="投料确认"
+        width="200"
+      />
+
+    </el-table>
+
+  </el-dialog>
+
+</template>
+
+<script>
+export default {
+  name: 'Xzgdtl',
+}
+// 5.1修正工单实际投料-获取列表
+import service from '@/utils/request'
+
+const getOrderFeedList = (params) => {
+  return service({
+    url: '/mes_server/order_super_loss/getOrderFeedList',
+    method: 'get',
+    params
+  })
+}
+
+// 5.2更新工单实际投料
+const updateOrderFeed = (data) => {
+  return service({
+    url: '/mes_server/order_super_loss/updateOrderFeed',
+    method: 'post',
+    data
+  })
+}
+</script>
+
+<script setup>
+import { ElMessage, ElMessageBox } from 'element-plus'
+import { watch, ref, reactive, defineProps, defineEmits, onBeforeUnmount } from 'vue'
+
+const props = defineProps(['modelValue', 'date'])
+const emits = defineEmits(['update:modelValue'])
+const tableData = ref([])
+const table = ref(null)
+const multipleSelection = ref([])
+const getTable = async() => {
+  let params
+  if (props?.['date']) {
+    const { date } = props
+    params = {
+      year: date.slice(0, 4),
+      month: date.slice(4, 6),
+    }
+  } else {
+    return
+  }
+  const res = await getOrderFeedList(params)
+  if (res['code'] === 0) {
+    const { data } = res
+    tableData.value = data
+  }
+}
+getTable()
+
+const handleSelectionChange = (val) => {
+  multipleSelection.value = val
+}
+
+const handleSearch = () => {
+  ElMessageBox.prompt('输入工单编号', '定位', {
+    confirmButtonText: '确认',
+    cancelButtonText: '取消',
+  })
+    .then(({ value }) => {
+      console.log(value)
+      if (!value) {
+        getTable()
+      } else {
+        tableData.value = tableData.value.filter(item => {
+          return item['Gd_gdbh'] === value ?? item
+        })
+      }
+      ElMessage({
+        type: 'success',
+        message: '定位',
+      })
+    })
+    .catch(() => {
+      ElMessage({
+        type: 'info',
+        message: '取消',
+      })
+    })
+}
+
+const handleUpdate = async() => {
+  if (multipleSelection.value.length === 0) {
+    console.log('未选择行')
+    return
+  }
+  const params = multipleSelection.value.map(item => ({
+    UniqId: item['UniqId'],
+    number: item['实际投料'],
+  }))
+  const res = await updateOrderFeed(params)
+  if (res['code'] === 0) {
+    ElMessage({
+      type: 'success',
+      message: '更新成功',
+    })
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -20,13 +20,15 @@
                 type="primary"
                 icon="search"
                 class="search"
+                @click="handleSearch"
               />
               <el-button
                 type="primary"
                 icon="edit"
                 class="bt"
-                @click="onStatusClick"
-              ><i class="el-icon-edit" />查改</el-button>
+                @click="() => {dialogDetail = true}"
+              ><i class="el-icon-edit" />查改
+              </el-button>
               <!--                <el-button type="primary" disabled icon="edit" @click="" style="margin-left: 10px">工艺方案复制</el-button>-->
               <el-button
                 type="primary"
@@ -36,18 +38,87 @@
               >工单超节损统计
               </el-button>
 
+              <el-button
+                type="primary"
+                icon="edit"
+                class="bt"
+                @click="()=>{dialogKhsz = true}"
+              >考核设置
+              </el-button>
+
+              <el-button
+                type="primary"
+                icon="edit"
+                class="bt"
+                @click="()=>{dialogXzgdtl = true}"
+              >修正工单投料
+              </el-button>
+
+              <el-button
+                type="primary"
+                icon="edit"
+                class="bt"
+                @click="()=>{dialogGxclhc = true}"
+              >工序产量核查
+              </el-button>
+
+              <el-button
+                type="primary"
+                icon="edit"
+                class="bt"
+                @click="()=>{dialogGdzjfptj = true}"
+              >工单质检废品统计
+              </el-button>
+
             </el-form-item>
           </el-form>
 
           <!--按钮弹窗部分-->
+
+          <!-- 查改 -->
+          <Detail
+            v-if="dialogDetail"
+            v-model="dialogDetail"
+            :gdbh="gdbh"
+          />
+
+          <!-- 工单超节损统计 -->
           <el-dialog
             v-model="dialogGdcjstj"
             title="工单超节损统计"
-            style="width: 20vw;height: 30vh"
+            destroy-on-close
           >
-            <Gdcjstj :gdbh="currentRow" />
+            <Gdcjstj :gdbh="gdbh" />
           </el-dialog>
 
+          <!-- 修正工单印件质量考核设置 -->
+          <Khsz
+            v-if="dialogKhsz"
+            v-model="dialogKhsz"
+            :gdbh="gdbh"
+          />
+
+          <!-- 修正工单投料 -->
+          <Xzgdtl
+            v-if="dialogXzgdtl"
+            v-model="dialogXzgdtl"
+            :date="date"
+          />
+
+          <!-- 工序产量核查 -->
+          <Gxclhc
+            v-if="dialogGxclhc"
+            v-model="dialogGxclhc"
+            :gdbh="gdbh"
+          />
+
+          <!-- 工单质检废品统计 -->
+          <Gongdanzhijianfeipintongji
+            v-if="dialogGdzjfptj"
+            v-model="dialogGdzjfptj"
+            :val="gdbh"
+          />
+
         </div>
       </layout-header>
 
@@ -119,7 +190,6 @@
             :cell-style="{ padding: '0px' }"
             :header-row-style="{ height: '20px' }"
             :header-cell-style="{ padding: '0px' }"
-            @row-dblclick="doubleClick"
           >
             <el-table-column
               type="selection"
@@ -134,28 +204,33 @@
               :width="column.width"
               show-overflow-tooltip="true"
             />
-
           </el-table>
-
         </layout-content>
-
       </layout>
     </layout>
   </div>
 </template>
 <script setup>
 // 全量引入格式化工具 请按需保留
-import { ElMessage, ElMessageBox } from 'element-plus'
-import { Layout, LayoutSider, LayoutContent, LayoutHeader } from '@arco-design/web-vue'
-import { ref, reactive } from 'vue'
-import { getSide, getTable, getOrderSuperLossGy } from '@/api/mes_api_gty/orderAccounting'
-import Gdcjstj from '@/view/performance/12-orderAccounting/gdcjstj.vue'
-
-defineOptions({ name: 'Company' })
+import { Layout, LayoutContent, LayoutHeader, LayoutSider } from '@arco-design/web-vue'
+import { ref, watch } from 'vue'
+import { getOrderGy, getOrderSuperLossGy, getSide, getTable, updateOrderGy } from '@/api/mes_api_gty/orderAccounting'
+import Gdcjstj from '@/view/performance/12-orderAccounting/componets/gdcjstj.vue'
+import Khsz from '@/view/performance/12-orderAccounting/componets/khsz.vue'
+import Xzgdtl from '@/view/performance/12-orderAccounting/componets/xzgdtl.vue'
+import Gxclhc from '@/view/performance/12-orderAccounting/componets/gxclhc.vue'
+import Gongdanzhijianfeipintongji
+  from '@/view/performance/09-workOrderVerification/componets/gongdanzhijianfeipintongji.vue'
+import Detail from '@/view/performance/12-orderAccounting/componets/detail.vue'
 
+// 弹窗
 const dialogGdcjstj = ref(false)
+const dialogDetail = ref(false)
+const dialogKhsz = ref(false)
+const dialogXzgdtl = ref(false)
+const dialogGxclhc = ref(false)
+const dialogGdzjfptj = ref(false)
 
-// =========== 左侧树侧形结构 ===========
 // 侧边栏数据
 const treeData = ref([])
 const getSideData = async() => {
@@ -172,7 +247,7 @@ const getSideData = async() => {
         children: value.map(item => ({
           label: `${item['客户编号']}【${item['客户名称']}】(工单数:${item.total})`,
           date: date,
-          code: item?.['客户编号']
+          code: item?.['客户编号'],
         })),
       }
       transformedData.push(transformedItem)
@@ -180,10 +255,9 @@ const getSideData = async() => {
     treeData.value = transformedData
   }
 }
-
 getSideData()
 
-// =========== 表格数据部分 ===========
+// 表格数据
 const tableCols1 = [
   { label: '超损工单', prop: '', width: '90' },
   { label: '工单编号', prop: 'Gd_gdbh', width: '100' },
@@ -227,17 +301,24 @@ const tableCols2 = [
 const tableData1 = ref([])
 const tableData2 = ref([])
 const currentRow = ref({})
+const gdbh = ref('')
+const date = ref('')
+const searchInfo = ref('')
+
+watch(currentRow, (value, oldValue, onCleanup) => {
+  gdbh.value = value?.['Gd_gdbh']
+  date.value = value?.['年月']
+})
 
 // 显示上方表格
 const handleNodeClick = async(node) => {
   if (node.children) {
-    console.log(node.date)
     const { date } = node
     const res = await getTable({ date, limit: 9999, page: 1 })
     tableData1.value = res.data.data
     console.log(res.data)
   } else {
-    console.log(node.date, node.code)
+    // console.log(node.date, node.code)
   }
 }
 
@@ -254,7 +335,14 @@ const showOrderSuperLossGy = async() => {
     }))
   }
 }
-
+// 定位
+const handleSearch = () => {
+  if (searchInfo.value) {
+    tableData1.value = tableData1.value.filter(item => {
+      return item['Gd_gdbh'] === searchInfo.value ?? item
+    })
+  }
+}
 const rowClassName = ({ row, rowIndex }) => {
 
 }
@@ -263,9 +351,11 @@ const rowClassName = ({ row, rowIndex }) => {
 :deep(.plan-usage-low div) {
   color: red !important;
 }
+
 .JKWTree-container {
   display: flex;
 }
+
 .JKWTree-tree {
   width: 300px;
   background-color: #fff;
@@ -273,23 +363,27 @@ const rowClassName = ({ row, rowIndex }) => {
   padding: 10px;
   margin-right: 20px;
 }
+
 .JKWTree-tree h3 {
   font-size: 15px;
   font-weight: 700;
   margin: 10px 0;
 }
+
 .JKWTree-content {
   flex: 1;
 }
+
 :deep(.el-table__body .warning-row) {
   background: #FFFF80 !important;
 }
+
 /* 选中某行时的背景色 */
 :deep(.el-table__body tr.current-row) > td {
   background: #ff80ff !important;
 }
 
-:deep(.el-table .bg-yellow){
+:deep(.el-table .bg-yellow) {
   background: yellow;
 }
 
@@ -298,25 +392,31 @@ const rowClassName = ({ row, rowIndex }) => {
 :deep(.el-table td .cell) {
   line-height: 20px !important;
 }
-:deep(.el-tabs__header){
+
+:deep(.el-tabs__header) {
   margin-bottom: 0;
 }
-.search{
+
+.search {
   margin-left: 0px !important;
   margin-right: 10px !important;
 }
-.bt{
+
+.bt {
   margin-left: 2px !important;
   padding: 3px !important;
   font-size: 12px;
 }
-.el-tabs__header{
+
+.el-tabs__header {
   margin: 0px !important;
 }
-.gva-table-box{
+
+.gva-table-box {
   padding: 0px !important;
 }
-.mab{
+
+.mab {
   margin-bottom: 5px;
 }
 </style>

src/view/yunyin/chanpinziliao/chanpinziliao.vue

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

src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

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

src/view/yunyin/shengchanguanli/gongdanshengchan.vue

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

src/view/yunyin/shengchanguanli/gongdanziliao.vue

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

src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -12,7 +12,7 @@
       <el-aside width="200px">
         <div class="JKWTree-tree">
 
-          <h3  > 组织列表</h3>
+          <h3  >设备运行跟踪</h3>
           <el-tree :data="treeData" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
         </div>
 
@@ -136,17 +136,6 @@
 </div>
           <div v-if="JTMCOn" class="gva-table-box">
             <div class="gva-btn-list">
-              <!-- <el-button type="primary" icon="plus" @click="openDialog">新增</el-button> -->
-              <!-- <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
-                <p>确定要删除吗？</p>
-                <div style="text-align: right; margin-top: 8px;">
-                  <el-button type="primary" link @click="deleteVisible = false">取消</el-button>
-                  <el-button type="primary" @click="onDelete">确定</el-button>
-                </div>
-                <template #reference>
-                  <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
-                </template>
-              </el-popover> -->
             </div>
             <el-tabs v-model="activName" type="card" @tab-click="handleClick">
             
@@ -160,15 +149,15 @@
                                     @row-click="yjupdateCompanyFunc"
                                     style="width: 100%;height: 330px" border tooltip-effect="dark" :data="sbzyData" row-key="ID" @selection-change="handleSelectionChange">
             <!--                <el-table-column type="selection" width="55" />-->
-                            <el-table-column align="left" label="选择" prop="bh"  width="80"/>
-                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="180" />
+                            <!-- <el-table-column align="left" label="选择" prop="bh"  width="80"/> -->
+                            <el-table-column align="left" label="工单编号|质量信息" prop="工单编号|质量信息" width="145" />
 							<el-table-column align="left" label="印件资料" prop="印件资料" width="240" />
                             <el-table-column align="left" label="工序名称" prop="工序名称" width="100" />
-                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="180"/>
-                            <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="100"/>
-                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="240" />
+                            <el-table-column align="left" label="计划产量/已完成" prop="计划产量/已完成" width="130"/>
+                            <el-table-column align="left" label="装版时数" prop="装版时数" width="85"/>
+                            <el-table-column align="left" label="工序产能" prop="工序产能" width="85"/>
+                            <el-table-column align="left" label="计划工时" prop="计划工时" width="85"/>
+                            <el-table-column align="left" label="计划生产时段" prop="计划生产时段" width="210" />
                             <el-table-column align="left" label="排产备注" prop="排产备注" width="100" />
                             <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
                           </el-table>
@@ -186,18 +175,18 @@
                                     style="width: 100%;height: 400px" border tooltip-effect="dark" :data="FPData" row-key="ID" @selection-change="handleSelectionChange"
                                     @row-click="clickybupdate">
             <!--                <el-table-column type="selection" width="55" />-->
-                            <el-table-column align="left" label="选择" prop="方案"  width="70"/>
-                            <el-table-column align="left" label="班组号" prop="班组号" width="80" />
-                            <el-table-column align="left" label="组员1" prop="0" width="240" />
-                            <el-table-column align="left" label="组员2" prop="1" width="240" />
-                            <el-table-column align="left" label="组员3" prop="2" width="240" />
-                            <el-table-column align="left" label="组员4" prop="3" width="240" />
-                            <el-table-column align="left" label="组员5" prop="4" width="100" />
-                            <el-table-column align="left" label="组员6" prop="5" width="100" />
-                            <el-table-column align="left" label="组员7" prop="6" width="100" />
-                            <el-table-column align="left" label="组员8" prop="7" width="100" />
-                            <el-table-column align="left" label="组员9" prop="8" width="100" />
-                            <el-table-column align="left" label="组员10" prop="9_正品版" width="120" />
+                            <!-- <el-table-column align="left" label="选择" prop="方案"  width="70"/> -->
+                            <el-table-column align="left" label="班组号" prop="班组号" width="70" />
+                            <el-table-column align="left" label="组员1" prop="0" width="200" />
+                            <el-table-column align="left" label="组员2" prop="1" width="200" />
+                            <el-table-column align="left" label="组员3" prop="2" width="200" />
+                            <el-table-column align="left" label="组员4" prop="3" width="200" />
+                            <el-table-column align="left" label="组员5" prop="4" width="200" />
+                            <el-table-column align="left" label="组员6" prop="5" width="70" />
+                            <el-table-column align="left" label="组员7" prop="6" width="70" />
+                            <el-table-column align="left" label="组员8" prop="7" width="70" />
+                            <el-table-column align="left" label="组员9" prop="8" width="70" />
+                            <el-table-column align="left" label="组员10" prop="9_正品版" width="70" />
                           </el-table>
                         </el-tab-pane>
             
@@ -213,8 +202,8 @@
                                   >
             <!--              <el-table-column type="selection" width="55" />-->
                           <el-table-column align="left" label="生产时段" prop="生产时间段"  width="180"/>
-                          <el-table-column align="left" label="工单编号" prop="工单编号" width="120" />
-                          <el-table-column align="left" label="产品名称" prop="产品名称" width="240" />
+                          <el-table-column align="left" label="工单编号" prop="工单编号" width="85" />
+                          <el-table-column align="left" label="产品名称" prop="产品名称" width="150" />
                           <el-table-column align="left" label="印件及工序" prop="印件及工序" width="320"/>
                           <el-table-column align="left" label="标牌号" prop="标牌号"  width="80"/>
                           <el-table-column align="left" label="产量" prop="产量" width="100"/>
@@ -245,17 +234,17 @@
                                   highlight-current-row="true"
                                   style="width: 100%;height: 400px" border tooltip-effect="dark" :data="JYData" row-key="ID" @selection-change="handleSelectionChange">
             <!--              <el-table-column type="selection" width="55" />-->
-                          <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="330" />
-                          <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
+                          <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
+                          <el-table-column align="left" label="印件号" prop="印件号" width="70" />
+                          <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
+                          <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
                           <el-table-column
                              v-for="time in columnNames"
                              :key="time"
                              :label="time"
                              :prop="time"
                              align="center"
-                             width="120"
+                             width="80"
                            ></el-table-column>
                         </el-table>
                         </el-tab-pane>
@@ -273,43 +262,43 @@
 			                highlight-current-row="true"
 			                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
 			        <el-table-column type="selection" width="55" />
-			        <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="240"/>
+			        <!-- <el-table-column align="left" label="选择" prop="工单编号"  width="100"/> -->
+			        <el-table-column align="left" label="产品名称" prop="产品名称"  width="200"/>
+			        <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="100"/>
-			        <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="100"/>
-			        <el-table-column align="left" label="难度系数" prop="难度系数"  width="100"/>
-			        <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="120"/>
-			        <el-table-column align="left" label="组员1" prop="组员1" width="240" />
-			        <el-table-column align="left" label="组员2" prop="组员2" width="240" />
-			        <el-table-column align="left" label="组员3" prop="组员3" width="240" />
-			        <el-table-column align="left" label="组员4" prop="组员4" width="240" />
-			        <el-table-column align="left" label="组员5" prop="组员5" width="100" />
-			        <el-table-column align="left" label="组员6" prop="组员6" width="100" />
-			        <el-table-column align="left" label="组员7" prop="组员7" width="100" />
-			        <el-table-column align="left" label="组员8" prop="组员8" width="100" />
-			        <el-table-column align="left" label="组员9" prop="组员9" width="100" />
-			        <el-table-column align="left" label="组员10" prop="组员10" 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="100" />
-			  				<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="100" />
-			  				<el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
-			  				<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="100" />
-			  				<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="100" />
-			  				<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="100" />
+			        <el-table-column align="left" label="产量" prop="产量"  width="70"/>
+			        <el-table-column align="left" label="千件工价" prop="千件工价"  width="85"/>
+			        <el-table-column align="left" label="日定额" prop="日定额"  width="85"/>
+			        <el-table-column align="left" label="补产标准" prop="补产标准"  width="85"/>
+			        <el-table-column align="left" label="难度系数" prop="难度系数"  width="85"/>
+			        <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="85"/>
+			        <el-table-column align="left" label="组员1" prop="组员1" width="170" />
+			        <el-table-column align="left" label="组员2" prop="组员2" width="170" />
+			        <el-table-column align="left" label="组员3" prop="组员3" width="170" />
+			        <el-table-column align="left" label="组员4" prop="组员4" width="170" />
+			        <el-table-column align="left" label="组员5" prop="组员5" width="70" />
+			        <el-table-column align="left" label="组员6" prop="组员6" width="70" />
+			        <el-table-column align="left" label="组员7" prop="组员7" width="70" />
+			        <el-table-column align="left" label="组员8" prop="组员8" width="70" />
+			        <el-table-column align="left" label="组员9" prop="组员9" width="70" />
+			        <el-table-column align="left" label="组员10" prop="组员10" width="70" />
+			  				<el-table-column align="left" label="制程废品" prop="制程废品" width="85" />
+			  				<el-table-column align="left" label="制程次品" prop="制程次品" width="85" />
+			  				<el-table-column align="left" label="前工序废" prop="前工序废" width="85" />
+			  				<el-table-column align="left" label="来料异常" prop="来料异常"  width="85"/>
+			  				<el-table-column align="left" label="装版工时" prop="装版工时" width="85" />
+			  				<el-table-column align="left" label="保养工时" prop="保养工时" width="85" />
+			  				<el-table-column align="left" label="打样工时" prop="打样工时" width="85"/>
+			  				<el-table-column align="left" label="异常停机工时" prop="异常总工时"  width="110"/>
+			  				<el-table-column align="left" label="通电工时" prop="通电工时" width="85"/>
+			  				<el-table-column align="left" label="码开始行" prop="码开始行" width="85" />
+			  				<el-table-column align="left" label="码结束行" prop="码结束行" width="85" />
+			  				<el-table-column align="left" label="码包" prop="码包" width="70" />
+			  				<el-table-column align="left" label="主电表" prop="主电表"  width="70"/>
+			  				<el-table-column align="left" label="辅电表" prop="辅电表" width="70" />
+			  				<el-table-column align="left" label="色度数" prop="色度数" width="70" />
+			  				<el-table-column align="left" label="用户" prop="用户" width="210" />
+			  				<el-table-column align="left" label="更新时间" prop="更新时间" width="160" />
 			      </el-table>
 			    </el-tab-pane>
 			  
@@ -322,100 +311,23 @@
 			                highlight-current-row="true"
 			                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
 			        <el-table-column type="selection" width="55" />
-			        <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="330" />
-			        <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
+			        <el-table-column align="left" label="工单编号" prop="工单编号"  width="85"/>
+			        <el-table-column align="left" label="印件号" prop="印件号" width="70" />
+			        <el-table-column align="left" label="工序名称" prop="工序名称" width="85" />
+			        <el-table-column align="left" label="检验项目" prop="检验项目" width="85"/>
 			  				 <el-table-column
 			  				    v-for="time in columnNames"
 			  				    :key="time"
 			  				    :label="time"
 			  				    :prop="time"
 			  				    align="center"
-			  				    width="120"
+			  				    width="80"
 			  				  ></el-table-column>
 			      </el-table>
 			    </el-tab-pane>
 			  </el-tabs>
 		  </div>
-          <!-- <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
-          <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-            <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
-              <el-table ref="multipleTable"
-                        :show-overflow-tooltip="true"
-                        :row-style="{ height: '20px' }"
-                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
-                        :header-cell-style="{ padding: '0px' }"
-                        highlight-current-row="true"
-                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" />
-                <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="240"/>
-                <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="100"/>
-                <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="100"/>
-                <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="120"/>
-                <el-table-column align="left" label="组员1" prop="组员1" width="240" />
-                <el-table-column align="left" label="组员2" prop="组员2" width="240" />
-                <el-table-column align="left" label="组员3" prop="组员3" width="240" />
-                <el-table-column align="left" label="组员4" prop="组员4" width="240" />
-                <el-table-column align="left" label="组员5" prop="组员5" width="100" />
-                <el-table-column align="left" label="组员6" prop="组员6" width="100" />
-                <el-table-column align="left" label="组员7" prop="组员7" width="100" />
-                <el-table-column align="left" label="组员8" prop="组员8" width="100" />
-                <el-table-column align="left" label="组员9" prop="组员9" width="100" />
-                <el-table-column align="left" label="组员10" prop="组员10" 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="100" />
-				<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="100" />
-				<el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
-				<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="100" />
-				<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="100" />
-				<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="100" />
-              </el-table>
-            </el-tab-pane>
-          
-            <el-tab-pane label="当日制程检验记录"  @click="showTable('印件资料')"  name="second">
-              <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"
-                        style="width: 100%;height: 400px" border tooltip-effect="dark" :data="drzcData" row-key="ID" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" />
-                <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="330" />
-                <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
-				 <el-table-column
-				    v-for="time in columnNames"
-				    :key="time"
-				    :label="time"
-				    :prop="time"
-				    align="center"
-				    width="120"
-				  ></el-table-column>
-              </el-table>
-            </el-tab-pane>
-          </el-tabs>
-          </el-dialog> -->
-
-          <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
+          <el-dialog v-model="detailShow" style="width: 1000px" 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' }"
@@ -463,9 +375,9 @@
 			 </el-col>
 			</el-row> 	
 				
-			<div class="groupbox">
+			<div class="groupbox" style="height: 18vh; width: 920px;">
 			    <span class="grouptitle">组员及分配比例</span>
-				<el-row :gutter="10" style="margin-top: 10px;">
+				<el-row :gutter="10" style="margin-top: 0px; height: 5vh;">
 								 <el-col :span="2">
 								   <span></span>
 								 </el-col>
@@ -493,72 +405,92 @@
 								<el-col :span="2">
 								  
 								</el-col>
-								<el-col :span="2">
+								<el-col :span="3">
 								  
 								</el-col>
-								<el-col :span="2">
+								<el-col :span="3">
 								 <el-form-item label="特殊组员" prop="id">
 								 						 
 								 </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="4">
-				  <el-input v-model="formDatas.code1" :clearable="true" />
+				<el-row :gutter="10" style="margin-top: 0px;">
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code1" :clearable="true" placeholder="" />
 				</el-col>
-				<el-col :span="4">
-				  <el-input v-model="formDatas.code2" :clearable="true" />
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code2" :clearable="true" placeholder="" />
 				</el-col>
-				<el-col :span="4">
-				  <el-input v-model="formDatas.code3" :clearable="true" />
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code3" :clearable="true" placeholder="" />
 				</el-col>
-				<el-col :span="4">
-				  <el-input v-model="formDatas.code4" :clearable="true" />
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code4" :clearable="true" placeholder="" />
+				</el-col>
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code5" :clearable="true" placeholder="" />
+				</el-col>
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code6" :clearable="true" placeholder="" />
+				</el-col>
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code7" :clearable="true" placeholder="" />
+				</el-col>
+				<el-col :span="3">
+				  <el-input v-model="formDatas.code8" :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="4">
-			  				  <el-input v-model="formDatas.name1" :clearable="true" />
+			 <el-row :gutter="10" style="margin-top: 1px;">
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.name1" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name2" :clearable="true" />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.name2" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name3" :clearable="true" />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.name3" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name4" :clearable="true" />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.name4" :clearable="true" placeholder="" />
 			  				</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.name5" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.name6" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.name7" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.name8" :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="4">
-			  				  <el-input v-model="formDatas.percentage1" :clearable="true" />
+			  <el-row :gutter="10" style="margin-top: 1px;">
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage2" :clearable="true" />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage3" :clearable="true"  />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="" />
 			  				</el-col>
-			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage4" :clearable="true" />
+			  				<el-col :span="3">
+			  				  <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="" />
 			  				</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.percentage5" :clearable="true" placeholder="" />
+							</el-col>
+							<el-col :span="3">
+							  <el-input v-model="formDatas.percentage6" :clearable="true" placeholder="" />
+							</el-col>
 			  </el-row>
 			</div>
           </el-dialog>
@@ -566,20 +498,20 @@
 
         <el-dialog
           v-model="dianjianVisible"
-          title="选择"
+          title="设备点检记录"
           destroy-on-close
           width="1300px"
-		  style="height: 110%;"
+		  style="height: 80%;"
         >
-          <el-row :gutter="0">
-            <el-col :span="4">
+          <el-row :gutter="24">
+            <el-col :span="3">
               <el-form-item label="设备编号" prop="id">
                 <el-input v-model="formData.JTMC" :clearable="true" />
               </el-form-item>
             </el-col>
-            <el-col :span="20">
-              <el-row :gutter="20">
-                <el-col :span="5">
+            <el-col :span="10">
+              <el-row>
+                <el-col>
                   <el-input v-model="formData.产品名称" :clearable="true"  />
                 </el-col>
               </el-row>
@@ -587,8 +519,8 @@
           </el-row>
         
           <div style="display: flex;">
-            <div style="flex: 1;">
-              <el-aside width="250px" style="margin: 0;">
+            <div style="flex: 0.1;">
+              <el-aside width="200px" style="margin: 0;">
                 <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>
@@ -601,6 +533,7 @@
                 :data="dianjianselectData"
                 row-key="ID"
                 highlight-current-row="true"
+				:show-overflow-tooltip="true"
                 border  @row-click="dianjianhandle"
                 style="width:100%; height:400px;"
                 @row-dblclick="handleSelectClick"
@@ -609,7 +542,7 @@
                 <el-table-column
                   prop="检验项目"
                   label="检验项目"
-                  width="180"
+                  width="300"
                 />
                 <el-table-column
                   prop="点检方法"
@@ -776,10 +709,10 @@
 		
 		<el-dialog
 		  v-model="xunchaVisible"
-		  title="选择"
+		  title="管理人员现场巡查记录"
 		  destroy-on-close
 		  width="1300px"
-		  style="height: 80%;"
+		  style="height: 65%;"
 		>
 		  
 		
@@ -802,16 +735,17 @@
 		      style="width:1000px; height:400px;"
 		      @row-dblclick="handleSelectClick"
 		      :row-class-name="rowClassName"
+			  :show-overflow-tooltip="true"
 		    >
 		      <el-table-column
 		        prop="工单编号"
 		        label="工序编号"
-		        width="180"
+		        width="85"
 		      />
 		      <el-table-column
 		        prop="印件号"
 		        label="印件号"
-		        width="180"
+		        width="70"
 		      />
 		      
 			  <el-table-column
@@ -822,48 +756,48 @@
 			<el-table-column
 			  prop="流程单号"
 			  label="流程单号"
-			  width="180"
+			  width="85"
 			/>
 			<el-table-column
 			  prop="设备编号"
 			  label="设备编号"
-			  width="180"
+			  width="85"
 			/>
 			
 			<el-table-column
 			  prop="班组编号"
 			  label="班组编号"
-			  width="180"
+			  width="85"
 			/>
 			<el-table-column
 			  prop="检验备注"
 			  label="检验备注"
-			  width="180"
+			  width="85"
 			/>
 			<el-table-column
 			  prop="现场管理人员"
 			  label="现场管理人员"
-			  width="180"
+			  width="145"
 			/>
 			<el-table-column
 			  prop="提交时间"
 			  label="提交时间"
-			  width="180"
+			  width="160"
 			/>
 			<el-table-column
 			  prop="开工时间"
 			  label="开工时间"
-			  width="180"
+			  width="160"
 			/>
 			<el-table-column
 			  prop="分钟差数"
 			  label="分钟差数"
-			  width="180"
+			  width="85"
 			/>
 			<el-table-column
 			  prop="归属时段"
 			  label="归属时段"
-			  width="180"
+			  width="160"
 			/>
 		    </el-table>
 		  </div>
@@ -935,6 +869,7 @@ defineOptions({
     name: 'Company'
 })
 const gytableData = ref([])
+const drzcDatas =ref([])
 const detailData = reactive([])
 const treeData=ref([])
 const yinbantreeData=ref([])
@@ -956,16 +891,20 @@ const handleNodeClick = (nodeData,node) => {
         console.log(node.label); // 第一级节点
       } else if (nodeData.level === 2) {
         console.log(node.label); // 第二级节点
-		JTMC=node.label.split("【")[0]
+		JTMC=node.label.split("-")[0]
 		JTMCOn.value=true
 		dateOn.value=false
 		FacilityProduction()
 		FacilityWorklist()
       } else if (nodeData.level === 3) {
-		  JTMC=nodeData.machineName.split("【")[0]
+		  JTMC=nodeData.machineName.split("-")[0]
 		  JTMCOn.value=false
 		  dateOn.value=true
 		  date=node.label
+		  gytableData.value=[]
+		  drzcDatas.value=[]
+		  columnNames=[]
+		  drzcData=[]
 		  FacilityInspect()
 		  FacilitychanLiang()
           console.log(node.label); // 第三级节点
@@ -977,10 +916,21 @@ const FacilityProduction = async () => {
   if (response.code === 0) {
 	console.log(response)
 	// 填充formData对象的基本字段
-	    formData.value.工单编号 = response.data[0].工单编号;
-	    formData.value.印件编号 = response.data[0].印件号;
-	    formData.value.工序名称 = response.data[0].工序名称;
-	    formData.value.产品名称 = response.data[0].产品名称;
+	    formData.value.工单编号 = response.data.工单编号;
+	    formData.value.印件编号 = response.data.印件号;
+	    formData.value.工序名称 = response.data.工序名称;
+	    formData.value.产品名称 = response.data.产品名称;
+		formData.value.班组 = response.data.班组编号;
+		let sczl_bhkey=''
+		let sczl_namekey=''
+		if (response.data.班组成员) {
+		  for (let i = 1; i <= Math.min(Object.keys(response.data.班组成员).length, 6); i++) {
+						 sczl_bhkey=`sczl_bh${i}`
+						 sczl_namekey=`sczl_name${i}`
+		    formData.value[sczl_bhkey] = response.data.班组成员[i]['编号'];
+		    formData.value[sczl_namekey] = response.data.班组成员[i]['姓名'];
+		  }
+		}
 		formData.value.JTMC=JTMC
 	    FacilityTeam(JTMC)
   }
@@ -1419,47 +1369,48 @@ const getSpotCheckItem = async (machineName) => {
 const FacilityTeam = async (value) => {
   const response = await facilityTeam({ machine: value });
   if (response.code === 0) {
-	formData.value.班组 = response.data[0]['班组号'];
-	if(response.data[0][2]){
-		// console.log(response.data[0][2].split(' '));
-		for (let i = 1; i <= 3; i++) {
-		  const sczl_bh = `sczl_bh${i}`;
-		  const sczl_name = `sczl_name${i}`;
-		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
-		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+	// formData.value.班组 = response.data[0]['班组号'];
+	BZMC.value=response.data[0]['班组号']
+	// if(response.data[0][2]){
+	// 	// console.log(response.data[0][2].split(' '));
+	// 	for (let i = 1; i <= 3; i++) {
+	// 	  const sczl_bh = `sczl_bh${i}`;
+	// 	  const sczl_name = `sczl_name${i}`;
+	// 	  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+	// 	  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
 		 
-		}
-	}
-	if(response.data[0][0]){
-		// console.log(response.data[0][2].split(' '));
-		for (let i = 1; i <= 1; i++) {
-		  const sczl_bh = `sczl_bh${i}`;
-		  const sczl_name = `sczl_name${i}`;
-		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
-		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+	// 	}
+	// }
+	// if(response.data[0][0]){
+	// 	// console.log(response.data[0][2].split(' '));
+	// 	for (let i = 1; i <= 1; i++) {
+	// 	  const sczl_bh = `sczl_bh${i}`;
+	// 	  const sczl_name = `sczl_name${i}`;
+	// 	  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+	// 	  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
 		 
-		}
-	}
-	if(response.data[0][1]){
-		// console.log(response.data[0][2].split(' '));
-		for (let i = 1; i <= 2; i++) {
-		  const sczl_bh = `sczl_bh${i}`;
-		  const sczl_name = `sczl_name${i}`;
-		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
-		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+	// 	}
+	// }
+	// if(response.data[0][1]){
+	// 	// console.log(response.data[0][2].split(' '));
+	// 	for (let i = 1; i <= 2; i++) {
+	// 	  const sczl_bh = `sczl_bh${i}`;
+	// 	  const sczl_name = `sczl_name${i}`;
+	// 	  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+	// 	  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
 		 
-		}
-	}
-	if(response.data[0][3]){
-		// console.log(response.data[0][2].split(' '));
-		for (let i = 1; i <= 4; i++) {
-		  const sczl_bh = `sczl_bh${i}`;
-		  const sczl_name = `sczl_name${i}`;
-		  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
-		  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
+	// 	}
+	// }
+	// if(response.data[0][3]){
+	// 	// console.log(response.data[0][2].split(' '));
+	// 	for (let i = 1; i <= 4; i++) {
+	// 	  const sczl_bh = `sczl_bh${i}`;
+	// 	  const sczl_name = `sczl_name${i}`;
+	// 	  formData.value[sczl_bh] = response.data[0][i-1].split(' ')[0];
+	// 	  formData.value[sczl_name] = response.data[0][i-1].split(' ')[1];
 		 
-		}
-	}
+	// 	}
+	// }
 
 	InspectionRecord()
 	FacilityDetail()
@@ -1741,7 +1692,6 @@ const openDialog = () => {
     dialogFormVisible.value = true
 }
 let drzcData=[]
-const drzcDatas =ref([])
 let columnNames=[]
 //当日制程检验记录
 const FacilityInspect = async () => {
@@ -1850,6 +1800,10 @@ const enterDialog = async () => {
 .JKWTree-content {
   flex: 1;
 }
+/* 选中某行时的背景色*/
+.el-table__body tr.current-row>td {
+  background: #ff80ff !important;
+}
 .groupbox
       {margin:10px;
       width:500px;