Merge remote-tracking branch 'origin/master'

src/api/placeFirefighting/placeFirefighting.js

@@ -17,4 +17,10 @@ export default class placeFirefighting {
             `/religioussites/fire/fireEquipment/queryById`, { id: id }
         )
     };
+    //设备删除
+    placeFirefightingDelete(id) {
+        return request.delete(
+            `/religioussites/fire/fireEquipment/delete`, { ids: id }
+        )
+    };
 }

src/api/placePerson/placePerson.js

@@ -39,4 +39,9 @@ export default class placePerson {
             `/user/usertemplate/userType/queryById`, { id: id }
         )
     }
+    userDelete(id) {
+        return request.delete(
+            `/user/usermanagement/userManagement/delete`, { ids: id }
+        )
+    }
 }

src/api/tabletManage/TabletServer.js

@@ -20,4 +20,9 @@ export default class TabletServer {
             `/placememorialtablets/placeMemorialTablets/queryById`, { id: id }
         )
     };
+    tabletDelete(id) {
+        return request.delete(
+            `/placememorialtablets/placeMemorialTablets/delete`, { ids: id }
+        )
+    }
 }

src/views/placeManage/ManageList.vue

@@ -62,7 +62,7 @@
             @click="selectes(item)"
           >
             <template #right-icon>
-              <van-radio :name="item" />
+              <van-radio :name="item" @click="selectes(item)"/>
             </template>
           </van-cell>
         </van-cell-group>

src/views/placeManage/ManageList2.vue

@@ -64,7 +64,7 @@
             @click="selectes2(item)"
           >
             <template #right-icon>
-              <van-radio :name="item" />
+              <van-radio :name="item" @click="selectes2(item)"/>
             </template>
           </van-cell>
         </van-cell-group>

src/views/placeManage/placeFirefighting/placeFirefightingList.vue

@@ -15,62 +15,62 @@
 
   <div class="main">
     <div class="search">
-      <van-search
-        v-model="active"
-        show-action
-        label="场所名称："
-        placeholder="请输入场所关键字"
-      >
-      </van-search>
-      <div class="typebox">
-        <div class="type-left">
-          <van-cell-group>
-            <van-field
-              v-model="typeOfEmployeesName"
-              label-width="7.2em"
-              readonly
-              border="false"
-              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_site_fire_type')"
-                :columns-field-names="{
-                  text: 'label',
-                  value: 'value',
-                }"
-                @cancel="hs_typeOfEmployees = false"
-                @confirm="gettypeOfEmployees"
-              />
-            </van-popup>
-          </van-cell-group>
-        </div>
-        <div class="type-right">
-          <van-button
-            plain
-            hairline
-            @click="onClickSearch"
-            type="primary"
-            style="width:100%"
-            >搜索</van-button
+      <van-row>
+        <van-col span="12" align="center">
+          <div class="typebox">
+            <div class="type-left">
+              <van-cell-group>
+                <van-field
+                  v-model="typeOfEmployeesName"
+                  readonly
+                  border="false"
+                  label="设备类型"
+                  clearable
+                  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_site_fire_type')"
+                    :columns-field-names="{
+                      text: 'label',
+                      value: 'value',
+                    }"
+                    @cancel="cencel"
+                    @confirm="gettypeOfEmployees"
+                  />
+                </van-popup>
+              </van-cell-group>
+            </div>
+          </div>
+        </van-col>
+        <van-col span="12" align="center">
+          <van-search
+            v-model="active"
+            clearable
+            show-action
+            placeholder="请输入场所名称关键字"
           >
-        </div>
-      </div>
+            <template #action>
+              <div @click="onClickSearch">搜索</div>
+            </template>
+          </van-search>
+        </van-col>
+      </van-row>
     </div>
     <van-list
       v-model:loading="loading"
       :finished="finished"
       finished-text="没有更多了"
       @load="onLoad"
+      style="margin-top:0px"
     >
       <van-swipe-cell v-for="item in list" :key="item">
         <div class="list-item" @click="placeFirefightingInfo(item.id)">
@@ -92,18 +92,21 @@
               <span v-if="item.equipmentType == 10">应急灯</span>
             </div>
           </div>
