zhaomin 3 anos atrás
pai
commit
f962fe74e7

+ 16 - 3
CallCenterWeb.UI/RMYYAPP/pages/index/index.vue

@@ -76,9 +76,22 @@
76 76
 											url: '/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail?wid=' + this.wid+ '&segmenter=1' +'&sms_id='+ this.wid
77 77
 										});
78 78
 									}else{
79
-										uni.reLaunch({
80
-											url: '/pages/myTask/myTask'
81
-										});
79
+										this.$mStore.dispatch("GetInfo").then((e)=>{
80
+											uni.setStorageSync('roleCode', e.data.Role.F_RoleCode)
81
+											uni.setStorageSync('userName', e.data.User.F_UserName)
82
+											if(e.data.Dept){
83
+												uni.setStorageSync('deptId', e.data.Dept.F_DeptId)
84
+												uni.setStorageSync('deptName', e.data.Dept.F_DeptName)
85
+											}
86
+											
87
+											uni.setStorageSync('userCode', e.data.User.F_UserCode)
88
+											
89
+											const code = uni.getStorageSync("roleCode"); 
90
+											uni.reLaunch({
91
+												url: '/pages/myTask/myTask'
92
+											});
93
+										})
94
+										
82 95
 									}
83 96
 								} else {
84 97
 									this.$mHelper.toast(res.message)

+ 10 - 7
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

@@ -28,10 +28,9 @@
28 28
 				<text class="contentTitle">申请人员:</text>
29 29
 				<text class="contentText">{{ detailContentData.applicantname}}</text>
30 30
 			</view>
31
-			<view class="contentTable">
31
+			<view class="contentTable" >
32 32
 				<text class="contentTitle">联系电话:</text>
33
-				<text class="contentText">{{ detailContentData.F_Phone}} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
34
-				
33
+				<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_Phone}} <uni-icons @click="callHandle(detailContentData.F_Phone)" class="frContentText" type="phone" size="30"></uni-icons></text>	
35 34
 			</view>
36 35
 			<view class="contentTable">
37 36
 				<view class="contentTitle">工单内容:</view>
@@ -55,7 +54,11 @@
55 54
 			</view>
56 55
 			<view class="contentTable">
57 56
 				<text class="contentTitle">接单人员:</text>
58
-				<text class="contentText" v-if="detailContentData.DealManName">{{ detailContentData.DealManName + '('+detailContentData.DealManPhone+')'}}</text>
57
+				<text class="contentText" v-if="detailContentData.DealManName">{{ detailContentData.DealManName }}</text>
58
+			</view>
59
+			<view class="contentTable">
60
+				<text class="contentTitle">联系电话:</text>
61
+				<text class="contentText" style="margin-top: -5px;">{{ detailContentData.DealManPhone}} <uni-icons @click="callHandle(detailContentData.DealManPhone)" class="frContentText" type="phone" size="30" v-if="detailContentData.DealManPhone"></uni-icons></text>	
59 62
 			</view>
60 63
 			<view class="contentTable">
61 64
 				<text class="contentTitle">接单时间:</text>
@@ -255,13 +258,13 @@
255 258
 			this.roleCode = uni.getStorageSync("roleCode")
256 259
 		},
