From cf27c13e5d530e4721be2262df0cedb42ad6bc2f Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 9 Aug 2023 17:25:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E8=81=94=E8=B0=83,?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E6=9F=A5=E8=AF=A2=E5=A6=82=E6=9E=9C=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E8=BF=94=E5=9B=9E=E6=9D=A1=E4=BB=B6=E7=BB=99=E4=B8=80?=
 =?UTF-8?q?=E4=B8=AA=E7=A9=BA=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resiDisability/resiDisability.vue         |  1 -
 .../residentManagement/veteran/veteran.vue    |  1 -
 .../residentManagement/volunteer/addForm.vue  | 37 +++++++++----
 .../volunteer/volunteer.vue                   | 52 ++++++++++++++-----
 src/views/modules/shequ/chaxun.vue            |  5 +-
 5 files changed, 68 insertions(+), 28 deletions(-)

diff --git a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
index b9e223e60..52364c49c 100644
--- a/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
+++ b/src/views/modules/base/residentManagement/resiDisability/resiDisability.vue
@@ -394,7 +394,6 @@
           <el-table-column
             prop="remark"
             align="center"
-            width="100"
             label="备注"
             :show-overflow-tooltip="true"
           >
diff --git a/src/views/modules/base/residentManagement/veteran/veteran.vue b/src/views/modules/base/residentManagement/veteran/veteran.vue
index 61c2de298..5097fa831 100644
--- a/src/views/modules/base/residentManagement/veteran/veteran.vue
+++ b/src/views/modules/base/residentManagement/veteran/veteran.vue
@@ -483,7 +483,6 @@
           <el-table-column
             prop="remark"
             align="center"
-            width="100"
             label="备注"
             :show-overflow-tooltip="true"
           >
diff --git a/src/views/modules/base/residentManagement/volunteer/addForm.vue b/src/views/modules/base/residentManagement/volunteer/addForm.vue
index 20bff05be..7b5a36990 100644
--- a/src/views/modules/base/residentManagement/volunteer/addForm.vue
+++ b/src/views/modules/base/residentManagement/volunteer/addForm.vue
@@ -87,7 +87,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">出生日期: </span>
-              <span>{{formData.birthday||'--'}}</span>
+              <span v-if="formData.birthday">{{formData.birthday.substr(0,10)||'--'}}</span>
             </div>
             <el-form-item label-width="100px" label="出生日期" v-else>
               <el-date-picker
