safecheck-client 4.0.0-10 → 4.0.0-101

package/src/components/pc/NewCheckpaper.vue

@@ -141,7 +141,7 @@ div {
               <tr>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">入户状态:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_entry_status }}</td>
-                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">燃气使用:</td>
+                <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用气状态:</td>
                 <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_usegas }}</td>
               </tr>
               <tr>
@@ -543,7 +543,7 @@ div {
                       paperdata.f_entry_status
                     }}
                   </td>
-                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">燃气使用:</td>
+                  <td style="text-align: center;border: #E9E9E9 solid 1px;width: 17%">用气状态:</td>
                   <td style="text-align: center;border: #E9E9E9 solid 1px;width: 33%">{{ paperdata.f_usegas }}</td>
                 </tr>
                 <tr>
@@ -959,7 +959,7 @@ let asyncReady = async function (self) {
 }
 export default {
   title: '安检单',
-  props: ['f_plan_id', 'item', 'role'],
+  props: ['f_plan_id', 'item', 'role','gotoitem'],
   data() {
     return {
       f_user_path:'',
@@ -1132,7 +1132,7 @@ export default {
       }).then((res) => {
         if (res.data.code == 200) {
           this.loading = false;
-          this.$back()
+          this.$emit('showback')
         }
       })
     },
@@ -1159,7 +1159,7 @@ export default {
           this.loading = false;
           this.message = '';
           this.showModel = false;
-          this.$back()
+          this.$emit('showback')
         }
       })
     },
@@ -1351,9 +1351,11 @@ export default {
       }
       //tag
       //tag)
-      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType) {
+      if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度普检']) {
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度普检'][this.item.f_check_type]])
-      } else if (Vue.config.safecheck.SafecheckType){
+      }else if (!this.item.f_safecheck_type && Vue.config.safecheck.SafecheckType && Vue.config.safecheck.SafecheckType['年度安检']){
+        this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType['年度安检'][this.item.f_check_type]])
+      }else if (Vue.config.safecheck.SafecheckType && Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type]]){
         this.config = this.extend(this.config, Vue.config.safecheck[Vue.config.safecheck.SafecheckType[this.item.f_safecheck_type][this.item.f_check_type]])
       }else {
         if(this.item.f_check_type == '民用'){
@@ -1512,16 +1514,20 @@ export default {
     back() {
       if (this.role == 'inspect') {
         if (!this.isStrat) {
-          this.$back()
+          this.$emit('showback')
           return
         } else {
           this.savePaper(true).then(() => {
-            this.$back()
+            this.$emit('showback')
             this.isStrat = false
           })
         }
       } else {
-        this.$back()
+        if(this.gotoitem){
+          this.$back()
+          return
+        }
+        this.$emit('showback')
       }
     },
     checkIsStart() {

package/src/components/pc/NewCheckpaperTemp.vue

@@ -572,7 +572,7 @@
         }).then((res) => {
           if (res.data.code == 200) {
             this.loading = false;
-            this.$back()
+            this.$emit('showback')
           }
         })
       },
@@ -599,7 +599,7 @@
             this.loading = false;
             this.message = '';
             this.showModel = false;
-            this.$back()
+            this.$emit('showback')
           }
         })
       },
@@ -938,16 +938,16 @@
       back() {
         if (this.role == 'inspect') {
           if (!this.isStrat) {
-            this.$back()
+            this.$emit('showback')
             return
           } else {
             this.savePaper(true).then(() => {
-              this.$back()
+              this.$emit('showback')
               this.isStrat = false
             })
           }
         } else {
-          this.$back()
+          this.$emit('showback')
         }
       },
       checkIsStart() {

package/src/components/pc/PaperDefectMain.vue

@@ -642,6 +642,7 @@
           f_outlets: this.$login.f.deps,
           f_remarks: this.selectData.f_remarks,
           f_repairtype: this.selectData.f_repairtype,
+          dispatchType: this.selectData.dispatchType,
           toRepair: toRepair,
           activity:act
         }

package/src/components/pc/RoleSelectorDep.vue

@@ -127,11 +127,12 @@
         if (resids.length > 0 && typeof resids[0] == "object") {
           resids = resids[0]
         }
+        this.allUsers = []
+        this.users = []
         if (resids[0]) {
           this.source = `root.getResourceById($${resids[0]}$,$department$).getSpecialResByType($user$).where(row.getAttributes().get($rolestr$).indexOf($${this.roleName}$) != -1)`
           await this.search()
         }
-        this.users = []
         this.allUsers.forEach(user => {
             this.users.push({label: user.name, value: user.name})
         })