Parcourir la source

人员详情页修改

guoqing il y a 1 an
Parent
commit
ee6f7114d4

+ 11 - 1
src/api/placePerson/placePerson.js

@@ -14,7 +14,12 @@ export default class placePerson {
             params
         )
     };
-    //人员新增
+    queryId(id) {
+            return request.get(
+                `/zjzz/religion/queryById`, { id: id }
+            )
+        }
+        //人员新增
     save(inputForm) {
             return request.post(
                 `/user/usermanagement/userManagement/save`,
@@ -28,4 +33,9 @@ export default class placePerson {
             params
         )
     }
+    userDTOqueryId(id) {
+        return request.get(
+            `/user/usertemplate/userType/queryById`, { "id": id }
+        )
+    }
 }

+ 402 - 440
src/views/placeManage/placePerson/placePersoninfo.vue

@@ -84,328 +84,348 @@
           </van-cell-group>
         </van-col>
       </van-row>
-      <van-row class="item">
+      <div class="item">
         <van-cell-group>
-        <van-field
-          v-model="data.beforeUsedName"
-          center
-          label="曾用名:"
-          placeholder="请填写曾用名"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="nationName"
-          readonly
-          label="民族:"
-          placeholder="请选择民族"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_nation = true"
-        />
-        <van-popup v-model:show="hs_nation" round position="bottom">
-          <van-picker
-            title="民族类型"
-            :columns="nation"
-            @cancel="hs_nation = false"
-            @confirm="getnation"
+          <van-field
+            v-model="data.beforeUsedName"
+            center
+            label="曾用名:"
+            placeholder="请填写曾用名"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.phone"
-          center
-          label="手机号:"
-          placeholder="请填写手机号"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.nativePlace"
-          readonly
-          label="籍贯:"
-          placeholder="请选择籍贯地区"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_nativePlace = true"
-        />
-        <van-popup v-model:show="hs_nativePlace" round position="bottom">
-          <van-picker
-            title="籍贯"
-            :columns="nativePlace"
-            :columns-field-names="customFieldName"
-            @cancel="hs_nativePlace = false"
-            @confirm="getnativePlace"
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="nationName"
+            readonly
+            label="民族:"
+            placeholder="请选择民族"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_nation = true"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="educationName"
-          readonly
-          label="教育程度"
-          placeholder="请选择教育程度"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_education = true"
-        />
-        <van-popup v-model:show="hs_education" round position="bottom">
-          <van-picker
-            title="教育程度"
-            :columns="education"
-            @cancel="hs_education = false"
-            @confirm="geteducation"
+          <van-popup v-model:show="hs_nation" round position="bottom">
+            <van-picker
+              title="民族类型"
+              :columns="$dictUtils.getDictList('hs_nation')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="hs_nation = false"
+              @confirm="getnation"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.phone"
+            center
+            label="手机号:"
+            placeholder="请填写手机号"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.graduatedFrom"
-          center
-          label="毕业院校:"
-          placeholder="请填写毕业院校"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="religiousName"
-          readonly
-          label="教别:"
-          name="validator"
-          placeholder="请选择教别"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_religious = true"
-        />
-        <van-popup v-model:show="hs_religious" round position="bottom">
-          <van-picker
-            title="教别"
-            :columns="religious"
-            @cancel="hs_religious = false"
-            @confirm="getreligious"
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.nativePlace"
+            readonly
+            label="籍贯:"
+            placeholder="请选择籍贯地区"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_nativePlace = true"
+          />
+          <van-popup v-model:show="hs_nativePlace" round position="bottom">
+            <van-picker
+              title="籍贯"
+              :columns="nativePlace"
+              :columns-field-names="customFieldName"
+              @cancel="hs_nativePlace = false"
+              @confirm="getnativePlace"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="educationName"
+            readonly
+            label="教育程度"
+            placeholder="请选择教育程度"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_education = true"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.religiousAppellation"
-          center
-          label="宗教称谓:"
-          placeholder="请填写宗教称谓"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="locationName"
-          readonly
-          label="所属场所:"
-          placeholder="请选择所属场所"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_site = true"
-        >
-        </van-field>
-        <van-dialog v-model:show="hs_site" title="所属场所" show-cancel-button>
-          <div class="dialog">
-            <van-list
-              v-model:loading="loading"
-              :finished="finished"
-              finished-text="没有更多了"
-              @load="onLoad"
-            >
-              <van-radio-group v-model="checked">
-                <van-cell-group inset>
-                  <van-cell
-                    v-for="item in sitelist"
-                    :key="item"
-                    :title="item.name"
-                    clickable
-                    @click="getsite(item)"
-                  >
-                    <template #right-icon>
-                      <van-radio :name="item.id" @click="getsite(item)"/>
-                    </template>
-                  </van-cell>
-                </van-cell-group>
-              </van-radio-group>
-            </van-list>
-          </div>
-        </van-dialog>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="typeOfEmployeesName"
-          readonly
-          label-width="7.2em"
-          label="场所任职情况:"
-          placeholder="请选择场所任职情况"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_typeOfEmployees = true"
-        />
-        <van-popup v-model:show="hs_typeOfEmployees" round position="bottom">
-          <van-picker
-            title="任职情况"
-            :columns="typeOfEmployees"
-            @cancel="hs_typeOfEmployees = false"
-            @confirm="gettypeOfEmployees"
+          <van-popup v-model:show="hs_education" round position="bottom">
+            <van-picker
+              title="教育程度"
+              :columns="$dictUtils.getDictList('hs_personnel_education')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="hs_education = false"
+              @confirm="geteducation"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.graduatedFrom"
+            center
+            label="毕业院校:"
+            placeholder="请填写毕业院校"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.currentResidence"
-          center
-          required
-          readonly
-          label="现居地:"
-          placeholder="请填写现居地"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="showPlace1 = true"
-        />
-        <van-popup v-model:show="showPlace1" round position="bottom">
-          <van-picker
-            title="现居地选择"
-            :columns="options"
-            :columns-field-names="customFieldName"
-            @cancel="showPlace1 = false"
-            @confirm="getPlace1"
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="religiousName"
+            readonly
+            label="教别:"
+            name="validator"
+            placeholder="请选择教别"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_religious = true"
           />
