Merge remote-tracking branch 'origin/master' into master

src/pages/main/gridDivision/approvalExamination.vue

@@ -91,7 +91,7 @@ export default {
       opinion_visible: false,
       track_visible: false,
       opinion_form: {},
-      status:'',
+      status: "",
       isAgree: false,
       // 单条审批id
       ids: "",
@@ -179,7 +179,7 @@ export default {
         {
           label: "不通过",
           props: "back",
-          visible: { sts: ["0"] },
+          visible: { sts: [0] },
         },
         {},
         {},
@@ -220,12 +220,12 @@ export default {
   },
   watch: {
     parentId() {
+      this.status = this.$route.query.status;
       this.handleInit();
     },
   },
-  mounted() {
+  created() {
     this.parentId = this.$route.query.parentId;
-    this.status = this.$route.query.status;
   },
   methods: {
     // 表格数据初始化
@@ -252,10 +252,10 @@ export default {
           ? data.map((element, index) => ({
               ...element,
               No: index + 1,
-              sts:Number(this.status)
+              sts: Number(this.status),
             }))
           : [];
-        this.table_list && this.table_list[0].sts === "0"
+        this.table_list && this.table_list[0].sts === 0
           ? (this.table_handle = [
               {
                 label: "返回",
@@ -403,14 +403,15 @@ export default {
           },
         }).then((res) => {
           console.log(res);
+          this.status = 1;
           this.handleInit();
         });
       }
 
       this.handleVisible("opinion");
     },
-    handleReturn(){
-      this.$router.go(-1)
+    handleReturn() {
+      this.$router.go(-1);
     },
     // 审批轨迹--确定关闭模态框
     handleConsent() {