Browse Source

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

tty 1 year ago
parent
commit
84b1d5f43f

+ 6 - 6
src/api/jixiaoguanli/jitairibaobiao.js

@@ -841,11 +841,11 @@ export const  reportMachineMac= (params) => {
   })
 }
 //设置工单工序完工
-export const setProcessStatus = (params) => {
+export const setProcessStatus = (data) => {
   return service({
     url:'/mes_server/reporting_work/setProcessStatus',
     method: 'post',
-    params
+    data
   })
 }
 //设置机台状态
@@ -857,19 +857,19 @@ export const SetMachineStatus = (params) => {
   })
 }
 //日产量上报
-export const submitDailyProduction = (params) => {
+export const submitDailyProduction = (data) => {
   return service({
     url:'/mes_server/reporting_work/submitDailyProduction',
     method: 'post',
-    params
+    data
   })
 }
 //提交巡查记录
-export const submitPatrolRecord = (params) => {
+export const submitPatrolRecord = (data) => {
   return service({
     url:'/mes_server/reporting_work/submitPatrolRecord',
     method: 'post',
-    params
+    data
   })
 }
 //设置机台状态

+ 7 - 0
src/api/mes/job.js

@@ -217,3 +217,10 @@ export const dictionaryEdit = (data) => {
     data
   })
 }
+export const FieldInspectionRecord = (params) => {
+  return service({
+    url: '/mes_server/facility/FieldInspectionRecord',
+    method: 'get',
+    params
+  })
+}

+ 3 - 3
src/api/mes_api_gty/otherDocuments.js

@@ -48,10 +48,10 @@ export const updateData = (data) => {
 }
 
 // 新增
-export const addData = (data) => {
+export const add = (data) => {
   return service({
-    url: '/mes_serve/other_count_document/add',
+    url: '/mes_server/other_count_document/add',
     method: 'post',
     data
   })
-}
+}

+ 2 - 0
src/api/mes_api_gty/overTimePayVerification.js

@@ -49,3 +49,5 @@ export const getLocal = (params) => {
   })
 }
 
+
+

+ 91 - 24
src/api/yunyin/yunying.js

@@ -140,6 +140,88 @@ export const editGyWaste = (data) => {
     })
 }
 
+//3.1获取产品印件资料
+export const getProductYjInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYjInfo',
+        method: 'get',
+        params
+    })
+}
+//3.2修改产品印件资料
+export const editProductYjInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/editProductYjInfo',
+        method: 'post',
+        data
+    })
+}
+//3.3新增产品印件资料
+export const addProductYjInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/addProductYjInfo',
+        method: 'post',
+        data
+    })
+}
+//3.4获取印件代码及名称
+export const getProductYjList = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYjList',
+        method: 'get',
+        params
+    })
+}
+//3.5获取纸张代号及名称
+export const getProductZzList = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductZzList',
+        method: 'get',
+        params
+    })
+}
+//3.6工艺资料-获取产品工艺资料
+export const getProductGyInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductGyInfo',
+        method: 'get',
+        params
+    })
+}
+//3.7工艺资料-获取车间及工艺名称
+export const getDepartName = (params) => {
+    return service({
+        url: '/mes_server/Product/getDepartName',
+        method: 'get',
+        params
+    })
+}
+//3.8工艺资料-新增产品工艺
+export const addProductGyInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/addProductGyInfo',
+        method: 'post',
+        data
+    })
+}
+//3.9印版资料-获取产品印版资料
+export const getProductYbInfo = (params) => {
+    return service({
+        url: '/mes_server/Product/getProductYbInfo',
+        method: 'get',
+        params
+    })
+}
+//3.10印版资料-修改产品印版资料
+export const editProductYbInfo = (data) => {
+    return service({
+        url: '/mes_server/Product/editProductYbInfo',
+        method: 'post',
+        data
+    })
+}
+
+
 /** 生产管理 工单资料管理*/
 // 1.工单资料菜单列表
 export const DataList = (params) => {
@@ -165,30 +247,6 @@ export const workOrderListDetail = (params) => {
         params
     })
 }
-// // 工艺资料
-// export const Craft = (params) => {
-//     return service({
-//         url: '/mes_server/work_order/Craft',
-//         method: 'get',
-//         params
-//     })
-// }
-// // 印件资料
-// export const Printed = (params) => {
-//     return service({
-//         url: '/mes_server/work_order/Printed',
-//         method: 'get',
-//         params
-//     })
-// }
-// // BOM资料
-// export const Bom = (params) => {
-//     return service({
-//         url: '/mes_server/work_order/Bom',
-//         method: 'get',
-//         params
-//     })
-// }
 
 //工单查改->获取工单信息
 export const DataCorrection = (params) => {
@@ -344,6 +402,15 @@ export const gdzl_MachineList = (params) => {
 }
 
 
+//机台产量获取
+export const capacityList = (params) => {
+    return service({
+        url: '/mes_server/work_order/capacityList',
+        method: 'get',
+        params
+    })
+}
+
 
 /**工单生产排单(排产管理)*/
 //计划中工单

+ 79 - 22
src/view/job/processSheet/processSheet.vue

@@ -15,23 +15,37 @@
 		                    <td><span>生产批次号</span></td>
 		                    <td><input name="Gd_gdbh" type="text" v-model="workData.Gd_gdbh" @input="propertyChange" class="required" style="width: 380px;height: 30px;"></td>
 		                </tr>
-		                <tr>
+		                <tr v-if="dan">
 		                    <td><span>纸张名称</span></td>
 		                    <td>
-		                        <select name="maobao" v-model="workData.maobao" style="width: 380px;height: 30px;">
-		        		  
-		                        </select>
+								<select style="width: 380px;height: 30px;">
+									<option v-for="option in selectedPaper">
+									{{ option.bom_物料名称 }}
+									</option>
+								</select>
 		                    </td>
 		                </tr>
+						<tr v-if="shuang">
+						    <td><span>纸张名称</span></td>
+						    <td>
+								<select @change="selectpPaper" style="width: 380px;height: 30px;">
+									<option v-for="option in selectedPaper" :value="option.bom_计划用量">
+									{{ option.bom_物料名称 }}
+									</option>
+								</select>
+						    </td>
+						</tr>
 		                <tr >
 		                    <td><span style="color: red">码包</span></td>
 		                    <td><input name="mabao" type="text" v-model="workData.mabao" style="width: 380px;height: 30px;" placeholder="利群(新版)专用,不是利群(新版)不要填"></td>
 		                </tr>
-		                <tr style="display: none" class="peijian">
+		                <tr v-if="shuang" class="peijian">
 		                    <td><span style="color: red">配件名称</span></td>
 		                    <td>
-		                        <select name="peijian" v-model="workData.peijian" style="width: 380px;height: 30px; color: red" >
-		        		  
+		                        <select name="peijian" @change="selectPeijian"  style="width: 380px;height: 30px; color: red" >
+									<option v-for="option in selectedPeijian" :value="option.id">
+									{{ option.peijian_name }}
+									</option>
 		                        </select>
 		                    </td>
 		                </tr>
@@ -86,15 +100,15 @@
 	                 <table width="100%" border="1" class="new_craft" id="new_craft">
 	             	   <caption>工艺</caption>	  
 	             		  <tr>
-							  <td>上次<span style="color: red">{{department}}</span>工艺更新时间:<span style="color: red">{{update}}</span></td>
+							  <td width="40%">上次<span style="color: red">{{department}}</span>工艺更新时间:<span style="color: red">{{update}}</span></td>
 							  <td> 
 							      <input type="button" style="margin-left: 1px;" value="增加工艺" @click="addInput"/>
 							  </td>
 						  </tr>
-							  <tr v-for="(item,index) in gyData">
-							      <td></td>
-							      <td><input type="text" v-model="item.gy"></td>
-							  </tr>
+						  <tr v-for="(item,index) in gyData">
+							  <td></td>
+							  <td><input type="text" v-model="item.gy"></td>
+						  </tr>
 	                 </table>
 	                 </fieldset>
 	             </div>
@@ -132,33 +146,61 @@
 		y_offset:0
 	})
 	const department = ref()
+	const dan = ref(true)
+	const shuang = ref(false)
 	const update = ref()
 	const data = ref()
 	const gyData = ref([])
