Merge remote-tracking branch 'HS_MZAP/master'

# Conflicts:
#	src/utils/config.js

src/api/placeRegister/placeRegister.js

@@ -9,11 +9,11 @@ export default class placeRegister {
     };
     //所属场所
     queryById(id) {
-            return request.get(
-                `/religioussites/siteinfo/religiousSitesInfo/queryById`, { id: id }
-            )
-        }
-        //地点
+        return request.get(
+            `/religioussites/siteinfo/religiousSitesInfo/queryById`, { id: id }
+        )
+    };
+    //地点
     treeDate(params) {
         return request.get(
             `/tools/area_yc/treeData`,
@@ -27,4 +27,11 @@ export default class placeRegister {
             params
         )
     };
+    //机构
+    treeDate2(params) {
+        return request.get(
+            `/sys/office/treeData`,
+            params
+        )
+    }
 }

src/utils/config.js

@@ -11,4 +11,4 @@ if (process.env.NODE_ENV === 'development') {
 
 // APP_SERVER_URL = APP_SERVER_URL + "/app"
 
-export default APP_SERVER_URL
+export default APP_SERVER_URL

src/views/placeManage/ManageList.vue

@@ -16,7 +16,7 @@
         >
         <van-cell-group inset>
           <van-cell
-            v-for="(item, index) in list"
+            v-for="(item, index) in list3"
             clickable
             :key="item"
             :title="item.name"
@@ -26,7 +26,8 @@
               <van-checkbox
                 shape="square"
                 :name="item"
-                :ref="(el) => (checkboxRefs[index] = el)"/>
+                :ref="(el) => (checkboxRefs[index] = el)"
+              />
             </template>
           </van-cell>
         </van-cell-group>
@@ -34,7 +35,7 @@
       <van-radio-group v-if="type == 0" v-model="checked">
         <van-cell-group inset>
           <van-cell
-            v-for="item in list"
+            v-for="item in list3"
             clickable
             :key="item"
             :title="item.name"
@@ -52,16 +53,21 @@
 
 <script>
 import { ref } from "vue";
-import placeRegister from "@/api/placeRegister/placeRegister" 
+import placeRegister from "@/api/placeRegister/placeRegister";
+import { List } from "vant";
 export default {
   name: "personList",
   emits: ["selected"],
-  props: ["type"],
+  props: ["type", "stateType", "placeAddress"],
   setup(props, { emit }) {
     const list = ref([]);
+    const list3 = ref([]);
     const loading = ref(false);
     const finished = ref(false);
     let index = 0;
+    let placeAddress = props.placeAddress.split("/");
+    let zjList = ref([]);
+    let gaList = ref([]);
     const onLoad = () => {
       // 异步更新数据
       new placeRegister()
@@ -74,12 +80,84 @@ export default {
           // 加载状态结束
           loading.value = false;
           index++;
+          // console.log(list.value);
           // 数据全部加载完成
           if (records.length < 10) {
             finished.value = true;
           }
         });
+      let mechanism1 = []; //宗教
+      let mechanism2 = []; //公安
+      new placeRegister().treeDate2().then((res) => {
+        mechanism1.push(res[0]);
+        mechanism2.push(res[1]);
+        if (props.stateType == 0) {
+          Getzj(mechanism1);
+          // console.log(zjList.value);
+          zjList.value.forEach((item1) => {
+            if (
+              
+              item1.regionLevel3 == placeAddress[0]||
+              item1.regionLevel4 == placeAddress[1]||
+              item1.regionLevel5 == placeAddress[2]
+            ) {
+              let itemId = item1.id;
+              let list2 = [];
+              list.value.forEach((item2) => {
+                if (itemId == item2.officeDTO.id) {
+                  list2.push(item2)
+                }
+              });
+              list3.value = list2;
+              console.log(list2);
+            }
+          });
+        } else {
+          Getga(mechanism2);
+          // console.log(gaList.value);
+          gaList.value.forEach((item3) => {
+            if (
+              // item3.regionLevel3 == placeAddress[0] ||
+              // (item3.regionLevel3 == placeAddress[0] &&
+              //   item3.regionLevel4 == placeAddress[1]) ||
+              // (item3.regionLevel3 == placeAddress[0] &&
+              //   item3.regionLevel4 == placeAddress[1] &&
+              //   item3.regionLevel5 == placeAddress[2])
+              item3.regionLevel3 == placeAddress[0]||
+              item3.regionLevel4 == placeAddress[1]||
+              item3.regionLevel5 == placeAddress[2]
+            ) {
+              let itemId = item3.id;
+              let list2 = [];
+              list.value.forEach((item2) => {
+                if (itemId == item2.officeDTO.id) {
+                  list2.push(item2)
+                }
+              });
+              list3.value = list2;
+            }
+          });
+        }
+      });
     };
+    //获取宗教部门数组
+    function Getzj(list) {
+      list.forEach((item) => {
+        zjList.value.push(item);
+        if (item.children) {
+          Getzj(item.children);
+        }
+      });
+    }
+    //获取公安部门数组
+    function Getga(list) {
+      list.forEach((item) => {
+        gaList.value.push(item);
+        if (item.children) {
+          Getga(item.children);
+        }
+      });
+    }
     // 搜索
     const value = ref("");
     const onSearch = (val) => showToast(val);
@@ -104,7 +182,6 @@ export default {
 
     return {
       // 人员
-      list,
       onLoad,
       loading,
       finished,
@@ -116,6 +193,7 @@ export default {
       checkboxGroup,
       // 单选
       selectes,
+      list3
     };
   },
 };

src/views/placeManage/placeRegister.vue

@@ -62,7 +62,7 @@
         />
         <van-popup v-model:show="showPlace1" round position="bottom">
           <van-picker
-            title="活动场所"
+            title="场所地点"
             :columns="options"
             :columns-field-names="customFieldName"
             @cancel="showPlace1 = false"
@@ -139,7 +139,7 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.religiousDeptManaUserName.name"
+          v-model="placeActivity.placeData.religiousDeptManaUserName"
           center
           label="宗教管理人员"
           placeholder="请填写宗教管理人员"
@@ -153,26 +153,36 @@
           show-cancel-button
           @confirm="reselected"
         >
-          <manage-list @selected="selected" :type="1"></manage-list>
+          <manage-list
+            @selected="selected"
+            :type="0"
+            :stateType="0"
+            :placeAddress="placeAddress"
+          ></manage-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.securityDeptManaUserName.name"
+          v-model="placeActivity.placeData.securityDeptManaUserName"
           center
           label="公安管理人员"
           placeholder="请填写公安管理人员"
           input-align="right"
           right-icon="arrow-down"
           @click="showReport = true"
-        />  
+        />
         <van-dialog
           v-model:show="showReport"
           title="公安部门管理人员"
           show-cancel-button
           @confirm="reselected"
         >
-          <manage-list @selected="selected" :type="0"></manage-list>
+          <manage-list
+            @selected="selected"
+            :type="0"
+            :stateType="1"
+            :placeAddress="placeAddress"
+          ></manage-list>
         </van-dialog>
       </van-cell-group>
       <van-cell-group>
@@ -214,11 +224,10 @@
 
 <script>
 import { reactive, ref } from "vue";
-import ManageList from "../placeManage/ManageList.vue"
+import ManageList from "../placeManage/ManageList.vue";
 import PlaceRegister from "@/api/placeRegister/placeRegister";
-import router from "@/router";
 export default {
-  components:{ManageList},
+  components: { ManageList },
   setup() {
     const goback = () => {
       history.back();
@@ -236,14 +245,10 @@ export default {
         siteType: "", //场所类型
         constructionStage: "", //场所建设阶段
         nature: "", //场所性质
-        religiousDeptManaUserName: {
-          id:"",
-          name:""
-        }, //宗教部门管理人员
-        securityDeptManaUserName: {
-          id:"",
-          name:""
-        }, //公安部门管理人员
+        religiousDeptManaUser: "", //宗教部门管理人员id
+        religiousDeptManaUserName: "", //宗教部门管理人员
+        securityDeptManaUser: "", //公安部门管理人员id
+        securityDeptManaUserName: "", //公安部门管理人员
         peopleThreshold: "", //场所活动人数
         scenesImage: "", //内外景图片
       },
@@ -298,9 +303,15 @@ export default {
     const afterRead = (file) => {
       // 此时可以自行将文件上传至服务器
       console.log(file);
+      xm.chooseImage({
+        count: 9,
+      }).then(function (result) {
+        console.log(result);
+        // [ {name: 'a.png', size: 1234, path: '/root/images/, base64: '' } ]
+      });
     };
-
     // 地区选择
+    let placeAddress = ref("");
     const customFieldName = {
       text: "name",
       value: "id",
@@ -313,6 +324,13 @@ export default {
     });
     let showPlace1 = ref(false);
     const getPlace1 = ({ selectedOptions }) => {
+      placeAddress.value =
+        selectedOptions[0].id +
+        "/" +
+        selectedOptions[1].id +
+        "/" +
+        selectedOptions[2].id;
+      // console.log(placeAddress.value);
       showPlace1.value = false;
       placeActivity.placeData.placeSelectName =
         selectedOptions[0].name +
@@ -329,7 +347,6 @@ export default {
       type: "",
     };
     const selected = (val, type) => {
-      
       list.value = val;
       list.type = type;
       console.log(list);
@@ -342,11 +359,11 @@ export default {
           ids.push(item.id);
           names.push(item.name);
         });
-      placeActivity.placeData.religiousDeptManaUserName.id =  ids.join(',')
-      placeActivity.placeData.religiousDeptManaUserName.name =  names.join(',')  
+        placeActivity.placeData.religiousDeptManaUser = ids.join(",");
+        placeActivity.placeData.religiousDeptManaUserName = names.join(",");
       } else {
-      placeActivity.placeData.securityDeptManaUserName.id =  list.value.id
-      placeActivity.placeData.securityDeptManaUserName.name =  list.value.name
+        placeActivity.placeData.securityDeptManaUser = list.value.id;
+        placeActivity.placeData.securityDeptManaUserName = list.value.name;
       }
     };
     //数据提交
@@ -354,9 +371,9 @@ export default {
       // console.log(placeActivity.placeData.scenesImage);
       new PlaceRegister().sava(placeActivity.placeData).then((res) => {
         console.log("提交成功", res);
-        router.push({
-          path: "/tabAll",
-        });
+        // router.push({
+        //   path: "/tabAll",
+        // });
       });
     };
 
@@ -383,6 +400,7 @@ export default {
       // 返回
       goback,
       // 地区选择
+      placeAddress,
       customFieldName,
       showPlace1,
       getPlace1,

src/views/toBeDone/toBeDone_details.vue

@@ -17,10 +17,7 @@
       <p>发生时间：{{ PersonInfo.data.problemTime }}</p>
       <p>截止时间：{{ PersonInfo.data.deadlineTime }}</p>
       <p>
-        问题附件：
-        <van-uploader>
-          <van-button>活动申请书</van-button>
-        </van-uploader>
+        问题附件：{{PersonInfo.data.problemAccessory}}
       </p>
     </div>
     <div class="content-bottom">