miaofuhao лет назад: 2
Родитель
Сommit
8e54822c6b

+ 55 - 152
CallCenterWeb.UI/RMYYAPP/config/constData.config.js

@@ -11,6 +11,7 @@ export default {
11 11
 	}],
12 12
 	//任务列表数据
13 13
 	roleListData: {
14
+		// 司机工单
14 15
 		driverList: [{
15 16
 			id: "14",
16 17
 			imagePath: "../../static/icon_vehicleScheduling.png",
@@ -18,111 +19,6 @@ export default {
18 19
 			text: "司机列表", //WorkOrder/GetLDDealList
19 20
 			navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=0",
20 21
 		}],
21
-		// 管理员
22
-		administratorList: [
23
-
24
-
25
-			
26
-			{
27
-					id: "1",
28
-					imagePath: "../../static/icon_repair.png",
29
-					imageBg: "#fe940a",
30
-					text: "维修工单", //WorkOrder/GetLDDealList
31
-					navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
32
-				},
33
-			{
34
-				id: "2",
35
-				imagePath: "../../static/icon_leasing.png",
36
-				imageBg: "#ff7451",
37
-				text: "设备租赁", //WorkOrder/GetDWDealList
38
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=2&tab=7&state=&stingText=局委延时审核",
39
-			},
40
-			{
41
-				id: "3",
42
-				imagePath: "../../static/material_transfer.png",
43
-				imageBg: "#1ccd8d",
44
-				text: "物资转移", //WorkOrder/GetLDDealList
45
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=3&tab=0&state=6&segmenter=0&db=0&tobereply=1&stingText=已办待审核",
46
-			},
47
-			{
48
-				id: "4",
49
-				imagePath: "../../static/icon_bedTranshipment.png",
50
-				imageBg: "#1ccd8d",
51
-				text: "病床转移", //WorkOrder/GetLDDealList
52
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=11&state=6&segmenter=0&db=0&tobereply=1&stingText=退回重办审核",
53
-			},
54
-			{
55
-				id: "5",
56
-				imagePath: "../../static/icon_prescription.png",
57
-				imageBg: "#7068e2",
58
-				text: "红处方配送", //WorkOrder/GetZXDealList
59
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=3&tab=0&state=7&tobereply=1&db=0&segmenter=0&stingText=已办待回访",
60
-			},
61
-			{
62
-				id: "6",
63
-				imagePath: "../../static/icon_else.png",
64
-				imageBg: "#f26564",
65
-				text: "其他配送", //WorkOrder/GetLDDealList
66
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=1&state=&displayCallContent=1&stingText=正在办理",
67
-			},
68
-			{
69
-				id: "7",
70
-				imagePath: "../../static/icon_specimens.png",
71
-				imageBg: "#1ccd8d",
72
-				text: "急诊标本配送", //WorkOrder/GetList
73
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&stingText=工单查询",
74
-			},
75
-			{
76
-				id: "8",
77
-				imagePath: "../../static/icon_blood.png",
78
-				imageBg: "#f26564",
79
-				text: "血液制品配送", //WorkOrder/GetList
80
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&state=6&segmenter=1&isproresult=1&stingText=已办未果",
81
-			},
82
-			{
83
-				id: "9",
84
-				imagePath: "../../static/icon_serve.png",
85
-				imageBg: "#f26564",
86
-				text: "陪检服务", //WorkOrder/GetList
87
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=0&tab=&state=6&segmenter=1&isproresult=1&stingText=已办未果",
88
-			},
89
-			{
90
-				id: "10",
91
-				imagePath: "../../static/icon_takeBlood.png",
92
-				imageBg: "#1ccd8d",
93
-				text: "血站取血", //WorkOrder/GetLDDealList
94
-				navigateToUrl: "/pages/workOrderList/workOrderList?workOrderListType=1&tab=5&state=&stingText=已办结",
95
-			},
96
-			{
97
-					id: "11",
98
-					imagePath: "../../static/reppair.png",
99
-					imageBg: "#1ccd8d",
100
-					text: "故障报修", //WorkOrder/GetLDDealList
101
-					navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
102
-				},
103
-			{
104
-				id: "12",
105
-				imagePath: "../../static/icon_vehicleScheduling.png",
106
-				imageBg: "#1ccd8d",
107
-				text: "申请人列表", //WorkOrder/GetLDDealList
108
-				navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
109
-			},
110
-			{
111
-				id: "13",
112
-				imagePath: "../../static/consult.png",
113
-				imageBg: "#1ccd8d",
114
-				text: "咨询工单", //WorkOrder/GetLDDealList
115
-				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
116
-			},
117
-			{
118
-				id: "15",
119
-				imagePath: "../../static/consult.png",
120
-				imageBg: "#1ccd8d",
121
-				text: "综合调度", //WorkOrder/GetLDDealList
122
-				navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
123
-			},
124
-
125
-		],
126 22
 		// 维修员
127 23
 		UnitList: [{
128 24
 				id: "1",
@@ -156,38 +52,33 @@ export default {
156 52
 		// 基础工单
157 53
 		applyRepairList: [
158 54
 			{
159
-			id: "11",
160
-			imagePath: "../../static/reppair.png",
161
-			imageBg: "#1ccd8d",
162
-			text: "故障报修", //WorkOrder/GetLDDealList
163
-			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
164
-		}, 
165
-		// {
166
-		// 		id: "1",
167
-		// 		imagePath: "../../static/icon_repair.png",
168
-		// 		imageBg: "#fe940a",
169
-		// 		text: "维修工单", //WorkOrder/GetLDDealList
170
-		// 		navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
171
-		// },
172
-		{
173
-			id: "2",
174
-			imagePath: "../../static/consult.png",
175
-			imageBg: "#1ccd8d",
176
-			text: "咨询工单", //WorkOrder/GetLDDealList
177
-			navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
178
-		}, {
179
-			id: "3",
180
-			imagePath: "../../static/consult.png",
181
-			imageBg: "#1ccd8d",
182
-			text: "综合调度", //WorkOrder/GetLDDealList
183
-			navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
184
-		}, {
185
-				id: "12",
186
-				imagePath: "../../static/icon_vehicleScheduling.png",
55
+				id: "11",
56
+				imagePath: "../../static/reppair.png",
187 57
 				imageBg: "#1ccd8d",
188
-				text: "车辆调度", //WorkOrder/GetLDDealList
189
-				navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
190
-			}],
58
+				text: "故障报修", //WorkOrder/GetLDDealList
59
+				navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
60
+			}, 
61
+			{
62
+				id: "2",
63
+				imagePath: "../../static/consult.png",
64
+				imageBg: "#1ccd8d",
65
+				text: "咨询工单", //WorkOrder/GetLDDealList
66
+				navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
67
+			}, 
68
+			{
69
+				id: "3",
70
+				imagePath: "../../static/consult.png",
71
+				imageBg: "#1ccd8d",
72
+				text: "综合调度", //WorkOrder/GetLDDealList
73
+				navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
74
+			}, 
75
+			{
76
+					id: "12",
77
+					imagePath: "../../static/icon_vehicleScheduling.png",
78
+					imageBg: "#1ccd8d",
79
+					text: "车辆调度", //WorkOrder/GetLDDealList
80
+					navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
81
+		}],
191 82
 		// 调度员
192 83
 		dispatchList: [{
193 84
 				id: "11",
@@ -217,25 +108,37 @@ export default {
217 108
 			}
218 109
 		],
219 110
 		// 工勤员
220
-		AttendantList: [{
111
+		AttendantList: [
112
+			{
113
+				id: "1",
114
+				imagePath: "../../static/consult.png",
115
+				imageBg: "#1ccd8d",
116
+				text: "调度工单", //WorkOrder/GetLDDealList
117
+				navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=1",
118
+			},
119
+			{
120
+				id: "11",
121
+				imagePath: "../../static/reppair.png",
122
+				imageBg: "#1ccd8d",
123
+				text: "故障报修", //WorkOrder/GetLDDealList
124
+				navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
125
+			},
126
+			{
127
+					id: "12",
128
+					imagePath: "../../static/icon_vehicleScheduling.png",
129
+					imageBg: "#1ccd8d",
130
+					text: "车辆调度", //WorkOrder/GetLDDealList
131
+					navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
132
+		}],
133
+		// 调度主管
134
+		departManagerList: [{
221 135
 			id: "1",
222 136
 			imagePath: "../../static/consult.png",
223
-			imageBg: "#1ccd8d",
224
-			text: "综合调度", //WorkOrder/GetLDDealList
137
+			imageBg: "#fe940a",
138
+			text: "调度工单", //WorkOrder/GetLDDealList
225 139
 			navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=1",
226
-		},{
227
-			id: "11",
228
-			imagePath: "../../static/reppair.png",
229
-			imageBg: "#1ccd8d",
230
-			text: "故障报修", //WorkOrder/GetLDDealList
231
-			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=0",
232
-		},{
233
-				id: "12",
234
-				imagePath: "../../static/icon_vehicleScheduling.png",
235
-				imageBg: "#1ccd8d",
236
-				text: "车辆调度", //WorkOrder/GetLDDealList
237
-				navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
238
-			}]
140
+		}],
141
+			
239 142
 	},
240 143
 	//公告管理数据
241 144
 	noticListData: [{

+ 9 - 14
CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -91,21 +91,16 @@
91 91
 						uni.setStorageSync('userId', e.data.User.F_UserId.toString())
92 92
 						uni.setStorageSync('storageAllowUserDept', e.data.User.F_AllowDepartment)
93 93
 						const code = uni.getStorageSync("roleCode"); 
94
-						 // ||code == 'GLY' || code == 'DDZX'
95
-						if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || 
96
-						code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
97
-							this.getAllowDept()
98
-							// uni.switchTab({
99
-							// 	url: '/pages/myTask/myTask'
100
-							// });
101
-							if(!uni.getStorageSync('fontSizeValue')){
102
-								uni.setStorageSync('fontSizeValue', 1)
103
-							}
104
-							
105
-						}else{
106
-							this.$mHelper.toast("没有登录权限");
107
-							return;
94
+						this.getAllowDept()
95
+						if(!uni.getStorageSync('fontSizeValue')){
96
+							uni.setStorageSync('fontSizeValue', 1)
108 97
 						}
98
+						 // ||code == 'GLY' || code == 'DDZX'
99
+						// if(code == 'WXY' || code == 'DDZX'|| code == 'GLY' || code == 'jcgn'  || code == 'GQY' || 
100
+						// code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {}else{
101
+						// 	this.$mHelper.toast("没有登录权限");
102
+						// 	return;
103
+						// }
109 104
 					})
110 105
 				}).catch((e)=>{
111 106
 					this.isRotate = false

+ 17 - 53
CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -53,20 +53,6 @@
53 53
 								<uni-td align="center">{{ $mHelper.findParents(departList, item.deptid) }}</uni-td>
54 54
 							</uni-tr>
55 55
 						</uni-table>
56
-						<!-- <table class="equipmentInfo">
57
-							<thead style="background-color: #fafafa;">
58
-								<tr class="trCon">
59
-									<td class="tdCon">请选择</td>
60
-									<td class="tdCon">科室</td>
61
-								</tr>
62
-							</thead>
63
-							<tbody>
64
-								<tr class="trCon" v-for="(item,index) in allowData">
65
-									<td class="tdCon"><input :value="item.deptid" name="tabVal" type="radio" @change="handleSelectionChange" /></td>
66
-									<td class="tdCon">{{ $mHelper.findParents(departList, item.deptid)}}</td>
67
-								</tr>
68
-							</tbody>
69
-						</table> -->
70 56
 					</view>
71 57
 				</uni-popup-dialog>
72 58
 			</uni-popup>
@@ -81,6 +67,7 @@
81 67
 	import {
82 68
 		getToken
83 69
 	} from '@/utils/auth'
70
+	import listUrl  from '@/utils/listUrl.js'
84 71
 	import pageData from '../myTask/repairList/addRepair/pageData.js'
85 72
 	export default {
86 73
 		data() {
@@ -154,10 +141,6 @@
154 141
 					}
155 142
 				})
156 143
 			},
157
-			// handleSelectionChange(val) {
158
-			// 	this.onchangedept = val.target.value
159
-			// 	console.log(val)
160
-			// },
161 144
 			init() {
162 145
 				// #ifdef APP-PLUS
163 146
 				let timer
@@ -175,17 +158,6 @@
175 158
 				// #endif
176 159
 				this.bannnerData = this.$mConstDataConfig.bannnerData
177 160
 				this.getMenuPermissions() //获取用户权限
178
-				// if (!getToken()) {
179
-				// 	uni.reLaunch({
180
-				// 		url: '/pages/login/login'
181
-				// 	});
182
-				// } else {
183
-				// 	//banner数据
184
-				// 	this.bannnerData = this.$mConstDataConfig.bannnerData
185
-				// 	this.getMenuPermissions() //获取用户权限
186
-				// 	// 公告数据
187
-				// 	//this.noticListData = this.$mConstDataConfig.noticListData
188
-				// }
189 161
 			},
190 162
 			saveDept() {
191 163
 				pageData.getDet((res, data) => {
@@ -304,30 +276,22 @@
304 276
 							}
305 277
 						}
306 278
 
307
-					})
308
-					.catch((e) => {
309
-						console.log(e)
310
-					})
311
-				/* 
312
-        GLY:管理员
313
-				*/
314
-				if (code === 'WXY' || code === 'WXBZZ') {
315
-					this.orderListData = this.$mConstDataConfig.roleListData.UnitList
316
-				} else if (code === "DDZX") {
317
-					this.orderListData = this.$mConstDataConfig.roleListData.dispatchList
318
-				} else if (code === "GQY") {
319
-					this.orderListData = this.$mConstDataConfig.roleListData.AttendantList
320
-				} else if (code === "SJ") {
321
-					this.orderListData = this.$mConstDataConfig.roleListData.driverList
322
-				} else if (code === 'jcgn') {
323
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
324
-				} else if (code === 'APRY') {
325
-					this.orderListData = this.$mConstDataConfig.roleListData.driverList
326
-				} else if (code === 'BMXG') {
327
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
328
-				} else if (code === 'GLY') {
329
-					this.orderListData = this.$mConstDataConfig.roleListData.applyRepairList
330
-				}
279
+				})
280
+				.catch((e) => {
281
+					console.log(e)
282
+				})
283
+				this.$http.get("Index/GetMenu").then((response) => {
284
+					if (response.state.toLowerCase() === "success") {
285
+						if (response.data.length>0) {
286
+
287
+							this.orderListData = listUrl.getMenuData(response.data,code)
288
+							console.log(this.orderListData)
289
+						}
290
+					}
291
+				})
292
+				.catch((e) => {
293
+					console.log(e)
294
+				})
331 295
 			},
