Browse Source

操作成功弹窗提示

Lexie 1 year ago
parent
commit
a640547f47

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

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

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

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

+ 8 - 0
src/api/mes_api_gty/workOrderVerification.js

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

+ 68 - 16
src/view/job/sampling/sampling.vue

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

+ 14 - 8
src/view/performance/08-timesheet/index.vue

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

+ 81 - 16
src/view/performance/09-workOrderVerification/index.vue

@@ -38,14 +38,18 @@
                 @click="isShowMrhjtj = true"
               >每日核检统计
               </el-button>
-
               <el-button
                 type="primary"
                 :icon="Search"
                 @click="showGdzjfptj"
               >工单质检废品统计
               </el-button>
-
+			 <el-button
+                type="primary"
+                :icon="Search"
+                @click="handleShowAdd"
+              >新增
+              </el-button>
               <div style="margin-left: auto;">
                 <el-button
                   type="primary"
@@ -411,7 +415,6 @@
           <!-- 测试图表 -->
           <el-dialog
             title="【01.24 08:30】【JY01#--海德堡对开八色平版胶印机(JY08-01)】【2311116-->钻石(荷花)盒包装纸】【01--胶印】"
-            destroy-on-close
             fullscreen
           >
             <Shebeizhuangtai />
@@ -438,7 +441,7 @@ import {
 import { ElMessage } from 'element-plus'
 import { Search, Refresh, Download } from '@element-plus/icons-vue'
 import { ref, reactive } from 'vue'
-import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData } from '@/api/mes_api_gty/workOrderVerification'
+import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData,add } from '@/api/mes_api_gty/workOrderVerification'
 import Meirihejiantongji from './meirihejiantongji.vue'
 import Gongdanzhijianfeipintongji from './gongdanzhijianfeipintongji.vue'
 import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/shebeizhuangtai.vue'
@@ -740,10 +743,20 @@ const handleSelectClick = (row, column, event) => {
   detailData.table[index].fp_bh = sczl_bh1
   detailData.table[index].fp_name = name
   dialogSelectVisible2.value = false
+  
 }
 
 // 弹窗确定
 const enterDialog = async() => {
+	
+	if (type.value === 'update') {
+	  updateDetailData()
+	} else if (type.value === 'add') {
+	  addDetailData()
+	}
+}
+//新增
+const addDetailData = async() => {
   const restoredData = {
     UniqId: detailData.UniqId,
     qczl_gdbh: detailData.qczl_gdbh,
@@ -762,24 +775,66 @@ const enterDialog = async() => {
     qczl_NumDesc6: detailData.qczl_NumDesc6,
     qczl_NumDesc7: detailData.qczl_NumDesc7,
     qczl_NumDesc8: detailData.qczl_NumDesc8,
+	sys_id:'[1003/洪桂芬]',
   }
   detailData.table.forEach((item, index) => {
-    const num = index + 1
-    restoredData[`fp_lb${num}`] = item.fp_lb
-    restoredData[`fp_sl${num}`] = item.fp_sl
-    restoredData[`fp_bh${num}`] = item.fp_bh
-    restoredData[`fp_bz${num}`] = item.fp_bz
-    restoredData[`fp_gxmc${num}`] = item.fp_gxmc
-  })
-  const res = await updateData(restoredData)
+	  const num = index + 1
+	  restoredData[`fp_lb${num}`] = item.fp_lb
+	  restoredData[`fp_sl${num}`] = item.fp_sl
+	  restoredData[`fp_bh${num}`] = item.fp_bh
+	  restoredData[`fp_bz${num}`] = item.fp_bz
+	  restoredData[`fp_gxmc${num}`] = item.fp_gxmc
+	})
+  console.log(restoredData)
+  const res = await add(restoredData)
+  console.log(res)
+  
   if (res.code === 0) {
     ElMessage({
       type: 'success',
-      message: res.msg,
+      message: '新增成功',
     })
     dialogFormVisible.value = false
   }
 }
