民宗App人员档案新增dead字段

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -25,7 +25,11 @@
           <van-popup v-model:show="showPicker" round position="bottom">
             <van-picker
               title="证件类型"
-              :columns="places"
+              :columns="$dictUtils.getDictList('hs_cert_type')"
+              :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
               @cancel="showPicker = false"
               @confirm="getPlace"
             />
@@ -91,7 +95,11 @@
           <van-popup v-model:show="hs_nation" round position="bottom">
             <van-picker
               title="民族类型"
-              :columns="nation"
+              :columns="$dictUtils.getDictList('hs_nation')"
+              :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
               @cancel="hs_nation = false"
               @confirm="getnation"
             />
@@ -112,7 +120,11 @@
           <van-popup v-model:show="hs_sex" round position="bottom">
             <van-picker
               title="性别"
-              :columns="sex"
+              :columns="$dictUtils.getDictList('sex')"
+              :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
               @cancel="hs_sex = false"
               @confirm="getsex"
             />
@@ -420,6 +432,31 @@
             />
           </van-popup>
         </van-cell-group>
+        <van-cell-group>
+          <van-field
+            v-model="Dead"
+            readonly
+            required
+            :rules="[{ required: true }]"
+            label="是否死亡："
+            placeholder="请选择人员是否死亡"
+            input-align="right"
+            right-icon="arrow-down"
+            @click="hs_dead = true"
+          />
+          <van-popup v-model:show="hs_dead" round position="bottom">
+            <van-picker
+              title="是否死亡"
+              :columns="$dictUtils.getDictList('yes_no')"
+              :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
+              @cancel="hs_dead = false"
+              @confirm="getdead"
+            />
+          </van-popup>
+        </van-cell-group>
         <p class="miniTitle">扩展信息</p>
         <van-col
           span="24"
@@ -610,6 +647,7 @@ export default {
         id: "",
       },
       bkcheck: "",
+      dead:"",
     });
     onMounted(() => {
       //籍贯接口
@@ -619,12 +657,6 @@ export default {
       });
     });
     // 证件类型
-    const places = [
-      { text: "身份证", value: " 1" },
-      { text: "护照", value: "2" },
-      { text: "港澳通行证", value: "3" },
-      { text: "其他", value: "4" },
-    ];
     const idTypeName = ref("");
     let showPicker = ref(false);
     const getPlace = ({ selectedOptions }) => {
@@ -633,69 +665,10 @@ export default {
         idType: selectedOptions[0].value,
       });
       inputForm.value = json;
-      idTypeName.value = selectedOptions[0].text;
+      idTypeName.value = selectedOptions[0].label;
     };
     // 民族
     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;
@@ -703,14 +676,10 @@ export default {
         nation: selectedOptions[0].value,
       });
       inputForm.value = json;
-      nationName.value = selectedOptions[0].text;
+      nationName.value = selectedOptions[0].label;
     };
     // 性别
     const sexName = ref("");
-    const sex = [
-      { text: "男", value: "1" },
-      { text: "女", value: "2" },
-    ];
     let hs_sex = ref(false);
     const getsex = ({ selectedOptions }) => {
       hs_sex.value = false;
@@ -718,7 +687,7 @@ export default {
         sex: selectedOptions[0].value,
       });
       inputForm.value = json;
-      sexName.value = selectedOptions[0].text;
+      sexName.value = selectedOptions[0].label;
     };
     // 教育程度
     const educationName = ref("");
@@ -1062,6 +1031,17 @@ export default {
       inputForm.value = json;
       activitytext.value = selectedOptions[0].text;
     };