-        </van-popup>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.place"
-          center
-          label="详细地址:"
-          placeholder="请填写详细场所"
-          input-align="right"
-        >
-          <template #right-icon>
-            <van-icon name="location" @click="getLocation()" />
-          </template>
-        </van-field>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="personnalType"
-          readonly
-          required
-          label="人员类型:"
-          placeholder="请选择人员类型"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_persontype = true"
-        />
-        <van-dialog
-          v-model:show="hs_persontype"
-          title="人员类型"
-          show-cancel-button
-        >
-          <div class="dialog">
-            <van-list>
-              <van-checkbox-group v-model="checked2">
-                <van-cell-group inset>
-                  <van-cell
-                    v-for="(item, index) in persontype"
-                    clickable
-                    :key="item"
-                    :title="`${item.text}`"
-                    @click="toggle(index)"
-                  >
-                    <template #right-icon>
-                      <van-checkbox
-                        :name="item.value"
-                        :ref="(el) => (checkboxRefs[index] = el)"
-                        @click.stop
-                      />
-                    </template>
-                  </van-cell>
-                </van-cell-group>
-              </van-checkbox-group>
-            </van-list>
-          </div>
-        </van-dialog>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="tissueName"
-          readonly
-          label="宗教组织:"
-          placeholder="请选择宗教组织"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_tissue = true"
-        />
-        <van-dialog
-          v-model:show="hs_tissue"
-          title="所属场所"
-          show-cancel-button
-        >
-          <div class="dialog">
-            <van-list
-              v-model:loading="loading1"
-              :finished="finished1"
-              finished-text="没有更多了"
-              @load="onLoad1"
-            >
-              <van-radio-group v-model="checked1">
-                <van-cell-group inset>
-                  <van-cell
-                    v-for="item in tissuelist"
-                    :key="item"
-                    :title="item.organizationName"
-                    clickable
-                    @click="gettissue(item)"
-                  >
-                    <template #right-icon>
-                      <van-radio :name="item.id" />
-                    </template>
-                  </van-cell>
-                </van-cell-group>
-              </van-radio-group>
-            </van-list>
-          </div>
-        </van-dialog>
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="data.zjzzJob"
-          center
-          label-width="6.5em"
-          label="团体任职情况:"
-          placeholder="请填写团体任职情况"
-          input-align="right"
-        />
-      </van-cell-group>
-      <van-cell-group>
-        <van-field
-          v-model="activitytext"
-          readonly
-          required
-          label-width="7em"
-          label="非法活动参加:"
-          placeholder="请选择是否参加非法活动"
-          input-align="right"
-          right-icon="arrow-down"
-          @click="hs_activity = true"
-        />
-        <van-popup v-model:show="hs_activity" round position="bottom">
-          <van-picker
-            title="选择是否参加"
-            :columns="activity"
-            @cancel="hs_activity = false"
-            @confirm="getactivity"
+          <van-popup v-model:show="hs_religious" round position="bottom">
+            <van-picker
+              title="教别"
+              :columns="$dictUtils.getDictList('hs_religion_type')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="hs_religious = false"
+              @confirm="getreligious"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.religiousAppellation"
+            center
+            label="宗教称谓:"
+            placeholder="请填写宗教称谓"
+            input-align="right"
           />
