From ffb16f495c815f446a1890d45ee696505378ee42 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 10 Oct 2023 16:29:58 +0800
Subject: [PATCH] =?UTF-8?q?bug#690,684,=E6=AE=8B=E7=96=BE=E4=BA=BA?=
 =?UTF-8?q?=E8=80=81=E5=B9=B4=E4=BA=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?,bug#648=E9=80=9A=E8=AE=AF=E5=BD=95=E7=BD=91=E6=A0=BC=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E4=BA=BA=E5=91=98=E8=AF=81=E4=BB=B6=E5=8F=B7=E4=B8=8E?=
 =?UTF-8?q?=E8=81=8C=E8=B4=A3=E4=B8=8D=E5=9B=9E=E6=98=BE=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/components/resiForm.vue                   | 12 ++++++++++--
 .../modules/base/organization/organization.vue      |  2 ++
 .../base/residentManagement/oldPeople/addForm.vue   | 13 +++++++------
 .../base/residentManagement/oldPeople/oldPeople.vue |  2 +-
 .../residentManagement/resiDisability/addForm.vue   |  1 +
 .../resiDisability/resiDisability.vue               |  2 +-
 .../subsistenceAllowance/addForm.vue                |  1 +
 .../residentManagement/unemployment/addForm.vue     |  1 +
 .../base/residentManagement/veteran/addForm.vue     |  1 +
 .../base/residentManagement/volunteer/addForm.vue   |  1 +
 10 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/views/components/resiForm.vue b/src/views/components/resiForm.vue
index 404e82f90..abe067cc0 100644
--- a/src/views/components/resiForm.vue
+++ b/src/views/components/resiForm.vue
@@ -405,6 +405,7 @@ import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
 import { computedCard } from '@/utils/index'
 import { idTypeList } from "@/js/columns/constants";
 import {requestGet}  from "@/js/dai/request";
