zhaomin лет назад: 3
Родитель
Сommit
9a1d829b07

+ 55 - 56
CallCenterWeb.UI/RMYY/src/views/login/index.vue

@@ -92,127 +92,126 @@
92 92
 </template>
93 93
 
94 94
 <script>
95
-import SvgIcon from "@/components/common/SvgIcon"; // svg组件
95
+import SvgIcon from '@/components/common/SvgIcon' // svg组件
96 96
 
97
-import { validUsername, validPassword, validExtension } from "@/utils/validate";
97
+import { validUsername, validPassword, validExtension } from '@/utils/validate'
98 98
 
99 99
 export default {
100
-  name: "Login",
100
+  name: 'Login',
101 101
   components: {
102
-    SvgIcon,
102
+    SvgIcon
103 103
   },
104 104
   data() {
105 105
     const validateUser = (rule, value, callback) => {
106 106
       if (!validUsername(value)) {
107 107
         callback(
108
-          new Error("管理员账号格式(3-20个字符只能是字母、下划线、数字)!")
109
-        );
108
+          new Error('管理员账号格式(3-20个字符只能是字母、下划线、数字)!')
109
+        )
110 110
       } else {
111
-        callback();
111
+        callback()
112 112
       }
113
-    };
113
+    }
114 114
     const validatePass = (rule, value, callback) => {
115 115
       if (!validPassword(value)) {
116
-        callback(new Error("密码格式(6-32个字符只能是字母、下划线、数字)!"));
116
+        callback(new Error('密码格式(6-32个字符只能是字母、下划线、数字)!'))
117 117
       } else {
118
-        callback();
118
+        callback()
119 119
       }
120
-    };
120
+    }
121 121
     return {
122
-      userRole: "1",
122
+      userRole: '1',
123 123
       isShow: false,
124 124
       loginForm: {
125
-        username: "",
126
-        extension: "",
127
-        password: "",
125
+        username: '',
126
+        extension: '',
127
+        password: ''
128 128
       },
129 129
       options: [
130 130
         {
131
-          value: "0",
132
-          label: "职工",
131
+          value: '0',
132
+          label: '职工'
133 133
         },
134 134
         {
135
-          value: "1",
136
-          label: "坐席",
137
-        },
135
+          value: '1',
136
+          label: '坐席'
137
+        }
138 138
       ],
139 139
       loginRules: {
140 140
         username: [
141 141
           {
142 142
             required: true,
143
-            trigger: "blur",
144
-            validator: validateUser,
145
-          },
143
+            trigger: 'blur',
144
+            validator: validateUser
145
+          }
146 146
         ],
147 147
         password: [
148 148
           {
149 149
             required: true,
150
-            trigger: "blur",
151
-            validator: validatePass,
152
-          },
153
-        ],
150
+            trigger: 'blur',
151
+            validator: validatePass
152
+          }
153
+        ]
154 154
       },
155 155
       loading: false,
156
-      pwdType: "password",
157
-    };
156
+      pwdType: 'password'
157
+    }
158 158
   },
159 159
   created() {
160
-    this.toggle();
160
+    this.toggle()
161 161
   },
162 162
   methods: {
163 163
     showPwd() {
164
-      if (this.pwdType === "password") {
165
-        this.pwdType = "";
164
+      if (this.pwdType === 'password') {
165
+        this.pwdType = ''
166 166
       } else {
167
-        this.pwdType = "password";
167
+        this.pwdType = 'password'
168 168
       }
169 169
     },
170 170
     handleLogin() {
171
-      console.log(this.loginForm);
172 171
       this.$refs.loginForm.validate((valid) => {
173 172
         if (valid) {
174 173
           // this.loading = true;
175 174
           this.$store
176
-            .dispatch("Login", this.loginForm)
175
+            .dispatch('Login', this.loginForm)
177 176
             .then(() => {
178
-              this.$message.success("登录成功");
179
-              this.loading = false;
177
+              this.$message.success('登录成功')
178
+              this.loading = false
180 179
               this.$router.push({
181
-                path: "/Dashboard",
182
-              });
180
+                path: '/Dashboard'
181
+              })
183 182
             })
184 183
             .catch(() => {
185
-              this.loading = false;
186
-            });
184
+              this.loading = false
185
+            })
187 186
         } else {
188
-          this.$message.error("请输入有效的必填项信息!");
189
-          return false;
187
+          this.$message.error('请输入有效的必填项信息!')
188
+          return false
190 189
         }
191
-      });
190
+      })
192 191
     },