-        </van-popup>
-      </van-cell-group>
-      </van-row>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="locationName"
+            readonly
+            label="所属场所:"
+            placeholder="请选择所属场所"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_site = true"
+          >
+          </van-field>
+          <van-dialog
+            v-model:show="hs_site"
+            title="所属场所"
+            show-cancel-button
+          >
+            <div class="dialog">
+              <van-list
+                v-model:loading="loading"
+                :finished="finished"
+                finished-text="没有更多了"
+                @load="onLoad"
+              >
+                <van-radio-group v-model="checked">
+                  <van-cell-group inset>
+                    <van-cell
+                      v-for="item in sitelist"
+                      :key="item"
+                      :title="item.name"
+                      clickable
+                      @click="getsite(item)"
+                    >
+                      <template #right-icon>
+                        <van-radio :name="item.id" @click="getsite(item)" />
+                      </template>
+                    </van-cell>
+                  </van-cell-group>
+                </van-radio-group>
+              </van-list>
+            </div>
+          </van-dialog>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="typeOfEmployeesName"
+            readonly
+            label-width="7.2em"
+            label="场所任职情况:"
+            placeholder="请选择场所任职情况"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_typeOfEmployees = true"
+          />
+          <van-popup v-model:show="hs_typeOfEmployees" round position="bottom">
+            <van-picker
+              title="任职情况"
+              :columns="$dictUtils.getDictList('hs_type_of_employees')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
+              @cancel="hs_typeOfEmployees = false"
+              @confirm="gettypeOfEmployees"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.currentResidence"
+            center
+            required
+            readonly
+            label="现居地:"
+            placeholder="请填写现居地"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="showPlace1 = true"
+          />
+          <van-popup v-model:show="showPlace1" round position="bottom">
+            <van-picker
+              title="现居地选择"
+              :columns="options"
+              :columns-field-names="customFieldName"
+              @cancel="showPlace1 = false"
+              @confirm="getPlace1"
+            />
+          </van-popup>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.currentResidenceDetail"
+            center
+            label="详细地址:"
+            placeholder="请填写详细场所"
+            input-align="right"
+          >
+            <template #right-icon>
+              <van-icon name="location" @click="getLocation()" />
+            </template>
+          </van-field>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="personnalType"
+            readonly
+            required
+            label="人员类型:"
+            placeholder="请选择人员类型"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_persontype = true"
+          />
+          <van-dialog
+            v-model:show="hs_persontype"
+            title="人员类型"
+            show-cancel-button
+          >
+            <div class="dialog">
+              <van-list>
+                <van-checkbox-group v-model="checked2">
+                  <van-cell-group inset>
+                    <van-cell
+                      v-for="(item, index) in persontype"
+                      clickable
+                      :key="item"
+                      :title="`${item.text}`"
+                      @click="toggle(index)"
+                    >
+                      <template #right-icon>
+                        <van-checkbox
+                          :name="item.value"
+                          :ref="(el) => (checkboxRefs[index] = el)"
+                          @click.stop
+                        />
+                      </template>
+                    </van-cell>
+                  </van-cell-group>
+                </van-checkbox-group>
+              </van-list>
+            </div>
+          </van-dialog>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="tissueName"
+            readonly
+            label="宗教组织:"
+            placeholder="请选择宗教组织"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_tissue = true"
+          />
+          <van-dialog
+            v-model:show="hs_tissue"
+            title="所属场所"
+            show-cancel-button
+          >
+            <div class="dialog">
+              <van-list
+                v-model:loading="loading1"
+                :finished="finished1"
+                finished-text="没有更多了"
+                @load="onLoad1"
+              >
+                <van-radio-group v-model="checked1">
+                  <van-cell-group inset>
+                    <van-cell
+                      v-for="item in tissuelist"
+                      :key="item"
+                      :title="item.organizationName"
+                      clickable
+                      @click="gettissue(item)"
+                    >
+                      <template #right-icon>
+                        <van-radio :name="item.id" />
+                      </template>
+                    </van-cell>
+                  </van-cell-group>
+                </van-radio-group>
+              </van-list>
+            </div>
+          </van-dialog>
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="data.zjzzJob"
+            center
+            label-width="6.5em"
+            label="团体任职情况:"
+            placeholder="请填写团体任职情况"
+            input-align="right"
+          />
+        </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="activitytext"
+            readonly
+            required
+            label-width="7em"
+            label="非法活动参加:"
+            placeholder="请选择是否参加非法活动"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_activity = true"
+          />
+          <van-popup v-model:show="hs_activity" round position="bottom">
+            <van-picker
+              title="选择是否参加"
+              :columns="activity"
+              @cancel="hs_activity = false"
+              @confirm="getactivity"
+            />
+          </van-popup>
+        </van-cell-group>
+      </div>
       <p class="miniTitle">拓展信息</p>
       <van-row class="item" v-for="(item, index) in expansion" :key="index">
         <van-col span="24">