-          <div class="item_center">
-            {{ item.position }}
-          </div>
           <div class="item_down">
             <div class="item_down_left">
               {{ item.siteName }}
             </div>
-            <div class="item_down_right">
-              {{ item.personInChargeName }}
-            </div>
           </div>
         </div>
+        <template #right>
+          <van-button
+            square
+            text="删除"
+            type="danger"
+            @click="del(item.id)"
+            class="delete-button"
+          />
+        </template>
       </van-swipe-cell>
     </van-list>
   </div>
@@ -187,9 +190,40 @@ export default {
         query: { id: data },
       });
     };
+    //牌位删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placeFirefighting().placeFirefightingDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            finished.value = false;
+            list.value = [];
+            onLoad();
+          });
+        }
+      });
+    };
+    const cencel = ()=>{
+      hs_typeOfEmployees.value = false;
+      typeOfEmployeesName.value = '';
+      const json = Object.assign(inputForm.value, {
+        equipmentType: '',
+      });
+      inputForm.value = json;
+    }
     const onClickSearch = () => {
       if (active.value == "") {
         list.value = [];
+        inputForm.value.siteName = '';
         onLoad();
       } else {
         list.value = [];
@@ -216,12 +250,14 @@ export default {
       typeOfEmployeesName,
       hs_typeOfEmployees,
       gettypeOfEmployees,
+      del,
+      cencel
     };
   },
 };
 </script>
 
-<style lang='less'>
+<style lang='less' scoped>
 body,
 html {
   margin: 0;
@@ -235,21 +271,16 @@ html {
     .typebox {
       width: 100%;
       .type-left {
-        width: 70%;
-        float: left;
-      }
-      .type-right {
-        width: 30%;
-        float: left;
-
+        width: 100%;
       }
     }
   }
   .list-item {
     background-color: #fff;
-    padding-left: 10px;
-    margin-bottom: 5px;
+    padding: 10px;
+    padding-top: 0px;
     overflow: hidden;
+    border-bottom: 1px solid #f2f2f2;
     .item_top {
       width: 100%;
       overflow: hidden;
@@ -269,33 +300,22 @@ html {
         text-overflow: ellipsis;
       }
     }
-    .item_center {
-      width: 100%;
-      font-size: 16px;
-      color: #a2a2a2;
-      text-align: left;
-      padding: 10px 0;
-      overflow: hidden;
-    }
     .item_down {
       overflow: hidden;
       width: 100%;
       font-size: 16px;
-      border-bottom: 1px solid #f5f5f5;
       .item_down_left {
-        width: 70%;
+        width: 100%;
         float: left;
         color: #000000;
         white-space: nowrap;
         overflow: hidden;
         text-overflow: ellipsis;
       }
-      .item_down_right {
-        width: 30%;
-        text-align: center;
-        float: left;
-      }
     }
   }
+  .delete-button{
+    height: 100%;
+  }
 }
 </style>

src/views/placeManage/placePerson/placePerson.vue

@@ -1,25 +1,34 @@
 <template>
-  <van-nav-bar fixed title="人员档案管理" left-arrow @click-left="onClickLeft" @click-right="onClickright"
-    :style="{ 'background-color': selectColor }">
+  <van-nav-bar
+    fixed
+    title="人员档案管理"
+    left-arrow
+    @click-left="onClickLeft"
+    @click-right="onClickright"
+    :style="{ 'background-color': selectColor }"
+  >
     <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
   <div class="main">
     <van-tabs v-model:active="active">
-      <van-tab title="姓名查询" name="name">
-      </van-tab>
-      <van-tab title="身份证查询" name="cardId">
-      </van-tab>
+      <van-tab title="姓名查询" name="name"> </van-tab>
+      <van-tab title="身份证查询" name="cardId"> </van-tab>
     </van-tabs>
-    <van-search v-model="value1" show-action placeholder="请输入关键词">
+    <van-search v-model="value1" clearable show-action placeholder="请输入关键词">
       <template #action>
         <div @click="search1">搜索</div>
       </template>
     </van-search>
     <div class="PersonList">
       <van-pull-refresh v-model="refreshing" @refresh="onRefresh">