+import { numberToGlsl } from 'ol/style/expressions';
 export default {
   name: 'resiForm',
   props: {
@@ -1727,9 +1728,11 @@ export default {
       console.log(node,resolve);
        await this.getTreeChildenList(node,resolve)      
     },
-  
     async getTreeChildenList (node, resolve) {
-      console.log(node,resolve);
+      if (node.data.partyOrgLevel === 7) {
+        resolve([]); // 直接解决为空数组，不执行请求
+        return;
+    }
       const url = "/actual/base/party/org/listNextLevelPartyOrgTreeNodesByPid"
       console.log('级联', node.value)
       let params = {
@@ -1737,6 +1740,11 @@ export default {
       }
       const { data, code, msg } = await requestGet(url, params)
       if (code === 0) {
+        data.forEach(item => {
+            if (item.partyOrgLevel === 7) {
+                item.children = null; // 或 item.children = [];
+            }
+        });
         resolve(data)
       } else {
         this.$message.error(msg)
diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index 970756757..d7e4ae245 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2001,6 +2001,8 @@ export default {
         // this.peoForm.gender = data.gender === 1 ? '男' : '女'
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
+        this.peoForm.idCard = data.idCard;
+        this.peoForm.duty = data.roleList.map(item=>item.roleId);
         // 已有的权限（职责）
         let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {
diff --git a/src/views/modules/base/residentManagement/oldPeople/addForm.vue b/src/views/modules/base/residentManagement/oldPeople/addForm.vue
index 42bf4db0d..40d8faf41 100644
--- a/src/views/modules/base/residentManagement/oldPeople/addForm.vue
+++ b/src/views/modules/base/residentManagement/oldPeople/addForm.vue
@@ -260,7 +260,7 @@
                 <el-row>
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
-                            <span class="info-title-2">该居民有无赡养老人: </span>
+                            <span class="info-title-2">有无赡养老人: </span>
                             <span>{{
                                 formData.elderlyFlag != null
                                 ? formData.elderlyFlag === 1
@@ -271,7 +271,7 @@
                                 : "--"
                             }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="该居民有无赡养老人" v-else>
+                        <el-form-item label-width="100px" label="有无赡养老人" v-else>
                             <el-select v-model="formData.elderlyFlag" clearable>
                                 <el-option v-for="item in elderlyList" :key="item.value" :label="item.label"
                                     :value="item.value">
@@ -281,10 +281,10 @@
                     </el-col>
                     <el-col :span="12">
                         <div class="info-prop" v-if="formType == 'detail'">
-                            <span class="info-title-2">该居民与赡养人关系: </span>
+                            <span class="info-title-2">与赡养人关系: </span>
                             <span>{{ formData.elderlyRelationName || "--" }}</span>
                         </div>
-                        <el-form-item label-width="100px" label="该居民与赡养人关系" v-else>
+                        <el-form-item label-width="100px" label="与赡养人关系" v-else>
                             <el-select v-model="formData.elderlyRelation" clearable>
                                 <el-option v-for="item in dicts.resi_base_info" :key="item.value"
                                     :label="item.label" :value="item.value">
@@ -432,8 +432,9 @@ export default {
             const url = `/actual/base/resiCategorized/oldPeople/detail/${categorizedResiId}`;
             const { data, code, msg } = await requestGet(url);
             if (code === 0) {
-                console.log(data);
                 this.formData = { ...data };
+                this.formData.idType = this.formData.idType.toString()
+                console.log(this.formData);
             } else {
                 this.$message.error(msg);
             }
@@ -467,7 +468,7 @@ export default {
                 console.log(this.formData);
                 const url =
                     this.formType === "edit"
-                        ? "/actual/base/resiCategorized/oldpeople/update"
+                        ? "/actual/base/resiCategorized/oldPeole/update"
                         : "/actual/base/resiCategorized/oldpeople/create";
 
                 const { data, code, msg } = await requestPost(url, this.formData);
diff --git a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
index 6086dcc99..ae65dbff5 100644
--- a/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
+++ b/src/views/modules/base/residentManagement/oldPeople/oldPeople.vue
@@ -113,7 +113,7 @@
                 </el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="该居民有无赡养人">
+            <el-form-item label="有无赡养人">
               <el-select
                 v-model="formData.elderlyList"
                 placeholder="请输入"
diff --git a/src/views/modules/base/residentManagement/resiDisability/addForm.vue b/src/views/modules/base/residentManagement/resiDisability/addForm.vue
index 81e720f74..80236896e 100644
--- a/src/views/modules/base/residentManagement/resiDisability/addForm.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/addForm.vue
@@ -463,6 +463,7 @@ export default {
       if (code === 0) {
         console.log(data);
         this.formData = { ...data };
+        this.formData.idType = this.formData.idType.toString()
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
index 04258654f..51feaa688 100644
--- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
@@ -156,7 +156,7 @@
               clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="联系电话">
+          <el-form-item label="联系人电话">
             <el-input
               v-model="formData.contactMobile"
               placeholder="请输入"
diff --git a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
index 49333c546..26ebea815 100644
--- a/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
+++ b/src/views/modules/base/residentManagement/subsistenceAllowance/addForm.vue
@@ -463,6 +463,7 @@
         const { data, code, msg } = await requestGet(url);
         if (code === 0) {
           this.formData = { ...data };
+          this.formData.idType = this.formData.idType.toString()
          await this.setAgencyIdFromLastLayerId(data.agencyId)
           console.log(this.agencyIdTemp);
         } else {
diff --git a/src/views/modules/base/residentManagement/unemployment/addForm.vue b/src/views/modules/base/residentManagement/unemployment/addForm.vue
index 81e7a5eed..6a027c7a1 100644
--- a/src/views/modules/base/residentManagement/unemployment/addForm.vue
+++ b/src/views/modules/base/residentManagement/unemployment/addForm.vue
@@ -623,6 +623,7 @@ export default {
       if (code === 0) {
         console.log(data);
         this.formData = { ...data };
+        this.formData.idType = this.formData.idType.toString()
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/base/residentManagement/veteran/addForm.vue b/src/views/modules/base/residentManagement/veteran/addForm.vue
index c0320f8e1..956aeeeac 100644
--- a/src/views/modules/base/residentManagement/veteran/addForm.vue
+++ b/src/views/modules/base/residentManagement/veteran/addForm.vue
@@ -723,6 +723,7 @@ export default {
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
         this.formData = { ...data };
+        this.formData.idType = this.formData.idType.toString()
       } else {
         this.$message.error(msg);
       }
diff --git a/src/views/modules/base/residentManagement/volunteer/addForm.vue b/src/views/modules/base/residentManagement/volunteer/addForm.vue
index eb13f336e..2eb9e5c9d 100644
--- a/src/views/modules/base/residentManagement/volunteer/addForm.vue
+++ b/src/views/modules/base/residentManagement/volunteer/addForm.vue
@@ -466,6 +466,7 @@ export default {
       const { data, code, msg } = await requestGet(url);
       if (code === 0) {
         this.formData = { ...data };
+        this.formData.idType = this.formData.idType.toString()
       } else {
         this.$message.error(msg);
       }