257 260
 		methods: {
258
-			callHandle(e){
259
-				if(!this.detailContentData.F_Phone) {
261
+			callHandle(phone){
262
+				if(!phone) {
260 263
 					this.$mHelper.toast('无号码信息')
261 264
 					return
262 265
 				}
263 266
 				uni.makePhoneCall({
264
-					phoneNumber:this.detailContentData.F_Phone //仅为示例
267
+					phoneNumber:phone //仅为示例
265 268
 				})
266 269
 			},
267 270
 			getButtons() {

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/pages/myTask/consultList/consultDetail/consultDetail.vue

@@ -39,7 +39,7 @@
39 39
 			</view>
40 40
 			<view class="contentTable">
41 41
 				<text class="contentTitle">联系电话:</text>
42
-				<text class="contentText">{{ detailContentData.F_Phon  }} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
42
+				<text class="contentText"  style="margin-top: -5px;">{{ detailContentData.F_Phon  }} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
43 43
 			</view>
44 44
 			<view class="contentTable">
45 45
 				<text class="contentTitle">身份证号:</text>

+ 0 - 380
CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask2.vue

@@ -1,380 +0,0 @@
1
-<template>
2
-	<page-meta :root-font-size="getFontSizeValue"></page-meta>
3
-	<view>
4
-		<view class="uni-margin-wrap">
5
-			<swiper class="swiper" circular :indicator-dots="indicatorDots" :autoplay="autoplay" :interval="interval"
6
-				:duration="duration">
7
-				<swiper-item v-for="item in bannnerData" :key="item.id">
8
-					<image :src="item.imgPath" mode=""></image>
9
-				</swiper-item>
10
-			</swiper>
11
-		</view>
12
-
13
-		<view class="orderManage">
14
-			<view class="orderTit" style="padding-left: 15px;color: rgb(126, 131, 125);">
15
-				<text
16
-					style="width: 4px;background-color: rgb(26, 188, 156);height: 20px;margin-top: 10px;margin-right: 5px;"></text>
17
-				<text>工单模块</text>
18
-			</view>
19
-
20
-			<view class="orderCon">
21
-				<view class="orderList" v-for="item in orderListData" :key="item.id" @click="workOrderListClick(item)">
22
-					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
23
-					<text>{{ item.text }}</text>
24
-				</view>
25
-			</view>
26
-
27
-			<view class="orderTit" @click="changeStore" v-if="noticState">
28
-				<image style="background: #ff9600" src="/static/icon_noticefi.png"></image>
29
-				<text>公告通知</text>
30
-			</view>
31
-
32
-			<view class="notification">
33
-				<view class="notifiList" v-for="item in noticListData" :key="item.id">
34
-					<image :style="{ background: item.imageBg }" :src="item.imagePath" mode=""></image>
35
-					<view class="">
36
-						<text>{{ item.textTit }}</text>
37
-						<text>{{ item.textCon }}</text>
38
-					</view>
39
-				</view>
40
-			</view>
41
-		</view>
42
-	</view>
43
-</template>
44
-<script>
45
-	import {
46
-		getCode
47
-	} from '@/utils/dd'
48
-	import {
49
-		mapGetters
50
-	} from "vuex"
51
-	import store from '@/store';
52
-	import {
53
-		getToken
54
-	} from '@/utils/auth'
55
-	export default {
56
-		data() {
57
-			return {
58
-				ddcode: '',
59
-				indicatorDots: true,
60
-				getFontSizeValue: '1rem',
61
-				autoplay: true,
62
-				interval: 2000,
63
-				noticState: false,
64
-				duration: 500,
65
-				bannnerData: [],
66
-				orderListData: [],
67
-				noticListData: [],
68
-			}
69
-		},
70
-		computed: {
71
-			...mapGetters(["State"]),
72
-		},
73
-		onLoad() {
74
-			this.init()
75
-			this.getFontSizeValue = uni.getStorageSync('fontSizeValue') + 'rem'
76
-			// this.getFontSizeValue = '1.5rem'
77
-			if (uni.getStorageSync("roleCode") === "APRY") {
78
-				uni.hideTabBar()
79
-			}
80
-			// uni.hideTabBar()
81
-		},
82
-		methods: {
83
-			init() {
84
-				// 钉钉免登录
85
-				getCode(code => {
86
-					if (code !== 'fail' && code !== 'start') {
87
-						this.$http.post("Home/Dinglogin", {
88
-							code: code
89
-						}).then((res) => {
90
-							if (res.state.toLowerCase() == 'success') {
91
-								uni.setStorageSync('token', res.data)
92
-								
93
-							} else {
94
-								this.$mHelper.toast(res.message)
95
-								return
96
-							}
97
-							this.$mStore.dispatch("GetInfo").then((e) => {
98
-								if (e.state == 'notoken') {
99
-									uni.reLaunch({
100
-										url: '/pages/login/login'
101
-									});
102
-									return
103
-								}
104
-								uni.setStorageSync('roleCode', e.data.Role.F_RoleCode)
105
-								uni.setStorageSync('userName', e.data.User.F_UserName)
106
-								if (e.data.Dept) {
107
-									uni.setStorageSync('deptId', e.data.Dept.F_DeptId)
108
-									uni.setStorageSync('deptName', e.data.Dept.F_DeptName)
109
-								}
110
-								uni.setStorageSync('userCode', e.data.User.F_UserCode)
111
-								this.getMenuPermissions()
112
-							})
113
-						})
114
-					} else {
115
-						this.$mStore.dispatch("GetInfo").then((e) => {
116
-							if (e.state.toLowerCase() == 'notoken') {
117
-								uni.reLaunch({
118
-									url: '/pages/login/login'
119
-								});
120
-							} else {
121
-								this.bannnerData = this.$mConstDataConfig.bannnerData
122
-								this.getMenuPermissions() //获取用户权限
123
-							}
124
-						})
125
-					}
126
-				})
127
-
128
-				// #ifdef APP-PLUS
129
-				let timer
130
-				timer = setInterval(() => {
131
-					plus.push.getClientInfoAsync((info) => {
132
-						let cid = info["clientid"];
133
-						if (cid) {
134
-							clearInterval(timer)
135
-							this.clienGet(cid) //获取cid 
136
-						}
137
-					});
138
-				}, 5000)
139
-
140
-				this.upData()
141
-				// #endif
142
-
143
-			},
144
-
145
-			changeStore() {
146
-				this.$mStore.dispatch("STATE", 3)
147
-			},
148
-			workOrderListClick(item) {
149
-				uni.navigateTo({
150
-					url: item.navigateToUrl,
151
-				})
152
-			},
153
-			clienGet(cid) {
154
-
155
-				let apptype
156
-				if (plus.device.model.indexOf('iPhone') > -1) {
157
-					apptype = 2;
158
-				} else {
159
-					apptype = 1;
160
-				}
161
-				const params = {
162
-					apptype: apptype,
163
-					clientid: cid,
164
-					token: uni.getStorageSync("token"),
165
-				}
166
-				this.$http.get("PushMessage/PutAppClientIdAsync", params).then((response) => {
167
-						if (response.state.toLowerCase() === "success") {
168
-							let data = response.message
169
-						}
170
-
171
-					})
172
-					.catch((e) => {
173
-						console.log(e)
174
-					})
175
-
176
-			},
177
-			upData() {
178
-				plus.runtime.getProperty(plus.runtime.appid, function(wgtinfo) {
179
-					uni.setStorageSync('versionCode', wgtinfo.version)
180
-				});
181
-				let typeUp = ''
182
-				if (plus.device.model.indexOf('iPhone') > -1) {
183
-					typeUp = 'ios';
184
-				} else {
185
-					typeUp = 'android';
186
-				}
187
-				const params = {
188
-					versionName: typeUp,
189
-				}
190
-				this.$http.get('/ApplicationsRefresh/GetAllList', params).then((response) => {
191
-					if (response.rows.length > 0) {
192
-						let data = response.rows
193
-						const nowVersionCode = uni.getStorageSync('versionCode')
194
-						const serveVersionCode = data[0].F_VersionCode
195
-						console.log(nowVersionCode + "---" + serveVersionCode)
196
-						if (nowVersionCode !== serveVersionCode) {
197
-							if (typeUp === 'android') {
198
-								uni.showModal({
199
-									title: '更新',
200
-									content: '是否更新',
201
-									success: function(res) {
202
-										if (res.confirm) {
203
-											plus.runtime.openURL(data[0].F_DownUrl);
204
-										} else if (res.cancel) {
205
-											this.$mHelper.toast("取消更新");
206
-										}
207
-									}
208
-								});
209
-							} else if (typeUp === 'ios') {
210
-								plus.runtime.openURL(
211
-									'https://apps.apple.com/cn/app/%E9%83%91%E5%B7%9E%E4%BA%BA%E6%B0%91%E5%8C%BB%E9%99%A2%E7%BB%BC%E5%90%88%E6%9C%8D%E5%8A%A1%E4%BF%9D%E9%9A%9C%E8%B0%83%E5%BA%A6%E5%B9%B3%E5%8F%B0/id6444557705'
212
-								);
213
-							}
214
-
215
-
216
-						}
217
-
218
-					}
219
-				}).catch((e) => {
220
-					console.log(e);
221
-				})
222
-			},
223
-
224
-			getMenuPermissions() {
225
-				let code = uni.getStorageSync("roleCode")
226
-				this.$http.get("InternalMessages/GetCount").then((response) => {
227
-						if (response.state.toLowerCase() === "success") {
228
-							if (response.IsRead == 1) {
229
-								uni.showTabBarRedDot({
230
-									index: 2
231
-								})
232
-							} else {
233
-								uni.hideTabBarRedDot({
234
-									index: 2
235
-								})
236
-							}
237
-						}
238
-
239
-					})
240
-					.catch((e) => {
241
-						console.log(e)
242
-					})
243
-				/* 
244
-        GLY:管理员
245
-				*/
246
-				if (code === 'WXY' || code === 'WXBZZ') {
247
-					this.orderListData = this.$mConstDataConfig.roleListData.UnitList
248
-				} else if (code === "DDZX") {
249
-					this.orderListData = this.$mConstDataConfig.roleListData.dispatchList
250
-				} else if (code === "GQY") {
251
-					this.orderListData = this.$mConstDataConfig.roleListData.AttendantList
252
-				} else if (code === "SJ") {
253
-					this.orderListData = this.$mConstDataConfig.roleListData.driverList
254
-				} else if (code === 'jcgn') {
255
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
256
-				} else if (code === 'APRY') {
257
-					this.orderListData = this.$mConstDataConfig.roleListData.driverList
258
-				} else if (code === 'BMXG') {
259
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
260
-				} else if (code === 'GLY') {
261
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
262
-				}
263
-			},
264
-		},
265
-	}
266
-</script>
267
-
268
-<style lang="scss">
269
-	.uni-margin-wrap {
270
-		width: 690rpx;
271
-		width: 100%;
272
-	}
273
-
274
-	.swiper {
275
-		height: 225px;
276
-
277
-		image {
278
-			width: 100%;
279
-			height: 100%;
280
-		}
281
-	}
282
-
283
-	.orderManage {
284
-		.orderTit {
285
-			margin-top: 15rpx;
286
-			width: 100%;
287
-			height: 80rpx;
288
-			line-height: 80rpx;
289
-			background: #ffffff;
290
-			display: flex;
291
-			border-bottom: 1rpx solid #eeeeee;
292
-
293
-			text {
294
-				font-size: 1rem;
295
-			}
296
-
297
-			image {
298
-				width: 24rpx;
299
-				height: 24rpx;
300
-				padding: 8rpx;
301
-				border-radius: 12px;
302
-				background: #1972c2;
303
-				margin: 20rpx 10rpx 20rpx 26rpx;
304
-			}
305
-		}
306
-
307
-		.orderCon {
308
-			background: #ffffff;
309
-			display: flex;
310
-			flex-wrap: wrap;
311
-
312
-			.orderList {
313
-				width: 186rpx;
314
-				height: 206rpx;
315
-				text-align: center;
316
-				border-right: 2rpx solid #eeeeee;
317
-				border-bottom: 2rpx solid #eeeeee;
318
-
319
-				image {
320
-					width: 40rpx;
321
-					height: 40rpx;
322
-					margin: 0 auto;
323
-					display: block;
324
-					border-radius: 35rpx;
325
-					padding: 15rpx;
326
-					margin-top: 45rpx;
327
-				}
328
-
329
-				text {
330
-					line-height: 60rpx;
331
-				}
332
-			}
333
-
334
-			.orderList:nth-child(4n + 4) {
335
-				border-right: none;
336
-			}
337
-
338
-			.orderList:last-child {
339
-				border-right: none;
340
-			}
341
-		}
342
-
343
-		.notification {
344
-			background: #ffffff;
345
-			margin-bottom: 100rpx;
346
-			display: flex;
347
-			flex-wrap: wrap;
348
-			border-bottom: 1rpx solid #eeeeee;
349
-
350
-			.notifiList {
351
-				width: 375rpx;
352
-				height: 172rpx;
353
-				padding: 46rpx 30rpx 46rpx 30rpx;
354
-				text-align: left;
355
-				border-right: 1rpx solid #eeeeee;
356
-				border-bottom: 1rpx solid #eeeeee;
357
-				box-sizing: border-box;
358
-				display: flex;
359
-
360
-				image {
361
-					width: 48rpx;
362
-					height: 48rpx;
363
-					box-sizing: border-box;
364
-					border-radius: 24rpx;
365
-					padding: 10rpx;
366
-					margin: 19rpx;
367
-				}
368
-
369
-				text {
370
-					font-size: 24rpx;
371
-					line-height: 30rpx;
372
-				}
373
-			}
374
-
375
-			.notifiList:nth-child(2n + 2) {
376
-				border-right: none;
377
-			}
378
-		}
379
-	}
380
-</style>

+ 82 - 67
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -1,72 +1,81 @@
1 1
 <template>
2
-	<page-meta :root-font-size="getFontSizeValue"></page-meta>
3
-	<view class="wrapper">
4
-
5
-		<view class="uniStep" v-if="listFlag">
6
-			<uni-steps :options="list1" :active="active" />
7
-		</view>
8
-
9
-		<view class="detailContent">
10
-			<view class="contentTable">
11
-				<text class="contentTitle">工单编号:</text>
12
-				<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
13
-			</view>
14
-			<view class="contentTable">
15
-				<text class="contentTitle">工单类型:</text>
16
-				<text
17
-					class="contentText">{{ $mHelper.findParents(orderTypeList,detailContentData.F_Type)}}</text>
18
-			</view>
19
-			<view class="contentTable">
20
-				<text class="contentTitle">申请科室:</text>
21
-				<text class="contentText">{{ detailContentData.F_ProposerDeptName }}</text>
22
-			</view>
23
-			<view class="contentTable">
24
-				<text class="contentTitle">申请时间:</text>
25
-				<text class="contentText">{{ detailContentData.F_CreateTime }}</text>
26
-			</view>
27
-			<view class="contentTable">
28
-				<text class="contentTitle">联系电话:</text>
29
-				<text class="contentText">{{ detailContentData.F_Phon  }}<uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
30
-			</view>
31
-			<view class="contentTable">
32
-				<text class="contentTitle">申请人员:</text>
33
-				<text class="contentText">{{ detailContentData.F_ProposerCode }}</text>
34
-			</view>
35
-			<view class="contentTable">
36
-				<text class="contentTitle">工单内容:</text>
37
-				<text class="contentText">{{ detailContentData.F_Content }}</text>
38
-			</view>
39
-
40
-			<view class="contentTable">
41
-				<text class="contentTitle">出发地点:</text>
42
-				<text class="contentText">{{ detailContentData.F_DepartPlace }}</text>
43
-			</view>
44
-			<view class="contentTable">
45
-				<text class="contentTitle">出发地点:</text>
46
-				<text class="contentText">{{ detailContentData.F_Destination }}</text>
47
-			</view>
48
-
49
-			<view class="contentTable">
50
-				<text class="contentTitle">车牌号码:</text>
51
-				<text class="contentText">{{ detailContentData.F_CarMessage }}</text>
52
-			</view>
53
-			<view class="contentTable">
54
-				<text class="contentTitle">用车时间:</text>
55
-				<text class="contentText">{{ detailContentData.F_UseTime }}</text>
2
+	<view>
3
+		<page-meta :root-font-size="getFontSizeValue"></page-meta>
4
+		<view class="wrapper">
5
+		
6
+			<view class="uniStep" v-if="listFlag">
7
+				<uni-steps :options="list1" :active="active" />
56 8
 			</view>
57
-			<view class="contentTable">
58
-				<text class="contentTitle">是否出生:</text>
59
-				<text class="contentText">{{ detailContentData.F_Birth }}</text>
9
+		
10
+			<view class="detailContent">
11
+				<view class="contentTable">
12
+					<text class="contentTitle">工单编号:</text>
13
+					<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
14
+				</view>
15
+				<view class="contentTable">
16
+					<text class="contentTitle">工单类型:</text>
17
+					<text
18
+						class="contentText">{{ $mHelper.findParents(orderTypeList,detailContentData.F_Type)}}</text>
19
+				</view>
20
+				<view class="contentTable">
21
+					<text class="contentTitle">申请科室:</text>
22
+					<text class="contentText">{{ $mHelper.findParents(departList,detailContentData.F_ProposerDeptId) }}</text>
23
+				</view>
24
+				<view class="contentTable">
25
+					<text class="contentTitle">申请时间:</text>
26
+					<text class="contentText">{{ detailContentData.F_CreateTime }}</text>
27
+				</view>
28
+				<view class="contentTable">
29
+					<text class="contentTitle">申请人员:</text>
30
+					<text class="contentText">{{ $mHelper.findUserName(userCodeList, detailContentData.F_ProposerCode ) }}</text>
31
+				</view>
32
+				<view class="contentTable">
33
+					<text class="contentTitle">联系电话:</text>
34
+					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_Phon  }}<uni-icons @click="callHandle(detailContentData.F_Phon)" class="frContentText" type="phone" size="30"></uni-icons></text>
35
+				</view>
36
+				<view class="contentTable">
37
+					<text class="contentTitle">工单内容:</text>
38
+					<text class="contentText">{{ detailContentData.F_Content }}</text>
39
+				</view>
40
+				<view class="contentTable">
41
+					<text class="contentTitle">司机姓名:</text>
42
+					<text class="contentText">{{ detailContentData.F_DriverName }}</text>
43
+				</view>
44
+				<view class="contentTable">
45
+					<text class="contentTitle">联系方式:</text>
46
+					<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_DriverPhon }} <uni-icons @click="callHandle(detailContentData.F_DriverPhon)" class="frContentText" type="phone" size="30" v-if="detailContentData.F_DriverPhon"></uni-icons></text>
47
+				</view>
48
+				<view class="contentTable">
49
+					<text class="contentTitle">出发地点:</text>
50
+					<text class="contentText">{{ detailContentData.F_DepartPlace }}</text>
51
+				</view>
52
+				<view class="contentTable">
53
+					<text class="contentTitle">出发地点:</text>
54
+					<text class="contentText">{{ detailContentData.F_Destination }}</text>
55
+				</view>
56
+		
57
+				<view class="contentTable">
58
+					<text class="contentTitle">车牌号码:</text>
59
+					<text class="contentText">{{ detailContentData.F_CarMessage }}</text>
60
+				</view>
61
+				<view class="contentTable">
62
+					<text class="contentTitle">用车时间:</text>
63
+					<text class="contentText">{{ detailContentData.F_UseTime }}</text>
64
+				</view>
65
+				<view class="contentTable">
66
+					<text class="contentTitle">是否出生:</text>
67
+					<text class="contentText">{{ detailContentData.F_Birth }}</text>
68
+				</view>
60 69
 			</view>
