Merge branch 'master' of http://123.57.226.179:8080/yin_yu820/HS_MZAP

src/views/activityMan/personList.vue

@@ -1,25 +1,31 @@
 <template>
   <div class="personList">
-    <van-cell-group>
-      <van-field v-model="personType" clearable center readonly label="人员类型:" placeholder="请选择人员类型" input-align="right"
-        right-icon="arrow-down" @click="showPerson = true" />
-      <van-popup v-model:show="showPerson" round position="bottom">
-        <van-picker title="人员类型" :columns="$dictUtils.getDictList('hs_people_type')" :columns-field-names="{
-          text: 'label',
-          value: 'value'
-        }" @cancel="showPerson = false" @confirm="getPersonType" />
-      </van-popup>
-    </van-cell-group>
-    <van-cell-group>
-      <van-field v-model="religiousType" clearable center readonly label="宗教类型:" placeholder="请选择宗教类型" input-align="right"
-        right-icon="arrow-down" @click="showPlace = true" />
-      <van-popup v-model:show="showPlace" round position="bottom">
-        <van-picker title="宗教类型" :columns="$dictUtils.getDictList('hs_religion_type')" :columns-field-names="{
-          text: 'label',
-          value: 'value'
-        }" @cancel="showPlace = false" @confirm="getType" />
-      </van-popup>
-    </van-cell-group>
+    <van-row ustify="center">
+      <van-col span="12">
+        <van-cell-group>
+          <van-field v-model="personType" clearable center readonly placeholder="请选择人员类型" input-align="right"
+            right-icon="arrow-down" @click="showPerson = true" />
+          <van-popup v-model:show="showPerson" round position="bottom">
+            <van-picker title="人员类型" :columns="$dictUtils.getDictList('hs_people_type')" :columns-field-names="{
+              text: 'label',
+              value: 'value'
+            }" @cancel="showPerson = false" @confirm="getPersonType" />
+          </van-popup>
+        </van-cell-group>
+      </van-col>
+      <van-col span="12">
+        <van-cell-group>
+          <van-field v-model="religiousType" clearable center readonly placeholder="请选择宗教类型" input-align="right"
+            right-icon="arrow-down" @click="showPlace = true" />
+          <van-popup v-model:show="showPlace" round position="bottom">
+            <van-picker title="宗教类型" :columns="$dictUtils.getDictList('hs_religion_type')" :columns-field-names="{
+              text: 'label',
+              value: 'value'
+            }" @cancel="showPlace = false" @confirm="getType" />
+          </van-popup>
+        </van-cell-group>
+      </van-col>
+    </van-row>
     <van-search v-model="searchForm.name" clearable show-action shape="round" placeholder="请输入搜索关键词" input-align="center"
       @search="onLoad" @cancel="onCancel" />
     <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
@@ -27,18 +33,18 @@
         <van-button type="primary" size="mini" @click="checkAll">全选</van-button>
         <van-button type="primary" size="mini" @click="nocheckAll">取消全选</van-button>
         <van-cell-group inset>
-          <van-cell v-for="(item, index) in list" clickable :key="item" :title="item.name" @click="toggle(index)">
+          <van-cell v-for="(item, index) in list" clickable :key="item" :title="item.name">
             <template #right-icon>
-              <van-checkbox shape="square" :name="item" :ref="(el) => (checkboxRefs[index] = el)" />
+              <van-checkbox :name="item" :ref="el => (checkboxRefs[index] = el)" @click="toggle(index)" />
             </template>
           </van-cell>
         </van-cell-group>
       </van-checkbox-group>
       <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
-          <van-cell v-for="item in list" clickable :key="item" :title="item.name" @click="selectes(item)">
+          <van-cell v-for="item in list" clickable :key="item" :title="item.name">
             <template #right-icon>
-              <van-radio :name="item" />
+              <van-radio :name="item" @click="selectes(item)" />
             </template>
           </van-cell>
         </van-cell-group>
@@ -90,7 +96,6 @@ export default {
     const checkboxRefs = ref([]);
     const checkboxGroup = ref(null);
     const toggle = (index) => {
-
       checkboxRefs.value[index].toggle();
       emit("selected", checked.value, 1);
     };
@@ -168,7 +173,7 @@ export default {
           }
         });
     };
-    if (props.siteId != "") {
+    if (props.siteId != "" && searchForm.value.location.id != props.siteId) {
       searchForm.value.location.id = props.siteId;
     }
     return {

src/views/activityMan/placeactivity/placeActivityView.vue

@@ -35,8 +35,8 @@
           input-align="right" type="digit" />
       </van-cell-group>
       <van-cell-group>
-        <van-field v-model="placeActivity.knownList.name" center required :rules="[{ required: true }]" label="已知名单:"
-          placeholder="请选择参会已知名单" input-align="right" right-icon="arrow-down" @click="showPerson = true" />
+        <van-field v-model="placeActivity.knownList.name" center label="已知名单:" placeholder="请选择参会已知名单" input-align="right"
+          right-icon="arrow-down" @click="showPerson = true" />
         <van-dialog v-model:show="showPerson" title="选择人员名单" show-cancel-button @confirm="reselected">
           <person-list v-if="showPerson" @selected="selected" :type="1" :siteId="placeActivity.siteName.id"></person-list>
         </van-dialog>