Hwt 2 vuotta sitten
vanhempi
commit
f8a364f98d
1 muutettua tiedostoa jossa 23 lisäystä ja 22 poistoa
  1. 23 22
      operationSupport/src/views/workOrders/index.vue

+ 23 - 22
operationSupport/src/views/workOrders/index.vue

@@ -259,28 +259,6 @@ export default {
     },
     closeTask (row, data = {}) {
       this.checkAudit(row);
-      new Promise((resolve) => {
-        let title = '关闭工单';
-        this.$store.dispatch('addPopup', {
-          url: '/workOrders/popups/closeTsk.vue',
-          width: '500px',
-          height: '280px',
-          props: {
-            data,
-            row,
-            closeAudit: this.$closeAudit,
-            callback: resolve
-          },
-          notip: true,
-          title: title,
-          confirmButtonText: row.auditStatus == null ? '提交审核' : '确认',
-          showConfirmButton: row.auditStatus == 2 ? true : this.dataJurisdiction == '1' ? true : false,
-          showCancelButton: row.auditStatus == 2 ? true : this.dataJurisdiction == '1' ? true : false,
-          hideStar: row.auditStatus == 2 ? true : this.dataJurisdiction == '1' ? true : false,
-        });
-      }).then(() => {
-        this.mixins_search();
-      });
     },
     addOrEdit () {
       new Promise((resolve) => {
@@ -326,6 +304,29 @@ export default {
       this.$http.postForm('/czc-community/workOrder/checkAudit', { orderId: Number(row.id) }).then(({ data, status, msg }) => {
         if (status == 0) {
           this.dataJurisdiction = data;
+          console.log('this.dataJurisdiction', this.dataJurisdiction);
+          new Promise((resolve) => {
+            let title = '关闭工单';
+            this.$store.dispatch('addPopup', {
+              url: '/workOrders/popups/closeTsk.vue',
+              width: '500px',
+              height: '280px',
+              props: {
+                data,
+                row,
+                closeAudit: this.$closeAudit,
+                callback: resolve
+              },
+              notip: true,
+              title: title,
+              confirmButtonText: row.auditStatus == null ? '提交审核' : '确认',
+              showConfirmButton: row.auditStatus == null ? false : row.auditStatus == 2 ? true : this.dataJurisdiction != '1' ? true : false,
+              showCancelButton: row.auditStatus == 2 ? true : this.dataJurisdiction != '1' ? true : false,
+              hideStar: row.auditStatus == 2 ? true : this.dataJurisdiction != '1' ? true : false,
+            });
+          }).then(() => {
+            this.mixins_search();
+          });
         }
       })
     }