bugfix

pages/repair/rapidRepNext.vue

@@ -17,7 +17,7 @@
 				</view>
 <!--        <view class="form_item">
           <view class="title select"><text class="required newicon newicon-bitian"></text>报修科室：</view>
-        	<uni-data-picker class="value" placeholder="请选择报修科室" 
+        	<uni-data-picker class="value" placeholder="请选择报修科室"
         		v-model="dataInfo.department" :localdata="dataInfo.repairTypeList"
         		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.department}">
         	</uni-data-picker>
@@ -32,7 +32,7 @@
 				<view class="candidate" v-if="itemUser">
 					<view class="candidate-item" v-for="(item, index) in itemUser.commonDeptDTO" :key="item" @click="itemCandidate(item)">{{item.dept}}</view>
 				</view>
-				
+
 				<view class="form_item column">
 					<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
 					<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.address }" />
@@ -40,12 +40,12 @@
 				<view class="candidate">
 					<view class="candidate-item" v-for="item in dataInfo.addressList" :key="item.id" @click="itemAddres(item)">{{item.name}}</view>
 				</view>
-				
+
 				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.contacts}">
 					<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
 					<input class="item-input" placeholder="请输入联系人" v-model="dataInfo.contacts" />
 				</view>
-				
+
 				<view class="form_item" :class="{formRed: isSubmit && !dataInfo.contactsInformation}">
 					<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
 					<input class="item-input" placeholder="请输入联系电话" v-model="dataInfo.contactsInformation"/>
@@ -68,7 +68,7 @@
        		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.areaId}">
        	</uni-data-picker>
        </view>
-       
+
 			 <view class="form_item" v-if="isRepair.valueconfig==1">
 			   <view class="title select"><text class="required newicon newicon-bitian"></text>楼层：</view>
 			 	<uni-data-picker class="value" placeholder="请选择楼层"
@@ -76,17 +76,17 @@
 			 		:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.placeId}">
 			 	</uni-data-picker>
 			 </view>
-			 
+
        <view class="form_item column" v-if="isRepair.valueconfig==1">
        	<view class="title"><text class="required newicon newicon-bitian"></text>详细地址：</view>
        	<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.address}" />
        </view>
-       
+
        <view class="form_item" :class="{formRed: isSubmit && !dataInfo.contacts}">
        	<view class="title select"><text class="required newicon newicon-bitian"></text>联系人：</view>
        	<input class="item-input value" placeholder="请输入联系人" v-model="dataInfo.contacts"/>
        </view>
-       
+
        <view class="form_item" :class="{formRed: isSubmit && !dataInfo.contactsInformation}">
        	<view class="title select"><text class="required newicon newicon-bitian"></text>联系电话：</view>
        	<input class="item-input value" placeholder="请输入联系电话" v-model="dataInfo.contactsInformation"/>
@@ -98,7 +98,7 @@
       <button @click="submit" type="default" class="primaryButton btn">提交</button>
     </view>
     <NumberModal v-if="dataInfo.isNumber" @cancelEmit="cancelNumber" @confirmEmit="conformNumber" @removeEmit="removeNumber" :selectData="dataInfo.selectData" :selectType="dataInfo.selectType" :evtNumber="dataInfo.evtNumber" showRemove></NumberModal>
-		
+
 	</view>
 </template>
 
@@ -115,17 +115,17 @@
   import { useGoBack } from '@/share/useGoBack.js'
   import { useLoginUserStore } from '@/stores/loginUser'
   import { useHandlerStore } from '@/stores/handler'
-  
+
   useSetTitle();
   const loginUserStore = useLoginUserStore();
   const handlerStore = useHandlerStore();
   const { makePhoneCall }  = useMakePhoneCall();
   const { uploadFile }  = useUploadFile();
   const { goBack }  = useGoBack();
-  
+
   // 主题颜色
   const primaryColor = ref(defaultColor)
-  
+
 	// 备用机选项
 	const machineData = ref([
 		{
@@ -137,14 +137,14 @@
 			value:0
 		},
 	])
-	
+
 	const isDept = ref({})
 	const isRepair = ref({})
 	const branchData = ref([])
 	const candidateData = ref(loginUserStore.loginUser.user)
-	
+
 	const repairIncident = ref(null)
-	
+
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -174,28 +174,28 @@
 		branch:'', //院区
 		addressList: [], //科室地点
   })