+//修改
+const updateDetailData = async() => {
+	const restoredData = {
+	  UniqId: detailData.UniqId,
+	  qczl_gdbh: detailData.qczl_gdbh,
+	  qczl_yjno: detailData.qczl_yjno,
+	  qczl_gxh: detailData.qczl_gxh,
+	  qczl_gxmc: detailData.qczl_gxmc,
+	  qczl_rq: detailData.qczl_rq,
+	  qczl_fp: detailData.qczl_fp,
+	  qczl_num: detailData.qczl_num,
+	  qczl_NumDesc: detailData.qczl_NumDesc,
+	  qczl_NumDesc1: detailData.qczl_NumDesc1,
+	  qczl_NumDesc2: detailData.qczl_NumDesc2,
+	  qczl_NumDesc3: detailData.qczl_NumDesc3,
+	  qczl_NumDesc4: detailData.qczl_NumDesc4,
+	  qczl_NumDesc5: detailData.qczl_NumDesc5,
+	  qczl_NumDesc6: detailData.qczl_NumDesc6,
+	  qczl_NumDesc7: detailData.qczl_NumDesc7,
+	  qczl_NumDesc8: detailData.qczl_NumDesc8,
+	}
+	detailData.table.forEach((item, index) => {
+	  const num = index + 1
+	  restoredData[`fp_lb${num}`] = item.fp_lb
+	  restoredData[`fp_sl${num}`] = item.fp_sl
+	  restoredData[`fp_bh${num}`] = item.fp_bh
+	  restoredData[`fp_bz${num}`] = item.fp_bz
+	  restoredData[`fp_gxmc${num}`] = item.fp_gxmc
+	})
+	const res = await updateData(restoredData)
+	if (res.code === 0) {
+	  ElMessage({
+	    type: 'success',
+	    message: res.msg,
+	  })
+	  dialogFormVisible.value = false
+	}
+}
 
 // 多选
 const handleSelectionChange = (val) => {
@@ -838,17 +893,27 @@ const isShowMrhjtj = ref(false)
 const isShowGdzjfptj = ref(false)
 const value1 = ref('')
 const table = ref(null)
-const currentRow = ref()
+
 
 const showGdzjfptj = () => {
   value1.value = currentRow.value?.qczl_gdbh
   isShowGdzjfptj.value = true
 }
-
+const currentRow = ref()
 const handleSelectChange = (row, column, event) => {
-  currentRow.value = row
+  currentRow.value = row.UniqId
 }
 
+// 新增数据
+const handleShowAdd = async () => {
+  
+    type.value='add'
+    getDetailData(currentRow.value)
+	// type.value='add'
+ //    Object.assign(detailData);
+	// dialogFormVisible.value = true
+  
+};
 </script>
 
 <style scoped>

+ 850 - 275
src/view/performance/09-workOrderVerification/shebeizhuangtai.vue

@@ -1,304 +1,879 @@
 <template>
   <div>
-    <el-row>
-      <el-col :span="20">
-        <el-row
-          style="height: 20vh"
-        >
-          <v-chart
-            class="chart1"
-            autoresize
-            :option="option1"
-          />
-        </el-row>
-
-        <el-row
-          style="height: 20vh"
-        >
-          <v-chart
-            class="chart2"
-            autoresize
-            :option="option2"
-          />
-        </el-row>
-
-        <el-row
-          style="height: 20vh"
-        >
-          <v-chart
-            class="chart3"
-            autoresize
-            :option="option3"
-          />
-        </el-row>
+    <el-container>
+      <!-- 左侧树形结构 -->
+      <el-scrollbar max-height="75vh">
+        <el-aside>
+          <div class="JKWTree-tree">
+            <h3>工单核验单维护</h3>
+            <el-tree
+              :data="treeData"
+              highlight-current
+              @node-click="handleNodeClick"
+            />
+          </div>
+        </el-aside>
+      </el-scrollbar>
+
+      <el-container>
+        <el-main>
+          <div class="gva-table-box">
+            <!-- 按钮区域 -->
+            <div class="gva-btn-list">
+              <el-row :span="6">
+                <el-input
+                  v-model="searchInfo"
+                  placeholder="输入工单编号"
+                />
+              </el-row>
+              <el-button
+                type="primary"
+                :icon="Search"
+                @click="handleSearch"
+              >搜索
+              </el-button>
+              <el-button
+                type="primary"
+                :icon="Search"
+                @click="isShowMrhjtj = true"
+              >每日核检统计
+              </el-button>
+
+              <el-button
+                type="primary"
+                :icon="Search"
+                @click="showGdzjfptj"
+              >工单质检废品统计
+              </el-button>
+
+              <div style="margin-left: auto;">
+                <el-button
+                  type="primary"
+                  :icon="Download"
+                  @click="exportExcel"
+                >导出到Excel</el-button>
+              </div>
+            </div>
+            <!-- 数据展示 -->
+            <el-table
+              ref="table"
+              style="width: 100%"
+              :data="tableData"
+              row-key="ID"
+              highlight-current-row
+              border
+              show-overflow-tooltip
+              :row-style="{ height: '20px' }"
+              :cell-style="{ padding: '0px' }"
+              :header-row-style="{ height: '20px' }"
+              :header-cell-style="{ padding: '0px' }"
+              @row-click="handleSelectChange"
+              @row-dblclick="doubleClick"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+              />
+              <!-- 循环渲染表格列 -->
+              <el-table-column
+                v-for="column in tableColumns"
+                :key="column.prop"
+                :prop="column.prop"
+                :label="column.label"
+                :width="column.width"
+              />
+
+            </el-table>
+            <!-- 分页 -->
+            <div class="gva-pagination">
+              <el-pagination
+                v-model:current-page="page"
+                v-model:page-size="limit"
+                layout="total, sizes, prev, pager, next, jumper"
+                :page-sizes="[10, 30, 50, 100]"
+                :total="total"
+                @current-change="handleCurrentChange"
+                @size-change="handleSizeChange"
+              />
+            </div>
+          </div>
+
+          <!-- 弹出框 -->
+          <el-dialog
+            v-model="dialogFormVisible"
+            :before-close="closeDialog"
+            :title="type === 'create' ? '添加' : '修改'"
+            destroy-on-close
+            width="70%"
+            style="position: fixed; top: 35%; left: 50%; transform: translate(-50%, -50%);"
+          >
+
+            <el-form
+              ref="elFormRef"
+              :model="detailData"
+              inline
+              label-position="left"
+              :rules="rule"
+            >
+              <el-form-item
+                label="日期"
+              >
+                <el-date-picker
+                  v-model="detailData.qczl_rq"
+                  type="date"
+                  style="width: 150px;"
+                />
+                <!--                <el-input
+                  v-model="detailData.qczl_rq"
+                  style="width: 120px;"
+                />-->
+              </el-form-item>
+              <el-form-item
+                label="工单编号"
+              >
+                <el-input
+                  v-model="detailData.qczl_gdbh"
+                  style="width: 100px;"
+                  @keyup.enter="handleGdbhEnter"
+                />
+              </el-form-item>
+              <el-form-item label="拼印主工单">
+                <el-input
+                  v-model="detailData.qczl_Pygd"
+                  style="width: 100px;"
+                />
+              </el-form-item>
+              <el-form-item
+                label="产品名称"
+              >
+                <el-input
+                  v-model="detailData.Gd_cpmc"
+                  style="width: 400px;"
+                  readonly
+                />
+              </el-form-item>
+              <br>
+              <el-form-item
+                label="印件号"
+              >
+                <el-input
+                  v-model="detailData.qczl_yjno"
+                  style="width: 60px;"
+                />
+              </el-form-item>
+              <el-form-item
+                label="印件名称"
+                style="margin-left: 47px"
+              >
+                <el-input
+                  v-model="detailData.yj_yjmc"
+                  style="width: 500px;"
+                  readonly
+                />
+              </el-form-item>
+              <el-form-item
+                label="废品总数"
+              >
+                <el-input
+                  v-model="detailData.qczl_fp"
+                  style="width: 100px;"
+                />
+              </el-form-item>
+              <br>
+
+              <el-form-item
+                label="工序"
+              >
+                <el-input
+                  v-model="detailData.qczl_gxmc"
+                  style="width: 200px;"
+                />
+              </el-form-item>
+              <el-form-item
+                label="工序号"
+              >
+                <el-input
+                  v-model="detailData.qczl_gxh"
+                  style="width: 100px;"
+                  readonly
+                />
+              </el-form-item>
+              <el-form-item
+                label="总流程号"
+              >
+                <el-input
+                  v-model="detailData.total_liucheng"
+                  style="width: 100px;"
+                  readonly
+                />
+              </el-form-item>
+
+              <el-form-item
+                label="流程单号"
+              >
+                <el-input
+                  v-model="detailData.qczl_num"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc1"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc2"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc3"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc4"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc5"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc6"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc7"
+                  style="width: 60px; margin-left: 5px;"
+                />
+                <el-input
+                  v-model="detailData.qczl_NumDesc8"
+                  style="width: 60px; margin-left: 5px;"
+                />
+              </el-form-item>
+
+              <el-form-item
+                label="备注"
+              >
+                <el-input
+                  v-model="detailData.qczl_NumDesc"
+                  style="width: 200px;"
+                />
+              </el-form-item>
 
-        <el-col style="height: 10vh; text-align: center; margin-top: 10px">
-          <el-button
-            class="btn-right"
-            style="background: #5B79D7;"
+              <el-scrollbar height="400px">
+                <el-table
+                  :data="detailData.table"
+                  border
+                  tooltip-effect="dark"
+                  :row-style="{ height: '20px' }"
+                  :cell-style="{ padding: '0px' }"
+                  :header-row-style="{ height: '20px' }"
+                  :header-cell-style="{ padding: '0px' }"
+                >
+                  <el-table-column
+                    label="废品类别"
+                    width="200"
+                  >
+                    <template #default="{ row, $index }">
+                      <el-input
+                        v-model="row.fp_lb"
+                        @keyup.enter="handleFplbEnter($index, row)"
+                      />
+                    </template>
+                  </el-table-column>
+
+                  <el-table-column
+                    label="数量"
+                    width="100"
+                  >
+                    <template #default="{ row, $index }">
+                      <el-input
+                        v-model="row.fp_sl"
+                        @keyup.enter="handleFpslEnter($index, row)"
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label="工序及责任机长"
+                    width="500"
+                  >
+                    <template #default="{ row }">
+                      <el-input
+                        v-model="row.fp_gxmc"
+                        readonly
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label=""
+                    width="100"
+                  >
+                    <template #default="{ row }">
+                      <el-input
+                        v-model="row.fp_bz"
+                        readonly
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label=""
+                    width="100"
+                  >
+                    <template #default="{ row }">
+                      <el-input
+                        v-model="row.fp_bh"
+                        readonly
+                      />
+                    </template>
+                  </el-table-column>
+                  <el-table-column
+                    label=""
+                    width="100"
+                  >
+                    <template #default="{ row }">
+                      <el-input
+                        v-model="row.fp_name"
+                        readonly
+                      />
+                    </template>
+                  </el-table-column>
+
+                </el-table>
+
+              </el-scrollbar>
+
+            </el-form>
+
+            <template #footer>
+              <div class="dialog-footer">
+                <el-button @click="closeDialog">取 消</el-button>
+                <el-button
+                  type="primary"
+                  @click="enterDialog"
+                >确 定
+                </el-button>
+              </div>
+            </template>
+          </el-dialog>
+
+          <!-- 废品类别弹出选项框 -->
+          <el-dialog
+            v-model="dialogSelectVisible1"
+            title="选择"
+            destroy-on-close
+            width="600px"
           >
-            上一班次
-          </el-button>
+            <el-tree
+              :data="selecTreeData"
+              :props="defaultProps"
+              highlight-current
+              @node-click="handleFplbClick"
+            />
+          </el-dialog>
 
-          <span
-            style="font-size: 26px;vertical-align: middle;margin: 20px"
-          >当前班次:{{ currentFrequency }}</span>
+          <!-- 弹出选项框 数量 -->
+          <el-dialog
+            v-model="dialogSelectVisible2"
+            title="选择"
+            destroy-on-close
+            width="800px"
+          >
+            <el-table
+              tooltip-effect="dark"
+              :data="selectData"
+              row-key="ID"
+              highlight-current-row
+              border
+              style="width:100%"
+              @row-dblclick="handleSelectClick"
+            >
+              <el-table-column
+                v-for=" column in selectColumns "
+                :key="column.prop"
+                :prop="column.prop"
+                :label="column.label"
+                :width="column.width"
+              />
+            </el-table>
+          </el-dialog>
 
-          <el-button
-            class="btn-right"
-            style="background: #5B79D7;"
+          <!-- 核验废品日统计弹出框 -->
+          <Meirihejiantongji
+            :is-show="isShowMrhjtj"
+            @my-close="isShowMrhjtj = false"
+          />
+
+          <!-- 工单质检废品统计 -->
+          <Gongdanzhijianfeipintongji
+            :is-show="isShowGdzjfptj"
+            :val="value1"
+            @my-close="isShowGdzjfptj =false"
+          />
+
+          <!-- 测试图表 -->
+          <el-dialog
+            title="【01.24 08:30】【JY01#--海德堡对开八色平版胶印机(JY08-01)】【2311116-->钻石(荷花)盒包装纸】【01--胶印】"
+            fullscreen
           >
-            下一班次
-          </el-button>
-        </el-col>
-
-      </el-col>
-
-      <el-col :span="4">
-        <div
-          style="font-size: 22px; margin-left: 30px"
-        >设备状态:</div><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '待单'}"
-          @click="handleBtnActive"
-        >待单</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '维修' }"
-          @click="handleBtnActive"
-        >维修</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '保养' }"
-          @click="handleBtnActive"
-        >保养</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '测试' }"
-          @click="handleBtnActive"
-        >测试</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '打样' }"
-          @click="handleBtnActive"
-        >打样</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '待料' }"
-          @click="handleBtnActive"
-        >待料</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '装版' }"
-          @click="handleBtnActive"
-        >装版</el-button><br>
-        <el-button
-          class="btn-right"
-          :class="{ 'active': activeBtn === '生产' }"
-          @click="handleBtnActive"
-        >生产</el-button><br>
-      </el-col>
-    </el-row>
+            <Shebeizhuangtai />
+          </el-dialog>
 
