新建事件

http/api.js

@@ -167,3 +167,18 @@ export function api_listAttachment(type, id){
 export function api_incidentLog(data){
   return post("/simple/data/fetchDataList/incidentLog", data);
 }
+
+/**
+ * 获取报修科室列表
+ */
+export function api_department(data){
+  return post("/user/data/fetchDataList/department", data);
+}
+
+/**
+ * 获取地点列表
+ */
+export function api_place(data){
+  return post("/user/data/fetchDataList/place", data);
+}
+

pages.json

@@ -134,6 +134,31 @@
           "titleNView": false
         }
       }
+    },
+    {
+      "path": "pages/searchDept/searchDept",
+      "style": {
+        "h5": {
+          "titleNView": false
+        },
+        "enablePullDownRefresh": true
+      }
+    },
+    {
+      "path" : "pages/searchArea/searchArea",
+      "style" : 
+      {
+        "navigationBarTitleText" : "",
+        "enablePullDownRefresh" : false
+      }
+    },
+    {
+      "path" : "pages/searchPlace/searchPlace",
+      "style" : 
+      {
+        "navigationBarTitleText" : "",
+        "enablePullDownRefresh" : false
+      }
     }
   ],
   "globalStyle": {

pages/buildIncident/buildIncident.vue

@@ -3,16 +3,72 @@
     <scroll-view scroll-y class="body">
       <view class="form_item">
         <view class="title select"><text class="required newicon newicon-bitian"></text>院区：</view>
-        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择院区" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+        <uni-data-select class="value" v-model="incidentData.branch" :localdata="dataInfo.branchList" :clear="false" placeholder="请选择院区" :class="{formRed: isSubmit && !incidentData.branch}" @change="changeBranch"></uni-data-select>
       </view>
       <view class="form_item">
-        <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
-        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择报修科室" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+        <view class="title"><text class="required newicon newicon-bitian"></text>报修科室：</view>
+        <view class="value category" @click="selectDepartment">
+          <text class="categoryName ellipsis-multiline">{{incidentData.department ? incidentData.department.dept : ''}}</text>
+          <text class="newicon newicon-weibiaoti2010104"></text>
+        </view>
       </view>
       <view class="form_item">
         <view class="title select"><text class="required newicon newicon-bitian transparent"></text>报修人：</view>
-        <uni-data-select class="value" v-model="dataInfo.groupId" :localdata="dataInfo.groupList" :clear="false" placeholder="请选择报修人" @change="changeGroup" :class="{formRed: isSubmit && !dataInfo.groupId}"></uni-data-select>
+        <uni-data-select readonly class="value" v-model="incidentData.requester" :localdata="dataInfo.requesterList" placeholder="请选择报修人"></uni-data-select>
       </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian transparent"></text>联系人：</view>
+        <uni-easyinput class="value" v-model="incidentData.contacts" placeholder="请输入联系人" />
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
+        <uni-easyinput class="value" v-model="incidentData.contactsInformation" placeholder="请输入联系电话" :class="{formRed: isSubmit && !incidentData.contactsInformation.trim()}" />
+      </view>
+      <view class="form_item">
+        <view class="title"><text class="required newicon newicon-bitian transparent"></text>楼栋楼层：</view>
+        <view class="value category" @click="selectAreaPlace">
+          <text class="categoryName ellipsis-multiline">{{incidentData.place ? incidentData.place.area.area + ' ' + incidentData.place.place : ''}}</text>
+          <text class="newicon newicon-weibiaoti2010104"></text>
+        </view>
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian transparent"></text>详细地址：</view>
+        <uni-easyinput class="value" v-model="incidentData.houseNumber" placeholder="请输入详细地址" />
+      </view>
+      <view class="form_item">
+        <view class="title"><text class="required newicon newicon-bitian"></text>故障现象：</view>
+        <view class="value category" @click="selectCategory">
+          <text class="categoryName ellipsis-multiline">{{incidentData.category ? incidentData.category.mutiCategory : ''}}</text>
+          <text class="newicon newicon-weibiaoti2010104"></text>
+        </view>
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian transparent"></text>故障来源：</view>
+        <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择故障来源"></uni-data-select>
+      </view>
+      <view class="form_item">
+        <view class="title select"><text class="required newicon newicon-bitian transparent"></text>优先级：</view>
+        <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级"></uni-data-select>
+      </view>
+      <view class="form_item column">
+        <view class="title select"><text class="required newicon newicon-bitian"></text>故障描述：</view>
+        <uni-easyinput class="value" type="textarea" v-model="incidentData.description" placeholder="请输入故障描述" :class="{formRed: isSubmit && !incidentData.description.trim()}" />
+      </view>
+      <view class="form_item_column">
+        <view class="form_item">
+          <view class="title"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+          <view class="value">
+            <uni-file-picker ref="handlerImgRef" v-model="incidentData.handlerImgList" limit="3" @success="handlerImgSuccess" @fail="handlerImgFail" @select="handlerImgSelect" @delete="handlerImgDelete"></uni-file-picker>
+          </view>
+        </view>
+        <view class="form_item">
+          <view class="title transparent"><text class="required newicon newicon-bitian transparent"></text>处理图片：</view>
+          <view class="value">
+            <text class="imgTips ellipsis">(支持JPG/PNG格式图片，单张大小10M以内)</text>
+          </view>
+        </view>
+      </view>
+      
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
@@ -24,82 +80,136 @@
 <script setup>
   import { ref, reactive } from 'vue'
   import { onLoad } from '@dcloudio/uni-app'
-  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment } from "@/http/api.js"
+  import { api_user, api_branch, api_getDictionary, api_incidentTask } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
-  import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useUploadFile } from '@/share/useUploadFile.js'
   
   useSetTitle();
   const loginUserStore = useLoginUserStore();