61
-		</view>
62
-
63
-		<view class="operationButton" v-show="orderButtonData.length != 0">
64
-			<view>
65
-				<text class="operationButtonTitle">操作</text>
66
-				<buttonsComponents class="buttons" :order-button-data="orderButtonData" :fid="fId" :wid="workorderid"/>
70
+		
71
+			<view class="operationButton" v-show="orderButtonData.length != 0">
72
+				<view>
73
+					<text class="operationButtonTitle">操作</text>
74
+					<buttonsComponents class="buttons" :order-button-data="orderButtonData" :fid="fId" :wid="workorderid"/>
75
+				</view>
67 76
 			</view>
77
+		
68 78
 		</view>
69
-
70 79
 	</view>
71 80
 </template>
72 81
 
@@ -98,6 +107,9 @@
98 107
 			}
99 108
 		},
100 109
 		onLoad(optioin) {
110
+			pageData.getDet((res, data) => {
111
+				this.departList = data
112
+			})
101 113
 			this.getGongDanType()
102 114
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem' 
103 115
 			this.workorderid = optioin.wid 
@@ -130,13 +142,13 @@
130 142
 					}
131 143
 				})
132 144
 			},
133
-			callHandle(e){
134
-				if(!this.detailContentData.F_Phon) {
145
+			callHandle(phone){
146
+				if(!phone) {
135 147
 					this.$mHelper.toast('无号码信息')
136 148
 					return
137 149
 				}
138 150
 				uni.makePhoneCall({
139
-					phoneNumber:this.detailContentData.F_Phon //仅为示例
151
+					phoneNumber:phone //仅为示例
140 152
 				})
141 153
 			},
142 154
 			getDetail(type) {
@@ -205,6 +217,9 @@
205 217
 								this.orderButtonData = this.workOrderButton
206 218
 							});
207 219
 						}