@@ -424,9 +444,13 @@
 
 <script>
 import { useRouter } from "vue-router";
-import { onBeforeUpdate,onMounted, ref } from "vue";
+import { onBeforeUpdate, onMounted, ref, getCurrentInstance } from "vue";
 import $base from "@/utils/config";
+import placePerson from "@/api/placePerson/placePerson";
+import PlaceRegister from "@/api/placeRegister/placeRegister";
 import UserManage from "@/api/user/UserManage";
+import tools from "@/api/sys/tools";
+import placeRegister from '@/api/placeRegister/placeRegister';
 export default {
   setup() {
     const data = ref({});
@@ -435,6 +459,7 @@ export default {
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
     //数据接收
     const router = useRouter();
+    const current = getCurrentInstance();
     onMounted(() => {
       var id = JSON.parse(router.currentRoute.value.query.id);
       new UserManage().queryById(id).then((res) => {
@@ -442,6 +467,35 @@ export default {
         expansion.value = res.userManagenmetDetailsDTOList;
         idTypeName.value = getidCardType(data.value.idType);
         sexName.value = getSex(data.value.sex);
+        nationName.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "hs_nation",
+            data.value.nation
+          );
+        educationName.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "hs_personnel_education",
+            data.value.nationalEducationLevel
+          );
+        religiousName.value = current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "hs_religion_type",
+            data.value.religion
+          );
+        let location = data.value.location
+        locationName.value = location.name;
+        typeOfEmployeesName.value = current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "hs_type_of_employees",
+            data.value.typeOfEmployees
+          );
+          let arr = data.value.personnelType.split(',')
+          personnalType.value = getValue1(arr).join(',')
+        let tissid = data.value.zjzz.id
+        if(tissid!=''){
+          new placePerson().queryId({id:tissid}).then((res)=>{
+          tissueName.value = res.organizationName
+        })
+        }
+        activitytext.value = getActivity(data.value.bkcheck);
       });
       //籍贯接口
       new placePerson().nativePlace().then((res) => {
@@ -505,7 +559,7 @@ export default {
         4: "其他",
       };
       return type[item];
-    };
+    }
     // 性别
     const sexName = ref("");
     const sex = [
@@ -530,65 +584,6 @@ export default {
     };
     // 民族
     const nationName = ref("");
-    const nation = [
-      { text: "汉族", value: " 1" },
-      { text: "阿昌族", value: "2" },
-      { text: "白族", value: "3" },
-      { text: "保安族", value: "4" },
-      { text: "布朗族", value: "5" },
-      { text: "布依族", value: " 6" },
-      { text: "朝鲜族", value: "7" },
-      { text: "达斡尔族", value: "8" },
-      { text: "傣族", value: "9" },
-      { text: "德昂族", value: "10" },
-      { text: "东乡族", value: " 11" },
-      { text: "侗族", value: "12" },
-      { text: "独龙族", value: "13" },
-      { text: "俄罗斯族", value: "14" },
-      { text: "鄂伦春族", value: "15" },
-      { text: "鄂温克族", value: " 16" },
-      { text: "高山族", value: "17" },
-      { text: "仡佬族", value: "18" },
-      { text: "哈尼族", value: "19" },
-      { text: "哈萨克族", value: "20" },
-      { text: "赫哲族", value: " 21" },
-      { text: "回族", value: "22" },
-      { text: "基诺族", value: "23" },
-      { text: "京族", value: "24" },
-      { text: "景颇族", value: "25" },
-      { text: "柯尔克孜族", value: " 26" },
-      { text: "拉祜族", value: "27" },
-      { text: "黎族", value: "28" },
-      { text: "傈僳族", value: "29" },
-      { text: "珞巴族", value: "30" },
-      { text: "满族", value: " 31" },
-      { text: "毛南族", value: "32" },
-      { text: "门巴族", value: "33" },
-      { text: "蒙古族", value: "34" },
-      { text: "苗族", value: "35" },
-      { text: "仫佬族", value: " 36" },
-      { text: "纳西族", value: "37" },
-      { text: "怒族", value: "38" },
-      { text: "普米族", value: "39" },
-      { text: "羌族", value: "40" },
-      { text: "撒拉族", value: " 41" },
-      { text: "畲族", value: "42" },
-      { text: "水族", value: "43" },
-      { text: "塔吉克族", value: "44" },
-      { text: "塔塔尔族", value: "45" },
-      { text: "土家族", value: " 46" },
-      { text: "土族", value: "47" },
-      { text: "佤族", value: "48" },
-      { text: "维吾尔族", value: "49" },
-      { text: "乌孜别克族", value: "50" },
-      { text: "锡伯族", value: " 51" },
-      { text: "瑶族", value: "52" },
-      { text: "彝族", value: "53" },
-      { text: "裕固族", value: "54" },
-      { text: "藏族", value: "55" },
-      { text: "壮族", value: "56" },
-      { text: "其他", value: "57" },
-    ]
     let hs_nation = ref(false);
     const getnation = ({ selectedOptions }) => {
       hs_nation.value = false;
@@ -596,21 +591,10 @@ export default {
         nation: selectedOptions[0].value,
       });
       data.value = json;
-      nationName.value = selectedOptions[0].text;
+      nationName.value = selectedOptions[0].label;
     };
     // 教育程度
     const educationName = ref("");
-    const education = [
-      { text: "小学", value: "1" },
-      { text: "初中", value: "2" },
-      { text: "中专", value: "3" },
-      { text: "高中", value: "4" },
-      { text: "大专", value: "5" },
-      { text: "本科", value: "6" },
-      { text: "硕士研究生", value: "7" },
-      { text: "博士研究生", value: "8" },
-      { text: "其他", value: "9" },
-    ];
     let hs_education = ref(false);
     const geteducation = ({ selectedOptions }) => {
       hs_education.value = false;
@@ -618,17 +602,10 @@ export default {
         nationalEducationLevel: selectedOptions[0].value,
       });
       data.value = json;
-      educationName.value = selectedOptions[0].text;
+      educationName.value = selectedOptions[0].label;
     };
     // 宗教类别
     const religiousName = ref("");
-    const religious = [
-      { text: "伊斯兰教", value: "1" },
-      { text: "基督教", value: "2" },
-      { text: "天主教", value: "3" },
-      { text: "佛教", value: "4" },
-      { text: "道教", value: "5" },
-    ];
     let hs_religious = ref(false);
     const getreligious = ({ selectedOptions }) => {
       hs_religious.value = false;
@@ -636,7 +613,7 @@ export default {
         religion: selectedOptions[0].value,
       });
       data.value = json;
-      religiousName.value = selectedOptions[0].text;
+      religiousName.value = selectedOptions[0].label;
     };
     // 宗教类别2
     const religiousName2 = ref("");