-  const { makePhoneCall }  = useMakePhoneCall();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
   
   // 主题颜色
   const primaryColor = ref(defaultColor)
   
+  // 工单对象
+  const incidentData = reactive({
+    "deleteFlag": 0,
+    "duty": undefined,
+    "department": undefined,
+    "contactsInformation": '',
+    "contacts": '',
+    "branch": undefined,
+    "area": undefined,
+    "place": undefined,
+    "houseNumber": '',
+    "category": undefined,
+    "priority": undefined,
+    "source": undefined,
+    "title": '',
+    "description": '',
+    "repairType": undefined,
+    "requester":undefined,
+    "acceptUser": loginUserStore.loginUser.user,
+    handlerImgList: [],//处理图片列表
+  })
+  
+  // 处理图片
+  const handlerImgRef = ref(null)
+  
   // 数据
   const dataInfo = reactive({
-    incidentId: undefined,//事件ID
-    incidentData: {},//事件对象
-    groupList: [], //工作组列表
-    groupId: undefined, //工作组ID
-    userList: [], //用户列表
-    userId: undefined, //用户ID
     branchList: [], //院区列表
-    branchId: undefined, //院区ID
-    dutyList: [], //责任科室列表
-    dutyId: undefined, //责任科室ID
-    isAssignUser: 1, //工作组是否转派到人
-    isAssignUserList: [
-      { text: '是', value: 1 },
-      { text: '否', value: 0 },
-    ], //工作组是否转派到人选项
-    reassignRemark: '',//退回原因
+    requesterList: [], //报修人列表
+    sourceList: [], //故障来源列表
+    priorityList: [], //优先级列表
   })
   
   // 是否提交
   const isSubmit = ref(false)
   
