From 31d259b313bb6cbddea6dd67d2c05fe5680eaf33 Mon Sep 17 00:00:00 2001
From: Apcallover <1503963513@qq.com>
Date: Tue, 14 May 2024 16:26:07 +0800
Subject: [PATCH] =?UTF-8?q?flat:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/city-cascader/main.vue           | 12 +++++++-----
 src/page/login/userlogin.vue                    |  3 ++-
 src/store/modules/area.js                       |  9 +++++----
 src/views/manage/company/companyList.vue        |  1 +
 src/views/tenant/mission/Dialog/CopyMission.vue |  2 +-
 src/views/tenant/works/Dialog/CopyMission.vue   |  2 +-
 6 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/components/city-cascader/main.vue b/src/components/city-cascader/main.vue
index 278e7ed..1b1ac02 100644
--- a/src/components/city-cascader/main.vue
+++ b/src/components/city-cascader/main.vue
@@ -11,11 +11,12 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
+import {mapGetters} from "vuex";
 
 function getProv(code) {
   return code.substring(0, 2) + "0000";
 }
+
 function getCity(code) {
   return code.substring(0, 4) + "00";
 }
@@ -25,7 +26,7 @@ export default {
     value: String,
     filterable: Boolean,
     placeholder: String,
-    showAllLevels: { type: Boolean, default: true },
+    showAllLevels: {type: Boolean, default: true},
     disabled: Boolean,
     clearable: Boolean,
   },
@@ -41,14 +42,14 @@ export default {
   computed: {
     ...mapGetters(["area"]),
     prov() {
-      if (this.county) {
+      if (this.county && this.county != -1) {
         return getProv(this.county);
       } else {
         return "";
       }
     },
     city() {
-      if (this.county) {
+      if (this.county && this.county != -1) {
         return getCity(this.county);
       } else {
         return "";
@@ -60,6 +61,7 @@ export default {
       },
       set(val) {
         this.$emit("input", val);
+        return val;
       },
     },
     model: {
@@ -71,7 +73,7 @@ export default {
         }
       },
       get() {
-        if (this.county) {
+        if (this.county && this.county != -1) {
           return [this.prov, this.city, this.county];
         }
         return null;
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 0c08818..105b6ba 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -56,7 +56,8 @@ import topLang from "@/page/index/top/top-lang";
 // import { info } from "@/api/system/tenant";
 import {getCaptcha} from "@/api/user";
 
-if (/(^http)(s?):\/\/([a-z0-9].+)(\/manage$)/.test(location.href)) {
+console.log('是否跳转', /(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href), location.href)
+if (/(^http)(s?):\/\/([a-z0-9].+)\/manage(\/)?$/i.test(location.href)) {
   window.location.href = 'http://10.160.7.216:9920/casserver/login?service=http://10.165.0.77/manage/login&stService=http%3A%2F%2F10.165.0.77%2Fmanage%2Flogin'
 }
 if (/(\/login\?)(.*)/ig.test(location.href)) {
diff --git a/src/store/modules/area.js b/src/store/modules/area.js
index 24842f4..38d94ed 100644
--- a/src/store/modules/area.js
+++ b/src/store/modules/area.js
@@ -29,15 +29,16 @@ function format(data) {
     } else {
       dic[item.areaId] = node;
     }
-    node.valueId = node.value
-    node.value = item.areaName
+    const nodeCopy = JSON.parse(JSON.stringify(node))
+    nodeCopy.valueId = nodeCopy.value
+    nodeCopy.value = item.areaName
     if (labelChild.hasOwnProperty(item.parentId)) {
       if (!labelChild[item.parentId].children) {
         labelChild[item.parentId].children = [];
       }
-      labelChild[item.parentId].children.push(node);
+      labelChild[item.parentId].children.push(nodeCopy);
     } else {
-      labelChild[item.parentId] = {children: [node]};
+      labelChild[item.parentId] = {children: [nodeCopy]};
     }
   });
   return {data: result, dic, labelData: labelResult};
diff --git a/src/views/manage/company/companyList.vue b/src/views/manage/company/companyList.vue
index bf604c6..e54b522 100644
--- a/src/views/manage/company/companyList.vue
+++ b/src/views/manage/company/companyList.vue
@@ -165,6 +165,7 @@ export default {
       }
     }
     return {
+      type: "",
       insureTypeList: [//商保下拉框
         {
           label: "停用",
diff --git a/src/views/tenant/mission/Dialog/CopyMission.vue b/src/views/tenant/mission/Dialog/CopyMission.vue
index da38dc8..227db1a 100644
--- a/src/views/tenant/mission/Dialog/CopyMission.vue
+++ b/src/views/tenant/mission/Dialog/CopyMission.vue
@@ -626,7 +626,7 @@ export default {
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
                   label: "dictValue",
-                  value: "dictkey",
+                  value: "dictKey",
                 },
                 rules: [
                   {
diff --git a/src/views/tenant/works/Dialog/CopyMission.vue b/src/views/tenant/works/Dialog/CopyMission.vue
index 0aa7670..f7b0694 100644
--- a/src/views/tenant/works/Dialog/CopyMission.vue
+++ b/src/views/tenant/works/Dialog/CopyMission.vue
@@ -748,7 +748,7 @@ export default {
                 dicUrl: "/api/jobslink-api/system/dict-biz/dictionary?code=company_nature",
                 props: {
                   label: "dictValue",
-                  value: "dictkey",
+                  value: "dictKey",
                 },
                 rules: [
                   {