报修类型

manifest.json

@@ -62,14 +62,14 @@
         "devServer" : {
             "proxy" : {
                 "/service" : {
-                    "target" : "http://192.168.3.111", //请求的目标域名
-										// "target" : "http://192.168.4.163", //宋程玉本地
-										// "target" : "http://192.168.4.105", //程肖本地
+                    "target" : "http://192.168.3.108", //请求的目标域名
+                    // "target" : "http://192.168.4.163", //宋程玉本地
+                    // "target" : "http://192.168.4.105", //程肖本地
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 },
                 "/file" : {
-                    "target" : "http://192.168.3.111", //请求的目标域名
+                    "target" : "http://192.168.3.108", //请求的目标域名
                     "changeOrigin" : true, //是否跨域
                     "secure" : false
                 }

pages/incidentDetail/incidentDetail.vue

@@ -21,6 +21,10 @@
             <text class="value">{{dataInfo.incidentData.incidentsign || '无'}}</text>
           </view>
           <view class="deital_item">
+            <text class="name">报修类型：</text>
+            <text class="value">{{dataInfo.incidentData.repairIncidentType.name || '无'}}</text>
+          </view>
+          <view class="deital_item">
             <text class="name">故障现象：</text>
             <text class="value">{{dataInfo.incidentData.category ? dataInfo.incidentData.category.mutiCategory : '无'}}</text>
           </view>

pages/incidentList/incidentList.vue

@@ -15,8 +15,9 @@
         </view>
 
         <view class="body_item_content">
-          <view class="body_item_content_p" v-if="data.department">
-            <text class="name ellipsis">报修科室：{{data.department.dept}}</text>
+          <view class="body_item_content_p">
+            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'dept'">报修科室：{{data.department.dept}}</text>
+            <text class="name ellipsis" v-if="data.repairIncidentType.value === 'public'">报修类型：{{data.repairIncidentType.name}}</text>
             <view class="status" :style="stateStyle(data.state)">{{data.state ? data.state.name : ''}}</view>
           </view>
           <view class="body_item_content_p" v-if="data.place || data.houseNumber">

pages/repair/rapidRepNext.vue

@@ -38,7 +38,7 @@
 					<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址"  :class="{formRed: isSubmit && !dataInfo.address }" />
 				</view>
 				<view class="candidate">
-					<view class="candidate-item" v-for="item in addresData" :key="item" @click="itemAddres(item)">{{item.name}}</view>
+					<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}">
@@ -145,13 +145,6 @@
 	
 	const repairIncident = ref(null)
 	
-	const addresData = ref([
-		{name:'护士站'},
-		{name:'卫生间'},
-		{name:'更衣室'},
-		{name:'治疗室'}
-	])
-	
   // 数据
   const dataInfo = reactive({
     tabs: [
@@ -179,6 +172,7 @@
 		areaId:'',//楼栋
 		placeId:'',//楼层
 		branch:'', //院区
+		addressList: [], //科室地点
   })
   
 	
@@ -453,6 +447,26 @@
 		  });
   }
   
+  // 获取科室地点
+  function getAddressList(){
+    uni.showLoading({
+      title: "加载中",
+      mask: true,
+    });
+  	let postData = {
+  	  idx: 0,
+  	  sum: 10,
+  		qrCode:{
+        deptId: dataInfo.department,
+  		}
+  	};
+  	getFetchDataList("simple/data", "qrCode", postData)
+  	  .then((res) => {
+  			uni.hideLoading();
+  	    dataInfo.addressList = res.list || [];
+  	  });
+  }
+  
 	function areaChange(e){
 		getPlaceList(dataInfo.areaId)
 	}
@@ -699,6 +713,7 @@
   onLoad((option) => {
 		initForm()
     getIncidentDetail();
+    getAddressList();
   })
 </script>