-        <van-list v-model:loading="loading" :finished="finished" finished-text="没有更多了" @load="onLoad">
+        <van-list
+          v-model:loading="loading"
+          :finished="finished"
+          finished-text="没有更多了"
+          @load="onLoad"
+        >
           <van-swipe-cell v-for="item in dataList" :key="item">
             <div class="PersonItem" @click="goPlacePersonInfo(item.id)">
               <van-row>
@@ -27,15 +36,26 @@
                   <p>
                     {{ item.name }}（<span style="color: #36a7f3">{{
                       item.idcard
-                    }}</span>）
+                    }}</span
+                    >）
                   </p>
                 </van-col>
                 <van-col span="6" style="text-align: right">
-                  <span v-if="item.religion == 1" style="color: #25bc5c">伊斯兰教</span>
-                  <span v-if="item.religion == 2" style="color: #53b4f4">基督教</span>
-                  <span v-if="item.religion == 3" style="color: #36a7f3">天主教</span>
-                  <span v-if="item.religion == 4" style="color: #d7cc18">佛教</span>
-                  <span v-if="item.religion == 5" style="color: #36a7f3">道教</span>
+                  <span v-if="item.religion == 1" style="color: #25bc5c"
+                    >伊斯兰教</span
+                  >
+                  <span v-if="item.religion == 2" style="color: #53b4f4"
+                    >基督教</span
+                  >
+                  <span v-if="item.religion == 3" style="color: #36a7f3"
+                    >天主教</span
+                  >
+                  <span v-if="item.religion == 4" style="color: #d7cc18"
+                    >佛教</span
+                  >
+                  <span v-if="item.religion == 5" style="color: #36a7f3"
+                    >道教</span
+                  >
                 </van-col>
               </van-row>
               <van-row>
@@ -44,17 +64,29 @@
                     item.locationName
                   }}</span>
                 </van-col>
-                <van-col span="6" style="
+                <van-col
+                  span="6"
+                  style="
                     text-align: right;
                     font-size: 12px;
                     white-space: nowrap;
                     overflow: hidden;
                     text-overflow: ellipsis;
-                  ">
+                  "
+                >
                   <span>{{ item.personnelTypeName }}</span>
                 </van-col>
               </van-row>
             </div>
+            <template #right>
+              <van-button
+                square
+                text="删除"
+                type="danger"
+                @click="del(item.id)"
+                class="delete-button"
+              />
+            </template>
           </van-swipe-cell>
         </van-list>
       </van-pull-refresh>
@@ -66,6 +98,7 @@
 import { ref } from "vue";
 import { useRouter } from "vue-router";
 import UserManage from "@/api/user/UserManage";
+import placePerson from "@/api/placePerson/placePerson";
 export default {
   setup() {
     const searchForm = ref({
@@ -119,7 +152,6 @@ export default {
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
       loading.value = true;
-
       onLoad();
     };
     //跳转
@@ -139,15 +171,37 @@ export default {
     const value1 = ref("");
     const search1 = () => {
       if (active.value == "name") {
-        searchForm.value.name = value1.value
+        searchForm.value.name = value1.value;
       } else {
-        searchForm.value.idcard = value1.value
+        searchForm.value.idcard = value1.value;
       }
       dataList.value = [];
       loading.value = true;
       index = 0;
-      finished.value = false
-      onLoad()
+      finished.value = false;
+      onLoad();
+    };
+    //人员删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new placePerson().userDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            dataList.value = [];
+            loading.value = true;
+            index = 0;
+            finished.value = false;
+            onLoad();
+          });
+        }
+      });
     };
     //返回
     const onClickLeft = () => {
@@ -168,12 +222,13 @@ export default {
       dataList,
       selectColor,
       onClickright,
-      search1
+      search1,
+      del,
     };
   },
 };
 </script>
-<style lang="less">
+<style lang="less" scoped>
 body,
 html {
   margin: 0;
@@ -254,4 +309,12 @@ html {
     }
   }
 }
+.goods-card {
+  margin: 0;
+  background-color: white;
+}
+
+.delete-button {
+  height: 100%;
+}
 </style>

src/views/placeManage/placePerson/placePersonAdd.vue

@@ -350,6 +350,7 @@
                           :name="item.value"
                           :ref="(el) => (checkboxRefs[index] = el)"
                           @click.stop
