From c224e85141eca6ff5dd6733d0c2839cce319c8be Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 02 Dec 2021 17:14:28 +0800
Subject: [PATCH] +

---
 src/views/licenseApproval/securityGuard.vue  |   30 ++++++++++++++++++++++++++----
 src/views/licenseApproval/securityPermit.vue |   29 +++++++++++++++++++++++------
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 84b5cc8..14c16bd 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -2,7 +2,7 @@
  * @Author: liu
  * @Date: 2021-08-26 16:57:58 
  * @Last Modified by: liu
- * @Last Modified time: 2021-11-25 17:38:08
+ * @Last Modified time: 2021-12-02 17:04:32
  */
 
 
@@ -567,14 +567,36 @@
       var b = data;
       if (this.user_name == "派") {
         // 派出所审批
-        b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.papprove == "0" || b.papprove == ""
+            ? "0"
+            : b.papprove == "1"
+            ? "1"
+            : "2";
       } else if (this.user_name == "县") {
         // 分局审批
-        b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.xapprove == "0" || b.xapprove == ""
+            ? "0"
+            : b.xapprove == "1"
+            ? "1"
+            : "2";
       } else if (this.user_name == "市") {
         // 市局审批
-        b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.sapprove == "0" || b.sapprove == ""
+            ? "0"
+            : b.sapprove == "1"
+            ? "1"
+            : "2";
       }
+      console.log(
+        b.papprove == "0" || b.papprove == ""
+          ? "0"
+          : b.papprove == "1"
+          ? "1"
+          : "2"
+      );
       return b;
     },
     onLoad(page, params = {}) {
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index adfa6a2..fc473aa 100644
--- a/src/views/licenseApproval/securityPermit.vue
+++ b/src/views/licenseApproval/securityPermit.vue
@@ -3,7 +3,7 @@
  * @Author: liu
  * @Date: 2021-08-26 16:22:20 
  * @Last Modified by: liu
- * @Last Modified time: 2021-11-25 18:49:29
+ * @Last Modified time: 2021-12-02 17:14:20
  */
 
 <template>
@@ -558,18 +558,35 @@
       return d;
     },
     changeState(data) {
-      var b = data;
+      var b = {
+        ...data,
+        stateOur: "",
+      };
       if (this.user_name == "派") {
         // 派出所审批
-        b["stateOur"] = b.papprove == "0" ? "0" : b.papprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.papprove == "0" || b.papprove == ""
+            ? "0"
+            : b.papprove == "1"
+            ? "1"
+            : "2";
       } else if (this.user_name == "县") {
         // 分局审批
-        b["stateOur"] = b.xapprove == "0" ? "0" : b.xapprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.xapprove == "0" || b.xapprove == ""
+            ? "0"
+            : b.xapprove == "1"
+            ? "1"
+            : "2";
       } else if (this.user_name == "市") {
         // 市局审批
-        b["stateOur"] = b.sapprove == "0" ? "0" : b.sapprove == "1" ? "1" : "2";
+        b["stateOur"] =
+          b.sapprove == "0" || b.sapprove == ""
+            ? "0"
+            : b.sapprove == "1"
+            ? "1"
+            : "2";
       }
-      // console.log(this.user_name);
       return b;
     },
     onLoad(page, params = {}) {

--
Gitblit v1.9.3