332 296
 		},
333 297
 	}

+ 7 - 7
CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/button/button.vue

@@ -387,16 +387,16 @@
387 387
 			   })
388 388
 		   },
389 389
 		   // 编辑
390
-		   dispatchEditBtn() {
390
+		 dispatchEditBtn() {
391 391
 			  uni.navigateTo({
392 392
 			  	url: "/pages/myTask/comDispatch/addComDispatch/addComDispatch?wid=" + this.wid 
393 393
 			  }) 
394
-		   },
395
-		   disTrunBtn() {
396
-			   uni.navigateTo({
397
-			   	url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+"&zhdd=1"+ '&orderType=' + this.orderType +'&departid='+ this.applicationDept
398
-			   })
399
-		   },
394
+		 },
395
+		 disTrunBtn() {
396
+			 uni.navigateTo({
397
+				url: "/pages/myTask/repairList/repairDetail/tranferDetail/tranferDetail?wid=" + this.wid+"&zhdd=1"+ '&orderType=' + this.orderType +'&departid='+ this.applicationDept
398
+			 })
399
+		 },
400 400
 			// 车辆调度 ( 按钮开始 )
401 401
 			// 编辑
402 402
 			editVehBtn() {

+ 94 - 0
CallCenterWeb.UI/RMYYAPP/utils/listUrl.js

@@ -0,0 +1,94 @@
1
+/* eslint-disable */
2
+const dataMenu = ["orderManage", "faultRepairManagement", "comDispatch", "SJGD"]
3
+
4
+const urlData = {
5
+	'orderManage': [
6
+		{
7
+			id: "12",
8
+			imagePath: "../../static/consult.png",
9
+			imageBg: "#1ccd8d",
10
+			text: "咨询工单", //WorkOrder/GetLDDealList
11
+			navigateToUrl: "/pages/myTask/consultList/consultList?segmenter=0&urlIndex=0",
12
+		},
13
+		{
14
+			id: "13",
15
+			imagePath: "../../static/consult.png",
16
+			imageBg: "#1ccd8d",
17
+			text: "综合调度", //WorkOrder/GetLDDealList
18
+			navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=0",
19
+		},
20
+		{
21
+			id: "11",
22
+			imagePath: "../../static/reppair.png",
23
+			imageBg: "#1ccd8d",
24
+			text: "故障报修", //WorkOrder/GetLDDealList
25
+			navigateToUrl: "/pages/myTask/repairList/myRepairOrderList/myRepairOrderList?segmenter=0&urlIndex=1",
26
+		},
27
+		{
28
+			id: "14",
29
+			imagePath: "../../static/icon_vehicleScheduling.png",
30
+			imageBg: "#1ccd8d",
31
+			text: "车辆调度", //WorkOrder/GetLDDealList
32
+			navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=1",
33
+		}
34
+	],
35
+	'faultRepairManagement': [{
36
+		id: "2",
37
+		imagePath: "../../static/icon_repair.png",
38
+		imageBg: "#fe940a",
39
+		text: "维修工单", //WorkOrder/GetLDDealList
40
+		navigateToUrl: "/pages/myTask/repairList/repairList?segmenter=0",
41
+	}],
42
+	"comDispatch": [{
43
+		id: "3",
44
+		imagePath: "../../static/consult.png",
45
+		imageBg: "#fe940a",
46
+		text: "调度工单", //WorkOrder/GetLDDealList
47
+		navigateToUrl: "/pages/myTask/comDispatch/applicantList/applicantList?segmenter=0&urlIndex=1",
48
+	}],
49
+	"SJGD": [{
50
+		id: "4",
51
+		imagePath: "../../static/icon_vehicleScheduling.png",
52
+		imageBg: "#fe940a",
53
+		text: "司机工单", //WorkOrder/GetLDDealList
54
+		navigateToUrl: "/pages/myTask/vehicleSchedulList/vehicleSchedulList?segmenter=0",
55
+	}],
56
+
57
+}
58
+
59
+const listUrl = {
60
+	getUrlData(code) {
61
+		return urlData[code];
62
+	},
63
+	getUrlCode() {
64
+		const urlCodeData = []
65
+		Object.keys(urlData).forEach(function(key) {
66
+			urlCodeData.push(key)
67
+		});
68
+		return urlCodeData;
69
+	},
70
+	getMenuData(data, code) {
71
+		const menuData = []
72
+		for (let i in data) {
73
+			const menuCode = data[i].F_MenuCode
74
+			if(menuCode ==="vehicleDispatch"){
75
+				for (let m in data[i].children) {
76
+					const menuChildCode = data[i].children[m].F_MenuCode
77
+					if (dataMenu.indexOf(menuChildCode) != -1) {
78
+						for(let n in urlData[menuChildCode]){
79
+							menuData.push(urlData[menuChildCode][n])
80
+						}
81
+					}
82
+				}
83
+			}else{
84
+				for(let n in urlData[menuCode]){
85
+					menuData.push(urlData[menuCode][n])
86
+				}
87
+			}
88
+			
89
+
90
+		}
91
+		return menuData
92
+	}
93
+};
94
+export default listUrl