-  </div>
+        </el-main>
+      </el-container>
+    </el-container>
 
+  </div>
 </template>
-<script>
-export default {
-  name: 'Shebeizhuangtai',
+
+<script setup>
+import {
+  createCompany,
+  deleteCompany,
+  deleteCompanyByIds,
+  updateCompany,
+  findCompany,
+  getCompanyList
+} from '@/api/company'
+
+// 全量引入格式化工具 请按需保留
+import { ElMessage } from 'element-plus'
+import { Search, Refresh, Download } from '@element-plus/icons-vue'
+import { ref, reactive } from 'vue'
+import { getSide, getTable, getOneWorkOrder, getOrderInfo, getGxAndLeader, getWastInfo, updateData } from '@/api/mes_api_gty/workOrderVerification'
+import Meirihejiantongji from './meirihejiantongji.vue'
+import Gongdanzhijianfeipintongji from './gongdanzhijianfeipintongji.vue'
+import Shebeizhuangtai from '@/view/performance/09-workOrderVerification/shebeizhuangtai.vue'
+
+defineOptions({
+  name: '06PackingDocuments'
+})
+
+// 侧边栏数据请求
+const treeData = reactive([])
+const getSideData = async() => {
+  const response = await getSide()
+  if (response.code === 0) {
+    const transformedData = response.data.map(item => ({
+      label: `${item.date.replace(/-/g, '.')}【单据数: ${item.counts}张】`,
+      children: item.sys.map(sysItem => ({
+        label: `${sysItem.sys_id} 【记录数: ${sysItem.count}张】`,
+        params: {
+          date: item.date.replace(/\./g, '-'),
+          sys_id: sysItem.sys_id,
+        },
+      })),
+    }))
+    treeData.splice(0, treeData.length, ...transformedData)
+  }
 }
 
-// 机台数据详情
-import service from '@/utils/request'
-export const getMachineDetail = (params) => {
-  return service({
-    url: '/mes_server/facility/MachineDetail',
-    method: 'get',
-    params
-  })
+getSideData()
+
+// 验证规则
+const rule = reactive({
+})
+
+const elFormRef = ref()
+const elSearchFormRef = ref()
+
+// =========== 表格控制部分 ===========
+const tableColumns = [
+  { label: '工单编号', prop: 'qczl_gdbh', width: '100' },
+  { label: '印件号', prop: 'qczl_yjno', width: '100' },
+  { label: '印件名称', prop: 'Gd_cpmc', width: '400' },
+  { label: '日期', prop: 'qczl_rq', width: '100' },
+  { label: '流程单号', prop: 'qczl_num', width: '100' },
+  { label: '流程单备注', prop: 'qczl_NumDesc', width: '100' },
+  { label: '总废品', prop: 'qczl_fp', width: '100' },
+  { label: '废品1', prop: 'sl_lb1', width: '250' },
+  { label: '废品2', prop: 'sl_lb2', width: '250' },
+  { label: '废品3', prop: 'sl_lb3', width: '250' },
+  { label: '废品4', prop: 'sl_lb4', width: '250' },
+  { label: '废品5', prop: 'sl_lb5', width: '250' },
+  { label: '废品6', prop: 'sl_lb6', width: '250' },
+  { label: '废品7', prop: 'sl_lb7', width: '250' },
+  { label: '废品8', prop: 'sl_lb8', width: '250' },
+  { label: '废品9', prop: 'sl_lb9', width: '250' },
+  { label: '废品10', prop: 'sl_lb10', width: '250' },
+  { label: '废品11', prop: 'sl_lb11', width: '250' },
+  { label: '废品12', prop: 'sl_lb12', width: '250' },
+  { label: '废品13', prop: 'sl_lb13', width: '250' },
+  { label: '废品14', prop: 'sl_lb14', width: '250' },
+  { label: '废品15', prop: 'sl_lb15', width: '250' },
+  { label: '废品16', prop: 'sl_lb16', width: '250' },
+  { label: '废品17', prop: 'sl_lb17', width: '250' },
+  { label: '创建用户', prop: 'sys_id', width: '200' }
+]
+const tableData = reactive([])
+
+const total = ref(0)
+const page = ref(1)
+const limit = ref(10)
+
+const searchInfo = ref('')
+const params = {
+  date: '',
+  sys_id: '',
+  order: '',
+  page: page.value.toString(),
+  limit: limit.value.toString(),
 }
 
-</script>
+// 批量删除控制标记
+const deleteVisible = ref(false)
+const multipleSelection = ref([])
 
-<script setup>
-import { use } from 'echarts/core'
-import { CanvasRenderer } from 'echarts/renderers'
-import { BarChart, LineChart, PieChart, ScatterChart } from 'echarts/charts'
-import { GridComponent, LegendComponent, TitleComponent, TooltipComponent } from 'echarts/components'
-import VChart, { THEME_KEY } from 'vue-echarts'
-import { provide, ref } from 'vue'
-
-use([
-  CanvasRenderer,
-  PieChart,
-  BarChart,
-  LineChart,
-  ScatterChart,
-  GridComponent,
-  TitleComponent,
-  TooltipComponent,
-  LegendComponent,
-])
-// provide(THEME_KEY, 'dark')
-
-const activeBtn = ref(null)
-const handleBtnActive = (e) => {
-  activeBtn.value = e.target.innerText
-  console.log(e.target.innerText)
+const getTableData = async() => {
+  const response = await getTable(params)
+  if (response.code === 0) {
+    total.value = response.data.total
+    // Object.assign(tableData, response.data.rows)
+    tableData.splice(0, tableData.length, ...response.data.rows)
+  }
 }
 
-const currentFrequency = ref('2023-01-02 08:30')
-
-const option1 = ref({
-  xAxis: {
-    data: ['待单', '维修', '保养', '测试', '打样', '待料', '装版', '生产'],
-  },
-  yAxis: {
-    name: '状态时长(小时)',
-    nameLocation: 'end',
-    nameGap: 5,
-    nameTextStyle: {
-      align: 'left',
-      verticalAlign: 'bottom',
-    },
-  },
-  grid: {
-    left: '8%',
-    right: '2%',
-    top: '22%',
-    bottom: '15%',
-  },
-  series: {
-    type: 'bar',
-    label: {
-      show: true,
-      position: 'top',
-    },
-    data: [
-      0, 0, 0, 0, 0, 0, 2.39, 19.36,
-    ],
-  },
-  textStyle: {
-    fontWeight: 'bolder',
-    fontSize: 16,
-
-  },
-})
+// 左侧树结构点击
+const handleNodeClick = (node, check) => {
+  if (node.params) {
+    params.date = node.params.date
+    params.sys_id = node.params.sys_id
+    page.value = 1
+    handleCurrentChange()
+  }
+}
+
+// 搜索
+function handleSearch() {
+  params.sys_id = ''
+  params.date = ''
+  params.order = searchInfo.value
+  page.value = 1
+  handleCurrentChange()
+}
 
-// 生成横坐标(每分钟一个点,显示时间格式为 "HH:mm")
-const data = []
-for (let i = 510; i <= 1230; i++) { // 08:30 到 20:30 的分钟数范围
-  const hours = Math.floor(i / 60)
-  const minutes = i % 60
-  const time = (hours < 10 ? '0' + hours : hours) + ':' + (minutes < 10 ? '0' + minutes : minutes)
-  data.push([time, Math.random() * 1000])
+// 分页
+const handleSizeChange = () => {
+  params.limit = limit.value.toString()
+  getTableData()
 }
-const xAxisData = data.map(item => item?.[0])
-
-const option2 = ref({
-  xAxis: {
-    type: 'category',
-    axisLabel: {
-      interval: 59, // 控制显示的刻度标签间隔,每小时一个
-    },
-  },
-  yAxis: {
-    name: '实时产量',
-    nameLocation: 'end',
-    nameGap: 5,
-    nameTextStyle: {
-      align: 'left',
-      verticalAlign: 'bottom',
+
+// 页面跳转
+const handleCurrentChange = () => {
+  params.page = page.value.toString()
+  getTableData()
+}
+
+// ============== 详情页面 ==============
+const detailData = reactive({})
+const selectData = reactive([])
+const selectColumns = [
+  { label: '', prop: 'sczl_gxmc', width: '600' },
+  { label: '', prop: 'sczl_bzdh', width: '100' },
+  { label: '', prop: 'name', width: '100' },
+]
+let selecTreeData = []
+
+// 行为控制标记(弹窗内部需要增还是改)
+const type = ref('')
+
+// 弹窗控制标记
+const dialogFormVisible = ref(false)
+const dialogSelectVisible1 = ref(false)
+const dialogSelectVisible2 = ref(false)
+
+let selectIndex = 0
+
+const getDetailData = async(id) => {
+  try {
+    const res = await getOneWorkOrder({ UniqId: id })
+    if (res.code === 0) {
+      const obj = res.data
+      // 裁剪返回数据的前后空格
+      for (const key in obj) {
+        if (Object.prototype.hasOwnProperty.call(obj, key) && typeof obj[key] === 'string') {
+          obj[key] = obj[key].trim()
+        }
+      }
+      // 修改日期格式
+      if (Object.prototype.hasOwnProperty.call(obj, 'qczl_rq') && typeof obj['qczl_rq'] === 'string') {
+        obj['qczl_rq'] = obj['qczl_rq'].split(' ')[0]
+      }
+
+      Object.assign(detailData, obj)
+      const table = []
+
+      // 循环13行数据
+      for (let i = 1; i <= 13; i++) {
+        table.push({
+          fp_lb: detailData[`fp_lb${i}`] || '',
+          fp_sl: detailData[`fp_sl${i}`] || '',
+          fp_gxmc: detailData[`fp_gxmc${i}`] || '',
+          fp_bz: detailData[`fp_bz${i}`] || '',
+          fp_bh: detailData[`fp_bh${i}`] || '',
+          fp_name: detailData[`fp_name${i}`] || '',
+        })
+        // 从原对象中删除这些属性
+        delete detailData[`fp_lb${i}`]
+        delete detailData[`fp_sl${i}`]
+        delete detailData[`fp_gxmc${i}`]
+        delete detailData[`fp_bz${i}`]
+        delete detailData[`fp_bh${i}`]
+        delete detailData[`fp_name${i}`]
+      }
+      detailData.table = table
+      try {
+        const res = await getOrderInfo({ order: detailData.qczl_gdbh })
+        if (res.code === 0) {
+          detailData.Gd_cpmc = res.data.Gd_cpmc
+          dialogFormVisible.value = true
+        }
+      } catch (e) {
+        console.log(e)
+      }
     }
-  },
-  grid: {
-    left: '8%',
-    right: '2%',
-    top: '22%',
-    bottom: '15%',
-  },
-  tooltip: {
-    trigger: 'axis'
-  },
-  series: {
-    name: '速度',
-    type: 'line',
-    data: data,
-  },
-  textStyle: {
-    fontWeight: 'bolder',
-    fontSize: 16,
-  },
-})
+  } catch (e) {
+    console.log(e)
+  }
+}
 
-const option3 = ref({
-  xAxis: {
-    // type: 'value',
-    data: xAxisData,
-    axisLabel: {
-      interval: 59, // 控制显示的刻度标签间隔,每小时一个
-    },
-  },
-  yAxis: {
-    name: '检验时间',
-    nameLocation: 'end',
-    nameGap: 5,
-    nameTextStyle: {
-      align: 'left',
-      verticalAlign: 'bottom'
-    },
-    axisLine: {
-      show: true,
-    },
-    data: ['IPQC检验', '机台检验', '首件与过程'],
-  },
-  tooltip: {
-    trigger: 'item'
-  },
-  grid: {
-    left: '8%',
-    right: '2%',
-    top: '22%',
-    bottom: '15%',
-  },
-  series: {
-    type: 'scatter',
-    symbol: 'arrow',
-    symbolSize: 20,
-    label: {
-      show: true,
-      position: 'right',
-      formatter: '{@value}' // 点旁边显示label,这里使用name: '横坐标'这样写也可以,鼠标移入出现提示。
-    },
-    data: [
-      ['08:30', 'IPQC检验'],
-      ['10:30', 'IPQC检验'],
-      ['11:30', '机台检验'],
-      ['17:30', '机台检验'],
-    ],
-  },
-  textStyle: {
-    fontWeight: 'bolder',
-    fontSize: 16,
-  },
-})
+// 工单编号回车
+const handleGdbhEnter = async() => {
+  const res = await getOrderInfo({ order: detailData.qczl_gdbh })
+  if (res.code === 0) {
+    const { Gd_cpmc, yj_Yjno, yj_yjmc } = res.data
+    detailData.Gd_cpmc = Gd_cpmc
+    detailData.qczl_yjno = yj_Yjno
+    detailData.yj_yjmc = yj_yjmc
+  }
+}
+
+// 废品类别回车
+const handleFplbEnter = async(index, row) => {
+  let res
+  try {
+    res = await getWastInfo({ search: row.fp_lb })
+    if (res.code !== 0) {
+      return
+    }
+  } catch (e) {
+    console.log(e)
+    return
+  }
+
+  const obj = res.data
+  const treeData = []
+  for (const category in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, category)) {
+      const children = []
+
+      for (const subCategory in obj[category]) {
+        if (Object.prototype.hasOwnProperty.call(obj[category], subCategory)) {
+          const subChildren = obj[category][subCategory].map(item => {
+            return { label: item }
+          })
+
+          children.push({
+            label: subCategory,
+            children: subChildren
+          })
+        }
+      }
+
+      treeData.push({
+        label: category,
+        children: children
+      })
+    }
+  }
+  selecTreeData = treeData
+  selectIndex = index
+  dialogSelectVisible1.value = true
+}
+
+const handleFplbClick = (node, check) => {
+  if (!node.children) {
+    detailData.table[selectIndex].fp_lb = node.label
+    dialogSelectVisible1.value = false
+  }
+}
+
+// 废品数量回车
+const handleFpslEnter = async(index, row) => {
+  if (row.fp_sl === '0') {
+    detailData.table[index].fp_gxmc = ''
+    detailData.table[index].fp_bz = ''
+    detailData.table[index].fp_bh = ''
+    detailData.table[index].fp_name = ''
+    return
+  }
+
+  const params = {
+    type: row.fp_lb,
+    order: detailData.qczl_gdbh,
+  }
+  let res
+  try {
+    res = await getGxAndLeader(params)
+    if (res.code !== 0) {
+      return
+    }
+  } catch (e) {
+    console.log(e)
+    return
+  }
+  selectIndex = index
+  Object.assign(selectData, res.data)
+  dialogSelectVisible2.value = true
+}
+
+// 双击表格操作
+function doubleClick(row, column, event) {
+  type.value = 'update'
+  getDetailData(row.UniqId)
+}
+
+// 处理选择框回车操作
+const handleSelectClick = (row, column, event) => {
+  const { sczl_gxmc, sczl_bzdh, sczl_bh1, name } = row
+  const index = selectIndex
+  detailData.table[index].fp_gxmc = sczl_gxmc
+  detailData.table[index].fp_bz = sczl_bzdh
+  detailData.table[index].fp_bh = sczl_bh1
+  detailData.table[index].fp_name = name
+  dialogSelectVisible2.value = false
+}
+
+// 弹窗确定
+const enterDialog = async() => {
+  const restoredData = {
+    UniqId: detailData.UniqId,
+    qczl_gdbh: detailData.qczl_gdbh,
+    qczl_yjno: detailData.qczl_yjno,
+    qczl_gxh: detailData.qczl_gxh,
+    qczl_gxmc: detailData.qczl_gxmc,
+    qczl_rq: detailData.qczl_rq,
+    qczl_fp: detailData.qczl_fp,
+    qczl_num: detailData.qczl_num,
+    qczl_NumDesc: detailData.qczl_NumDesc,
+    qczl_NumDesc1: detailData.qczl_NumDesc1,
+    qczl_NumDesc2: detailData.qczl_NumDesc2,
+    qczl_NumDesc3: detailData.qczl_NumDesc3,
+    qczl_NumDesc4: detailData.qczl_NumDesc4,
+    qczl_NumDesc5: detailData.qczl_NumDesc5,
+    qczl_NumDesc6: detailData.qczl_NumDesc6,
+    qczl_NumDesc7: detailData.qczl_NumDesc7,
+    qczl_NumDesc8: detailData.qczl_NumDesc8,
+  }
+  detailData.table.forEach((item, index) => {
+    const num = index + 1
+    restoredData[`fp_lb${num}`] = item.fp_lb
+    restoredData[`fp_sl${num}`] = item.fp_sl
+    restoredData[`fp_bh${num}`] = item.fp_bh
+    restoredData[`fp_bz${num}`] = item.fp_bz
+    restoredData[`fp_gxmc${num}`] = item.fp_gxmc
+  })
+  const res = await updateData(restoredData)
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: res.msg,
+    })
+    dialogFormVisible.value = false
+  }
+}
+
+// 多选
+const handleSelectionChange = (val) => {
+  multipleSelection.value = val
+}
+
+// 多选删除
+const onDelete = async() => {
+  const ids = []
+  if (multipleSelection.value.length === 0) {
+    ElMessage({
+      type: 'warning',
+      message: '请选择要删除的数据'
+    })
+    return
+  }
+  multipleSelection.value &&
+    multipleSelection.value.map(item => {
+      ids.push(item.ID)
+    })
+  const res = await deleteCompanyByIds({ ids })
+  if (res.code === 0) {
+    ElMessage({
+      type: 'success',
+      message: '删除成功'
+    })
+    if (tableData.value.length === ids.length && page.value > 1) {
+      page.value--
+    }
+    deleteVisible.value = false
+    getTableData()
+  }
+}
+
+// 更新行
+const updateCompanyFunc = async(row) => {
+  const res = await findCompany({ ID: row.ID })
+  type.value = 'update'
+  if (res.code === 0) {
+    formData.value = res.data.recompany
+    dialogFormVisible.value = true
+  }
+}
+
+// 关闭弹窗
+const closeDialog = () => {
+  dialogFormVisible.value = false
+}
+
+// 导出excel
+function exportExcel() {
+  console.log('导出到excel')
+}
+
+const isShowMrhjtj = ref(false)
+const isShowGdzjfptj = ref(false)
+const value1 = ref('')
+const table = ref(null)
+const currentRow = ref()
+
+const showGdzjfptj = () => {
+  value1.value = currentRow.value?.qczl_gdbh
+  isShowGdzjfptj.value = true
+}
+
+const handleSelectChange = (row, column, event) => {
+  currentRow.value = row
+}
 
 </script>
 
 <style scoped>
