处理冲突

src/api/jixiaoguanli/jitairibaobiao.js

@@ -873,11 +873,11 @@ export const submitPatrolRecord = (data) => {
   })
 }
 //设置机台状态
-export const setMachineStatus = (params) => {
+export const setMachineStatus = (data) => {
   return service({
     url:'/mes_server/reporting_work/setMachineStatus',
     method: 'post',
-    params
+    data
   })
 }
 //获取机台编号

src/api/mes/job.js

@@ -79,6 +79,14 @@ export const updateSpotData = (data) => {
     data
   })
 }
+// 工单抽检记录新增
+export const add = (data) => {
+  return service({
+    url: '/mes_server/work_order_spot_check/add',
+    method: 'post',
+    data
+  })
+}
 
 // 工单抽检记录获取工单抽检记录信息
 export const getSpotInfo = (params) => {

src/api/mes_api_gty/workOrderVerification.js

@@ -138,3 +138,11 @@ export const getOrderWasteTotal = (params) => {
     params
   })
 }
+// 9新增
+export const add = (data) => {
+  return service({
+    url: '/mes_server/work_order_verification/add',
+    method: 'post',
+    data
+  })
+}

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,16 +403,14 @@ export const ProcessDetailEdit = (data) => {
         data
     })
 }
-
 //打印作业通知单
-export const PrintJobOrder = (data) => {
+export const PrintJobOrder = (params) => {
     return service({
         url: '/mes_server/work_order/PrintJobOrder',
-        method: 'post',
-        data
+        method: 'get',
+        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
+    })
+}
 
 
 /**工单生产排单(排产管理)*/
@@ -644,4 +685,31 @@ export const getMachineMac = (data) => {
         method: 'get',
         data
     })
+}
+
+//6工单工序产量查核
+export const getOrderProcessCount = (params) => {
+    return service({
+        url:'/mes_server/order_super_loss/getOrderProcessCount',
+        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/job/sampling/sampling.vue

@@ -40,6 +40,12 @@
                   icon="search"
                   @click="handlerSearch"
                 >查询</el-button>
+				<el-button
+				   type="primary"
+				   :icon="Search"
+				   @click="handleShowAdd"
+				 >新增
+				 </el-button>
               </el-form-item>
             </el-form>
           </div>
@@ -72,6 +78,7 @@
               :header-cell-style="{ padding: '0px' }"
               @selection-change="handleSelectionChange"
               @row-dblclick="getDetailData"
+			  @row-click="handleSelectChange"
             >
               <el-table-column
                 type="selection"
@@ -452,7 +459,7 @@
 </template>
 
 <script setup>
-import { getSpotList, getSpotTab, getSpotLocal, getSpotInfo, updateSpotData } from '@/api/mes/job'
+import { getSpotList, getSpotTab, getSpotLocal, getSpotInfo, updateSpotData,add } from '@/api/mes/job'
 import { createCompany, deleteCompany, deleteCompanyByIds, findCompany, updateCompany } from '@/api/company'
 // 全量引入格式化工具 请按需保留
 import { ElMessage, ElMessageBox } from 'element-plus'
@@ -591,7 +598,22 @@ const handlerSearch = () => {
   page.value = 1
   handleCurrentChange()
 }
-
+// 新增数据
+const handleShowAdd = async () => {
+  
+    type.value='add'
+	console.log(currentRow.value)
+   const res = await getSpotInfo({ UniqId:currentRow.value })
+   if (res.code === 0) {
+     Object.assign(detailData, res.data[0])
+     detailData.UniqId = currentRow.value
+     dialogFormVisible.value = true
+   }
+	// type.value='add'
+ //    Object.assign(detailData);
+	// dialogFormVisible.value = true
+  
+};
 // ============== 详情展示 ===============
 const detailData = reactive({})
 
@@ -599,6 +621,7 @@ const detailData = reactive({})
 const getDetailData = async(row) => {
   console.log(row.UniqId)
   const { UniqId } = row
+  type.value='update'
   const res = await getSpotInfo({ UniqId })
   if (res.code === 0) {
     Object.assign(detailData, res.data[0])
@@ -606,25 +629,54 @@ const getDetailData = async(row) => {
     dialogFormVisible.value = true
   }
 }
+const currentRow = ref()
+const handleSelectChange = (row, column, event) => {
+  currentRow.value = row.UniqId
+}
 
 // 弹窗确定更新数据
 const enterDialog = async() => {
   // const obj = { ...detailData }
-  const obj = {}
-  Object.assign(obj, detailData)
-  delete obj.name
-  delete obj.Gd_cpmc
-  delete obj.sczl_gxh
-  const res = await updateSpotData(obj)
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '更新成功'
-    })
-    dialogFormVisible.value = false
-  }
-}
+   console.log(type.value)
+   if (type.value === 'update') {
+  	   updateDetailData()
+  	 } else if (type.value === 'add') {
+  	   addDetailData()
+  	 }else {
+		 console.log(type)
+	 }
 
+}
+const addDetailData = async() => {
+	const obj = {}
+	Object.assign(obj, detailData)
+	delete obj.name
+	delete obj.Gd_cpmc
+	delete obj.sczl_gxh
+	const res = await add(obj)
+	if (res.code === 0) {
+	  ElMessage({
+	    type: 'success',
+	    message: '新增成功'
+	  })
+	  dialogFormVisible.value = false
+	}
+}
+const updateDetailData = async() => {
+	const obj = {}
+	Object.assign(obj, detailData)
+	delete obj.name
+	delete obj.Gd_cpmc
+	delete obj.sczl_gxh
+	const res = await updateSpotData(obj)
+	if (res.code === 0) {
+	  ElMessage({
+	    type: 'success',
+	    message: '更新成功'
+	  })
+	  dialogFormVisible.value = false
+	}
+}
 // 获取需要的字典 可能为空 按需保留
 const setOptions = async() => {
 }

src/view/performance/08-timesheet/index.vue

@@ -626,15 +626,15 @@ const addDetailData = async() => {
   }
   console.log(restoredData)
   const res = await createData(restoredData)
+
   console.log(res)
-  // console.log(res)
-  // if (res.code === 0) {
-  //   ElMessage({
-  //     type: 'success',
-  //     message: '新增成功',
-  //   })
-  //   dialogFormVisible.value = false
-  // }
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '新增成功',
+    })
+    dialogFormVisible.value = false
+  }
 }
 //修改
 const updateDetailData = async() => {
@@ -651,6 +651,12 @@ const updateDetailData = async() => {
 	  params.type = 'getTableData'
 	  // page.value = 1
 	  handleCurrentChange()
+	  // if(response.code==0){
+	  // 		 ElMessage({
+	  // 		   type: 'success',
+	  // 		   message: '更新成功',
+	  // 		 })
+	  // }
 	  dialogFormVisible.value = false
 	}
 }

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

@@ -38,14 +38,18 @@
                 @click="dialogMrhjtj = true"
               >每日核检统计
               </el-button>
-
               <el-button
                 type="primary"
                 :icon="Search"
                 @click="showGdzjfptj"
               >工单质检废品统计
               </el-button>
-
+			 <el-button
+                type="primary"
+                :icon="Search"
+                @click="handleShowAdd"
+              >新增
+              </el-button>
               <div style="margin-left: auto;">
                 <el-button
                   type="primary"
@@ -440,6 +444,10 @@ import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWa
 import Meirihejiantongji from './componets/meirihejiantongji.vue'
 import Gongdanzhijianfeipintongji from './componets/gongdanzhijianfeipintongji.vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/componets/shebeizhuangtai.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'
 
 defineOptions({
   name: '06PackingDocuments'
@@ -738,10 +746,20 @@ 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') {
+	  updateDetailData()
+	} else if (type.value === 'add') {
+	  addDetailData()
+	}
+}
+//新增
+const addDetailData = async() => {
   const restoredData = {
     UniqId: detailData.UniqId,
     qczl_gdbh: detailData.qczl_gdbh,
@@ -760,24 +778,66 @@ const enterDialog = async() => {
     qczl_NumDesc6: detailData.qczl_NumDesc6,
     qczl_NumDesc7: detailData.qczl_NumDesc7,
     qczl_NumDesc8: detailData.qczl_NumDesc8,
+	sys_id:'[1003/洪桂芬]',
   }
   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)
+	  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
+	})
+  console.log(restoredData)
+  const res = await add(restoredData)
+  console.log(res)
+
   if (res.code === 0) {
     ElMessage({
       type: 'success',
-      message: res.msg,
+      message: '新增成功',
     })
     dialogFormVisible.value = false
   }
 }
