seimin 2 månader sedan
förälder
incheckning
ab2b4f3e30
2 ändrade filer med 9 tillägg och 13 borttagningar
  1. 2 2
      manifest.json
  2. 7 11
      pages/repair/rapidRepNext.vue

+ 2 - 2
manifest.json

@@ -62,8 +62,8 @@
62
         "devServer" : {
62
         "devServer" : {
63
             "proxy" : {
63
             "proxy" : {
64
                 "/service" : {
64
                 "/service" : {
65
-                    // "target" : "http://192.168.3.108", //请求的目标域名
66
-                    "target" : "http://192.168.4.163", //宋程玉本地
65
+                    "target" : "http://192.168.3.108", //请求的目标域名
66
+                    // "target" : "http://192.168.4.163", //宋程玉本地
67
                     // "target" : "http://192.168.4.105", //程肖本地
67
                     // "target" : "http://192.168.4.105", //程肖本地
68
                     "changeOrigin" : true, //是否跨域
68
                     "changeOrigin" : true, //是否跨域
69
                     "secure" : false
69
                     "secure" : false

+ 7 - 11
pages/repair/rapidRepNext.vue

@@ -54,14 +54,14 @@
54
 
54
 
55
       <!-- 公共报修 -->
55
       <!-- 公共报修 -->
56
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
56
       <template v-if="dataInfo.tabActiveValue === 'overtime'">
57
-				<view class="form_item" v-if="isRepair.valueconfig==1 && hospitalModel.valueconfig!=1">
57
+				<view class="form_item" v-if="hospitalModel.valueconfig!=1">
58
 				  <view class="title select"><text class="required newicon newicon-bitian"></text>院区:</view>
58
 				  <view class="title select"><text class="required newicon newicon-bitian"></text>院区:</view>
59
 					<uni-data-picker class="value" placeholder="请选择院区" @change="overDeptChange"
59
 					<uni-data-picker class="value" placeholder="请选择院区" @change="overDeptChange"
60
 						v-model="dataInfo.branch" :localdata="branchData"
60
 						v-model="dataInfo.branch" :localdata="branchData"
61
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.branch}">
61
 						:clear-icon="false" :class="{formRed: isSubmit && !dataInfo.branch}">
62
 					</uni-data-picker>
62
 					</uni-data-picker>
63
 				</view>
63
 				</view>
64
-       <view class="form_item" v-if="isRepair.valueconfig==1">
64
+       <view class="form_item">
65
          <view class="title select"><text class="required newicon newicon-bitian"></text>楼栋:</view>
65
          <view class="title select"><text class="required newicon newicon-bitian"></text>楼栋:</view>
66
        	<uni-data-picker class="value" placeholder="请选择楼栋" @change="areaChange"
66
        	<uni-data-picker class="value" placeholder="请选择楼栋" @change="areaChange"
67
        		v-model="dataInfo.areaId" :localdata="dataInfo.buildingTypeList"
67
        		v-model="dataInfo.areaId" :localdata="dataInfo.buildingTypeList"
@@ -69,7 +69,7 @@
69
        	</uni-data-picker>
69
        	</uni-data-picker>
70
        </view>
70
        </view>
71
 
71
 
72
-			 <view class="form_item" v-if="isRepair.valueconfig==1">
72
+			 <view class="form_item">
73
 			   <view class="title select"><text class="required newicon newicon-bitian"></text>楼层:</view>
73
 			   <view class="title select"><text class="required newicon newicon-bitian"></text>楼层:</view>
74
 			 	<uni-data-picker class="value" placeholder="请选择楼层"
74
 			 	<uni-data-picker class="value" placeholder="请选择楼层"
75
 			 		v-model="dataInfo.placeId" :localdata="dataInfo.placeTypeList"
75
 			 		v-model="dataInfo.placeId" :localdata="dataInfo.placeTypeList"
@@ -77,7 +77,7 @@
77
 			 	</uni-data-picker>
77
 			 	</uni-data-picker>
78
 			 </view>
78
 			 </view>
79
 
79
 
80
-       <view class="form_item column" v-if="isRepair.valueconfig==1">
80
+       <view class="form_item column">
81
        	<view class="title"><text class="required newicon newicon-bitian"></text>详细地址:</view>
81
        	<view class="title"><text class="required newicon newicon-bitian"></text>详细地址:</view>
82
        	<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.address}" />
82
        	<uni-easyinput class="value" type="textarea" v-model="dataInfo.address" placeholder="请输入详细地址" :class="{formRed: isSubmit && !dataInfo.address}" />
83
        </view>
83
        </view>
@@ -337,7 +337,9 @@
337
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
337
 		isDept.value = data.find(i=>i.keyconfig=='deptRepair')
338
 		isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
338
 		isRepair.value = data.find(i=>i.keyconfig=='publicRepair')
339
 		hospitalModel.value = data.find(i=>i.keyconfig=='hospitalModel')
339
 		hospitalModel.value = data.find(i=>i.keyconfig=='hospitalModel')
340
-		if(isDept.value.valueconfig==1 && isRepair.value.valueconfig==1){
340
+    console.log('isDept', isDept.value, isDept.value.valueconfig == 1)
341
+    console.log('isRepair', isRepair.value, isRepair.value.valueconfig == 1)
342
+		if((isDept.value.valueconfig==1 && isRepair.value.valueconfig==1) || (isDept.value.valueconfig==0 && isRepair.value.valueconfig==0) || (!isDept.value.valueconfig && !isRepair.value.valueconfig)){
341
 			dataInfo.tabs = [
343
 			dataInfo.tabs = [
342
 				{id: 5, name: '科内报修', value: 'doing', num: ''},
344
 				{id: 5, name: '科内报修', value: 'doing', num: ''},
343
 				{id: 6, name: '公共报修', value: 'overtime', num: ''},
345
 				{id: 6, name: '公共报修', value: 'overtime', num: ''},
@@ -354,12 +356,6 @@
354
 			]
356
 			]
355
 			dataInfo.tabActiveValue = 'overtime'
357
 			dataInfo.tabActiveValue = 'overtime'
356
 			getbuildingList()
358
 			getbuildingList()
357
-		} else if (isDept.value.valueconfig==0 && isRepair.value.valueconfig==0){
358
-			dataInfo.tabs = [
359
-				{id: 5, name: '科内报修', value: 'doing', num: ''},
360
-				{id: 6, name: '公共报修', value: 'overtime', num: ''},
361
-			]
362
-			dataInfo.tabActiveValue = 'doing'
363
 		}
359
 		}
364
 		
360
 		
365
 
361