-.active {
-  background-color: #528B34 !important;
+.JKWTree-container {
+  display: flex;
+}
+
+.JKWTree-tree {
+  width: 300px;
+  background-color: #fff;
+  padding: 10px;
+  margin-right: 20px;
+}
+
+.JKWTree-tree h3 {
+  font-size: 15px;
+  font-weight: 700;
+  margin: 10px 0;
+}
+
+.JKWTree-content {
+  flex: 1;
 }
 
-.btn-right {
-  width: 100px;
-  height: 50px;
-  margin-bottom: 5px;
-  margin-left: 30px;
-  color: #FFFFFF;
-  background-color: #C6BEC4;
-  font-size: 20px;
-  font-style: italic;
+/* 选中某行时的背景色 */
+:deep(.el-table__body tr.current-row) > td {
+  background: #ff80ff !important;
 }
 </style>

+ 26 - 4
src/view/performance/Dayreportattached.vue

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

+ 237 - 48
src/view/performance/Dayreports.vue

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

+ 65 - 22
src/view/performance/MachineDocuments.vue

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

+ 81 - 27
src/view/performance/Manualdocuments.vue

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

+ 63 - 13
src/view/performance/Packagingoutput.vue

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

+ 138 - 95
src/view/performance/chejianbaogong.vue

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

+ 75 - 26
src/view/yunyin/shengchanguanli/chengpinrucang.vue

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