建单BUG修复

pages/assign/assign.vue

@@ -177,6 +177,7 @@
     Promise.all(requestList).then(resList => {
       uni.hideLoading();
       console.log(resList);
+      incidentBuildStore.clearIncidentBuildData();
       uni.showToast({
       	icon: 'none',
         title: '建单成功',
@@ -560,6 +561,7 @@
     postData.incident.closecode = {id: dataInfo.closecode};
     postData.incident.category = dataInfo.category;
     postData.incident.synergetic = dataInfo.synergetic;
+    postData.incident.directProcess = 1;//直接解决
     
     return api_incidentTask('accept', postData);
   }
@@ -665,6 +667,7 @@
         uni.hideLoading();
         console.log(resList);
         if(resList[0].state == 200){
+          incidentBuildStore.clearIncidentBuildData();
           uni.showToast({
           	icon: 'none',
             title: '建单成功',
@@ -741,6 +744,7 @@
         uni.hideLoading();
         console.log(resList);
         if(resList[0].state == 200){
+          incidentBuildStore.clearIncidentBuildData();
           uni.showToast({
           	icon: 'none',
             title: '建单成功',
@@ -768,11 +772,51 @@
       Object.assign(dataInfo, handlerStore.handler.data);
       console.log(dataInfo)
       handlerStore.clearHandlerData();
+      
+      if(dataInfo.category){
+         dataInfo.incidentData.category = dataInfo.category;
+        
+        // 处理责任科室
+        if(dataInfo.category.branchType == 1){
+          // 分院区
+          if(dataInfo.incidentData.branch){
+            let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
+            if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+              dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+            }else{
+              dataInfo.incidentData.duty = undefined;
+            }
+          }else{
+            dataInfo.incidentData.duty = undefined;
+          }
+        }else{
+          // 不分院区
+          dataInfo.incidentData.duty = dataInfo.category.dutyDepartment;
+        }
+      }
     }else if(incidentBuildStore.incidentBuild.data){
       // 初始化
-      dataInfo.incidentData = incidentBuildStore.incidentBuild.data || {};
+      Object.assign(dataInfo.incidentData, incidentBuildStore.incidentBuild.data);
       if(dataInfo.incidentData.category){
         dataInfo.category = dataInfo.incidentData.category;
+        
+        // 处理责任科室
+        if(dataInfo.category.branchType == 1){
+          // 分院区
+          if(dataInfo.incidentData.branch){
+            let dutyConfig = dataInfo.category.branchUserGroups.find(v=>v.branchId == dataInfo.incidentData.branch);
+            if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
+              dataInfo.incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
+            }else{
+              dataInfo.incidentData.duty = undefined;
+            }
+          }else{
+            dataInfo.incidentData.duty = undefined;
+          }
+        }else{
+          // 不分院区
+          dataInfo.incidentData.duty = dataInfo.category.dutyDepartment;
+        }
       }
       if(dataInfo.incidentData.priority){
         dataInfo.incidentData.priority = { id: dataInfo.incidentData.priority };

pages/buildIncident/buildIncident.vue

@@ -43,12 +43,12 @@
         </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 class="title select"><text class="required newicon newicon-bitian"></text>故障来源：</view>
+        <uni-data-select readonly class="value" v-model="incidentData.source" :localdata="dataInfo.sourceList" placeholder="请选择故障来源" :class="{formRed: isSubmit && !incidentData.source}"></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 class="title select"><text class="required newicon newicon-bitian"></text>优先级：</view>
+        <uni-data-select placement="top" readonly class="value" v-model="incidentData.priority" :localdata="dataInfo.priorityList" placeholder="请选择优先级" :class="{formRed: isSubmit && !incidentData.priority}"></uni-data-select>
       </view>
       <view class="form_item column">
         <view class="title select"><text class="required newicon newicon-bitian"></text>故障描述：</view>
@@ -68,7 +68,7 @@
           </view>
         </view>
       </view>
-      
+
     </scroll-view>
     <view class="foot_common_btns">
       <button @click="goBack" type="default" class="cancelButton btn">返回</button>
@@ -87,16 +87,16 @@
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useIncidentBuildStore } from '@/stores/incidentBuild'
   import { useUploadFile } from '@/share/useUploadFile.js'
-  
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const incidentBuildStore = useIncidentBuildStore();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
   // 工单对象
   const incidentData = reactive({
     "deleteFlag": 0,
@@ -118,10 +118,10 @@
     "acceptUser": loginUserStore.loginUser.user,
     repairImgList: [],//报修图片列表
   })
-  
+
   // 报修图片
   const handlerImgRef = ref(null)
-  
+
   // 数据
   const dataInfo = reactive({
     branchList: [], //院区列表
@@ -129,10 +129,10 @@
     sourceList: [], //故障来源列表
     priorityList: [], //优先级列表
   })
-  
+
   // 是否提交
   const isSubmit = ref(false)
-  
+
   // 上传报修图片成功
   function handlerImgSuccess(e){
     incidentData.repairImgList.forEach(v => {
@@ -140,7 +140,7 @@
     })
     console.log(incidentData.repairImgList);
   }
-  
+
   // 上传报修图片失败
   function handlerImgFail(e){
     incidentData.repairImgList.forEach(v => {
@@ -148,19 +148,19 @@
     })
     console.log(incidentData.repairImgList);
   }
-  
+
   // 选择上传图片
   function handlerImgSelect(e){
     incidentData.repairImgList = incidentData.repairImgList.concat(e.tempFiles);
     console.log(incidentData.repairImgList);
   }
-  
+
   // 删除上传图片
   function handlerImgDelete(e){
     incidentData.repairImgList = incidentData.repairImgList.filter(v => e.tempFile.uuid != v.uuid);
     console.log(incidentData.repairImgList);
   }
-  
+
   // 选择故障现象
   function selectCategory(){
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
@@ -168,7 +168,7 @@
       url: `/pages/categoryOne/categoryOne`
     })
   }
-  
+
   // 选择楼栋楼层
   function selectAreaPlace(){
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
@@ -176,7 +176,7 @@
       url: `/pages/searchArea/searchArea`
     })
   }
-  
+
   // 跳转到搜索报修科室
   function selectDepartment(){
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
@@ -184,7 +184,7 @@
       url: `/pages/searchDept/searchDept`
     })
   }
-  
+
   // 获取院区列表
   function getBranchs(){
     uni.showLoading({
@@ -203,15 +203,17 @@
           text: v.hosName,
           value: v.id,
         }));
-        
-        if(loginUserStore.loginUser.user.duty){
-          // 当前的所属责任科室
-          incidentData.branch = loginUserStore.loginUser.user.duty.branch;
-        }else if(loginUserStore.loginUser.user.branch){
-          // 当前的所属院区
-          incidentData.branch = loginUserStore.loginUser.user.branch.id;
+
+        if(!incidentBuildStore.incidentBuild.data){
+          if(loginUserStore.loginUser.user.duty){
+            // 当前的所属责任科室
+            incidentData.branch = loginUserStore.loginUser.user.duty.branch;
+          }else if(loginUserStore.loginUser.user.branch){
+            // 当前的所属院区
+            incidentData.branch = loginUserStore.loginUser.user.branch.id;
+          }
         }
-        
+
       }else{
         uni.showToast({
           icon: 'none',
@@ -220,7 +222,7 @@
       }
     })
   }