-  
-	
+
+
 	// 故障处理用是否提供备用机
 	const newProvideBackupMachine = ref(0)
-	
+
 	// 知识库id
 	const solutionId = ref(null)
-	
+
   // 是否提交
   const isSubmit = ref(false)
-  
+
   // 处理图片
   const handlerImgRef = ref(null)
-  
+
 	// 用户信息
 	const itemUser = ref(null)
-		
+
   // 是否进入汇总单
   const isInSummaryOrder = computed(() => {
     return dataInfo.tabActiveValue === 'doing' && dataInfo.incidentData.duty && dataInfo.incidentData.duty.addSummary == 1 && (dataInfo.incidentData.handlingPersonnelUser.id == loginUserStore.loginUser.user.id);
   })
-  
+
   // 上一步或者返回列表
   function goBackOrToList(){
 		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
@@ -203,7 +203,7 @@
 		  url: `/pages/repair/rapidRep`
 		})
   }
-  
+
   // 重置
   function reset(){
 		// dataInfo.department = '',//报修科室
@@ -214,7 +214,7 @@
 		dataInfo.placeId = '' //院区
 		dataInfo.placeTypeList = []
   }
-  
+
   // 初始化表单
   function initForm(){
     if(dataInfo.tabActiveValue === 'doing'){
@@ -224,7 +224,7 @@
 			getbuildingList()
     }
   }
-  
+
 	function itemCandidate(item){
 		// console.log(55,index)
 		// let arr = loginUserStore.loginUser.user.commonDept.split(',')
@@ -232,11 +232,11 @@
 		dataInfo.department = item.id
 		dataInfo.departmentName = item.dept
 	}
-	
+
 	function itemAddres(item){
 		dataInfo.address = item.name
 	}
-	
+
 	function getUserInfo(){
 		let user = loginUserStore.loginUser.user
 		let postData = {
@@ -255,7 +255,7 @@
 				if(uni.getStorageSync('rapidRepNext')){
 					let data = JSON.parse(uni.getStorageSync('rapidRepNext'))
 					if(data){
-						dataInfo.departmentName = data.departmentName 
+						dataInfo.departmentName = data.departmentName
 						dataInfo.department = data.department
 					}
 				}else{
@@ -263,7 +263,7 @@
 					dataInfo.department = res.list[0].dept.id
 				}
 		    itemUser.value = res.list.find(i=>i.id==user.id)
-				
+
 		  }else{
 		    uni.showToast({
 		      icon: 'none',
@@ -272,7 +272,7 @@
 		  }
 		})
 	}
-	
+
   // 点击tab
   function clickTab(tabValue){
     if(dataInfo.tabActiveValue == tabValue){
@@ -294,7 +294,7 @@
 		newProvideBackupMachine.value = dataInfo.incidentData.provideBackupMachine
     initForm();
   }
-  
+
   // 获取事件详情
   function getIncidentDetail(){
 		let user = loginUserStore.loginUser.user
@@ -331,7 +331,7 @@
 				dataInfo.assetId = data.assetId
 			}
 		}
-		
+
 		let data = JSON.parse(uni.getStorageSync('sysData'))
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
 		isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
@@ -354,7 +354,7 @@
 			getbuildingList()
 		}
 
-		
+
 		let postData = {
 		  "key": 'repair_incident_type',
 		  "type": "list",
@@ -365,7 +365,7 @@
 		})
 		getBranch()
   }
-  
+
 	// 获取院区列表
 	function getBranch(){
 		let arr = loginUserStore.loginUser.hospital.filter(i=>i.parent==undefined)
@@ -374,19 +374,19 @@
 		  value: v.id,
 		}));
 	}
-	
+
 	// 科内报修选择院区
 	function doingDeptChange(){
 		dataInfo.department = ''
 		dataInfo.departmentName = ''
 		// getRepairTypes()
 	}
-	
+
 	// 公区报修选择院区
 	function overDeptChange(){
 		getbuildingList()
 	}
-	
+
 	// 跳转到搜索报修科室
 	function selectDepartment(){
 		uni.setStorageSync('rapidRepNext',JSON.stringify(dataInfo))
@@ -394,7 +394,7 @@
 	    url: `/pages/searchDept/searchDept?type=repair&branchId=${dataInfo.branch}`
 	  })
 	}
-	
+
   // 获取报修科室列表
   function getRepairTypes(){
     uni.showLoading({
@@ -422,7 +422,7 @@
 			}
     })
   }