+//修改
+const updateDetailData = 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) => {
@@ -838,17 +898,27 @@ const dialogGdzjfptj = ref(false)
 const dialogSbyxgl = ref(false)
 const value1 = ref('')
 const table = ref(null)
-const currentRow = ref()
+
 
 const showGdzjfptj = () => {
   value1.value = currentRow.value?.qczl_gdbh
   dialogGdzjfptj.value = true
 }
-
+const currentRow = ref()
 const handleSelectChange = (row, column, event) => {
-  currentRow.value = row
+  currentRow.value = row.UniqId
 }
 
+// 新增数据
+const handleShowAdd = async () => {
+
+    type.value='add'
+    getDetailData(currentRow.value)
+	// type.value='add'
+ //    Object.assign(detailData);
+	// dialogFormVisible.value = true
+
+};
 </script>
 
 <style scoped>

src/view/performance/Dayreportattached.vue

@@ -27,7 +27,7 @@
             </div>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true" border @selection-change="handleSelectionChange" 
+              highlight-current-row="true" border @selection-change="handleSelectionChange" @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="生产日期" prop="sczl_rq" width="120"/>
@@ -116,7 +116,7 @@
             <!-- </el-scrollbar> -->
             <template #footer>
               <div class="dialog-footer">
-                <el-button @click="closeDialog">取 消</el-button>
+                <el-button @click="dialogFormVisible=false">取 消</el-button>
                 <el-button type="primary" @click="enterDialog">确 定</el-button>
               </div>
             </template>
@@ -392,6 +392,11 @@ function doubleClick(row, column, event) {
 	 
 	 AddgetInfo(table.value)
 }
+// 单击表格操作
+function Click(row, column, event) {
+  lastCellValue= row['UniqId'];
+  console.log(lastCellValue)
+}
 //获取详细信息
 const AddgetInfo = async (value) => {
   const response = await addgetInfo({UniqId:value});
@@ -478,12 +483,25 @@ const updateDetailData = async() => {
 	 // console.log(ADD.value)
 	 ADD.value='0'
 	 console.log(response)
-	 
+	 if(response.code==0){
+	 		 ElMessage({
+	 		   type: 'success',
+	 		   message: '新增成功',
+	 		 })
+	 }
+	 dialogFormVisible.value = false
  }else{
 	 const response = await addedit(restoredData);
 	 console.log('修改')
 	  console.log(ADD.value)
 	  console.log(response)
+	  if(response.code==0){
+	 ElMessage({
+	   type: 'success',
+	   message: '修改成功',
+	 })
+	  }
+	  dialogFormVisible.value = false
 	 // ADD.value='0'
 	 // console.log(ADD.value)
  }
@@ -526,12 +544,16 @@ const AddDel = async (value) => {
   const response = await adddel({UniqId:'0'});
   console.log(response) 
   if (response.code === 0) {
-	 console.log('333') 
+	 ElMessage({
+	   type: 'success',
+	   message: '删除成功',
+	 })
   }
 }
 const ADD=ref('0')
 //新增
 function onAdd() {
+	AddgetInfo(lastCellValue)
 	ADD.value='新增'
 	console.log(ADD.value)
 	dialogFormVisible.value = true

src/view/performance/Dayreports.vue

@@ -19,7 +19,7 @@
                 <el-input v-model="positionvalue" placeholder="输入工单编号或产品名称" />
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
-			  <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			  <el-button type="primary"  @click="onCountByGdbh">切换显示方式</el-button>
 			  <el-button type="primary" @click="onAdd">新增</el-button>
               <el-button type="primary" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
@@ -29,7 +29,7 @@
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
               highlight-current-row="true" border 
-			  :show-overflow-tooltip="true"
+			  :show-overflow-tooltip="true" @row-click="Click"
 			  @selection-change="handleSelectionChange" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="工单编号" prop="sczl_gdbh" width="120"/>
@@ -96,7 +96,7 @@
             <!-- <el-scrollbar height="500px"> -->
             <el-form :model="formData" label-position="left" ref="elFormRef" :rules="rule">
 
-              <el-row :gutter="20">
+            <!--  <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工单编号" prop="id">
                     <el-input v-model="formData.sczl_gdbh" id="工单编号" @keydown="ent($event, 'rate10', '工单编号', '产品名称')" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="" />
@@ -111,13 +111,51 @@
                     </el-row>
                   </el-form-item>
                 </el-col>
-              </el-row>
+              </el-row> -->
+               
+			   <el-row :gutter="24">
+			     <el-col :span="6">
+			       <el-form-item label="工单编号:" prop="flatFeed" class="mab">
+                    <el-input v-model="formData.sczl_gdbh" id="工单编号" @keydown="ent($event, 'rate10', '工单编号', '产品名称')" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="" />
+			       </el-form-item>
+			     </el-col>
+			     <el-col :span="6">
+			       <el-form-item label="产品名称:" prop="perTenThousand" class="mab">
+					 <el-input v-model="formData.Gd_cpmc" id="产品名称" @keydown="ent($event, '工单编号', '产品名称', '印件号')" :clearable="true" placeholder="" />
+			       </el-form-item>
+			     </el-col>
+				 <el-col :span="6">
+				   <el-form-item label="&nbsp&nbsp&nbsp印件号:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_yjno" id="印件号" @keydown="ent($event, '产品名称', '印件号', '印件名称')" :clearable="true" placeholder="0." />
+				   </el-form-item>
+				 </el-col>
+			   </el-row>
 
-              <el-row :gutter="20">
+
+            <el-row :gutter="24">
+              <el-col :span="6">
+                <el-form-item label="印件名称:" prop="perTenThousand" class="mab">
+                <el-input v-model="formData.yj_yjmc" id="印件名称" @keydown="ent($event, '印件号', '印件名称', '工序名称')" :clearable="true" placeholder="" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="6">
+                <el-form-item label="工序名称:" prop="flatFeed" class="mab">
+                <el-input v-model="formData.sczl_gxmc" style="width: 100px;"  id="工序名称"  @keydown="ent($event, '印件名称', '工序名称', 'sczl_gxh')" :clearable="true" placeholder="" />
+                <el-input v-model="formData.sczl_gxh"  style="width: 50px;"id="sczl_gxh"  @keydown="ent($event, '工序名称', 'sczl_gxh', 'sczl_type')" :clearable="true" placeholder="" />
+                </el-form-item>
+              </el-col>
+			  <el-col :span="6">
+			    <el-form-item label="工艺名称:" prop="perTenThousand" class="mab">
+			  	  <el-input v-model="formData.sczl_type" id="sczl_type"  @keydown="ent($event, 'sczl_gxh', 'sczl_type', '日期')" :clearable="true" placeholder="" />
+			    </el-form-item>
+			  </el-col>
+            </el-row>
+
+              <!-- <el-row :gutter="20">
                 <el-col :span="100">
                   <el-row :gutter="20">
-                    <el-col :span="10">
-                      <el-form-item label="印件号" prop="id">
+                    <el-col :span="8">
+                      <el-form-item label="&nbsp&nbsp 印件号" prop="id">
                         <el-input v-model="formData.sczl_yjno" id="印件号" @keydown="ent($event, '产品名称', '印件号', '印件名称')" :clearable="true" placeholder="0." />
                       </el-form-item>
                     </el-col>
@@ -128,9 +166,29 @@
                     </el-col>
                   </el-row>
                 </el-col>
-              </el-row>
+              </el-row> -->
 			  
-             <el-row :gutter="20">
+			  
+			  
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp日期:" prop="flatFeed" class="mab">
+			  				  <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, 'sczl_type', '日期', '机器')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <el-col :span="6">
+			      <el-form-item label="&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp机器:" prop="flatFeed" class="mab">
+			      <el-input v-model="formData.sczl_jtbh"  id="机器"  @keydown="ent($event, '日期', '机器', '组别')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp组别:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_jtbh"  id="机器"  @keydown="ent($event, '日期', '机器', '组别')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col>
+			  </el-row>
+			  
+             <!-- <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工序名称" prop="id">
                     <el-input v-model="formData.sczl_gxmc"  id="工序名称"  @keydown="ent($event, '印件名称', '工序名称', 'sczl_gxh')" :clearable="true" placeholder="" />
@@ -148,10 +206,28 @@
                     <el-input v-model="formData.sczl_type" id="sczl_type"  @keydown="ent($event, 'sczl_gxh', 'sczl_type', '日期')" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
-              </el-row>
+              </el-row> -->
+			  
 			  
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp墨色:" prop="flatFeed" class="mab">
+				  <el-input v-model="formData.sczl_ms" id="墨色"  @keydown="ent($event, '组别', '墨色', '加工联数')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <el-col :span="6">
+			      <el-form-item label="加工联数:" prop="flatFeed" class="mab">
+			      <el-input v-model="formData.sczl_ls" id="加工联数"  @keydown="ent($event, '墨色', '加工联数', '产量')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp&nbsp产量:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_cl" id="产量"  @keydown="ent($event, '加工联数', '产量', '制程废品')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col>
+			  </el-row>
 			  
-			  <el-row :gutter="20">
+			  <!-- <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="日期" prop="id">
 			         <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, 'sczl_type', '日期', '机器')" :clearable="true" placeholder="" />
@@ -171,9 +247,26 @@
 			         <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '机器', '组别', '墨色')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
-			   </el-row>
+			   </el-row> -->
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="制程废品:" prop="flatFeed" class="mab">
+				  <el-input v-model="formData.sczl_zcfp"    id="制程废品"  @keydown="ent($event, '产量', '制程废品', '装版总工时')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <el-col :span="6">
+			      <el-form-item label="装版总工时:" prop="flatFeed" class="mab">
+			      <el-input v-model="formData.sczl_装版总工时" id="装版总工时"  @keydown="ent($event, '制程废品', '装版总工时', '装版补产工时')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="装版补产工时:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_装版工时" id="装版补产工时"  @keydown="ent($event, '装版总工时', '装版补产工时', '保养工时')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col>
+			  </el-row>
 			  
-			  <el-row :gutter="20">
+			  <!-- <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="墨色" prop="id">
 			         <el-input v-model="formData.sczl_ms" id="墨色"  @keydown="ent($event, '组别', '墨色', '加工联数')" :clearable="true" placeholder="" />
@@ -198,10 +291,27 @@
 				     <el-input v-model="formData.sczl_zcfp"    id="制程废品"  @keydown="ent($event, '产量', '制程废品', '装版总工时')" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
-			   </el-row>
+			   </el-row> -->
 			   
+			   <el-row :gutter="24">
+			     <el-col :span="6">
+			       <el-form-item label="保养工时:" prop="flatFeed" class="mab">
+					  <el-input v-model="formData.sczl_保养工时" id="保养工时"  @keydown="ent($event, '装版补产工时', '保养工时', '异常停机')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			       </el-form-item>
+			     </el-col>
+			     <el-col :span="6">
+			       <el-form-item label="异常停机:" prop="flatFeed" class="mab">
+			       <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '保养工时', '异常停机', '打样总工时')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			       </el-form-item>
+			     </el-col>
+					<el-col :span="6">
+					  <el-form-item label="打样总工时:" prop="flatFeed" class="mab">
+					   <el-input v-model="formData.sczl_打样总工时" id="打样总工时"  @keydown="ent($event, '异常停机', '打样总工时', '打样补产工时')" :clearable="true" placeholder=""style="width: 200px;" />		  				  
+					  </el-form-item>
+					</el-col>
+			   </el-row>
 			   
-			   <el-row :gutter="20">
+			   <!-- <el-row :gutter="20">
 			      <el-col :span="4">
 			        <el-form-item label="装版总工时" prop="id">
 			          <el-input v-model="formData.sczl_装版总工时" id="装版总工时"  @keydown="ent($event, '制程废品', '装版总工时', '装版补产工时')" :clearable="true" placeholder="" />
@@ -226,10 +336,27 @@
 			   				     <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '保养工时', '异常停机', '打样总工时')" :clearable="true" placeholder="" />
 			   				   </el-form-item>
 			   				 </el-col>
-			    </el-row>
+			    </el-row> -->
 			  
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="打样补产工时:" prop="flatFeed" class="mab">
+				  <el-input v-model="formData.sczl_打样工时" id="打样补产工时"  @keydown="ent($event, '打样总工时', '打样补产工时', '通电时间')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <el-col :span="6">
+			      <el-form-item label="通电时间:" prop="flatFeed" class="mab">
+			       <el-input v-model="formData.sczl_设备运行工时"  id="通电时间"  @keydown="ent($event, '打样补产工时', '通电时间', '拆片联拼系数')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="拆片联拼系数:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.拆片联拼系数" id="拆片联拼系数"  @keydown="ent($event, '通电时间', '拆片联拼系数', '拆片条小盒系数')" :clearable="true" placeholder=""  style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col>
+			  </el-row>
 			  
-			  <el-row :gutter="20">
+			 <!-- <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="打样总工时" prop="id">
 			         <el-input v-model="formData.sczl_打样总工时" id="打样总工时"  @keydown="ent($event, '异常停机', '打样总工时', '打样补产工时')" :clearable="true" placeholder="" />
@@ -249,10 +376,27 @@
 			         <el-input v-model="formData.sczl_设备运行工时"  id="通电时间"  @keydown="ent($event, '打样补产工时', '通电时间', '拆片联拼系数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>			  				
-			   </el-row>
+			   </el-row> -->
 			  
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="拆片条小盒系数:" prop="flatFeed" class="mab">
+				  <el-input v-model="formData.拆片条小盒系数" id="拆片条小盒系数"  @keydown="ent($event, '拆片联拼系数', '拆片条小盒系数', '定额代号')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <el-col :span="6">
+			      <el-form-item label="定额代号:" prop="flatFeed" class="mab">
+			       <el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent($event, '拆片条小盒系数', '定额代号', '工价系数')" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="工价系数:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_工价系数" id="工价系数"  @keydown="ent($event, '定额代号', '工价系数', '计产系数')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col>
+			  </el-row>
 			  
-			  <el-row :gutter="20">
+			  <!-- <el-row :gutter="20">
 			     <el-col :span="4">			       
 			     </el-col>
 			     <el-col :span="7">          
@@ -269,9 +413,28 @@
 			         <el-input v-model="formData.拆片条小盒系数" id="拆片条小盒系数"  @keydown="ent($event, '拆片联拼系数', '拆片条小盒系数', '定额代号')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>			  				 
-			   </el-row>
+			   </el-row> -->
+			  
+			  
+			  <el-row :gutter="24">
+			    <el-col :span="6">
+			      <el-form-item label="计产系数:" prop="flatFeed" class="mab">
+				  <el-input v-model="formData.sczl_计产系数" id="计产系数"  @keydown="ent($event, '工价系数', '计产系数', 'sczl_bh1')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+			    <!-- <el-col :span="6">
+			      <el-form-item label="定额代号:" prop="flatFeed" class="mab">
+			       <el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent($event, '拆片条小盒系数', '定额代号', '工价系数')" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+			      </el-form-item>
+			    </el-col>
+				<el-col :span="6">
+				  <el-form-item label="工价系数:" prop="flatFeed" class="mab">
+				   <el-input v-model="formData.sczl_工价系数" id="工价系数"  @keydown="ent($event, '定额代号', '工价系数', '计产系数')" :clearable="true" placeholder="" style="width: 200px;" />		  				  
+				  </el-form-item>
+				</el-col> -->
+			  </el-row>
 			  