193 192
     toggle() {
194 193
       const validateExt = (rule, value, callback) => {
195 194
         if (!validExtension(value)) {
196
-          callback(new Error("分机号格式(4-20个字符只能是数字)!"));
195
+          callback(new Error('分机号格式(4-20个字符只能是数字)!'))
197 196
         } else {
198
-          callback();
197
+          callback()
199 198
         }
200
-      };
201
-      this.isShow = !this.isShow;
199
+      }
200
+      this.isShow = !this.isShow
202 201
       if (this.isShow) {
203 202
         this.loginRules.extension = [
204 203
           {
205 204
             required: true,
206
-            trigger: "blur",
207
-            validator: validateExt,
208
-          },
209
-        ];
205
+            trigger: 'blur',
206
+            validator: validateExt
207
+          }
208
+        ]
210 209
       } else {
211
-        this.loginRules.extension = [];
210
+        this.loginRules.extension = []
212 211
       }
213
-    },
214
-  },
215
-};
212
+    }
213
+  }
214
+}
216 215
 </script>
217 216
 
218 217
 <style rel="stylesheet/scss" lang="scss">

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

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

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/main.js

@@ -13,7 +13,7 @@ import { http } from '@/utils/request';
13 13
 import $mGraceChecker from '@/utils/graceChecker';
14 14
 import $mHelper from '@/utils/helper';
15 15
 import $mRouter from '@/utils/router';
16
-
16
+// import * as dd from 'dingtalk-jsapi'; // 此方式为整体加载,也可按需进行加载
17 17
 import { debuggerModule } from 'uni_modules/imengyu-IMDebuggerWindow/common/debuggerExtern.js'
18 18
 
19 19
 const errorHandler = (err, vm, info) => { 

+ 31 - 10
CallCenterWeb.UI/RMYYAPP/package-lock.json

@@ -1,13 +1,34 @@
1 1
 {
2
-  "name": "个人信息编辑表单",
3
-  "version": "1.0.1",
4
-  "lockfileVersion": 1,
5
-  "requires": true,
6
-  "dependencies": {
7
-    "jsencrypt": {
8
-      "version": "3.3.1",
9
-      "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz",
10
-      "integrity": "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw=="
2
+    "name": "个人信息编辑表单",
3
+    "version": "1.0.1",
4
+    "lockfileVersion": 3,
5
+    "requires": true,
6
+    "packages": {
7
+        "": {
8
+            "name": "个人信息编辑表单",
9
+            "version": "1.0.1",
10
+            "dependencies": {
11
+                "dingtalk-jsapi": "^3.0.12",
12
+                "jsencrypt": "^3.3.1"
13
+            }
14
+        },
15
+        "node_modules/dingtalk-jsapi": {
16
+            "version": "3.0.12",
17
+            "resolved": "https://registry.npmmirror.com/dingtalk-jsapi/-/dingtalk-jsapi-3.0.12.tgz",
18
+            "integrity": "sha512-vSP5fGuSthytrIYsN9ITa4DIO5h0bhIIKmcIYIRdvHN0brhzn1IX3hkFtNNNnjg6+u+pHWT8bKH/PRheWIhOLQ==",
19
+            "dependencies": {
20
+                "promise-polyfill": "^7.1.0"
21
+            }
22
+        },
23
+        "node_modules/jsencrypt": {
24
+            "version": "3.3.1",
25
+            "resolved": "https://registry.npmmirror.com/jsencrypt/-/jsencrypt-3.3.1.tgz",
26
+            "integrity": "sha512-dVvV54GdFuJgmEKn+oBiaifDMen4p6o6j/lJh0OVMcouME8sST0bJ7bldIgKBQk4za0zyGn0/pm4vOznR25mLw=="
27
+        },
28
+        "node_modules/promise-polyfill": {
29
+            "version": "7.1.2",
30
+            "resolved": "https://registry.npmmirror.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz",
31
+            "integrity": "sha512-FuEc12/eKqqoRYIGBrUptCBRhobL19PS2U31vMNTfyck1FxPyMfgsXyW4Mav85y/ZN1hop3hOwRlUDok23oYfQ=="
32
+        }
11 33
     }
12
-  }
13 34
 }

+ 1 - 0
CallCenterWeb.UI/RMYYAPP/package.json

@@ -9,6 +9,7 @@
9 9
         "手机号"
10 10
     ],
11 11
     "dependencies": {
12
+        "dingtalk-jsapi": "^3.0.12",
12 13
         "jsencrypt": "^3.3.1"
13 14
     }
14 15
 }