+                          @click="toggle(index)"
                         />
                       </template>
                     </van-cell>
@@ -373,6 +374,7 @@
             v-model:show="hs_tissue"
             title="宗教组织"
             show-cancel-button
+            @confirm="tissue()"
           >
             <div class="dialog">
               <van-list
@@ -391,7 +393,7 @@
                       @click="gettissue(item)"
                     >
                       <template #right-icon>
-                        <van-radio :name="item.id" />
+                        <van-radio :name="item.id" @click="gettissue(item)"/>
                       </template>
                     </van-cell>
                   </van-cell-group>
@@ -751,7 +753,6 @@ export default {
     const sitelist = ref([]);
     let hs_site = ref(false);
     const getsite = (val) => {
-      console.log(val);
       let id = "";
       id = val.id;
       locationName.value = val.name;
@@ -911,12 +912,16 @@ export default {
     const checked1 = ref("");
     const tissuelist = ref([]);
     let hs_tissue = ref(false);
+    const tiname = ref('')
     const gettissue = (val) => {
-      tissueName.value = val.organizationName;
-      const json = Object.assign(inputForm.value, { zjzz: { id: val.id } });
-      inputForm.value = json;
+      tiname.value = val.organizationName;
       checked1.value = val.id;
     };
+    const tissue = ()=>{
+      tissueName.value = tiname.value
+      const json = Object.assign(inputForm.value, { zjzz: { id: checked1.value } });
+      inputForm.value = json;
+    }
     const loading1 = ref(false);
     const finished1 = ref(false);
     const refreshing1 = ref(false);
@@ -1102,7 +1107,6 @@ export default {
         }
       });
       new placePerson().save(inputForm.value).then((res) => {
-        console.log(res);
         if (res.status == 200) {
           xm.showToast({
             message: "人员添加成功",
@@ -1114,7 +1118,6 @@ export default {
           xm.showToast({
             message: "人员添加失败",
           });
-          console.log(res);
         }
       });
     };
@@ -1174,6 +1177,7 @@ export default {
       checked1,
       hs_tissue,
       gettissue,
+      tissue,
       tissuelist,
       loading1,
       finished1,
@@ -1245,4 +1249,7 @@ export default {
   height: 400px;
   overflow: auto;
 }
+.bgList{
+  background: #36a7f3;
+}
 </style>

src/views/placeManage/placePerson/placePersoninfo.vue

@@ -371,6 +371,7 @@
                             :name="item.value"
                             :ref="(el) => (checkboxRefs[index] = el)"
                             @click.stop
+                            @click="toggle(index)"
                           />
                         </template>
                       </van-cell>
@@ -412,7 +413,7 @@
                         @click="gettissue(item)"
                       >
                         <template #right-icon>
-                          <van-radio :name="item.id" />
+                          <van-radio :name="item.id" @click="gettissue(item)"/>
                         </template>
                       </van-cell>
                     </van-cell-group>

src/views/placeManage/placeRegister/placeRegister.vue

@@ -13,48 +13,55 @@
         <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
-                    readonly
-                    v-model="fileList"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead"
-                    @click-upload="chooseImg"
+            <div class="imgbox">
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="8em"
+                    label="场所内外景(主):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
-            <van-cell-group>
-              <van-field
-                name="uploader"
-                label-align="top"
-                label-width="8em"
-                label="场所外景照片:"
-              >
-                <template #input>
-                  <van-uploader
-                    readonly
-                    v-model="fileList4"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead4"
-                    @click-upload="chooseImg4"
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList"
+                        :max-count="1"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead"
+                        @click-upload="chooseImg"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="9em"
+                    label="场所内外景(其他):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList4"
+                        :max-count="5"
+                        preview-size="60"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead4"
+                        @click-upload="chooseImg4"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+            </div>
             <van-cell-group>
               <van-field
                 v-model="inputForm.name"
@@ -1413,6 +1420,20 @@ export default {
 };
 </script>
 <style lang="less">
+.main {
+  .imgbox {
+    width: 100%;
+    overflow: hidden;
+    .img-left {
+      float: left;
+      width: 50%;
+    }
+    .img-right {
+      float: left;
+      width: 50%;
+    }
+  }
+}
 .btn {
   margin: 10px auto;
   padding: 0 10px;

src/views/placeManage/placeRegister/placeRegisterInfo.vue

@@ -17,48 +17,55 @@
         <van-tab>
           <template #title> <van-icon name="orders-o" />基础信息</template>
           <div style="padding: 0 10px; height: 470px; overflow: auto">
-            <van-cell-group>
-              <van-field
-                name="uploader"
-                label-align="top"
-                label-width="8em"
-                label="场所内外景照片:"
-              >
-                <template #input>
-                  <van-uploader
-                    readonly
-                    v-model="fileList"
-                    :max-count="5"
-                    accept=""
-                    :preview-full-image="false"
-                    :before-delete="deleteRead"
-                    @click-upload="chooseImg"
+            <div class="imgbox">
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="8em"
+                    label="场所内外景(主):"
                   >
-                  </van-uploader>
-                </template>
-              </van-field>
-            </van-cell-group>
-            <van-cell-group>
-            <van-field
-              name="uploader"
-              label-align="top"
-              label-width="8em"
-              label="场所外景照片:"
-            >
-              <template #input>
-                <van-uploader
-                  readonly
-                  v-model="fileList4"
-                  :max-count="5"
-                  accept=""
-                  :preview-full-image="false"
-                  :before-delete="deleteRead4"
-                  @click-upload="chooseImg4"
-                >
-                </van-uploader>
-              </template>
-            </van-field>
-          </van-cell-group>
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList"
+                        :max-count="1"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead"
+                        @click-upload="chooseImg"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+              <div class="img-left">
+                <van-cell-group>
+                  <van-field
+                    name="uploader"
+                    label-align="top"
+                    label-width="9em"
+                    label="场所内外景(其他):"
+                  >
+                    <template #input>
+                      <van-uploader
+                        readonly
+                        v-model="fileList4"
+                        :max-count="5"
+                        preview-size="60"
+                        accept=""
+                        :preview-full-image="false"
+                        :before-delete="deleteRead4"
+                        @click-upload="chooseImg4"
+                      >
+                      </van-uploader>
+                    </template>
+                  </van-field>
+                </van-cell-group>
+              </div>
+            </div>
             <van-cell-group>
               <van-field
                 v-model="dataitem.name"
@@ -1503,6 +1510,20 @@ export default {
 </script>
 
 <style lang="less">
+.main {
+  .imgbox {
+    width: 100%;
+    overflow: hidden;
+    .img-left {
+      float: left;
+      width: 50%;
+    }
+    .img-right {
+      float: left;
+      width: 50%;
+    }
+  }
+}
 .btn {
   margin: 10px auto;
   .van-button {

src/views/placeManage/placeRegister/placeRegisterList.vue

@@ -16,7 +16,11 @@
     <div class="search">
       <div class="box1">
         <van-dropdown-menu>
-          <van-dropdown-item v-model="value1" :options="option1" />
+          <van-dropdown-item
+            v-model="value1"
+            :options="option1"
+            @click="search1"
+          />
           <van-dropdown-item v-model="value2" :options="option2" />
         </van-dropdown-menu>
       </div>
@@ -24,6 +28,7 @@
         <van-search
           v-model="value"
           show-action
+          clearable
           label="场所名称"
           placeholder="请输入场所名称"
         >
@@ -34,7 +39,6 @@
       </div>
     </div>
     <van-pull-refresh
-      v-if="show == false"
       v-model="refreshing"
       @refresh="onRefresh"
     >
@@ -73,46 +77,6 @@
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
-    <van-pull-refresh
-      v-if="show == true"
-      v-model="refreshing"
-      @refresh="onRefresh"
-    >
-      <van-list
-        v-model:loading="loading"
-        :finished="finished"
-        finished-text="没有更多了"
-        @load="search"
-      >
-        <van-swipe-cell v-for="item in searchList" :key="item">
-          <div class="list-item" @click="gotoplaceRegister(item.id)">
-            <div class="item_top">
-              <div class="item_top_left">
-                {{ item.name }}
-              </div>
-              <div class="item_top_right">
-                <span v-if="item.religiousType == 1">伊斯兰教</span>
-                <span v-if="item.religiousType == 2">基督教</span>
-                <span v-if="item.religiousType == 3">天主教</span>
-                <span v-if="item.religiousType == 4">佛教</span>
-                <span v-if="item.religiousType == 5">道教</span>
-              </div>
-            </div>
-            <div class="item_center">
-              {{ item.place }}
-            </div>
-            <div class="item_down">
-              <div class="item_down_left">
-                {{ item.contact }}
-              </div>
-              <div class="item_down_right">
-                {{ item.contactNumber }}
-              </div>
-            </div>
-          </div>
-        </van-swipe-cell>
-      </van-list>
-    </van-pull-refresh>
   </div>
 </template>
 
@@ -120,9 +84,54 @@
 import { onMounted, ref, toRefs } from "vue";
 import { useRouter } from "vue-router";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
-import placeRegister from '@/api/placeRegister/placeRegister';
+import placeRegister from "@/api/placeRegister/placeRegister";
 export default {
   setup() {
+    const inputForm = ref({
+      id: "",
+      religiousType: "",
+      religiousName: "",
+      name: "",
+      tyshxydm: "",
+      filingNo: "",
+      contact: "",
+      contactNumber: "",
+      placeSelectName: "",
+      placeSelectId: "",
+      placeSelectType3: "",
+      placeSelectType4: "",
+      placeSelectType5: "",
+      placeSelectType6: "",
+      placeSelectLastId: "",
+      place: "",
+      longitude: "",
+      latitude: "",
+      siteType: "",
+      constructionStage: "",
+      nature: "",
+      religiousDeptManaUser: "",
+      securityDeptManaUser: "",
+      scenesImage: "",
+      plan: "",
+      etiquetteSpace: "",
+      mainRoads: "",
+      publicArea: "",
+      website: "",
+      approvalProcedures: "",
+      peopleThreshold: "",
+      state: "",
+      isEnable: "",
+      remake: "",
+      approvedEstablishmentTime: "",
+      registrationAuthority: "",
+      registrationDate: "",
+      teachingStaff: "",
+      approveOffice: "",
+      coveredArea: "",
+      floorSpace: "",
+      protectionLevel: "",
+      dynamicFormJson: "",
+    });
     //暂时列表数据
     const list = ref([]);
     // 导航栏颜色
@@ -132,52 +141,29 @@ export default {
       history.back();
     };
     //搜索事件
-    const show = ref(false);
-    const searchList = ref([]);
     const search1 = () => {
-      searchList.value = [];
-      search();
-    }
-    const search = () => {
-      loading.value = true;
-      finished.value = false;
-      if (value2.value == 0) {
-        show.value = true;
-        new PlaceRegister()
-          .searchlist({
-            current: index + 1,
-            size: 11,
-            name: value.value,
-            address: value1.value,
-          })
-          .then(({ records, pages }) => {
-            searchList.value = searchList.value.concat(records);
-            // 加载状态结束
-            loading.value = false;
-            if (index + 1 >= pages) {
-              finished.value = true;
-            }
-            index++;
-          });
+      if (value.value == "") {
+        list.value = [];
+        if(value2.value==0){
+          inputForm.value.religiousType = '';
+        }else{
+          inputForm.value.religiousType = value2.value;
+        }
+        inputForm.value.name = '';
+        loading.value = true;
+        finished.value = false;
+        onLoad();
       } else {
-        show.value = true;
-        new PlaceRegister()
-          .searchlist({
-            current: index + 1,
-            size: 11,
-            name: value.value,
-            address: value1.value,
-            religiousType: value2.value,
-          })
-          .then(({ records, pages }) => {
-            searchList.value = searchList.value.concat(records);
-            // 加载状态结束
-            loading.value = false;
-            if (index + 1 >= pages) {
-              finished.value = true;
-            }
-            index++;
-          });
+        list.value = [];
+        if(value2.value==0){
+          inputForm.value.religiousType = '';
+        }else{
+          inputForm.value.religiousType = value2.value;
+        }
+        inputForm.value.name = value.value;
+        loading.value = true;
+        finished.value = false;
+        onLoad();
       }
     };
     const value = ref("");
@@ -196,15 +182,15 @@ export default {
       getUser();
     });
     const getUser = () => {
-      new placeRegister().address().then((res)=>{
-        res.forEach(item => {
+      new placeRegister().address().then((res) => {
+        res.forEach((item) => {
           option1.value.push({
-            text:item.name,
-            value:item.id
-          })
+            text: item.name,
+            value: item.id,
+          });
         });
-      value1.value = option1.value[0].value
-      })
+        value1.value = option1.value[0].value;
+      });
     };
     //跳转
     let router = useRouter();
@@ -227,13 +213,13 @@ export default {
     const onLoad = () => {
       loading.value = true;
       finished.value = false;
-      let address = localStorage.getItem("address");
       // 异步更新数据
       new PlaceRegister()
         .searchlist({
           current: index + 1,
           size: 11,
-          address: address,
+          address: value1.value,
+          ...inputForm.value,
         })
         .then(({ records, pages }) => {
           list.value = list.value.concat(records);
@@ -269,10 +255,7 @@ export default {
       onLoad,
       onRefresh,
       //搜索
-      search,
       gotoplaceRegister,
-      show,
-      searchList,
       value,
       value1,
       value2,
@@ -284,7 +267,7 @@ export default {
 };
 </script>
 
-<style lang='less'>
+<style lang='less' scoped>
 body,
 html {
   margin: 0;

src/views/placeManage/placeTablet/placeTablet.vue

@@ -7,7 +7,7 @@
     @click-right="onClickright"
     :style="{ 'background-color': selectColor }"
   >
-   <template #right>
+    <template #right>
       <van-icon name="plus" size="18" />
     </template>
   </van-nav-bar>
@@ -16,6 +16,7 @@
       v-model="searchName"
       shape="round"
       show-action
+      clearable
       input-align="center"
       label="牌位名称"
       placeholder="请输入牌位名称"
@@ -24,7 +25,11 @@
         <div @click="search1">搜索</div>
       </template>
     </van-search>
-    <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"
@@ -37,7 +42,9 @@
               <div class="item_top_left">
                 {{ item.brandName }}
               </div>
-              <div class="item_top_right" style="color: red">￥{{ item.sacrificeExpenses }}</div>
+              <div class="item_top_right" style="color: red">
+                ￥{{ item.sacrificeExpenses }}
+              </div>
             </div>
             <div class="item_down">
               <div class="item_down_left" style="color: #a2a2a2">
@@ -46,10 +53,23 @@
               <div class="item_down_right">场管：{{ item.siteContact }}</div>
             </div>
           </div>
+          <template #right>
+            <van-button
+              square
+              text="删除"
+              type="danger"
+              @click="del(item.id)"
+              class="delete-button"
+            />
+          </template>
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
-    <van-pull-refresh v-if="show==false" v-model="refreshing" @refresh="onRefresh">
+    <van-pull-refresh
+      v-if="show == false"
+      v-model="refreshing"
+      @refresh="onRefresh"
+    >
       <van-list
         v-model:loading="loading1"
         :finished="finished1"
@@ -62,7 +82,9 @@
               <div class="item_top_left">
                 {{ item.brandName }}
               </div>
-              <div class="item_top_right" style="color: red">￥{{ item.sacrificeExpenses }}</div>
+              <div v-if="item.sacrificeExpenses!=''" class="item_top_right" style="color: red">
+                ￥{{ item.sacrificeExpenses }}
+              </div>
             </div>
             <div class="item_down">
               <div class="item_down_left" style="color: #a2a2a2">
@@ -71,6 +93,15 @@
               <div class="item_down_right">场管：{{ item.siteContact }}</div>
             </div>
           </div>
+          <template #right>
+            <van-button
+              square
+              text="删除"
+              type="danger"
+              @click="del(item.id)"
+              class="delete-button"
+            />
+          </template>
         </van-swipe-cell>
       </van-list>
     </van-pull-refresh>
@@ -109,7 +140,7 @@ export default {
       information: "",
     });
     //搜索事件
-    const show = ref(true)
+    const show = ref(true);
     const searchName = ref("");
     const searchList = ref([]);
     const loading1 = ref(false);
@@ -117,27 +148,29 @@ export default {
     const refreshing1 = ref(false);
     let index1 = 0;
     const search = () => {
-      show.value = false
+      show.value = false;
       loading1.value = true;
       finished1.value = false;
-      new TabletServer().list({
-        current:index1 + 1,
-        size:11,
-        brandName:searchName.value
-      }).then(({records,pages})=>{
-        searchList.value = searchList.value.concat(records)
-        loading1.value = false;
+      new TabletServer()
+        .list({
+          current: index1 + 1,
+          size: 11,
+          brandName: searchName.value,
+        })
+        .then(({ records, pages }) => {
+          searchList.value = searchList.value.concat(records);
+          loading1.value = false;
           if (index1 + 1 >= pages) {
             finished1.value = true;
           }
           index1++;
-      })
+        });
     };
 
-    const search1 = ()=>{
+    const search1 = () => {
       searchList.value = [];
-      search()
-    }
+      search();
+    };
     //页面跳转以及数据传递
     let router = useRouter();
     const goTabletInfo = (item) => {
@@ -159,7 +192,7 @@ export default {
         .list({
           current: index + 1,
           size: 11,
-          ...inputForm.value
+          ...inputForm.value,
         })
         .then(({ records, pages }) => {
           TabletData.value = TabletData.value.concat(records);
@@ -183,6 +216,33 @@ export default {
     const onClickLeft = () => {
       history.back();
     };
+    //牌位删除
+    const del = (id) => {
+      xm.showConfirm({
+        title: "删除确认",
+        message: "确认删除该记录",
+      }).then((result) => {
+        if (result == "ok") {
+          new TabletServer().tabletDelete(id).then((res) => {
+            if (res.status == 200 || res.statusText == "OK") {
+              xm.showToast({
+                message: res.data,
+              });
+            }
+            index = 0;
+            loading.value = true;
+            finished.value = false;
+            TabletData.value = [];
+            onLoad();
+            index1 = 0;
+            loading1.value = true;
+            finished1.value = false;
+            searchList.value = [];
+            search();
+          });
+        }
+      });
+    };
     //进入场所录入页面
     const onClickright = () => {
       router.push("/placeTabletAdd");
@@ -207,13 +267,14 @@ export default {
       search,
       show,
       searchList,
-      search1
+      search1,
+      del,
     };
   },
 };
 </script>
 
-<style lang="less">
+<style lang="less" scoped>
 body,
 html {
   margin: 0;
@@ -240,7 +301,7 @@ html {
   .list-item {
     background-color: #fff;
     padding: 10px;
-    margin-bottom: 5px;
+    border-bottom: 1px solid #f5f5f5;
     overflow: hidden;
     .item_top {
       width: 100%;
@@ -263,7 +324,6 @@ html {
       width: 100%;
       font-size: 16px;
       padding: 5px 0;
-      border-bottom: 1px solid 	#F5F5F5;
       .item_down_left {
         width: 70%;
         float: left;
@@ -272,8 +332,14 @@ html {
         width: 30%;
         text-align: center;
         float: left;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
     }
   }
+  .delete-button{
+    height: 100%;
+  }
 }
 </style>

src/views/placeManage/placeTablet/placeTabletAdd.vue

@@ -50,7 +50,7 @@
                   @click="getsite(item)"
                 >
                   <template #right-icon>
-                    <van-radio :name="item.id" />
+                    <van-radio :name="item.id" @click="getsite(item)"/>
                   </template>
                 </van-cell>
               </van-cell-group>

src/views/placeManage/placeTablet/placeTabletInfo.vue

@@ -55,7 +55,7 @@
                     @click="getsite(item)"
                   >
                     <template #right-icon>
-                      <van-radio :name="item.id" />
+                      <van-radio :name="item.id" @click="getsite(item)"/>
                     </template>
                   </van-cell>
                 </van-cell-group>

src/views/tab_a/tabAll.vue

@@ -108,7 +108,7 @@ export default {
 
 	created() {
 		let id = this.$route.query.id;
-		// window.xm.setNavigationBarTitle({ title: '宗教和顺' })
+		window.xm.setNavigationBarTitle({ title: '宗教和顺' })
 		this.TokenLogin2();
 		this.$dictUtils.refreshDictList();
 	},