-			  <el-row :gutter="20">
+			  <!-- <el-row :gutter="20">
 			     <el-col :span="4">			       
 			     </el-col>
 			     <el-col :span="10">          
@@ -293,7 +456,7 @@
 					  <el-input v-model="formData.sczl_计产系数" id="计产系数"  @keydown="ent($event, '工价系数', '计产系数', 'sczl_bh1')" :clearable="true" placeholder="" />
 					</el-form-item>
 				  </el-col>
-			   </el-row>
+			   </el-row> -->
             
               <el-row :gutter="10">
 				  <el-col :span="2">
@@ -548,6 +711,7 @@ const getTabdata = async () => {
      }),
    }));
    treeData.splice(0, treeData.length, ...transformedData);
+   displayMod.value = 'date'
    console.log(treeData);
 }
 
@@ -872,6 +1036,8 @@ const ADD=ref('0')
 function onAdd() {
 	ADD.value='新增'
 	console.log(ADD.value)
+	console.log(lastCellValue)
+	 GetInfo(lastCellValue)
 	dialogFormVisible.value = true
 	// Productionadd()
 }
@@ -891,37 +1057,33 @@ function onDel() {
 const Del = async () => {
   const response = await productiondel({UniqId:lastCellValue});
   if (response.code === 0) {
-	console.log(333)
+	ElMessage({
+	  type: 'success',
+	  message: '删除成功',
+	})
   }
   getTableData()
 }
+const displayMod = ref('')
 // 按工单显示
 function onCountByGdbh() {
-	CountByGdbh()
+	console.log(displayMod.value)
+	if (displayMod.value === 'date') {
+	   displayMod.value = 'gd'	
+	   CountByGdbh()
+	   console.log(displayMod.value)
+	} else {
+	  getTabdata()
+	}
+	
 }
 //按工单显示
 const CountByGdbh = async () => {
   const response = await productionByGdbh();
-  // let tree = {}; // 将 tree 声明为 let 变量，以便后续可以重新赋值
-  // console.log(response)
+
   if (response.code === 0) {
-	//   console.log(response)
-	  
-	// const transformedData = response.data.map(item => ({
-	// 	      label: `${item.sys.value}`,	
-			  
-	// 	      // children: item.sys(sysItem => ({
-	// 	        // label: `${sysItem.sys} 【记录数: ${sysItem.sys}张】`,
-	// 	        params: {
-	// 	          date: item.sczl_gdbh,
-	// 	          sys_id: item.sczl_gdbh,
-	// 	          total: '1',
-	// 	        },
-	// 	      // })),
-	// 	    }));
-	// 	    treeData.splice(0, treeData.length, ...transformedData);
-			// 假设您有一个名为"tree"的空对象来存储树形结构
-			
+		
+		// console.log(displayMod.value)
 		treeData.splice(0, treeData.length);
 		  // 遍历接口返回的数据
 		  response.data.forEach(item => {
@@ -947,7 +1109,7 @@ const CountByGdbh = async () => {
 					total: item.sys[key],
 				}
 		      };
-		      treeData[item.sczl_gdbh].children.push(childNode);
+		      treeData[item.sczl_gdbh].children.push(childNode);			  
 		    }
 		  });
 		// console.log(treeData)
@@ -963,7 +1125,8 @@ const CountByGdbh = async () => {
   // const transformedData = Object.values(tree);
   // console.log(transformedData)
   // treeData = transformedData;
-  getTableData()
+
+  // getTableData()
 }
 // ============== 表格控制部分结束 ===============
 
@@ -1101,7 +1264,7 @@ const updateDetailData = async() => {
    sczl_ms: formData.value.sczl_ms,
    sczl_ls: formData.value.sczl_ls,
    sczl_cl: formData.value.sczl_cl,
-   sczl_zcfp: formData.value.sczl_zcfp,
+   sczl_fp: formData.value.sczl_zcfp,
    sczl_装版总工时: formData.value.sczl_装版总工时,
    sczl_装版工时: formData.value.sczl_装版工时,
    sczl_保养工时: formData.value.sczl_保养工时,
@@ -1156,12 +1319,25 @@ const updateDetailData = async() => {
   	 // console.log(ADD.value)
   	 ADD.value='0'
   	 console.log(response)
-  	 
+	 if(response.code==0){
+		 ElMessage({
+		   type: 'success',
+		   message: '新增成功',
+		 })
+	 }
+  	 dialogFormVisible.value = false
   }else{
   	  const response = await productionedit(restoredData);
   	 console.log('修改')
   	  console.log(ADD.value)
   	  console.log(response)
+	  if(response.code==0){
+		 ElMessage({
+		   type: 'success',
+		   message: '更新成功',
+		 })
+	  }
+	  dialogFormVisible.value = false
   	 // ADD.value='0'
   	 // console.log(ADD.value)
   }
@@ -1190,6 +1366,17 @@ function doubleClick(row, column, event) {
 	  console.log('此数据不展示详细信息')
   }  
 }
+// 单击表格操作
+function Click(row, column, event) {
+    lastCellValue= row['UniqId'];
+   console.log(lastCellValue)
+  // if(row['table_type']=='db_sczl'){
+  // 	 dialogFormVisible.value = true
+  // 	 GetInfo(table.value)
+  // }else{
+	 //  console.log('此数据不展示详细信息')
+  // }  
+}
 //获取详细信息
 const GetInfo = async (value) => {
   const response = await productionInfo({UniqId:value});
@@ -1230,7 +1417,9 @@ onMounted(async () => {
 .JKWTree-content {
   flex: 1;
 }
-
+.mab{
+  margin-bottom: 5px;
+}
 /* 选中某行时的背景色*/
 .el-table__body tr.current-row>td {
   background: #ff80ff !important;

src/view/performance/MachineDocuments.vue

@@ -20,7 +20,7 @@
               </el-row>
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary" :icon="Refresh" @click="onRefresh">刷新质检系数</el-button>
-			   <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			   <el-button type="primary"  @click="onCountByGdbh">切换显示方式</el-button>
 			   <el-button type="primary" :icon="Refresh" @click="onAdd">新增</el-button>
 			  <el-button type="primary" :icon="Refresh" @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
@@ -29,7 +29,7 @@
             </div>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true" border @selection-change="handleSelectionChange" 
+              highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="分类" prop="sczl_单据类型" width="120"/>
@@ -477,7 +477,7 @@ const transformedData = response.data.map(item => ({
 	      })),
 	    }));
 	    treeData.splice(0, treeData.length, ...transformedData);
-
+        displayMod.value = 'date'
 	}
 
 getTabdata();
@@ -891,24 +891,42 @@ const updateDetailData = async() => {
   	 // console.log(ADD.value)
   	 ADD.value='0'
   	 console.log(response)
-  	 
+  	 if(response.code==0){
+  	 		 ElMessage({
+  	 		   type: 'success',
+  	 		   message: '新增成功',
+  	 		 })
+  	 }
+  	 dialogFormVisible.value = false
   }else{
 		 console.log(restoredData)
   	     console.log(lastCellValue)
   	     formData.value.UniqId=lastCellValue
   	     console.log(formData)
   	 	restoredData.UniqId='5'
-  	    const response = await machineEdit(restoredData);
+  	    const res = await machineEdit(restoredData);
   	   // console.log(FormData)
-  	   console.log(response)
+  	   console.log(res)
+	   if(res.code==0){
+	   ElMessage({
+	     type: 'success',
+	     message: '更新成功',
+	   })
+	   }
+	   dialogFormVisible.value = false
   	 }
+	
   }
  
 //删除
 const MachineDel = async () => {
   const response = await machineDel({UniqId:lastCellValue});
   if (response.code === 0) {
-	console.log(333)
+	
+	ElMessage({
+	  type: 'success',
+	  message: '删除成功',
+	})
   }
   getTableData()
 }
