场所详情页面更改

src/api/placePerson/placePerson.js

@@ -22,9 +22,16 @@ export default class placePerson {
     };
     //人员新增
     save(inputForm) {
-        return request.post(
-            `/user/usermanagement/userManagement/save`,
-            inputForm
+            return request.post(
+                `/user/usermanagement/userManagement/save`,
+                inputForm
+            )
+        }
+        //登录用户信息
+    userList(params) {
+        return request.get(
+            `/sys/user/list`,
+            params
         )
     }
 }

src/views/placeManage/placePerson/placePerson.vue

@@ -24,7 +24,7 @@
           </template>
         </van-search>
       </van-tab>
-      <van-tab title="身份证号">
+      <van-tab title="身份证查询">
         <van-search
           v-model="value2"
           show-action

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -6,273 +6,598 @@
     @click-left="onClickLeft"
     :style="{ 'background-color': selectColor }"
   />
-  <div class="main">
+  <div class="main" style="height: 100vh">
     <div class="banner">
       <img src="../../../../public/loginbg/banner.jpg" alt="" />
     </div>
-    <div class="info">
-      <p class="miniTitle">场所信息</p>
-      <van-row justify="space-between">
-        <van-col span="24">
-          <van-row class="item">
-            <van-col span="24">
-              <van-row justify="space-between">
-                <van-field
-                  v-model="dataitem.name"
-                  center
-                  readonly
-                  clearable
-                  label="场所名称:"
-                  input-align="right"
-                />
-              </van-row>
-            </van-col>
-          </van-row>
-          <van-row class="item">
-            <van-col span="24">
-              <van-row justify="space-between">
-                <van-field
-                  v-model="dataitem.religiousType"
-                  center
-                  readonly
-                  clearable
-                  label="宗教类型:"
-                  input-align="right"
+    <div class="info" style="height: 600px">
+      <van-tabs v-model:active="active" swipeable>
+        <!-- 基础信息 -->
+        <van-tab>
+          <template #title> <van-icon name="orders-o" />基础信息</template>
+          <div style="padding: 0 10px; height: 570px; overflow: auto">
+            <van-cell-group>
+              <van-field
+                name="uploader"
+                label-align="top"
+                label-width="8em"
+                label="场所内外景照片:"
+              >
+                <template #input>
+                  <van-uploader
+                    v-model="fileList"
+                    :after-read="afterRead1"
+                    :max-count="6"
+                    capture="camera"
+                    accept=""
+                    :before-delete="fjdelete"
+                  >
+                  </van-uploader>
+                </template>
+              </van-field>
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.name"
+                center
+                required
+                clearable
+                label="场所名称:"
+                input-align="right"
+                placeholder="请输入场所名称"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="religiousType"
+                readonly
+                required
+                label="宗教类型:"
+                name="validator"
+                placeholder="请选择教别"
+                input-align="right"
+                right-icon="arrow-down"
+                @click="hs_religious = true"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.tyshxydm"
+                center
+                label-width="7em"
+                clearable
+                label="社会信用代码:"
+                input-align="right"
+                placeholder="请输入社会信用代码"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.contact"
+                center
+                label-width="7em"
+                clearable
+                label="场所联系人:"
+                input-align="right"
+                placeholder="请填写场所联系人"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.contactNumber"
+                center
+                label-width="7em"
+                clearable
+                label="联系电话:"
+                input-align="right"
+                placeholder="请输入联系电话"
+              />
+            </van-cell-group>
+
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.placeSelectName"
+                center
+                clearable
+                label="场所地点:"
+                input-align="right"
+                placeholder="请输入场所地点"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.place"
+                center
+                clearable
+                label="详细地点:"
+                input-align="right"
+                placeholder="请输入详细场所地点"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.longitude"
+                center
+                clearable
+                label-width="7em"
+                label="场所坐标-经度:"
+                input-align="right"
+                placeholder="请输入场所经度坐标"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.latitude"
+                center
+                clearable
+                label-width="7em"
+                label="场所坐标-纬度:"
+                input-align="right"
+                placeholder="请输入场所纬度坐标"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.peopleThreshold"
+                center
+                clearable
+                required
+                label="额定人数:"
+                input-align="right"
+                placeholder="请输入场所额定人数"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.siteType"
+                center
+                clearable
+                required
+                label="场所类型:"
+                input-align="right"
+                placeholder="请选择场所类型"
+              >
+                <template #input>
+                  <span v-if="dataitem.siteType == 1">线下</span>
+                  <span v-if="dataitem.siteType == 0">线上</span>
+                </template>
+              </van-field>
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.nature"
+                center
+                required
+                clearable
+                label="场所性质:"
+                input-align="right"
+                placeholder="请选择场所性质"
+              >
+                <template #input>
+                  <span v-if="dataitem.siteType == 1">寺观教堂</span>
+                  <span v-if="dataitem.siteType == 0">固定场所</span>
+                </template>
+              </van-field>
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.place"
+                center
+                clearable
+                label-width="7em"
+                label="文物保护级别:"
+                input-align="right"
+                placeholder="请输入文物保护级别"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.constructionStage"
+                center
+                required
+                clearable
+                label-width="7em"
+                label="场所建设阶段:"
+                input-align="right"
+                placeholder="请选择场所建设阶段"
+              >
+                <template #input>
+                  <span v-if="dataitem.siteType == 1">建设完成</span>
+                  <span v-if="dataitem.siteType == 0">筹备</span>
+                </template>
+              </van-field>
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.place"
+                center
+                clearable
+                label="建筑面积(㎡):"
+                input-align="right"
+                placeholder="请输入场所建筑面积"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.place"
+                center
+                clearable
+                label="占地面积(㎡):"
+                input-align="right"
+                placeholder="请输入场所占地面积"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.plan"
+                center
+                clearable
+                label="场所规划:"
+                input-align="right"
+                placeholder="请填写场所规划"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.mainRoads"
+                center
+                clearable
+                label-width="8em"
+                label="出入口主要道路:"
+                input-align="right"
+                placeholder="请填写出入口主要道路"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.publicArea"
+                center
+                clearable
+                label-width="7em"
+                label="外围公共区域:"
+                input-align="right"
+                placeholder="请填写外围公共区域"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                name="uploader"
+                label-width="8em"
+                label="宗教礼仪空间:"
+              >
+                <template #input>
+                  <van-uploader>
+                    <van-button type="primary"> 点击上传 </van-button>
+                  </van-uploader>
+                </template>
+              </van-field>
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="message"
+                rows="1"
+                autosize
+                label="备注："
+                type="textarea"
+                placeholder="请输入备注"
+              />
+            </van-cell-group>
+          </div>
+        </van-tab>
+        <!-- 备案信息 -->
+        <van-tab>
+          <template #title> <van-icon name="bulb-o" />备案信息 </template>
+          <div style="padding: 0 10px; height: 570px; overflow: auto">
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.filingNo"
+                center
+                clearable
+                label="场所备案号:"
+                input-align="right"
+                placeholder="请输入场所备案号"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.approvedEstablishmentTime"
+                center
+                required
+                clearable
+                label-width="8em"
+                label="批准设立时间:"
+                input-align="right"
+                placeholder="请选择批准设立时间"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.approveOffice"
+                center
+                required
+                clearable
+                label="登记机关:"
+                input-align="right"
+                placeholder="请输入登记机关"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.registrationDate"
+                center
+                required
+                clearable
+                label="登记日期:"
+                input-align="right"
+                placeholder="请选择登记日期"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.teachingStaff"
+                center
+                required
+                clearable
+                label-width="7em"
+                label="主要教职人员:"
+                input-align="right"
+                placeholder="请输入主要教职人员"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.registrationAuthority"
+                center
+                clearable
+                label-width="7em"
+                label="批准设立机关:"
+                input-align="right"
+                placeholder="请输入批准设立机关"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.registrationAuthority"
+                center
+                clearable
+                label-width="10em"
+                label="宗教部门管理人员:"
+                input-align="right"
+                placeholder="请选择宗教部门管理人员"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                v-model="dataitem.registrationAuthority"
+                center
+                clearable
+                label-width="10em"
+                label="公安部门管理人员:"
+                input-align="right"
+                placeholder="请选择公安部门管理人员"
+              />
+            </van-cell-group>
+            <van-cell-group>
+              <van-field
+                name="uploader"
+                label-width="10em"
+                label="场所建设审批手续:"
+              >
+                <template #input>
+                  <van-uploader>
+                    <van-button type="primary"> 点击上传 </van-button>
+                  </van-uploader>
+                </template>
+              </van-field>
+            </van-cell-group>
+          </div>
+        </van-tab>
+        <!-- 互联网专区 -->
+        <van-tab>
+          <template #title> <van-icon name="desktop-o" />互联网专区 </template>
+          <div style="padding: 0 10px; height: 570px; overflow: auto">
+            <div style="overflow: hidden">
+              <p style="font-weight: 700">
+                直播间<van-button
+                  type="primary"
+                  size="mini"
+                  style="margin-left: 10px; vertical-align: middle"
+                  >新增</van-button
+                >
+              </p>
+              <div>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="所属平台:"
+                    input-align="right"
+                    placeholder="请选择所属平台"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="直播账号:"
+                    input-align="right"
+                    placeholder="请输入直播账号"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="管理员:"
+                    input-align="right"
+                    placeholder="请填写管理员"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="联系方式:"
+                    input-align="right"
+                    placeholder="请输入联系方式"
+                  />
+                </van-cell-group>
+                <van-button type="danger" size="mini" color="#e6a23c"
+                  >删除</van-button
+                >
+              </div>
+            </div>
+            <div style="overflow: hidden">
+              <p style="font-weight: 700">
+                公众号<van-button
+                  type="primary"
+                  size="mini"
+                  style="margin-left: 10px; vertical-align: middle"
+                  >新增</van-button
+                >
+              </p>
+              <div>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="公众号账号:"
+                    input-align="right"
+                    placeholder="请输入直播账号"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="管理员:"
+                    input-align="right"
+                    placeholder="请填写管理员"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="联系方式:"
+                    input-align="right"
+                    placeholder="请输入联系方式"
+                  />
+                </van-cell-group>
+                <van-button type="danger" size="mini" color="#e6a23c"
+                  >删除</van-button
+                >
+              </div>
+            </div>
+            <div style="overflow: hidden">
+              <p style="font-weight: 700">
+                微信群<van-button
+                  type="primary"
+                  size="mini"
+                  style="margin-left: 10px; vertical-align: middle"
+                  >新增</van-button
                 >