-  
+
   // 获取报修人列表
   function getRequesters(){
     uni.showLoading({
@@ -242,7 +244,7 @@
           text: v.name,
           value: v.id,
         }));
-        
+
       }else{
         uni.showToast({
           icon: 'none',
@@ -251,7 +253,7 @@
       }
     })
   }
-  
+
   // 获取故障来源列表
   function getSources(){
     uni.showLoading({
@@ -268,10 +270,15 @@
       dataInfo.sourceList = res.map(v => ({
         text: v.name,
         value: v.id,
+        key: v.value,
       }));
+      let discover = dataInfo.sourceList.find(v => v.key === 'discover');
+      if(discover){
+        incidentData.source = discover.value;
+      }
     })
   }
-  
+
   // 获取优先级列表
   function getPrioritys(){
     uni.showLoading({
@@ -291,30 +298,35 @@
       }));
     })
   }
-  
+
   // 选择院区
-  function changeBranch(){}
-  
+  function changeBranch(){
+    incidentData.department = undefined;
+    incidentData.contactsInformation = '';
+    incidentData.place = undefined;
+    incidentData.houseNumber = undefined;
+  }
+
   // 处理提交事件
   function handlerOrder(){
     let postData = {
       incident: dataInfo.incidentData,
     }
-    
+
     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 handlerOrderImg(imgObj){
     return uploadFile(imgObj, 'incident', dataInfo.incidentId)
   }
-  
+
   // 提交
   function submit(){
     isSubmit.value = true;
@@ -326,7 +338,7 @@
       });
       return;
     }