@@ -946,6 +964,7 @@ function onRefresh() {
 const ADD=ref('0')
 //新增
 function onAdd() {
+	GetMachineInfo(lastCellValue)
 	ADD.value='新增'
 	console.log(ADD.value)
 	dialogFormVisible.value = true
@@ -955,15 +974,24 @@ function onAdd() {
 function onDel() {
 	MachineDel()
 }
+const displayMod = ref('')
 // 按工单显示
 function onCountByGdbh() {
-	CountByGdbh()
+	console.log(displayMod.value)
+	if (displayMod.value === 'date') {
+	   displayMod.value = 'gd'	
+	   CountByGdbh()
+	   console.log(displayMod.value)
+	} else {
+	  getTabdata()
+	}
+	// CountByGdbh()
 }
 //按工单显示
 const CountByGdbh = async () => {
   const response = await getMachineCountByGdbh();
   // console.log(response)
-   treeData.splice(0, GetJTtreeData.length);
+   treeData.splice(0, treeData.length);
   if (response.code === 0) {
 	  console.log(response)
 	  
@@ -981,7 +1009,7 @@ const CountByGdbh = async () => {
 		    treeData.splice(0, treeData.length, ...transformedData);
 			
   }
-  getTableData()
+  // getTableData()
 }
 // ============== 表格控制部分结束 ===============
 
@@ -1115,23 +1143,28 @@ const enterDialog = async () => {
 const ent = (event,id1,id2,id3) => {
 
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
-    if(id3!=''){
-      document.getElementById(id3).focus()
-    }
-	if(id2=='工单编号'&&event.keyCode === 13){
-		getMachineGxMcsubmit()
-	}else if(id2=='机台编号'&&event.keyCode === 13){
-		getJtbhsubmit()
-	}else if(id2=='定额代号'&&event.keyCode === 13){
-		getMachineDedhsubmit()
-	}
+    const idMap = {
+       'bh0': '0',
+       'bh1': '1',
+       'bh2': '2',
+       'bh3': '3',
+       'bh4': '4',
+       'bh5': '5',
+       'bh6': '6',
+       'bh7': '7',
+       'bh8': '8',
+     };
 	if(id2=='工单编号'&&event.keyCode === 13){
 		getMachineGxMcsubmit()
 	}else if(id2=='机台编号'&&event.keyCode === 13){
 		getJtbhsubmit()
 	}else if(id2=='定额代号'&&event.keyCode === 13){
 		getMachineDedhsubmit()
-	}
+	}else if (idMap.hasOwnProperty(id2) && event.keyCode === 13) {
+	    getGxMcsubmit('', idMap[id2]);
+	}else if(id3!=''){
+      document.getElementById(id3).focus()
+    }	
   } else if (event.keyCode === 38) { // 向上箭头
     if(id1!=''){
       document.getElementById(id1).focus()
@@ -1163,7 +1196,17 @@ function doubleClick(row, column, event) {
 		// dialogSelectVisible.value = true
   GetMachineInfo(table.value)
 }
-
+// 单击表格操作
+function Click(row, column, event) {
+    lastCellValue= row['UniqId'];
+   console.log(lastCellValue)
+  // if(row['table_type']=='db_sczl'){
+  // 	 dialogFormVisible.value = true
+  // 	 GetInfo(table.value)
+  // }else{
+	 //  console.log('此数据不展示详细信息')
+  // }  
+}
 // 导出excel
 function exportExcel() {
   console.log('导出到excel');

src/view/performance/Manualdocuments.vue

@@ -21,7 +21,7 @@
               <el-button type="primary" :icon="Search" @click="onSearch">搜索</el-button>
               <el-button type="primary"  @click="onAdd">新增</el-button>
 			  <el-button type="primary"  @click="onRefresh">刷新质检系数</el-button>
-			  <el-button type="primary"  @click="onCountByGdbh">按工单显示</el-button>
+			  <el-button type="primary"  @click="onCountByGdbh">切换显示方式</el-button>
 			  <el-button type="primary"  @click="onDel">删除</el-button>
               <div style="margin-left: auto;">
                 <el-button type="primary" :icon="Download" @click="exportExcel">导出到Excel</el-button>
@@ -29,7 +29,7 @@
             </div>
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
-              highlight-current-row="true" border @selection-change="handleSelectionChange" 
+              highlight-current-row="true" border @selection-change="handleSelectionChange"  @row-click="Click"
 			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
               <el-table-column align="left" label="工单印件" prop="combinedProp" width="340"/>
@@ -77,7 +77,7 @@
                     </el-row>
                   </el-form-item>
                 </el-col>
-				<el-col :span="4">
+				<el-col :span="6">
 				  <el-form-item label="组长" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="12">
@@ -92,7 +92,7 @@
 				<el-col :span="4">
 				  <el-form-item label="箱数" prop="name">
 				    <el-row :gutter="20">
-				      <el-col :span="2">
+				      <el-col :span="20">
 				        <el-input v-model="formData.sczl_cl0" id="箱数"  @keydown="ent($event, 'name0', '箱数', '每箱数')" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
@@ -101,7 +101,7 @@
 				<el-col :span="3">
 				  <el-form-item label="每箱数" prop="name">
 				    <el-row :gutter="20">
-				      <el-col :span="2">
+				      <el-col :span="40">
 				        <el-input v-model="formData.sczl_fp0" id="每箱数"  @keydown="ent($event, '箱数', '每箱数', '工单编号')" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
@@ -123,7 +123,7 @@
 					<el-col :span="5">
 					    <el-input v-model="formData.sczl_gxmc" id="gxmc"  @keydown="ent($event, 'yjgx', 'gxmc', 'yjmc')" :clearable="true" placeholder="" />
 					</el-col>
-					<el-col :span="5">
+					<el-col :span="7">
 					    <el-input v-model="formData.yj_yjmc" id="yjmc"  @keydown="ent($event, 'gxmc', 'yjmc', '产量合计')" :clearable="true" placeholder="" />
 					</el-col>
                   </el-row>
@@ -136,7 +136,7 @@
 			         <el-input v-model="formData.sczl_cl" id="产量合计"  @keydown="ent($event, 'gxmc', '产量合计', '定额代号')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
-			     <el-col :span="6">          
+			     <el-col :span="10">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="定额代号" prop="id">
@@ -145,12 +145,12 @@
 			           </el-col>
 			         </el-row>
 			     </el-col>
-			     <el-col :span="3">
+			     <el-col :span="4">
 			       <el-form-item label="检验类别" prop="name">
 			         <el-input v-model="formData.sczl_检验类别"  id="检验类别"  @keydown="ent($event, '定额代号', '检验类别', '废品率系数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
-				 <el-col :span="3">
+				 <el-col :span="4">
 				   <el-form-item label="废品率系数" prop="name">
 				     <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent($event, '检验类别', '废品率系数', '计时时数')" :clearable="true" placeholder="" />
 				   </el-form-item>
@@ -564,7 +564,7 @@ const transformedData = response.data.map(item => ({
 	      })),
 	    }));
 	    treeData.splice(0, treeData.length, ...transformedData);
-
+        displayMod.value = 'date'
 	}
 
 getTabdata();
@@ -789,8 +789,8 @@ const GetYg = async (value,inputName) => {
 //员工编号回车事件
 const getygsubmit = (event, inputName) => {
 
-	  console.log(inputName)
-	 
+	    console.log(inputName)
+	    
 		  let combinedString = 'sczl_bh' + inputName;
 		   console.log(combinedString)
 		  //  let variableName = 'sczl_gdbh'+inputName;
@@ -913,12 +913,33 @@ const getDedhsubmit = () => {
 const ent = (event,id1,id2,id3) => {
 
   if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
-    if(id3!=''){
+    
+	 const idMap = {
+	    'bh0': '0',
+	    'bh1': '1',
+	    'bh2': '2',
+	    'bh3': '3',
+	    'bh4': '4',
+	    'bh5': '5',
+	    'bh6': '6',
+	    'bh7': '7',
+	    'bh8': '8',
+	    'bh9': '9',
+	    'bh10': '10',
+	    'bh11': '11',
+	    'bh12': '12'
+	  };
+	  if(id2=='工单编号'&& event.keyCode === 13){
+		  getGxMcsubmit()
+	  }
+	  else if(id2=='定额代号'&& event.keyCode === 13){
+	  		 getDedhsubmit()
+	  }
+	 else if (idMap.hasOwnProperty(id2) && event.keyCode === 13) {
+	     getygsubmit('', idMap[id2]);
+	   }else if(id3!=''){
       document.getElementById(id3).focus()
     }
-	if(id2=='bh0'){
-		getygsubmit($event, '0')
-	}
   } else if (event.keyCode === 38) { // 向上箭头
     if(id1!=''){
       document.getElementById(id1).focus()
@@ -953,6 +974,7 @@ const GetScrapFactor = async (value) => {
 const ADD=ref('0')
 //新增
 function onAdd() {
+	 GetInfo(lastCellValue)
 	ADD.value='新增'
 	console.log(ADD.value)
 	dialogFormVisible.value = true
@@ -987,15 +1009,16 @@ const updateDetailData = async() => {
    sczl_废品率系数: formData.value.sczl_废品率系数,
    sczl_jsss: formData.value.sczl_jsss,
    sczl_冲定额: formData.value.sczl_冲定额,
+   qczl_Num:formData.value.qczl_NumDesc,
    qczl_NumDesc:formData.value.流程单号1,
    qczl_NumDesc1: formData.value.流程单号2,
-   qczl_NumDesc12: formData.value.流程单号3,
-   qczl_NumDesc13: formData.value.流程单号4,
-   qczl_NumDesc14: formData.value.流程单号5,
-   qczl_NumDesc15: formData.value.流程单号6,
-   qczl_NumDesc16: formData.value.流程单号7,
-   qczl_NumDesc17: formData.value.流程单号8,
-   qczl_NumDesc18: formData.value.流程单号9,
+   qczl_NumDesc2: formData.value.流程单号3,
+   qczl_NumDesc3: formData.value.流程单号4,
+   qczl_NumDesc4: formData.value.流程单号5,
+   qczl_NumDesc5: formData.value.流程单号6,
+   qczl_NumDesc6: formData.value.流程单号7,
+   qczl_NumDesc7: formData.value.流程单号8,
+   qczl_NumDesc8: formData.value.流程单号9,
    sczl_desc: formData.value.sczl_desc,
    sczl_bh1: formData.value.sczl_bh1,
    sczl_bh2: formData.value.sczl_bh2,
@@ -1055,12 +1078,25 @@ const updateDetailData = async() => {
   	 // console.log(ADD.value)
   	 ADD.value='0'
   	 console.log(response)
-  	 
+  	 if(response.code==0){
+  	 		 ElMessage({
+  	 		   type: 'success',
+  	 		   message: '新增成功',
+  	 		 })
+  	 }
+  	 dialogFormVisible.value = false
   }else{
   	const response = await shougongedit(restoredData);
   	 console.log('修改')
   	  console.log(ADD.value)
   	  console.log(response)
+	  if(response.code==0){
+	  		 ElMessage({
+	  		   type: 'success',
+	  		   message: '更新成功',
+	  		 })
+	  }
+	  dialogFormVisible.value = false
   	 // ADD.value='0'
   	 // console.log(ADD.value)
   }
@@ -1082,13 +1118,26 @@ function onDel() {
 const Del = async () => {
   const response = await shougongdel({UniqId:lastCellValue});
   if (response.code === 0) {
-	console.log(333)
+	ElMessage({
+	  type: 'success',
+	  message: '删除成功',
+	})
   }
   getTableData()
 }
+const displayMod = ref('')
 // 按工单显示
 function onCountByGdbh() {
-	CountByGdbh()
+	console.log(displayMod.value)
+	if (displayMod.value === 'date') {
+	   displayMod.value = 'gd'	
+	   CountByGdbh()
+	   console.log(displayMod.value)
+	} else {
+	  getTabdata()
+	}
+	
+	// CountByGdbh()
 }
 //按工单显示
 const CountByGdbh = async () => {
@@ -1111,7 +1160,7 @@ const CountByGdbh = async () => {
 		    treeData.splice(0, treeData.length, ...transformedData);
 			
   }
-  getTableData()
+  // getTableData()
 }
 // ============== 表格控制部分结束 ===============
 
@@ -1245,7 +1294,12 @@ function doubleClick(row, column, event) {
     GetInfo(table.value)
   // dialogFormVisible.value = true
 }
+// 单击表格操作
+function Click(row, column, event) {
+    lastCellValue= row['UniqId'];
+   console.log(lastCellValue)
 
+}
 // 导出excel
 function exportExcel() {
   console.log('导出到excel');

src/view/performance/Packagingoutput.vue

@@ -30,7 +30,7 @@
             <!-- 数据展示 -->
             <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
               highlight-current-row="true"  :cell-style="cellStyle" border @selection-change="handleSelectionChange" 
-			  :show-overflow-tooltip="true" @row-dblclick="doubleClick">
+			  :show-overflow-tooltip="true" @row-click="Click" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
 <!-- 			  <el-table-column align="left" label="创建用户" prop="sys_id" width="120" />
               <el-table-column align="left" label="日期" prop="sczl_rq" width="120"/>
@@ -93,6 +93,7 @@
                                  <template #default="{ row, $index }">
                                    <el-input
                                      v-model="row.sczl_gdbh"
+									 id="工单编号"  @keydown="ent($event, '零头', '工单编号', '印件工序')"
                                      @keyup.enter="handleEnter($index, row)"
                                    />
                                  </template>
@@ -102,7 +103,7 @@
                                  width="100"
                                >
                                  <template #default="{ row }">
-                                   <el-input v-model="row.sczl_yjGx" />
+                                   <el-input v-model="row.sczl_yjGx" id="印件工序"  @keydown="ent($event, '工单编号', '印件工序', '工序名称')" />
                                  </template>
                                </el-table-column>
                                <el-table-column
@@ -110,12 +111,12 @@
                                  width="100"
                                >
                                  <template #default="{ row }">
-                                   <el-input v-model="row.sczl_gxmc" />
+                                   <el-input v-model="row.sczl_gxmc"  id="工序名称"  @keydown="ent($event, '印件工序', '工序名称', '印件名称')"/>
                                  </template>
                                </el-table-column>
                                <el-table-column label="印件名称">
                                  <template #default="{ row }">
-                                   <el-input v-model="row.Gd_cpmc" />
+                                   <el-input v-model="row.Gd_cpmc"  id="印件名称"  @keydown="ent($event, '工序名称', '印件名称', '包装产量')" />
                                  </template>
                                </el-table-column>
                                <el-table-column
@@ -123,7 +124,7 @@
                                  width="100"
                                >
                                  <template #default="{ row }">
-                                   <el-input v-model="row.sczl_cl" />
+                                   <el-input v-model="row.sczl_cl" id="包装产量"  @keydown="ent($event, '印件名称', '包装产量', '每箱数量')"  />
                                  </template>
                                </el-table-column>
                                <el-table-column
@@ -131,7 +132,7 @@
                                  width="100"
                                >
                                  <template #default="{ row }">
-                                   <el-input v-model="row.sczl_PgCl" />
+                                   <el-input v-model="row.sczl_PgCl" id="每箱数量"  @keydown="ent($event, '包装产量', '每箱数量', '零头')" />
                                  </template>
                                </el-table-column>
                                <el-table-column
@@ -139,7 +140,7 @@
                                  width="100"
                                >
 							   <template #default="{ row }">
-							     <el-input v-model="row.sczl_clAdd" />
+							     <el-input v-model="row.sczl_clAdd" id="零头"  @keydown="ent($event, '每箱数量', '零头', '工单编号')" />
 							   </template>
                                </el-table-column>
                              </el-table>
@@ -707,12 +708,26 @@ const updateDetailData = async() => {
   	 // console.log(ADD.value)
   	 ADD.value='0'
   	 console.log(response)
+	 if(response.code==0){
+	 		 ElMessage({
+	 		   type: 'success',
+	 		   message: '新增成功',
+	 		 })
+	 }
+	 dialogFormVisible.value = false
   	 
   }else{
   	 // restoredData.UniqId = 1
   	  const res = await edit(restoredData)
   	 console.log(restoredData)
   	 console.log(res)
+	 if(res.code==0){
+	 		 ElMessage({
+	 		   type: 'success',
+	 		   message: '更新成功',
+	 		 })
+	 }
+	 dialogFormVisible.value = false
   	 // ADD.value='0'
   	 // console.log(ADD.value)
   }
@@ -724,11 +739,40 @@ const updateDetailData = async() => {
 const GxMcdel = async () => {
   const response = await del({UniqId:lastCellValue});
   if (response.code === 0) {
-	console.log(333)
+	ElMessage({
+	  type: 'success',
+	  message: '删除成功',
+	})
   }
   getTableData()
 }
 
+//键盘 input框跳转
+const ent = (event,id1,id2,id3) => {
+
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+  } else if (event.keyCode === 38) { // 向上箭头
+    if(id1!=''){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 8) { // 删除箭头
+    if(id1!='' && document.getElementById(id2).value==''){
+      document.getElementById(id1).focus()
+    }
+    console.log(document.getElementById(id2).value)
+  }else if (event.keyCode === 37) { // 向左箭头
+    if(id1!='' && document.getElementById(id2).selectionStart==0){
+      document.getElementById(id1).focus()
+    }
+  }else if (event.keyCode === 39) { // 向右箭头
+    if(id3!='' && document.getElementById(id2).selectionStart == document.getElementById(id2).value.length){
+      document.getElementById(id3).focus()
+    }
+  }
+}
 
 const selectData = reactive([
   {
@@ -748,9 +792,6 @@ const handleSelectClick = (row, column, event) => {
 }
 const GetGxMc = async (index, row) => {
 	
-	
-	
-	
 	console.log(row)
 	  const response = await getGxMc({gdbh: row.sczl_gdbh })
 	  if (response.code === 0) {
@@ -912,7 +953,6 @@ function onAdd() {
 	console.log(ADD.value)
 	getpickInfo(lastCellValue)
 	dialogFormVisible.value = true
-	
 	// Productionadd()
 }
 
@@ -970,7 +1010,17 @@ function doubleClick(row) {
 		 table.value=lastCellValue
        getpickInfo(table.value)
 }
-
+// 单击表格操作
+function Click(row, column, event) {
+    lastCellValue= row['UniqId'];
+   console.log(lastCellValue)
+  // if(row['table_type']=='db_sczl'){
+  // 	 dialogFormVisible.value = true
+  // 	 GetInfo(table.value)
+  // }else{
+	 //  console.log('此数据不展示详细信息')
+  // }  
+}
 
 function GxMcdoubleClick(row) {
 

src/view/performance/chejianbaogong.vue

@@ -5,7 +5,6 @@
 		<div style="height: 50px;">
 			<el-button type="primary" @click="onBZ" >班组维护</el-button>
 			<el-button type="primary" @click="onchanliang"  v-if="zdtreeType === true" >日产量上报</el-button>
-			<el-button type="primary" @click="onDel" >删除</el-button>
 			<el-button type="primary" @click="onOver" >完工</el-button>
 			<el-button type="primary" @click="ondianjian"  >设备点检</el-button>			
 			<el-button type="primary" @click="onxuncha" >管理巡查</el-button>
@@ -42,10 +41,10 @@
 							  <el-form-item label="工单编号" prop="name">
 								<el-row :gutter="20">
 								  <el-col :span="12">
-									<el-input v-model="formData.工单编号" :clearable="true" placeholder="ZT01733" />							
+									<el-input v-model="formData.工单编号" :clearable="true" placeholder="" />							
 								  </el-col>
 								  <el-col :span="12">
-									<el-input v-model="formData.产品名称" :clearable="true" placeholder="ZT01733" />
+									<el-input v-model="formData.产品名称" :clearable="true" placeholder="" />
 								  </el-col>
 								</el-row>
 								
@@ -56,12 +55,12 @@
 						  <el-row :gutter="20">
 							<el-col :span="5">
 							 <el-form-item label="印件编号" prop="id">
-							   <el-input v-model="formData.印件号" :clearable="true" placeholder="2023.12.14" />
+							   <el-input v-model="formData.印件号" :clearable="true" placeholder="" />
 							 </el-form-item>
 							</el-col>
 						  <el-col :span="15">
 							 <el-form-item label="工序名称" prop="name">
-							   <el-input v-model="formData.工序名称" :clearable="true" placeholder="A班" />
+							   <el-input v-model="formData.工序名称" :clearable="true" placeholder="" />
 							 </el-form-item>
 							</el-col>			    
 						  </el-row>
@@ -76,23 +75,23 @@
 			<el-row :gutter="1">
 						 
 						 <el-col :span="3">
-						   <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZT01733" />
+						   <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="" />
 						 </el-col>
 						<el-col :span="3">
-						  <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="ZT01733" />
+						  <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="" />
 						</el-col>
 						  <el-col :span="3">			  			
-							<el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="ZT01733" />
+							<el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="" />
 						  </el-col>
 						  
 						 <el-col :span="3">
-							<el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="ZT01733" />
+							<el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="" />
 						  </el-col>
 						  <el-col :span="3">
-							<el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="ZT01733" />
+							<el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="" />
 						  </el-col>
 						  <el-col :span="3">
-							<el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="ZT01733" />
+							<el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="" />
 						  </el-col> 
 						<!-- <el-col :span="1">
 							<el-input v-model="formData.sczl_bh7" :clearable="true" placeholder="ZT01733" />
@@ -111,13 +110,13 @@
 					   <el-row :gutter="1">
 					 
 					 <el-col :span="3">
-					   <el-input v-model="formData.sczl_name1" :clearable="true" placeholder="ZT01733" />
+					   <el-input v-model="formData.sczl_name1" :clearable="true" placeholder="" />
 					 </el-col>
 					<el-col :span="3">
-					  <el-input v-model="formData.sczl_name2" :clearable="true" placeholder="ZT01733" />
+					  <el-input v-model="formData.sczl_name2" :clearable="true" placeholder="" />
 					</el-col>
 					  <el-col :span="3">			  			
-						<el-input v-model="formData.sczl_name3" :clearable="true" placeholder="ZT01733" />
+						<el-input v-model="formData.sczl_name3" :clearable="true" placeholder="" />
 					  </el-col>
 					  
 					  <!-- <el-col :span="3">
@@ -173,7 +172,7 @@
 </div>
           <div class="gva-table-box">
             
-            <el-tabs v-model="activeName" type="card" @tab-click="duohandleClick"   >
+            <el-tabs v-model="activName" type="card" @tab-click="duohandleClick"   >
             
                         <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"   name="first">
                           <el-table ref="multipleTable"
@@ -418,7 +417,7 @@
 			 </el-col>
 			 <el-col :span="10">
 			   <el-form-item label="班组编号" prop="id">
-				<el-input v-model="BZMC" :clearable="true" placeholder="2023.12.14" />			 
+				<el-input v-model="BZMC" :clearable="true" placeholder="" />			 
 			   </el-form-item>
 			 </el-col>
 			</el-row> 	
@@ -474,16 +473,16 @@
 				
 				
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code1" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formDatas.code1" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code2" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formDatas.code2" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code3" :clearable="true" placeholder="是" />
+				  <el-input v-model="formDatas.code3" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code4" :clearable="true" placeholder="是" />
+				  <el-input v-model="formDatas.code4" :clearable="true" placeholder="" />
 				</el-col>
 				
 				<!-- <el-col :span="2">
@@ -519,16 +518,16 @@
 			  				   <span></span>
 			  				 </el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name1" :clearable="true" placeholder="ZI00401" />
+			  				  <el-input v-model="formDatas.name1" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name2" :clearable="true" placeholder="瞿春生" />
+			  				  <el-input v-model="formDatas.name2" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name3" :clearable="true" placeholder="11.0" />
+			  				  <el-input v-model="formDatas.name3" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name4" :clearable="true" placeholder="打包废纸" />
+			  				  <el-input v-model="formDatas.name4" :clearable="true" placeholder="" />
 			  				</el-col>
 			  	<!-- 			<el-col :span="2">
 			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
@@ -554,16 +553,16 @@
 			  				   <span></span>
 			  				 </el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="ZI00401" />
+			  				  <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="瞿春生" />
+			  				  <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="11.0" />
+			  				  <el-input v-model="formDatas.percentage3" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="打包废纸" />
+			  				  <el-input v-model="formDatas.percentage4" :clearable="true" placeholder="" />
 			  				</el-col>
 			  			<!-- 	<el-col :span="2">
 			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
@@ -601,13 +600,13 @@
 		  <el-row :gutter="0">
 		    <el-col :span="4">
 		      <el-form-item label="设备编号" prop="id">
-		        <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+		        <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="" />
 		      </el-form-item>
 		    </el-col>
 		    <el-col :span="20">
 		      <el-row :gutter="20">
 		        <el-col :span="5">
-		          <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="ZT01733" />
+		          <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
 		        </el-col>
 		      </el-row>
 		    </el-col>
@@ -688,21 +687,21 @@
 		  <el-row :gutter="0">
 		    <el-col :span="4">
 		      <el-form-item label="工单编号" prop="id">
-		        <el-input v-model="formData.order" :clearable="true" placeholder="2023.12.14" />
+		        <el-input v-model="formData.order" :clearable="true" placeholder="" />
 		      </el-form-item>
 		    </el-col>
 
 		    <el-col :span="10">
 		      <el-row :gutter="20">
 		        <el-col :span="10">
-		          <el-input v-model="formData.product_name" :clearable="true" placeholder="ZT01733" />
+		          <el-input v-model="formData.product_name" :clearable="true" placeholder="" />
 		        </el-col>
 		      </el-row>
 		    </el-col>
 			
 			<el-col :span="4">
 			  <el-form-item label="流程单" prop="id">
-			    <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+			    <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="" />
 			  </el-form-item>
 			</el-col>
 		  </el-row>
@@ -710,24 +709,24 @@
 		  <el-row :gutter="0">
 		    <el-col :span="4">
 		      <el-form-item label="印件编号" prop="id">
-		        <el-input v-model="formData.yjno" :clearable="true" placeholder="2023.12.14" />
+		        <el-input v-model="formData.yjno" :clearable="true" placeholder="" />
 		      </el-form-item>
 		    </el-col>
 		    <el-col :span="10">
 		      <el-row :gutter="20">
 		        <el-col :span="5">
-		          <el-input v-model="formData.gxmc" :clearable="true" placeholder="ZT01733" />
+		          <el-input v-model="formData.gxmc" :clearable="true" placeholder="" />
 		        </el-col>
 		      </el-row>
 		    </el-col>
 			<el-col :span="4">
 			  <el-form-item label="工号" prop="id">
-			    <el-input v-model="formData3.sczl_bh11"  @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="2023.12.14" />
+			    <el-input v-model="formData3.sczl_bh11"  @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			</el-col>
 			<el-col :span="4">
 			  <el-form-item label="姓名" prop="id">
-			    <el-input v-model="formData3.sczl_name11" :clearable="true" placeholder="2023.12.14" />
+			    <el-input v-model="formData3.sczl_name11" :clearable="true" placeholder="" />
 			  </el-form-item>
 			</el-col>
 		  </el-row>
@@ -736,7 +735,7 @@
 		<el-row :gutter="0">
 		  <el-col :span="4">
 		    <el-form-item label="检验备注" prop="id">
-		      <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="2023.12.14" />
+		      <el-input v-model="formData.sczl_gdbh" :clearable="true" placeholder="" />
 		    </el-form-item>
 		  </el-col>
 		  
@@ -849,19 +848,19 @@
 		        <el-row :gutter="20">
 		          <el-col :span="15">
 		          <el-form-item label="工单编号" prop="id" style="margin-top: 10px;">
-		            <el-input v-model="formData3.order" :clearable="true" placeholder="" />
+		            <el-input v-model="formData3.order" id="工单编号"  @keydown="ent($event, 'rate10', '工单编号', '产品名称')" :clearable="true" placeholder="" />
 		          </el-form-item>
 		          </el-col>
 		        </el-row>
 
 			  <el-col :span="8">
 			  <el-form-item label="产品名称" prop="id" style="margin-top: 10px;">
-			    <el-input v-model="formData3.product_name" :clearable="true" placeholder="" />
+			    <el-input v-model="formData3.product_name" id="产品名称"  @keydown="ent($event, '工单编号', '产品名称', '工序名称')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
 			  <el-col :span="8">
 			  <el-form-item label="工序名称" prop="id" style="margin-top: 10px;">
-			    <el-input v-model="formData3.gxmc" :clearable="true" placeholder="" />
+			    <el-input v-model="formData3.gxmc" id="工序名称"  @keydown="ent($event, '产品名称', '工序名称', '印件号')" :clearable="true" placeholder="" />
 			  </el-form-item>
 			  </el-col>
 			  <el-col :span="8">
@@ -875,24 +874,24 @@
 			      <el-row :gutter="20">
 			        <el-col :span="15">
 			        <el-form-item label="印件号" prop="id" style="margin-top: 10px;">
-			          <el-input v-model="formData3.yjno" :clearable="true" placeholder="" />
+			          <el-input v-model="formData3.yjno" id="印件号"  @keydown="ent($event, '工序名称', '印件号', '印件名称')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
 			      </el-row>
 			
 				  <el-col :span="8">
 				  <el-form-item label="印件名称" prop="id" style="margin-top: 10px;">
-					<el-input v-model="formData3.yj_name" :clearable="true" placeholder="" />
+					<el-input v-model="formData3.yj_name" id="印件名称"  @keydown="ent($event, '印件号', '印件名称', '工艺名称')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
 				  <el-col :span="8">
 				  <el-form-item label="工艺名称" prop="id" style="margin-top: 10px;">
-					<el-input v-model="formData3.gy_name" :clearable="true" placeholder="" />
+					<el-input v-model="formData3.gy_name" id="工艺名称"  @keydown="ent($event, '印件名称', '工艺名称', 'gxh')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
 				  <el-col :span="2">
 				  <el-form-item label="" prop="id" style="margin-top: 10px;">
-				    <el-input v-model="formData3.gxh" :clearable="true" placeholder="" />
+				    <el-input v-model="formData3.gxh" id="gxh"  @keydown="ent($event, '工艺名称', 'gxh', '日期')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>						  
 			  </el-row>
@@ -903,24 +902,24 @@
 			        <el-row :gutter="20">
 			          <el-col :span="15">
 			          <el-form-item label="日期" prop="id" style="margin-top: 10px;">
-			            <el-input v-model="formData3.日期" :clearable="true" placeholder="" />
+			            <el-input v-model="formData3.日期" id="日期"  @keydown="ent($event, 'gxh', '日期', '流程标牌')" :clearable="true" placeholder="" />
 			          </el-form-item>
 			          </el-col>
 			        </el-row>
 			  
 			  	  <el-col :span="5">
 			  	  <el-form-item label="流程标牌" prop="id" style="margin-top: 10px;">
-			  		<el-input v-model="formData3.流程标牌" :clearable="true" placeholder="" />
+			  		<el-input v-model="formData3.流程标牌" id="流程标牌"  @keydown="ent($event, '日期', '流程标牌', '上机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
 			  	  <el-col :span="5">
 			  	  <el-form-item label="上机时间" prop="id" style="margin-top: 10px;">
-			  		<el-input v-model="formData3.上机时间" :clearable="true" placeholder="" />
+			  		<el-input v-model="formData3.上机时间" id="上机时间"  @keydown="ent($event, '流程标牌', '上机时间', '下机时间')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			  	  <el-col :span="5">
 			  	  <el-form-item label="下机时间" prop="" style="margin-top: 10px;">
-			  	    <el-input v-model="formData3.下机时间" :clearable="true" placeholder="" />
+			  	    <el-input v-model="formData3.下机时间"  id="下机时间"  @keydown="ent($event, '上机时间', '下机时间', '产量')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>						  
 			    </el-row>
@@ -931,37 +930,37 @@
 			      
 			    <el-col :span="3">
 			    <el-form-item label="产量" prop="id" style="margin-top: 10px;">
-			      <el-input v-model="formData3.产量" :clearable="true" placeholder="" />
+			      <el-input v-model="formData3.产量" id="产量"  @keydown="ent($event, '下机时间', '产量', '制程废品')" :clearable="true" placeholder="" />
 			    </el-form-item>
 			    </el-col>
 				  <el-col :span="3">
 				  <el-form-item label="制程废品" prop="id" style="margin-top: 10px;">
-					<el-input v-model="formData3.制程废品" :clearable="true" placeholder="" />
+					<el-input v-model="formData3.制程废品" id="制程废品"  @keydown="ent($event, '产量', '制程废品', '制程次品')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>
 				  <el-col :span="3">
 				  <el-form-item label="制程次品" prop="id" style="margin-top: 10px;">
-					<el-input v-model="formData3.制程次品" :clearable="true" placeholder="" />
+					<el-input v-model="formData3.制程次品" id="制程次品"  @keydown="ent($event, '制程废品', '制程次品', '前工序废')" :clearable="true" placeholder="" />
 				  </el-form-item> 
 				  </el-col>
 				  <el-col :span="3">
 				  <el-form-item label="前工序废" prop="" style="margin-top: 10px;">
-				    <el-input v-model="formData3.前工序废" :clearable="true" placeholder="" />
+				    <el-input v-model="formData3.前工序废" id="前工序废"  @keydown="ent($event, '制程次品', '前工序废', '来料异常')" :clearable="true" placeholder="" />
 				  </el-form-item>
 				  </el-col>	
 				<el-col :span="3">
 				<el-form-item label="来料异常" prop="" style="margin-top: 10px;">
-				  <el-input v-model="formData3.来料异常" :clearable="true" placeholder="" />
+				  <el-input v-model="formData3.来料异常" id="来料异常"  @keydown="ent($event, '前工序废', '来料异常', '联数')" :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 				<el-col :span="3">
 				<el-form-item label="联数" prop="" style="margin-top: 10px;">
-				  <el-input v-model="formData3.联数" :clearable="true" placeholder="" />
+				  <el-input v-model="formData3.联数" id="联数"  @keydown="ent($event, '来料异常', '联数', '墨色')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 				<el-col :span="3">
 				<el-form-item label="墨色" prop="" style="margin-top: 10px;">
-				  <el-input v-model="formData3.墨色" :clearable="true" placeholder="" />
+				  <el-input v-model="formData3.墨色" id="墨色"  @keydown="ent($event, '联数', '墨色', '装版总时长')"  :clearable="true" placeholder="" />
 				</el-form-item>
 				</el-col>
 			  </el-row>
@@ -970,17 +969,17 @@
 			  <el-row :gutter="20">			        
 			      <el-col :span="3">
 			      <el-form-item label="装版总时长" prop="id" style="margin-top: 10px;">
-			        <el-input v-model="formData3.装版总时长" :clearable="true" placeholder="" />
+			        <el-input v-model="formData3.装版总时长" id="装版总时长"  @keydown="ent($event, '墨色', '装版总时长', '打样总工时')"  :clearable="true" placeholder="" />
 			      </el-form-item>
 			      </el-col>
 			  	  <el-col :span="3">
 			  	  <el-form-item label="打样总工时" prop="id" style="margin-top: 10px;">
-			  		<el-input v-model="formData3.打样总工时" :clearable="true" placeholder="" />
+			  		<el-input v-model="formData3.打样总工时" id="打样总工时"  @keydown="ent($event, '装版总时长', '打样总工时', '通电工时')" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
 			  	  <el-col :span="3">
 			  	  <el-form-item label="通电工时" prop="id" style="margin-top: 10px;">
-			  		<el-input v-model="formData3.通电工时" :clearable="true" placeholder="" />
+			  		<el-input v-model="formData3.通电工时" id="通电工时"  @keydown="ent($event, '打样总工时', '通电工时', '定额代号')" :clearable="true" placeholder="" />
 			  	  </el-form-item> 
 			  	  </el-col>
 			    </el-row>
@@ -989,62 +988,62 @@
 				<el-row :gutter="20">      
 				    <el-col :span="3">
 				    <el-form-item label="定额代号" prop="id" style="margin-top: 10px;">
-				      <el-input v-model="formData3.定额代号" :clearable="true" placeholder="" />
+				      <el-input v-model="formData3.定额代号" id="定额代号"  @keydown="ent($event, '通电工时', '定额代号', '码包')" :clearable="true" placeholder="" />
 				    </el-form-item>
 				    </el-col>
 					  <el-col :span="3">
 					  <el-form-item label="码包" prop="id" style="margin-top: 10px;">
-						<el-input v-model="formData3.码包" :clearable="true" placeholder="" />
+						<el-input v-model="formData3.码包" id="码包"  @keydown="ent($event, '定额代号', '码包', '主电表')" :clearable="true" placeholder="" />
 					  </el-form-item>
 					  </el-col>
 					  <el-col :span="3">
 					  <el-form-item label="主电表" prop="id" style="margin-top: 10px;">
-						<el-input v-model="formData3.主电表" :clearable="true" placeholder="" />
+						<el-input v-model="formData3.主电表"  id="主电表"  @keydown="ent($event, '码包', '主电表', '辅电表')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>					  
 					  <el-col :span="3">
 					  <el-form-item label="辅电表" prop="id" style="margin-top: 10px;">
-						<el-input v-model="formData3.辅电表" :clearable="true" placeholder="" />
+						<el-input v-model="formData3.辅电表" id="辅电表"  @keydown="ent($event, '主电表', '辅电表', 'bzdh')" :clearable="true" placeholder="" />
 					  </el-form-item> 
 					  </el-col>
 				  </el-row>
 		  
 		  <el-row :gutter="10" style="margin-top: 10px;">
 		  	 <el-col :span="1">
-		  	   <el-input v-model="formData3.sczl_bzdh" :clearable="true" placeholder="ZI00401" />
+		  	   <el-input v-model="formData3.sczl_bzdh" id="bzdh"  @keydown="ent($event, '辅电表', 'bzdh', 'bh1')" :clearable="true" placeholder="ZI00401" />
 		  	 </el-col>						 
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_bh1" @keyup.enter.native="getygsubmit($event, '1')" :clearable="true" placeholder="ZI00401" />
+		       <el-input v-model="formData3.sczl_bh1" id="bh1"  @keydown="ent($event, 'bzdh', 'bh1', 'bh2')" @keyup.enter.native="getygsubmit($event, '1')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_bh2" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="瞿春生" />
+		       <el-input v-model="formData3.sczl_bh2" id="bh2"  @keydown="ent($event, 'bh1', 'bh2', 'bh3')" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_bh3" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="11.0" />
+		       <el-input v-model="formData3.sczl_bh3" id="bh3"  @keydown="ent($event, 'bh2', 'bh3', 'bh4')" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_bh4" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="打包废纸" />
+		       <el-input v-model="formData3.sczl_bh4" id="bh4"  @keydown="ent($event, 'bh3', 'bh4', 'bh5')" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_bh5" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="是" />
+		       <el-input v-model="formData3.sczl_bh5" id="bh5"  @keydown="ent($event, 'bh4', 'bh5', 'bh6')" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="" />
 		     </el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bh6" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_bh6" id="bh6"  @keydown="ent($event, 'bh5', 'bh6', 'bh7')" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bh7" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="瞿春生" />
+			  <el-input v-model="formData3.sczl_bh7" id="bh7"  @keydown="ent($event, 'bh6', 'bh7', 'bh8')" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bh8" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="11.0" />
+			  <el-input v-model="formData3.sczl_bh8" id="bh8"  @keydown="ent($event, 'bh7', 'bh8', 'bh9')" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bh9" @keyup.enter.native="getygsubmit($event, '1')" :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_bh9" id="bh9"  @keydown="ent($event, 'bh8', 'bh9', 'bh10')" @keyup.enter.native="getygsubmit($event, '9')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bh10" @keyup.enter.native="getygsubmit($event, '1')" :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_bh10" id="bh10"  @keydown="ent($event, 'bh9', 'bh10', 'bh11')" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_bhll" @keyup.enter.native="getygsubmit($event, '1')" :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_bhll" id="bh11"  @keydown="ent($event, 'bh10', 'bh11', 'name1')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		   
@@ -1055,37 +1054,37 @@
 		  
 		  	 </el-col>						 
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_name1"  :clearable="true" placeholder="ZI00401" />
+		       <el-input v-model="formData3.sczl_name1" id="name1"  @keydown="ent($event, 'bh11', 'name1', 'name2')"  :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_name2"  :clearable="true" placeholder="瞿春生" />
+		       <el-input v-model="formData3.sczl_name2" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')"  :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_name3"  :clearable="true" placeholder="11.0" />
+		       <el-input v-model="formData3.sczl_name3" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_name4"  :clearable="true" placeholder="打包废纸" />
+		       <el-input v-model="formData3.sczl_name4" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_name5"  :clearable="true" placeholder="是" />
+		       <el-input v-model="formData3.sczl_name5" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')" :clearable="true" placeholder="" />
 		     </el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_name6"  :clearable="true" placeholder="瞿春生" />
+			  <el-input v-model="formData3.sczl_name6" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_name7"  :clearable="true" placeholder="11.0" />
+			  <el-input v-model="formData3.sczl_name7" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_name8"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_name8" id="name8"  @keydown="ent($event, 'name7', 'name8', 'name9')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_name9"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_name9" id="name9"  @keydown="ent($event, 'name8', 'name9', 'name10')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_name10"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_name10" id="name10"  @keydown="ent($event, 'name9', 'name10', 'name11')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.llname"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.llname" id="name11"  @keydown="ent($event, 'name10', 'name11', 'rate1')" :clearable="true" placeholder="" />
 			</el-col>
 		   </el-row>
 		  
@@ -1094,34 +1093,34 @@
 		  	   
 		  	 </el-col>						 
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_rate1"  :clearable="true" placeholder="ZI00401" />
+		       <el-input v-model="formData3.sczl_rate1" id="rate1"  @keydown="ent($event, 'name11', 'rate1', 'rate2')"  :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_rate2"  :clearable="true" placeholder="瞿春生" />
+		       <el-input v-model="formData3.sczl_rate2" id="rate2"  @keydown="ent($event, 'rate1', 'rate2', 'rate3')"  :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_rate3"  :clearable="true" placeholder="11.0" />
+		       <el-input v-model="formData3.sczl_rate3" id="rate3"  @keydown="ent($event, 'rate2', 'rate3', 'rate4')"  :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_rate4"  :clearable="true" placeholder="打包废纸" />
+		       <el-input v-model="formData3.sczl_rate4" id="rate4"  @keydown="ent($event, 'rate3', 'rate4', 'rate5')" :clearable="true" placeholder="" />
 		     </el-col>
 		     <el-col :span="2">
-		       <el-input v-model="formData3.sczl_rate5"  :clearable="true" placeholder="是" />
+		       <el-input v-model="formData3.sczl_rate5" id="rate5"  @keydown="ent($event, 'rate4', 'rate5', 'rate6')" :clearable="true" placeholder="" />
 		     </el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_rate6"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_rate6" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_rate7"  :clearable="true" placeholder="瞿春生" />
+			  <el-input v-model="formData3.sczl_rate7" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_rate8"  :clearable="true" placeholder="11.0" />
+			  <el-input v-model="formData3.sczl_rate8" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_rate9"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_rate9" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">
-			  <el-input v-model="formData3.sczl_rate10"  :clearable="true" placeholder="ZI00401" />
+			  <el-input v-model="formData3.sczl_rate10" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')" :clearable="true" placeholder="" />
 			</el-col>
 			<el-col :span="2">	  
 			</el-col>
@@ -1324,6 +1323,7 @@ defineOptions({
 const xunchatreeData=ref([{label: '现场巡查记录',} ])
 let checked1=ref(false)
 let checked2=ref(false)
+const activName=ref('first')
 let checked3=ref(false)
 const detailData = reactive([])
 const treeData=ref([])
@@ -1334,6 +1334,48 @@ const FPData = reactive([])
 const CLMXData = reactive([])
 let JYData = reactive([])
 
+//键盘 input框跳转
+const ent = (event,id1,id2,id3) => {
+
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    const idMap = {
+       'bh1': '1',
+       'bh2': '2',
+       'bh3': '3',
+       'bh4': '4',
+       'bh5': '5',
+       'bh6': '6',
+       'bh7': '7',
+       'bh8': '8',
+       'bh9': '9',
+       'bh10': '10',
+       'bh11': '11',
+     };
+	 if (idMap.hasOwnProperty(id2) && event.keyCode === 13) {
+	     getygsubmit('', idMap[id2]);
+	   }else 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 handleNodeClick = (nodeData,node) => {
   //存放当前节点的nodeId
   if(nodeData.level === 1){

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"  disabled  @click="addcpyj_onclick"     class="bt">新增印件资料</el-button>
-              <el-button type="primary"  icon="edit"  disabled @click="ddcpgy_onclick"     class="bt">新增工艺资料</el-button>
-              <el-button type="primary" 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>
 
@@ -231,8 +231,6 @@
                           @keyup.enter="jsssxzgetProductValue"  placeholder="输入产品编号" style="width: 500px;"/>
               </el-form-item>
             </div>
-
-
             <el-table ref="multipleTable"
                       :show-overflow-tooltip="true"
                       :row-style="{ height: '20px' }"
@@ -289,7 +287,7 @@
           <!--质检废品系数-->
           <el-dialog v-model="fjfpxslist" title="质检废品系数" style="width: 100%;height: 100%;margin: 0;">
             <el-button type="" @click="fjfpxsCancel">取消</el-button>
-            <el-button type="primary" disabled @click="fjfpxsConfirm">确认</el-button>
+            <el-button type="primary"  @click="fjfpxsConfirm">确认</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 0px 0px 6px 0px; display: flex; align-items: center;">
               <el-form-item label="关键字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
                 <el-input v-model="fjfpxsformData['cpdh']"
@@ -360,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>
 
           <!--排产参数调整-->
@@ -581,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>
@@ -769,34 +764,66 @@
             </template>
           </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_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_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_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>
@@ -804,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>
@@ -838,53 +870,150 @@
             <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="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" 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 height="500px">
-                <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
+              <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="100px">
+                      <el-input  placeholder="" style="width: 140px;"  id="印件号"  @keydown="ent($event, '', '印件号', '印件代号')" />
+                    </el-form-item>
+                  </el-row>
                   <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" label-width="100px">
+                      <el-input  placeholder="" style="width: 140px;"  id="印件代号"  @keydown="ent($event, '印件号', '印件代号', '印件名称')" />
+                    </el-form-item>
+                  </el-row>
+                  <el-row>
+                    <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-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-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <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_zzdh1')"  />
+                        </el-row>
                       </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-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="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-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="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-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="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="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="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="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>
+                    </el-col>
+                  </el-row>
+                  <el-row>
+                    <el-col :span="24">
+                      <el-form-item label="备注说明:" prop="remark" class="mab">
+                        <el-input type="textarea" rows="4" clearable placeholder="请输入备注说明"  id="yj_desc"  @keydown="ent($event, 'yj_ls', 'yj_desc', '印件号')"/>
+                      </el-form-item>
+                    </el-col>
+                  </el-row>
+                </el-form>
+              </el-scrollbar>
+            </el-row>
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="add_yjcloseDialog">取 消</el-button>
+                <el-button type="primary" disabled @click="add_yjenterDialog">确 定</el-button>
+              </div>
+            </template>
+          </el-dialog>
+
+          <!-- 修改工艺资料 弹窗 -->
+          <el-dialog v-model="gydialogFormVisible" :before-close="gycloseDialog" :title="'修改工艺资料'" height="300px" width="900px" destroy-on-close>
+            <el-row>
+              <el-scrollbar>
+                <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule"  >
+                  <el-row>
+                      <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-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-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-form-item label="加工开数" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['Gy0_Ks']"  placeholder="" style="width: 90px;" id="加工开数"  @keydown="ent($event, 'Gy0_gxh', '加工开数', 'Gy0_ls')"/>
+                      </el-form-item>
+                      <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-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>
@@ -892,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-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-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>
-                    </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>
@@ -946,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>
@@ -1070,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'})
 
@@ -1551,27 +1682,24 @@ const _fjfpxsgetProductGy = async ()=>{
 //质检废品系数更新按钮
 const fjfpxsConfirm = async () => {
   const rawValueArray = fjfpxstableData._rawValue;
-  // console.log(rawValueArray)
   const formattedData = rawValueArray.map(item => {
     return {
       UniqID: item.UniqID,
-      artificial_zp: (item.artificial_zp == null) ? 0 : parseFloat(item.artificial_zp),
-      artificial_cp: (item.artificial_cp == null) ? 0 : parseFloat(item.artificial_cp),
-      artificial_fj: (item.artificial_fj == null) ? 0 : parseFloat(item.artificial_fj),
-      machine_zp: (item.machine_zp == null) ? 0 : parseFloat(item.machine_zp),
-      machine_cp: (item.machine_cp == null) ? 0 : parseFloat(item.machine_cp),
-      machine_fj: (item.machine_fj == null) ? 0 : parseFloat(item.machine_fj)
-    }
+      artificial_zp: parseFloat(item.artificial_zp) || item.artificial_zp === 0 ? parseFloat(item.artificial_zp).toFixed(3) : "0.000",
+      artificial_cp: parseFloat(item.artificial_cp) || item.artificial_cp === 0 ? parseFloat(item.artificial_cp).toFixed(3) : "0.000",
+      artificial_fj: parseFloat(item.artificial_fj) || item.artificial_fj === 0 ? parseFloat(item.artificial_fj).toFixed(3) : "0.000",
+      machine_zp: parseFloat(item.machine_zp) || item.machine_zp === 0 ? parseFloat(item.machine_zp).toFixed(3) : "0.000",
+      machine_cp: parseFloat(item.machine_cp) || item.machine_cp === 0 ? parseFloat(item.machine_cp).toFixed(3) : "0.000",
+      machine_fj: parseFloat(item.machine_fj) || item.machine_fj === 0 ? parseFloat(item.machine_fj).toFixed(3) : "0.000"
+    };
   });
-  console.log(formattedData)
-  // console.log(12312312312321321321321312312)
   const editGyWastes = await editGyWaste(formattedData);
   if (editGyWastes.code === 0) {
     ElMessage({type: 'success',message: '更新成功'})
   } else {
     ElMessage({type: 'error',message: '更新失败'})
   }
-  // fjfpxslist.value = false;
+  fjfpxslist.value = false;
 };
 //质检废品系数放弃按钮
 const fjfpxsCancel = () => {fjfpxslist.value = false;};
@@ -1778,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();
 };
 
 //=========修改产品基本资料产品表格弹窗========
@@ -1833,12 +1960,13 @@ const enterDialog = async () => {
   dialogFormVisible.value = false;
 }
 
-//=========印件修改========
+//=========修改印件资料========
 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;
 };
 // 弹窗
@@ -1851,59 +1979,96 @@ 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;
+}
+
+//=========新增印件资料========
+//默认弹窗关闭
+const add_yjdialogFormVisible = ref(false)
+//新增弹窗
+const addcpyj_onclick = () => {
+  add_yjdialogFormVisible.value = true
+}
+//印件新增确定
+const add_yjcloseDialog = () => {
+  add_yjdialogFormVisible.value = true
+}
+//印件新增取消
+const add_yjenterDialog = () => {
+  add_yjdialogFormVisible.value = true
 }
 
-//=========工艺修改========
+
+
+
+//=========修改工艺资料========
 let gyformDataTest = reactive({})
 //双击修改
 const gyupdateCompanyFunc = async (row) => {
-  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 {
@@ -1963,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/chengpinrucang.vue

@@ -29,7 +29,7 @@
               </div>
             </div>
             <!-- 数据展示 -->
-            <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID"
+            <el-table ref="multipleTable" style="width: 100%" tooltip-effect="dark" :data="tableData" row-key="ID" @row-click="Click"
               highlight-current-row="true" border @selection-change="handleSelectionChange" :show-overflow-tooltip="true" @row-dblclick="doubleClick">
               <el-table-column type="selection" width="55" />
 			  <el-table-column align="left" label="入仓类型" prop="入仓类型" width="120"/>
@@ -77,17 +77,17 @@
               <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="入仓类型" prop="id">
-				 <el-input v-model="formData.入仓类型" :clearable="true" placeholder="" />
+				 <el-input v-model="formData.入仓类型" id="入仓类型"  @keydown="ent($event, '入仓备注', '入仓类型', '仓库编号')" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="6">
 			   <el-form-item label="仓库" prop="name">
 				 <el-row :gutter="20">
 				   <el-col :span="12">
-					 <el-input v-model="formData.仓库编号" @keyup.enter.native="getCKsubmit" :clearable="true" placeholder="ZT01733" />
+					 <el-input v-model="formData.仓库编号" id="仓库编号"  @keydown="ent($event, '入仓类型', '仓库编号', '仓库名称')"  @keyup.enter.native="getCKsubmit" :clearable="true" placeholder="ZT01733" />
 				   </el-col>   
 				   <el-col :span="12">
-					 <el-input v-model="formData.仓库名称" :clearable="true" placeholder="" />
+					 <el-input v-model="formData.仓库名称" id="仓库名称"  @keydown="ent($event, '仓库编号', '仓库名称', '单据编号')" :clearable="true" placeholder="" />
 				   </el-col>  
 				 </el-row>
 			   </el-form-item>
@@ -98,7 +98,7 @@
 		   <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="单据编号" prop="id">
-				 <el-input v-model="formData.jjcp_num"  :clearable="true" placeholder="" />
+				 <el-input v-model="formData.jjcp_num"  id="单据编号"  @keydown="ent($event, '仓库名称', '单据编号', '工单编号')" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 		   </el-row> 
@@ -108,23 +108,23 @@
 		   <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="工单编号" prop="id">
-				 <el-input v-model="formData.jjcp_gdbh" @keyup.enter.native="getGDsubmit" :clearable="true" placeholder="" />
+				 <el-input v-model="formData.jjcp_gdbh" id="工单编号"  @keydown="ent($event, '单据编号', '工单编号', '印件号')" @keyup.enter.native="getGDsubmit" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
 			 <el-col :span="6">
 			   <el-form-item label="印件号" prop="name">
 				 <el-row :gutter="20">
 				   <el-col :span="12">
-					 <el-input v-model="formData.jjcp_yjno" :clearable="true" placeholder="" />
+					 <el-input v-model="formData.jjcp_yjno" id="印件号"  @keydown="ent($event, '工单编号', '印件号', '订单编号')" :clearable="true" placeholder="" />
 				   </el-col>  				
 				 </el-row>
 			   </el-form-item>	   
 			 </el-col>
-			 <el-col :span="4">
+			 <el-col :span="10">
 			   <el-form-item label="订单编号" prop="name">
 				 <el-row :gutter="20">
-				   <el-col :span="12">
-					 <el-input v-model="formData.订单编号" :clearable="true" placeholder="" />
+				   <el-col :span="20">
+					 <el-input v-model="formData.订单编号" id="订单编号"  @keydown="ent($event, '印件号', '订单编号', '印件编号')" :clearable="true" placeholder="" />
 				   </el-col>  				
 				 </el-row>
 			   </el-form-item>
@@ -134,11 +134,11 @@
            <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="印件编号" prop="id">
-				 <el-input v-model="formData.jjcp_cpdh" :clearable="true" placeholder="" />
+				 <el-input v-model="formData.jjcp_cpdh" id="印件编号"  @keydown="ent($event, '订单编号', '印件编号', 'jjcp_cpmc')" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
-			 <el-col :span="4">
-			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="" />					   
+			 <el-col :span="10">
+			 <el-input v-model="formData.jjcp_cpmc"  id="jjcp_cpmc"  @keydown="ent($event, '印件编号', 'jjcp_cpmc', '产品编号')" :clearable="true" placeholder="" />					   
 			 </el-col>
            </el-row> 
             
@@ -146,18 +146,18 @@
 			<el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="产品编号" prop="id">
-				 <el-input v-model="formData.jjcp_cpdh"@keyup.enter.native="getSLsubmit" :clearable="true" placeholder="" />
+				 <el-input v-model="formData.jjcp_cpdh" id="产品编号"  @keydown="ent($event, 'jjcp_cpmc', '产品编号', '成品名称')" @keyup.enter.native="getSLsubmit" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
-			 <el-col :span="4">
-			 <el-input v-model="formData.jjcp_cpmc" :clearable="true" placeholder="" />					   
+			 <el-col :span="10">
+			 <el-input v-model="formData.成品名称" id="成品名称"  @keydown="ent($event, '产品编号', '成品名称', '客户料号')" :clearable="true" placeholder="" />					   
 			 </el-col>
 			</el-row> 
 
             <el-row :gutter="20">
 			 <el-col :span="4">
 			   <el-form-item label="客户料号" prop="id">
-				 <el-input v-model="formData.客户料号" :clearable="true" placeholder="" />
+				 <el-input v-model="formData.客户料号" id="客户料号"  @keydown="ent($event, '成品名称', '客户料号', '首末版')" :clearable="true" placeholder="" />
 			   </el-form-item>
 			 </el-col>
             </el-row> 
@@ -165,12 +165,12 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="首末版" prop="id">
-			  	 <el-input v-model="formData.jjcp_smb" :clearable="true" placeholder="" />
+			  	 <el-input v-model="formData.jjcp_smb"  id="首末版"  @keydown="ent($event, '客户料号', '首末版', '入仓时间')" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 				   <el-form-item label="入仓时间" prop="id">
-			   <el-input v-model="formData.jjcp_sj" :clearable="true" placeholder="" />	
+			   <el-input v-model="formData.jjcp_sj"  id="入仓时间"  @keydown="ent($event, '首末版', '入仓时间', '入仓数量')" :clearable="true" placeholder="" />	
 					</el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -179,12 +179,12 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="入仓数量" prop="id">
-			  	 <el-input v-model="formData.jjcp_sl" :clearable="true" placeholder="" />
+			  	 <el-input v-model="formData.jjcp_sl" id="入仓数量"  @keydown="ent($event, '入仓时间', '入仓数量', '入仓单位')" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			  	<el-form-item label="入仓单位" prop="id">
-			   <el-input v-model="formData.jjcp_dw" :clearable="true" placeholder="" />	
+			   <el-input v-model="formData.jjcp_dw" id="入仓单位"  @keydown="ent($event, '入仓数量', '入仓单位', '订单数量')" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -193,17 +193,17 @@
 			  <el-row :gutter="20">
 			   <el-col :span="4">
 			     <el-form-item label="订单数量" prop="id">
-			  	 <el-input v-model="formData.订单数量" :clearable="true" placeholder="" />
+			  	 <el-input v-model="formData.订单数量" id="订单数量"  @keydown="ent($event, '入仓单位', '订单数量', '已完工')" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			  	<el-form-item label="已完工" prop="id">
-			   <el-input v-model="formData.jjcp_sls" :clearable="true" placeholder="" />	
+			   <el-input v-model="formData.jjcp_sls" id="已完工"  @keydown="ent($event, '订单数量', '已完工', '机型备注')" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			   <el-col :span="4">
 			   			  	<el-form-item label="机型备注" prop="id">
-			   <el-input v-model="formData.机型备注" :clearable="true" placeholder="" />	
+			   <el-input v-model="formData.机型备注" id="机型备注"  @keydown="ent($event, '已完工', '机型备注', '入仓备注')" :clearable="true" placeholder="" />	
 			    </el-form-item>
 			   </el-col>
 			  </el-row> 
@@ -212,7 +212,7 @@
 			  <el-row :gutter="20">
 				 <el-col :span="4">
 				   <el-form-item label="入仓备注" prop="id">
-					 <el-input v-model="formData.jjcp_desc" :clearable="true" placeholder="" />
+					 <el-input v-model="formData.jjcp_desc"  id="入仓备注"  @keydown="ent($event, '机型备注', '入仓备注', '入仓类型')":clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			  </el-row> 
@@ -599,6 +599,7 @@ function onSearch() {
 const ADD=ref('0')
 //新增
 function onAdd() {
+	 GetInfo(lastCellValue)
 	ADD.value='新增'
 	console.log(ADD.value)
 	dialogFormVisible.value = true
@@ -612,7 +613,10 @@ function onDel() {
 const Del = async () => {
   const response = await finisheddel({UniqId:lastCellValue});
   if (response.code === 0) {
-	console.log(333)
+	ElMessage({
+	  type: 'success',
+	  message: '删除成功',
+	})
   }
   getTableData()
 }
@@ -885,6 +889,13 @@ const updateDetailData = async() => {
   	 // console.log(ADD.value)
   	 // ADD.value='0'
   	 console.log(response)
+	 if(response.code==0){
+	 		 ElMessage({
+	 		   type: 'success',
+	 		   message: '新增成功',
+	 		 })
+	 }
+	 dialogFormVisible.value = false
   	 
   }else{
   	  // const response = await productionedit(restoredData);
@@ -903,6 +914,38 @@ const updateDetailData = async() => {
   // console.log(FormData)
   // console.log(response)
 }
+//键盘 input框跳转
+const ent = (event,id1,id2,id3) => {
+
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id2=='仓库编号'&&event.keyCode === 13){
+		getCKsubmit()
+	}if(id2=='工单编号'&&event.keyCode === 13){
+		getGDsubmit()
+	}if(id2=='产品编号'&&event.keyCode === 13){
+		getSLsubmit()
+	}else 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()
+    }
+  }
+}
 let table=ref(5);
 let lastCellValue=ref()
 // 双击表格操作
@@ -916,6 +959,12 @@ function doubleClick(row, column, event) {
   GetInfo(table.value)
   // dialogFormVisible.value = true
 }
+// 单击表格操作
+function Click(row, column, event) {
+    lastCellValue= row['UniqId'];
+   console.log(lastCellValue)
+  
+}
 //获取详细信息
 const GetInfo = async (value) => {
   const response = await finishedInfo({UniqId:value});