+ 10 - 0
CallCenterWeb.UI/RMYYAPP/pages.json

@@ -1,8 +1,18 @@
1 1
 {
2 2
     "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
3
+	{
4
+	    "path": "pages/index/index",
5
+	    "style": {
6
+			"navigationBarTitleText": "郑州人民医院综合服务保障调度平台",
7
+	        "app-plus": {
8
+	            "titleNView": false //禁用原生导航栏  
9
+	        }
10
+	    }
11
+	},
3 12
         {
4 13
             "path": "pages/myTask/myTask",
5 14
             "style": {
15
+				"navigationBarTitleText": "郑州人民医院综合服务保障调度平台",
6 16
                 "app-plus": {
7 17
                     "titleNView": false //禁用原生导航栏  
8 18
                 }

+ 1 - 1
CallCenterWeb.UI/RMYYAPP/pages/login/login.vue

@@ -88,7 +88,7 @@
88 88
 						
89 89
 						const code = uni.getStorageSync("roleCode"); 
90 90
 						 // ||code == 'GLY' || code == 'DDZX'
91
-						if(code == 'WXY' || code == 'jcgn'  || code == 'GQY' || code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
91
+						if(code == 'WXY' || code == 'DDZX' || code == 'jcgn'  || code == 'GQY' || code == 'SJ' || code == 'WXBZZ' || code == 'APRY' || code == 'APRY') {
92 92
 							uni.switchTab({
93 93
 								url: '/pages/myTask/myTask'
94 94
 							});

+ 24 - 2
CallCenterWeb.UI/RMYYAPP/pages/myTask/comDispatch/comDispatchDetail/comDispatchDetail.vue

@@ -9,7 +9,7 @@
9 9
 			</view>
10 10
 			<view class="contentTable" v-show="detailContentData.StateName ">
11 11
 				<text class="contentTitle">工单状态:</text>
12
-				<text class="textState">{{ detailContentData.StateName }}</text>
12
+				<text class="textState" style="margin-left: 10px;">{{ detailContentData.StateName }}</text>
13 13
 			</view>
14 14
 			<view class="contentTable">
15 15
 				<text class="contentTitle">申请科室:</text>
@@ -21,7 +21,12 @@
21 21
 			</view>
22 22
 			<view class="contentTable">
23 23
 				<text class="contentTitle">申请人员:</text>
24
-				<text class="contentText">{{ detailContentData.applicantname + '('+detailContentData.F_Phone+')'}}</text>
24
+				<text class="contentText">{{ detailContentData.applicantname}}</text>
25
+			</view>
26
+			<view class="contentTable">
27
+				<text class="contentTitle">联系电话:</text>
28
+				<text class="contentText">{{ detailContentData.F_Phone}} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
29
+				
25 30
 			</view>
26 31
 			<view class="contentTable">
27 32
 				<view class="contentTitle">工单内容:</view>
@@ -245,6 +250,15 @@
245 250
 			this.roleCode = uni.getStorageSync("roleCode")
246 251
 		},
247 252
 		methods: {
253
+			callHandle(e){
254
+				if(!this.detailContentData.F_Phone) {
255
+					this.$mHelper.toast('无号码信息')
256
+					return
257
+				}
258
+				uni.makePhoneCall({
259
+					phoneNumber:this.detailContentData.F_Phone //仅为示例
260
+				})
261
+			},
248 262
 			getButtons() {
249 263
 				this.orderButtonData = []
250 264
 				const params = {
@@ -400,6 +414,14 @@
400 414
 						width: 34%;
401 415
 						display: inline-block;
402 416
 						text-align: right;
417
+						
418
+						
419
+					}
420
+					
421
+					.frContentText{
422
+						font-size: 25px !important;
423
+						color: #1e90ff !important;
424
+						margin-left: 15px !important;
403 425
 					}
404 426
 	
405 427
 					.contentText {

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

@@ -3,13 +3,13 @@
3 3
 	<view class="wrapper">
4 4
 		<view class="detailContent">
5 5
 			<view class="contentTable">
6
-				<text class="contentTitle">工单号:</text>
6
+				<text class="contentTitle">工单号:</text>
7 7
 				<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
8 8
 				<!-- <text class="textState" v-show="detailContentData.StateName">{{ detailContentData.StateName }}</text> -->
9 9
 			</view>
10 10
 			<view class="contentTable" v-show="detailContentData.StateName ">
11 11
 				<text class="contentTitle">工单状态:</text>
12
-				<text class="textState">{{ detailContentData.StateName }}</text>
12
+				<text class="textState" style="margin-left: 10px;">{{ detailContentData.StateName }}</text>
13 13
 			</view>
14 14
 			<view class="contentTable">
15 15
 				<text class="contentTitle">业务类别:</text>
@@ -24,22 +24,22 @@
24 24
 				<text class="contentText">{{ detailContentData.F_CreateTime }}</text>
25 25
 			</view>
26 26
 			<view class="contentTable">
27
-				<text class="contentTitle">姓&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;名:</text>
27
+				<text class="contentTitle">姓<span class="place"></span>名:</text>
28 28
 				<text class="contentText">{{ detailContentData.F_Customer }}</text>
29 29
 			</view>
30 30
 			<view class="contentTable">
31
-				<text class="contentTitle">性&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;别:</text>
31
+				<text class="contentTitle">性<span class="place"></span>别:</text>
32 32
 				<text
33 33
 					class="contentText">{{ detailContentData.F_Sex | sexFilters }}</text>
34 34
 			</view>
35 35
 			<view class="contentTable">
36
-				<text class="contentTitle">来&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;源:</text>
36
+				<text class="contentTitle">来<span class="place"></span>源:</text>
37 37
 				<text
38 38
 					class="contentText">{{ detailContentData.F_Source }}</text>
39 39
 			</view>
40 40
 			<view class="contentTable">
41 41
 				<text class="contentTitle">联系电话:</text>
42
-				<text class="contentText">{{ detailContentData.F_Phon }}</text>
42
+				<text class="contentText">{{ 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>
@@ -67,7 +67,7 @@
67 67
 				<view class="contentText">{{ detailContentData.F_WorkOrderContents }}</view>
68 68
 			</view>
69 69
 			<view class="contentTable">
70
-				<text class="contentTitle">图&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;片:</text>
70
+				<text class="contentTitle">图<span class="place"></span>片:</text>
71 71
 			
72 72
 				<view class="contentText" style="margin-top: 10px;">
73 73
 					<uni-file-picker readonly :value="getFileData(detailContentData.FileUrl)" :imageStyles="imageStyles"
@@ -217,6 +217,15 @@
217 217
 			this.roleCode = uni.getStorageSync("roleCode")
218 218
 		},
219 219
 		methods: {
220
+			callHandle(e){
221
+				if(!this.detailContentData.F_Phon) {
222
+					this.$mHelper.toast('无号码信息')
223
+					return
224
+				}
225
+				uni.makePhoneCall({
226
+					phoneNumber:this.detailContentData.F_Phon //仅为示例
227
+				})
228
+			},
220 229
 			getButtons() {
221 230
 				this.orderButtonData = []
222 231
 				const params = {
@@ -359,7 +368,18 @@
359 368
 					display: inline-block;
360 369
 					text-align: right;
361 370
 				}
362
-
371
+				
372
+				.place{
373
+					display: inline-block;
374
+					width: 32px;
375
+				}
376
+				
377
+				.frContentText{
378
+					font-size: 25px !important;
379
+					color: #1e90ff !important;
380
+					margin-left: 15px !important;
381
+				}
382
+				
363 383
 				.contentText {
364 384
 					width: 66%;
365 385
 					color: #525252;

+ 13 - 12
CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -86,18 +86,19 @@
86 86
 				
87 87
 				this.upData()
88 88
 				// #endif
89
-				
90
-				if (!getToken()) {
91
-					uni.reLaunch({
92
-						url: '/pages/login/login'
93
-					});
94
-				} else {
95
-					//banner数据
96
-					this.bannnerData = this.$mConstDataConfig.bannnerData
97
-					this.getMenuPermissions() //获取用户权限
98
-					// 公告数据
99
-					//this.noticListData = this.$mConstDataConfig.noticListData
100
-				}
89
+				this.bannnerData = this.$mConstDataConfig.bannnerData
90
+				this.getMenuPermissions() //获取用户权限
91
+				// if (!getToken()) {
92
+				// 	uni.reLaunch({
93
+				// 		url: '/pages/login/login'
94
+				// 	});
95
+				// } else {
96
+				// 	//banner数据
97
+				// 	this.bannnerData = this.$mConstDataConfig.bannnerData
98
+				// 	this.getMenuPermissions() //获取用户权限
99
+				// 	// 公告数据
100
+				// 	//this.noticListData = this.$mConstDataConfig.noticListData
101
+				// }
101 102
 			},
102 103
 			
103 104
 			changeStore() {

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

@@ -163,37 +163,45 @@
163 163
 		},
164 164
 		onLoad(option) {
165 165
 			this.getFontSizeValue = uni.getStorageSync('fontSizeValue')+'rem'
166
-			// 维修员下步流程指派的时候只能指派给自己部门
167 166
 			this.valiFormData.ApplicationDept = uni.getStorageSync("deptId")
168 167
 			pageData.getApplicant(uni.getStorageSync("deptId"), (res,data,candidates) => {
169 168
 				this.candidates = candidates
170 169
 				this.ApplicantData = res
171 170
 				this.valiFormData.Applicant = uni.getStorageSync("userCode")
172 171
 				this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
173
-			})
174
-			if(uni.getStorageSync("roleCode") == 'GLY' || uni.getStorageSync("roleCode") == 'WXY') {
175
-				this.isShowIsEnd = true
176
-				if(uni.getStorageSync("roleCode") == 'WXY') {
177
-					this.readonly = true
178
-					this.valiFormData.MaintenanceDept = uni.getStorageSync("deptId")
179
-					pageData.getApplicant(uni.getStorageSync("deptId"), (res,data,candidates) => {
180
-						this.candidates = candidates
181
-						this.candidatesDesignate = candidates
182
-						this.MaintenancerData = res
183
-						this.ApplicantData = res
184
-						this.orderApplicantData = data
185
-						this.valiFormData.Applicant = uni.getStorageSync("userCode")
186
-						this.valiFormData.ApplicantName = this.$mHelper.findUserName(this.ApplicantData, uni.getStorageSync("userCode"))
187
-						const user = this.orderApplicantData.find((o) => {
188
-							return o.usercode === this.valiFormData.Applicant.toString()
189
-						})
190
-						if (user) {
191
-							this.valiFormData.Phone = user.usertelphone
192
-						}
193
-						this.getLocation(this.valiFormData.Applicant)
194
-					})
172
+				this.orderApplicantData = data
173
+				const user = this.orderApplicantData.find((o) => {
174
+					return o.usercode === uni.getStorageSync("userCode").toString()
175
+				})
176
+				if(user) {
177
+					this.valiFormData.Applicantsphone = user.usertelphone
178
+					this.valiFormData.Phone = user.usertelphone
195 179
 				}
196
-			}
180
+			})
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
+			// }
197 205
 			this.workorderid = option.wid
198 206
 			// 部门数据
199 207
 			pageData.getDet((res,data) => {

+ 25 - 7
CallCenterWeb.UI/RMYYAPP/pages/myTask/vehicleSchedulList/components/vehiccleDetail/vehiccleDetail.vue

@@ -8,7 +8,7 @@
8 8
 
9 9
 		<view class="detailContent">
10 10
 			<view class="contentTable">
11
-				<text class="contentTitle">工单号:</text>
11
+				<text class="contentTitle">工单号:</text>
12 12
 				<text class="contentText">{{ detailContentData.F_WorkOrderCode }}</text>
13 13
 			</view>
14 14
 			<view class="contentTable">
@@ -21,10 +21,10 @@
21 21
 			</view>
22 22
 			<view class="contentTable">
23 23
 				<text class="contentTitle">联系电话:</text>
24
-				<text class="contentText">{{ detailContentData.F_Phon }}</text>
24
+				<text class="contentText">{{ detailContentData.F_Phon  }}<uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
25 25
 			</view>
26 26
 			<view class="contentTable">
27
-				<text class="contentTitle">申请人:</text>
27
+				<text class="contentTitle">申请人:</text>
28 28
 				<text class="contentText">{{ detailContentData.F_ProposerCode }}</text>
29 29
 			</view>
30 30
 			<view class="contentTable">
@@ -42,7 +42,7 @@
42 42
 			</view>
43 43
 
44 44
 			<view class="contentTable">
45
-				<text class="contentTitle">车牌号:</text>
45
+				<text class="contentTitle">车牌号:</text>
46 46
 				<text class="contentText">{{ detailContentData.F_CarMessage }}</text>
47 47
 			</view>
48 48
 			<view class="contentTable">
@@ -100,10 +100,10 @@
100 100
 				this.fId = optioin.sms_id
101 101
 			}
102 102
 			
103
-			if(optioin.segmenter == '0'){	//	申请人列表
103
+			if(Number(optioin.segmenter) == 0){	//	申请人列表
104 104
 				this.listFlag = false
105 105
 				this.getDetail(0)
106
-			} else if(optioin.segmenter == '1'){  //司机里列表
106
+			} else if(Number(optioin.segmenter)== 1){  //司机里列表
107 107
 				this.getDetail(3)
108 108
 				this.receiviFlag = optioin.receiviFlag
109 109
 				this.listFlag = true
@@ -111,13 +111,25 @@
111 111
 			} 
112 112
 		},
113 113
 		methods: {
114
+			callHandle(e){
115
+				if(!this.detailContentData.F_Phon) {
116
+					this.$mHelper.toast('无号码信息')
117
+					return
118
+				}
119
+				uni.makePhoneCall({
120
+					phoneNumber:this.detailContentData.F_Phon //仅为示例
121
+				})
122
+			},
114 123
 			getDetail(type) {
124
+				// alert('1')
115 125
 				const params = {
116 126
 					WorkOrderCode: this.workorderid,
117 127
 					type: type,
118
-					orderid:this.fId
128
+					orderid:this.fId,
129
+					token:uni.getStorageSync("token")
119 130
 				}
120 131
 				this.$http.get("T_Car_WorkOrder/GetModelDetail", params).then((response) => {
132
+					// alert(response.state)
121 133
 					if (response.state.toLowerCase() === "success") {
122 134
 						let btnData
123 135
 						if (type == 0) {
@@ -239,6 +251,12 @@
239 251
 					display: inline-block;
240 252
 					text-align: right;
241 253
 				}
254
+				
255
+				.frContentText{
256
+					font-size: 25px !important;
257
+					color: #1e90ff !important;
258
+					margin-left: 15px !important;
259
+				}
242 260
 	
243 261
 				.contentText {
244 262
 					width: 66%;

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

@@ -10,7 +10,7 @@
10 10
 			</view>
11 11
 			<view class="contentTable" v-show="detailContentData.StateName ">
12 12
 				<text class="contentTitle">工单状态:</text>
13
-				<text class="textState">{{ detailContentData.StateName }}</text>
13
+				<text class="textState" style="margin-left: 10px;">{{ detailContentData.StateName }}</text>
14 14
 				<text class="textState fx" v-show="backState == 1">返修</text>
15 15
 			</view>
16 16
 			<view class="contentTable">
@@ -28,11 +28,11 @@
28 28
 			</view>
29 29
 			<view class="contentTable">
30 30
 				<text class="contentTitle">报修人员:</text>
31
-				<text class="contentText">{{ detailContentData.applicantname+ '('+detailContentData.F_Phone+')' }}</text>
31
+				<text class="contentText">{{ detailContentData.applicantname}}</text>
32 32
 			</view>
33 33
 			<view class="contentTable">
34 34
 				<text class="contentTitle">联系电话:</text>
35
-				<text class="contentText">{{ detailContentData.F_Phone }}</text>
35
+				<text class="contentText">{{ detailContentData.F_Phone }} <uni-icons @click="callHandle" class="frContentText" type="phone" size="30"></uni-icons></text>
36 36
 			</view>
37 37
 			<view class="contentTable">
38 38
 				<view class="contentTitle">报修内容:</view>
@@ -345,6 +345,15 @@
345 345
 			this.roleCode = uni.getStorageSync("roleCode")
346 346
 		},
347 347
 		methods: {
348
+			callHandle(e){
349
+				if(!this.detailContentData.F_Phone) {
350
+					this.$mHelper.toast('无号码信息')
351
+					return
352
+				}
353
+				uni.makePhoneCall({
354
+					phoneNumber:this.detailContentData.F_Phone //仅为示例
355
+				})
356
+			},
348 357
 			getButtons() {
349 358
 				this.orderButtonData = []
350 359
 				const params = {
@@ -515,6 +524,12 @@
515 524
 					display: inline-block;
516 525
 					text-align: right;
517 526
 				}
527
+				
528
+				.frContentText{
529
+					font-size: 25px !important;
530
+					color: #1e90ff !important;
531
+					margin-left: 15px !important;
532
+				}
518 533
 
519 534
 				.contentText {
520 535
 					width: 66%;

+ 15 - 0
CallCenterWeb.UI/RMYYAPP/store/modules/user.js

@@ -48,6 +48,21 @@ const user = {
48 48
 					})
49 49
 			})
50 50
 		},
51
+		// 钉钉免登录
52
+		Dinglogin({
53
+			commit
54
+		}, userInfo) {
55
+			return new Promise((resolve, reject) => {
56
+				http.post("Home/Dinglogin", userInfo).then((response) => {
57
+						setToken(response.data)
58
+						commit('SET_TOKEN', response.data)
59
+						resolve(response)
60
+					})
61
+					.catch((e) => {
62
+						reject(e)
63
+					})
64
+			})
65
+		},
51 66
 		// 获取用户信息 GetInfo
52 67
 		GetInfo({
53 68
 			commit