@@ -655,15 +632,16 @@ export default {
       religiousName2.value = selectedOptions[0].text;
     };
     // 所属场所
+    const locationName = ref("");
     const checked = ref("");
     const sitelist = ref([]);
     let hs_site = ref(false);
     const getsite = (val) => {
       console.log(val);
-      let id = '';
+      let id = "";
       id = val.id;
       locationName.value = val.name;
-      const json = Object.assign(data.value, { location: { id: id } });
+      const json = Object.assign(data.value, { location: { id: id,name:val.name} });
       data.value = json;
       checked.value = val.id;
     };
@@ -692,44 +670,15 @@ export default {
     };
     // 场所任职情况
     const typeOfEmployeesName = ref("");
-    const typeOfEmployees = [
-      { text: "场所负责人", value: "1" },
-      { text: "堂委", value: "2" },
-      { text: "主要教职人员", value: "3" },
-      { text: "财会", value: "4" },
-      { text: "传道(已退休)", value: "5" },
-      { text: "保安", value: "6" },
-      { text: "信息审核员", value: "7" },
-      { text: "常住", value: "8" },
-      { text: "传道", value: "9" },
-      { text: "道士", value: "10" },
-      { text: "法人", value: "11" },
-      { text: "法务", value: "12" },
-      { text: "副主任", value: "13" },
-      { text: "副组长", value: "14" },
-      { text: "监院", value: "15" },
-      { text: "清众", value: "16" },
-      { text: "僧职", value: "17" },
-      { text: "僧值", value: "18" },
-      { text: "退居", value: "19" },
-      { text: "维那", value: "20" },
-      { text: "长老", value: "21" },
-      { text: "知客", value: "22" },
-      { text: "住持", value: "23" },
-      { text: "组长", value: "24" },
-      { text: "组长及讲道", value: "25" },
-    ];
     let hs_typeOfEmployees = ref(false);
     const gettypeOfEmployees = ({ selectedOptions }) => {
       hs_typeOfEmployees.value = false;
-      // inputForm.typeOfEmployees = selectedOptions[0].value;
       const json = Object.assign(data.value, {
         typeOfEmployees: selectedOptions[0].value,
       });
       data.value = json;
       typeOfEmployeesName.value = selectedOptions[0].text;
     };
