工单审核

operationSupport/src/views/workOrders/index.vue

@@ -111,6 +111,7 @@
             effect="light"
             placement="bottom"
             :content="scope.row.orderStatus == 4 ? '已关闭' : '关闭'"
+            v-if="$closeAudit"
           >
             <i
               v-if="scope.row.orderStatus !== 4"
@@ -187,7 +188,9 @@ export default {
             if (val == 1) {
               return '审核中'
             } else if (val == 2) {
-              return '已审核'
+              return '审核通过'
+            } else if (val == 3) {
+              return '审核不通过'
             } else {
               return '-'
             }
@@ -304,7 +307,6 @@ 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', {
@@ -319,10 +321,10 @@ export default {
               },
               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,
+              confirmButtonText: row.auditStatus == null ? '提交审核' : row.auditStatus == '3' ? '提交审核' : '确认',
+              showConfirmButton: row.auditStatus == null ? false : row.auditStatus == '3' ? false : row.auditStatus == 2 ? true : this.dataJurisdiction != '1' ? true : false,
+              showCancelButton: row.auditStatus == 2 ? true : row.auditStatus == '3' ? true : this.dataJurisdiction != '1' ? true : false,
+              hideStar: row.auditStatus == 2 ? true : row.auditStatus == '3' ? true : this.dataJurisdiction != '1' ? true : false,
             });
           }).then(() => {
             this.mixins_search();

operationSupport/src/views/workOrders/popups/closeTsk.vue

@@ -6,10 +6,11 @@
       :rules="formRules"
       labelWidth="90"
       ref="form"
-      v-if="this.params.row.auditStatus == null ? true :false"
+      v-if="this.params.row.auditStatus == null ? true : this.params.row.auditStatus == '3' ? true :  false"
     > </zz-form>
     <template>
-      <div v-if="this.params.row.auditStatus != null ? true :false">
+      <!-- v-if="this.params.row.auditStatus != null ? true  : this.params.row.auditStatus == '3' ? true : false" -->
+      <div v-if="this.params.row.auditStatus == '3' ? false :  this.params.row.auditStatus != null ? true  : false">
         <el-form
           ref="form"
           :model="form"
@@ -28,7 +29,6 @@
               disabled
             ></el-input>
           </el-form-item>
-
           <el-form-item
             label="审核"
             v-if="this.params.closeAudit && (this.dataJurisdiction == '1' ? true : false)"
@@ -84,7 +84,7 @@ export default {
 
   methods: {
     submit () {
-      if (this.params.row.auditStatus == null) {
+      if (this.params.row.auditStatus == null || this.params.row.auditStatus == '3') {
         new Promise((resolve) => {
           this.$refs.form.validate(resolve);
         }).then(() => {
@@ -134,9 +134,8 @@ export default {
     // this.formData.orderId = JSON.parse(JSON.stringify(this.params.data)).id;
     this.params.row.id;
     this.formData.orderId = this.params.row.id;
-
     this.form.cause = this.params.row.cause;
-    this.form.auditStatus = this.params.row.auditStatus == '1' ? '审核中' : '已审核';
+    this.form.auditStatus = this.params.row.auditStatus == '1' ? '审核中' : this.params.row.auditStatus == '2' ? '审核通过' : '审核不通过';
     if (this.params.row.auditStatus == 2) {
       this.form.resource = '0';
     }
@@ -144,6 +143,8 @@ export default {
       this.checkAudit();
     }
 
+
+
   }
 };
 </script>