-    
+
     if(!incidentData.department){
       uni.showToast({
       	icon: 'none',
@@ -334,7 +346,7 @@
       });
       return;
     }
-    
+
     if(!incidentData.contactsInformation.trim()){
       uni.showToast({
       	icon: 'none',
@@ -342,7 +354,7 @@
       });
       return;
     }
-    
+
     if(!incidentData.category){
       uni.showToast({
       	icon: 'none',
@@ -350,7 +362,23 @@
       });
       return;
     }
-    
+
+    if(!incidentData.source){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择故障来源'
+      });
+      return;
+    }
+
+    if(!incidentData.priority){
+      uni.showToast({
+      	icon: 'none',
+        title: '请选择优先级'
+      });
+      return;
+    }
+
     if(!incidentData.description.trim()){
       uni.showToast({
       	icon: 'none',
@@ -359,12 +387,12 @@
       return;
     }
     console.log(incidentData);
-    
+
     // 处理责任科室
     if(incidentData.category.branchType == 1){
       // 分院区
       if(incidentData.branch){
-        var dutyConfig = incidentData.category.branchUserGroups.find(v=>v.branchId == incidentData.branch);
+        let dutyConfig = incidentData.category.branchUserGroups.find(v=>v.branchId == incidentData.branch);
         if(dutyConfig && dutyConfig.dutyId && dutyConfig.dutyName){
           incidentData.duty = {id:dutyConfig.dutyId,dept:dutyConfig.dutyName};
         }else{
@@ -377,30 +405,29 @@
       // 不分院区
       incidentData.duty = incidentData.category.dutyDepartment;
     }
-    
+
     incidentData.title = incidentData.category.category;
     incidentBuildStore.setIncidentBuildData(incidentData, 'buildIncident');
     uni.navigateTo({
       url: '/pages/assign/assign'
     })
   }
-  
+
   onLoad((option) => {
     if(incidentBuildStore.incidentBuild.data){
       Object.assign(incidentData, incidentBuildStore.incidentBuild.data);
-      // incidentBuildStore.clearIncidentBuildData();
-      
+
       // 修改报修科室,则回显楼栋,楼层,详细地址,联系电话
       if(!incidentData.place){
-        incidentData.place = incidentData.department.place || undefined;
+        incidentData.place = incidentData.department ? incidentData.department.place : undefined;
       }
-      
+
       if(!incidentData.houseNumber){
-        incidentData.houseNumber = incidentData.department.address || '';
+        incidentData.houseNumber = incidentData.department ? incidentData.department.address : '';
       }
-      
+
       if(!incidentData.contactsInformation){
-        incidentData.contactsInformation = incidentData.department.phone || '';
+        incidentData.contactsInformation = incidentData.department ? incidentData.department.phone : '';
       }
     }
     getBranchs();