From c73fade91be7fed5e5256cad8226f8b9a2e3e625 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 18 Jul 2022 15:02:49 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A1=AB=E6=8A=A5?=
 =?UTF-8?q?=E5=BA=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/equipment/MaintainResultFill.vue          | 7 +++++--
 .../xinrui/storage/emptytray/WeighExceptionHandle.vue      | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/pages/xinrui/equipment/MaintainResultFill.vue b/src/pages/xinrui/equipment/MaintainResultFill.vue
index 77f37b0..4c4f56a 100644
--- a/src/pages/xinrui/equipment/MaintainResultFill.vue
+++ b/src/pages/xinrui/equipment/MaintainResultFill.vue
@@ -30,7 +30,7 @@
             </tr>
             <tr v-for="e in dataList" :key="e.repair_dtl_id">
               <td>
-                {{parseInt(i) + 1}}
+                {{e.indexId}}
               </td>
             </tr>
           </table>
@@ -95,7 +95,10 @@ export default {
     async _queryRepairDtl () {
       let res = await queryRepairDtl(this.$store.getters.materObj)
       if (res.code === '1') {
-        this.dataList = [...res.content.rows]
+        res.rows.map((e, i) => {
+          this.$set(e, 'indexId', parseInt(i) + 1)
+        })
+        this.dataList = [...res.rows]
       } else {
         this.Dialog(res.desc)
       }
diff --git a/src/pages/xinrui/storage/emptytray/WeighExceptionHandle.vue b/src/pages/xinrui/storage/emptytray/WeighExceptionHandle.vue
index 34e2617..9c77765 100644
--- a/src/pages/xinrui/storage/emptytray/WeighExceptionHandle.vue
+++ b/src/pages/xinrui/storage/emptytray/WeighExceptionHandle.vue
@@ -21,8 +21,8 @@
             <tr>
             <th>顺序号</th>
             </tr>
-            <tr v-for="(e, i) in dataList" :key="e.bucketunique">
-              <td>{{i + 1}}</td>
+            <tr v-for="e in dataList" :key="e.bucketunique">
+              <td>{{e.indexId}}</td>
             </tr>
           </table>
         </div>
@@ -105,6 +105,9 @@ export default {
       }
       let res = await unUsualQuery(e, this.val1)
       if (res.code === '1') {
+        res.rows.map((e, i) => {
+          this.$set(e, 'indexId', parseInt(i) + 1)
+        })
         this.dataList = [...res.rows]
       } else {
         this.toast(res.desc)

From cff95000fb39555c91d5c4acdfbcf61802ce0455 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 18 Jul 2022 16:12:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/xinrui/equipment/EquipRepairConfirm.vue |  1 +
 src/pages/xinrui/equipment/EquipRepairExecute.vue |  7 ++++++-
 src/pages/xinrui/equipment/MaintainResultFill.vue | 13 ++++++++++---
 src/pages/xinrui/equipment/MaintainResults.vue    |  8 ++++----
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/pages/xinrui/equipment/EquipRepairConfirm.vue b/src/pages/xinrui/equipment/EquipRepairConfirm.vue
index 5486683..e8bf245 100644
--- a/src/pages/xinrui/equipment/EquipRepairConfirm.vue
+++ b/src/pages/xinrui/equipment/EquipRepairConfirm.vue
@@ -96,6 +96,7 @@ export default {
         let res = await repairOpeate(this.pkObj, type)
         if (res.code === '1') {
           this.toast(res.desc)
+          this._queryRepairs(this.val1)
         } else {
           this.Dialog(res.desc)
         }
diff --git a/src/pages/xinrui/equipment/EquipRepairExecute.vue b/src/pages/xinrui/equipment/EquipRepairExecute.vue
index 41db34e..a8927e9 100644
--- a/src/pages/xinrui/equipment/EquipRepairExecute.vue
+++ b/src/pages/xinrui/equipment/EquipRepairExecute.vue
@@ -74,7 +74,11 @@ export default {
     }
     next()
   },
-  activated () {},
+  activated () {
+    if (this.val1) {
+      this._queryRepairs(this.val1)
+    }
+  },
   methods: {
     handleChange1 (e, type) {
       if (type) {
@@ -95,6 +99,7 @@ export default {
         let res = await repairOpeate(this.pkObj, type)
         if (res.code === '1') {
           this.toast(res.desc)
+          this._queryRepairs(this.val1)
         } else {
           this.Dialog(res.desc)
         }
diff --git a/src/pages/xinrui/equipment/MaintainResultFill.vue b/src/pages/xinrui/equipment/MaintainResultFill.vue
index 4c4f56a..97c812b 100644
--- a/src/pages/xinrui/equipment/MaintainResultFill.vue
+++ b/src/pages/xinrui/equipment/MaintainResultFill.vue
@@ -18,12 +18,12 @@
         <div class="bottom-filter-tip">
           <div class="filter-label txtjustify">生产负责人</div>
           <div class="fxcol mgl20">
-            <input type="text" class="filter-input filter-scan-input" disabled v-model="val3">
+            <input type="text" class="filter-input filter-scan-input" v-model="val3">
           </div>
         </div>
       </div>
       <div class="grid-wraper">
-        <div class="left_fixed">
+        <div class="left_fixed pdb140">
           <table class="layout-t left_layout_t">
             <tr>
             <th>序号</th>
@@ -35,7 +35,7 @@
             </tr>
           </table>
         </div>
-        <div class="slide">
+        <div class="slide pdb140">
           <table class="layout-t">
             <tr>
               <th>是否完成</th>
@@ -139,3 +139,10 @@ export default {
   }
 }
 </script>
+
+<style lang="stylus" scoped>
+.filter-label
+  width 1.6rem
+.pdb140
+  padding-bottom 1.4rem
+</style>
diff --git a/src/pages/xinrui/equipment/MaintainResults.vue b/src/pages/xinrui/equipment/MaintainResults.vue
index 9c2b70a..aa3e199 100644
--- a/src/pages/xinrui/equipment/MaintainResults.vue
+++ b/src/pages/xinrui/equipment/MaintainResults.vue
@@ -17,7 +17,7 @@
         </div>
       </div>
       <div class="grid-wraper">
-        <div class="left_fixed">
+        <div class="left_fixed pdb140">
           <table class="layout-t left_layout_t">
             <tr>
             <th>是否完成</th>
@@ -33,7 +33,7 @@
             </tr>
           </table>
         </div>
-        <div class="slide">
+        <div class="slide pdb140">
           <table class="layout-t">
             <tr>
               <th>保养项目名称</th>
@@ -144,6 +144,6 @@ export default {
 </script>
 
 <style lang="stylus" scoped>
-.mgb140
-  margin-bottom 1.4rem
+.pdb140
+  padding-bottom 1.4rem
 </style>