+	const selectedPaper = ref([])
+	const selectedPeijian = ref([])
 	const datas = ref([])
 	const propertyChange = () => {
 		if(workData.value.Gd_gdbh.length!==7){
+			workData.value = []
+			shuang.value=false
+			selectedPaper.value=[]
+			selectedPeijian.value=[]
+			gyData.value=[]
+			workData.value.tldx=3000
+			workData.value.start_liucheng=1
+			workData.value.liucheng_num=1
+			workData.value.x_offset=0
+			workData.value.y_offset=0
+			department.value=null
+			department.value=null
 			return false;
 		}
 		const getDocument = async() => {
 		  const getDocumentDatas = await getDocumentData({order:workData.value.Gd_gdbh})
 		  if (getDocumentDatas.code === 0) {
 			  workData.value.version=getDocumentDatas.data.paper[0].产品版本号;
+			  workData.value.peijian=getDocumentDatas.data.paper;
+			  console.log(selectedPaper.value)
 			  if(getDocumentDatas.data.num>1){
+				  dan.value=false
+				  shuang.value=true
+				  console.log(getDocumentDatas.data.paper.length)
+				  selectedPaper.value=getDocumentDatas.data.paper
+				  selectedPeijian.value=getDocumentDatas.data.peijian
 				  
 			  }else{
-				  
+				  dan.value=true
+				  shuang.value=false
+				  selectedPaper.value=getDocumentDatas.data.paper
+				  workData.value.product=getDocumentDatas.data.paper[0].bom_物料名称;
 			  }
 			  workData.value.num=getDocumentDatas.data.paper[0].bom_计划用量;
 			  if(getDocumentDatas.data.peijian){
 				  const getHistory = async() => {
-				    const getDocumentHistorys = await getDocumentHistory({order:2109722,peijian:0})
+				    const getDocumentHistorys = await getDocumentHistory({
+						order:workData.value.Gd_gdbh,
+						peijian:getDocumentDatas.data.peijian[0]['id']})
 				    if (getDocumentHistorys.code === 0) {
-				  					department.value=getDocumentHistorys.data.department
-				  					update.value=getDocumentHistorys.data.update
-				  					gyData.value=getDocumentHistorys.data.data.map((item)=>({
-				  						gy:item
-				  					}))			  	  
+							department.value=getDocumentHistorys.data.department
+							update.value=getDocumentHistorys.data.update
+							gyData.value=getDocumentHistorys.data.data.map((item)=>({
+								gy:item
+							}))			  	  
 				    }
 				  }
 				  getHistory()
@@ -173,12 +215,9 @@
 	 gyData.value.push({gy:''})
 	}
 	const sendClick = () => {
-		// console.log(datas)
-		// console.log(gyData.value)
 		const saveDocument = async() => {
 			datas.value = gyData.value.map((item)=>(item.gy))
 			data.value= datas.value.join(",")
-			// console.log(data.value)
 		  const saveDocumentDatas = await saveDocumentData({order:2109722,data:data.value,peijian:0})
 		  if (saveDocumentDatas.code === 0) {
 		  	  console.log(saveDocumentDatas)
@@ -186,6 +225,24 @@
 		}
 		saveDocument()
 	}
+	const selectpPaper = (event) => {
+		 workData.value.num=event.target.value
+	}
+	
+	const selectPeijian = async(event) => {
+		 const getDocumentHistoryss = await getDocumentHistory({
+		 	order:workData.value.Gd_gdbh,
+		 	peijian:event.target.value})
+			console.log(getDocumentHistoryss)
+		 if (getDocumentHistoryss.code === 0) {
+		 		department.value=getDocumentHistoryss.data.department
+		 		update.value=getDocumentHistoryss.data.update
+		 		gyData.value=getDocumentHistoryss.data.data.map((item)=>({
+		 			gy:item
+		 		}))			  	  
+		 }
+	}
+	
 </script>
 
 <style>

+ 60 - 17
src/view/performance/07-otherDocuments/index.vue

@@ -42,7 +42,7 @@
               <el-button
                 type="primary"
                 :icon="Search"
-                @click="onSearch"
+                @click="handleShowAdd"
               >新增</el-button>
 
               <div style="margin-left: auto;">
@@ -192,12 +192,12 @@
                 label="工价代号"
               >
                 <el-input
-                  v-model="detailData.Sczl_dedh"
+                  v-model="detailData.sys_bh"
                   style="width: 200px"
                   @keyup.enter="handleGjdhEnter"
                 />
                 <el-input
-                  v-model="detailData.aaaa"
+                  v-model="detailData.sys_mc"
                   style="width: 300px; margin-left: 5px"
                   readonly
                 />
@@ -247,7 +247,7 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
-import { getSide, getTable, getInfo, getOtherInfo, updateData } from '@/api/mes_api_gty/otherDocuments'
+import { getSide, getTable, getInfo, getOtherInfo, updateData,add } from '@/api/mes_api_gty/otherDocuments'
 
 defineOptions({
   name: '07OtherDocuments'
@@ -362,11 +362,18 @@ const detailData = reactive({})
 
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
-
+// 新增数据
+const handleShowAdd = () => {
+    type.value = '新增'
+	Object.assign(detailData, currentRow.value)
+	dialogFormVisible.value = true
+}
 // 查改
 const handleShowDetail = () => {
   type.value = '查改'
   Object.assign(detailData, currentRow.value)
+  console.log(detailData)
+  console.log(currentRow.value)
   dialogFormVisible.value = true
 }
 const handleYgbhEnter = async() => {
@@ -392,31 +399,67 @@ const handleGjdhEnter = async() => {
 
 // 弹窗确定
 const enterDialog = async() => {
-  const params = {
-    UniqId: detailData.UniqId,
+	
+	if (type.value === '查改') {
+	  updateDetailData()
+	} else if (type.value === '新增') {
+	  addDetailData()
+	}
+}
+//新增
+const addDetailData = async() => {
+	
+  const restoredData = {
+    Sys_id: '[1009/李美芬]',
     Sczl_bh1: detailData.Sczl_bh1,
     sczl_Type: detailData.sczl_Type,
+    // name: detailData.name,
     Sczl_rq: detailData.Sczl_rq,
     Sczl_gdbh: detailData.sczl_gdbh,
-    Sczl_gxmc: '',
+    Sczl_gxmc: detailData.Sczl_gxmc,
     sczl_gxh: detailData.sczl_gxh,
-    Sczl_cl: detailData.Sczl_cl,
-    Sczl_dedh: '',
-    Sczl_desc: detailData.Sczl_desc,
+	Sczl_cl: detailData.Sczl_cl,
+	Sczl_dedh: detailData.sys_bh,
+	Sczl_desc: detailData.Sczl_desc,
   }
-  const res = await updateData(params)
+  console.log(restoredData)
+  const res = await add(restoredData)
+  console.log(restoredData)
+  console.log(res)
   if (res.code === 0) {
     ElMessage({
       type: 'success',
-      message: '新成功',
+      message: '新成功',
     })
     dialogFormVisible.value = false
-    params.order = ''
-    // page.value = 1
-    handleCurrentChange()
   }
 }
-
+//修改
+const updateDetailData = async() => {
+	const params = {
+	  UniqId: detailData.UniqId,
+	  Sczl_bh1: detailData.Sczl_bh1,
+	  sczl_Type: detailData.sczl_Type,
+	  Sczl_rq: detailData.Sczl_rq,
+	  Sczl_gdbh: detailData.sczl_gdbh,
+	  Sczl_gxmc: '',
+	  sczl_gxh: detailData.sczl_gxh,
+	  Sczl_cl: detailData.Sczl_cl,
+	  Sczl_dedh: '',
+	  Sczl_desc: detailData.Sczl_desc,
+	}
+	const res = await updateData(params)
+	if (res.code === 0) {
+	  ElMessage({
+	    type: 'success',
+	    message: '更新成功',
+	  })
+	  dialogFormVisible.value = false
+	  params.order = ''
+	  // page.value = 1
+	  handleCurrentChange()
+	}
+}
 // 获取需要的字典 可能为空 按需保留
 const setOptions = async() => {
 }

+ 102 - 17
src/view/performance/08-timesheet/index.vue

@@ -33,6 +33,11 @@
                 :icon="Search"
                 @click="onSearch"
               >搜索</el-button>
+			  <el-button
+			    type="primary"
+			    :icon="Search"
+			    @click="handleShowAdd"
+			  >新增</el-button>
               <el-button
                 type="primary"
                 :icon="Refresh"
@@ -61,6 +66,7 @@
               :header-cell-style="{ padding: '0px' }"
               @selection-change="handleSelectionChange"
               @row-dblclick="doubleClick"
+			  @row-click="Click"
             >
               <el-table-column
                 type="selection"
@@ -395,7 +401,7 @@ import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDow
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive, onMounted, onBeforeMount } from 'vue'
-import { getSide, getTable, getDetail, updateData, getLocate } from '@/api/mes_api_gty/timesheet'
+import { getSide, getTable, getDetail, updateData, getLocate ,createData} from '@/api/mes_api_gty/timesheet'
 
 defineOptions({
   name: '08Timesheet'
@@ -523,7 +529,15 @@ const handleNodeClick = (node, check) => {
     handleCurrentChange()
   }
 }
-
+// 新增数据
+const handleShowAdd = async () => {
+  const res = await getDetail({ wgjs_rq: value1.value, wgjs_bh1: value2.value });
+  if (res.code === 0) {
+	type.value='add'
+    Object.assign(detailData, res.data);
+	dialogFormVisible.value = true
+  }
+};
 // 搜索
 function onSearch() {
   params.search = searchInfo.value
@@ -550,24 +564,95 @@ async function doubleClick(row, column, event) {
     dialogFormVisible.value = true
   }
 }
-
+const value1=ref()
+const value2=ref()
+// 单击表格操作
+async function Click(row, column, event) {
+  const { wgjs_rq, wgjs_bh1 } = row
+  value1.value=wgjs_rq
+  value2.value=wgjs_bh1
+  // console.log(wgjs_rq)
+  // console.log(wgjs_bh1)
+  // const res = await getDetail({ wgjs_rq, wgjs_bh1 })
+  // if (res.code === 0) {
+  //   Object.assign(detailData, res.data)
+  //   dialogFormVisible.value = true
+  // }
+}
 // 更新数据
 const enterDialog = async() => {
-  const obj = detailData
-  for (let i = 1; i <= 6; i++) {
-    delete obj[`name${i}`]
-  }
-  const res = await updateData(obj)
-  if (res.code === 0) {
-    ElMessage({
-      type: 'success',
-      message: '更新成功'
-    })
-    params.type = 'getTableData'
-    // page.value = 1
-    handleCurrentChange()
-    dialogFormVisible.value = false
+	
+	if (type.value === 'update') {
+	  updateDetailData()
+	} else if (type.value === 'add') {
+	  addDetailData()
+	}
+	
+  
+}
+//新增
+const addDetailData = async() => {
+  const restoredData = {
+    wgjs_rq: detailData.wgjs_rq,
+	wgjs_bh1:detailData.wgjs_bh1,
+	wgjs_js1:detailData.wgjs_js1,
+	wgjs_yy1:detailData.wgjs_yy1,
+	wgjs_冲定额1:detailData.wgjs_冲定额1,
+	
+	wgjs_bh2:detailData.wgjs_bh2,
+	wgjs_js2:detailData.wgjs_js2,
+	wgjs_yy2:detailData.wgjs_yy2,
+	wgjs_冲定额2:detailData.wgjs_冲定额2,
+	
+	wgjs_bh3:detailData.wgjs_bh3,
+	wgjs_js3:detailData.wgjs_js3,
+	wgjs_yy3:detailData.wgjs_yy3,
+	wgjs_冲定额3:detailData.wgjs_冲定额3,
+	
+	wgjs_bh4:detailData.wgjs_bh4,
+	wgjs_js4:detailData.wgjs_js4,
+	wgjs_yy4:detailData.wgjs_yy4,
+	wgjs_冲定额4:detailData.wgjs_冲定额4,
+	
+	wgjs_bh5:detailData.wgjs_bh5,
+	wgjs_js5:detailData.wgjs_js5,
+	wgjs_yy5:detailData.wgjs_yy5,
+	wgjs_冲定额5:detailData.wgjs_冲定额5,
+	
+	wgjs_bh6:detailData.wgjs_bh6,
+	wgjs_js6:detailData.wgjs_js6,
+	wgjs_yy6:detailData.wgjs_yy6,
+	wgjs_冲定额6:detailData.wgjs_冲定额6,
   }
+  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
+  // }
+}
+//修改
+const updateDetailData = async() => {
+	const obj = detailData
+	for (let i = 1; i <= 6; i++) {
+	  delete obj[`name${i}`]
+	}
+	const res = await updateData(obj)
+	if (res.code === 0) {
+	  ElMessage({
+	    type: 'success',
+	    message: '更新成功'
+	  })
+	  params.type = 'getTableData'
+	  // page.value = 1
+	  handleCurrentChange()
+	  dialogFormVisible.value = false
+	}
 }
 
 // 获取需要的字典 可能为空 按需保留

+ 31 - 6
src/view/performance/Dayreportattached.vue

@@ -60,7 +60,7 @@
                   <el-form-item label="日期" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="ZT01733" />
+                        <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, '备注', '日期', '机器')" :clearable="true" placeholder="ZT01733" />
                       </el-col>
                     </el-row>
                   </el-form-item>
@@ -72,11 +72,11 @@
                   <el-row :gutter="20">
                     <el-col :span="14">
                       <el-form-item label="机器" prop="id">
-                        <el-input v-model="formData.sczl_jtbh" @keyup.enter.native="getJTsubmit" :clearable="true" placeholder="0.00" />
+                        <el-input v-model="formData.sczl_jtbh" id="机器"  @keydown="ent($event, '日期', '机器', '设备名称')" @keyup.enter.native="getJTsubmit" :clearable="true" placeholder="0.00" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="10">                     
-                        <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-col>
@@ -88,12 +88,12 @@
 			      <el-row :gutter="20">
 			        <el-col :span="14">
 			          <el-form-item label="组别" prop="id">
-			            <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="0.00" />
+			            <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '设备名称', '组别', '通电时间')" :clearable="true" placeholder="0.00" />
 			          </el-form-item>
 			        </el-col>
 			        <el-col :span="10">
 			            <el-form-item label="通电时间" prop="id">
-			            <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="是" />
+			            <el-input v-model="formData.sczl_设备运行工时" id="通电时间"  @keydown="ent($event, '组别', '通电时间', '备注')" :clearable="true" placeholder="是" />
 			            </el-form-item>
 			        </el-col>
 			      </el-row>
@@ -105,7 +105,7 @@
 			      <el-row :gutter="20">
 			        <el-col :span="14">
 			        <el-form-item label="备注" prop="id" style="margin-top: 10px;">
-			          <el-input v-model="formData.sczl_desc" :clearable="true" placeholder="" />
+			          <el-input v-model="formData.sczl_desc" id="备注"  @keydown="ent($event, '通电时间', '备注', '日期')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			        </el-col>
 			      </el-row>
@@ -496,7 +496,32 @@ 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(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 AddDel = async (value) => {
   const response = await adddel({UniqId:'0'});
   console.log(response) 

+ 95 - 69
src/view/performance/Dayreports.vue

@@ -99,14 +99,14 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工单编号" prop="id">
-                    <el-input v-model="formData.sczl_gdbh" @keyup.enter.native="getCPMCsubmit"  :clearable="true" placeholder="" />
+                    <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-col :span="200">
                   <el-form-item label="产品名称" prop="name">
-                    <el-row :gutter="20">
-                      <el-col :span="12">
-                        <el-input v-model="formData.Gd_cpmc" :clearable="true" placeholder="" />
+                    <el-row :gutter="200">
+                      <el-col :span="70">
+                        <el-input v-model="formData.Gd_cpmc" id="产品名称" @keydown="ent($event, '工单编号', '产品名称', '印件号')" :clearable="true" placeholder="" />
                       </el-col>                      
                     </el-row>
                   </el-form-item>
@@ -114,16 +114,16 @@
               </el-row>
 
               <el-row :gutter="20">
-                <el-col :span="8">
+                <el-col :span="100">
                   <el-row :gutter="20">
-                    <el-col :span="14">
+                    <el-col :span="10">
                       <el-form-item label="印件号" prop="id">
-                        <el-input v-model="formData.sczl_yjno" @keyup.enter.native="getYJMCsubmit" :clearable="true" placeholder="0." />
+                        <el-input v-model="formData.sczl_yjno" id="印件号" @keydown="ent($event, '产品名称', '印件号', '印件名称')" :clearable="true" placeholder="0." />
                       </el-form-item>
                     </el-col>
-                    <el-col :span="10">
+                    <el-col :span="70">
                       <el-form-item label="印件名称" prop="id">
-                        <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
+                        <el-input v-model="formData.yj_yjmc" id="印件名称" @keydown="ent($event, '印件号', '印件名称', '工序名称')" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -133,19 +133,19 @@
              <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="工序名称" prop="id">
-                    <el-input v-model="formData.sczl_gxmc"  @keyup.enter.native="getGXsubmit" :clearable="true" placeholder="" />
+                    <el-input v-model="formData.sczl_gxmc"  id="工序名称"  @keydown="ent($event, '印件名称', '工序名称', 'sczl_gxh')" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">          
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_gxh" :clearable="true" placeholder="" />
+                        <el-input v-model="formData.sczl_gxh" id="sczl_gxh"  @keydown="ent($event, '工序名称', 'sczl_gxh', 'sczl_type')" :clearable="true" placeholder="" />
                       </el-col>
                     </el-row>
                 </el-col>
                 <el-col :span="3">
                   <el-form-item label="工艺名称" prop="name">
-                    <el-input v-model="formData.sczl_type" :clearable="true" placeholder="" />
+                    <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>
@@ -154,21 +154,21 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="日期" prop="id">
-			         <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, 'sczl_type', '日期', '机器')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="机器" prop="id">
-			             <el-input v-model="formData.sczl_jtbh" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_jtbh"  id="机器"  @keydown="ent($event, '日期', '机器', '组别')" :clearable="true" placeholder="" />
 						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="组别" prop="name">
-			         <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '机器', '组别', '墨色')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			   </el-row>
@@ -176,26 +176,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="墨色" prop="id">
-			         <el-input v-model="formData.sczl_ms" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_ms" id="墨色"  @keydown="ent($event, '组别', '墨色', '加工联数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						 <el-form-item label="加工联数" prop="id">
-			             <el-input v-model="formData.sczl_ls" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_ls" id="加工联数"  @keydown="ent($event, '墨色', '加工联数', '产量')" :clearable="true" placeholder="" />
 						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="产量" prop="name">
-			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_cl" id="产量"  @keydown="ent($event, '加工联数', '产量', '制程废品')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="制程废品" prop="name">
-				     <el-input v-model="formData.sczl_zcfp" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_zcfp"    id="制程废品"  @keydown="ent($event, '产量', '制程废品', '装版总工时')" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -204,26 +204,26 @@
 			   <el-row :gutter="20">
 			      <el-col :span="4">
 			        <el-form-item label="装版总工时" prop="id">
-			          <el-input v-model="formData.sczl_装版总工时" :clearable="true" placeholder="" />
+			          <el-input v-model="formData.sczl_装版总工时" id="装版总工时"  @keydown="ent($event, '制程废品', '装版总工时', '装版补产工时')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
-			      <el-col :span="6">          
+			      <el-col :span="7">          
 			          <el-row :gutter="20">
 			            <el-col :span="12">
 			   						 <el-form-item label="装版补产工时" prop="id">
-			              <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="" />
+			              <el-input v-model="formData.sczl_装版工时" id="装版补产工时"  @keydown="ent($event, '装版总工时', '装版补产工时', '保养工时')" :clearable="true" placeholder="" />
 			   						 </el-form-item>
 			            </el-col>
 			          </el-row>
 			      </el-col>
 			      <el-col :span="3">
 			        <el-form-item label="保养工时" prop="name">
-			          <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="" />
+			          <el-input v-model="formData.sczl_保养工时" id="保养工时"  @keydown="ent($event, '装版补产工时', '保养工时', '异常停机')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
 			   				 <el-col :span="3">
 			   				   <el-form-item label="异常停机" prop="name">
-			   				     <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="" />
+			   				     <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '保养工时', '异常停机', '打样总工时')" :clearable="true" placeholder="" />
 			   				   </el-form-item>
 			   				 </el-col>
 			    </el-row>
@@ -232,21 +232,21 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="打样总工时" prop="id">
-			         <el-input v-model="formData.sczl_打样总工时" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_打样总工时" id="打样总工时"  @keydown="ent($event, '异常停机', '打样总工时', '打样补产工时')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
-			     <el-col :span="6">          
+			     <el-col :span="7">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="打样补产工时" prop="id">
-			             <el-input v-model="formData.sczl_打样工时" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_打样工时" id="打样补产工时"  @keydown="ent($event, '打样总工时', '打样补产工时', '通电时间')" :clearable="true" placeholder="" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="通电时间" prop="name">
-			         <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_设备运行工时"  id="通电时间"  @keydown="ent($event, '打样补产工时', '通电时间', '拆片联拼系数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>			  				
 			   </el-row>
@@ -255,18 +255,18 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">			       
 			     </el-col>
-			     <el-col :span="6">          
+			     <el-col :span="7">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <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>
 			     </el-col>
-			     <el-col :span="3">
+			     <el-col :span="4">
 			       <el-form-item label="拆片条小盒系数" prop="name">
-			         <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>
@@ -274,23 +274,23 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">			       
 			     </el-col>
-			     <el-col :span="6">          
+			     <el-col :span="10">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 			  						 <el-form-item label="定额代号" prop="id">
-			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent($event, '拆片条小盒系数', '定额代号', '工价系数')" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
 			  						 </el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="工价系数" prop="name">
-			         <el-input v-model="formData.sczl_工价系数" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_工价系数" id="工价系数"  @keydown="ent($event, '定额代号', '工价系数', '计产系数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				  <el-col :span="3">
 					<el-form-item label="计产系数" prop="name">
-					  <el-input v-model="formData.sczl_计产系数" :clearable="true" placeholder="" />
+					  <el-input v-model="formData.sczl_计产系数" id="计产系数"  @keydown="ent($event, '工价系数', '计产系数', 'sczl_bh1')" :clearable="true" placeholder="" />
 					</el-form-item>
 				  </el-col>
 			   </el-row>
@@ -336,34 +336,34 @@
 				   <span>班组成员</span>
 				 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')":clearable="true" placeholder="" />
+                  <el-input v-model="formData.sczl_bh1" id="sczl_bh1"  @keydown="ent($event, '计产系数', 'sczl_bh1', 'sczl_bh2')" @keyup.enter.native="getGxMcsubmit($event, '1')":clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
+                  <el-input v-model="formData.sczl_bh2" id="sczl_bh2"  @keydown="ent($event, 'sczl_bh1', 'sczl_bh2', 'sczl_bh3')" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
+                  <el-input v-model="formData.sczl_bh3" id="sczl_bh3"  @keydown="ent($event, 'sczl_bh2', 'sczl_bh3', 'sczl_bh4')" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
+                  <el-input v-model="formData.sczl_bh4" id="sczl_bh4"  @keydown="ent($event, 'sczl_bh3', 'sczl_bh4', 'sczl_bh5')" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
                 </el-col>
                 <el-col :span="2">
-                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
+                  <el-input v-model="formData.sczl_bh5" id="sczl_bh5"  @keydown="ent($event, 'sczl_bh4', 'sczl_bh5', 'sczl_bh6')" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
                 </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh6" id="sczl_bh6"  @keydown="ent($event, 'sczl_bh5', 'sczl_bh6', 'sczl_bh7')" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh7" id="sczl_bh7"  @keydown="ent($event, 'sczl_bh6', 'sczl_bh7', 'sczl_bh8')" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh8" id="sczl_bh8"  @keydown="ent($event, 'sczl_bh7', 'sczl_bh8', 'sczl_bh9')" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getGxMcsubmit($event, '9')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh9" id="sczl_bh9"  @keydown="ent($event, 'sczl_bh8', 'sczl_bh9', 'sczl_bh10')" @keyup.enter.native="getGxMcsubmit($event, '9')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getGxMcsubmit($event, '10')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh10" id="sczl_bh10"  @keydown="ent($event, 'sczl_bh9', 'sczl_bh10', 'name1')" @keyup.enter.native="getGxMcsubmit($event, '10')" :clearable="true" placeholder="" />
 				</el-col>
               </el-row>
             </el-form>
@@ -374,34 +374,34 @@
 							   
 							 </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh1_name"  :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent($event, 'sczl_bh10', 'name1', 'name2')"  :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')" :clearable="true" placeholder="" />
 			   </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh6_name" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent($event, 'name7', 'name8', 'name9')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh9_name"  id="name9"  @keydown="ent($event, 'name8', 'name9', 'name10')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh10_name"  id="name10"  @keydown="ent($event, 'name9', 'name10', 'rate1')" :clearable="true" placeholder="" />
 				</el-col>
 			 </el-row>
 			
@@ -410,34 +410,34 @@
 				  
 				 </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate1" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_rate1" id="rate1"  @keydown="ent($event, 'name10', 'rate1', 'rate2')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate2" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_rate2" id="rate2"  @keydown="ent($event, 'rate1', 'rate2', 'rate3')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate3" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_rate3" id="rate3"  @keydown="ent($event, 'rate2', 'rate3', 'rate4')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate4" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_rate4" id="rate4"  @keydown="ent($event, 'rate3', 'rate4', 'rate5')" :clearable="true" placeholder="" />
 			   </el-col>
 			   <el-col :span="2">
-			     <el-input v-model="formData.sczl_rate5" :clearable="true" placeholder="" />
+			     <el-input v-model="formData.sczl_rate5" id="rate5"  @keydown="ent($event, 'rate4', 'rate5', 'rate6')" :clearable="true" placeholder="" />
 			   </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate6" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_rate6" id="rate6"  @keydown="ent($event, 'rate5', 'rate6', 'rate7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate7" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_rate7" id="rate7"  @keydown="ent($event, 'rate6', 'rate7', 'rate8')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate8" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_rate8" id="rate8"  @keydown="ent($event, 'rate7', 'rate8', 'rate9')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate9" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_rate9" id="rate9"  @keydown="ent($event, 'rate8', 'rate9', 'rate10')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_rate10" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_rate10" id="rate10"  @keydown="ent($event, 'rate9', 'rate10', '工单编号')" :clearable="true" placeholder="" />
 				</el-col>
 			 </el-row>
 			 
@@ -726,6 +726,32 @@ const GetYg = async (value,inputName) => {
 	// console.log(formData.value[Bname])
   }
 }
+//键盘 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 getDedhsubmit = () => {
@@ -1151,6 +1177,7 @@ const updateDetailData = async() => {
 let table=ref(5);
 let lastCellValue=ref()
 // 双击表格操作
+const type = ref('')
 function doubleClick(row, column, event) {
   type.value = 'update';
     lastCellValue= row['UniqId'];
@@ -1161,8 +1188,7 @@ function doubleClick(row, column, event) {
   	 GetInfo(table.value)
   }else{
 	  console.log('此数据不展示详细信息')
-  }
-   
+  }  
 }
 //获取详细信息
 const GetInfo = async (value) => {

+ 94 - 54
src/view/performance/MachineDocuments.vue

@@ -74,14 +74,14 @@
 			  <el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="日期" prop="id">
-						 <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
+						 <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, '其他备注', '日期', '组别')" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="6">
 					   <el-form-item label="组别" prop="name">
 						 <el-row :gutter="20">
 						   <el-col :span="12">
-							 <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
+							 <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '日期', '组别', '工单编号')" :clearable="true" placeholder="" />
 						   </el-col>                      
 						 </el-row>
 					   </el-form-item>
@@ -92,20 +92,20 @@
 				<el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="工单编号" prop="id">
-						 <el-input v-model="formData.sczl_gdbh" @keyup.enter="getMachineGxMcsubmit" :clearable="true" placeholder="" />
+						 <el-input v-model="formData.sczl_gdbh"id="工单编号"  @keydown="ent($event, '日期', '工单编号', 'sczl_yjgx')"  @keyup.enter.native="getMachineGxMcsubmit" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="20">
 					   <!-- <el-form-item label="组别" prop="name"> -->
 						 <el-row :gutter="20">
 						   <el-col :span="5">
-							 <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="" />
+							 <el-input v-model="formData.sczl_yjgx" id="sczl_yjgx"  @keydown="ent($event, '工单编号', 'sczl_yjgx', 'sczl_gxmc')" :clearable="true" placeholder="" />
 						   </el-col>
 							<el-col :span="5">
-							 <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="" />
+							 <el-input v-model="formData.sczl_gxmc" id="sczl_gxmc"  @keydown="ent($event, 'sczl_yjgx', 'sczl_gxmc', 'yj_yjmc')" :clearable="true" placeholder="" />
 							</el-col>  
 							<el-col :span="5">
-							 <el-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
+							 <el-input v-model="formData.yj_yjmc" id="yj_yjmc"  @keydown="ent($event, 'sczl_gxmc', 'yj_yjmc', '机台编号')" :clearable="true" placeholder="" />
 							</el-col>  					 
 						 </el-row>
 					   <!-- </el-form-item> -->
@@ -116,26 +116,26 @@
 					<el-row :gutter="20">
 					 <el-col :span="4">
 					   <el-form-item label="机台编号" prop="id">
-						 <el-input v-model="formData.sczl_jtbh" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="" />
+						 <el-input v-model="formData.sczl_jtbh" id="机台编号"  @keydown="ent($event, 'yj_yjmc', '机台编号', '检验类型')" @keyup.enter.native="getJtbhsubmit" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="6">          
 						 <el-row :gutter="20">
 						   <el-col :span="12">
 							<el-form-item label="检验类型" prop="id">
-							 <el-input v-model="formData.sczl_单据类型" :clearable="true" placeholder="" />
+							 <el-input v-model="formData.sczl_单据类型" id="检验类型"  @keydown="ent($event, '机台编号', '检验类型', '检验类别')" :clearable="true" placeholder="" />
 							</el-form-item>
 						   </el-col>
 						 </el-row>
 					 </el-col>
 					 <el-col :span="3">
 					   <el-form-item label="检验类别" prop="name">
-						 <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="" />
+						 <el-input v-model="formData.sczl_检验类别" id="检验类别"  @keydown="ent($event, '检验类型', '检验类别', '废品率系数')" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 					 <el-col :span="3">
 					   <el-form-item label="废品率系数" prop="name">
-						 <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="" />
+						 <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent($event, '检验类别', '废品率系数', '计件箱数')" :clearable="true" placeholder="" />
 					   </el-form-item>
 					 </el-col>
 				   </el-row>
@@ -143,17 +143,17 @@
 					   <el-row :gutter="20">
 					   <el-col :span="4">
 						 <el-form-item label="计件箱数" prop="id">
-						   <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
+						   <el-input v-model="formData.sczl_cl" id="计件箱数"  @keydown="ent($event, '废品率系数', '计件箱数', '每箱数量')" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					 <el-col :span="3">
 						 <el-form-item label="每箱数量" prop="name">
-						   <el-input v-model="formData.sczl_PgCl" :clearable="true" placeholder="" />
+						   <el-input v-model="formData.sczl_PgCl" id="每箱数量"  @keydown="ent($event, '计件箱数', '每箱数量', '定额代号')" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					   <el-col :span="3">
-						 <el-form-item label="定额代号" @keyup.enter.native="getMachineDedhsubmit" prop="name">
-						   <el-input v-model="formData.sczl_dedh" :clearable="true" placeholder="" />
+						 <el-form-item label="定额代号"   prop="name">
+						   <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getMachineDedhsubmit"  id="定额代号"  @keydown="ent($event, '计件箱数', '定额代号', '流程单号')" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>
 					 </el-row>
@@ -163,42 +163,42 @@
 					 <el-row :gutter="1">
 					 			     <el-col :span="4">
 					 			       <el-form-item label="流程单号" prop="id">
-					 			         <el-input v-model="formData.address" :clearable="true" placeholder="" />
+					 			         <el-input v-model="formData.address" id="流程单号"  @keydown="ent($event, '定额代号', '流程单号', '流程单号1')" :clearable="true" placeholder="" />
 					 			       </el-form-item>
 					 			     </el-col>
 					 							 <el-col :span="1">
-					 							   <el-input v-model="formData.流程单号1" :clearable="true" placeholder="" />
+					 							   <el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent($event, '流程单号', '流程单号1', '流程单号2')" :clearable="true" placeholder="" />
 					 							 </el-col>
 					 				            <el-col :span="1">
-					 				              <el-input v-model="formData.流程单号2" :clearable="true" placeholder="" />
+					 				              <el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent($event, '流程单号1', '流程单号2', '流程单号3')" :clearable="true" placeholder="" />
 					 				            </el-col>
 					 			  				  <el-col :span="1">			  			
-					 			  				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent($event, '流程单号2', '流程单号3', '流程单号4')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 							  
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent($event, '流程单号3', '流程单号4', '流程单号5')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent($event, '流程单号4', '流程单号5', '流程单号6')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent($event, '流程单号5', '流程单号6', '流程单号7')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent($event, '流程单号6', '流程单号7', '流程单号8')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			  				  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent($event, '流程单号7', '流程单号8', '流程单号9')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 							  <el-col :span="1">
-					 			  				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="" />
+					 			  				    <el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent($event, '流程单号8', '流程单号9', '备注')" :clearable="true" placeholder="" />
 					 			  				  </el-col>
 					 			     <el-col :span="6">          
 					 			         <el-row :gutter="20">
 					 			           <el-col :span="12">
 					 			  						 <el-form-item label="备注" prop="id">
-					 			             <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+					 			             <el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent($event, '流程单号9', '备注', '换模补产工时')" :clearable="true" placeholder="" />
 					 			  						 </el-form-item>
 					 			           </el-col>
 					 			         </el-row>
@@ -209,26 +209,26 @@
 				<el-row :gutter="20">
 							     <el-col :span="4">
 							       <el-form-item label="换模补产工时" prop="id">
-							         <el-input v-model="formData.sczl_装版工时" :clearable="true" placeholder="" />
+							         <el-input v-model="formData.sczl_装版工时" id="换模补产工时"  @keydown="ent($event, '备注', '换模补产工时', '设备保养工时')" :clearable="true" placeholder="" />
 							       </el-form-item>
 							     </el-col>
 							     <el-col :span="6">          
 							         <el-row :gutter="20">
 							           <el-col :span="12">
 							  						<el-form-item label="设备保养工时" prop="id">
-							             <el-input v-model="formData.sczl_保养工时" :clearable="true" placeholder="" />
+							             <el-input v-model="formData.sczl_保养工时" id="设备保养工时"  @keydown="ent($event, '换模补产工时', '设备保养工时', '异常停机')" :clearable="true" placeholder="" />
 							  						</el-form-item>
 							           </el-col>
 							         </el-row>
 							     </el-col>
 							     <el-col :span="3">
 							       <el-form-item label="异常停机" prop="name">
-							         <el-input v-model="formData.sczl_异常停机工时" :clearable="true" placeholder="" />
+							         <el-input v-model="formData.sczl_异常停机工时" id="异常停机"  @keydown="ent($event, '设备保养工时', '异常停机', '设备通电工时')" :clearable="true" placeholder="" />
 							       </el-form-item>
 							     </el-col>
 								 <el-col :span="3">
 								   <el-form-item label="设备通电工时" prop="name">
-									 <el-input v-model="formData.sczl_设备运行工时" :clearable="true" placeholder="" />
+									 <el-input v-model="formData.sczl_设备运行工时" id="设备通电工时"  @keydown="ent($event, '异常停机', '设备通电工时', 'sczl_bh1')" :clearable="true" placeholder="" />
 								   </el-form-item>
 								 </el-col>
 							   </el-row>				   
@@ -238,28 +238,28 @@
 								   <span>组员信息</span>
 								 </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh1" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="" />
+				                  <el-input v-model="formData.sczl_bh1"id="sczl_bh1"  @keydown="ent($event, '异常停机', 'sczl_bh1', 'sczl_bh2')" @keyup.enter.native="getGxMcsubmit($event, '1')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
+				                  <el-input v-model="formData.sczl_bh2" id="sczl_bh2"  @keydown="ent($event, 'sczl_bh1', 'sczl_bh2', 'sczl_bh3')" @keyup.enter.native="getGxMcsubmit($event, '2')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
+				                  <el-input v-model="formData.sczl_bh3" id="sczl_bh3"  @keydown="ent($event, 'sczl_bh2', 'sczl_bh3', 'sczl_bh4')" @keyup.enter.native="getGxMcsubmit($event, '3')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
+				                  <el-input v-model="formData.sczl_bh4" id="sczl_bh4"  @keydown="ent($event, 'sczl_bh3', 'sczl_bh4', 'sczl_bh5')" @keyup.enter.native="getGxMcsubmit($event, '4')" :clearable="true" placeholder="" />
 				                </el-col>
 				                <el-col :span="2">
-				                  <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
+				                  <el-input v-model="formData.sczl_bh5" id="sczl_bh5"  @keydown="ent($event, 'sczl_bh4', 'sczl_bh5', 'sczl_bh6')" @keyup.enter.native="getGxMcsubmit($event, '5')" :clearable="true" placeholder="" />
 				                </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh6" id="sczl_bh6"  @keydown="ent($event, 'sczl_bh5', 'sczl_bh6', 'sczl_bh7')" @keyup.enter.native="getGxMcsubmit($event, '6')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh7" id="sczl_bh7"  @keydown="ent($event, 'sczl_bh6', 'sczl_bh7', 'sczl_bh8')" @keyup.enter.native="getGxMcsubmit($event, '7')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh8" id="sczl_bh8"  @keydown="ent($event, 'sczl_bh7', 'sczl_bh8', 'name1')" @keyup.enter.native="getGxMcsubmit($event, '8')" :clearable="true" placeholder="" />
 								</el-col>
 				              </el-row>
 										 
@@ -268,28 +268,28 @@
 								   <span></span>
 								 </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh1_name"   :clearable="true" placeholder="" />
+							      <el-input v-model="formData.sczl_bh1_name" id="name1"  @keydown="ent($event, 'sczl_bh8', 'name1', 'name2')"  :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh2_name"   :clearable="true" placeholder="" />
+							      <el-input v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent($event, 'name1', 'name2', 'name3')"  :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent($event, 'name2', 'name3', 'name4')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent($event, 'name3', 'name4', 'name5')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent($event, 'name4', 'name5', 'name6')" :clearable="true" placeholder="" />
 							    </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh6_name" id="name6"  @keydown="ent($event, 'name5', 'name6', 'name7')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent($event, 'name6', 'name7', 'name8')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent($event, 'name7', 'name8', 'NumDesc1')" :clearable="true" placeholder="" />
 								</el-col>
 							  </el-row>
 													   
@@ -299,28 +299,28 @@
 								   <span></span>
 								 </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc1"  @keydown="ent($event, 'name8', 'NumDesc1', 'NumDesc2')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc2"  @keydown="ent($event, 'NumDesc1', 'NumDesc2', 'NumDesc3')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc3"  @keydown="ent($event, 'NumDesc2', 'NumDesc3', 'NumDesc4')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc4"  @keydown="ent($event, 'NumDesc3', 'NumDesc4', 'NumDesc5')" :clearable="true" placeholder="" />
 							    </el-col>
 							    <el-col :span="2">
-							      <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+							      <el-input v-model="formData.qczl_NumDesc" id="NumDesc5"  @keydown="ent($event, 'NumDesc4', 'NumDesc5', 'NumDesc6')" :clearable="true" placeholder="" />
 							    </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc6"  @keydown="ent($event, 'NumDesc5', 'NumDesc6', 'NumDesc7')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc7"  @keydown="ent($event, 'NumDesc6', 'NumDesc7', 'NumDesc8')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.qczl_NumDesc" id="NumDesc8"  @keydown="ent($event, 'NumDesc7', 'NumDesc8', '其他备注')" :clearable="true" placeholder="" />
 								</el-col>
 							  </el-row>
 																	 
@@ -328,7 +328,7 @@
 				<el-row :gutter="20">
 			   <el-col :span="20">
 			     <el-form-item label="其他备注" prop="id">
-			       <el-input v-model="formData.流程单号" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.流程单号" id="其他备注"  @keydown="ent($event, 'NumDesc8', '其他备注', '日期')" :clearable="true" placeholder="" />
 			     </el-form-item>
 			   </el-col>
 			 </el-row>													 
@@ -1111,6 +1111,46 @@ const enterDialog = async () => {
   // })
   updateDetailData()
 }
+//键盘 input框跳转
+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()
+	}
+	if(id2=='工单编号'&&event.keyCode === 13){
+		getMachineGxMcsubmit()
+	}else if(id2=='机台编号'&&event.keyCode === 13){
+		getJtbhsubmit()
+	}else if(id2=='定额代号'&&event.keyCode === 13){
+		getMachineDedhsubmit()
+	}
+  } 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()
 // 双击表格操作

+ 106 - 75
src/view/performance/Manualdocuments.vue

@@ -65,14 +65,14 @@
               <el-row :gutter="20">
                 <el-col :span="4">
                   <el-form-item label="日期" prop="id">
-                    <el-input v-model="formData.sczl_rq" :clearable="true" placeholder="" />
+                    <el-input v-model="formData.sczl_rq" id="日期"  @keydown="ent($event, '其他备注', '日期', '组别')" :clearable="true" placeholder="" />
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
                   <el-form-item label="组别" prop="name">
                     <el-row :gutter="20">
                       <el-col :span="12">
-                        <el-input v-model="formData.sczl_bzdh" :clearable="true" placeholder="" />
+                        <el-input v-model="formData.sczl_bzdh" id="组别"  @keydown="ent($event, '日期', '组别', 'bh0')" :clearable="true" placeholder="" />
                       </el-col>                      
                     </el-row>
                   </el-form-item>
@@ -81,10 +81,10 @@
 				  <el-form-item label="组长" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="12">
-				        <el-input v-model="formData.sczl_bh0" @keyup.enter.native="getygsubmit($event, '0')":clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_bh0" id="bh0"  @keydown="ent($event, '组别', 'bh0', 'name0')" @keyup.enter.native="getygsubmit($event, '0')":clearable="true" placeholder="" />
 				      </el-col>
 						<el-col :span="12">
-						  <el-input v-model="formData.sczl_bh0_name" :clearable="true" placeholder="" />
+						  <el-input v-model="formData.sczl_bh0_name" id="name0"  @keydown="ent($event, 'bh0', 'name0', '箱数')" :clearable="true" placeholder="" />
 						</el-col>  
 				    </el-row>
 				  </el-form-item>
@@ -93,7 +93,7 @@
 				  <el-form-item label="箱数" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_cl0" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_cl0" id="箱数"  @keydown="ent($event, 'name0', '箱数', '每箱数')" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
 				  </el-form-item>
@@ -102,7 +102,7 @@
 				  <el-form-item label="每箱数" prop="name">
 				    <el-row :gutter="20">
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_fp0" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_fp0" id="每箱数"  @keydown="ent($event, '箱数', '每箱数', '工单编号')" :clearable="true" placeholder="" />
 				      </el-col>                      
 				    </el-row>
 				  </el-form-item>
@@ -114,17 +114,17 @@
                   <el-row :gutter="20">
                     <el-col :span="5">
                       <el-form-item label="工单编号" prop="id">
-                        <el-input v-model="formData.sczl_gdbh" @keyup.enter="getGxMcsubmit" :clearable="true" placeholder="" />
+                        <el-input v-model="formData.sczl_gdbh" id="工单编号"  @keydown="ent($event, '每箱数', '工单编号', 'yjgx')" @keyup.enter="getGxMcsubmit" :clearable="true" placeholder="" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="5">                      
-                        <el-input v-model="formData.sczl_yjgx" :clearable="true" placeholder="" />
+                        <el-input v-model="formData.sczl_yjgx" id="yjgx"  @keydown="ent($event, '工单编号', 'yjgx', 'gxmc')" :clearable="true" placeholder="" />
                     </el-col>
 					<el-col :span="5">
-					    <el-input v-model="formData.sczl_gxmc" :clearable="true" placeholder="" />
+					    <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-input v-model="formData.yj_yjmc" :clearable="true" placeholder="" />
+					    <el-input v-model="formData.yj_yjmc" id="yjmc"  @keydown="ent($event, 'gxmc', 'yjmc', '产量合计')" :clearable="true" placeholder="" />
 					</el-col>
                   </el-row>
                 </el-col>
@@ -133,26 +133,26 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="产量合计" prop="id">
-			         <el-input v-model="formData.sczl_cl" :clearable="true" placeholder="" />
+			         <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-row :gutter="20">
 			           <el-col :span="12">
 						<el-form-item label="定额代号" prop="id">
-			             <el-input v-model="formData.sczl_dedh" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_dedh" id="定额代号"  @keydown="ent($event, '产量合计', '定额代号', '检验类别')" @keyup.enter.native="getDedhsubmit" :clearable="true" placeholder="" />
 						</el-form-item>
 			           </el-col>
 			         </el-row>
 			     </el-col>
 			     <el-col :span="3">
 			       <el-form-item label="检验类别" prop="name">
-			         <el-input v-model="formData.sczl_检验类别" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_检验类别"  id="检验类别"  @keydown="ent($event, '定额代号', '检验类别', '废品率系数')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 				 <el-col :span="3">
 				   <el-form-item label="废品率系数" prop="name">
-				     <el-input v-model="formData.sczl_废品率系数" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_废品率系数" id="废品率系数"  @keydown="ent($event, '检验类别', '废品率系数', '计时时数')" :clearable="true" placeholder="" />
 				   </el-form-item>
 				 </el-col>
 			   </el-row>
@@ -160,14 +160,14 @@
 			  <el-row :gutter="20">
 			     <el-col :span="4">
 			       <el-form-item label="计时时数" prop="id">
-			         <el-input v-model="formData.sczl_jsss" :clearable="true" placeholder="" />
+			         <el-input v-model="formData.sczl_jsss" id="计时时数"  @keydown="ent($event, '废品率系数', '计时时数', '冲月定额')" :clearable="true" placeholder="" />
 			       </el-form-item>
 			     </el-col>
 			     <el-col :span="6">          
 			         <el-row :gutter="20">
 			           <el-col :span="12">
 						 <el-form-item label="冲月定额" prop="id">
-			             <el-input v-model="formData.sczl_冲定额" :clearable="true" placeholder="" />
+			             <el-input v-model="formData.sczl_冲定额" id="冲月定额"  @keydown="ent($event, '计时时数', '冲月定额', '流程单号1')" :clearable="true" placeholder="" />
 						 </el-form-item>
 			           </el-col>
 			         </el-row>
@@ -178,38 +178,38 @@
 			   <el-row :gutter="1">
 			      <el-col :span="4">
 			        <el-form-item label="流程单号" prop="id">
-			          <el-input v-model="formData.流程单号1" :clearable="true" placeholder="" />
+			          <el-input v-model="formData.流程单号1" id="流程单号1"  @keydown="ent($event, '冲月定额', '流程单号1', '流程单号2')" :clearable="true" placeholder="" />
 			        </el-form-item>
 			      </el-col>
 				  <el-col :span="1">			  			
-				    <el-input v-model="formData.流程单号2" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号2" id="流程单号2"  @keydown="ent($event, '流程单号1', '流程单号2', '流程单号3')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号3" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号3" id="流程单号3"  @keydown="ent($event, '流程单号2', '流程单号3', '流程单号4')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号4" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号4" id="流程单号4"  @keydown="ent($event, '流程单号3', '流程单号4', '流程单号5')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号5" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号5" id="流程单号5"  @keydown="ent($event, '流程单号4', '流程单号5', '流程单号6')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号6" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号6" id="流程单号6"  @keydown="ent($event, '流程单号5', '流程单号6', '流程单号7')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号7" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号7" id="流程单号7"  @keydown="ent($event, '流程单号6', '流程单号7', '流程单号8')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号8" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号8" id="流程单号8"  @keydown="ent($event, '流程单号7', '流程单号8', '流程单号9')" :clearable="true" placeholder="" />
 				  </el-col>
 				  <el-col :span="1">
-				    <el-input v-model="formData.流程单号9" :clearable="true" placeholder="" />
+				    <el-input v-model="formData.流程单号9" id="流程单号9"  @keydown="ent($event, '流程单号8', '流程单号9', '备注')" :clearable="true" placeholder="" />
 				  </el-col>
 			      <el-col :span="6">          
 			          <el-row :gutter="20">
 			            <el-col :span="12">
 			   						 <el-form-item label="备注" prop="id">
-			              <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="" />
+			              <el-input v-model="formData.qczl_NumDesc" id="备注"  @keydown="ent($event, '流程单号9', '备注', 'bh1')" :clearable="true" placeholder="" />
 			   						 </el-form-item>
 			            </el-col>
 			          </el-row>
@@ -254,30 +254,30 @@
 				   <span></span>
 				 </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh1" :clearable="true" @keyup.enter.native="getygsubmit($event, '1')"  placeholder="" />
+			       <el-input v-model="formData.sczl_bh1" id="bh1"  @keydown="ent($event, '备注', 'bh1', 'name')"  :clearable="true" @keyup.enter.native="getygsubmit($event, '1')"  placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh1_name" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_bh1_name" id="name"  @keydown="ent($event, 'bh1', 'name', 'cl1')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_cl1" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_cl1" id="cl1"  @keydown="ent($event, 'name', 'cl1', 'fp1')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_fp1" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_fp1" id="fp1"  @keydown="ent($event, 'cl1', 'fp1', 'bh7')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">			       
 			     </el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh7" id="bh7"  @keydown="ent($event, 'fp1', 'bh7', 'name7')" @keyup.enter.native="getygsubmit($event, '7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_bh7_name" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_bh7_name" id="name7"  @keydown="ent($event, 'bh7', 'name7', 'cl7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_cl7" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_cl7" id="cl7"  @keydown="ent($event, 'name7', 'cl7', 'fp7')" :clearable="true" placeholder="" />
 				</el-col>
 				<el-col :span="2">
-				  <el-input v-model="formData.sczl_fp7" :clearable="true" placeholder="" />
+				  <el-input v-model="formData.sczl_fp7" id="fp7"  @keydown="ent($event, 'cl7', 'fp7', 'bh2')" :clearable="true" placeholder="" />
 				</el-col>
 			   </el-row>	
 						 
@@ -286,30 +286,30 @@
 			  				   <span></span>
 			  				 </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh2" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_bh2" id="bh2"  @keydown="ent($event, 'fp7', 'bh2', 'name2')" @keyup.enter.native="getygsubmit($event, '2')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_bh2_name" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_bh2_name" id="name2"  @keydown="ent($event, 'bh2', 'name2', 'cl2')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_cl2" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_cl2" id="cl2"  @keydown="ent($event, 'name2', 'cl2', 'fp2')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">
-			       <el-input v-model="formData.sczl_fp2" :clearable="true" placeholder="" />
+			       <el-input v-model="formData.sczl_fp2" id="fp2"  @keydown="ent($event, 'cl2', 'fp2', 'bh8')" :clearable="true" placeholder="" />
 			     </el-col>
 			     <el-col :span="2">			       
 			     </el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_bh8" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="" />
+			  				  <el-input v-model="formData.sczl_bh8" id="bh8"  @keydown="ent($event, 'fp2', 'bh8', 'name8')" @keyup.enter.native="getygsubmit($event, '8')" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_bh8_name" :clearable="true" placeholder="" />
+			  				  <el-input v-model="formData.sczl_bh8_name" id="name8"  @keydown="ent($event, 'bh8', 'name8', 'cl8')" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_cl8" :clearable="true" placeholder="" />
+			  				  <el-input v-model="formData.sczl_cl8" id="cl8"  @keydown="ent($event, 'name8', 'cl8', 'fp8')" :clearable="true" placeholder="" />
 			  				</el-col>
 			  				<el-col :span="2">
-			  				  <el-input v-model="formData.sczl_fp8" :clearable="true" placeholder="" />
+			  				  <el-input v-model="formData.sczl_fp8" id="fp8"  @keydown="ent($event, 'cl8', 'fp8', 'bh3')" :clearable="true" placeholder="" />
 			  				</el-col>
 			   </el-row>
 				
@@ -318,30 +318,30 @@
 								   <span></span>
 								 </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh3" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_bh3" id="bh3"  @keydown="ent($event, 'fp8', 'bh3', 'name3')" @keyup.enter.native="getygsubmit($event, '3')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh3_name" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_bh3_name" id="name3"  @keydown="ent($event, 'bh3', 'name3', 'cl3')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_cl3" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_cl3" id="cl3"  @keydown="ent($event, 'name3', 'cl3', 'fp3')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_fp3" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_fp3" id="fp3"  @keydown="ent($event, 'cl3', 'fp3', 'bh9')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">			       
 				   </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh9" @keyup.enter.native="getygsubmit($event, '9')" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh9" id="bh9"  @keydown="ent($event, 'fp3', 'bh9', 'name9')" @keyup.enter.native="getygsubmit($event, '9')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh9_name" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh9_name" id="name9"  @keydown="ent($event, 'bh9', 'name9', 'cl9')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_cl9" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_cl9" id="cl9"  @keydown="ent($event, 'name9', 'cl9', 'fp9')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_fp9" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_fp9" id="fp9"  @keydown="ent($event, 'cl9', 'fp9', 'bh4')" :clearable="true" placeholder="" />
 								</el-col>
 				 </el-row>
 				 
@@ -351,30 +351,30 @@
 								   <span></span>
 								 </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh4" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_bh4" id="bh4"  @keydown="ent($event, 'fp9', 'bh4', 'name4')" @keyup.enter.native="getygsubmit($event, '4')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_bh4_name" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_bh4_name" id="name4"  @keydown="ent($event, 'bh4', 'name4', 'cl4')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_cl4" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_cl4" id="cl4"  @keydown="ent($event, 'name4', 'cl4', 'fp4')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">
-				     <el-input v-model="formData.sczl_fp4" :clearable="true" placeholder="" />
+				     <el-input v-model="formData.sczl_fp4" id="fp4"  @keydown="ent($event, 'cl4', 'fp4', 'bh10')" :clearable="true" placeholder="" />
 				   </el-col>
 				   <el-col :span="2">			       
 				   </el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh10" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh10" id="bh10"  @keydown="ent($event, 'fp4', 'bh10', 'name10')" @keyup.enter.native="getygsubmit($event, '10')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_bh10_name" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_bh10_name" id="name10"  @keydown="ent($event, 'bh10', 'name10', 'cl10')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_cl10" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_cl10" id="cl10"  @keydown="ent($event, 'name10', 'cl10', 'fp10')" :clearable="true" placeholder="" />
 								</el-col>
 								<el-col :span="2">
-								  <el-input v-model="formData.sczl_fp10" :clearable="true" placeholder="" />
+								  <el-input v-model="formData.sczl_fp10" id="fp10"  @keydown="ent($event, 'cl10', 'fp10', 'bh5')" :clearable="true" placeholder="" />
 								</el-col>
 				 </el-row>
 				  
@@ -384,30 +384,30 @@
 				  				   <span></span>
 				  				 </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_bh5" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="" />
+				       <el-input v-model="formData.sczl_bh5" id="bh5"  @keydown="ent($event, 'fp10', 'bh5', 'name5')" @keyup.enter.native="getygsubmit($event, '5')" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_bh5_name" :clearable="true" placeholder="" />
+				       <el-input v-model="formData.sczl_bh5_name" id="name5"  @keydown="ent($event, 'bh5', 'name5', 'cl5')"  :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_cl5" :clearable="true" placeholder="" />
+				       <el-input v-model="formData.sczl_cl5" id="cl5"  @keydown="ent($event, 'name5', 'cl5', 'fp5')" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">
-				       <el-input v-model="formData.sczl_fp5" :clearable="true" placeholder="" />
+				       <el-input v-model="formData.sczl_fp5" id="fp5"  @keydown="ent($event, 'cl5', 'fp5', 'bh11')" :clearable="true" placeholder="" />
 				     </el-col>
 				     <el-col :span="2">			       
 				     </el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_bh11" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
+				  				  <el-input v-model="formData.sczl_bh11" id="bh11"  @keydown="ent($event, 'fp5', 'bh11', 'name11')" @keyup.enter.native="getygsubmit($event, '11')" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_bh11_name" :clearable="true" placeholder="" />
+				  				  <el-input v-model="formData.sczl_bh11_name" id="name11"  @keydown="ent($event, 'bh11', 'name11', 'cl11')" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_cl11" :clearable="true" placeholder="" />
+				  				  <el-input v-model="formData.sczl_cl11" id="cl11"  @keydown="ent($event, 'name11', 'cl11', 'fp11')" :clearable="true" placeholder="" />
 				  				</el-col>
 				  				<el-col :span="2">
-				  				  <el-input v-model="formData.sczl_fp11" :clearable="true" placeholder="" />
+				  				  <el-input v-model="formData.sczl_fp11" id="fp11"  @keydown="ent($event, 'cl11', 'fp11', 'bh6')" :clearable="true" placeholder="" />
 				  				</el-col>
 				   </el-row>
 				   
@@ -417,30 +417,30 @@
 				   				   <span></span>
 				   				 </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_bh6" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_bh6" id="bh6"  @keydown="ent($event, 'fp11', 'bh6', 'name6')" @keyup.enter.native="getygsubmit($event, '6')" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_bh6_name" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_bh6_name" id="name6"  @keydown="ent($event, 'bh6', 'name6', 'cl6')" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_cl6" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_cl6" id="cl6"  @keydown="ent($event, 'name6', 'cl6', 'fp6')" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">
-				        <el-input v-model="formData.sczl_fp6" :clearable="true" placeholder="" />
+				        <el-input v-model="formData.sczl_fp6" id="fp6"  @keydown="ent($event, 'cl6', 'fp6', 'bh12')" :clearable="true" placeholder="" />
 				      </el-col>
 				      <el-col :span="2">			       
 				      </el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_bh12" @keyup.enter.native="getygsubmit($event, '12')" :clearable="true" placeholder="" />
+				   				  <el-input v-model="formData.sczl_bh12" id="bh12"  @keydown="ent($event, 'fp6', 'bh12', 'name12')" @keyup.enter.native="getygsubmit($event, '12')" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_bh12_name" :clearable="true" placeholder="" />
+				   				  <el-input v-model="formData.sczl_bh12_name" id="name12"  @keydown="ent($event, 'bh12', 'name12', 'cl12')" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_cl12" :clearable="true" placeholder="" />
+				   				  <el-input v-model="formData.sczl_cl12" id="cl12"  @keydown="ent($event, 'name12', 'cl12', 'fp12')" :clearable="true" placeholder="" />
 				   				</el-col>
 				   				<el-col :span="2">
-				   				  <el-input v-model="formData.sczl_fp12" :clearable="true" placeholder="" />
+				   				  <el-input v-model="formData.sczl_fp12" id="fp12"  @keydown="ent($event, 'cl12', 'fp12', '其他备注')" :clearable="true" placeholder="" />
 				   				</el-col>
 				    </el-row>
 					
@@ -449,7 +449,7 @@
 					<el-row :gutter="20">
 					   <el-col :span="20">
 						 <el-form-item label="其他备注" prop="id">
-						   <el-input v-model="formData.sczl_desc" :clearable="true" placeholder="" />
+						   <el-input v-model="formData.sczl_desc" id="其他备注"  @keydown="ent($event, 'fp12', '其他备注', '日期')" :clearable="true" placeholder="" />
 						 </el-form-item>
 					   </el-col>			  				
 					 </el-row>
@@ -880,6 +880,7 @@ response.data.bh_mc.forEach(item => {
   }
 
 }
+
 //定额代号树形结构单机
 const GetDedhhandleNodeClick = (node,check,nodeData) => {
   //存放当前节点的nodeId
@@ -907,6 +908,36 @@ const getDedhsubmit = () => {
 
 	 GetDedh()
 }
+
+//键盘 input框跳转
+const ent = (event,id1,id2,id3) => {
+
+  if (event.keyCode === 13 || event.keyCode === 40) { // Enter 或向下箭头
+    if(id3!=''){
+      document.getElementById(id3).focus()
+    }
+	if(id2=='bh0'){
+		getygsubmit($event, '0')
+	}
+  } 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 GetScrapFactor = async (value) => {
   const response = await shougonggetScrapFactor(value);

+ 6 - 5
src/view/performance/chejianbaogong.vue

@@ -909,8 +909,8 @@
 			        </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-form-item label="流程标" prop="id" style="margin-top: 10px;">
+			  		<el-input v-model="formData3.流程标" :clearable="true" placeholder="" />
 			  	  </el-form-item>
 			  	  </el-col>
 			  	  <el-col :span="5">
@@ -1453,7 +1453,7 @@ const InspectionRecord = async () => {
 }
 //当班产量明细
 const FacilityDetail = async () => {
-  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2312191', team:'A班' });
+  const response = await facilityDetail({ machine: JTMC, Gd_gdbh: '2311114', team:'A班' });
   if (response.code === 0) {
     console.log(response);
     CLMXData.splice(0, CLMXData.length, ...Object.values(response.data));
@@ -1613,7 +1613,7 @@ const SetProcessStatus = async () => {
   console.log(formData.value.印件编号)
   // console.log(formData.value.工单编号)
   const RESCODE={
-	 order:'2401714', 
+	 order:'2311114', 
 	 yjno:'1',
 	 gxh:'1',
   }
@@ -1868,7 +1868,8 @@ const SubmitDailyProduction = async () => {
   const response = await submitDailyProduction(restoredData);
   console.log(response)
   if (response.code === 0) {
-  
+   FacilityDetail()
+   chanliangVisible.value=false
   }
 }
 // let formattedArray 

+ 90 - 83
src/view/yunyin/chanpinziliao/chanpinziliao.vue

@@ -16,6 +16,8 @@
               <el-button type="primary" icon="edit" @click="fjfpxsClick" class="bt">质检废品系数</el-button>
               <el-button type="primary" icon="edit" @click="pccstzClick" class="bt">排产参数调整</el-button>
               <el-button type="primary" icon="edit" @click="hscstzClick" class="bt">核算参数调整</el-button>
+              <el-button type="primary"  icon="edit"  disabled  @click="addcpyj_onclick"     class="bt">新增印件资料</el-button>
+              <el-button type="primary"  icon="edit"  disabled @click="ddcpgy_onclick"     class="bt">新增工艺资料</el-button>
               <el-button type="primary" disabled icon="Download" @click="cpexportToExcel" style="margin: 5px;display: none">导出产品资料</el-button>
               <el-button type="primary" disabled icon="Download" @click="gyexportToExcel" style="margin: 5px;margin-top: 5px;display: none">导出工艺流程</el-button>
             </el-form-item>
@@ -230,10 +232,10 @@
               </el-form-item>
             </div>
 
+
             <el-table ref="multipleTable"
                       :show-overflow-tooltip="true"
                       :row-style="{ height: '20px' }"
-
                       :header-row-style="{ height: '20px' }"
                       :header-cell-style="{ padding: '0px' }"
                       style="width: 100%;height: 70vh" border tooltip-effect="dark"
@@ -597,7 +599,7 @@
                         :header-cell-style="{ padding: '0px' }"
                         @row-dblclick="yjupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="yjtableData" row-key="ID" @selection-change="handleSelectionChange">
-                <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column type="selection" width="30" />
                 <el-table-column align="left" label="印件号" prop="yj_yjno"  width="80"/>
                 <el-table-column align="left" label="印件代号" prop="yj_yjdh" width="100" />
                 <el-table-column align="left" label="印件名称" prop="yj_yjmc" width="540" />
@@ -625,7 +627,7 @@
                         :row-class-name="rowClassStyle"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange"
                         @row-click="clickybupdate">
-                <!--                <el-table-column type="selection" width="55" />-->
+                <el-table-column type="selection" width="30" />
                 <el-table-column align="left" label="方案" prop="方案"  width="70"/>
                 <el-table-column align="left" label="印件" prop="Gy0_yjno" width="80" />
                 <el-table-column align="left" label="工序" prop="Gy0_gxh" width="70" />
@@ -660,7 +662,7 @@
                         @row-dblclick="ybupdateCompanyFunc"
                         style="width: 100%;height: 40vh" border tooltip-effect="dark" :data="ybtableData" row-key="ID" @selection-change="handleSelectionChange"
               >
-                <!--              <el-table-column type="selection" width="55" />-->
+                <el-table-column type="selection" width="30" />
                 <el-table-column align="left" label="方案" prop="YB_方案"  width="70"/>
                 <el-table-column align="left" label="印件号" prop="YB_Yjno" width="80" />
                 <el-table-column align="left" label="印版类别" prop="印版类别" width="100" />
@@ -713,47 +715,47 @@
                     </el-col>
                     <el-col :span="9">
                       <el-form-item label="印品代号:" prop="address" class="mab">
-                        <el-input v-model="formDataTest['产品编号']" :clearable="true" id="id3" placeholder="" @keydown="ent($event, 'id2', 'id3', '')" style="width: 150px;" />
+                        <el-input v-model="formDataTest['产品编号']" :clearable="true" id="id3" placeholder="" @keydown="ent($event, 'id2', 'id3', '版本号')" style="width: 150px;" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
                       <el-form-item label="版本号:" prop="gender" label-width="60px" class="mab">
-                        <el-input v-model="formDataTest['版本号']" :clearable="true" placeholder="" style="width: 120px;" />
+                        <el-input v-model="formDataTest['版本号']" :clearable="true" placeholder="" id="版本号"  @keydown="ent($event, 'id3', '版本号', '客户料号')" style="width: 120px;" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="9">
                       <el-form-item label="客户料号:" prop="idCard" label-width="110px" class="mab">
-                        <el-input v-model="formDataTest['客户料号']" :clearable="true" placeholder=""  style="width: 150px;" />
+                        <el-input v-model="formDataTest['客户料号']" :clearable="true" placeholder=""  id="客户料号"  @keydown="ent($event, '版本号', '客户料号', '产品名称')"  style="width: 150px;" />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="产品名称:" prop="department" class="mab">
-                        <el-input v-model="formDataTest['产品名称']" :clearable="true" placeholder=""  />
+                        <el-input v-model="formDataTest['产品名称']" :clearable="true" placeholder="" id="产品名称"  @keydown="ent($event, '客户料号', '产品名称', '产品类别')"  />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="9">
                       <el-form-item label="产品类别:" prop="department" class="mab">
-                        <el-input v-model="formDataTest['产品类别']" :clearable="true" placeholder="" style="width: 150px;" />
+                        <el-input v-model="formDataTest['产品类别']" :clearable="true" placeholder="" id="产品类别"  @keydown="ent($event, '产品名称', '产品类别', '计量单位')" style="width: 150px;" />
                       </el-form-item>
                     </el-col>
                     <el-col :span="15">
                       <el-form-item label="单位:" prop="department" label-width="60px" class="mab">
-                        <el-input v-model="formDataTest['计量单位']" :clearable="true" placeholder="" style="width: 120px;"  />
+                        <el-input v-model="formDataTest['计量单位']" :clearable="true" placeholder="" id="计量单位"  @keydown="ent($event, '产品类别', '计量单位', '成品规格')" style="width: 120px;"  />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-col :span="24">
                     <el-form-item label="成品规格:" prop="department" class="mab">
-                      <el-input v-model="formDataTest['成品规格']" :clearable="true" placeholder="" />
+                      <el-input v-model="formDataTest['成品规格']" :clearable="true" 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="formDataTest['产品备注']" :rows="4" :clearable="true" placeholder=""  />
+                      <el-input type="textarea" v-model="formDataTest['产品备注']" :rows="4" :clearable="true" placeholder="" id="产品备注"  @keydown="ent($event, '成品规格', '产品备注', 'id1')"   />
                     </el-form-item>
                   </el-col>
                 </el-form>
@@ -768,33 +770,33 @@
           </el-dialog>
 
           <!-- 修改印件资料 弹窗 -->
-          <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="'修改印件资料'" height="80%" width="60%" destroy-on-close>
+          <el-dialog v-model="yjdialogFormVisible" :before-close="yjcloseDialog" :title="'修改印件资料'" height="80%" width="50%" destroy-on-close>
             <el-row>
               <el-scrollbar >
-                <el-form :model="yjformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="110px">
+                <el-form :model="yjformDataTest" label-position="right" ref="elFormRef" :rules="rule">
                   <el-row>
-                    <el-form-item label="印件号:" prop="address" class="mab">
-                      <el-input v-model="yjformDataTest['yj_yjno']" clearable placeholder="请输入印件号" style="width: 140px;" />
+                    <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>
                   </el-row>
                   <el-row>
                     <el-form-item label="印件代号:" prop="address" class="mab">
-                      <el-input v-model="yjformDataTest['yj_yjdh']" clearable placeholder="请输入印件代码" style="width: 140px;" />
+                      <el-input v-model="yjformDataTest['yj_yjdh']" clearable placeholder="请输入印件代码" style="width: 140px;"  id="印件代号"  @keydown="ent($event, '印件号', '印件代号', '印件名称')" />
                     </el-form-item>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
                       <el-form-item label="印件名称:" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_yjmc']" clearable placeholder="请输入印件代码" style="width: 100%;" />
+                        <el-input v-model="yjformDataTest['yj_yjmc']" clearable placeholder="请输入印件代码" style="width: 100%;" id="印件名称"  @keydown="ent($event, '印件代号', '印件名称', 'yj_zzdh')" />
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="纸张:" prop="address" class="mab">
+                      <el-form-item label="纸张:" prop="address" class="mab" label-width="70px">
                         <el-row>
-                          <el-input v-model="yjformDataTest['yj_zzdh']" clearable placeholder="" style="width: 140px;" />
-                          <el-input v-model="yjformDataTest['yj_zzmc']" clearable placeholder=""  style="width: 460px;" />
+                          <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-row>
                       </el-form-item>
                     </el-col>
@@ -802,31 +804,31 @@
                   <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;" />
+                        <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-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;" />
+                        <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-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="12">
-                      <el-form-item label="开数:" prop="address" class="mab">
-                        <el-input v-model="yjformDataTest['yj_ks']" clearable placeholder="请输入开数" style="width: 140px;" />
+                      <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-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;"/>
+                        <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-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="请输入备注说明"  />
+                        <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>
                     </el-col>
                   </el-row>
@@ -848,93 +850,93 @@
                 <el-form :model="gyformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
                   <el-row>
                     <el-col :span="5">
-                      <el-form-item label="工序方案:" prop="address">
-                        <el-input v-model="gyformDataTest['方案']" clearable placeholder="" style="width: 90px;" />
+                      <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>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label="印件编号:" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_yjno']" clearable placeholder="" style="width: 90px;" />
+                      <el-form-item label="印件编号:" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['Gy0_yjno']" clearable placeholder="" style="width: 90px;" id="Gy0_yjno"  @keydown="ent($event, '方案', 'Gy0_yjno', 'Gy0_gxh')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label="工序编号:" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_gxh']" clearable placeholder="" style="width: 90px;" />
+                      <el-form-item label="工序编号:" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['Gy0_gxh']" clearable placeholder="" style="width: 90px;" id="Gy0_gxh"  @keydown="ent($event, 'Gy0_yjno', 'Gy0_gxh', 'Gy0_Ks')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label="加工开数" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_Ks']" clearable placeholder="" style="width: 90px;" />
+                      <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-form-item>
                     </el-col>
                     <el-col :span="4">
-                      <el-form-item label="加工联数:" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_ls']" clearable placeholder="" style="width: 90px;" />
+                      <el-form-item label="加工联数:" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['Gy0_ls']" clearable placeholder="" style="width: 90px;" id="Gy0_ls"  @keydown="ent($event, 'Gy0_Ks', 'Gy0_ls', 'gy0_site')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="6">
-                      <el-form-item label="车间名称:" prop="address">
-                        <el-input v-model="gyformDataTest['gy0_site']" clearable placeholder="" style="width: 140px;" />
+                      <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-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item label="工艺名称:" prop="address">
-                        <el-input v-model="gyformDataTest['gy0_gxmc']" clearable placeholder="" style="width: 140px;" />
+                      <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>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="工序名称:" prop="address">
-                        <el-input v-model="gyformDataTest['add_gxmc']" clearable placeholder="" style="width: 100%;" />
+                      <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-form-item>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="6">
-                      <el-form-item label="可用设备:" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_sbbh']" clearable placeholder="" style="width: 140px;" />
+                      <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>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="5">
-                      <el-form-item label="标准损耗:" prop="address">
-                        <el-input v-model="gyformDataTest['Gy0_shdh']" clearable placeholder="" style="width: 90px;" />
+                      <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-form-item>
                     </el-col>
                     <el-col :span="5">
-                      <el-form-item label="基础损耗:" prop="address">
-                        <el-input v-model="gyformDataTest['基础损耗']" clearable placeholder="" style="width: 90px;" />
+                      <el-form-item label="基础损耗:" prop="address" class="mab">
+                        <el-input v-model="gyformDataTest['基础损耗']" clearable placeholder="" style="width: 90px;" id="基础损耗"  @keydown="ent($event, 'Gy0_shdh', '基础损耗', '损耗率')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="6">
-                      <el-form-item label="损耗率" prop="address">
-                        <el-input v-model="gyformDataTest['损耗率']" clearable placeholder="" style="width: 90px;" />
+                      <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-col :span="6">
-                      <el-form-item label="工价系数:" prop="address">
-                        <el-input v-model="gyformDataTest['工价系数']" clearable placeholder="" style="width: 90px;" />
+                      <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-col :span="6">
-                      <el-form-item label="损耗系数:" prop="address">
-                        <el-input v-model="gyformDataTest['损耗系数']" clearable placeholder="" style="width: 90px;" />
+                      <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">
-                        <el-input type="textarea" v-model="gyformDataTest['备注']" rows="4" clearable placeholder="请输入备注说明" />
+                      <el-form-item label="工序备注:" prop="remark" class="mab">
+                        <el-input type="textarea" v-model="gyformDataTest['备注']" rows="4" clearable placeholder="请输入备注说明"  id="备注"  @keydown="ent($event, '损耗系数', '备注', '方案')" />
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -956,54 +958,54 @@
                 <el-form :model="ybformDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px" >
                   <el-row>
                     <el-col :span="8">
-                      <el-form-item label="工序方案:" prop="address">
-                        <el-input v-model="ybformDataTest['YB_方案']" clearable placeholder="" style="width: 100px;" />
+                      <el-form-item label="工序方案:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['YB_方案']" clearable placeholder="" style="width: 100px;" id="YB_方案"  @keydown="ent($event, 'gy0_site', 'YB_方案', 'YB_Yjno')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                      <el-form-item label="印件号:" prop="address">
-                        <el-input v-model="ybformDataTest['YB_Yjno']" clearable placeholder="" style="width: 100px;" />
+                      <el-form-item label="印件号:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['YB_Yjno']" clearable placeholder="" style="width: 100px;"  id="YB_Yjno"  @keydown="ent($event, 'YB_方案', 'YB_Yjno', '工序编号')"/>
                       </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                      <el-form-item label="工序编号:" prop="address">
-                        <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;" />
+                      <el-form-item label="工序编号:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['']" clearable placeholder="" style="width: 100px;"  id="工序编号"  @keydown="ent($event, 'YB_Yjno', '工序编号', '工艺名称')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
 
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="工艺名称:" prop="address">
-                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      <el-form-item label="工艺名称:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="工艺名称"  @keydown="ent($event, '工序编号', '工艺名称', '工序名称')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="工序名称:" prop="address">
-                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      <el-form-item label="工序名称:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="工序名称"  @keydown="ent($event, '工艺名称', '工序名称', '存货编码')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="10 ">
-                      <el-form-item label="存货编码:" prop="address">
-                        <el-input v-model="ybformDataTest['存货编码']" clearable placeholder="" style="width: 140px;" />
+                      <el-form-item label="存货编码:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['存货编码']" clearable placeholder="" style="width: 140px;"  id="存货编码"  @keydown="ent($event, '工序名称', '存货编码', '印版名称')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="存货名称:" prop="address">
-                        <el-input v-model="ybformDataTest['印版名称']" clearable placeholder="" style="width: 100%;" />
+                      <el-form-item label="存货名称:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['印版名称']" clearable placeholder="" style="width: 100%;"  id="印版名称"  @keydown="ent($event, '存货编码', '印版名称', 'gy0_site')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
                   <el-row>
                     <el-col :span="24">
-                      <el-form-item label="印版备注:" prop="address">
-                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;" />
+                      <el-form-item label="印版备注:" prop="address"  class="mab">
+                        <el-input v-model="ybformDataTest['gy0_site']" clearable placeholder="" style="width: 100%;"  id="gy0_site"  @keydown="ent($event, '印版名称', 'gy0_site', 'YB_方案')"/>
                       </el-form-item>
                     </el-col>
                   </el-row>
@@ -1756,33 +1758,39 @@ const _getProduct = async ()=>{
   let params = {}
   params.search = searchInfo.value;
   params.custom_code = _custom_code.value;
-  params.limit = 999;
-  params.page = 1;
-  // params.limit = page.value;
-  // params.page = pageSize.value;
+  params.limit = pageSize.value;
+  params.page = page.value;
   try {
     const WorkListdata = await getProduct(params);
-    tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
-    total.value = tableData.length;//共多少条
+    console.log(WorkListdata.data.data)
+    if(WorkListdata.data.data === []){
+      ElMessage({type: 'warning',message: '未查询到搜索条件'})
+    }else{
+      tableData.splice(0, tableData.length, ...WorkListdata.data.data);//表格
+      console.log(WorkListdata)
+      total.value = WorkListdata.data.total;//共多少条
+    }
   } catch (error) {
     console.error(error);
   }
 }
 
-// ========分页==============
+// 分页
 const page = ref(1)
 const total = ref(0)
 const pageSize = ref(50)
 const handleCurrentChange = (val) => {
   page.value = val;
-  _getProduct();
+  _WorkList_page();
 };
+
 // 修改页面容量 点击多少条/页
 const handleSizeChange = (val) => {
   page.value = 1;
   pageSize.value = val;
-  _getProduct();
+  _WorkList_page();
 };
+
 //=========修改产品基本资料产品表格弹窗========
 let formDataTest = reactive({})
 //弹窗
@@ -1982,7 +1990,6 @@ const ent = (event,id1,id2,id3) => {
 
 //表格文字变色
 const tableDataCellClass = ({row, column, rowIndex, columnIndex}) =>{
-  console.log(column)
   if (column.property === 'gyData' || column.property === 'yjData') {
     return 'plan-usage-low';
   }

+ 66 - 50
src/view/yunyin/renliziyuan/renyuanjibenziliao.vue

@@ -79,11 +79,11 @@
           </div>
 
           <!-- 弹窗 -->
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" width="900px" style="height: 52%;" :title="'修改员工基本资料'" destroy-on-close>
-            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="90px">
-              <div>
-                <div style="float: left; width: 35%;">
-                  <!-- 左侧部分 -->
+          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="'修改员工基本资料'" destroy-on-close>
+            <el-form :model="formDataTest" label-position="right" ref="elFormRef" :rules="rule" label-width="100px">
+              <div class="form-container">
+                <!-- 左侧部分 -->
+                <div class="form-column" style="width: 36%;">
                   <el-form-item label="员工编号:" prop="employeeId" class="mab" >
                     <el-input v-model="formDataTest['员工编号']"  placeholder="" style="width: 190px;"
                               id="员工编号" @keydown="handleKeyDown($event, '员工编号', '在职状态', '性别')" />
@@ -98,24 +98,28 @@
                   </el-form-item>
                   <el-form-item label="部门名称:" prop="gender"  class="mab">
                     <el-input v-model="formDataTest['所在部门']"  placeholder="" style="width: 190px;"
-                              id="所在部门" @keydown="handleKeyDown($event, '所在部门', 'input3', '聘用日期')" />
+                              id="所在部门" @keydown="handleKeyDown($event, '所在部门', '身份证号', '聘用日期')" />
                   </el-form-item>
                   <el-form-item label="入职日期:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['聘用日期']"  placeholder="" style="width: 190px;"
-                              id="聘用日期" @keydown="handleKeyDown($event, '聘用日期', 'input4', '班次类型')" />
+                              id="聘用日期" @keydown="handleKeyDown($event, '聘用日期', '所在部门', '人员类别')" />
                   </el-form-item>
                   <el-form-item label="人员类别:" prop="joinDate" >
-                    <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;">
+                    <el-select v-model="formDataTest['人员类别']" placeholder="" style="width: 190px;" id="人员类别"
+                               @keydown="handleKeyDown($event, '人员类别', '聘用日期', '班次类型')"
+                    >
                       <el-option label="生产" value="生产"></el-option>
                       <el-option label="行政" value="行政"></el-option>
                     </el-select>
                   </el-form-item>
                   <el-form-item label="班次类型:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['班次类型']"  placeholder="" style="width: 190px;"
-                              id="班次类型" @keydown="handleKeyDown($event, '班次类型', '聘用日期', 'U8在职')" />
+                              id="班次类型" @keydown="handleKeyDown($event, '班次类型', '人员类别', '工资表类别')" />
                   </el-form-item>
                   <el-form-item label="工资表类别:" prop="joinDate" class="mab">
-                    <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;">
+                    <el-select v-model="formDataTest['工资表类别']" placeholder="" style="width: 190px;"
+                               id="工资表类别" @keydown="handleKeyDown($event, '工资表类别', '班次类型', 'U8在职')"
+                    >
                       <el-option label="职员级计时工资表" value="职员级计时工资表"></el-option>
                       <el-option label="另发工资" value="另发工资"></el-option>
                       <el-option label="操作级计件工资表" value="操作级计件工资表"></el-option>
@@ -124,11 +128,12 @@
                   </el-form-item>
                   <el-form-item label="U8在职:" prop="joinDate" class="mab">
                     <el-input v-model="formDataTest['U8在职']"   placeholder="" style="width: 190px;"
-                              id="U8在职" @keydown="handleKeyDown($event, 'U8在职', '班次类型', '员工姓名')" />
+                              id="U8在职" @keydown="handleKeyDown($event, 'U8在职', '工资表类别', '员工姓名')" />
                   </el-form-item>
                 </div>
-                <div style="float: left; width: 33%;margin-left: 50px">
-                  <!-- 中间部分 -->
+
+                <!-- 中间部分 -->
+                <div class="form-column">
                   <el-form-item label="员工姓名:" prop="name" class="mab" label-width="100">
                     <el-input v-model="formDataTest['员工姓名']"  placeholder="" style="width: 190px;"
                               id="员工姓名" @keydown="handleKeyDown($event, '员工姓名', 'U8在职', '出生日期')" />
@@ -151,10 +156,12 @@
                   </el-form-item>
                   <el-form-item label="扣减司龄:" prop="departmentId" class="mab" label-width="100">
                     <el-input v-model="formDataTest['扣减司龄']" placeholder="" style="width: 190px;"
-                              id="扣减司龄" @keydown="handleKeyDown($event, '扣减司龄', '转正日期', '薪酬核算分组')" />
+                              id="扣减司龄" @keydown="handleKeyDown($event, '扣减司龄', '转正日期', '人员性质')" />
                   </el-form-item>
                   <el-form-item label="人员性质:" prop="departmentId" class="mab" label-width="100">
-                    <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;">
+                    <el-select v-model="formDataTest['人员性质']" placeholder="" style="width: 190px;"
+                               id="人员性质" @keydown="handleKeyDown($event, '人员性质', '扣减司龄', '薪酬核算分组')"
+                    >
                       <el-option label="退休返聘" value="退休返聘"></el-option>
                       <el-option label="劳动合同工" value="劳动合同工"></el-option>
                       <el-option label="借用" value="借用"></el-option>
@@ -164,7 +171,7 @@
                   </el-form-item>
                   <el-form-item label="工资核算分组:" prop="joinDate" class="mab" label-width="100" >
                     <el-input v-model="formDataTest['薪酬核算分组']"  placeholder="" style="width: 190px;"
-                              id="薪酬核算分组" @keydown="handleKeyDown($event, '薪酬核算分组', '扣减司龄', '在职状态')" />
+                              id="薪酬核算分组" @keydown="handleKeyDown($event, '薪酬核算分组', '人员性质', '在职状态')" />
                   </el-form-item>
                   <el-form-item label="在职状态:" prop="joinDate" class="mab" label-width="100"  >
                     <el-input v-model="formDataTest['在职状态']" placeholder="" style="width: 190px;"
@@ -172,26 +179,13 @@
                   </el-form-item>
                 </div>
               </div>
-<!--                <div style="float: left; text-align: center; margin-left: 50px;">-->
-<!--                  &lt;!&ndash; 右侧图片 &ndash;&gt;-->
-<!--                  <div style="height: 200px; width: 160px; background-color: #eee; position: relative;">-->
-<!--                    &lt;!&ndash; 上传按钮 &ndash;&gt;-->
-<!--                    <input type="file" style="position: absolute; top: 0; left: 0; width: 100%; height: 100%; opacity: 0; cursor: pointer;"-->
-<!--                           @change="handleFileUpload">-->
-<!--                    &lt;!&ndash; 显示上传的图片 &ndash;&gt;-->
-<!--                    <img v-if="formDataTest.imageUrl" :src="formDataTest.imageUrl" alt="Uploaded Image" style="max-width: 100%; max-height: 100%;">-->
-<!--                  </div>-->
-<!--                </div>-->
 
-<!--              </div>-->
             </el-form>
             <!-- 添加编辑页面取消确定按钮 -->
-<!--            <template #footer>-->
-              <div  style="text-align: right; position: absolute; bottom: 20px; right: 20px; width: 90%;">
+              <div  style="text-align: right; ">
                 <el-button @click="closeDialog">取消</el-button>
                 <el-button type="primary"  @click="enterDialog">确定</el-button>
               </div>
-<!--            </template>-->
           </el-dialog>
         </el-main>
       </layout-content>
@@ -385,11 +379,11 @@ const handleSizeChange = (val) => {
 // 弹窗控制标记
 const dialogFormVisible = ref(false)
 //修改
-let formDataTest = reactive({})
+const formDataTest = ref({})
 const updateCompanyFunc = async (row) => {
   let code = row['员工编号'];
   const getStaffInfo_data = await getStaffInfo({code:code});
-  formDataTest = getStaffInfo_data.data;
+  formDataTest.value = getStaffInfo_data.data;
   dialogFormVisible.value = true;
 };
 
@@ -403,24 +397,24 @@ const enterDialog = async () => {
 //修改员工资料
 const _ygjbzledit = async ()=>{
   const formattedData = {
-    '员工编号': formDataTest['员工编号'],
-    '员工姓名': formDataTest['员工姓名'],
-    '性别': formDataTest['性别'],
-    '出生日期': formDataTest['出生日期'],
-    '身份证号': formDataTest['身份证号'],
-    '职称职务': formDataTest['职称职务'],
-    '所在部门': formDataTest['所在部门'],
-    '聘用日期': formDataTest['聘用日期'],
-    '转正日期': formDataTest['转正日期'],
-    '扣减司龄': formDataTest['扣减司龄'] ? formDataTest['扣减司龄'] : '0',
-    '人员类别': formDataTest['人员类别'],
-    '人员性质': formDataTest['人员性质'],
-    '班次类型': formDataTest['班次类型'],
-    '薪酬核算分组': formDataTest['薪酬核算分组'],
-    '工资表类别': formDataTest['工资表类别'],
-    'U8在职': formDataTest['U8在职'],
-    '在职状态': formDataTest['在职状态'],
-    '部门编码': formDataTest['部门编码'],
+    '员工编号': formDataTest.value['员工编号'],
+    '员工姓名': formDataTest.value['员工姓名'],
+    '性别': formDataTest.value['性别'],
+    '出生日期': formDataTest.value['出生日期'],
+    '身份证号': formDataTest.value['身份证号'],
+    '职称职务': formDataTest.value['职称职务'],
+    '所在部门': formDataTest.value['所在部门'],
+    '聘用日期': formDataTest.value['聘用日期'],
+    '转正日期': formDataTest.value['转正日期'],
+    '扣减司龄': formDataTest.value['扣减司龄'] ? formDataTest.value['扣减司龄'] : '0',
+    '人员类别': formDataTest.value['人员类别'],
+    '人员性质': formDataTest.value['人员性质'],
+    '班次类型': formDataTest.value['班次类型'],
+    '薪酬核算分组': formDataTest.value['薪酬核算分组'],
+    '工资表类别': formDataTest.value['工资表类别'],
+    'U8在职': formDataTest.value['U8在职'],
+    '在职状态': formDataTest.value['在职状态'],
+    '部门编码': formDataTest.value['部门编码'],
   };
   try {
     const ygjbzledit_eddt = await ygjbzledit(formattedData);
@@ -439,6 +433,28 @@ const _ygjbzledit = async ()=>{
 </script>
 
 <style scoped>
+.form-container {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.form-column {
+  /*flex: 1;*/
+  margin-right: 15px; /* 调整列之间的间距 */
+}
+
+/* 左侧输入框宽度调整 */
+.form-column .el-form-item .el-input {
+  width: 150px; /* 调整左侧输入框的宽度 */
+}
+
+/* 媒体查询,根据需要调整断点 */
+@media screen and (max-width: 768px) {
+  .form-column {
+    flex: 1 0 100%; /* 在小屏幕下变成单列布局 */
+    margin-right: 0;
+  }
+}
 /*:deep(.el-table td .cell) {*/
 /*  line-height: 30px !important;*/
 /*}*/

+ 359 - 181
src/view/yunyin/shengchanguanli/gongdanshengchan.vue

@@ -6,23 +6,32 @@
           <!--          按钮部分-->
           <el-form ref="elSearchFormRef"  :model="searchInfo" class="demo-form-inline" :rules="searchRule" @keyup.enter="onSubmit">
             <el-form-item>
-              <!--按钮-->
-              <el-input v-model="searchInfo" placeholder="搜索工单编号" clearable style="width: 180px;"></el-input>
+              <!--按钮 clearable-->
+              <el-input v-model="searchInfo" placeholder="搜索工单编号"  style="width: 180px;"></el-input>
               <el-button type="primary" icon="search"  @click="onSubmit"></el-button>
+              <el-button type="primary" icon="edit" @click="onStatusClick" class="bt">工单状态设置</el-button>
+
               <div v-if="treeType === 'customTree'">
-                <el-button type="primary" icon="edit" @click="onStatusClick" class="bt">状态设置</el-button>
                 <el-button type="primary" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
+                <el-button type="primary" icon="edit" disabled @click="pd_yysjcsonClick" class="bt">引用实际参数</el-button>
+                <el-button type="primary" icon="edit" disabled @click="pd_pccswhonClick" class="bt">排程参数维护</el-button>
+                <el-button type="primary" icon="edit" disabled @click="pd_pdcsfzonClick" class="bt">排单参数复制</el-button>
+                <el-button type="primary" icon="edit" disabled @click="pd_editscjhonClick" class="bt">编辑生产计划</el-button>
               </div>
+
               <div v-else>
                 <el-button type="primary" icon="edit"  @click="onjrpcClick" class="bt">加入排产</el-button>
                 <el-button type="primary" icon="edit"  @click="onztwgClick" class="bt">暂停排产</el-button>
                 <el-button type="primary" icon="edit"  @click="ongxwgClick" class="bt">工序完工</el-button>
-                <!--                <el-button type="primary" icon="edit" disabled @click="onjztzClick" style="margin: 5px">机组调整</el-button>-->
-                <!--                <el-button type="primary" icon="edit" disabled @click="oncjsbpcClick" style="margin: 5px">车间设备排程</el-button>-->
+                <el-button type="primary" icon="edit" @click="ongxztgzClick" class="bt">工序状态更正</el-button>
+                <el-button type="primary" icon="edit" disabled @click="onjztzClick" style="margin: 5px">机组调整</el-button>
+                <el-button type="primary" icon="edit"  @click="oncjsbpcClick" style="margin: 5px">车间设备排程</el-button>
               </div>
-              <!--                <el-button type="primary" icon="edit" disabled @click="onprintClick" style="margin: 5px">工单打印</el-button>-->
-              <!--                <el-button type="primary" icon="edit" disabled @click="ongxclhcClick" style="margin: 5px">工序产量核查</el-button>-->
-              <!--                <el-button type="primary" icon="edit" disabled @click="onlcdlistClick" style="margin: 5px">流程单查询</el-button>-->
+
+              <el-button type="primary" icon="edit" disabled @click="pd_gdprintonClick" class="bt">工单打印</el-button>
+              <el-button type="primary" icon="edit" disabled @click="pd_gxclhconClick" class="bt">工序产量核查</el-button>
+              <el-button type="primary" icon="edit" disabled @click="pd_lcdlistonClick" class="bt">流程单查询</el-button>
+
             </el-form-item>
           </el-form>
 
@@ -52,118 +61,100 @@
           <el-dialog v-model="gxztgzzlist" title="工序状态更正" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
             <el-button type="" @click="gxztgzzCancel">退出</el-button>
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; display: flex; align-items: center;">
-              <el-form-item label="关键字 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
-                <el-input v-model="gxztgzzformData['gdbh']" @keyup.enter="gxztgzzgetProductValue" placeholder="" style="width: 500px;"/>
+              <el-form-item label="工单编号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
+                <el-input v-model="gxztgzzformData['gdbh']" @keyup.enter="gxztgzzgetProductValue" placeholder="" style="width: 200px;"/>
               </el-form-item>
             </div>
-            <el-table ref="multipleTable"
+            <el-table ref="paichengRef"
                       :show-overflow-tooltip="true"
                       :row-style="{ height: '0px' }"
                       :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
                       :header-cell-style="{ padding: '0px' }"
-                      style="width: 100%;height: 710px" border tooltip-effect="dark"
-                      :data="gxztgzztableData" row-key="ID" @selection-change="handleSelectionChange">
-              <el-table-column v-slot="scope" align="left" label=印件及工序 width="600" >
-                <el-input disabled  v-model="scope.row.印件及工序" :clearable="false"/>
-              </el-table-column>
-              <el-table-column v-slot="scope" align="left" label=计划产量/已完成 width="590" >
-                <el-input disabled  v-model="scope.row['计划产量/已完成']" :clearable="false"/>
-              </el-table-column>
-              <el-table-column v-slot="scope" align="left" label=完成率 width="240" >
-                <el-input disabled  v-model="scope.row.完成率" :clearable="false"/>
-              </el-table-column>
-              <el-table-column v-slot="scope" align="left" label=完工时间 width="210" >
-                <el-input disabled  v-model="scope.row.完工时间" :clearable="false"/>
-              </el-table-column>
-              <el-table-column v-slot="scope" align="left" label=设备代号 width="240" >
-                <el-input disabled  v-model="scope.row.设备代号" :clearable="false"/>
-              </el-table-column>
+                      style="width: 100%;height: 74vh" border tooltip-effect="dark"
+                      :data="gxztgzztableData" row-key="ID"
+                      :cell-class-name="gxztgzzCellClass">
+              <template v-for="(item, idx) in gxztgzztableColumns">
+                <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
+<!--                  <div v-if="['完工时间'].includes(item.prop)">-->
+<!--                    <el-input v-model="row[item.prop]"-->
+<!--                              :id="`input${idx}${$index}`" @keyup="gxztgzz_handleKeyDown($event, idx, $index, item.prop)"/>-->
+<!--                  </div>-->
+                  <div v-if="['完工时间'].includes(item.prop)">
+                    <el-date-picker
+                        v-model="row[item.prop]"
+                        type="datetime"
+
+                        :id="`datepicker${idx}${$index}`"
+                        placeholder="选择日期和时间">
+                    </el-date-picker>
+                  </div>
+                  <div v-else>{{ row[item.prop] }}</div>
+                </el-table-column>
+              </template>
             </el-table>
           </el-dialog>
+
           <!--加入排产【弹窗】-->
           <!--暂停完工【弹窗】-->
           <!--暂停完工【弹窗】-->
           <!--机组调整【弹窗】-->
           <!--车间设备排程【弹窗】-->
           <el-dialog v-model="cjsbpclist" title="车间设备排程" style="width: 100%;height: 100%;margin: 0px;padding: 0px">
-            <el-button type="" icon="edit" @click="oneditpcClick">更新排程</el-button>
             <el-button type="" @click="cjsbpcCancel">退出</el-button>
-
             <div style="width: 100%; height: 60px; padding: 0px; margin: 10px 0px 0px 0px; ">
               <div style="width: 100%; height: 60px; padding: 0px;  display: flex; align-items: center;">
                 <el-form-item label="设备代号 :" prop="currentProcess" style="margin-right: 20px; padding: 0px">
                   <el-input v-model="cjsbpcformData['sbdh']" disabled placeholder="" />
                 </el-form-item>
                 <el-form-item label="班次选择:" prop="originalName" style="margin-left: 20px;">
-                  <el-select v-model="cjsbpcformData.banci" placeholder="请选择" allow-create filterable>
+                  <el-select v-model="cjsbpcformData.banci" placeholder="请选择" allow-create filterable @change="setBanci">
                     <el-option
                         v-for="(option, index) in cjsbpcformData.bancis"
                         :key="index"
-                        :label="option.label"
+                        :label="option.value"
                         :value="option.value"
-                    />
+                    >
+                      {{option.label}}
+                    </el-option>
                   </el-select>
                 </el-form-item>
                 <el-form-item label="" prop="isBanciSelected" style="margin-left: 20px;">
                   <el-checkbox v-model="cjsbpcformData.isBanciSelected">所有班次</el-checkbox>
                 </el-form-item>
 
+                <el-form-item label="" prop="" style="margin-left: 25px;">
+<!--                <el-button type="" icon="edit"  @click="oneditpcClick">更新排程</el-button>-->
+                <el-button type="" icon="edit" disabled @click="oneditpcClick">更新排程</el-button>
+                </el-form-item>
               </div>
+
               <el-table ref="paichengRef"
-                        :show-overflow-tooltip="true"
-                        :row-style="{ height: '0px' }"
-                        :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
-                        :header-cell-style="{ padding: '0px' }"
-                        style="width: 100%;height: 74vh" border tooltip-effect="dark"
-                        :data="paichengData" row-key="ID" >
-                <!--                  <el-table-column v-slot="scope" align="left" label=优先次序 width="120" >-->
-                <!--                    <el-input disabled  v-model="scope.row.优先次序" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=工单编号 width="200" >-->
-                <!--                    <el-input disabled  v-model="scope.row.工单编号" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=印件名称 width="220" >-->
-                <!--                    <el-input disabled  v-model="scope.row.印件名称" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=接货数 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.接货数" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=小时产能 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.小时产能" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=产能系数 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.产能系数" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=生产工时 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.生产工时" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=生产工时 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.生产工时" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=辅助工时 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.辅助工时" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=班次安排 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.班次安排" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=排单备注 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.排单备注" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=最早开工时间 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.最早开工时间" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=计划开工时间 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.计划开工时间" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=计划完工时间 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.计划完工时间" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=销售订单号 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.销售订单号" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
-                <!--                  <el-table-column v-slot="scope" align="left" label=印件/工序 width="110" >-->
-                <!--                    <el-input disabled  v-model="scope.row.印件/工序" :clearable="false"/>-->
-                <!--                  </el-table-column>-->
+                :show-overflow-tooltip="true"
+                :row-style="{ height: '0px' }"
+                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '0px' }"
+                :header-cell-style="{ padding: '0px' }"
+                style="width: 100%;height: 74vh" border tooltip-effect="dark"
+                highlight-current-row="true"
+                @row-click="cjpc_tableRowClick"
+                :data="paichengData" row-key="ID"
+              >
+                <template v-for="(item, idx) in paichengColumns">
+                  <el-table-column #default="{ row, column, $index }" align="left" :label="item.label" :width="item.width" >
+                    <div v-if="['优先次序', '生产工时', '辅助工时', '班次安排', '排单备注','最早开工时间', '计划开工时间'].includes(item.prop)">
+                      <el-input v-model="row[item.prop]" :clearable="false"
+                        :id="`input${idx}${$index}`"
+                        @keyup="handleKeyDown($event, idx, $index, item.prop)"
+                      />
+<!--                      <el-date-picker v-model="row[item.prop]" v-if="['最早开工时间', '计划开工时间'].includes(item.prop)" type="datetime" :clearable="false"-->
+<!--                        :id="`input${idx}${$index}`"-->
+<!--                        @keyup="handleKeyDown($event, idx, $index , item.prop)"-->
+<!--                      />-->
+                    </div>
+                    <div v-else>
+                      {{ row[item.prop] }}
+                    </div>
+                  </el-table-column>
+                </template>
               </el-table>
             </div>
 
@@ -183,9 +174,9 @@
                 </el-form-item>
               </div>
             </div>
-
           </el-dialog>
 
+
         </div>
       </layout-header>
 
@@ -609,11 +600,14 @@ const workbenchdata = async () => {
 workbenchdata();
 //全局获取工单编号
 const _Gd_gdbh = ref(null)
-//点击表格 通过【工单编号】获取下方表格数据
+//点击表格 通过上方表格【工单编号】获取下方表格数据
+const chejianRowClick = async (row) => {
+  _Gd_gdbh.value = row.工单编号;
+  console.log(_Gd_gdbh.value);
+}
 const gdtableRowClick = async (row) => {
   _Gd_gdbh.value = row.工单编号;
   console.log(_Gd_gdbh.value);
-
   if (currentNode.value == "计划中") {
     if(row['statusColumn'] === "*"){
       gytableData.value = [];
@@ -676,32 +670,56 @@ const handleNodeClick = async (node) => {
 const searchInfo = ref('');
 // 提交搜索
 const onSubmit = () => {
-  console.log(searchInfo.value)
-  console.log(currentNode.value)
-  console.log(_machine.value)
-  if(searchInfo.value === '' || searchInfo.value === null ){
-    ElMessage({type: 'warning',message: '请选择具体的工单后,再操作此功能'})
+  if (!searchInfo.value || !_machine.value) {
+    ElMessage({ type: 'warning', message: '请输入工单编号和具体条件' });
     return false;
   }
-  if(currentNode.value === '计划中' || currentNode.value === '已完工'){
-    _Project();
+  const isPureNumber = /^\d+$/.test(searchInfo.value);
+  if (!isPureNumber) {
+    ElMessage({ type: 'warning', message: '请输入正确的工单编号' });
     return false;
   }
-  if(currentNode.value === '排程中' || currentNode.value === '制程中'){
+  if (currentNode.value === '计划中' || currentNode.value === '已完工') {
+    _Project();
+  } else if (currentNode.value === '排程中' || currentNode.value === '制程中') {
     _Schedule();
-    return false;
-  }
-  if(_machine.value){
-    console.log(2131211111111111111111111111111)
-    _MachineWorkOrderList();
+  } else {
+    ElMessage({ type: 'warning', message: '查询不到具体条件的工单' });
   }
 };
+// const onSubmit = () => {
+//   const isPureNumber = /^[\d]+$/.test(searchInfo.value);
+//   if (isPureNumber) {
+//     if(_machine.value){
+//       _MachineWorkOrderList();
+//     }else if(_machine.value === '' || _machine.value === null){
+//       ElMessage({type: 'warning',message: '查询不到具体条件的工单'})
+//       return false;
+//     }else{
+//       {
+//         if(searchInfo.value === '' || searchInfo.value === null ){
+//           ElMessage({type: 'warning',message: '查询不到具体条件的工单'})
+//           return false;
+//         }
+//         if(currentNode.value === '计划中' || currentNode.value === '已完工'){
+//           _Project();
+//           return false;
+//         }
+//         if(currentNode.value === '排程中' || currentNode.value === '制程中'){
+//           _Schedule();
+//           return false;
+//         }
+//       }
+//     }
+//   } else {
+//     ElMessage({type: 'warning',message: '请输入正确的工单编号'})
+//   }
+// };
 // 搜索计划中、已完工一条工单
 const _Project = async () => {
   const status = currentNode.value;
   const search = searchInfo.value;
   const Project_search = await Project({status:status,search:search});
-  console.log(Project_search);
   if(Project_search.msg === '成功'){
     tableData.value = Project_search.data;
   }else{
@@ -713,10 +731,7 @@ const _Project = async () => {
 const _Schedule = async () => {
   const status = currentNode.value;
   const search = searchInfo.value;
-  console.log(status)
-  console.log(search)
   const Schedule_search = await Schedule({status:status,search:search});
-  console.log(Schedule_search);
   if(Schedule_search.msg === '成功'){
     chejianData.value = Schedule_search.data;
   }else{
@@ -726,36 +741,50 @@ const _Schedule = async () => {
 };
 //机台搜索一条工单
 const _MachineWorkOrderList = async () => {
-  console.log(123)
-  const status = searchInfo.value;
-  const search = _machine.value;
-
-  const MachineWorkOrderList_search = await MachineWorkOrderList({status:status,search:search});
-  console.log(MachineWorkOrderList_search);
-  if(MachineWorkOrderList_search.code === 0){
-    tableData.value = MachineWorkOrderList_search.data;
-  }else{
+  let params = {}
+  params.search = searchInfo.value;
+  params.machine = _machine.value;
+  const MachineWorkOrderList_search = await MachineWorkOrderList(params);
+  if(MachineWorkOrderList_search.msg === ''){
     ElMessage({type: 'warning',message: '查不到具体条件的工单'})
     return false;
+  }else{
+    chejianfuData.value = MachineWorkOrderList_search.data['制程'];
+    chejianData.value = MachineWorkOrderList_search.data['排程'];
   }
 };
 
-// const paichengForm = ref([])
-// const paichengData = ref([
-//   {
-//     优先次序: 1, 工单编号: 1000, 印件名称: 'test',接货数: 111,
-//     小时产能: 1, 产能系数: 1.5, 生产工时: 333, 辅助工时: 222,
-//     班次安排: '1111', 排单备注: '备注备注', 最早开工时间: '2023-01-01 08:08:08',
-//     计划开工时间: '2023-01-01 08:08:08', 计划完工时间: '2023-01-01 08:08:08',
-//     销售订单号: '3335555', '印件/工序': '321312',
-//   }
-// ])
-
-
 // =========== 【工序状态更正】 ===========
+const gxztgzztableColumns = ref(
+    [
+      { label: '印件及工序', prop: '印件及工序', width: '600' },
+      { label: '计划产量/已完成', prop:['计划产量/已完成'], width: '500' },
+      { label: '完成率', prop: '完成率', width: '240' },
+      { label: '完工时间', prop: '完工时间', width: '300' },
+      { label: '设备代号', prop: '设备代号', width: '240' },
+    ]
+)
+const gxztgzz_handleKeyDown = (event, x, y, prop) => {
+  const currentElement = document.getElementById(`input${x}${y}`);
+  if (currentElement === null && currentElement === undefined) return
+  switch (event.keyCode) {
+    case 13: // Enter
+    case 40: // 向下箭头
+      if (y < gxztgzztableData.value.length )
+        document.getElementById(`input${x}${y + 1}`).focus();
+      break;
+    case 38: // 向上箭头
+      if ( y > 0) {
+        document.getElementById(`input${x}${y - 1}`).focus();
+      }
+      break;
+    default:
+      break;
+  }
+}
+const gxztgzztableData = ref([]);
 const gxztgzzlist = ref(false);
 const gxztgzzformData = reactive({gdbh: '',});
-const gxztgzztableData = ref([]);
 //工序状态更正【按钮】
 const ongxztgzClick = () => {
   if(_Gd_gdbh.value == null){
@@ -785,51 +814,62 @@ const gxztgzzCancel = () => {
 
 //加入排产【按钮】
 const onjrpcClick = async () => {
+  searchInfo.value = '';
   if(_PC_gdbh.value == null || _PC_gdbh.value == ''){
     ElMessage({type: 'warning',message: '请选择排程中工单'})
   }else{
-    let params = {}
-    params.workOrder = _PC_gdbh.value;
-    params.machine = _machine.value;
-    params.printCode = 1;
-    params.processCode = 1;
-    const ProductionSchedulingAdd_add = await ProductionSchedulingAdd(params);
-    if (ProductionSchedulingAdd_add .code === 0) {
-      const  pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
-      chejianfuData.value = pc_zc_table.data['制程'];
-      chejianData.value = pc_zc_table.data['"排程"'];
-      ElMessage({type: 'success',message: '加入排产 更新成功'});
-    } else {
-      ElMessage({ type: 'error',message: '更新失败'})
+    console.log(_PC_xscn.value)
+    if (_PC_xscn.value === '' || _PC_xscn.value === null || _PC_xscn.value === '0') {
+      ElMessage({type: 'warning',message: '选择中小时产量为 0'})
+      return false;
+    }else{
+      let params = {}
+      params.workOrder = _PC_gdbh.value;
+      params.machine = _machine.value;
+      params.printCode = _PC_yjno.value;
+      params.processCode =  _PC_gxh.value;
+      console.log(params)
+      const ProductionSchedulingAdd_add = await ProductionSchedulingAdd(params);
+      if (ProductionSchedulingAdd_add.code === 0) {
+        const  pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
+        chejianData.value = pc_zc_table.data['排程'];
+        chejianfuData.value = pc_zc_table.data['制程'];
+        ElMessage({type: 'success',message: '加入排产 更新成功'});
+      } else {
+        ElMessage({ type: 'error',message: '更新失败'})
+      }
     }
+
   }
 };
-
 //暂停排产【按钮】
 const onztwgClick = async () => {
+  searchInfo.value = '';
   if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
     ElMessage({type: 'warning', message: '请选择制程中工单'})
   }else{
-    let params = {}
-    params.workOrder = _ZC_gdbh.value;
-    params.machine = _machine.value;
-    params.printCode = 1;
-    params.processCode = 1;
-    const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
-    console.log(ProductionSchedulingAdd_stop)
-    if (ProductionSchedulingAdd_stop .code === 0) {
-      const pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
-      chejianData.value = pc_zc_table.data['"排程"'];
-      chejianfuData.value = pc_zc_table.data['制程'];
-      ElMessage({type: 'success',message: '暂停排产 更新成功'});
-    } else {
-      ElMessage({ type: 'error',message: '更新失败'})
-    }
+      let params = {}
+      params.workOrder = _ZC_gdbh.value;
+      params.machine = _machine.value;
+      params.printCode = _ZC_yjno.value;
+      params.processCode =  _ZC_gxh.value;
+      console.log(params)
+      const ProductionSchedulingAdd_stop = await ProductionSchedulingPause(params);
+      if (ProductionSchedulingAdd_stop.code === 0) {
+        const pc_zc_table = await MachineWorkOrderList({machine:_machine.value});
+        console.log(pc_zc_table)
+        chejianData.value = pc_zc_table.data['排程'];
+        chejianfuData.value = pc_zc_table.data['制程'];
+        ElMessage({type: 'success',message: '暂停排产 更新成功'});
+      } else {
+        ElMessage({ type: 'error',message: '更新失败'})
+      }
   }
 };
 
 //工序完工【按钮】
 const ongxwgClick = async () => {
+  searchInfo.value = '';
   if(_ZC_gdbh.value == null || _ZC_gdbh.value == ''){
     onstatuslist.value = false;
     ElMessage({
@@ -839,11 +879,11 @@ const ongxwgClick = async () => {
   }else{
     let params = {}
     params.workOrder = _ZC_gdbh.value;
-    params.processCode = _gxh.value;
+    params.processCode = _ZC_gxh.value;
     const complete_get = await complete(params);
-    if (complete_get .code === 0) {
+    if (complete_get.code === 0) {
       const  pc_zc_table = await MachineWorkOrderList({ machine:_machine.value});
-      chejianData.value = pc_zc_table.data['"排程"'];
+      // chejianData.value = pc_zc_table.data['排程'];
       chejianfuData.value = pc_zc_table.data['制程'];
       ElMessage({type: 'success',message: '工序完工 更新成功'})
     } else {
@@ -852,20 +892,35 @@ const ongxwgClick = async () => {
   }
 };
 //加入排程【上面到下面】
+const _PC_gxh = ref(null)
+const _PC_yjno = ref(null)
 const _PC_gdbh = ref(null)
+const _PC_xscn = ref(null)
 const PC_handleChange = (arr) => {
+  let gxh = arr.map((val) => val['gxh']).join(",");
+  let yjno = arr.map((val) => val['yjno']).join(",");
   let str = arr.map((val) => val['工单编号']).join(",");
+  let xscn = arr.map((val) => val['小时产能']).join(",");
+  _PC_gxh.value = gxh;
+  _PC_yjno.value = yjno;
   _PC_gdbh.value = str;
+  _PC_xscn.value = xscn;
 }
 //加入制程【下面到上面】
+const _ZC_gxh = ref(null)
+const _ZC_yjno = ref(null)
 const _ZC_gdbh = ref(null)
-const _gxh = ref(null)
+const _ZC_xscn = ref(null)
 const ZP_handleChange = (arr) => {
   console.log(arr)
-  let str = arr.map((val) => val['工单编号']).join(",");
   let gxh = arr.map((val) => val['gxh']).join(",");
+  let yjno = arr.map((val) => val['yjno']).join(",");
+  let str = arr.map((val) => val['工单编号']).join(",");
+  let xscn = arr.map((val) => val['小时产能']).join(",");
+  _ZC_gxh.value = gxh;
+  _ZC_yjno.value = yjno;
   _ZC_gdbh.value = str;
-  _gxh.value = gxh;
+  _ZC_xscn.value = xscn;
 }
 
 //机组调整【按钮】
@@ -899,6 +954,61 @@ const gxclhcProductValue = () => {
   _ongetProductclick();
 }
 
+const paichengColumns = ref(
+    [
+      { label: '优先次序', prop: '优先次序', width: '120' },
+      { label: '工单编号', prop: '工单编号', width: '200' },
+      { label: '印件名称', prop: '印件名称', width: '220' },
+      { label: '接货数', prop: '接货数', width: '110' },
+      { label: '小时产能', prop: '小时产能', width: '110' },
+      { label: '生产工时', prop: '生产工时', width: '110' },
+      { label: '辅助工时', prop: '辅助工时', width: '110' },
+      { label: '班次安排', prop: '班次安排', width: '110' },
+      { label: '排单备注', prop: '排单备注', width: '110' },
+      { label: '最早开工时间', prop: '最早开工时间', width: '200' },
+      { label: '计划开工时间', prop: '计划开工时间', width: '200' },
+      { label: '计划完工时间', prop: '计划完工时间', width: '200' },
+      { label: '销售订单号', prop: '销售订单号', width: '120' },
+      { label: '印件/工序', prop: '印件/工序', width: '120' },
+    ]
+)
+
+const handleKeyDown = (event, x, y, prop) => {
+  const currentElement = document.getElementById(`input${x}${y}`);
+  if (currentElement === null && currentElement === undefined) return
+  let move = 0
+  switch (event.keyCode) {
+    case 13: // Enter
+    case 40: // 向下箭头
+        if (y < paichengData.value.length ){
+          document.getElementById(`input${x}${y + 1}`).focus();
+        }
+      break;
+    case 38: // 向上箭头
+      if ( y > 0) {
+        document.getElementById(`input${x}${y - 1}`).focus();
+      }
+      break;
+    case 39: // 向左箭头
+      if ( x === 0) {
+        move = x + 5
+      } else if (x >= 5 && x <10) {
+        move = x + 1
+      }
+      document.getElementById(`input${move}${y}`).focus();
+      break;
+    case 37: // 向右箭头
+      if ( x === 5) {
+        move = x -  5
+      } else if (x >= 5 && x <=10) {
+        move = x - 1
+      }
+      document.getElementById(`input${move}${y}`).focus();
+      break;
+    default:
+      break;
+  }
+}
 
 
 //工序产量核查【退出】
@@ -917,9 +1027,9 @@ const onlcdlistClick = async () => {
 //状态设置【按钮】
 const onstatuslist = ref(false);
 const statusformData = reactive({gdbh: '',});
-const status = ref('计划中'); // 默认选择在产
+const status = ref('计划中'); // 默认选择
 const onStatusClick = () => {
-  if(_Gd_gdbh.value == null){
+  if(_Gd_gdbh.value === null || _Gd_gdbh.value === ''){
     onstatuslist.value = false;
     ElMessage({
       type: 'warning',
@@ -1000,6 +1110,7 @@ const multipleSelection = ref([])
 // 多选
 const handleSelectionChange = (val) => {
   multipleSelection.value = val
+  console.log(multipleSelection.value)
 }
 
 
@@ -1024,6 +1135,9 @@ const enterDialog = async () => {
 const closeDialog = () => {dialogFormVisible.value = false}
 
 
+
+
+//=============车间设备排程================
 const cjsbpclist = ref(false);
 const cjsbpcformData = reactive({
   //设备代号
@@ -1034,37 +1148,58 @@ const cjsbpcformData = reactive({
   banci: '',
   isBanciSelected: false,
 });
-
-//=============车间设备排程================
 //车间设备排程【按钮】
 const oncjsbpcClick = () => {
-  cjsbpcformData['sbdh'] = 'WY01#';
+  cjsbpcformData['sbdh'] = _machine.value;
   _EquipmentSchedulingdata();
   _ScheduleSelectiondata();
   cjsbpclist.value = true;
 };
-//班次选择列表
+//调用班次选择列表接口
 const _ScheduleSelectiondata = async ()=>{
   try {
     const ScheduleSelectiondata = await ScheduleSelection();
     // 清空之前的数据
     cjsbpcformData.bancis = [];
-
     // 循环遍历数组并将每个班次的detail添加到bancis数组中
     for (const option of ScheduleSelectiondata.data) {
       cjsbpcformData.bancis.push({ label: option.detail, value: option.detail.split('||')[0], rename:option.detail});
     }
-    console.log("赋值后的数据:", cjsbpcformData.bancis);
+    //班次列表数据
+    // console.log("赋值后的数据:", cjsbpcformData.bancis);
   } catch (error) {
     console.error(error);
   }
 }
 //车间设备排程->数据展示
+const paichengData = ref([])
+//点击车间排程行
+const _bcxz_val = ref(null)
+
+//点击表格行的时候触发的方法
+const cjpc_tableRowClick = (row) => {
+  _bcxz_val.value = row; // 保存点击的行数据
+}
+//班次选择列表下拉框
+const setBanci = (v) => {
+  if(cjsbpcformData['isBanciSelected'] === true){
+    console.log("已选择所有班次")
+    paichengData.value.map( item => item.班次安排 = v)
+  }else{
+    console.log("未选择所有班次")
+    if (_bcxz_val.value) {
+      _bcxz_val.value['班次安排'] = v;
+    }
+  }
+}
 const _EquipmentSchedulingdata = async ()=>{
-  let machine = 'WY01#';
+  // let machine = 'WY01#';
+  let machine = _machine.value;
   try {
     const EquipmentSchedulingdata = await EquipmentScheduling({machine:machine});
-    console.log(EquipmentSchedulingdata)
+    if (EquipmentSchedulingdata.code === 0) {
+      paichengData.value = EquipmentSchedulingdata.data
+    }
   } catch (error) {
     console.error(error);
   }
@@ -1073,9 +1208,25 @@ const _EquipmentSchedulingdata = async ()=>{
 
 
 //车间设备排程【更新排程】
-const oneditpcClick = () => {
-  console.log("更新排程")
-  cjsbpclist.value = true;
+const oneditpcClick = async () => {
+  // console.log(paichengData)
+  const rawValueArray = paichengData._rawValue;
+  const formattedData = rawValueArray.map(item => {
+    return {
+      capacity: item.小时产能,
+      ProductionHours: item.生产工时,
+      AuxiliaryHours: item.辅助工时,
+      shift: item.班次安排,
+      remark: item.排单备注,
+      start: item.计划开工时间,
+      projectTime: item.计划完工时间,
+      UniqId: item.UniqId
+    };
+  });
+  console.log(formattedData)
+  // const EquipmentSchedulingEdit_edit = await EquipmentSchedulingEdit(formattedData);
+  // console.log(EquipmentSchedulingEdit_edit)
+  // cjsbpclist.value = true;
 };
 //车间设备排程【退出】
 const cjsbpcCancel = () => {
@@ -1083,9 +1234,37 @@ const cjsbpcCancel = () => {
 };
 
 
+//工序状态更正颜色
+const gxztgzzCellClass = ({row, column, rowIndex, columnIndex}) =>{
+  if(row['完工时间'] === ''){
+    return 'lan-plan-usage-low';
+  }else{
+    return 'hui-plan-usage-low';
+  }
+
+}
 
 </script>
 <style scoped>
+/*背景颜色*/
+/* 选中某行时的背景色 */
+:deep(.el-table__body tr.current-row) > td {
+  background: #ff80ff !important;
+}
+/*:deep(.el-table__body .current-row div div) {*/
+/*  background: #ff80ff !important;*/
+/*}*/
+
+/*文字颜色*/
+/*工序状态更正颜色【灰色】*/
+:deep(.hui-plan-usage-low div) {
+  color: #8c939d !important;
+}
+/*工序状态更正颜色【蓝色】*/
+:deep(.lan-plan-usage-low div) {
+  color: blue !important;
+}
+
 :deep(.el-tabs__header){
   margin-bottom: 0;
 }
@@ -1110,10 +1289,6 @@ const cjsbpcCancel = () => {
 .JKWTree-content {
   flex: 1;
 }
-/* 选中某行时的背景色 */
-:deep(.el-table__body tr.current-row) > td {
-  background: #ff80ff !important;
-}
 </style>
 <style scoped>
 
@@ -1164,4 +1339,7 @@ const cjsbpcCancel = () => {
 .mab{
   margin-bottom: 5px;
 }
+.focusdiv:focus {
+  border: 1px solid red;
+}
 </style>

File diff suppressed because it is too large
+ 328 - 408
src/view/yunyin/shengchanguanli/gongdanziliao.vue


+ 328 - 272
src/view/yunyin/shengchanguanli/shebeiyunxing.vue

@@ -1,15 +1,13 @@
 <template>
   <div>
     
-	<header>
+	    <header>
 			<el-button type="primary" @click="onBZ">班组维护</el-button>
 			<el-button type="primary" @click="onDel">删除</el-button>
-			<el-button type="primary" @click="onSMB">入仓末板数据统计</el-button>
+			<el-button type="primary" @click="onxuncha">管理巡查</el-button>
 			<el-button type="primary" @click="ondianjian">设备点检</el-button>
 			<el-button type="primary" @click="onyinban">印版领退</el-button>
 		</header>
-		
-		
     <el-container>
       <el-aside width="200px">
         <div class="JKWTree-tree">
@@ -20,23 +18,22 @@
 
       </el-aside>
       <el-container>
-<!--        <el-header>dd</el-header>-->
         <el-main>
 
           
-<div class="gva-search-box" style="overflow: hidden; padding: 0; display: flex;">
+<div class="gva-search-box" v-if="JTMCOn" style="overflow: hidden; padding: 0; display: flex;">
 
-			<div style="flex: 1; border: 1px magenta solid; margin: 0; padding: 0;">
+			<div style="flex: 1; border: 0px magenta solid; margin: 0; padding: 0;">
 
 			  <el-row :gutter="20">
 				<el-col :span="24">
 				  <el-form-item label="工单编号" prop="name">
 					<el-row :gutter="20">
 					  <el-col :span="6">
-						<el-input v-model="formData.工单编号" :clearable="true" placeholder="ZT01733" />							
+						<el-input v-model="formData.工单编号" :clearable="true"  />							
 					  </el-col>
 					  <el-col :span="18">
-						<el-input v-model="formData.产品名称" :clearable="true" placeholder="ZT01733" />
+						<el-input v-model="formData.产品名称" :clearable="true"  />
 					  </el-col>
 					</el-row>
 					
@@ -47,12 +44,12 @@
 			  <el-row :gutter="20">
 				<el-col :span="6">
 				 <el-form-item label="印件编号" prop="id">
-				   <el-input v-model="formData.印件编号" :clearable="true" placeholder="2023.12.14" />
+				   <el-input v-model="formData.印件编号" :clearable="true"  />
 				 </el-form-item>
 				</el-col>
 			  <el-col :span="17">
 				 <el-form-item label="工序名称" prop="name">
-				   <el-input v-model="formData.工序名称" :clearable="true" placeholder="A班" />
+				   <el-input v-model="formData.工序名称" :clearable="true"  />
 				 </el-form-item>
 				</el-col>			    
 			  </el-row>
@@ -67,63 +64,51 @@
 <el-row :gutter="1">
 			 
 			 <el-col :span="4">
-			   <el-input v-model="formData.sczl_bh1" :clearable="true" placeholder="ZT01733" />
+			   <el-input v-model="formData.sczl_bh1" :clearable="true"  />
 			 </el-col>
 			<el-col :span="4">
-			  <el-input v-model="formData.sczl_bh2" :clearable="true" placeholder="ZT01733" />
+			  <el-input v-model="formData.sczl_bh2" :clearable="true"  />
 			</el-col>
 			  <el-col :span="4">			  			
-				<el-input v-model="formData.sczl_bh3" :clearable="true" placeholder="ZT01733" />
+				<el-input v-model="formData.sczl_bh3" :clearable="true"  />
 			  </el-col>
 			  
 			 <el-col :span="4">
-				<el-input v-model="formData.sczl_bh4" :clearable="true" placeholder="ZT01733" />
+				<el-input v-model="formData.sczl_bh4" :clearable="true"  />
 			  </el-col>
 			  <el-col :span="4">
-				<el-input v-model="formData.sczl_bh5" :clearable="true" placeholder="ZT01733" />
+				<el-input v-model="formData.sczl_bh5" :clearable="true"  />
 			  </el-col>
 			  <el-col :span="4">
-				<el-input v-model="formData.sczl_bh6" :clearable="true" placeholder="ZT01733" />
+				<el-input v-model="formData.sczl_bh6" :clearable="true"  />
 			  </el-col> 
-			<!-- <el-col :span="1">
-				<el-input v-model="formData.sczl_bh7" :clearable="true" placeholder="ZT01733" />
-			  </el-col>
-			  <el-col :span="1">
-				<el-input v-model="formData.sczl_bh8" :clearable="true" placeholder="ZT01733" />
-			  </el-col>
-			  <el-col :span="1">
-				<el-input v-model="formData.sczl_bh9" :clearable="true" placeholder="ZT01733" />
-			  </el-col>	
-			   <el-col :span="1">
-				 <el-input v-model="formData.sczl_bh10" :clearable="true" placeholder="2023.12.14" />
-			   </el-col> -->
 		   </el-row>
 		   
 		   <el-row :gutter="1">
 		 
 		 <el-col :span="4">
-		   <el-input v-model="formData.sczl_name1" :clearable="true" placeholder="ZT01733" />
+		   <el-input v-model="formData.sczl_name1" :clearable="true"  />
 		 </el-col>
 		<el-col :span="4">
-		  <el-input v-model="formData.sczl_name2" :clearable="true" placeholder="ZT01733" />
+		  <el-input v-model="formData.sczl_name2" :clearable="true"  />
 		</el-col>
 		  <el-col :span="4">			  			
-			<el-input v-model="formData.sczl_name3" :clearable="true" placeholder="ZT01733" />
+			<el-input v-model="formData.sczl_name3" :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name4" :clearable="true" placeholder="ZT01733" />
+		  			<el-input v-model="formData.sczl_name4" :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name5" :clearable="true" placeholder="ZT01733" />
+		  			<el-input v-model="formData.sczl_name5" :clearable="true"  />
 		  </el-col>
 		  <el-col :span="4">
-		  			<el-input v-model="formData.sczl_name6" :clearable="true" placeholder="ZT01733" />
+		  			<el-input v-model="formData.sczl_name6" :clearable="true"  />
 		  </el-col>
 	   </el-row>
                                  		                    
 </div>
                     
-	<div style="flex: 1; border: 1px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
+	<div  style="flex: 1; border: 0px lawngreen solid; margin: 0; padding: 0; overflow: hidden;">
 
 	 <el-table
 	   tooltip-effect="dark"
@@ -149,10 +134,10 @@
 	</div>
                     
 </div>
-          <div class="gva-table-box">
+          <div v-if="JTMCOn" class="gva-table-box">
             <div class="gva-btn-list">
-              <el-button type="primary" icon="plus" @click="openDialog">新增</el-button>
-              <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
+              <!-- <el-button type="primary" icon="plus" @click="openDialog">新增</el-button> -->
+              <!-- <el-popover v-model:visible="deleteVisible" :disabled="!multipleSelection.length" placement="top" width="160">
                 <p>确定要删除吗?</p>
                 <div style="text-align: right; margin-top: 8px;">
                   <el-button type="primary" link @click="deleteVisible = false">取消</el-button>
@@ -161,9 +146,9 @@
                 <template #reference>
                   <el-button icon="delete" style="margin-left: 10px;" :disabled="!multipleSelection.length" @click="deleteVisible = true">删除</el-button>
                 </template>
-              </el-popover>
+              </el-popover> -->
             </div>
-            <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+            <el-tabs v-model="activName" type="card" @tab-click="handleClick">
             
                         <el-tab-pane label="设备作业清单"  @click="showTable('印件资料')"  name="first">
                           <el-table ref="multipleTable"
@@ -276,19 +261,84 @@
                         </el-tab-pane>
             
                       </el-tabs>
-            <!-- <div class="gva-pagination">
-              <el-pagination
-                  layout="total, sizes, prev, pager, next, jumper"
-                  :current-page="page"
-                  :page-size="pageSize"
-                  :page-sizes="[10, 30, 50, 100]"
-                  :total="total"
-                  @current-change="handleCurrentChange"
-                  @size-change="handleSizeChange"
-              />
-            </div> -->
           </div>
-          <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
+		  <div v-if="dateOn" >
+			  <el-tabs v-model="activName" type="card" @tab-click="handleClick">
+			    <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
+			      <el-table ref="multipleTable"
+			                :show-overflow-tooltip="true"
+			                :row-style="{ height: '20px' }"
+			                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+			                :header-cell-style="{ padding: '0px' }"
+			                highlight-current-row="true"
+			                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
+			        <el-table-column type="selection" width="55" />
+			        <el-table-column align="left" label="选择" prop="工单编号"  width="100"/>
+			        <el-table-column align="left" label="产品名称" prop="产品名称"  width="100"/>
+			        <el-table-column align="left" label="工序" prop="工序"  width="240"/>
+			        <el-table-column align="left" label="备注" prop="备注"  width="100"/>
+			        <el-table-column align="left" label="产量" prop="产量"  width="100"/>
+			        <el-table-column align="left" label="千件工价" prop="千件工价"  width="100"/>
+			        <el-table-column align="left" label="日定额" prop="日定额"  width="100"/>
+			        <el-table-column align="left" label="补产标准" prop="补产标准"  width="100"/>
+			        <el-table-column align="left" label="难度系数" prop="难度系数"  width="100"/>
+			        <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="120"/>
+			        <el-table-column align="left" label="组员1" prop="组员1" width="240" />
+			        <el-table-column align="left" label="组员2" prop="组员2" width="240" />
+			        <el-table-column align="left" label="组员3" prop="组员3" width="240" />
+			        <el-table-column align="left" label="组员4" prop="组员4" width="240" />
+			        <el-table-column align="left" label="组员5" prop="组员5" width="100" />
+			        <el-table-column align="left" label="组员6" prop="组员6" width="100" />
+			        <el-table-column align="left" label="组员7" prop="组员7" width="100" />
+			        <el-table-column align="left" label="组员8" prop="组员8" width="100" />
+			        <el-table-column align="left" label="组员9" prop="组员9" width="100" />
+			        <el-table-column align="left" label="组员10" prop="组员10" width="120" />
+			  				<el-table-column align="left" label="制程废品" prop="制程废品" width="100" />
+			  				<el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
+			  				<el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
+			  				<el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
+			  				<el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
+			  				<el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
+			  				<el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
+			  				<el-table-column align="left" label="异常停机工时" prop="异常总工时"  width="120"/>
+			  				<el-table-column align="left" label="通电工时" prop="通电工时" width="100"/>
+			  				<el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
+			  				<el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
+			  				<el-table-column align="left" label="码包" prop="码包" width="100" />
+			  				<el-table-column align="left" label="主电表" prop="主电表"  width="100"/>
+			  				<el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
+			  				<el-table-column align="left" label="色度数" prop="色度数" width="100" />
+			  				<el-table-column align="left" label="用户" prop="用户" width="100" />
+			  				<el-table-column align="left" label="更新时间" prop="更新时间" width="100" />
+			      </el-table>
+			    </el-tab-pane>
+			  
+			    <el-tab-pane label="当日制程检验记录"  @click="showTable('印件资料')"  name="second">
+			      <el-table ref="multipleTable"
+			                :row-style="{ height: '20px' }"
+			                :cell-style="{ padding: '0px' }" :header-row-style="{ height: '20px' }"
+			                :header-cell-style="{ padding: '0px' }"
+			                :show-overflow-tooltip="true"
+			                highlight-current-row="true"
+			                style="width: 100%;height: 400px" border tooltip-effect="dark" :data="drzcDatas" row-key="ID" @selection-change="handleSelectionChange">
+			        <el-table-column type="selection" width="55" />
+			        <el-table-column align="left" label="工单编号" prop="工单编号"  width="120"/>
+			        <el-table-column align="left" label="印件号" prop="印件号" width="120" />
+			        <el-table-column align="left" label="工序名称" prop="工序名称" width="330" />
+			        <el-table-column align="left" label="检验项目" prop="检验项目" width="120"/>
+			  				 <el-table-column
+			  				    v-for="time in columnNames"
+			  				    :key="time"
+			  				    :label="time"
+			  				    :prop="time"
+			  				    align="center"
+			  				    width="120"
+			  				  ></el-table-column>
+			      </el-table>
+			    </el-tab-pane>
+			  </el-tabs>
+		  </div>
+          <!-- <el-dialog v-model="dialogFormVisible" :before-close="closeDialog" :title="type==='create'?'添加':'修改'" destroy-on-close>
           <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
             <el-tab-pane label="当日上报产量"  @click="showTable('工艺资料')"  name="first">
               <el-table ref="multipleTable"
@@ -300,42 +350,42 @@
                         style="width: 100%;height: 400px" border tooltip-effect="dark" :data="gytableData" row-key="ID" @selection-change="handleSelectionChange">
                 <el-table-column type="selection" width="55" />
                 <el-table-column align="left" label="选择" prop="工单编号"  width="100"/>
-                <el-table-column align="left" label="产品名称" prop="重点工序"  width="100"/>
-                <el-table-column align="left" label="工序" prop="工序备注"  width="240"/>
-                <el-table-column align="left" label="备注" prop="机组"  width="100"/>
-                <el-table-column align="left" label="产量" prop="小时产能"  width="100"/>
-                <el-table-column align="left" label="千件工价" prop="生产工时"  width="100"/>
-                <el-table-column align="left" label="日定额" prop="辅助工时"  width="100"/>
-                <el-table-column align="left" label="补产标准" prop="印刷方式"  width="100"/>
-                <el-table-column align="left" label="难度系数" prop="版距"  width="100"/>
-                <el-table-column align="left" label="印刷方式" prop="创建用户"  width="120"/>
-                <el-table-column align="left" label="组员1" prop="Gy0_gxh" width="240" />
-                <el-table-column align="left" label="组员2" prop="gy0_gxmc" width="240" />
-                <el-table-column align="left" label="组员3" prop="add_gxmc" width="240" />
-                <el-table-column align="left" label="组员4" prop="Gy0_Ks" width="240" />
-                <el-table-column align="left" label="组员5" prop="Gy0_ls" width="100" />
-                <el-table-column align="left" label="组员6" prop="备注" width="100" />
-                <el-table-column align="left" label="组员7" prop="工价系数" width="100" />
-                <el-table-column align="left" label="组员8" prop="损耗系数" width="100" />
-                <el-table-column align="left" label="组员9" prop="Gy0_Ms" width="100" />
-                <el-table-column align="left" label="组员10" prop="人工检_正品版" width="120" />
-				<el-table-column align="left" label="制程废品" prop="Sys_id" width="100" />
-				<el-table-column align="left" label="制程次品" prop="建档日期" width="100" />
-				<el-table-column align="left" label="前工序废" prop="更新日期" width="100" />
-				<el-table-column align="left" label="来料异常" prop="YB_方案"  width="100"/>
-				<el-table-column align="left" label="装版工时" prop="YB_Yjno" width="100" />
-				<el-table-column align="left" label="保养工时" prop="印版类别" width="100" />
-				<el-table-column align="left" label="打样工时" prop="存货编码" width="100"/>
-				<el-table-column align="left" label="异常停机工时" prop="印版名称"  width="120"/>
-				<el-table-column align="left" label="通电工时" prop="考核印数" width="100"/>
-				<el-table-column align="left" label="码开始行" prop="Sys_id" width="100" />
-				<el-table-column align="left" label="码结束行" prop="建档日期" width="100" />
-				<el-table-column align="left" label="码包" prop="更新日期" width="100" />
-				<el-table-column align="left" label="主电表" prop="YB_方案"  width="100"/>
-				<el-table-column align="left" label="辅电表" prop="YB_Yjno" width="100" />
-				<el-table-column align="left" label="色度数" prop="印版类别" width="100" />
-				<el-table-column align="left" label="用户" prop="YB_Yjno" width="100" />
-				<el-table-column align="left" label="更新时间" prop="印版类别" width="100" />
+                <el-table-column align="left" label="产品名称" prop="产品名称"  width="100"/>
+                <el-table-column align="left" label="工序" prop="工序"  width="240"/>
+                <el-table-column align="left" label="备注" prop="备注"  width="100"/>
+                <el-table-column align="left" label="产量" prop="产量"  width="100"/>
+                <el-table-column align="left" label="千件工价" prop="千件工价"  width="100"/>
+                <el-table-column align="left" label="日定额" prop="日定额"  width="100"/>
+                <el-table-column align="left" label="补产标准" prop="补产标准"  width="100"/>
+                <el-table-column align="left" label="难度系数" prop="难度系数"  width="100"/>
+                <el-table-column align="left" label="印刷方式" prop="印刷方式"  width="120"/>
+                <el-table-column align="left" label="组员1" prop="组员1" width="240" />
+                <el-table-column align="left" label="组员2" prop="组员2" width="240" />
+                <el-table-column align="left" label="组员3" prop="组员3" width="240" />
+                <el-table-column align="left" label="组员4" prop="组员4" width="240" />
+                <el-table-column align="left" label="组员5" prop="组员5" width="100" />
+                <el-table-column align="left" label="组员6" prop="组员6" width="100" />
+                <el-table-column align="left" label="组员7" prop="组员7" width="100" />
+                <el-table-column align="left" label="组员8" prop="组员8" width="100" />
+                <el-table-column align="left" label="组员9" prop="组员9" width="100" />
+                <el-table-column align="left" label="组员10" prop="组员10" width="120" />
+				<el-table-column align="left" label="制程废品" prop="制程废品" width="100" />
+				<el-table-column align="left" label="制程次品" prop="制程次品" width="100" />
+				<el-table-column align="left" label="前工序废" prop="前工序废" width="100" />
+				<el-table-column align="left" label="来料异常" prop="来料异常"  width="100"/>
+				<el-table-column align="left" label="装版工时" prop="装版工时" width="100" />
+				<el-table-column align="left" label="保养工时" prop="保养工时" width="100" />
+				<el-table-column align="left" label="打样工时" prop="打样工时" width="100"/>
+				<el-table-column align="left" label="异常停机工时" prop="异常总工时"  width="120"/>
+				<el-table-column align="left" label="通电工时" prop="通电工时" width="100"/>
+				<el-table-column align="left" label="码开始行" prop="码开始行" width="100" />
+				<el-table-column align="left" label="码结束行" prop="码结束行" width="100" />
+				<el-table-column align="left" label="码包" prop="码包" width="100" />
+				<el-table-column align="left" label="主电表" prop="主电表"  width="100"/>
+				<el-table-column align="left" label="辅电表" prop="辅电表" width="100" />
+				<el-table-column align="left" label="色度数" prop="色度数" width="100" />
+				<el-table-column align="left" label="用户" prop="用户" width="100" />
+				<el-table-column align="left" label="更新时间" prop="更新时间" width="100" />
               </el-table>
             </el-tab-pane>
           
@@ -363,7 +413,7 @@
               </el-table>
             </el-tab-pane>
           </el-tabs>
-          </el-dialog>
+          </el-dialog> -->
 
           <el-dialog v-model="detailShow" style="width: 800px" lock-scroll :before-close="closeDetailShow" title="机台班组维护" destroy-on-close>
             <el-table ref="multipleTable"
@@ -408,7 +458,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" />			 
 			   </el-form-item>
 			 </el-col>
 			</el-row> 	
@@ -464,115 +514,51 @@
 				
 				
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code1" :clearable="true" placeholder="11.0" />
+				  <el-input v-model="formDatas.code1" :clearable="true" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code2" :clearable="true" placeholder="打包废纸" />
+				  <el-input v-model="formDatas.code2" :clearable="true" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code3" :clearable="true" placeholder="是" />
+				  <el-input v-model="formDatas.code3" :clearable="true" />
 				</el-col>
 				<el-col :span="4">
-				  <el-input v-model="formDatas.code4" :clearable="true" placeholder="是" />
-				</el-col>
-				
-				<!-- <el-col :span="2">
-				  <el-input v-model="formData.name" :clearable="true" placeholder="瞿春生" />
+				  <el-input v-model="formDatas.code4" :clearable="true" />
 				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="percentage" :clearable="true" placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="打包废纸" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="是" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-				</el-col>
-				<el-col :span="2">
-				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-				</el-col> -->
 			  </el-row>
 			 <el-row :gutter="10" style="margin-top: 10px;">
 			  				 <el-col :span="2">
 			  				   <span></span>
 			  				 </el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name1" :clearable="true" placeholder="ZI00401" />
+			  				  <el-input v-model="formDatas.name1" :clearable="true" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.name2" :clearable="true" placeholder="瞿春生" />
+			  				  <el-input v-model="formDatas.name2" :clearable="true" />
 			  				</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" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <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="是" />
+			  				  <el-input v-model="formDatas.name4" :clearable="true" />
 			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-			  				</el-col> -->
 			  </el-row>
 			  <el-row :gutter="10" style="margin-top: 10px;">
 			  				 <el-col :span="2">
 			  				   <span></span>
 			  				 </el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage1" :clearable="true" placeholder="ZI00401" />
+			  				  <el-input v-model="formDatas.percentage1" :clearable="true" />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <el-input v-model="formDatas.percentage2" :clearable="true" placeholder="瞿春生" />
+			  				  <el-input v-model="formDatas.percentage2" :clearable="true" />
 			  				</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"  />
 			  				</el-col>
 			  				<el-col :span="4">
-			  				  <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="是" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="ZI00401" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="瞿春生" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
+			  				  <el-input v-model="formDatas.percentage4" :clearable="true" />
 			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-			  				</el-col>
-			  				<el-col :span="2">
-			  				  <el-input v-model="formData.qczl_NumDesc" :clearable="true" placeholder="11.0" />
-			  				</el-col> -->
 			  </el-row>
 			</div>
           </el-dialog>
@@ -588,13 +574,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.JTMC" :clearable="true" />
               </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.产品名称" :clearable="true"  />
                 </el-col>
               </el-row>
             </el-col>
@@ -675,19 +661,22 @@
 		  width="1300px"
 		  style="height: 110%;"
 		>
-		  <el-row :gutter="0">
+		  <el-row :gutter="24">
 		    <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.工单编号" :clearable="true" />
 		      </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-col>
-		      </el-row>
-		    </el-col>
+			<el-col :span="6">
+			  <el-form-item prop="id">
+			    <el-input v-model="formData.productCode" :clearable="true"  />
+			  </el-form-item>
+			</el-col>
+			<el-col :span="14">
+			  <el-form-item prop="id">
+			    <el-input v-model="formData.产品名称" :clearable="true" />
+			  </el-form-item>
+			</el-col>
 		  </el-row>
 		
 		  <div style="display: flex;">
@@ -781,15 +770,112 @@
 				/>
 		        
 		      </el-table>
-			  <!-- <el-row :gutter="20">
-			    <el-col :span="20">			      
-			        <el-input v-model="pandingfangfa"  style="height: 50px;" :clearable="true"  />			      
-			    </el-col>
-			  </el-row> -->
 		    </div>
 		  </div>
 		</el-dialog>
 		
+		<el-dialog
+		  v-model="xunchaVisible"
+		  title="选择"
+		  destroy-on-close
+		  width="1300px"
+		  style="height: 80%;"
+		>
+		  
+		
+		<div style="display: flex;">
+		  <div style="flex: 1;">
+		    <el-aside width="250px" style="margin: 0;">
+		      <div class="JKWTree-tree" style="height: 100%; border-right: 1px solid #ebeef5;">		          
+		        <el-tree :data="xunchatreeData" :props="defaultProps" highlight-current="true"
+		          @node-click="xunchaNodeClick"></el-tree>
+		      </div>
+		    </el-aside>
+		  </div>
+		  <div style="flex: 1; margin: 0;">
+		    <el-table
+		      tooltip-effect="dark"
+		      :data="xunchaselectData"
+		      row-key="ID"
+		      highlight-current-row="true"
+		      border  @row-click="dianjianhandle"
+		      style="width:1000px; height:400px;"
+		      @row-dblclick="handleSelectClick"
+		      :row-class-name="rowClassName"
+		    >
+		      <el-table-column
+		        prop="工单编号"
+		        label="工序编号"
+		        width="180"
+		      />
+		      <el-table-column
+		        prop="印件号"
+		        label="印件号"
+		        width="180"
+		      />
+		      
+			  <el-table-column
+				prop="工序名称"
+				label="工序名称"
+				width="180"
+			  />
+			<el-table-column
+			  prop="流程单号"
+			  label="流程单号"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="设备编号"
+			  label="设备编号"
+			  width="180"
+			/>
+			
+			<el-table-column
+			  prop="班组编号"
+			  label="班组编号"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="检验备注"
+			  label="检验备注"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="现场管理人员"
+			  label="现场管理人员"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="提交时间"
+			  label="提交时间"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="开工时间"
+			  label="开工时间"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="分钟差数"
+			  label="分钟差数"
+			  width="180"
+			/>
+			<el-table-column
+			  prop="归属时段"
+			  label="归属时段"
+			  width="180"
+			/>
+		    </el-table>
+		  </div>
+		</div>
+		  <template #footer>
+		    <div class="dialog-footer">
+		      <!-- <el-button @click="closeDialog">关 闭</el-button> -->
+		      <!-- <el-button type="primary" @click="xunjianerDialog">提 交</el-button> -->
+		    </div>
+		  </template>
+		</el-dialog>
+		
         </el-main>
 
       </el-container>
@@ -837,8 +923,8 @@ import {
 } from '@/api/jixiaoguanli/jitairibaobiao'
 
 import {
-  demoCustomer
-} from "@/api/demo";
+  FieldInspectionRecord
+} from "@/api/mes/job";
 
 // 全量引入格式化工具 请按需保留
 import { getDictFunc, formatDate, formatBoolean, filterDict, ReturnArrImg, onDownloadFile } from '@/utils/format'
@@ -848,15 +934,17 @@ import { ref, reactive } from 'vue'
 defineOptions({
     name: 'Company'
 })
-let checked1=ref(false)
-let checked2=ref(false)
-let checked3=ref(false)
+const gytableData = ref([])
 const detailData = reactive([])
 const treeData=ref([])
 const yinbantreeData=ref([])
 let  dianjiantreeData;
 let JTMC=ref()
-let productCode=ref(104601001)
+let date=ref()
+let JTMCOn=ref()
+let dateOn=ref()
+const  activName  = ref('first')
+let productCode=ref()
 const sbzyData = reactive([])
 const FPData = reactive([])
 const CLMXData = reactive([])
@@ -869,11 +957,18 @@ const handleNodeClick = (nodeData,node) => {
       } else if (nodeData.level === 2) {
         console.log(node.label); // 第二级节点
 		JTMC=node.label.split("【")[0]
+		JTMCOn.value=true
+		dateOn.value=false
 		FacilityProduction()
 		FacilityWorklist()
-		console.log(JTMC)
       } else if (nodeData.level === 3) {
-        console.log(node.label); // 第三级节点
+		  JTMC=nodeData.machineName.split("【")[0]
+		  JTMCOn.value=false
+		  dateOn.value=true
+		  date=node.label
+		  FacilityInspect()
+		  FacilitychanLiang()
+          console.log(node.label); // 第三级节点
 	   }      
 }
 //当前生产订单
@@ -886,29 +981,8 @@ const FacilityProduction = async () => {
 	    formData.value.印件编号 = response.data[0].印件号;
 	    formData.value.工序名称 = response.data[0].工序名称;
 	    formData.value.产品名称 = response.data[0].产品名称;
+		formData.value.JTMC=JTMC
 	    FacilityTeam(JTMC)
-		
-	       // 填充sczl_bh和sczl_name字段
-	        for (let i = 1; i <= 10; i++) {
-	          const sczl_bh = `sczl_bh${i}`;
-	          const sczl_name = `sczl_name${i}`;
-	          if (response.data[sczl_bh] ) {
-	            formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
-	            formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
-				console.log(response.data[sczl_bh]['员工姓名'])
-				console.log(formData.value.sczl_bh)
-				// console.log(sczl_name)
-	          } else {
-	            // 如果字段不存在,可以在这里进行处理
-	            // console.log('2');
-				// formData.value[sczl_bh] = response.data[sczl_bh]['员工编号'];
-				// formData.value[sczl_name] = response.data[sczl_bh]['员工姓名'];
-				// console.log(formData.value.sczl_bh)
-				// console.log(sczl_name)
-	          }
-	        }
-	        // 输出填充后的formData对象
-	        // console.log(formData.value);
   }
   // getTableData()
 }
@@ -920,6 +994,7 @@ const FacilityWorklist = async () => {
 	console.log(response)
 	sbzyData.splice(0, sbzyData.length, ...response.data);
 	const res = await facilityProcedure({ Gd_gdbh: sbzyData[0]['工单编号|质量信息'].substring(0, 7) })
+	formData.value.productCode= response.data[0]['产品代号']
 	console.log(res)
 	if (res.code === 0) {
 	    selectData.value = res.data
@@ -1028,6 +1103,8 @@ const total = ref(0)
 const pageSize = ref(10)
 const tableData = ref([])
 const searchInfo = ref({})
+const xunchaVisible = ref(false)
+const xunchatreeData=ref([{label: '现场巡查记录',} ])
 
 // 重置
 const onReset = () => {
@@ -1087,6 +1164,7 @@ const getTableData = async () => {
              const dateOnly = dateTime.split(' ')[0];
              return {
                label: dateOnly,
+			   machineName:machineName,
                level: 3, // 添加层级属性
                parentNode: machineNode
              };
@@ -1143,7 +1221,7 @@ function ondianjian() {
 }
 
 const onyinban = async() => {
-	const res = await facilityPrintGetTab({productCode:productCode.value})
+	const res = await facilityPrintGetTab({productCode:formData.value.productCode})
 	if(res.code===0){
 		yinbantreeData.value=[{
 			label:'产品印版库',
@@ -1159,26 +1237,10 @@ const onyinban = async() => {
 		yinbanVisible.value = true;
 	}
 }
-// function onyinban() {
-	
-//   getSpotCheckItem(productCode).then(treeData  => {
-//     if (treeData) {
-//       // 如果获取成功,treeData 就是我们需要的树形结构数据
-//       dianjiantreeData = treeData;
-//       console.log('222');
-//       console.log(dianjiantreeData);
-//       // 使用 nextTick 来确保在更新 dianjianVisible 后立即刷新视图
-//       nextTick(() => {
-//         dianjianVisible.value = true;
-//       });
-//       // 这里可以处理treeData,例如将其赋值给某个状态管理变量或者用于渲染界面
-//     } else {
-//       // 如果获取失败,则treeData为null
-//       console.log('获取巡检项目树形结构数据失败');
-//     }
-//   });
-  
-// }
+const onxuncha = async() => {
+	xunchaVisible.value=true
+}
+
 //获取设备点检->检验项目
 const FacilityInspectionItem = async (value) => {
   try {
@@ -1222,6 +1284,7 @@ const facilityPrintDetailItem = async (value) => {
 //树形结构单机
 const dianjianselectData = reactive([])
 const yinbanselectData = ref([])
+const xunchaselectData = ref([])
 const dianjianNodeClick = (node, check, nodeData) => {
   if (node.children && node.children.length > 0) {
     // 点击的是父节点,且有子节点
@@ -1244,23 +1307,23 @@ const yinbanNodeClick = (node, check, nodeData) => {
      facilityPrintDetailItem(node.code)
   }
 };
+const xunchaNodeClick = (node, check, nodeData) => {
+	if(node){
+		fieldInspectionRecord()
+	}
+}
+
+const fieldInspectionRecord = async () => {
+	const response = await FieldInspectionRecord({ workOrder: '2311114',team:'A班',start:'2024-01-19 08:30:00' });
+	if (response.code === 0) {
+		xunchaselectData.value=response.data
+	}
+}
+
 let pandingfangfa=ref()
 //检验项目单击
 const dianjianhandle =  (val, row) => {
   try {
-    console.log(row);
-	// if(val.notjc==true){
-	// 	if(val.zc==false&&val.yc==false){
-	// 		val.zc=true
-	// 	}
-	// }else{
-	// 	if(val.zc==true||val.yc==true){
-	// 		val.notjc==true
-	// 		val.zc=false
-	// 		val.yc==false
-	// 	}
-	// }
-	// val.notjc=false
     pandingfangfa.value = val.判定标准;
   } catch (error) {
     console.error('An error occurred:', error);
@@ -1314,18 +1377,6 @@ const rowClassName = (row, column) => {
     return '';
   }
 };
-// const isIndeterminate = () => {
-//   return (checked1 && !checked2 && checked3) ||
-//              (!checked1 && checked2 && !checked3) ||
-//              (!checked1 && !checked2 && checked3);
-// };
-// const handleCheckAllChange = () => {
-//    if (checked1 && checked2 && checked3) {
-//           checked1 = false;
-//           checked2 = false;
-//           checked3 = false;
-//         }
-// };
 
 // 异步函数,用于获取指定设备的巡检项目,并且将结果格式化为树形结构数据
 const getSpotCheckItem = async (machineName) => {
@@ -1678,11 +1729,6 @@ const getDetails = async (row) => {
 // 关闭详情弹窗
 const closeDetailShow = () => {
   detailShow.value = false
-  // formData.value = {
-  //         address: '',
-  //         image: '',
-  //         name: '',
-  //         }
 }
 
 
@@ -1691,37 +1737,37 @@ const openDialog = () => {
     // type.value = 'create'
 	console.log('222')
 	FacilityInspect()
+	FacilitychanLiang()
     dialogFormVisible.value = true
 }
 let drzcData=[]
+const drzcDatas =ref([])
 let columnNames=[]
 //当日制程检验记录
 const FacilityInspect = async () => {
-  const response = await facilityInspect({machine:'JY01#',date:'2024-01-04'});
+  const response = await facilityInspect({machine:JTMC,date:date});
   console.log(response)
   if(response.code==0){
 	 // 提取 inspectiontime 作为列名
 	        // Extract inspectiontime as columnNames
-	  columnNames = response.data.inspectiontime;
-
+	  columnNames = response.data.InspectionTime;
 	  // Populate drzcData with row data
-	  for (const key in response.data) {
-		if (key !== 'inspectiontime') {
-		  const item = response.data[key];
+	  for (const key in response.data.row[0]) {
+		if (key !== 'InspectionTime') {
+		  const item = response.data.row[0][key];
 		  const rowData = {
 			'工单编号': item['工单编号'],
 			'印件号': item['印件号'],
 			'工序名称': item['工序名称'],
 			'检验项目': item['检验项目']
 		  };
-
 		  // Initialize time columns with '—'
 		 columnNames.forEach(time => {
 			rowData[time] = '';
 		  });
 
 		  // Split inspectresult and fill the corresponding time columns
-		  const results = item['inspectresult'].split(',');
+		  const results = item['time'].split(',');
 		  results.forEach(result => {
 			if (columnNames.includes(result)) {
 			  rowData[result] = '√';
@@ -1732,9 +1778,19 @@ const FacilityInspect = async () => {
 		  drzcData.push(rowData);
 		}
 	  }
+	  drzcDatas.value=drzcData
 	  console.log(drzcData);
   }
 }
+const FacilitychanLiang = async () => {
+  const response = await facilitychanLiang({machine:JTMC,date:date});
+  if(response.code==0){
+	 delete response.data['totalA']
+	 delete response.data['totalB']
+	 gytableData.value=Object.values(response.data)
+  }
+}
+
 // 关闭弹窗
 const closeDialog = () => {
     dialogFormVisible.value = false

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