-                
-                  <template #input>
-                    <span v-if="dataitem.religiousType == 1">伊斯兰教</span>
-                    <span v-if="dataitem.religiousType == 2">基督教</span>
-                    <span v-if="dataitem.religiousType == 3">天主教</span>
-                    <span v-if="dataitem.religiousType == 4">佛教</span>
-                    <span v-if="dataitem.religiousType == 5">道教</span>
-                  </template>
-                </van-field>
-              </van-row>
-            </van-col>
-          </van-row>
-          <van-row class="item">
-            <van-col span="24">
-              <van-row justify="space-between">
-                <van-field
-                  v-model="dataitem.tyshxydm"
-                  center
-                  readonly
-                  clearable
-                  label="社会信用代码:"
-                  input-align="right"
-                />
-              </van-row>
-            </van-col>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.filingNo"
-              center
-              readonly
-              clearable
-              label="场所备案号:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.approvedEstablishmentTime"
-              center
-              readonly
-              clearable
-              label="设立时间:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.approveOffice"
-              center
-              readonly
-              clearable
-              label="登记机关:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.registrationDate"
-              center
-              readonly
-              clearable
-              label="登记日期:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.siteContact"
-              center
-              readonly
-              clearable
-              label="主要教职人员:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.registrationAuthority"
-              center
-              readonly
-              clearable
-              label="批准设立机关:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.contact"
-              center
-              readonly
-              clearable
-              label="场所联系人:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.contactNumber"
-              center
-              readonly
-              clearable
-              label="联系人电话:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.placeSelectName"
-              center
-              readonly
-              clearable
-              label="场所地点:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.place"
-              center
-              readonly
-              clearable
-              label="详细地点:"
-              input-align="right"
-            />
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.siteType"
-              center
-              readonly
-              clearable
-              label="场所类型:"
-              input-align="right"
-            >
-              <template #input>
-                <span v-if="dataitem.siteType == 1">线下</span>
-                <span v-if="dataitem.siteType == 0">线上</span>
-              </template>
-            </van-field>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.constructionStage"
-              center
-              readonly
-              clearable
-              label="场所建设阶段:"
-              input-align="right"
-            >
-            <template #input>
-                <span v-if="dataitem.siteType == 1">建设完成</span>
-                <span v-if="dataitem.siteType == 0">筹备</span>
-              </template>
-            </van-field>
-          </van-row>
-        </van-col>
-      </van-row>
-      <van-row class="item">
-        <van-col span="24">
-          <van-row justify="space-between">
-            <van-field
-              v-model="dataitem.nature"
-              center
-              readonly
-              clearable
-              label="场所性质:"
-              input-align="right"
-            >
-            <template #input>
-                <span v-if="dataitem.siteType == 1">寺观教堂</span>
-                <span v-if="dataitem.siteType == 0">固定场所</span>
-              </template>
-            </van-field>
-          </van-row>
-        </van-col>
-      </van-row>
+              </p>
+              <div>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="微信群账号:"
+                    input-align="right"
+                    placeholder="请输入直播账号"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="管理员:"
+                    input-align="right"
+                    placeholder="请填写管理员"
+                  />
+                </van-cell-group>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="联系方式:"
+                    input-align="right"
+                    placeholder="请输入联系方式"
+                  />
+                </van-cell-group>
+                <van-button type="danger" size="mini" color="#e6a23c"
+                  >删除</van-button
+                >
+              </div>
+            </div>
+            <div style="overflow: hidden">
+              <p style="font-weight: 700">网站</p>
+              <div>
+                <van-cell-group>
+                  <van-field
+                    v-model="dataitem.registrationAuthority"
+                    center
+                    clearable
+                    label-width="7em"
+                    label="网站地址:"
+                    input-align="right"
+                    placeholder="请输入网站地址"
+                  />
+                </van-cell-group>
+              </div>
+            </div>
+          </div>
+        </van-tab>
+      </van-tabs>
+      <div class="btn">
+        <van-button type="primary">确认</van-button>
+      </div>
     </div>