-  
+
   // 获取楼栋
   function getbuildingList(){
     uni.showLoading({
@@ -446,7 +446,7 @@
 		    }));
 		  });
   }
-  
+
   // 获取科室地点
   function getAddressList(){
     uni.showLoading({
@@ -466,11 +466,11 @@
   	    dataInfo.addressList = res.list || [];
   	  });
   }
-  
+
 	function areaChange(e){
 		getPlaceList(dataInfo.areaId)
 	}
-	
+
 	// 获取楼层
 	function getPlaceList(e){
 	  let postData = {
@@ -481,7 +481,7 @@
 				hosId:dataInfo.branch
 			}
 	  };
-		
+
 		getFetchDataList("simple/data", "floor", postData)
 		  .then((res) => {
 				uni.hideLoading();
@@ -492,13 +492,13 @@
 		    }));
 		  });
 	}
-	
+
   // 提交
   function submit(){
 		isSubmit.value = true;
     submitHandler()
   }
-  
+
   // 处理提交事件
    async function handlerOrder(){
 		let postData = {
@@ -512,26 +512,25 @@
       let result = await api_departmentDetail(dataInfo.department);
       let deptDTO = result.data || {};
       postData.incident.place.id = deptDTO.floor ? deptDTO.floor.id : undefined;
-      postData.incident.houseNumber = deptDTO.address || undefined;
 		}else if(dataInfo.tabActiveValue === 'overtime'){
 			let data = repairIncident.value.find(i=>i.value=='public')
 			dataInfo.incidentData.repairIncidentType.id = data.id
 			postData.incident.place.id = dataInfo.placeId;
-      postData.incident.houseNumber = dataInfo.address;
 		}
     dataInfo.incidentData.department.id = dataInfo.department
     postData.incident.description = dataInfo.description;
 		if(dataInfo.serverId){
 			postData.serverId = dataInfo.serverId;
 		}else{
-			delete postData.serverId 
+			delete postData.serverId
 		}
     postData.incident.assetId = dataInfo.assetId;
+    postData.incident.houseNumber = dataInfo.address;
 		postData.incident.contacts = dataInfo.contacts;
 		postData.incident.contactsInformation = dataInfo.contactsInformation;
 		postData.incident.hosId = dataInfo.branch;
 		let repairsType = uni.getStorageSync('repairsType')
-		// postData.incident.buildId = dataInfo.areaId; //areaId:楼栋   
+		// postData.incident.buildId = dataInfo.areaId; //areaId:楼栋
   //   postData.incident.floorId = dataInfo.placeId;//placeId:楼层
 		// buildId
 		// floorId
@@ -619,13 +618,13 @@
 		})
 
   }
-  
+
   // 处理图片
   function handlerOrderImg(imgObj){
 		let allData = null
 		if(imgObj.extname=='mp4' ||
-			imgObj.extname=='avi' || 
-			imgObj.extname=='mpeg' || 
+			imgObj.extname=='avi' ||
+			imgObj.extname=='mpeg' ||
 			imgObj.extname=='wmv'){
 				allData = uploadFile(imgObj, 'wechatIncidentVideo', dataInfo.incidentId)
 			}else{
@@ -633,7 +632,7 @@
 			}
 		return allData
   }
-  
+
   // 处理提交
   function submitHandler(){
     console.log(dataInfo);
@@ -653,7 +652,7 @@
 			  });
 			  return;
 			}
-			
+
 			if(dataInfo.areaId==''){
 			  uni.showToast({
 			  	icon: 'none',
@@ -661,7 +660,7 @@
 			  });
 			  return;
 			}
-			
+
 			if(dataInfo.placeId==''){
 			  uni.showToast({
 			  	icon: 'none',
@@ -678,7 +677,7 @@
       });
       return;
     }
-    
+
     if(dataInfo.contacts==''){
       uni.showToast({
       	icon: 'none',
@@ -686,7 +685,7 @@
       });
       return;
     }
-    
+
     if(dataInfo.contactsInformation==''){
       uni.showToast({
       	icon: 'none',
@@ -701,14 +700,14 @@
     });
 		handlerOrder()
   }
-	
+
 	// 获取文本内容
 	function getHtml(html) {
 	  const tempDiv = document.createElement('div');
 	  tempDiv.innerHTML = html;
 	  return tempDiv.textContent || tempDiv.innerText || '';
 	}
-	
+
   onLoad((option) => {
 		initForm()
     getIncidentDetail();