From 99a010f21d278498bafd248217c584e101db2d8f Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期四, 01 九月 2022 17:27:17 +0800
Subject: [PATCH] 1.自动扫码回车功能接入

---
 src/views/sbgl/bybz.vue |   40 +++++++++++++++++++++++++++-------------
 1 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/src/views/sbgl/bybz.vue b/src/views/sbgl/bybz.vue
index 974b262..fca7c1e 100644
--- a/src/views/sbgl/bybz.vue
+++ b/src/views/sbgl/bybz.vue
@@ -51,6 +51,7 @@
           <el-table-column
             prop="RowNum"
             width="50"
+            fixed
             label="搴忓彿"
           />
           <el-table-column
@@ -76,19 +77,26 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="iscontr"
+            prop="main_cycle"
             label="淇濆吇鍛ㄦ湡"
             sortable="custom"
-          />
+          >
+            <template slot-scope="{row}">
+              <div v-if="row.main_cycle==='Y'">骞�</div>
+              <div v-if="row.main_cycle==='S'">瀛�</div>
+              <div v-if="row.main_cycle==='M'">鏈�</div>
+              <div v-if="row.main_cycle==='W'">鍛�</div>
+            </template>
+          </el-table-column>
           <el-table-column
-            prop="is_checkeqp"
+            prop="is_repaireqp"
             label="鍏宠仈璁惧"
             sortable="custom"
           >
             <template slot-scope="{row}">
-              <i v-if="row.is_checkeqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
+              <i v-if="row.is_repaireqp==='Y'" class="el-icon-share" @click="checkeqpClick(row)" />
               <i
-                v-if="row.is_checkeqp==='N'"
+                v-if="row.is_repaireqp==='N'"
                 class="el-icon-share"
                 style="color: rgb(180 ,181, 185)"
                 @click="checkeqpClick(row)"
@@ -130,7 +138,7 @@
         :page.sync="form.page"
         :limit.sync="form.rows"
         align="right"
-        layout="prev, pager, next,sizes"
+        layout="total,prev, pager, next,sizes"
         popper-class="select_bottom"
         @pagination="getDeviceRepairStandArdSearch"
       />
@@ -390,7 +398,7 @@
   DeviceCheckStanedAssociationEqp, DeviceRepairItemSelect,
   DeviceRepairStandArdSearch, DeviceRepairStanedAssociationEqp,
   SaveDeviceCheckStanedAssociationEqp, SaveDeviceRepairStanedAssociationEqp,
-  ViewDeviceCheckStanedSearch
+  ViewDeviceCheckStanedSearch, ViewDeviceRepairStanedSearch
 } from '@/api/sbgl'
 import $ from 'jquery'
 
@@ -566,7 +574,7 @@
     // 淇敼鎸夐挳
     edit(operation, row) {
       this.operation = operation
-      this.getViewDeviceCheckStanedSearch(row.code)
+      this.getViewDeviceRepairStanedSearch(row.code)
       this.dialogVisible = true
 
       this.$nextTick(() => {
@@ -580,8 +588,8 @@
       // })
     },
     // 淇敼鍓嶈姹傛帴鍙�
-    async getViewDeviceCheckStanedSearch(checkstand_code) {
-      const { data: res } = await ViewDeviceCheckStanedSearch({ checkstand_code })
+    async getViewDeviceRepairStanedSearch(repairstand_code) {
+      const { data: res } = await ViewDeviceRepairStanedSearch({ repairstand_code	 })
       this.tableDataDialog = res.Data
 
       this.dialogForm.code = res.code
@@ -593,7 +601,7 @@
         item.isVisible = 0
         item.repairitem_code = item.code
         item.repairitem_name = item.name
-        item.repairitem_descr = item.chkdesc
+        item.repairitem_descr = item.chk_desc
       })
 
       this.repairItemSelectArr = [...this.repairItemSelectArr].filter(x => [...this.tableDataDialog].every(y => y.repairitem_code !== x.code))
@@ -608,6 +616,9 @@
         DeleteDeviceRepairStaned({ repairstand_code: row.code }).then(res => {
           if (res.code === '200') {
             this.$message.success('鍒犻櫎鎴愬姛!')
+            if (this.form.page > 1 && this.tableData.length === 1) {
+              this.form.page--
+            }
             this.getDeviceRepairStandArdSearch()
           }
         })
@@ -781,8 +792,8 @@
       this.dialogFormEqp.name = row.name
       this.dialogFormEqp.code = row.code
 
-      const { data: res } = await DeviceRepairStanedAssociationEqp({ checkstand_code: row.code })
-      this.dialogFormEqp.eqpAll = res
+      const { data: res } = await DeviceRepairStanedAssociationEqp({ repairstand_code: row.code })
+      this.dialogFormEqp.eqpAll = res.filter(item => item.children.length > 0)
 
       if (this.dialogFormEqp.eqpAll.length > 0) {
         this.dialogFormEqp.eqpAll.forEach((item, index) => {
@@ -835,6 +846,9 @@
           this.dialogFormEqp.eqpTree = [this.dialogFormEqp.eqpAll[index]]
         }
       })
+      this.$nextTick(() => { // 鏍戝舰鍥炴樉
+        this.$refs.epqTree.setCheckedKeys(this.dialogFormEqp.eqpCodeSelectedArr)
+      })
     },
     // 灏忕洅瀛愮偣鍑�
     myCheckboxInputClick(val) {

--
Gitblit v1.9.3