+    // 是否死亡
+    const Dead = ref('');
+    let hs_dead = ref(false);
+    const getdead = ({ selectedOptions }) => {
+      hs_dead.value = false;
+      const json = Object.assign(inputForm.value, {
+        dead: selectedOptions[0].value,
+      });
+      inputForm.value = json;
+      Dead.value = selectedOptions[0].label;
+    };
     // 扩展信息选择
     let hs_select = ref({});
     const getselect = (index, { selectedOptions }) => {
@@ -1215,6 +1195,10 @@ export default {
       hs_activity,
       getactivity,
       activitytext,
+      //是否死亡
+      Dead,
+      hs_dead,
+      getdead,
       //扩展信息选择
       hs_select,
       getselect,

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -50,7 +50,6 @@
                 v-model="idTypeName"
                 readonly
                 required
-                
                 label="证件类型:"
                 name="validator"
                 placeholder="请选择证件类型"
@@ -62,7 +61,11 @@
               <van-popup v-model:show="showPicker" round position="bottom">
                 <van-picker
                   title="证件类型"
-                  :columns="places"
+                  :columns="$dictUtils.getDictList('hs_cert_type')"
+                  :columns-field-names="{
+                    text: 'label',
+                    value: 'value',
+                  }"
                   @cancel="showPicker = false"
                   @confirm="getPlace"
                 />
@@ -450,6 +453,31 @@
               />
             </van-popup>
           </van-cell-group>
+          <van-cell-group>
+            <van-field
+              v-model="Dead"
+              readonly
+              required
+              :rules="[{ required: true }]"
+              label="是否死亡："
+              placeholder="请选择人员是否死亡"
+              input-align="right"
+              right-icon="arrow-down"
+              @click="hs_dead = true"
+            />
+            <van-popup v-model:show="hs_dead" round position="bottom">
+              <van-picker
+                title="是否死亡"
+                :columns="$dictUtils.getDictList('yes_no')"
+                :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
+                @cancel="hs_dead = false"
+                @confirm="getdead"
+              />
+            </van-popup>
+          </van-cell-group>
         </div>
         <p class="miniTitle">扩展信息</p>
         <van-col
@@ -612,6 +640,10 @@ export default {
         expansion.value = res.userManagenmetDetailsDTOList;
         idTypeName.value = getidCardType(data.value.idType);
         sexName.value = getSex(data.value.sex);
+        idTypeName.value = current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "hs_cert_type",
+            data.value.idType
+          );
         nationName.value =
           current.appContext.config.globalProperties.$dictUtils.getDictLabel(
             "hs_nation",
@@ -634,6 +666,11 @@ export default {
             "hs_type_of_employees",
             data.value.typeOfEmployees
           );
+        Dead.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "yes_no",
+            data.value.dead
+          );
         let arr = data.value.personnelType.split(",");
         personnalType.value = getValue1(arr).join(",");
         let tissid = data.value.zjzz.id;
@@ -733,12 +770,6 @@ export default {
       return item.value;
     };
     // 证件类型
-    const places = [
-      { text: "身份证", value: " 1" },
-      { text: "护照", value: "2" },
-      { text: "港澳通行证", value: "3" },
-      { text: "其他", value: "4" },
-    ];
     const idTypeName = ref("");
     let showPicker = ref(false);
     const getPlace = ({ selectedOptions }) => {
@@ -747,7 +778,7 @@ export default {
         idType: selectedOptions[0].value,
       });
       data.value = json;
-      idTypeName.value = selectedOptions[0].text;
+      idTypeName.value = selectedOptions[0].label;
     };
     const getidCardType = (item) => {
       const type = {
@@ -1112,6 +1143,17 @@ export default {
       data.value = json;
       activitytext.value = selectedOptions[0].text;
     };
+    // 是否死亡
+    const Dead = ref("");
+    let hs_dead = ref(false);
+    const getdead = ({ selectedOptions }) => {
+      hs_dead.value = false;
+      const json = Object.assign(data.value, {
+        dead: selectedOptions[0].value,
+      });
+      data.value = json;
+      Dead.value = selectedOptions[0].label;
+    };
     const getActivity = (item) => {
       const type = {
         0: "是",
@@ -1184,7 +1226,6 @@ export default {
       // 证件类型
       idTypeName,
       showPicker,
-      places,
       getPlace,
       //性别
       sexName,
@@ -1250,6 +1291,10 @@ export default {
       hs_activity,
       getactivity,
       activitytext,
+      //是否死亡
+      Dead,
+      hs_dead,
+      getdead,
       // 地区选择
       placeAddress,
       customFieldName,