-
     //籍贯
     const nativePlace = ref([]);
     let hs_nativePlace = ref(false);
@@ -795,9 +744,9 @@ export default {
       let str1 = "";
       let str2 = "";
       selectedOptions.forEach((item) => {
-        if (inputForm.currentResidence) {
-          str1 = inputForm.currentResidence;
-          str2 = inputForm.currentResidenceId;
+        if (data.currentResidence) {
+          str1 = data.currentResidence;
+          str2 = data.currentResidenceId;
         }
         str1 += item.name + "/";
         str2 += item.code + "/";
@@ -877,12 +826,9 @@ export default {
       checkboxRefs.value[index].toggle();
       let str = "";
       str = checked2.value.join();
-      const json = Object.assign(
-        { ...data.value },
-        { personnelType: str }
-      );
+      const json = Object.assign({ ...data.value }, { personnelType: str });
       data.value = json;
-      personnalType.value = getValue1(checked2.value).join();
+      personnalType.value = getValue1(checked2.value).join(',');
       showZW.value = str;
     };
     onBeforeUpdate(() => {
@@ -919,6 +865,7 @@ export default {
       });
       return Array;
     };
+
     // 是否参加非法活动
     const activitytext = ref("");
     const activity = [
@@ -934,6 +881,13 @@ export default {
       data.value = json;
       activitytext.value = selectedOptions[0].text;
     };
+    const getActivity = (item) => {
+      const type = {
+        0: "是",
+        1: "否",
+      };
+      return type[item];
+    };
     //返回
     const onClickLeft = () => {
       history.back();
@@ -957,17 +911,14 @@ export default {
       //民族
       nationName,
       hs_nation,
-      nation,
       getnation,
       // 教育程度
       educationName,
       hs_education,
-      education,
       geteducation,
       // 宗教类别
       religiousName,
       hs_religious,
-      religious,
       getreligious,
       // 宗教类别2
       religiousName2,
@@ -976,7 +927,7 @@ export default {
       religious2,
       getreligious2,
       //所属场所
-      // locationName,
+      locationName,
       checked,
       hs_site,
       getsite,
@@ -988,7 +939,6 @@ export default {
       //场所任职情况
       typeOfEmployeesName,
       hs_typeOfEmployees,
-      typeOfEmployees,
       gettypeOfEmployees,
       //籍贯
       nativePlace,
@@ -1017,10 +967,22 @@ export default {
       hs_activity,
       getactivity,
       activitytext,
+      // 地区选择
+      placeAddress,
+      customFieldName,
+      showPlace1,
+      getPlace1,
+      options,
+      getLocation,
     };
   },
 };
 </script>
 
 <style lang="less" scoped>
+.dialog {
+  width: 100%;
+  height: 400px;
+  overflow: auto;
+}
 </style>