zhaomin 3 years ago
parent
commit
d1e98c7dfa
30 changed files with 110 additions and 61 deletions
  1. BIN
      CallCenterWeb.UI/RMYYAPP.zip
  2. 4 3
      CallCenterWeb.UI/RMYYAPP/config/index.config.js
  3. 7 3
      CallCenterWeb.UI/RMYYAPP/manifest.json
  4. 10 4
      CallCenterWeb.UI/RMYYAPP/pages/adressBook/adressBookDetail/adressBookDetail.vue
  5. 7 2
      CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue
  6. 20 2
      CallCenterWeb.UI/RMYYAPP/pages/managemtnt/managemtnt.vue
  7. 5 3
      CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue
  8. 23 23
      CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue
  9. 1 1
      CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue
  10. 4 0
      CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue
  11. BIN
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/__UNI__5A5207D_cm.apk
  12. 1 1
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl
  13. 1 1
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/cmManifestCache.json
  14. 2 2
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios
  15. 1 1
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-config-service.js
  16. 6 6
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-service.js
  17. 1 1
      CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-view.js
  18. 15 0
      CallCenterWeb.UI/RMYYAPP/utils/helper.js
  19. BIN
      CallCenterWeb.UI/rmyyecharts/dist.zip
  20. BIN
      CallCenterWeb.UI/新证书/a26609e254ee443ab65cbb7fee7d69ec.keystore
  21. 0 8
      CallCenterWeb.UI/新证书/密码.txt
  22. 2 0
      CallCenterWeb.UI/证书/ios/新建文本文档.txt
  23. 0 0
      CallCenterWeb.UI/证书/ios/正式.zip
  24. BIN
      CallCenterWeb.UI/证书/ios/正式/wuyuan (2).mobileprovision
  25. BIN
      CallCenterWeb.UI/证书/ios/正式/证书.p12
  26. BIN
      CallCenterWeb.UI/证书/ios/测试/new/wuyuan2.mobileprovision
  27. BIN
      CallCenterWeb.UI/证书/ios/测试/wuyuan1.mobileprovision
  28. BIN
      CallCenterWeb.UI/证书/ios/测试/证书1.p12
  29. 0 0
      CallCenterWeb.UI/证书/安卓/a26609e254ee443ab65cbb7fee7d69ec.keystore
  30. 0 0
      CallCenterWeb.UI/证书/安卓/证书信息.txt

BIN
CallCenterWeb.UI/RMYYAPP.zip


+ 4 - 3
CallCenterWeb.UI/RMYYAPP/config/index.config.js