@@ -131,7 +131,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">民族: </span>
-              <span>{{ nationName || "--" }}</span>
+              <span>{{ formData.nationName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="民族" v-else>
               <el-select v-model="formData.nation" clearable>
@@ -217,7 +217,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">文化程度: </span>
-              <span>{{ formData.disabilityCategoryName || "--" }}</span>
+              <span>{{ formData.cultureLevelName || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="文化程度" v-else>
               <el-select v-model="formData.cultureLevel" clearable>
@@ -251,7 +251,7 @@
           <el-col :span="12">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">志愿者类别: </span>
-              <span>{{ formData.volunteerCategoryNames || "--" }}</span>
+              <span v-if="formData.volunteerCategorieNames">{{ formData.volunteerCategorieNames.join(',') || "--" }}</span>
             </div>
             <el-form-item label-width="100px" label="志愿者类别" v-else>
               <el-select
@@ -291,7 +291,7 @@
           <el-col :span="24">
             <div class="info-prop" v-if="formType == 'detail'">
               <span class="info-title-2">兴趣特长: </span>
-              <span>{{ formData.interestDesc || "--" }}</span>
+              <span v-if="formData.hobbyNames">{{ formData.hobbyNames.join(',') || "--" }}</span>
             </div>
             <el-form-item
               label-width="100px"
@@ -299,11 +299,23 @@
               class="wd-wr"
               v-else
             >
-              <el-input
-                v-model="formData.interestDesc"
-                placeholder="请输入"
+              <el-select
+                v-model="formData.hobbyCodes"
+                placeholder="请选择"
+                size="small"
+                class="u-item-width-normal"
                 clearable
-              ></el-input>
+                multiple
+                collapse-tags
+              >
+                <el-option
+                  v-for="item in dicts.hobbyList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
@@ -376,7 +388,7 @@ export default {
         workUnit: "",
         volunteerCategories: [],
         occupation: "",
-        interestDesc: "",
+        hobbyCodes: [],
         remark: "",
       },
       genderList,
@@ -395,6 +407,7 @@ export default {
         educationList: [],
         volunteerList: [],
         idCard_type: [],
+        hobbyList:[]
       },
     };
   },
@@ -460,12 +473,16 @@ export default {
           this.$http.post("sys/dict/data/dictlist", {
             dictType: "idCard_type",
           }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "SPECIAL_SKILL",
+          }),
         ];
         const dictKeys = [
           "nationList",
           "educationList",
           "volunteerList",
           "idCard_type",
+          "hobbyList"
         ]; // 对应的键名
 
         const results = await Promise.all(requests);
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index 4b761131f..0a3c693a2 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -132,13 +132,23 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="兴趣特长">
-            <el-input
-              v-model="formData.hobbyInfo"
-              placeholder="请输入"
+            <el-select
+              v-model="formData.hobbyCodes"
+              placeholder="请选择"
               size="small"
               class="u-item-width-normal"
               clearable
-            ></el-input>
+              multiple
+              collapse-tags
+            >
+              <el-option
+                v-for="item in dicts.hobbyList"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
           <el-form-item label="居住地址">
             <el-input
@@ -260,12 +270,15 @@
           />
 
           <el-table-column
-            prop="volunteerCategoriesName"
+            prop="hobbyNames"
             align="center"
             width="200"
             label="志愿者类别"
             :show-overflow-tooltip="true"
           >
+          <template slot-scope="scope">
+            <span> {{scope.row.volunteerCategorieNames.join(",")|| "--"}}</span>
+          </template>
           </el-table-column>
           <el-table-column
             prop="name"
@@ -344,17 +357,19 @@
           >
           </el-table-column>
           <el-table-column
-            prop="hobbyInfo"
+            prop="hobbyCodes"
             align="center"
-            width="100"
             label="兴趣特长"
             :show-overflow-tooltip="true"
           >
+          <template slot-scope="scope">
+            <span> {{scope.row.hobbyNames.join(",")|| "--"}}</span>
+          </template>
           </el-table-column>
           <el-table-column
-            prop="residentialAddress"
+            prop="currentResidence"
             align="center"
-            width="100"
+            width="150"
             label="居住地址"
             :show-overflow-tooltip="true"
           >
@@ -474,7 +489,7 @@ export default {
         cultureLevel: "",
         volunteerCategories: "",
         occupation: "",
-        hobbyInfo: "",
+        hobbyCodes: [],
         remark: "",
       },
       pageNo: 1,
@@ -500,7 +515,8 @@ export default {
       dicts: {
         educationList: [],
         nationList: [],
-        volunteerList:[]
+        volunteerList:[],
+        hobbyList:[]
       }, //字典对象
     };
   },
@@ -536,8 +552,11 @@ export default {
           this.$http.post("sys/dict/data/dictlist", {
             dictType: "VOLUNTEER_CATEGORY",
           }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "SPECIAL_SKILL",
+          }),
         ];
-        const dictKeys = ["nationList", "educationList", "volunteerList"]; // 对应的键名
+        const dictKeys = ["nationList", "educationList", "volunteerList","hobbyList"]; // 对应的键名
 
         const results = await Promise.all(requests);
         results.forEach((result, index) => {
@@ -639,7 +658,14 @@ export default {
     },
 
     //   编辑触发事件
-    async handleEdit(row) {},
+    async handleEdit(row) {
+      this.addDiaTitle = "编辑";
+      this.formType = "edit";
+      this.showAdd = true;
+      this.$nextTick(() => {
+        this.$refs.ref_add_form.initForm("edit", row);
+      });
+    },
     //  新增弹出框组件取消事件
     handleClose() {
       this.formType = "";
diff --git a/src/views/modules/shequ/chaxun.vue b/src/views/modules/shequ/chaxun.vue
index d03616b64..04f11621c 100644
--- a/src/views/modules/shequ/chaxun.vue
+++ b/src/views/modules/shequ/chaxun.vue
@@ -498,7 +498,7 @@ export default {
       this.showSmatrForm = true;
       this.$nextTick(() => {
         this.$refs.smatr_rules_form.initForm(
-          this.rulesData.length == 0 ? this.childrenRulesData : this.rulesData
+          this.rulesData.length == 0 ? this.childrenRulesData  : this.rulesData
         );
       });
     },
@@ -556,8 +556,7 @@ export default {
       formData.append("type", this.searchData.type);
       const { data, code, msg } = await requestPost(url, formData);
       if (code == 0) {
-        this.rulesData = data;
-        console.log(this.rulesData);
+        this.rulesData = data && data.length !== 0 ? data : null;
       } else {
         console.log(msg);
       }