Просмотр исходного кода

场所录入,待办详情页更新

guoqing 2 лет назад
Родитель
Сommit
27e875ba22

+ 10 - 1
src/api/placeRegister/placeRegister.js

@@ -1,15 +1,24 @@
 import request from "@/utils/request";
 export default class placeRegister {
+    //场所提交
     sava(inputFrom) {
         return request.post(
             `/religioussites/siteinfo/religiousSitesInfo/save`,
             inputFrom
         )
     };
+    //地点
     treeDate(params) {
         return request.get(
             `/tools/area_yc/treeData`,
             params
         )
-    }
+    };
+    //公安、宗教部门
+    list(params) {
+        return request.get(
+            `/sys/user/list`,
+            params
+        )
+    };
 }

+ 77 - 16
src/views/placeManage/placeRegister.vue

@@ -140,21 +140,41 @@
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.religiousDeptManaUserName"
+          v-model="placeActivity.placeData.religiousDeptManaUserName.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"
+        >
+          <manage-list @selected="selected" :type="1"></manage-list>
+        </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
-          v-model="placeActivity.placeData.securityDeptManaUserName"
+          v-model="placeActivity.placeData.securityDeptManaUserName.name"
           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>
+        </van-dialog>
       </van-cell-group>
       <van-cell-group>
         <van-field
@@ -195,9 +215,11 @@
 
 <script>
 import { reactive, ref } from "vue";
+import ManageList from "../placeManage/ManageList.vue"
 import PlaceRegister from "@/api/placeRegister/placeRegister";
-import router from '@/router';
+import router from "@/router";
 export default {
+  components:{ManageList},
   setup() {
     const goback = () => {
       history.back();
@@ -215,10 +237,16 @@ export default {
         siteType: "", //场所类型
         constructionStage: "", //场所建设阶段
         nature: "", //场所性质
-        religiousDeptManaUserName: "", //宗教部门管理人员
-        securityDeptManaUserName: "", //公安部门管理人员
+        religiousDeptManaUserName: {
+          id:"",
+          name:""
+        }, //宗教部门管理人员
+        securityDeptManaUserName: {
+          id:"",
+          name:""
+        }, //公安部门管理人员
         peopleThreshold: "", //场所活动人数
-        scenesImage:""//内外景图片
+        scenesImage: "", //内外景图片
       },
       fileList1: [], //外景图片
       fileList2: [], //内景图片
@@ -266,6 +294,7 @@ export default {
       showPicker3.value = false;
       placeActivity.placeData.nature = selectedOptions[0].text;
     };
+
     //图片上传
     const afterRead = (file) => {
       // 此时可以自行将文件上传至服务器
@@ -293,17 +322,44 @@ export default {
         "/" +
         selectedOptions[2].name;
     };
+    //人员选择
+    let showPerson = ref(false);
+    let showReport = ref(false);
+    let list = {
+      value: [],
+      type: "",
+    };
+    const selected = (val, type) => {
+      
+      list.value = val;
+      list.type = type;
+      console.log(list);
+    };
+    const reselected = () => {
+      let ids = [];
+      let names = [];
+      if (list.type == 1) {
+        list.value.forEach((item) => {
+          ids.push(item.id);
+          names.push(item.name);
+        });
+      placeActivity.placeData.religiousDeptManaUserName.id =  ids.join(',')
+      placeActivity.placeData.religiousDeptManaUserName.name =  names.join(',')  
+      } else {
+      placeActivity.placeData.securityDeptManaUserName.id =  list.value.id
+      placeActivity.placeData.securityDeptManaUserName.name =  list.value.name
+      }
+    };
     //数据提交
-    const submit = ()=>{
+    const submit = () => {
       // console.log(placeActivity.placeData.scenesImage);
-      new PlaceRegister().sava(placeActivity.placeData).then((res)=>{
-        console.log("提交成功",res);
+      new PlaceRegister().sava(placeActivity.placeData).then((res) => {
+        console.log("提交成功", res);
         router.push({
-          path:'/tabAll'
-        })
-      })
-    }
-
+          path: "/tabAll",
+        });
+      });
+    };
 
     return {
       placeActivity,
@@ -332,8 +388,13 @@ export default {
       showPlace1,
       getPlace1,
       options,
+      //人员选择
+      showPerson,
+      showReport,
+      selected,
+      reselected,
       //数据提交
-      submit
+      submit,
     };
   },
 };

+ 3 - 1
src/views/toBeDone/toBeDone_details.vue

@@ -8,7 +8,7 @@
   <div class="content">
     <div class="content-top">
       <p>问题内容:</p>
-      <p v-html="PersonInfo.data.problemContent"></p>
+      <p v-html="PersonInfo.data.problemContent" style=""></p>
       <p>发起部门:{{ PersonInfo.createDepartment.name }}</p>
       <p>发起人:{{ PersonInfo.todoBy.name }}</p>
       <p>交办类型:{{ PersonInfo.data.assignTypeName }}</p>
@@ -106,12 +106,14 @@ html {
 .content {
   position: fixed;
   width: 85%;
+  height: 680px;
   top: 180px;
   left: 50%;
   padding: 20px 10px;
   transform: translateX(-50%);
   background-color: #fff;
   border-radius: 10px;
+  overflow: auto;
   .content-top {
     padding-bottom: 30px;
     border-bottom: 2px solid #e7e7e7;