From 891460423d48af87357501e1e7b1721ee708e30d Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Thu, 3 Aug 2023 19:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../residentManagement/volunteer/addForm.vue  | 1033 +++++++++--------
 .../volunteer/volunteer.vue                   |  137 ++-
 2 files changed, 609 insertions(+), 561 deletions(-)

diff --git a/src/views/modules/base/residentManagement/volunteer/addForm.vue b/src/views/modules/base/residentManagement/volunteer/addForm.vue
index 221d4b55d..056ba6f69 100644
--- a/src/views/modules/base/residentManagement/volunteer/addForm.vue
+++ b/src/views/modules/base/residentManagement/volunteer/addForm.vue
@@ -1,522 +1,555 @@
 <template>
-    <div>
-      <div
-        class="dialog-h-content scroll-h"
-        :class="{ 'visiual-form': source === 'visiual' }"
+  <div>
+    <div
+      class="dialog-h-content scroll-h"
+      :class="{ 'visiual-form': source === 'visiual' }"
+    >
+      <el-form
+        ref="ref_add_form"
+        :inline="true"
+        :model="formData"
+        :rules="dataRule"
+        class="div_form"
       >
-        <el-form
-          ref="ref_add_form"
-          :inline="true"
-          :model="formData"
-          :rules="dataRule"
-          class="div_form"
-        >
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">姓名: </span>
-                <span>{{ formData.name || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="姓名" prop="name" v-else>
-                <el-input
-                  v-model="formData.name"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">联系电话: </span>
-                <span>{{ formData.mobile || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="联系电话"  v-else>
-                <el-input
-                  v-model="formData.mobile"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">证件类型: </span>
-                <span>{{ formData.idTypeName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="证件类型" prop="idType"  v-else>
-                <el-select v-model="formData.idType" clearable>
-                  <el-option
-                    v-for="item in dicts.idCard_type"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">证件号: </span>
-                <span>{{ formData.idNum || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="证件号" prop="idNum"  v-else>
-                <el-input
-                  v-model="formData.idNum"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">性别: </span>
-                <span>{{  formData.gender?formData.gender=='1'?'男':formData.gender=='2'?'女':'--':'--' }}</span
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">姓名: </span>
+              <span>{{ formData.name || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="姓名" prop="name" v-else>
+              <el-input
+                v-model="formData.name"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">联系电话: </span>
+              <span>{{ formData.mobile || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="联系电话" v-else>
+              <el-input
+                v-model="formData.mobile"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">证件类型: </span>
+              <span>{{ formData.idTypeName || "--" }}</span>
+            </div>
+            <el-form-item
+              label-width="100px"
+              label="证件类型"
+              prop="idType"
+              v-else
+            >
+              <el-select v-model="formData.idType" clearable>
+                <el-option
+                  v-for="item in dicts.idCard_type"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-              </div>
-              <el-form-item label-width="100px" label="性别" v-else>
-                  
-                <el-select v-model="formData.gender" clearable>
-                  <el-option
-                    v-for="item in genderList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">本地户籍: </span>
-                <span>{{  formData.localResidenceFlag?formData.localResidenceFlag=='1'?'是':formData.localResidenceFlag=='0'?'否':'--':'--' }}</span
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">证件号: </span>
+              <span>{{ formData.idNum || "--" }}</span>
+            </div>
+            <el-form-item
+              label-width="100px"
+              label="证件号"
+              prop="idNum"
+              v-else
+            >
+              <el-input
+                v-model="formData.idNum"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">年龄: </span>
+              <span>{{
+                formData.localResidenceFlag
+                  ? formData.localResidenceFlag == "1"
+                    ? "是"
+                    : formData.localResidenceFlag == "0"
+                    ? "否"
+                    : "--"
+                  : "--"
+              }}</span>
+            </div>
+            <el-form-item label-width="100px" label="年龄" v-else>
+              <el-select v-model="formData.localResidenceFlag" clearable>
+                <el-option
+                  v-for="item in binaryOptionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-              </div>
-              <el-form-item label-width="100px" label="本地户籍" v-else>
-                <el-select v-model="formData.localResidenceFlag" clearable>
-                  <el-option
-                    v-for="item in binaryOptionList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">户籍地址: </span>
-                <span>{{ formData.placeOfDomicile || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="户籍地址" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.placeOfDomicile"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">现居地址: </span>
-                <span>{{ formData.currentResidence || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="现居地址" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.currentResidence"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾类别: </span>
-                <span>{{ formData.disabilityCategoryName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾类别" v-else>
-                <el-select v-model="formData.disabilityCategoryCode" clearable>
-                  <el-option
-                    v-for="item in dicts.disability_category_code"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾级别: </span>
-                <span>{{ formData.disabilityLevelName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾级别" v-else>
-                <el-select v-model="formData.disabilityLevel" clearable>
-                  <el-option
-                    v-for="item in dicts.disability_level"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">残疾证号: </span>
-                <span>{{ formData.disabilityNum || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="残疾证号" v-else>
-                <el-input
-                  v-model="formData.disabilityNum"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">低保: </span>
-                <span>{{  formData.subsistenceAllowanceFlag?formData.subsistenceAllowanceFlag=='1'?'是':formData.subsistenceAllowanceFlag=='0'?'否':'--':'--' }}</span
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">性别: </span>
+              <span>{{
+                formData.gender
+                  ? formData.gender == "1"
+                    ? "男"
+                    : formData.gender == "2"
+                    ? "女"
+                    : "--"
+                  : "--"
+              }}</span>
+            </div>
+            <el-form-item label-width="100px" label="性别" v-else>
+              <el-select v-model="formData.gender" clearable>
+                <el-option
+                  v-for="item in genderList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
                 >
-              </div>
-              <el-form-item label-width="100px" label="低保" v-else>
-                <el-select v-model="formData.subsistenceAllowanceFlag" clearable>
-                  <el-option
-                    v-for="item in binaryOptionList"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
-                  </el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">退休金额: </span>
-                <span>{{ formData.retirementAmount || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="退休金额" v-else>
-                <el-input
-                  v-model="formData.retirementAmount"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">月收入: </span>
-                <span>{{ formData.monthIncome || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="月收入" v-else>
-                <el-input
-                  v-model="formData.monthIncome"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">联系人: </span>
-                <span>{{ formData.contactName || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="联系人" v-else>
-                <el-input
-                  v-model="formData.contactName"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">联系电话: </span>
-                <span>{{ formData.contactMobile || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="联系电话" v-else>
-                <el-input
-                  v-model="formData.contactMobile"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-  
-          <el-row>
-            <el-col :span="24">
-              <div class="info-prop" v-if="formType == 'detail'">
-                <span class="info-title-2">备注: </span>
-                <span>{{ formData.remark || "--" }}</span>
-              </div>
-              <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
-                <el-input
-                  v-model="formData.remark"
-                  placeholder="请输入"
-                  clearable
-                ></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-      </div>
-      <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <el-button
-          size="small"
-          type="primary"
-          :disabled="btnDisable"
-          @click="handleComfirm"
-          >确 定</el-button
-        >
-      </div>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">民族: </span>
+              <span>{{ nationName || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="民族" v-else>
+              <el-select v-model="formData.nation" clearable>
+                <el-option
+                  v-for="item in dicts.nationList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">本地户籍: </span>
+              <span>{{
+                formData.localResidenceFlag != null
+                  ? formData.localResidenceFlag == 1
+                    ? "是"
+                    : formData.gender == 2
+                    ? "否"
+                    : "--"
+                  : "--"
+              }}</span>
+            </div>
+            <el-form-item label-width="100px" label="本地户籍" v-else>
+              <el-select v-model="formData.localResidenceFlag" clearable>
+                <el-option
+                  v-for="item in binaryOptionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">户籍地址: </span>
+              <span>{{ formData.placeOfDomicile || "--" }}</span>
+            </div>
+            <el-form-item
+              label-width="100px"
+              label="户籍地址"
+              class="wd-wr"
+              v-else
+            >
+              <el-input
+                v-model="formData.placeOfDomicile"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">现居地址: </span>
+              <span>{{ formData.currentResidence || "--" }}</span>
+            </div>
+            <el-form-item
+              label-width="100px"
+              label="现居地址"
+              class="wd-wr"
+              v-else
+            >
+              <el-input
+                v-model="formData.currentResidence"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">文化程度: </span>
+              <span>{{ formData.disabilityCategoryName || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="文化程度" v-else>
+              <el-select v-model="formData.cultureLevel" clearable>
+                <el-option
+                  v-for="item in dicts.educationList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">工作单位: </span>
+              <span>{{ formData.workUnit || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="工作单位" v-else>
+              <el-input
+                v-model="formData.workUnit"
+                placeholder="请输入内容"
+                clearable
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">志愿者类别: </span>
+              <span>{{ formData.volunteerCategoryNames || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="志愿者类别" v-else>
+              <el-select
+                v-model="formData.volunteerCategories"
+                placeholder="请选择"
+                size="small"
+                class="u-item-width-normal"
+                clearable
+                multiple
+                collapse-tags
+              >
+                <el-option
+                  v-for="item in dicts.volunteerList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">职业: </span>
+              <span>{{ formData.occupation || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="职业" v-else>
+              <el-input
+                v-model="formData.occupation"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">兴趣特长: </span>
+              <span>{{ formData.interestDesc || "--" }}</span>
+            </div>
+            <el-form-item
+              label-width="100px"
+              label="兴趣特长"
+              class="wd-wr"
+              v-else
+            >
+              <el-input
+                v-model="formData.interestDesc"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="info-prop" v-if="formType == 'detail'">
+              <span class="info-title-2">备注: </span>
+              <span>{{ formData.remark || "--" }}</span>
+            </div>
+            <el-form-item label-width="100px" label="备注" class="wd-wr" v-else>
+              <el-input
+                v-model="formData.remark"
+                placeholder="请输入"
+                clearable
+              ></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
     </div>
-  </template>
-      
-        <script>
-  import { Loading } from "element-ui"; // 引入Loading服务
-  import { requestPost, requestGet } from "@/js/dai/request";
-  import nextTick from "dai-js/tools/nextTick";
-  import { genderList, binaryOptionList } from "@/js/columns/constants";
-  
-  let loading; // 加载动画
-  
-  export default {
-    props: {
-      formType:{
-          type:String,
-          default:'add'
-      },
-      source: {
-        //展示来源：manage  管理平台    visiual  可视化平台
-        type: String,
-        default: "manage",
-      },
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <el-button
+        size="small"
+        type="primary"
+        :disabled="btnDisable"
+        @click="handleComfirm"
+        >确 定</el-button
+      >
+    </div>
+  </div>
+</template>
+    
+      <script>
+import { Loading } from "element-ui"; // 引入Loading服务
+import { requestPost, requestGet } from "@/js/dai/request";
+import nextTick from "dai-js/tools/nextTick";
+import { genderList, binaryOptionList } from "@/js/columns/constants";
+
+let loading; // 加载动画
+
+export default {
+  props: {
+    formType: {
+      type: String,
+      default: "add",
     },
-  
-    data() {
-      return {
-        btnDisable: false,
-  
-        formData: {
-          name: "",
-          mobile: "",
-          idType: "",
-          idNum: "",
-          gender: "",
-          localResidenceFlag: null,
-          placeOfDomicile: "",
-          currentResidence: "",
-          disabilityCategoryCode: "",
-          disabilityLevel: "",
-          disabilityNum: "",
-          subsistenceAllowanceFlag: null,
-          retirementAmount: null,
-          monthIncome: null,
-          contactName: "",
-          contactMobile: "",
-          remark: "",
-        },
-        genderList,
-        binaryOptionList,
-        dataRule: {
-          name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
-          idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
-  
-          idType: [
-            { required: true, message: "证件类型不能为空", trigger: "bulr" },
-          ],
-        },
-        scopeId: "",
-  
-        dicts: {
-          disability_category_code: [],
-          disability_level: [],
-          idCard_type: [],
-        },
-      };
+    source: {
+      //展示来源：manage  管理平台    visiual  可视化平台
+      type: String,
+      default: "manage",
     },
-  
-    watch: {},
-  
-    components: {},
-    async created() {
-      await this.getDicts();
+  },
+
+  data() {
+    return {
+      formType: "",
+      btnDisable: false,
+
+      formData: {
+        name: "",
+        mobile: "",
+        idType: "",
+        idNum: "",
+        birthday: "",
+        gender: "",
+        nation: "",
+        localResidenceFlag: null,
+        placeOfDomicile: "",
+        currentResidence: "",
+        cultureLevel: "",
+        workUnit: "",
+        volunteerCategories: [],
+        occupation: "",
+        interestDesc: "",
+        remark: "",
+      },
+      genderList,
+      binaryOptionList,
+      dataRule: {
+        name: [{ required: true, message: "姓名不能为空", trigger: "bulr" }],
+        idNum: [{ required: true, message: "证件号不能为空", trigger: "bulr" }],
+
+        idType: [
+          { required: true, message: "证件类型不能为空", trigger: "bulr" },
+        ],
+      },
+      scopeId: "",
+      dicts: {
+        nationList: [],
+        educationList: [],
+        volunteerList: [],
+        idCard_type: [],
+      },
+    };
+  },
+
+  watch: {},
+
+  components: {},
+  async created() {
+    await this.getDicts();
+  },
+  async mounted() {
+    this.startLoading();
+    await this.endLoading();
+  },
+
+  methods: {
+    async initForm(type, row) {
+      this.formType = type;
+      this.scopeId = row.categorizedResiId;
+      await this.getDetail();
     },
-    async mounted() {
-      this.startLoading();
-      await this.endLoading();
+    async getDetail(categorizedResiId) {
+      const url = `/governance/commonDemand/detail/${categorizedResiId}`;
+      const { data, code, msg } = await requestGet(url);
+      if (code === 0) {
+        this.formData = { ...data };
+      } else {
+        this.$message.error(msg);
+      }
     },
-  
-    methods: {
-      async initForm(type, row) {
-        this.formType = type;
-        this.scopeId = row.categorizedResiId;
-        await this.getDetail();
-      },
-      async getDetail(categorizedResiId) {
-        const url = `/governance/commonDemand/detail/${categorizedResiId}`;
-        const { data, code, msg } = await requestGet(url);
+    async handleComfirm() {
+      this.$refs["ref_add_form"].validate(async (valid) => {
+        if (!valid) {
+          return false;
+        }
+        const url =
+          this.formType === "edit"
+            ? "/governance/commonDemand/update"
+            : "/governance/commonDemand/save";
+
+        const { data, code, msg } = await requestPost(url, this.formData);
         if (code === 0) {
-          console.log(data);
-          //   let obj = {
-          //     name: "测试",
-          //     mobile: "17555555555",
-          //     idType: "1",
-          //     idNum: "370254111111111111",
-          //     gender: "1",
-          //     localResidenceFlag: 1,
-          //     placeOfDomicile: "青岛市市北区时代国际广场",
-          //     currentResidence: "青岛市李沧区建安小区",
-          //     disabilityCategoryCode: "tingli",
-          //     disabilityLevel: "1",
-          //     disabilityNum: "545461564512167",
-          //     subsistenceAllowanceFlag: 1,
-          //     retirementAmount: 1,
-          //     monthIncome: 200.111,
-          //     contactName: "刘备",
-          //     contactMobile: "15655555454",
-          //     remark: "备注",
-          //   };
-          this.formData = { ...obj };
-        } else {
+          this.$message.success("添加成功");
+          this.resetData();
+          this.$emit("handleComfirm");
+        } else if (code >= 8000) {
           this.$message.error(msg);
         }
-      },
-      async handleComfirm() {
-        this.$refs["ref_add_form"].validate(async (valid) => {
-          if (!valid) {
-            return false;
-          }
-          const url =
-            this.formType === "edit"
-              ? "/governance/commonDemand/update"
-              : "/governance/commonDemand/save";
-  
-          const { data, code, msg } = await requestPost(url, this.formData);
-          if (code === 0) {
-            this.$message.success("添加成功");
-            this.resetData();
-            this.$emit("handleComfirm");
-          } else if (code >= 8000) {
-            this.$message.error(msg);
+      });
+    },
+    async getDicts() {
+      try {
+        const requests = [
+          this.$http.post("sys/dict/data/nation", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/education", {
+            formCode: "resi_base_info",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "VOLUNTEER_CATEGORY",
+          }),
+          this.$http.post("sys/dict/data/dictlist", {
+            dictType: "idCard_type",
+          }),
+        ];
+        const dictKeys = [
+          "nationList",
+          "educationList",
+          "volunteerList",
+          "idCard_type",
+        ]; // 对应的键名
+
+        const results = await Promise.all(requests);
+        results.forEach((result, index) => {
+          if (result.data.code === 0) {
+            this.dicts[dictKeys[index]].push(...result.data.data);
+          } else {
+            console.log(`获取${dictKeys[index]}失败: ${result.data.msg}`);
           }
         });
-      },
-      async getDicts() {
-        try {
-          const dictTypes = [
-            "disability_category_code",
-            "disability_level",
-            "idCard_type",
-          ]; // 把所有dictType放在这个数组里
-          const requests = dictTypes.map((dictType) => {
-            return this.$http.post("sys/dict/data/dictlist", {
-              dictType: dictType,
-            });
-          });
-          const results = await Promise.all(requests);
-          results.forEach((result, index) => {
-            if (result.data.code === 0) {
-              this.dicts[dictTypes[index]].push(...result.data.data);
-            } else {
-              console.log(`获取${dictTypes[index]}字典失败: ${result.msg}`);
-            }
-          });
-        } catch (error) {
-          console.log("获取字典失败: ", error);
-        }
-      },
-      handleCancle() {
-        this.resetData();
-        this.$emit("handleClose");
-      },
-  
-      resetData() {
-        this.formData = {};
-      },
-      // 开启加载动画
-      startLoading() {
-        loading = Loading.service({
-          lock: true, // 是否锁定
-          text: "正在加载……", // 加载中需要显示的文字
-          background: "rgba(0,0,0,.7)", // 背景颜色
-        });
-      },
-      // 结束加载动画
-      endLoading() {
-        if (loading) {
-          loading.close();
-        }
-      },
+      } catch (error) {
+        console.log("获取字典失败: ", error);
+      }
     },
-  };
-  </script>
-      
-        <style lang="scss" scoped>
-  @import "@/assets/scss/modules/management/form-main.scss";
-  @import "@/assets/scss/modules/visual/a_customize.scss";
-  @import "@/assets/scss/modules/management/detail-main.scss";
-  
-  .form-item::v-deep .el-form-item__label {
+
+    handleCancle() {
+      this.resetData();
+      this.$emit("handleClose");
+    },
+
+    resetData() {
+      this.formData = {};
+    },
+    // 开启加载动画
+    startLoading() {
+      loading = Loading.service({
+        lock: true, // 是否锁定
+        text: "正在加载……", // 加载中需要显示的文字
+        background: "rgba(0,0,0,.7)", // 背景颜色
+      });
+    },
+    // 结束加载动画
+    endLoading() {
+      if (loading) {
+        loading.close();
+      }
+    },
+  },
+};
+</script>
+    
+      <style lang="scss" scoped>
+@import "@/assets/scss/modules/management/form-main.scss";
+@import "@/assets/scss/modules/visual/a_customize.scss";
+@import "@/assets/scss/modules/management/detail-main.scss";
+
+.form-item::v-deep .el-form-item__label {
+  color: #fff;
+}
+.form-item {
+  .el-radio {
     color: #fff;
   }
-  .form-item {
-    .el-radio {
-      color: #fff;
-    }
-    .el-checkbox {
-      color: #fff;
-    }
+  .el-checkbox {
+    color: #fff;
   }
-  
-  .wd-wr {
-    width: 100%;
-    /deep/ .el-form-item__content {
-      width: calc(100% - 148px);
-    }
+}
+
+.wd-wr {
+  width: 100%;
+  /deep/ .el-form-item__content {
+    width: calc(100% - 148px);
   }
-  .info-prop {
-    margin-top: 29px;
-    .info-title-2 {
-      width: 100px;
-      text-align: right;
-      display: inline-block;
-      padding-right: 10px;
-    }
+}
+.info-prop {
+  margin-top: 29px;
+  .info-title-2 {
+    width: 100px;
+    text-align: right;
+    display: inline-block;
+    padding-right: 10px;
   }
-  </style>
-      
+}
+</style>
     
-    
\ No newline at end of file
+  
+  
\ No newline at end of file
diff --git a/src/views/modules/base/residentManagement/volunteer/volunteer.vue b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
index 702f941cc..e44e77fd4 100644
--- a/src/views/modules/base/residentManagement/volunteer/volunteer.vue
+++ b/src/views/modules/base/residentManagement/volunteer/volunteer.vue
@@ -10,7 +10,7 @@
         >
           <el-form-item label="志愿者类别">
             <el-select
-              v-model="formData.volunteerCategory"
+              v-model="formData.volunteerCategories"
               placeholder="请选择"
               size="small"
               class="u-item-width-normal"
@@ -206,21 +206,18 @@
           >
             批量删除
           </el-button>
-          <!-- 
-                :on-success="handleExcelSuccess"
-              :before-upload="beforeExcelUpload"
-              :http-request="uploadHttpRequest"
-           -->
           <el-upload
             :headers="$getElUploadHeaders()"
             ref="upload"
-            class="upload-demo"
+            class="upload-btn"
             action="uploadUlr"
             :limit="1"
             :accept="'.xls,.xlsx'"
             :with-credentials="true"
             :show-file-list="false"
             :auto-upload="true"
+            :before-upload="beforeExcelUpload"
+            :http-request="uploadHttpRequest"
           >
             <el-button
               type="primary"
@@ -263,7 +260,7 @@
           />
 
           <el-table-column
-            prop="volunteerCategoryName"
+            prop="volunteerCategoriesName"
             align="center"
             width="200"
             label="志愿者类别"
@@ -376,7 +373,6 @@
                 >查看</el-button
               >
               <el-button
-                v-if="scope.row.serviceStatus === 'in_service'"
                 @click="handleEdit(scope.row)"
                 type="text"
                 size="small"
@@ -419,44 +415,24 @@
       <add-form
         ref="ref_add_form"
         :formType="formType"
-        @handleOk="handleOk"
+        @handleComfirm="handleComfirm"
         @handleClose="handleClose"
       ></add-form>
     </el-dialog>
-    <el-dialog
-      v-if="showDetail"
-      :visible.sync="showDetail"
-      :close-on-click-modal="false"
-      :close-on-press-escape="false"
-      :title="detailDiaTitle"
-      :modal-append-to-body="false"
-      width="850px"
-      top="5vh"
-      class="dialog-h"
-      @closed="diaDetailClose"
-    >
-      <detail-form
-        ref="ref_detail_form"
-        :statusArray="statusArray"
-        @diaDetailClose="diaDetailClose"
-      >
-      </detail-form>
-    </el-dialog>
   </div>
 </template>
-    
-      <script>
+    <script>
 import { requestPost } from "@/js/dai/request";
 import { genderList, binaryOptionList } from "@/js/columns/constants";
 import nextTick from "dai-js/tools/nextTick";
 import { mapGetters } from "vuex";
 import axios from "axios";
-import addForm from "./addForm.vue";
+import addForm from "./addForm";
 // import detailForm from "./detailForm";
 //   import editForm from "./editForm";
 
 export default {
-  components: { addForm },
+  components: { addForm  },
 
   data() {
     let endDisabledDate = (time) => {
@@ -496,7 +472,7 @@ export default {
         nation: "",
         currentResidence: "",
         cultureLevel: "1",
-        volunteerCategory: "",
+        volunteerCategories: "",
         occupation: "",
         hobbyInfo: "",
         remark: "",
@@ -524,7 +500,7 @@ export default {
       dicts: {
         educationList: [],
         nationList: [],
-        volunteerList: [],
+        volunteerList:[]
       }, //字典对象
     };
   },
@@ -576,24 +552,69 @@ export default {
       }
     },
 
-    binaryText(value) {
-      let text = "";
-      text = this.binaryOptionList.filter((item) => item.value == value)[0]
-        .label;
-      return text || "--";
+    binaryText(value){
+       let text = ''
+       text = this.binaryOptionList.filter(item=>item.value == value)[0].label
+       return text || "--"
     },
     // ------------------------------------事件------------------------------------------
-    checkNumberInput() {
-      if (isNaN(this.formData.retirementAmount)) {
-        this.$message.error("请输入数字");
-        this.formData.retirementAmount = "";
-      } else {
-        this.formData.retirementAmount = parseFloat(
-          this.formData.retirementAmount
-        );
+    checkNumberInput(){
+        if (isNaN(this.formData.retirementAmount)) {
+        this.$message.error('请输入数字');
+        this.formData.retirementAmount = '';
+        } else {
+        this.formData.retirementAmount = parseFloat(this.formData.retirementAmount);
+        }
+    },
+    // 导入
+    beforeExcelUpload(file) {
+      console.log("file", file);
+      const isType = file.type === "application/vnd.ms-excel";
+      const isTypeComputer =
+        file.type ===
+        "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
+      const fileType = isType || isTypeComputer;
+      const isLt1M = file.size / 1024 / 1024 < 10;
+      if (!fileType) {
+        this.$message.error("上传文件只能是xls/xlsx格式！");
       }
+
+      if (!isLt1M) {
+        this.$message.error("上传文件大小不能超过 10MB!");
+      }
+      return fileType && isLt1M;
     },
 
+    async uploadHttpRequest(file) {
+      this.$message({
+        showClose: true,
+        dangerouslyUseHTMLString: true,
+        message:
+          "导入中，请到系统管理-<a id='clickA' style='cursor: pointer;'>导入记录</a>中查看进度",
+        duration: 3000,
+      });
+      let than = this;
+      document.getElementById("clickA").addEventListener("click", function () {
+        than.$router.replace("/main/importRecord-index");
+      });
+      const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加
+      formData.append("file", file.file); //添加文件对象
+      await this.$http
+        .post("/actual/base/resiCategorized/disability/import", formData)
+        .then((res) => {
+          console.log("res-up", res);
+          if (res.data.code == 0 && res.data.msg == "success") {
+            this.$message.success("导入成功");
+            this.getTableData();
+            this.$refs.upload.clearFiles();
+          } else this.$message.error(res.data.msg);
+        })
+        .catch((err) => {
+          console.log("失败", err);
+          file.onError(); //上传失败的文件会从文件列表中删除
+          // this.$message.error('导入失败')
+        });
+    },
     // 搜索事件
     handleSearch(val) {
       console.log(this.formData);
@@ -610,29 +631,23 @@ export default {
     //   查看详情触发事件
     async handleDetail(row) {
       this.addDiaTitle = "详情";
-      this.showDetail = true;
-      this.formType = "add";
+      this.formType = "detail";
       this.showAdd = true;
       this.$nextTick(() => {
         this.$refs.ref_add_form.initForm("detail", row);
       });
     },
-    //   详情弹出框取消事件
-    diaDetailClose() {
-      this.$refs.ref_detail_form.diaDestroy();
-      this.showDetail = false;
-    },
+
     //   编辑触发事件
     async handleEdit(row) {},
     //  新增弹出框组件取消事件
     handleClose() {
       this.formType = "";
       this.showAdd = false;
-      this.showDetail = false;
       this.showEdit = false;
     },
     //  新增弹出框组件确定事件
-    handleOk() {
+    handleComfirm() {
       this.handleClose();
       this.pageNo = 1;
       this.getTableData();
@@ -645,7 +660,7 @@ export default {
         type: "warning",
       })
         .then(() => {
-          this.cancelFuwu([row.id]);
+          this.cancelFuwu([row.categorizedResiId]);
         })
         .catch((err) => {
           if (err == "cancel") {
@@ -809,7 +824,7 @@ export default {
   props: {},
 };
 </script>
-  <style lang="scss" scoped>
+<style lang="scss" scoped>
 @import "@/assets/scss/buttonstyle.scss";
 @import "@/assets/scss/modules/management/list-main.scss";
 @import "@/assets/scss/modules/shequzhili/event-info.scss";
@@ -817,5 +832,5 @@ export default {
   margin-right: 10px;
 }
 </style>
-    
-    
\ No newline at end of file
+  
+  
\ No newline at end of file