+    <!-- 宗教类型 -->
+    <van-popup v-model:show="hs_religious" round position="bottom">
+      <van-picker
+        title="宗教类型"
+        :columns="religious"
+        @cancel="hs_religious = false"
+        @confirm="getreligious"
+      />
+    </van-popup>
+    <!-- 场所地点 -->
+    <!-- 场所类型 -->
+    <!-- 场所性质 -->
+    <!-- 场所建设阶段 -->
   </div>
 </template>
 
 <script>
 import { useRouter } from "vue-router";
 import { onMounted, ref } from "vue";
+import placeRegister from "@/api/placeRegister/placeRegister";
+import tools from "@/api/sys/tools";
 export default {
   setup() {
+    const active = ref(0);
     // 导航栏颜色
     const selectColor = ref(window.localStorage.getItem("MZ_COLOR"));
     //场所数据
@@ -280,10 +605,66 @@ export default {
     //数据接收
     const router = useRouter();
     onMounted(() => {
-      var item = JSON.parse(router.currentRoute.value.query.data);
-      console.log(item, "============================>item");
-      dataitem.value = item;
+      var id = JSON.parse(router.currentRoute.value.query.id);
+      new placeRegister().queryById(id).then((res) => {
+        // console.log(res);
+        dataitem.value = res;
+        religiousType.value = getreligiousT(dataitem.value.religiousType);
+      });
     });
+    //宗教类型
+    const religiousType = ref("");
+    const getreligiousT = (type) => {
+      const typeObject = {
+        1: "伊斯兰教",
+        2: "基督教",
+        3: "天主教",
+        4: "佛教",
+        5: "道教",
+      };
+      return typeObject[type];
+    };
+    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;
+      // const json = Object.assign(inputForm.value, {
+      //   religion: selectedOptions[0].value,
+      // });
+      // inputForm.value = json;
+      religiousType.value = selectedOptions[0].text;
+    };
+    //图片上传
+    let fileList = ref([]);
+    let fileImg = ref([]);
+    const afterRead1 = (file) => {
+      new tools()
+        .uploadFile(file, `religioussites/siteinfo/religiousSitesInfo`)
+        .then(({ data }) => {
+          data.name = decodeURIComponent(
+            data.url.substring(data.url.lastIndexOf("/") + 1)
+          );
+          placeActivity.placeData.scenesImage += "" + data.url;
+          fileImg.value.push(data);
+        });
+    };
+    const fjdelete = (file) => {
+      //删除文件操作
+      for (let index = 0; index < fileList.value.length; index++) {
+        if (file.file == fileList.value[index].file) {
+          let delurl = fileImg.value[index].url;
+          new tools().uploadFiledelete("", delurl).then(({ data }) => {});
+          fileImg.value.splice(index, 1);
+          fileList.value.splice(index, 1);
+        }
+      }
+    };
     //返回
     const onClickLeft = () => {
       history.back();
@@ -292,10 +673,28 @@ export default {
       onClickLeft,
       dataitem,
       selectColor,
+      active,
+      //图片上传
+      fileList,
+      afterRead1,
+      //图片删除
+      fjdelete,
+      //宗教类型
+      religiousType,
+      hs_religious,
+      religious,
+      getreligious,
     };
   },
 };
 </script>
 
 <style lang="less">
+.btn {
+  margin: 10px auto;
+  .van-button {
+    width: 100%;
+    height: 50px;
+  }
+}
 </style>

src/views/placeManage/placeRegister/placeRegisterList.vue

@@ -13,7 +13,7 @@
     </template>
   </van-nav-bar>
   <div class="main">
-    <van-search
+    <!-- <van-search
       v-model="searchName"
       shape="round"
       show-action
@@ -24,8 +24,32 @@
       <template #action>
         <div @click="search">搜索</div>
       </template>
-    </van-search>
-    <van-pull-refresh v-if="show==false" v-model="refreshing" @refresh="onRefresh">
+    </van-search> -->
+    <div class="search">
+      <div class="box1">
+        <van-dropdown-menu>
+          <van-dropdown-item v-model="value1" :options="option1" />
+          <van-dropdown-item v-model="value2" :options="option2" />
+        </van-dropdown-menu>
+      </div>
+      <div class="box2">
+        <van-search
+          v-model="value"
+          show-action
+          label="场所名称"
+          placeholder="请输入场所名称"
+        >
+          <template #action>
+            <div @click="search">搜索</div>
+          </template>
+        </van-search>
+      </div>
+    </div>
+    <van-pull-refresh
+      v-if="show == false"
+      v-model="refreshing"
+      @refresh="onRefresh"
+    >
       <van-list
         v-model:loading="loading"
         :finished="finished"
@@ -33,7 +57,7 @@
         @load="onLoad"
       >
         <van-swipe-cell v-for="item in list" :key="item">
-          <div class="list-item" @click="gotoplaceRegister(item)">
+          <div class="list-item" @click="gotoplaceRegister(item.id)">
             <div class="item_top">
               <div class="item_top_left">
                 {{ item.name }}
@@ -61,7 +85,11 @@
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
-    <van-pull-refresh v-if="show == true" v-model="refreshing" @refresh="onRefresh">
+    <van-pull-refresh
+      v-if="show == true"
+      v-model="refreshing"
+      @refresh="onRefresh"
+    >
       <van-list
         v-model:loading="loading"
         :finished="finished"
@@ -69,7 +97,7 @@
         @load="onLoad"
       >
         <van-swipe-cell v-for="item in searchList" :key="item">
-          <div class="list-item" @click="gotoplaceRegister(item)">
+          <div class="list-item" @click="gotoplaceRegister(item.id)">
             <div class="item_top">
               <div class="item_top_left">
                 {{ item.name }}
@@ -101,8 +129,10 @@
 </template>
 
 <script>
-import {ref } from "vue";
+import {onMounted, ref } from "vue";
 import { useRouter } from "vue-router";
+import tools from "@/api/sys/tools";
+import placePerson from "@/api/placePerson/placePerson";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
 export default {
   setup() {
@@ -129,8 +159,7 @@ export default {
       history.back();
     };
     //搜索事件
-    const show = ref(false)
-    const searchName = ref("");
+    const show = ref(false);
     const searchList = ref([]);
     const search = () => {
       if (searchName.value != "") {
@@ -139,7 +168,7 @@ export default {
           .searchlist({
             current: 1,
             size: 10000,
-            name: searchName.value,
+            name: value.value,
           })
           .then(({ records }) => {
             searchList.value = records;
@@ -149,6 +178,51 @@ export default {
         onLoad();
       }
     };
+    const value = ref('');
+    const value1 = ref("");
+    const value2 = ref(0);
+    const option1 = ref([]);
+    const option2 = [
+      { text: "教别", value: 0 },
+      { text: "伊斯兰教", value: 1 },
+      { text: "基督教", value: 2 },
+      { text: "天主教", value: 3 },
+      { text: "佛教", value: 4 },
+      { text: "道教", value: 5 },
+    ]
+    onMounted(() => {
+      getUser();
+    });
+    const getUser = () => {
+      let addressList = []
+      let user = localStorage.getItem("MZ_USER");
+      new tools().treeData().then((res) => {
+        addressList.push(res[0]);
+        res[0].children.forEach((item) => {
+          addressList.push(item);
+        });
+      });
+      let userArea = '';
+      new placePerson().userList({ loginName: user }).then((res1) => {
+        let data = res1.records[0];
+        userArea = data.areaDTO;
+        addressList.forEach(item=>{
+          if(item.id==userArea.code){
+            value1.value = item.code
+            option1.value.push({
+              text:item.name,
+              value:item.code
+            });
+            item.children.forEach(item1 => {
+              option1.value.push({
+                text:item1.name,
+                value:item1.code
+              })
+            })
+          }
+        })
+      });
+    };
     //跳转
     let router = useRouter();
     //进入场所录入页面
@@ -160,13 +234,12 @@ export default {
       var data = JSON.stringify(item);
       router.push({
         path: "/placeRegisterInfo",
-        query: { data: data },
+        query: { id: data },
       });
     };
     const loading = ref(false);
     const finished = ref(false);
     const refreshing = ref(false);
-
     let index = 0;
     const onLoad = () => {
       loading.value = true;
@@ -213,11 +286,15 @@ export default {
       onLoad,
       onRefresh,
       //搜索
-      searchName,
       search,
       gotoplaceRegister,
       show,
-      searchList
+      searchList,
+      value,
+      value1,
+      value2,
+      option1,
+      option2,
     };
   },
 };
@@ -255,17 +332,16 @@ html {
     .item_center {
       width: 100%;
       font-size: 16px;
-      color:#a2a2a2;
+      color: #a2a2a2;
       text-align: left;
       padding: 10px 0;
       overflow: hidden;
-      
     }
     .item_down {
       overflow: hidden;
       width: 100%;
       font-size: 16px;
-      border-bottom: 1px solid 	#F5F5F5;
+      border-bottom: 1px solid #f5f5f5;
       .item_down_left {
         width: 70%;
         float: left;