220
+						pageData.getApplicant(this.detailContentData.F_ProposerDeptId, (res) => {
221
+							this.userCodeList = res
222
+						})
208 223
 						
209 224
 					}
210 225
 				}).catch((e) => {

+ 18 - 10
CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -37,7 +37,7 @@
37 37
 			</view>
38 38
 			<view class="contentTable">
39 39
 				<text class="contentTitle">联系电话:</text>
40
-				<text class="contentText">{{ detailContentData.F_Phone }} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
40
+				<text class="contentText" style="margin-top: -5px;">{{ detailContentData.F_Phone }} <uni-icons @click="callHandle(detailContentData.F_Phone)" class="frContentText" type="phone" size="30"></uni-icons></text>
41 41
 			</view>
42 42
 			<view class="contentTable">
43 43
 				<view class="contentTitle">报修内容:</view>
@@ -50,8 +50,11 @@
50 50
 			</view>
51 51
 			<view class="contentTable">
52 52
 				<text class="contentTitle">维修人员:</text>
53
-				<text
54
-					class="contentText">{{ $mHelper.findUserName(userCodeList,detailContentData.F_Maintenancer) }}</text>
53
+				<text class="contentText">{{ detailContentData.MaintenancerName}}</text>
54
+			</view>
55
+			<view class="contentTable">
56
+				<text class="contentTitle">联系方式:</text>
57
+				<text class="contentText" style="margin-top: -5px;">{{ detailContentData.MaintenancerPhone }} <uni-icons @click="callHandle(detailContentData.MaintenancerPhone)" class="frContentText" type="phone" size="30" v-if="detailContentData.MaintenancerPhone"></uni-icons></text>
55 58
 			</view>
56 59
 			<view class="contentTable">
57 60
 				<text class="contentTitle">紧急程度:</text>
@@ -74,7 +77,7 @@
74 77
 				<text class="contentText">{{ backCon }}</text>
75 78
 			</view>
76 79
 			<view class="contentTable">
77
-				<text class="contentTitle">图&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;片:</text>
80
+				<text class="contentTitle">图<span class="place"></span>片:</text>
78 81
 			
79 82
 				<view class="contentText" style="margin-top: 10px;">
80 83
 					<uni-file-picker readonly :value="getFileData(detailContentData.FileUrl)" :imageStyles="imageStyles" file-mediatype="image" />
@@ -158,7 +161,7 @@
158 161
 							<text class="contentText">{{ item.F_ExceptionTypeName }}</text>
159 162
 						</view>
160 163
 						<view class="contentTable">
161
-							<text class="contentTitle">附&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;件:</text>
164
+							<text class="contentTitle">附<span class="place"></span>件:</text>
162 165
 							<uni-file-picker readonly :value="getFileData(item.FileUrl)" :imageStyles="imageStyles"
163 166
 								file-mediatype="image" />
164 167
 						</view>
@@ -183,11 +186,11 @@
183 186
 							<text class="contentText">{{ $mHelper.findParents(departList,item.F_MaintenanceDept)}}</text>
184 187
 						</view>
185 188
 						<view class="contentTable">
186
-							<text class="contentTitle">状&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;态:</text>
189
+							<text class="contentTitle">状<span class="place"></span>态:</text>
187 190
 							<text class="contentText">{{ item.StateName }}</text>
188 191
 						</view>
189 192
 						<view class="contentTable">
190
-							<text class="contentTitle">内&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;容:</text>
193
+							<text class="contentTitle">内<span class="place"></span>容:</text>
191 194
 							<text class="contentText">{{ item.F_Content }}</text>
192 195
 						</view>
193 196
 						<view class="contentTable">
@@ -365,13 +368,13 @@
365 368
 					}
366 369
 				})
367 370
 			},
368
-			callHandle(e){
369
-				if(!this.detailContentData.F_Phone) {
371
+			callHandle(phone){
372
+				if(!phone) {
370 373
 					this.$mHelper.toast('无号码信息')
371 374
 					return
372 375
 				}
373 376
 				uni.makePhoneCall({
374
-					phoneNumber:this.detailContentData.F_Phone //仅为示例
377
+					phoneNumber:phone //仅为示例
375 378
 				})
376 379
 			},
377 380
 			getButtons() {
@@ -546,6 +549,11 @@
546 549
 					text-align: right;
547 550
 				}
548 551
 				
552
+				.place{
553
+					display: inline-block;
554
+					width: 32px;
555
+				}
556
+				
549 557
 				.frContentText{
550 558
 					font-size: 25px !important;
551 559
 					color: #1e90ff !important;