From c4e67a8942e514b65ab41bb19781d50576c15725 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Fri, 24 Sep 2021 19:56:52 +0800
Subject: [PATCH] 用户

---
 src/views/securityAnalysis/child/dispatch.vue |   43 +++++++++++++++++++------------------------
 1 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/src/views/securityAnalysis/child/dispatch.vue b/src/views/securityAnalysis/child/dispatch.vue
index 1dc10e9..f82a5b6 100644
--- a/src/views/securityAnalysis/child/dispatch.vue
+++ b/src/views/securityAnalysis/child/dispatch.vue
@@ -19,10 +19,19 @@
 export default {
   props: ["card"],
   data() {
-    var jurisdiction =
-      this.card.jurisdiction == "1372091709474910209"
-        ? "1372091709474910209"
-        : this.card.jurisdiction;
+    var dicUrl =
+        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+      search = true;
+    if (this.card.jurisdiction != "") {
+      dicUrl =
+        "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697&jurisdiction=" +
+        this.card.jurisdiction;
+    } else if (this.card.jurisdiction == 1372091709474910209) {
+      // a = "";
+    }
+    if (this.card.deptId != "") {
+      search = false;
+    }
     return {
       securityid1: "",
       ExperienceVisible: false,
@@ -80,8 +89,7 @@
             prop: "deptName",
             type: "tree",
             overHidden: true,
-            dicUrl:
-              "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+            dicUrl: dicUrl,
             props: {
               label: "title",
               value: "id",
@@ -101,7 +109,7 @@
             labelWidth: 118,
             width: 230,
             searchLabelWidth: 80,
-            search: true,
+            search: search,
             searchSpan: 4,
             // editDisplay: false,
             // addDisplay: false,
@@ -219,7 +227,7 @@
             prop: "jurisdiction",
             hide: true,
             searchLabelWidth: 80,
-            search: true,
+            search: search,
             searchSpan: 4,
             overHidden: true,
             labelWidth: 118,
@@ -291,19 +299,6 @@
       return "";
     },
     getPractitionersPageInfo(page, params = {}) {
-      // this.card.jurisdiction = "130";
-      // this.card.this.card = "1425365571343515649";
-      // if (params.hold == undefined) {
-      //   params.hold = 1;
-      // }
-      if (this.card.jurisdiction != "" || this.card.jurisdiction != undefined) {
-        if (this.query1.deptId != "" || this.query1.deptId != undefined) {
-          this.card.deptId = this.query1.deptId;
-        }
-        this.option1.column[2].search = true;
-      } else {
-        this.option1.column[2].search = false;
-      }
       if (this.card.jurisdiction == 1372091709474910209) {
         this.card.jurisdiction = "";
       }
@@ -312,22 +307,22 @@
       if (releaseTimeRange) {
         params = {
           ...params,
+          ...this.card,
           beginTime: releaseTimeRange[0],
           overTime: releaseTimeRange[1],
           status: 1,
           ...this.query1,
-          ...this.card,
         };
         // values.releaseTimeRange = null;
       } else {
         params = {
           ...params,
+          ...this.card,
           ...this.query1,
           status: 1,
-          ...this.card,
         };
       }
-      console.log(params);
+      // console.log(params);
       getdata(page.currentPage, page.pageSize, params).then((res) => {
         // console.log(res.data.data.records);
         const data = res.data.data;

--
Gitblit v1.9.3