src/views/placeManage/placePerson/placePersonAdd.vue

@@ -428,7 +428,11 @@
           <van-popup v-model:show="hs_activity" round position="bottom">
             <van-picker
               title="选择是否参加"
-              :columns="activity"
+              :columns="$dictUtils.getDictList('yes_no')"
+              :columns-field-names="{
+                text: 'label',
+                value: 'value',
+              }"
               @cancel="hs_activity = false"
               @confirm="getactivity"
             />
@@ -655,8 +659,8 @@ export default {
       zjzz: {
         id: "",
       },
-      bkcheck: "",
-      dead: "",
+      bkcheck: "0",
+      dead: "0",
     });
     onMounted(() => {
       //籍贯接口
@@ -1031,11 +1035,7 @@ export default {
       return Array;
     };
     // 是否参加非法活动
-    const activitytext = ref("");
-    const activity = [
-      { text: "是", value: "0" },
-      { text: "否", value: "1" },
-    ];
+    const activitytext = ref("否");
     let hs_activity = ref(false);
     const getactivity = ({ selectedOptions }) => {
       hs_activity.value = false;
@@ -1043,10 +1043,10 @@ export default {
         bkcheck: selectedOptions[0].value,
       });
       inputForm.value = json;
-      activitytext.value = selectedOptions[0].text;
+      activitytext.value = selectedOptions[0].label;
     };
     // 是否死亡
-    const Dead = ref("");
+    const Dead = ref("否");
     let hs_dead = ref(false);
     const getdead = ({ selectedOptions }) => {
       hs_dead.value = false;
@@ -1201,7 +1201,6 @@ export default {
       checkboxRefs,
       showZW,
       // 是否参加非法活动
-      activity,
       hs_activity,
       getactivity,
       activitytext,

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -448,7 +448,11 @@
             <van-popup v-model:show="hs_activity" round position="bottom">
               <van-picker
                 title="选择是否参加"
-                :columns="activity"
+                :columns="$dictUtils.getDictList('yes_no')"
+                :columns-field-names="{
+                  text: 'label',
+                  value: 'value',
+                }"
                 @cancel="hs_activity = false"
                 @confirm="getactivity"
               />
@@ -680,6 +684,11 @@ export default {
             "yes_no",
             data.value.dead
           );
+        activitytext.value =
+          current.appContext.config.globalProperties.$dictUtils.getDictLabel(
+            "yes_no",
+            data.value.bkcheck
+          );
         let arr = data.value.personnelType.split(",");
         personnalType.value = getValue1(arr).join(",");
         let tissid = data.value.zjzz.id;
@@ -1140,10 +1149,6 @@ export default {
     };
     // 是否参加非法活动
     const activitytext = ref("");
-    const activity = [
-      { text: "是", value: "0" },
-      { text: "否", value: "1" },
-    ];
     let hs_activity = ref(false);
     const getactivity = ({ selectedOptions }) => {
       hs_activity.value = false;
@@ -1151,10 +1156,10 @@ export default {
         bkcheck: selectedOptions[0].value,
       });
       data.value = json;
-      activitytext.value = selectedOptions[0].text;
+      activitytext.value = selectedOptions[0].label;
     };
     // 是否死亡
-    const Dead = ref("");
+    const Dead = ref("否");
     let hs_dead = ref(false);
     const getdead = ({ selectedOptions }) => {
       hs_dead.value = false;
@@ -1297,7 +1302,6 @@ export default {
       showZW,
       changperson,
       // 是否参加非法活动
-      activity,
       hs_activity,
       getactivity,
       activitytext,