新建事件BUG

pages/buildIncident/buildIncident.vue

@@ -86,11 +86,13 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentBuildStore } from '@/stores/incidentBuild'
+  import { useHandlerStore } from '@/stores/handler'
   import { useUploadFile } from '@/share/useUploadFile.js'
 
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentBuildStore = useIncidentBuildStore();
+  const handlerStore = useHandlerStore();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
 
@@ -171,7 +173,7 @@
 
   // 选择楼栋楼层
   function selectAreaPlace(){
-    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'area');
     uni.navigateTo({
       url: `/pages/searchArea/searchArea`
     })
@@ -179,7 +181,7 @@
 
   // 跳转到搜索报修科室
   function selectDepartment(){
-    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
+    incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident', 'department');
     uni.navigateTo({
       url: `/pages/searchDept/searchDept`
     })
@@ -414,20 +416,14 @@
   }
 
   onLoad((option) => {
+    handlerStore.clearHandlerData();
     if(incidentBuildStore.incidentBuild.data){
       Object.assign(incidentData, incidentBuildStore.incidentBuild.data);
-
       // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
-      if(!incidentData.place){
-        incidentData.place = incidentData.department ? incidentData.department.place : undefined;
-      }
-
-      if(!incidentData.houseNumber){
-        incidentData.houseNumber = incidentData.department ? incidentData.department.address : '';
-      }
-
-      if(!incidentData.contactsInformation){
-        incidentData.contactsInformation = incidentData.department ? incidentData.department.phone : '';
+      if(incidentBuildStore.incidentBuild.sign === 'department'){
+        incidentData.place = incidentData.department.place || undefined;
+        incidentData.houseNumber = incidentData.department.address || '';
+        incidentData.contactsInformation = incidentData.department.phone || '';
       }
     }
     getBranchs();

pages/handler/handler.vue

@@ -472,6 +472,7 @@
           console.log(dataInfo)
           handlerStore.clearHandlerData();
         }else{
+          handlerStore.clearHandlerData();
           // 初始化回显
           dataInfo.category = dataInfo.incidentData.category || {};
           dataInfo.synergetic = dataInfo.incidentData.synergetic || [];

pages/searchDept/searchDept.vue

@@ -100,7 +100,7 @@
   // 点击
   function clickItem(data){
     dataInfo.incidentData.department = data;
-    incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type);
+    incidentBuildStore.setIncidentBuildData(dataInfo.incidentData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);
     uni.navigateTo({
       url: '/pages/buildIncident/buildIncident'
     })

pages/searchPlace/searchPlace.vue

@@ -65,7 +65,7 @@
       return;
     }
     dataInfo.paramData.place = dataInfo.placeObj;
-    incidentBuildStore.setIncidentBuildData(dataInfo.paramData, incidentBuildStore.incidentBuild.type);
+    incidentBuildStore.setIncidentBuildData(dataInfo.paramData, incidentBuildStore.incidentBuild.type, incidentBuildStore.incidentBuild.sign);
     uni.navigateTo({
       url: `/pages/${incidentBuildStore.incidentBuild.type}/${incidentBuildStore.incidentBuild.type}?incidentId=${dataInfo.incidentId}`,
     })

pages/synergeticAdd/synergeticAdd.vue

@@ -120,7 +120,7 @@
     if(dataInfo.incidentId !== 'undefined'){
       getIncidentDetail();
     }else{
-      dataInfo.incidentData = handlerStore.handler.data || {};
+      dataInfo.incidentData = handlerStore.handler.data.incidentData || {};
       getList(0);
     }
   }

stores/incidentBuild.js

@@ -7,12 +7,19 @@ export const useIncidentBuildStore = defineStore(
     const incidentBuild = reactive({
       data: null,
       type: '',
+      sign: '',
     });
 
     // 保存
-    function setIncidentBuildData(data, type) {
+    /**
+     * @param {Object} data 数据
+     * @param {Object} type 路由
+     * @param {Object} sign 标识
+     */
+    function setIncidentBuildData(data, type, sign) {
       incidentBuild.data = data;
       incidentBuild.type = type;
+      incidentBuild.sign = sign;
     }
     
     // 清空
@@ -20,6 +27,7 @@ export const useIncidentBuildStore = defineStore(
       console.log(incidentBuild.data)
       incidentBuild.data = null;
       incidentBuild.type = '';
+      incidentBuild.sign = '';
     }
 
     return {