@@ -5,6 +5,7 @@ const CONFIG = {
5 5
 				// baseUrl: 'http://192.168.8.10:8033/',
6 6
 				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
7 7
 				baseUrl: 'http://39.164.159.192:8000/', // 本地外网地址
8
+		// baseUrl: 'http://172.16.10.22:8000/',	
8 9
         hostUrl: '', // H5地址(前端运行地址)
9 10
         weixinAppId: '' // 微信公众号appid
10 11
 
@@ -13,9 +14,9 @@ const CONFIG = {
13 14
     production: {
14 15
         assetsPath: '/static', // 静态资源路径
15 16
 				// baseUrl: 'http://192.168.8.10:8033/',
16
-				// baseUrl: 'http://39.164.159.192:8000/',
17
-				baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
18
-				
17
+				baseUrl: 'http://39.164.159.192:8000/',
18
+				// baseUrl: 'https://zyfb.zzrmyy.com/', // 本地外网地址
19
+		// baseUrl: 'http://172.16.10.22:8000/',		
19 20
         hostUrl: '', // H5地址(前端运行地址)
20 21
         weixinAppId: '' // 微信公众号appid
21 22
 

+ 7 - 3
CallCenterWeb.UI/RMYYAPP/manifest.json

@@ -2,7 +2,7 @@
2 2
     "name" : "郑州人民医院综合服务保障调度平台",
3 3
     "appid" : "__UNI__5A5207D",
4 4
     "description" : "",
5
-    "versionName" : "1.2.0",
5
+    "versionName" : "1.2.1",
6 6
     "versionCode" : 120,
7 7
     "transformPx" : false,
8 8
     /* 5+App特有相关 */
@@ -19,7 +19,8 @@
19 19
         /* 模块配置 */
20 20
         "modules" : {
21 21
             "VideoPlayer" : {},
22
-            "Push" : {}
22
+            "Push" : {},
23
+            "Messaging" : {}
23 24
         },
24 25
         /* 应用发布信息 */
25 26
         "distribute" : {
@@ -38,9 +39,12 @@
38 39
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
39 40
                     "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
40 41
                     "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
42
+                    "<uses-permission android:name=\"android.permission.READ_SMS\"/>",
43
+                    "<uses-permission android:name=\"android.permission.SEND_SMS\"/>",
41 44
                     "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
42 45
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
43
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
46
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
47
+                    "<uses-permission android:name=\"android.permission.WRITE_SMS\"/>"
44 48
                 ]
45 49
             },
46 50
             /* ios打包配置 */

+ 10 - 4
CallCenterWeb.UI/RMYYAPP/pages/adressBook/adressBookDetail/adressBookDetail.vue

@@ -59,11 +59,17 @@
59 59
 					this.$mHelper.toast('无号码信息')
60 60
 					return
61 61
 				}
62
+				// #ifdef H5
63
+				    //获取设备类型
64
+				    let platform = uni.getSystemInfoSync().platform
65
+				    window.location.href = platform === 'ios' ? `sms:/open?addresses=${this.detailUserData.F_Telephone}&body=${''}`: `sms:${this.detailUserData.F_Telephone}?body=${''}` 
66
+				// #endif
67
+				
62 68
 				// #ifdef APP-PLUS
63
-				var msg = plus.messaging.createMessage(plus.messaging.TYPE_SMS);
64
-				msg.to = [this.detailUserData.F_Telephone];
65
-				msg.body = '';
66
-				plus.messaging.sendMessage(msg);
69
+					var msg = plus.messaging.createMessage(plus.messaging.TYPE_SMS);
70
+					msg.to = [this.detailUserData.F_Telephone];
71
+					msg.body = '';
72
+					plus.messaging.sendMessage(msg);
67 73
 				// #endif
68 74
 			},
69 75
 			getUserAccount(userid){

+ 7 - 2
CallCenterWeb.UI/RMYYAPP/pages/components/orderSelect/orderSelect.vue

@@ -10,7 +10,8 @@
10 10
 			return {
11 11
 				order: '',
12 12
 				WorkOrderCategory: '',
13
-				
13
+				orderList: [],
14
+				identification: '',
14 15
 				dataOrderType: []
15 16
 			}
16 17
 		},