-  // 重置
-  function reset(){
-    dataInfo.branchId = undefined;
-    dataInfo.branchList = [];
-    
-    dataInfo.dutyId = undefined;
-    dataInfo.dutyList = [];
-    
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
-    
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    
-    dataInfo.isAssignUser = 1;
+  // 上传处理图片成功
+  function handlerImgSuccess(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+    // let handlerOrder$ = handlerOrder();
+    // let requestList = [handlerOrder$];
+    // dataInfo.handlerImgList.forEach(v => {
+    //   let handlerOrderImg$ = handlerOrderImg(v);
+    //   requestList.push(handlerOrderImg$);
+    // })
     
-    dataInfo.reassignRemark = '';
+    // Promise.all(requestList).then(resList => {
+    //   uni.hideLoading();
+    //   console.log(resList);
+    //   if(resList[0].state == 200){
+    //     uni.showToast({
+    //     	icon: 'none',
+    //       title: '处理成功',
+    //       mask: true,
+    //     });
+    //     setTimeout(() => {
+    //       uni.reLaunch({
+    //         url: '/pages/incidentList/incidentList',
+    //       })
+    //     }, 1500)
+    //   }else{
+    //     uni.showToast({
+    //       icon: 'none',
+    //       title: resList[0].msg || '请求数据失败！'
+    //     });
+    //   }
+    // })
   }
   
-  // 获取事件详情
-  function getIncidentDetail(){
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-
-    api_incidentDetail(dataInfo.incidentId).then(res => {
-      uni.hideLoading();
-      if(res.status == 200){
-        dataInfo.incidentData = res.data || {};
-        
-        initForm()
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
+  // 上传处理图片失败
+  function handlerImgFail(e){
+    dataInfo.handlerImgList.forEach(v => {
+      v.url = v.path;
+    })
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 选择上传图片
+  function handlerImgSelect(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.concat(e.tempFiles);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 删除上传图片
+  function handlerImgDelete(e){
+    dataInfo.handlerImgList = dataInfo.handlerImgList.filter(v => e.tempFile.uuid != v.uuid);
+    console.log(dataInfo.handlerImgList);
+  }
+  
+  // 选择故障现象
+  function selectCategory(){
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    uni.navigateTo({
+      url: `/pages/categoryOne/categoryOne`
+    })
+  }
+  
+  // 选择楼栋楼层
+  function selectAreaPlace(){
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    uni.navigateTo({
+      url: `/pages/searchArea/searchArea`
+    })
+  }
+  
+  // 跳转到搜索报修科室
+  function selectDepartment(){
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    uni.navigateTo({
+      url: `/pages/searchDept/searchDept`
     })
   }
   
@@ -124,15 +234,12 @@
         
         if(loginUserStore.loginUser.user.duty){
           // 当前的所属责任科室
-          dataInfo.branchId = loginUserStore.loginUser.user.duty.branch;
-          changeBranch();
-          
-          dataInfo.dutyId = loginUserStore.loginUser.user.duty.id;
-          changeDuty();
+          incidentData.branch = loginUserStore.loginUser.user.duty.branch;
         }else if(loginUserStore.loginUser.user.branch){
           // 当前的所属院区
-          dataInfo.branchId = loginUserStore.loginUser.user.branch.id;
+          incidentData.branch = loginUserStore.loginUser.user.branch.id;
         }
+        
       }else{
         uni.showToast({
           icon: 'none',
@@ -142,8 +249,8 @@
     })
   }
   
-  // 获取责任科室列表
-  function getDutys(){
+  // 获取报修人列表
+  function getRequesters(){
     uni.showLoading({
       title: "加载中",
       mask: true,
@@ -151,18 +258,19 @@
     let postData = {
       "idx": 0,
       "sum": 9999,
-      "dutyDepartment": {
-        "branch": dataInfo.branchId,
+      "user": {
+        "engineer": undefined,
       }
     };
-    api_dutyDepartment(postData).then(res => {
+    api_user(postData).then(res => {
       uni.hideLoading();
       if(res.status == 200){
         res.list = res.list || [];
-        dataInfo.dutyList = res.list.map(v => ({
-          text: v.dept,
+        dataInfo.requesterList = res.list.map(v => ({
+          text: v.name,
           value: v.id,
         }));
+        
       }else{
         uni.showToast({
           icon: 'none',
@@ -172,183 +280,74 @@
     })
   }
   
-  // 获取工作组列表
-  function getGroups(){
+  // 获取故障来源列表
+  function getSources(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
-    
-    let duty = undefined;
-    
     let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "group": {
-          "duty": duty,
-          "selectType": "nouser"
-      }
+      "key": 'incident_source',
+      "type": "list",
     };
-    api_group(postData).then(res => {
+    api_getDictionary(postData).then(res => {
       uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.groupList = res.list.map(v => ({
-          text: v.groupName,
-          value: v.id,
-        }));
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
+      res = res || [];
+      dataInfo.sourceList = res.map(v => ({
+        text: v.name,
+        value: v.id,
+      }));
     })
   }
   
-  // 获取用户列表
-  function getUsers(){
+  // 获取优先级列表
+  function getPrioritys(){
     uni.showLoading({
       title: "加载中",
       mask: true,
     });
     let postData = {
-      "idx": 0,
-      "sum": 9999,
-      "user": {
-          "groupdata":{
-            "id": dataInfo.groupId,
-          },
-          "roledata": {
-              "rolecode": "first-line support"
-          },
-          "roledata2": {
-              "rolecode": "second-line support"
-          },
-          "selectType": "1",
-          "selectDetails": 1,
-          "simple": true,
-          "engineer": 1
-      }
+      "key": 'incident_priority',
+      "type": "list",
     };
-    api_user(postData).then(res => {
+    api_getDictionary(postData).then(res => {
       uni.hideLoading();
-      if(res.status == 200){
-        res.list = res.list || [];
-        dataInfo.userList = res.list.map(v => ({
-          text: v.name,
-          value: v.id,
-        }));
-      }else{
-        uni.showToast({
-          icon: 'none',
-          title: res.msg || '请求数据失败！'
-        });
-      }
+      res = res || [];
+      dataInfo.priorityList = res.map(v => ({
+        text: v.name,
+        value: v.id,
+      }));
     })
   }
   
   // 选择院区
-  function changeBranch(){
-    dataInfo.dutyId = undefined;
-    dataInfo.dutyList = [];
-    
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
-    
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getDutys();
-  }
+  function changeBranch(){}
   
-  // 选择责任科室
-  function changeDuty(){
-    dataInfo.groupId = undefined;
-    dataInfo.groupList = [];
+  // 处理提交事件
+  function handlerOrder(){
+    let postData = {
+      incident: dataInfo.incidentData,
+    }
     
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getGroups();
-  }
-  
-  // 选择工作组
-  function changeGroup(){
-    dataInfo.userId = undefined;
-    dataInfo.userList = [];
-    getUsers();
+    postData.incident.handleDescription = dataInfo.handleDescription;
+    postData.incident.handleCategory = {id: dataInfo.handleCategory};
+    postData.incident.closecode = {id: dataInfo.closecode};
+    postData.incident.category = dataInfo.category;
+    postData.incident.synergetic = dataInfo.synergetic;
+    
+    return api_incidentTask('accept', postData);
   }
   
-  // 选择是否转派到人
-  function changeIsAssignUser(){
-    dataInfo.userId = undefined;
+  // 处理图片
+  function handlerOrderImg(imgObj){
+    return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
   
   // 提交
   function submit(){
     isSubmit.value = true;
-    
-  }
-  
-  // 转派提交
-  function submitRedeploy(){
-    if(!dataInfo.groupId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择工作组'
-      });
-      return;
-    }
-    
-    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
-      uni.showToast({
-      	icon: 'none',
-        title: '请选择指派对象'
-      });
-      return;
-    }
-    
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
-    }
-    
-    // api_incidentTask('' postData).then(res => {
-    //   uni.hideLoading();
-    //   if(res.state == 200){
-    //     uni.showToast({
-    //     	icon: 'none',
-    //       title: '转派成功',
-    //       mask: true,
-    //     });
-    //     setTimeout(() => {
-    //       uni.reLaunch({
-    //         url: '/pages/incidentList/incidentList',
-    //       })
-    //     }, 1500)
-    //   }else{
-    //     uni.showToast({
-    //       icon: 'none',
-    //       title: res.msg || '请求数据失败！'
-    //     });
-    //   }
-    // })
-  }
-  
-  // 指派提交
-  function submitAssign(){
-    if(!dataInfo.branchId){
+    console.log(dataInfo);
+    if(!dataInfo.branch){
       uni.showToast({
       	icon: 'none',
         title: '请选择院区'
@@ -356,115 +355,89 @@
       return;
     }
     
-    if(!dataInfo.dutyId){
+    if(!dataInfo.department){
       uni.showToast({
       	icon: 'none',
-        title: '请选择责任科室'
+        title: '请选择报修科室'
       });
       return;
     }
     
-    if(!dataInfo.groupId){
+    if(!dataInfo.contactsInformation.trim()){
       uni.showToast({
       	icon: 'none',
-        title: '请选择工作组'
+        title: '请填写联系电话'
       });
       return;
     }
     
-    if(dataInfo.isAssignUser == 1 && !dataInfo.userId){
+    if(!dataInfo.category){
       uni.showToast({
       	icon: 'none',
-        title: '请选择指派对象'
+        title: '请选择故障现象'
       });
       return;
     }
     
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    if(dataInfo.userId){
-      // 派人
-      postData.incident.assignee = dataInfo.userId;
-    } else {
-      // 派组
-      postData.incident.candidateGroups = dataInfo.groupId;
-    }
-    
-    // api_incidentTask('', postData).then(res => {
-    //   uni.hideLoading();
-    //   if(res.state == 200){
-    //     uni.showToast({
-    //     	icon: 'none',
-    //       title: '指派成功',
-    //       mask: true,
-    //     });
-    //     setTimeout(() => {
-    //       uni.reLaunch({
-    //         url: '/pages/incidentList/incidentList',
-    //       })
-    //     }, 1500)
-    //   }else{
-    //     uni.showToast({
-    //       icon: 'none',
-    //       title: res.msg || '请求数据失败！'
-    //     });
-    //   }
-    // })
-  }
-  
-  // 退回提交
-  function submitReassign(){
-    if(!dataInfo.reassignRemark.trim()){
+    if(!dataInfo.handleDescription.trim()){
       uni.showToast({
       	icon: 'none',
-        title: '请填写退回原因'
+        title: '请填写故障描述'
       });
       return;
     }
+    console.log(dataInfo.handlerImgList)
+    incidentBuildStore.setIncidentBuildData(dataInfo, 'buildIncident');
     
-    uni.showLoading({
-      title: "加载中",
-      mask: true,
-    });
-    
-    let postData = {
-      incident: dataInfo.incidentData,
-    }
-    
-    postData.incident.reassignRemark = dataInfo.reassignRemark;
-    
-    // api_incidentTask('', postData).then(res => {
-    //   uni.hideLoading();
-    //   if(res.state == 200){
-    //     uni.showToast({
-    //     	icon: 'none',
-    //       title: '退回成功',
-    //       mask: true,
-    //     });
-    //     setTimeout(() => {
-    //       uni.reLaunch({
-    //         url: '/pages/incidentList/incidentList',
-    //       })
-    //     }, 1500)
-    //   }else{
-    //     uni.showToast({
-    //       icon: 'none',
-    //       title: res.msg || '请求数据失败！'
-    //     });
-    //   }
-    // })
+    // uni.showLoading({
+    //   title: "加载中",
+    //   mask: true,
+    // });
+    // if(dataInfo.handlerImgList.length){
+    //   // 有图片
+    //   handlerImgRef.value.upload();
+    // }else{
+    //   // 没有图片
+    //   let handlerOrder$ = handlerOrder();
+    //   let requestList = [handlerOrder$];
+    //   Promise.all(requestList).then(resList => {
+    //     uni.hideLoading();
+    //     console.log(resList);
+    //     if(resList[0].state == 200){
+    //       uni.showToast({
+    //       	icon: 'none',
+    //         title: '处理成功',
+    //         mask: true,
+    //       });
+    //       setTimeout(() => {
+    //         uni.reLaunch({
+    //           url: '/pages/incidentList/incidentList',
+    //         })
+    //       }, 1500)
+    //     }else{
+    //       uni.showToast({
+    //         icon: 'none',
+    //         title: resList[0].msg || '请求数据失败！'
+    //       });
+    //     }
+    //   })
+    // }
   }
   
   onLoad((option) => {
-    dataInfo.incidentId = option.incidentId;
-    getIncidentDetail();
+    if(incidentBuildStore.incidentBuild.data){
+      Object.assign(incidentData, incidentBuildStore.incidentBuild.data);
+      incidentBuildStore.clearIncidentBuildData();
+      
+      // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
+      incidentData.place = incidentData.department.place || undefined;
+      incidentData.houseNumber = incidentData.department.address || '';
+      incidentData.contactsInformation = incidentData.department.phone || '';
+    }
+    getBranchs();
+    getRequesters();
+    getSources();
+    getPrioritys();
   })
 </script>
 
@@ -475,7 +448,6 @@
   flex-direction: column;
   justify-content: space-between;
   .body{
-    margin-top: 88rpx;
     padding: 0 24rpx;
     box-sizing: border-box;
     flex: 1;
@@ -511,10 +483,33 @@
         display: flex;
         align-items: center;
         margin-right: 12rpx;
+        flex-shrink: 0;
         &.select{
           width: calc(5em + 20rpx);
         }
       }
+      .value{
+        width: 100%;
+        &.category{
+          width: 100%;
+          display: flex;
+          justify-content: space-between;
+          align-items: center;
+          .categoryName{
+            font-size: 26rpx;
+            color: #555;
+            flex: 1;
+          }
+          .newicon-weibiaoti2010104{
+            color: $uni-primary;
+            margin-left: 24rpx;
+          }
+        }
+        .imgTips{
+          color: #909399;
+          font-size: 22rpx;
+        }
+      }
     }
   }
 }

pages/categoryThree/categoryThree.vue

@@ -25,11 +25,13 @@
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
   import { useGoBack } from '@/share/useGoBack.js'
   
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const handlerStore = useHandlerStore();
+  const incidentBuildStore = useIncidentBuildStore();
   const { goBack }  = useGoBack();
   
   // 主题颜色
@@ -64,15 +66,27 @@
       return;
     }
     dataInfo.paramData.category = dataInfo.categoryThreeObj;
-    handlerStore.setHandlerData(dataInfo.paramData);
-    uni.navigateTo({
-      url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
-    })
+    if(handlerStore.handler.type){
+      handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type);
+      uni.navigateTo({
+        url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}`,
+      })
+    } else if(incidentBuildStore.incidentBuild.type){
+      incidentBuildStore.setIncidentBuildData(dataInfo.paramData, incidentBuildStore.incidentBuild.type);
+      uni.navigateTo({
+        url: `/pages/${incidentBuildStore.incidentBuild.type}/${incidentBuildStore.incidentBuild.type}?incidentId=${dataInfo.incidentId}`,
+      })
+    }
+    
   }
   
   // 获取传递的数据
   function getParamData(){
-    dataInfo.paramData = handlerStore.handler.data || {};
+    if(handlerStore.handler.type){
+      dataInfo.paramData = handlerStore.handler.data || {};
+    } else if(incidentBuildStore.incidentBuild.type){
+      dataInfo.paramData = incidentBuildStore.incidentBuild.data || {};
+    }
     dataInfo.categoryThree = dataInfo.paramData.category ? dataInfo.paramData.category.id : undefined;
     dataInfo.categoryThreeObj =  dataInfo.paramData.category || {};
     getList(0);

pages/handler/handler.vue

@@ -143,7 +143,7 @@
   import NumberModal from '@/components/NumberModal.vue';
   import { onLoad } from '@dcloudio/uni-app'
   import { generateNumberArray } from '@/utils/index.js'
-  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc, api_uploadAttachment } from "@/http/api.js"
+  import { api_group, api_incidentDetail, api_user, api_incidentTask, api_branch, api_dutyDepartment, api_getDictionary, api_querySummaryDoc, api_addSummaryDoc } from "@/http/api.js"
   import { defaultColor } from '@/static/js/theme.js'
   import { useSetTitle } from '@/share/useSetTitle.js'
   import { useMakePhoneCall } from '@/share/useMakePhoneCall.js'
@@ -265,7 +265,7 @@
   
   // 添加协同人员
   function synergeticAdd(){
-    handlerStore.setHandlerData(dataInfo);
+    handlerStore.setHandlerData(dataInfo, 'handler');
     uni.navigateTo({
       url: `/pages/synergeticAdd/synergeticAdd?incidentId=${dataInfo.incidentId}`
     })
@@ -273,7 +273,7 @@
   
   // 选择故障现象
   function selectCategory(){
-    handlerStore.setHandlerData(dataInfo);
+    handlerStore.setHandlerData(dataInfo, 'handler');
     uni.navigateTo({
       url: `/pages/categoryOne/categoryOne?incidentId=${dataInfo.incidentId}`
     })

pages/searchArea/searchArea.vue

@@ -0,0 +1,163 @@
+<template>
+  <view class="categoryOne">
+    <view class="head">
+      请选择楼栋
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="toPlace(data)">
+        {{data.area}}
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_area } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+  })
+  
+  // 跳转地点列表
+  function toPlace(data){
+    uni.navigateTo({
+      url: `/pages/searchPlace/searchPlace?incidentId=${dataInfo.incidentId}&parentId=${data.id}&parentName=${data.area}`
+    })
+  }
+  
+  // 获取列表信息
+  function getList(idx){
+    if(!incidentBuildStore.incidentBuild.data.branch){
+      dataInfo.list = [];
+      uni.stopPullDownRefresh();
+      dataInfo.hasMore = false;
+      return;
+    }
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      "idx": 0,
+      "sum": 9999,
+      "area": {
+        "branch": incidentBuildStore.incidentBuild.data.branch,
+        "searchType": "quickStart",
+      }
+    };
+    
+    api_area(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.categoryOne{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 26rpx;
+    color: $uni-primary;
+  }
+  .body{
+    border-top: 1rpx solid #DEDEDE;
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/searchDept/searchDept.vue

@@ -0,0 +1,172 @@
+<template>
+  <view class="consumableList">
+    <view class="head">
+      <uni-search-bar v-model="dataInfo.keyWord" placeholder="请搜索报修科室" bgColor="#F8F8F8" @input="search" cancelButton="none" focus :radius="18" />
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <view class="body_item ellipsis" v-for="data in dataInfo.list" :key="data.id" @click="clickItem(data)">
+        {{data.dept}}
+      </view>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">返回</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { debounce } from 'lodash-es'
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_department, api_incidentDetail, api_addSummaryDoc } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentData: {},//事件对象
+    keyWord: '',//搜索的关键词
+  })
+  
+  // 搜索
+  const search = debounce(getList.bind(null, 0), 500);
+  
+  // 获取列表信息
+  function getList(idx){
+    if(dataInfo.keyWord.trim() === ''){
+      dataInfo.list = [];
+      uni.stopPullDownRefresh();
+      return;
+    }
+    
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      department: {
+        branch: dataInfo.incidentData.branch,
+        searchType: 'quickStart',
+        selectType: 'pinyin_qs',
+        dept: dataInfo.keyWord,
+      }
+    }
+    
+    api_department(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  // 点击
+  function clickItem(data){
+    dataInfo.incidentData.department = data;
+    incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type);
+    uni.navigateTo({
+      url: '/pages/buildIncident/buildIncident'
+    })
+  }
+  
+  onLoad((option) => {
+    if(incidentBuildStore.incidentBuild.data){
+      dataInfo.incidentData = incidentBuildStore.incidentBuild.data;
+    }
+    getList(0);
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.consumableList{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: linear-gradient( 90deg, #58CF66 0%, #DDE9FC 100%);
+  }
+  .body{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/searchPlace/searchPlace.vue

@@ -0,0 +1,193 @@
+<template>
+  <view class="searchPlace">
+    <view class="head">
+      <view class="one">{{dataInfo.parentName}}<uni-icons class="right" type="right" :size="16" :color="primaryColor"></uni-icons></view>
+      <text class="two ellipsis">{{dataInfo.placeObj.place}}</text>
+    </view>
+    <view class="body" v-if="dataInfo.list.length">
+      <uni-data-checkbox v-model="dataInfo.place" :localdata="dataInfo.list" mode="list" wrap icon="right" :map="{text:'place',value:'id'}" @change="selectItem"></uni-data-checkbox>
+    </view>
+    <view class="zanwu" v-else>
+      <text class="newicon newicon-zanwu"></text>
+    </view>
+    <view class="foot_common_btns">
+      <button @click="goBack" type="default" class="primaryButton btn">上一级</button>
+      <button @click="confirm" type="default" class="primaryButton btn">确认</button>
+    </view>
+  </view>
+</template>
+
+<script setup>
+  import { ref, reactive} from 'vue'
+  import { onLoad, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app'
+  import { api_place } from "@/http/api.js"
+  import { defaultColor } from '@/static/js/theme.js'
+  import { useSetTitle } from '@/share/useSetTitle.js'
+  import { useLoginUserStore } from '@/stores/loginUser'
+  import { useHandlerStore } from '@/stores/handler'
+  import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useGoBack } from '@/share/useGoBack.js'
+  
+  useSetTitle();
+  const loginUserStore = useLoginUserStore();
+  const handlerStore = useHandlerStore();
+  const incidentBuildStore = useIncidentBuildStore();
+  const { goBack }  = useGoBack();
+  
+  // 主题颜色
+  const primaryColor = ref(defaultColor)
+  
+  // 数据
+  const dataInfo = reactive({
+    list: [],//工单列表
+    idx: 0,//页码
+    hasMore: true,//是否有更多数据
+    incidentId: undefined,//事件ID
+    paramData: {},//传参
+    parentId: undefined,//区域id
+    parentName: '',//区域名称
+    place: undefined,//地点-回显
+    placeObj: {},//地点列表-已选择
+  })
+  
+  // 选择
+  function selectItem(e){
+    dataInfo.placeObj = e.detail.data;
+  }
+  
+  // 确认
+  function confirm(){
+    if(!dataInfo.place){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择地点'
+      });
+      return;
+    }
+    dataInfo.paramData.place = dataInfo.placeObj;
+    incidentBuildStore.setIncidentBuildData(dataInfo.paramData, incidentBuildStore.incidentBuild.type);
+    uni.navigateTo({
+      url: `/pages/${incidentBuildStore.incidentBuild.type}/${incidentBuildStore.incidentBuild.type}?incidentId=${dataInfo.incidentId}`,
+    })
+  }
+  
+  // 获取传递的数据
+  function getParamData(){
+    dataInfo.paramData = incidentBuildStore.incidentBuild.data || {};
+    dataInfo.place = dataInfo.paramData.place ? dataInfo.paramData.place.id : undefined;
+    dataInfo.placeObj =  dataInfo.paramData.place || {};
+    getList(0);
+  }
+  
+  // 获取列表信息
+  function getList(idx){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+    
+    dataInfo.idx = idx === undefined ? dataInfo.idx : idx;
+    if(dataInfo.idx === 0){
+      dataInfo.list = [];
+    }
+
+    let postData = {
+      idx: dataInfo.idx,
+      sum: 20,
+      place: {
+        areaId: dataInfo.parentId,
+      }
+    }
+    
+    api_place(postData).then(res => {
+      uni.hideLoading();
+      uni.stopPullDownRefresh();
+      if(res.status == 200){
+        let list = res.list || [];
+        if(list.length){
+          dataInfo.hasMore = true;
+          dataInfo.list = dataInfo.idx === 0 ? list : dataInfo.list.concat(list);
+        }else{
+          dataInfo.hasMore = false;
+        }
+      }else{
+        uni.showToast({
+          icon: 'none',
+          title: res.msg || '请求数据失败！'
+        });
+      }
+    })
+  }
+  
+  onLoad((option) => {
+    dataInfo.incidentId = option.incidentId;
+    dataInfo.parentId = option.parentId;
+    dataInfo.parentName = option.parentName;
+    getParamData();
+  })
+  
+  onPullDownRefresh(() => {
+    getList(0)
+  })
+  
+  onReachBottom(() => {
+    dataInfo.idx += 1;
+    if (dataInfo.hasMore) {
+      getList(); // 当触底时加载更多数据
+    }
+  })
+</script>
+
+<style lang="scss" scoped>
+.searchPlace{
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  .head{
+    height: 88rpx;
+    display: flex;
+    align-items: center;
+    padding: 0 24rpx;
+    position: fixed;
+    z-index: 99;
+    width: 100%;
+    box-sizing: border-box;
+    background: #fff;
+    font-size: 26rpx;
+    color: $uni-primary;
+    .right{
+      margin-top: 2rpx;
+    }
+    .two{
+      flex: 1;
+    }
+  }
+  .body{
+    border-top: 1rpx solid #DEDEDE;
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    font-size: 26rpx;
+    .body_item{
+      border-bottom: 1rpx solid #DEDEDE;
+      padding: 24rpx;
+    }
+  }
+  .zanwu{
+    margin-bottom: 140rpx;
+    margin-top: 88rpx;
+    display: flex;
+    justify-content: center;
+    .newicon-zanwu{
+      font-size: 256rpx;
+      color: #D6D6D6;
+      margin-top: 140rpx;
+    }
+  }
+  .foot_common_btns{
+    position: fixed;
+    left: 0;
+    bottom: 0;
+    background-color: #fff;
+  }
+}
+</style>

pages/synergeticAdd/synergeticAdd.vue

@@ -59,9 +59,9 @@
       return;
     }
     dataInfo.paramData.synergetic = dataInfo.userSelectedList;
-    handlerStore.setHandlerData(dataInfo.paramData);
+    handlerStore.setHandlerData(dataInfo.paramData, handlerStore.handler.type);
     uni.navigateTo({
-      url: `/pages/handler/handler?incidentId=${dataInfo.incidentId}`,
+      url: `/pages/${handlerStore.handler.type}/${handlerStore.handler.type}?incidentId=${dataInfo.incidentId}`,
     })
   }
   

static/scss/common.scss

@@ -167,3 +167,36 @@ uni-toast,
   border-top: none!important;
   border-bottom: 1rpx solid #DEDEDE!important;
 }
+
+// 清除按钮
+.content-clear-icon{
+  color: $uni-primary!important;
+}
+
+// flex1
+.flex1{
+  flex: 1;
+}
+
+// 表格控件遮罩
+.formMask{
+  position: relative;
+  &:after{
+    content: '';
+    position: absolute;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    left: 0;
+  }
+}
+
+// 下拉框
+.uni-select__input-box{
+  width: 100%!important;
+}
+
+// 数据组合框
+.uni-data-checklist .checklist-group .checklist-box.is--list.is-checked .checklist-content .checkobx__list{
+  border-color: $uni-primary!important;
+}

stores/handler.js

@@ -6,17 +6,20 @@ export const useHandlerStore = defineStore(
   () => {
     const handler = reactive({
       data: null,
+      type: '',
     });
 
     // 保存事件信息
-    function setHandlerData(data) {
+    function setHandlerData(data, type) {
       handler.data = data;
+      handler.type = type;
     }
     
     // 清空事件信息
     function clearHandlerData() {
       console.log(handler.data)
       handler.data = null;
+      handler.type = '';
     }
 
     return {

stores/incidentBuild.js

@@ -0,0 +1,34 @@
+import { defineStore } from "pinia"
+import { reactive } from 'vue'
+
+export const useIncidentBuildStore = defineStore(
+  "incidentBuild",
+  () => {
+    const incidentBuild = reactive({
+      data: null,
+      type: '',
+    });
+
+    // 保存
+    function setIncidentBuildData(data, type) {
+      incidentBuild.data = data;
+      incidentBuild.type = type;
+    }
+    
+    // 清空
+    function clearIncidentBuildData() {
+      console.log(incidentBuild.data)
+      incidentBuild.data = null;
+      incidentBuild.type = '';
+    }
+
+    return {
+      incidentBuild,
+      setIncidentBuildData,
+      clearIncidentBuildData,
+    };
+  },
+  {
+    unistorage: true, // 开启后对 state 的数据读写都将持久化
+  },
+);