@@ -25,6 +26,7 @@
25 26
 		methods: {
26 27
 			getDpartment() {
27 28
 				pageData.getGongDanType(this.typeid,(res, data) => {
29
+					this.orderList = data
28 30
 					this.dataOrderType = res
29 31
 					if(this.orderType) {
30 32
 						this.getOrder(res, data, this.orderType)
@@ -53,7 +55,10 @@
53 55
 			},
54 56
 			nodeclick(data) {
55 57
 				this.order = data.value
56
-				this.$emit('post-select-data',data.value,data.id,data.orderType)
58
+				console.log(this.orderList)
59
+				this.identification = this.$mHelper.getIdentification(this.orderList,data.value)
60
+				console.log(this.identification )
61
+				this.$emit('post-select-data',data.value,data.id,data.orderType,this.identification)
57 62
 			},
58 63
 			popupclosed() {
59 64
 				this.WorkOrderCategory = this.order

+ 20 - 2
CallCenterWeb.UI/RMYYAPP/pages/managemtnt/managemtnt.vue

@@ -11,7 +11,8 @@
11 11
 					<!-- 通过header插槽定义列表的标题 -->
12 12
 					<template v-slot:header>
13 13
 						<view class="uni-title" style="width: 100%;">
14
-							<view>{{item.SMS_Title}}</view>
14
+							<span class="point" v-show="item.SMS_IsRead === 0"></span>
15
+							<view style="vertical-align: middle;">{{item.SMS_Title}}</view>
15 16
 						</view>
16 17
 
17 18
 					</template>
@@ -31,6 +32,7 @@
31 32
 										类&nbsp;&nbsp;&nbsp;&nbsp;型:{{item.SMS_Type | getTypeFilters(item.SMS_Type)}}
32 33
 									</view>
33 34
 								</view>
35
+								<!-- <view style="color: #525252;">已读</view> -->
34 36
 							</view>
35 37
 						</view>
36 38
 					</template>
@@ -150,7 +152,6 @@
150 152
 					})
151 153
 			},
152 154
 			goDetail(wid, id, type) {
153
-				console.log(id)
154 155
 				const params = {
155 156
 					infoid: id
156 157
 				}
@@ -164,6 +165,13 @@
164 165
 					.catch((e) => {
165 166
 						console.log(e)
166 167
 					})
168
+				this.$http.post('InternalMessages/UpdateState', {ids:id, state:1}).then((response) => {
169
+						if (response.state.toLowerCase() === "success") {
170
+						}
171
+					})
172
+					.catch((e) => {
173
+						console.log(e)
174
+					})
167 175
 				if(type == 0) {
168 176
 					uni.navigateTo({
169 177
 						url: '/pages/myTask/consultList/consultDetail/consultDetail?wid=' + wid + '&sms_id='+ id
@@ -245,6 +253,16 @@
245 253
 	.uni-title {
246 254
 		color: #555;
247 255
 		font-size: 1rem !important;
256
+		
257
+		.point{
258
+			display: inline-block;
259
+			width: 7px;
260
+			height: 7px;
261
+			border-radius: 50%;
262
+			background-color: #f00;
263
+			margin-top: 7px;
264
+			margin-right: 5px;
265
+		}
248 266
 	}
249 267
 
250 268
 	.uni-title-sub {

+ 5 - 3
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/addComDispatch/addComDispatch.vue

@@ -39,8 +39,8 @@
39 39
 					</view>
40 40
 				</view>
41 41
 				<uni-forms-item label="送达地点" required name="ToPlace">
42
-					<dictionaries-select flag="SDKS" @post-select-dic="postSelectDicPlace"></dictionaries-select>
43
-					<!-- <uni-easyinput v-model="valiFormData.ToPlace" placeholder="请输入送达地点" /> -->
42
+					<dictionaries-select flag="SDKS" @post-select-dic="postSelectDicPlace" v-if="identification === '2006' || identification === 'JC' || identification === 'FJ'"></dictionaries-select>
43
+					<uni-easyinput v-model="valiFormData.ToPlace" placeholder="请输入送达地点" v-else/>
44 44
 				</uni-forms-item>
45 45
 				<uni-forms-item label="工单内容" required name="Content">
46 46
 					<uni-easyinput type="textarea" v-model="valiFormData.Content" placeholder="请输入工单内容" />
@@ -93,6 +93,7 @@
93 93
 		},
94 94
 		data() {
95 95
 			return {
96
+				identification: '', // 工单标识
96 97
 				getFontSizeValue:'1rem',
97 98
 				showSearch: true,
98 99
 				logo: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fbpic.588ku.com%2Felement_origin_min_pic%2F00%2F00%2F07%2F155788a6d8a5c42.jpg&refer=http%3A%2F%2Fbpic.588ku.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1619847627&t=2da40b583002205c204d980b54b35040',
@@ -275,7 +276,8 @@
275 276
 			postImgData(res) {
276 277
 			},
277 278
 			// 工单类别
278
-			postSelectData(e,id) {
279
+			postSelectData(e,id,type,ident) {
280
+				this.identification = ident
279 281
 				this.flaginfo = String(id)
280 282
 				this.valiFormData.WorkOrderCategory = e
281 283
 				if(this.flagid.indexOf(this.flaginfo) > -1) {

+ 23 - 23
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/addRepair/addRepair.vue

@@ -179,29 +179,29 @@
179 179
 				}
180 180
 			})
181 181
 			// 维修员下步流程指派的时候只能指派给自己部门
182
-			// if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
183
-			// 	this.isShowIsEnd = true
184
-			// 	if(uni.getStorageSync("roleCode") == 'WXY') {
185
-			// 		this.readonly = true
186
-			// 		this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
187
-			// 		pageData.getApplicant(uni.getStorageSync("deptId"), (res,data,candidates) => {
188
-			// 			this.candidates = candidates
189
-			// 			this.candidatesDesignate = candidates
190
-			// 			this.MaintenancerData = res
191
-			// 			this.ApplicantData = res
192
-			// 			this.orderApplicantData = data
193
-			// 			this.valiFormData.Applicant = uni.getStorageSync("userCode")
194
-			// 			this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
195
-			// 			const user = this.orderApplicantData.find((o) => {
196
-			// 				return o.usercode === this.valiFormData.Applicant.toString()
197
-			// 			})
198
-			// 			if (user) {
199
-			// 				this.valiFormData.Phone = user.usertelphone
200
-			// 			}
201
-			// 			this.getLocation(this.valiFormData.Applicant)
202
-			// 		})
203
-			// 	}
204
-			// }
182
+			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
183
+				this.isShowIsEnd = true
184
+				if(uni.getStorageSync("roleCode") == 'WXY') {
185
+					this.readonly = true
186
+					this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
187
+					pageData.getPersonByDeptId(uni.getStorageSync("deptId"), (res,data,candidates) => {
188
+						// this.candidates = candidates
189
+						this.candidatesDesignate = candidates
190
+						this.MaintenancerData = res
191
+						// this.ApplicantData = res
192
+						// this.orderApplicantData = data
193
+						// this.valiFormData.Applicant = uni.getStorageSync("userCode")
194
+						// this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
195
+						// const user = this.orderApplicantData.find((o) => {
196
+						// 	return o.usercode === this.valiFormData.Applicant.toString()
197
+						// })
198
+						// if (user) {
199
+						// 	this.valiFormData.Phone = user.usertelphone
200
+						// }
201
+						// this.getLocation(this.valiFormData.Applicant)
202
+					})
203
+				}
204
+			}
205 205
 			this.workorderid = option.wid
206 206
 			// 部门数据
207 207
 			pageData.getDet((res,data) => {

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/pages/myTask/repairList/repairList.vue

@@ -42,7 +42,7 @@
42 42
 			<uni-load-more :status="loadMoreState"></uni-load-more>
43 43
 		</view>
44 44
 
45
-		<!-- <uni-fab ref="fab"  @fabClick="fabClick" /> -->
45
+		<uni-fab ref="fab"  @fabClick="fabClick" />
46 46
 	</view>
47 47
 </template>
48 48
 

+ 4 - 0
CallCenterWeb.UI/RMYYAPP/pages/myTask/workOrderDetail/workOrderDetail.vue

@@ -57,6 +57,10 @@
57 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>
58 58
 			</view>
59 59
 			<view class="contentTable">
60
+				<text class="contentTitle">超时时限:</text>
61
+				<text class="contentText">{{ detailContentData.GapTime }}</text>
62
+			</view>
63
+			<view class="contentTable">
60 64
 				<text class="contentTitle">紧急程度:</text>
61 65
 				<text class="contentText">{{ detailContentData.F_EmergencyTypes }}</text>
62 66
 			</view>

BIN
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/__UNI__5A5207D_cm.apk


+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/apkurl

@@ -1 +1 @@
1
-https://ide.dcloud.net.cn/build/download/8e3c5cc0-8719-11ed-a805-3d9024e79047
1
+https://ide.dcloud.net.cn/build/download/58da4c60-90ba-11ed-9903-67326e0673c8

File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/apk/cmManifestCache.json


+ 2 - 2
CallCenterWeb.UI/RMYYAPP/unpackage/cache/certdataios

@@ -1,3 +1,3 @@
1
-iosProfile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/wuyuan (2).mobileprovision
2
-ioscertFile=E:/desktopFile/证书/RMYY证书/ios/4.0/正式/证书.p12
1
+iosProfile=D:/YJF_work/五院/CallCenterWeb.UI/4.0/正式/wuyuan (2).mobileprovision
2
+ioscertFile=D:/YJF_work/五院/CallCenterWeb.UI/4.0/正式/证书.p12
3 3
 ioscertPassword=LN4Bq2cDrCPQMwql//0+Pw==

File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-config-service.js


File diff suppressed because it is too large
+ 6 - 6
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-service.js


File diff suppressed because it is too large
+ 1 - 1
CallCenterWeb.UI/RMYYAPP/unpackage/cache/wgt/__UNI__5A5207D/app-view.js


+ 15 - 0
CallCenterWeb.UI/RMYYAPP/utils/helper.js

@@ -97,6 +97,21 @@ export default {
97 97
 		})
98 98
 		return value
99 99
 	},
100
+	// 通过id获取工单标识
101
+	getIdentification(treeData, id){
102
+		for (let i = 0; i < treeData.length; i++) {
103
+			if (treeData[i].id == id) {
104
+				return treeData[i].identification
105
+			} else {
106
+				if (treeData[i].children) {
107
+					var res = this.getIdentification(treeData[i].children, id)
108
+					if (res !== undefined) {
109
+						return res
110
+					}
111
+				}
112
+			}
113
+		}
114
+	},
100 115
 	// 详情返回页面 参数表示页面回退几级
101 116
 	returnPage(index) {
102 117
 		uni.navigateBack({

BIN
CallCenterWeb.UI/rmyyecharts/dist.zip


BIN
CallCenterWeb.UI/新证书/a26609e254ee443ab65cbb7fee7d69ec.keystore


+ 0 - 8
CallCenterWeb.UI/新证书/密码.txt

@@ -1,8 +0,0 @@
1
-证书别名:__uni__5a5207d
2
-密钥:SlNjodQL
3
-包名 uni.UNI4B368F0
4
-
5
-
6
-1、密钥: SlNjodQL
7
-2、别名:__uni__5a5207d
8
-3、包名:com.wuyuan.zw

+ 2 - 0
CallCenterWeb.UI/证书/ios/新建文本文档.txt

@@ -0,0 +1,2 @@
1
+com.wuyuan.zw
2
+hykj800100

CallCenterWeb.UI/正式.zip → CallCenterWeb.UI/证书/ios/正式.zip


BIN
CallCenterWeb.UI/证书/ios/正式/wuyuan (2).mobileprovision


BIN
CallCenterWeb.UI/证书/ios/正式/证书.p12


BIN
CallCenterWeb.UI/证书/ios/测试/new/wuyuan2.mobileprovision


BIN
CallCenterWeb.UI/证书/ios/测试/wuyuan1.mobileprovision


BIN
CallCenterWeb.UI/证书/ios/测试/证书1.p12


CallCenterWeb.UI/证书/a26609e254ee443ab65cbb7fee7d69ec.keystore → CallCenterWeb.UI/证书/安卓/a26609e254ee443ab65cbb7fee7d69ec.keystore


CallCenterWeb.UI/证书/证书信息.txt → CallCenterWeb.UI/证书/安卓/证书信息.txt