liuzhihui 2 years ago
parent
commit
aef3a7ab7e

+ 8 - 0
CallCenterWeb.UI/RMYY/src/api/callScreen/callScreen.js

@@ -82,3 +82,11 @@ export function GetUrl(params) {
82 82
     params
83 83
   })
84 84
 }
85
+// 眼睛
86
+export function GetPatientModel(params) {
87
+  return request({
88
+    url: 'Patient/GetPatientModel',
89
+    method: 'get',
90
+    params
91
+  })
92
+}

+ 10 - 3
CallCenterWeb.UI/RMYY/src/api/login.js

@@ -1,7 +1,7 @@
1 1
 import request from '@/utils/request'
2 2
 
3 3
 // 登录
4
-export function login(usercode, password,loginway) {
4
+export function login(usercode, password, loginway) {
5 5
   return request({
6 6
     url: 'Home/Login',
7 7
     method: 'post',
@@ -14,7 +14,7 @@ export function login(usercode, password,loginway) {
14 14
 }
15 15
 
16 16
 // 钉钉登录
17
-export function Dinglogin(code,loginway) {
17
+export function Dinglogin(code, loginway) {
18 18
   return request({
19 19
     url: 'Home/Dinglogin',
20 20
     method: 'post',
@@ -26,7 +26,7 @@ export function Dinglogin(code,loginway) {
26 26
 }
27 27
 
28 28
 // OA登录
29
-export function OAlogin(loginid, oploginid,loginway,dept) {
29
+export function OAlogin(loginid, oploginid, loginway, dept) {
30 30
   return request({
31 31
     url: 'Home/OAlogin',
32 32
     method: 'post',
@@ -69,3 +69,10 @@ export function getChangeDeptId(params) {
69 69
     data: params
70 70
   })
71 71
 }
72
+// 是否三个月未修改密码
73
+export function GetUserPasswordTime() {
74
+  return request({
75
+    url: 'UserAccount/GetUserPasswordTime',
76
+    method: 'get'
77
+  })
78
+}

+ 104 - 96
CallCenterWeb.UI/RMYY/src/api/orderManagement/orderList.js

@@ -1,262 +1,270 @@
1
-import request from "@/utils/request";
1
+import request from '@/utils/request'
2 2
 
3 3
 export function postzhddToColleagueForm(data) {
4 4
   return request({
5
-    url: "Scheduling/DealManTransfer",
6
-    method: "post",
5
+    url: 'Scheduling/DealManTransfer',
6
+    method: 'post',
7 7
     data
8
-  });
8
+  })
9 9
 }
10 10
 // 获取当前部门用户
11 11
 export function getCurrentDeptUsers(params) {
12 12
   return request({
13
-    url: "GroupClass/GetUserlistByDeptIdNew",
14
-    method: "get",
13
+    url: 'GroupClass/GetUserlistByDeptIdNew',
14
+    method: 'get',
15 15
     params
16
-  });
16
+  })
17 17
 }
18 18
 
19 19
 // 工号搜索
20 20
 export function getUserMsg(params) {
21 21
   return request({
22
-    url: "UserAccount/GetModel",
23
-    method: "get",
22
+    url: 'UserAccount/GetModel',
23
+    method: 'get',
24 24
     params
25
-  });
25
+  })
26 26
 }
27 27
 // 工单类型
28 28
 export function getOrderStateData(params) {
29 29
   return request({
30
-    url: "Con_WorkOrder/GetTypeState",
31
-    method: "get",
30
+    url: 'Con_WorkOrder/GetTypeState',
31
+    method: 'get',
32 32
     params
33
-  });
33
+  })
34 34
 }
35 35
 // 投诉来源下拉数据
36 36
 export function getTouSuSelect(params) {
37 37
   return request({
38
-    url: "Dictionary/GetDicValueList",
39
-    method: "get",
38
+    url: 'Dictionary/GetDicValueList',
39
+    method: 'get',
40 40
     params
41
-  });
41
+  })
42 42
 }
43 43
 // 工单新增
44 44
 export function addOrEdittOrder(data) {
45 45
   return request({
46
-    url: "Con_WorkOrder/AddWorkOrder",
47
-    method: "post",
46
+    url: 'Con_WorkOrder/AddWorkOrder',
47
+    method: 'post',
48 48
     data
49
-  });
49
+  })
50 50
 }
51 51
 // 工单修改
52 52
 export function updateWorkOrder(data) {
53 53
   return request({
54
-    url: "Con_WorkOrder/UpdateWorkOrder",
55
-    method: "post",
54
+    url: 'Con_WorkOrder/UpdateWorkOrder',
55
+    method: 'post',
56 56
     data
57
-  });
57
+  })
58 58
 }
59 59
 // 工单删除
60 60
 export function deleteOrder(ids) {
61 61
   return request({
62
-    url: "Con_WorkOrder/DelWorkOrder",
63
-    method: "post",
62
+    url: 'Con_WorkOrder/DelWorkOrder',
63
+    method: 'post',
64 64
     data: {
65 65
       ids
66 66
     }
67
-  });
67
+  })
68 68
 }
69 69
 // 工单列表
70 70
 export function getorderList(params) {
71 71
   return request({
72
-    url: "WorkCommon/GetComList",
73
-    method: "get",
72
+    url: 'WorkCommon/GetComList',
73
+    method: 'get',
74 74
     params
75
-  });
75
+  })
76 76
 }
77 77
 // 咨询工单详情
78 78
 export function GetOrderDetail(params) {
79 79
   return request({
80
-    url: "Con_WorkOrder/GetWorkOrder",
81
-    method: "get",
80
+    url: 'Con_WorkOrder/GetWorkOrder',
81
+    method: 'get',
82 82
     params
83
-  });
83
+  })
84 84
 }
85 85
 // 工单记录
86 86
 export function GetOrderItem(data) {
87 87
   return request({
88
-    url: "Con_WorkOrder/GetItemList",
89
-    method: "get",
88
+    url: 'Con_WorkOrder/GetItemList',
89
+    method: 'get',
90 90
     data
91
-  });
91
+  })
92 92
 }
93 93
 
94 94
 // 综合调度工单撤回
95 95
 export function schedulRetractOrder(data) {
96 96
   return request({
97
-    url: "Scheduling/MyRetract",
98
-    method: "post",
97
+    url: 'Scheduling/MyRetract',
98
+    method: 'post',
99 99
     data
100
-  });
100
+  })
101 101
 }
102 102
 // 综合调度工单编辑
103 103
 export function updateSchedulingOrder(params) {
104 104
   return request({
105
-    url: "Scheduling/UpdateSchedulingWorkOrder",
106
-    method: "post",
105
+    url: 'Scheduling/UpdateSchedulingWorkOrder',
106
+    method: 'post',
107 107
     data: params
108
-  });
108
+  })
109 109
 }
110 110
 // 综合调度工单删除
111 111
 export function deleteSchedulingOrder(data) {
112 112
   return request({
113
-    url: "Scheduling/DeleteSchedulingWorkOrder",
114
-    method: "post",
113
+    url: 'Scheduling/DeleteSchedulingWorkOrder',
114
+    method: 'post',
115 115
     data
116
-  });
116
+  })
117 117
 }
118 118
 // 综合调度工单详情
119 119
 export function getSchedulingOrder(data) {
120 120
   return request({
121
-    url: "Scheduling/WorkOrderCode",
122
-    method: "get",
121
+    url: 'Scheduling/WorkOrderCode',
122
+    method: 'get',
123 123
     data
124
-  });
124
+  })
125 125
 }
126 126
 // 综合调度工单评价
127 127
 export function postschedulEvaluteWorkOrder(params) {
128 128
   return request({
129
-    url: "Scheduling/EvaluateWorkOrder",
130
-    method: "post",
129
+    url: 'Scheduling/EvaluateWorkOrder',
130
+    method: 'post',
131 131
     data: params
132
-  });
132
+  })
133 133
 }
134 134
 
135 135
 // 工单转派
136 136
 export function AssignOrder(orderid) {
137 137
   return request({
138
-    url: "Con_WorkOrder/AssignWorkOrder",
139
-    method: "post",
138
+    url: 'Con_WorkOrder/AssignWorkOrder',
139
+    method: 'post',
140 140
     data: {
141 141
       orderid
142 142
     }
143
-  });
143
+  })
144 144
 }
145 145
 // 工单确认
146 146
 export function SureOrder(id) {
147 147
   return request({
148
-    url: "Con_WorkOrder/SureWorkOrder",
149
-    method: "post",
148
+    url: 'Con_WorkOrder/SureWorkOrder',
149
+    method: 'post',
150 150
     data: {
151 151
       id
152 152
     }
153
-  });
153
+  })
154 154
 }
155 155
 // Con_WorkOrder/CompleteWo
156 156
 // 工单完结
157 157
 export function CompleteOrder(woid) {
158 158
   return request({
159
-    url: "Con_WorkOrder/CompleteWo",
160
-    method: "post",
159
+    url: 'Con_WorkOrder/CompleteWo',
160
+    method: 'post',
161 161
     data: {
162 162
       woid
163 163
     }
164
-  });
164
+  })
165 165
 }
166 166
 // 工单处理
167 167
 export function DealOrder(data) {
168 168
   return request({
169
-    url: "Con_WorkOrder/DealWorkOrder",
170
-    method: "post",
169
+    url: 'Con_WorkOrder/DealWorkOrder',
170
+    method: 'post',
171 171
     data
172
-  });
172
+  })
173 173
 }
174 174
 // 工单审核
175 175
 export function AuditOrder(data) {
176 176
   return request({
177
-    url: "Con_WorkOrder/GetApproval",
178
-    method: "post",
177
+    url: 'Con_WorkOrder/GetApproval',
178
+    method: 'post',
179 179
     data
180
-  });
180
+  })
181 181
 }
182 182
 
183 183
 // 我的提交列表
184 184
 export function mySubmitOrderList(params) {
185 185
   return request({
186
-    url: "WorkCommon/GetSubmitList",
187
-    method: "get",
186
+    url: 'WorkCommon/GetSubmitList',
187
+    method: 'get',
188 188
     params
189
-  });
189
+  })
190 190
 }
191 191
 export function mySubmitOrderListExport(params) {
192 192
   return request({
193
-    url: "WorkCommon/GetSubmitList",
194
-    method: "get",
195
-    responseType: "blob",
193
+    url: 'WorkCommon/GetSubmitList',
194
+    method: 'get',
195
+    responseType: 'blob',
196 196
     params
197
-  });
197
+  })
198 198
 }
199 199
 // 工单列表
200 200
 export function comOrderList(params) {
201 201
   return request({
202
-    url: "WorkCommon/GetComList",
203
-    method: "get",
202
+    url: 'WorkCommon/GetComList',
203
+    method: 'get',
204 204
     params
205
-  });
205
+  })
206 206
 }
207 207
 export function getListExpt(params) {
208 208
   return request({
209
-    url: "WorkCommon/ExportGetComList",
210
-    method: "get",
211
-    responseType: "blob",
209
+    url: 'WorkCommon/ExportGetComList',
210
+    method: 'get',
211
+    responseType: 'blob',
212 212
     params
213
-  });
213
+  })
214 214
 }
215 215
 // 我的提交列表详情页
216 216
 export function GetFaultRepairDetail(params) {
217 217
   return request({
218
-    url: "FaultRepair/GetWorkOrder",
219
-    method: "get",
218
+    url: 'FaultRepair/GetWorkOrder',
219
+    method: 'get',
220 220
     params
221
-  });
221
+  })
222 222
 }
223 223
 // 故障报修编辑
224 224
 export function UpdateFaultRepair(params) {
225 225
   return request({
226
-    url: "FaultRepair/UpdateFaultRepairWorkOrder",
227
-    method: "post",
226
+    url: 'FaultRepair/UpdateFaultRepairWorkOrder',
227
+    method: 'post',
228 228
     data: params
229
-  });
229
+  })
230 230
 }
231 231
 // 我的提交撤回后故障报修编辑
232 232
 export function MyUpdateFaultRepairWorkOrder(params) {
233 233
   return request({
234
-    url: "FaultRepair/MyUpdateFaultRepairWorkOrder",
235
-    method: "post",
234
+    url: 'FaultRepair/MyUpdateFaultRepairWorkOrder',
235
+    method: 'post',
236 236
     params
237
-  });
237
+  })
238 238
 }
239 239
 // 催单
240 240
 export function postUrgeWorkOrder(params) {
241 241
   return request({
242
-    url: "WorkCommon/UrgeWorkOrder",
243
-    method: "post",
242
+    url: 'WorkCommon/UrgeWorkOrder',
243
+    method: 'post',
244 244
     params
245
-  });
245
+  })
246 246
 }
247 247
 // 完成
248 248
 export function postFinishWorkOrder(params) {
249 249
   return request({
250
-    url: "WorkCommon/FinishWorkOrder",
251
-    method: "post",
250
+    url: 'WorkCommon/FinishWorkOrder',
251
+    method: 'post',
252 252
     params
253
-  });
253
+  })
254 254
 }
255 255
 // 咨询-就诊记录
256 256
 export function GetMedicalRecord(params) {
257 257
   return request({
258
-    url: "Patient/GetMedicalRecord",
259
-    method: "get",
258
+    url: 'Patient/GetMedicalRecord',
259
+    method: 'get',
260 260
     params
261
-  });
261
+  })
262
+}
263
+// 眼睛
264
+export function GetApplicantPhone(params) {
265
+  return request({
266
+    url: 'WorkCommon/GetApplicantPhone',
267
+    method: 'get',
268
+    params
269
+  })
262 270
 }

+ 8 - 0
CallCenterWeb.UI/RMYY/src/api/systemSetup/roleSetting/userManage.js

@@ -94,3 +94,11 @@ export function getUserExport(params) {
94 94
     params
95 95
   })
96 96
 }
97
+// 眼睛
98
+export function GetCompletePhone(params) {
99
+  return request({
100
+    url: 'UserAccount/GetCompletePhone',
101
+    method: 'get',
102
+    params
103
+  })
104
+}

+ 18 - 4
CallCenterWeb.UI/RMYY/src/views/callScreen/components/hisList.vue

@@ -14,17 +14,17 @@
14 14
         <th>性别:</th>
15 15
         <td>{{ hismsg.xbmc || "-"  }}</td>
16 16
         <th>联系电话:</th>
17
-        <td>{{ hismsg.lxdh || "-" }}</td>
17
+        <td>{{ hismsg.lxdh || "-" }}<i v-show="hismsg.zjhm&&clickbefore==0" class="el-icon-view" @click="clickEye"></i></td>
18 18
       </tr>
19 19
       <tr>
20 20
         <th>出生日期:</th>
21 21
         <td>{{ hismsg.csrq || "-"  }}</td>
22 22
         <th>身份证号:</th>
23
-        <td>{{ hismsg.zjhm || "-"  }}</td>
23
+        <td>{{ hismsg.zjhm || "-"  }}<i v-show="hismsg.zjhm&&clickbefore==0" class="el-icon-view" @click="clickEye"></i></td>
24 24
       </tr>
25 25
       <tr>
26 26
         <th>家庭地址:</th>
27
-        <td colspan="5">{{ hismsg.jtdz || "-" }}</td>
27
+        <td colspan="5">{{ hismsg.jtdz || "-" }}<i v-show="hismsg.jtdz&&clickbefore==0" class="el-icon-view" @click="clickEye"></i></td>
28 28
       </tr>
29 29
     </table>
30 30
     <p style="font-weight: bold">住院记录</p>
@@ -231,6 +231,7 @@ import {
231 231
   GetRcord,
232 232
   GetDicValueList,
233 233
   GetUrl,
234
+  GetPatientModel
234 235
 } from "@/api/callScreen/callScreen";
235 236
 import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
236 237
 import hischange from "./hischange";
@@ -248,6 +249,7 @@ export default {
248 249
 
249 250
   data() {
250 251
     return {
252
+      clickbefore:0,
251 253
       callNum: "", // 来电号码
252 254
       loading: false,
253 255
       typeSecondId: "",
@@ -316,6 +318,18 @@ export default {
316 318
     }
317 319
   },
318 320
   methods: {
321
+    clickEye(){
322
+      const params = {
323
+        zsyh: window.localStorage.getItem("zsyh")
324
+      }
325
+      GetPatientModel(params).then(res=>{
326
+        const data = res.rows[0]
327
+        this.hismsg.lxdh = data.lxdh
328
+        this.hismsg.zjhm = data.zjhm
329
+        this.hismsg.jtdz = data.jtdz
330
+        this.clickbefore = 1
331
+      })
332
+    },
319 333
     getList() {
320 334
         const params = {
321 335
           zsyh: window.localStorage.getItem("zsyh"),
@@ -340,7 +354,7 @@ export default {
340 354
             this.getRecord("E", response.rows[0].zsyh);
341 355
             this.getRecord("P", response.rows[0].zsyh);
342 356
           }
343
-        });    
357
+        });
344 358
     },
345 359
     changeHis() {
346 360
       this.$layer.iframe({

+ 19 - 4
CallCenterWeb.UI/RMYY/src/views/comDispatch/components/dispatchdetail.vue

@@ -31,7 +31,8 @@
31 31
                 <td v-if="orderDetailData.applicantname">
32 32
                   {{ orderDetailData.applicantname }}-{{
33 33
                     orderDetailData.F_Applicant
34
-                  }}({{ orderDetailData.F_Phone }})
34
+                  }}({{ orderDetailData.F_Phone }})
35
+                  <i v-show="orderDetailData.F_Phone&&clickbefore==0" class="el-icon-view" @click="clickEye"></i>
35 36
                 </td>
36 37
                 <td v-if="!orderDetailData.applicantname">-</td>
37 38
                 <th>申请科室:</th>
@@ -272,7 +273,10 @@
272 273
   } from "vuex";
273 274
   import {
274 275
     GetOrderDetail
275
-  } from "@/api/comDispatch/addOrEditDispatch";
276
+  } from "@/api/comDispatch/addOrEditDispatch";
277
+  import {
278
+    GetApplicantPhone
279
+  } from "@/api/orderManagement/orderList";
276 280
   import dispatchDetail from "../../comDispatch/components/dispatchdetail.vue";
277 281
   import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
278 282
   let that;
@@ -300,7 +304,8 @@
300 304
       },
301 305
     },
302 306
     data() {
303
-      return {
307
+      return {
308
+        clickbefore:0,
304 309
         isDD: window.localStorage.getItem("roleCode"), //角色是不是调度
305 310
         texts: ["不满意", "不满意", "基本满意", "满意", "满意"],
306 311
         imgUrl: "",
@@ -363,7 +368,17 @@
363 368
       this.getDetail("2");
364 369
       this.getDetail("3");
365 370
     },
366
-    methods: {
371
+    methods: {
372
+      clickEye(){
373
+        const params = {
374
+          workordercode:this.orderDetailData.F_WorkOrderCode,
375
+          type:2000
376
+        }
377
+        GetApplicantPhone(params).then(res=>{
378
+          this.orderDetailData.F_Phone = res
379
+          this.clickbefore = 1
380
+        })
381
+      },
367 382
       hadndleOrderCode(id) {
368 383
         this.$layer.iframe({
369 384
           content: {

+ 55 - 45
CallCenterWeb.UI/RMYY/src/views/dashboard/index.vue

@@ -96,7 +96,10 @@
96 96
 </template>
97 97
 
98 98
 <script>
99
-  import { getAllowUserDept } from "@/api/login"
99
+  import {
100
+    getAllowUserDept,
101
+    GetUserPasswordTime
102
+  } from "@/api/login"
100 103
   import {
101 104
     GetTopCountByNow,
102 105
     GetConversation24ByNow,
@@ -148,46 +151,8 @@
148 151
     },
149 152
     created() {
150 153
       this.getAllowDept()
151
-
152
-      const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*_).{8,20}$/;
153
-      const pass = window.localStorage.getItem('loginpass');
154
-      if(!reg.test(pass)){
155
-        this.$alert('您的密码不符合规范,请更新密码', '提示', {
156
-                  showClose: false,
157
-                  confirmButtonText: '确定',
158
-                  callback: action => {
159
-                        this.$layer.iframe({
160
-                          content: {
161
-                            content: permsgEdit, // 传递的组件对象
162
-                            parent: this, // 当前的vue对象
163
-                            data: {}, // props
164
-                          },
165
-                          area: ["50%", "70%"],
166
-                          title: "个人中心",
167
-                        });
168
-                  }
169
-                });
170
-        // this.$confirm("您的密码不符合规范,请更新密码!", "提示", {
171
-        //   showClose: false,
172
-        //   confirmButtonText: "确定",
173
-        //   cancelButtonText: "取消",
174
-        //   type: "warning",
175
-        // })
176
-        //   .then(() => {
177
-        //     this.$layer.iframe({
178
-        //       content: {
179
-        //         content: permsgEdit, // 传递的组件对象
180
-        //         parent: this, // 当前的vue对象
181
-        //         data: {}, // props
182
-        //       },
183
-        //       area: ["50%", "70%"],
184
-        //       title: "个人中心",
185
-        //     });
186
-        //   })
187
-        //   .catch(() => {
188
-        //     this.$message("已取消");
189
-        //   });
190
-      }
154
+      this.updatePass()
155
+      this.isLongPass()
191 156
     },
192 157
     mounted() {
193 158
       if (window.localStorage.getItem('roleCode') === 'DDZX' || window.localStorage.getItem('roleCode') === 'DDBZ') {
@@ -214,14 +179,59 @@
214 179
       this.getNotice()
215 180
     },
216 181
     methods: {
217
-      getAllowDept(){
182
+      updatePass(){
183
+        const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*_).{8,20}$/;
184
+        const pass = window.localStorage.getItem('loginpass');
185
+        if (!reg.test(pass)) {
186
+          this.$alert('您的密码不符合规范,请更新密码!', '提示', {
187
+            showClose: false,
188
+            confirmButtonText: '确定',
189
+            callback: action => {
190
+              this.$layer.iframe({
191
+                content: {
192
+                  content: permsgEdit, // 传递的组件对象
193
+                  parent: this, // 当前的vue对象
194
+                  data: {}, // props
195
+                },
196
+                area: ["50%", "70%"],
197
+                title: "个人中心",
198
+              });
199
+            }
200
+          });
201
+        }
202
+      },
203
+      isLongPass(){
204
+        const params = {}
205
+        GetUserPasswordTime(params).then(res => {
206
+          if(res.state == 'success'){
207
+            if(res.data == 1){
208
+              this.$alert('您的密码已经超三个月未修改,请更新密码!', '提示', {
209
+                showClose: false,
210
+                confirmButtonText: '确定',
211
+                callback: action => {
212
+                  this.$layer.iframe({
213
+                    content: {
214
+                      content: permsgEdit, // 传递的组件对象
215
+                      parent: this, // 当前的vue对象
216
+                      data: {}, // props
217
+                    },
218
+                    area: ["50%", "70%"],
219
+                    title: "个人中心",
220
+                  });
221
+                }
222
+              });
223
+            }
224
+          }
225
+        })
226
+      },
227
+      getAllowDept() {
218 228
         //是否有dept,有的话不弹框
219
-        if(window.localStorage.getItem('oadept')!='0'){
229
+        if (window.localStorage.getItem('oadept') != '0') {
220 230
           return
221 231
         }
222 232
         const params = {}
223
-        getAllowUserDept(params).then(res=>{
224
-          if(res.message == '需要选择科室'){
233
+        getAllowUserDept(params).then(res => {
234
+          if (res.message == '需要选择科室') {
225 235
             this.$layer.iframe({
226 236
               content: {
227 237
                 content: changeDept, // 传递的组件对象

+ 13 - 1
CallCenterWeb.UI/RMYY/src/views/orderManage/components/askdetail.vue

@@ -50,7 +50,7 @@
50 50
               </tr>
51 51
               <tr>
52 52
                 <th>联系电话:</th>
53
-                <td>{{ orderDetailData.F_Phon }}</td>
53
+                <td>{{ orderDetailData.F_Phon }}<i v-show="orderDetailData.F_Phon&&clickbefore==0" class="el-icon-view" @click="clickEye"></i></td>
54 54
                 <th>家庭住址:</th>
55 55
                 <td colspan="3">{{ orderDetailData.F_CusAddress || "-" }}</td>
56 56
               </tr>
@@ -299,6 +299,7 @@ import {
299 299
   GetOrderDetail,
300 300
   GetOrderItem,
301 301
   GetMedicalRecord,
302
+  GetApplicantPhone
302 303
 } from "@/api/orderManagement/orderList";
303 304
 import { GetUrl } from "@/api/callScreen/callScreen";
304 305
 import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
@@ -320,6 +321,7 @@ export default {
320 321
   },
321 322
   data() {
322 323
     return {
324
+      clickbefore:0,
323 325
       jzlb: "1",
324 326
       userid: window.localStorage.getItem("storageUsercode"),
325 327
       zjh: "",
@@ -394,6 +396,16 @@ export default {
394 396
     }
395 397
   },
396 398
   methods: {
399
+    clickEye(){
400
+      const params = {
401
+        workordercode:this.orderDetailData.F_WorkOrderCode,
402
+        type:this.orderDetailData.F_type1
403
+      }
404
+      GetApplicantPhone(params).then(res=>{
405
+        this.orderDetailData.F_Phon = res
406
+        this.clickbefore = 1
407
+      })
408
+    },
397 409
     handleClick(tab, event) {
398 410
       console.log(tab, event);
399 411
     },

+ 13 - 0
CallCenterWeb.UI/RMYY/src/views/orderManage/components/orderDetail.vue

@@ -41,6 +41,7 @@
41 41
                   {{ orderDetailData.applicantname }}-{{
42 42
                     orderDetailData.F_Applicant
43 43
                   }}({{ orderDetailData.F_Applicantsphone }})
44
+                  <i v-show="orderDetailData.F_Applicantsphone&&clickbefore==0" class="el-icon-view" @click="clickEye"></i>
44 45
                 </td>
45 46
                 <th>申请科室:</th>
46 47
                 <td>{{ orderDetailData.F_MaintenanceDept }}</td>
@@ -396,6 +397,7 @@ import {
396 397
   GetOrderDetail,
397 398
   GetOrderItem,
398 399
   GetFaultRepairDetail,
400
+  GetApplicantPhone
399 401
 } from "@/api/orderManagement/orderList";
400 402
 import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
401 403
 let that;
@@ -422,6 +424,7 @@ export default {
422 424
   },
423 425
   data() {
424 426
     return {
427
+      clickbefore:0,
425 428
       texts: ["不满意", "不满意", "基本满意", "满意", "满意"],
426 429
       activeName: "1",
427 430
       pageParams: {
@@ -454,6 +457,16 @@ export default {
454 457
     this.getDetailTab(this.rowid, "4"); // 维修记录
455 458
   },
456 459
   methods: {
460
+    clickEye(){
461
+      const params = {
462
+        workordercode:this.orderDetailData.F_WorkOrderCode,
463
+        type:3000
464
+      }
465
+      GetApplicantPhone(params).then(res=>{
466
+        this.orderDetailData.F_Applicantsphone = res
467
+        this.clickbefore = 1
468
+      })
469
+    },
457 470
     handleClick(tab, event) {
458 471
       this.getDetailTab(this.rowid, this.activeName);
459 472
     },

+ 330 - 449
CallCenterWeb.UI/RMYY/src/views/systemSetup/roleSetting/userManage/index.vue

@@ -3,510 +3,391 @@
3 3
     <div class="filter-container">
4 4
       <el-row :gutter="20">
5 5
         <el-col :span="6">
6
-          <el-alert
7
-            :closable="false"
8
-            title="科室列表"
9
-            type="success"
10
-            style="margin-bottom: 5px"
11
-          />
12
-          <el-input
13
-            placeholder="请输入科室名称"
14
-            size="medium"
15
-            clearable
16
-            v-model="filterText"
17
-          >
6
+          <el-alert :closable="false" title="科室列表" type="success" style="margin-bottom: 5px" />
7
+          <el-input placeholder="请输入科室名称" size="medium" clearable v-model="filterText">
18 8
           </el-input>
19 9
           <div style="height: 700px; overflow-y: auto">
20
-            <el-tree
21
-              ref="treeRef"
22
-              :props="defaultProps"
23
-              :data="treelists"
24
-              :highlight-current="true"
25
-              :default-expand-all="false"
26
-              node-key="id"
27
-              :filter-node-method="filterNode"
28
-              @node-click="handleNodeClick"
29
-            />
10
+            <el-tree ref="treeRef" :props="defaultProps" :data="treelists" :highlight-current="true"
11
+              :default-expand-all="false" node-key="id" :filter-node-method="filterNode"
12
+              @node-click="handleNodeClick" />
30 13
           </div>
31 14
         </el-col>
32 15
         <el-col :span="18">
33
-          <el-alert
34
-            :closable="false"
35
-            title="用户列表"
36
-            type="success"
37
-            style="margin-bottom: 5px"
38
-          />
39
-          <el-alert
40
-            :closable="false"
41
-            title="上传文件需要严格按照下载的EXCEL模板进行填写!"
42
-            type="warning"
43
-            style="margin-bottom: 7px"
44
-          />
45
-          <el-input
46
-            v-model="keyword"
47
-            placeholder="请输入工号,姓名,电话"
48
-            class="filter-item"
49
-            size="medium"
50
-            clearable
51
-            style="width: 260px"
52
-          />
53
-          <el-button
54
-            type="primary"
55
-            class="filter-item"
56
-            icon="el-icon-search"
57
-            @click="btn_search"
58
-            >搜索</el-button
59
-          >
60
-          <el-button
61
-            v-permission="'add_userManage'"
62
-            type="primary"
63
-            class="filter-item"
64
-            icon="el-icon-plus"
65
-            @click="btn_add"
66
-            >添加</el-button
67
-          >
68
-          <el-button type="primary" class="filter-item" @click="btn_onimport"
69
-            >批量导入</el-button
70
-          >
71
-          <el-button type="primary" class="filter-item" @click="btn_export"
72
-            >批量导出</el-button
73
-          >
74
-          <a
75
-            href="/static/xls/userImport.xls"
76
-            download="用户模板.xls"
77
-            title="点击下载模板"
78
-            style="line-height: 32px; color: #409eff; font-size: 14px"
79
-            >点击下载用户模板</a
80
-          >
81
-          <el-table
82
-            v-loading="loading"
83
-            :data="dataLists"
84
-            border
85
-            stripe
86
-            @selection-change="changeSelects"
87
-          >
88
-            <el-table-column
89
-              prop="F_UserCode"
90
-              label="工号"
91
-              align="center"
92
-              min-width=""
93
-            />
94
-            <el-table-column
95
-              prop="F_UserName"
96
-              label="姓名"
97
-              align="center"
98
-              min-width=""
99
-            />
100
-            <el-table-column
101
-              prop="F_DeptName"
102
-              label="科室"
103
-              align="center"
104
-              min-width=""
105
-            />
106
-            <el-table-column
107
-              prop="F_RoleName"
108
-              label="角色"
109
-              align="center"
110
-              min-width=""
111
-            />
112
-            <el-table-column
113
-              prop="F_Title"
114
-              label="职称"
115
-              align="center"
116
-              min-width=""
117
-            />
118
-            <el-table-column
119
-              prop="F_Job"
120
-              label="职务"
121
-              align="center"
122
-              min-width=""
123
-            />
124
-            <el-table-column
125
-              prop="F_Telephone"
126
-              label="电话"
127
-              align="center"
128
-              min-width=""
129
-            />
16
+          <el-alert :closable="false" title="用户列表" type="success" style="margin-bottom: 5px" />
17
+          <el-alert :closable="false" title="上传文件需要严格按照下载的EXCEL模板进行填写!" type="warning" style="margin-bottom: 7px" />
18
+          <el-input v-model="keyword" placeholder="请输入工号,姓名,电话" class="filter-item" size="medium" clearable
19
+            style="width: 260px" />
20
+          <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
21
+          <el-button v-permission="'add_userManage'" type="primary" class="filter-item" icon="el-icon-plus"
22
+            @click="btn_add">添加</el-button>
23
+          <el-button type="primary" class="filter-item" @click="btn_onimport">批量导入</el-button>
24
+          <el-button type="primary" class="filter-item" @click="btn_export">批量导出</el-button>
25
+          <a href="/static/xls/userImport.xls" download="用户模板.xls" title="点击下载模板"
26
+            style="line-height: 32px; color: #409eff; font-size: 14px">点击下载用户模板</a>
27
+          <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
28
+            <el-table-column prop="F_UserCode" label="工号" align="center" min-width="" />
29
+            <el-table-column prop="F_UserName" label="姓名" align="center" min-width="" />
30
+            <el-table-column prop="F_DeptName" label="科室" align="center" min-width="" />
31
+            <el-table-column prop="F_RoleName" label="角色" align="center" min-width="" />
32
+            <el-table-column prop="F_Title" label="职称" align="center" min-width="" />
33
+            <el-table-column prop="F_Job" label="职务" align="center" min-width="" />
34
+            <el-table-column prop="F_Telephone" label="电话" align="center" min-width="">
35
+              <template slot-scope="scope">
36
+                <span>{{ scope.row.F_Telephone }}</span>
37
+                <i class="el-icon-view" @click="clickEye(scope.row,scope.row.F_UserId)"></i>
38
+              </template>
39
+            </el-table-column>
130 40
             <el-table-column label="用户账号状态" align="center" min-width="">
131 41
               <template slot-scope="scope">
132
-                <span v-if="scope.row.F_EnableFlag == 0" style="color: #f56c6c"
133
-                  >禁用</span
134
-                >
135
-                <span v-if="scope.row.F_EnableFlag == 1" style="color: #67c23a"
136
-                  >启用</span
137
-                >
138
-                <span v-if="scope.row.F_EnableFlag == 2" style="color: #f56c6c"
139
-                  >锁定</span
140
-                >
42
+                <span v-if="scope.row.F_EnableFlag == 0" style="color: #f56c6c">禁用</span>
43
+                <span v-if="scope.row.F_EnableFlag == 1" style="color: #67c23a">启用</span>
44
+                <span v-if="scope.row.F_EnableFlag == 2" style="color: #f56c6c">锁定</span>
141 45
               </template>
142 46
             </el-table-column>
143
-            <el-table-column
144
-              label="操作"
145
-              width="200"
146
-              align="center"
147
-              class-name="oparate_btn"
148
-              fixed="right"
149
-            >
47
+            <el-table-column label="操作" width="200" align="center" class-name="oparate_btn" fixed="right">
150 48
               <template slot-scope="scope">
151
-                <el-button
152
-                  v-if="scope.row.F_EnableFlag == 1"
153
-                  type="danger"
154
-                  plain
155
-                  @click="onOff(scope.row.F_UserId)"
156
-                  >禁用
49
+                <el-button v-if="scope.row.F_EnableFlag == 1" type="danger" plain @click="onOff(scope.row.F_UserId)">禁用
157 50
                 </el-button>
158
-                <el-button
159
-                  v-if="
51
+                <el-button v-if="
160 52
                     scope.row.F_EnableFlag == 0 || scope.row.F_EnableFlag == 2
161
-                  "
162
-                  type="success"
163
-                  plain
164
-                  @click="onOpen(scope.row.F_UserId)"
165
-                  >启用
53
+                  " type="success" plain @click="onOpen(scope.row.F_UserId)">启用
166 54
                 </el-button>
167
-                <el-button
168
-                  v-permission="'edit_userManage'"
169
-                  size="mini"
170
-                  plain
171
-                  type="primary"
172
-                  @click="
55
+                <el-button v-permission="'edit_userManage'" size="mini" plain type="primary" @click="
173 56
                     btn_edit(
174 57
                       scope.row.F_UserId.toString(),
175 58
                       scope.row.F_UserCode.toString()
176 59
                     )
177
-                  "
178
-                  >编辑</el-button
179
-                >
60
+                  ">编辑</el-button>
180 61
               </template>
181 62
             </el-table-column>
182 63
           </el-table>
183
-          <pagination
184
-            v-show="pageParams.total > 0"
185
-            :total="pageParams.total"
186
-            :pageindex.sync="pageParams.pageindex"
187
-            :pagesize.sync="pageParams.pagesize"
188
-            class="pagination"
189
-            @pagination="getList"
190
-          />
64
+          <pagination v-show="pageParams.total > 0" :total="pageParams.total" :pageindex.sync="pageParams.pageindex"
65
+            :pagesize.sync="pageParams.pagesize" class="pagination" @pagination="getList" />
191 66
         </el-col>
192 67
       </el-row>
193 68
     </div>
194 69
     <el-dialog :visible.sync="dialogTableVisible" title="导入用户">
195
-      <el-upload
196
-        :headers="headers"
197
-        :data="importData"
198
-        accept=".xls"
199
-        :on-remove="handle_remove"
200
-        :on-success="handle_success"
201
-        :limit="1"
202
-        :action="importUrl"
203
-        style="margin-bottom: 30px"
204
-      >
205
-        <el-button slot="trigger" size="small" type="primary"
206
-          >上传文件</el-button
207
-        >
70
+      <el-upload :headers="headers" :data="importData" accept=".xls" :on-remove="handle_remove"
71
+        :on-success="handle_success" :limit="1" :action="importUrl" style="margin-bottom: 30px">
72
+        <el-button slot="trigger" size="small" type="primary">上传文件</el-button>
208 73
       </el-upload>
209 74
     </el-dialog>
210 75
   </div>
211 76
 </template>
212 77
 
213 78
 <script>
214
-import {
215
-  getUserAccountLists,
216
-  deleteUserAccount,
217
-  getDelUsers,
218
-  getUserInput,
219
-  getUserExport,
220
-} from "@/api/systemSetup/roleSetting/userManage";
221
-import { getDeptTree } from "@/api/systemSetup/roleSetting/userManage";
222
-import { pickerOptions, buildTree, filterTreeDatas } from "@/utils";
223
-import { exportExcel } from "@/utils";
224
-import addOrEdit from "./addOrEdit";
225
-// import modifyPass from './modifyPass.vue'
226
-import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
79
+  import {
80
+    getUserAccountLists,
81
+    deleteUserAccount,
82
+    getDelUsers,
83
+    getUserInput,
84
+    getUserExport,
85
+    GetCompletePhone
86
+  } from "@/api/systemSetup/roleSetting/userManage";
87
+  import {
88
+    getDeptTree
89
+  } from "@/api/systemSetup/roleSetting/userManage";
90
+  import {
91
+    pickerOptions,
92
+    buildTree,
93
+    filterTreeDatas
94
+  } from "@/utils";
95
+  import {
96
+    exportExcel
97
+  } from "@/utils";
98
+  import addOrEdit from "./addOrEdit";
99
+  // import modifyPass from './modifyPass.vue'
100
+  import Pagination from "@/components/context/Pagination"; // 对el-pagination 二次封装
227 101
 
228
-export default {
229
-  name: "UserManage",
230
-  components: {
231
-    Pagination,
232
-  },
233
-  data() {
234
-    return {
235
-      filterText: "",
236
-      loading: false,
237
-      dialogTableVisible: false,
238
-      roleId: "",
239
-      keyword: "",
240
-      deptid: "",
241
-      treelists: [], // 菜单树数据
242
-      parentid: "-1",
243
-      pageParams: {
244
-        pageindex: 1, // 当前第几页
245
-        pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
246
-        total: 0, // 总共多少数据
247
-      },
248
-      defaultProps: {
249
-        children: "children",
250
-        label: "text",
251
-        value: "id",
252
-      },
253
-      importData: {
254
-        deptid: "",
255
-      },
256
-      // repairImageid: '',
257
-      headers: {
258
-        Authorization: "Bearer " + localStorage.getItem("Admin-Token"),
259
-      },
260
-      importUrl:
261
-        this.$store.getters.serverConfig.BASE_API +
262
-        "UserAccount/UserInput?token=" +
263
-        localStorage.getItem("Admin-Token"),
264
-      multipleSelection: [], // 选中的数据
265
-      dataLists: [], // 列表数据
266
-      hosid: "",
267
-      // 自定义菜单下拉数据的key值
268
-      props: {
269
-        value: "id",
270
-        label: "text",
271
-      },
272
-    };
273
-  },
274
-  created() {
275
-    this.getList();
276
-    this.getTreeList();
277
-    document.onkeyup = (e) => {
278
-      if (e.keyCode === 13) {
279
-        this.getList();
280
-      }
281
-    };
282
-  },
283
-  watch: {
284
-    filterText(val) {
285
-      this.$refs.treeRef.filter(val);
286
-    },
287
-  },
288
-  methods: {
289
-    filterNode(value, data) {
290
-      if (!value) return true;
291
-      return data.text.indexOf(value) !== -1;
102
+  export default {
103
+    name: "UserManage",
104
+    components: {
105
+      Pagination,
292 106
     },
293
-    getList() {
294
-      // this.loading = true
295
-      return new Promise((resolve) => {
296
-        const params = {
297
-          page: this.pageParams.pageindex, // 第几页
298
-          pagesize: this.pageParams.pagesize, // 每页几条信息
299
-          key: this.keyword, // 否	string	模糊查询
300
-          deptid: this.deptid,
301
-          woid: this.hosid,
302
-        };
303
-        getUserAccountLists(params).then((response) => {
304
-          // this.loading = false
305
-          this.pageParams.total = response.total;
306
-          this.dataLists = response.rows;
307
-        });
308
-        resolve();
309
-      });
310
-    },
311
-    btn_onimport() {
312
-      if (this.deptid == "") {
313
-        this.$message.warning("请选择部门");
314
-        return;
315
-      }
316
-      this.dialogTableVisible = true;
317
-    },
318
-    // 复选框状态改变
319
-    changeSelects(val) {
320
-      this.multipleSelection = val;
107
+    data() {
108
+      return {
109
+        filterText: "",
110
+        loading: false,
111
+        dialogTableVisible: false,
112
+        roleId: "",
113
+        keyword: "",
114
+        deptid: "",
115
+        treelists: [], // 菜单树数据
116
+        parentid: "-1",
117
+        pageParams: {
118
+          pageindex: 1, // 当前第几页
119
+          pagesize: Number(this.$store.getters.serverConfig.PAGESIZE), // 每页几条数据
120
+          total: 0, // 总共多少数据
121
+        },
122
+        defaultProps: {
123
+          children: "children",
124
+          label: "text",
125
+          value: "id",
126
+        },
127
+        importData: {
128
+          deptid: "",
129
+        },
130
+        // repairImageid: '',
131
+        headers: {
132
+          Authorization: "Bearer " + localStorage.getItem("Admin-Token"),
133
+        },
134
+        importUrl: this.$store.getters.serverConfig.BASE_API +
135
+          "UserAccount/UserInput?token=" +
136
+          localStorage.getItem("Admin-Token"),
137
+        multipleSelection: [], // 选中的数据
138
+        dataLists: [], // 列表数据
139
+        hosid: "",
140
+        // 自定义菜单下拉数据的key值
141
+        props: {
142
+          value: "id",
143
+          label: "text",
144
+        },
145
+      };
321 146
     },
322
-    btn_search() {
323
-      this.pageParams.pageindex = 1;
147
+    created() {
324 148
       this.getList();
149
+      this.getTreeList();
150
+      document.onkeyup = (e) => {
151
+        if (e.keyCode === 13) {
152
+          this.getList();
153
+        }
154
+      };
325 155
     },
326
-    btn_add() {
327
-      this.$layer.iframe({
328
-        content: {
329
-          content: addOrEdit, // 传递的组件对象
330
-          parent: this, // 当前的vue对象
331
-          data: {
332
-            addDeptid: this.deptid.toString(),
333
-          }, // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
334
-        },
335
-        area: ["50%", "85%"],
336
-        title: "添加用户信息",
337
-      });
338
-    },
339
-    btn_edit(editId, usercode) {
340
-      this.$layer.iframe({
341
-        content: {
342
-          content: addOrEdit, // 传递的组件对象
343
-          parent: this, // 当前的vue对象
344
-          data: {
345
-            rowid: editId,
346
-            usercodeList: usercode,
347
-          }, // props
348
-        },
349
-        area: ["50%", "80%"],
350
-        title: "编辑用户信息",
351
-      });
156
+    watch: {
157
+      filterText(val) {
158
+        this.$refs.treeRef.filter(val);
159
+      },
352 160
     },
353
-    // btn_modifyPass(editId) {
354
-    // this.$layer.iframe({
355
-    //   content: {
356
-    //     content: modifyPass, // 传递的组件对象
357
-    //     parent: this, // 当前的vue对象
358
-    //     data: {
359
-    //       rowid: editId
360
-    //     } // props
361
-    //   },
362
-    //   area: ['40%', '360px'],
363
-    //   title: '修改密码'
364
-    // })
365
-    // },
366
-    btn_delete(id) {
367
-      this.$confirm("您确定要将此用户信息删除吗?", "提示", {
368
-        confirmButtonText: "确定",
369
-        cancelButtonText: "取消",
370
-        type: "warning",
371
-      })
372
-        .then(() => {
373
-          const params = {
374
-            ids: id,
375
-            state: 1, // 0启用1删除2禁用
376
-          };
377
-          deleteUserAccount(params).then((response) => {
378
-            if (response.state.toLowerCase() === "success") {
379
-              this.getList();
380
-              this.$message.success("删除成功!");
381
-            }
382
-          });
161
+    methods: {
162
+      clickEye(row,id){
163
+        const params = {
164
+          userid: id
165
+        }
166
+        GetCompletePhone(params).then(res=>{
167
+          row.F_Telephone = res
383 168
         })
384
-        .catch(() => {
385
-          this.$message.info("已取消删除");
386
-        });
387
-    },
388
-    onOpen(id) {
389
-      this.$confirm("您确定要将此用户启用吗?", "提示", {
390
-        confirmButtonText: "确定",
391
-        cancelButtonText: "取消",
392
-        type: "warning",
393
-      })
394
-        .then(() => {
169
+      },
170
+      filterNode(value, data) {
171
+        if (!value) return true;
172
+        return data.text.indexOf(value) !== -1;
173
+      },
174
+      getList() {
175
+        // this.loading = true
176
+        return new Promise((resolve) => {
395 177
           const params = {
396
-            ids: id,
397
-            state: 1,
178
+            page: this.pageParams.pageindex, // 第几页
179
+            pagesize: this.pageParams.pagesize, // 每页几条信息
180
+            key: this.keyword, // 否	string	模糊查询
181
+            deptid: this.deptid,
182
+            woid: this.hosid,
398 183
           };
399
-          getDelUsers(params).then((response) => {
400
-            if (response.state.toLowerCase() === "success") {
401
-              this.getList();
402
-              this.$message.success("启用成功!");
403
-            }
184
+          getUserAccountLists(params).then((response) => {
185
+            // this.loading = false
186
+            this.pageParams.total = response.total;
187
+            this.dataLists = response.rows;
404 188
           });
405
-        })
406
-        .catch(() => {
407
-          this.$message("已取消");
189
+          resolve();
408 190
         });
409
-    },
410
-    onOff(id) {
411
-      this.$confirm("您确定要将此用户禁用吗?", "提示", {
412
-        confirmButtonText: "确定",
413
-        cancelButtonText: "取消",
414
-        type: "warning",
415
-      })
416
-        .then(() => {
417
-          const params = {
418
-            ids: id,
419
-            state: 0,
420
-          };
421
-          getDelUsers(params).then((response) => {
191
+      },
192
+      btn_onimport() {
193
+        if (this.deptid == "") {
194
+          this.$message.warning("请选择部门");
195
+          return;
196
+        }
197
+        this.dialogTableVisible = true;
198
+      },
199
+      // 复选框状态改变
200
+      changeSelects(val) {
201
+        this.multipleSelection = val;
202
+      },
203
+      btn_search() {
204
+        this.pageParams.pageindex = 1;
205
+        this.getList();
206
+      },
207
+      btn_add() {
208
+        this.$layer.iframe({
209
+          content: {
210
+            content: addOrEdit, // 传递的组件对象
211
+            parent: this, // 当前的vue对象
212
+            data: {
213
+              addDeptid: this.deptid.toString(),
214
+            }, // props//该方法会自动添加一个key为layerid的值, 该值为创建层的id, 可以直接使用
215
+          },
216
+          area: ["50%", "85%"],
217
+          title: "添加用户信息",
218
+        });
219
+      },
220
+      btn_edit(editId, usercode) {
221
+        this.$layer.iframe({
222
+          content: {
223
+            content: addOrEdit, // 传递的组件对象
224
+            parent: this, // 当前的vue对象
225
+            data: {
226
+              rowid: editId,
227
+              usercodeList: usercode,
228
+            }, // props
229
+          },
230
+          area: ["50%", "80%"],
231
+          title: "编辑用户信息",
232
+        });
233
+      },
234
+      // btn_modifyPass(editId) {
235
+      // this.$layer.iframe({
236
+      //   content: {
237
+      //     content: modifyPass, // 传递的组件对象
238
+      //     parent: this, // 当前的vue对象
239
+      //     data: {
240
+      //       rowid: editId
241
+      //     } // props
242
+      //   },
243
+      //   area: ['40%', '360px'],
244
+      //   title: '修改密码'
245
+      // })
246
+      // },
247
+      btn_delete(id) {
248
+        this.$confirm("您确定要将此用户信息删除吗?", "提示", {
249
+            confirmButtonText: "确定",
250
+            cancelButtonText: "取消",
251
+            type: "warning",
252
+          })
253
+          .then(() => {
254
+            const params = {
255
+              ids: id,
256
+              state: 1, // 0启用1删除2禁用
257
+            };
258
+            deleteUserAccount(params).then((response) => {
259
+              if (response.state.toLowerCase() === "success") {
260
+                this.getList();
261
+                this.$message.success("删除成功!");
262
+              }
263
+            });
264
+          })
265
+          .catch(() => {
266
+            this.$message.info("已取消删除");
267
+          });
268
+      },
269
+      onOpen(id) {
270
+        this.$confirm("您确定要将此用户启用吗?", "提示", {
271
+            confirmButtonText: "确定",
272
+            cancelButtonText: "取消",
273
+            type: "warning",
274
+          })
275
+          .then(() => {
276
+            const params = {
277
+              ids: id,
278
+              state: 1,
279
+            };
280
+            getDelUsers(params).then((response) => {
281
+              if (response.state.toLowerCase() === "success") {
282
+                this.getList();
283
+                this.$message.success("启用成功!");
284
+              }
285
+            });
286
+          })
287
+          .catch(() => {
288
+            this.$message("已取消");
289
+          });
290
+      },
291
+      onOff(id) {
292
+        this.$confirm("您确定要将此用户禁用吗?", "提示", {
293
+            confirmButtonText: "确定",
294
+            cancelButtonText: "取消",
295
+            type: "warning",
296
+          })
297
+          .then(() => {
298
+            const params = {
299
+              ids: id,
300
+              state: 0,
301
+            };
302
+            getDelUsers(params).then((response) => {
303
+              if (response.state.toLowerCase() === "success") {
304
+                this.getList();
305
+                this.$message.success("禁用成功!");
306
+              }
307
+            });
308
+          })
309
+          .catch(() => {
310
+            this.$message("已取消");
311
+          });
312
+      },
313
+      // 树
314
+      getTreeList() {
315
+        return new Promise((resolve) => {
316
+          getDeptTree(this.parentid).then((response) => {
422 317
             if (response.state.toLowerCase() === "success") {
423
-              this.getList();
424
-              this.$message.success("禁用成功!");
318
+              this.treelists = response.data;
425 319
             }
426 320
           });
427
-        })
428
-        .catch(() => {
429
-          this.$message("已取消");
430
-        });
431
-    },
432
-    // 树
433
-    getTreeList() {
434
-      return new Promise((resolve) => {
435
-        getDeptTree(this.parentid).then((response) => {
436
-          if (response.state.toLowerCase() === "success") {
437
-            this.treelists = response.data;
438
-          }
321
+          resolve();
439 322
         });
440
-        resolve();
441
-      });
442
-    },
443
-    handleNodeClick(data) {
444
-      this.deptid = "";
445
-      this.hosid = "";
446
-      if (data.parentid != "-1") {
447
-        this.deptid = data.id;
448
-        this.importData.deptid = data.id;
449
-        this.hosid = "";
450
-        this.getList();
451
-      }
452
-      if (data.parentid == "-1") {
453
-        this.hosid = data.id;
323
+      },
324
+      handleNodeClick(data) {
454 325
         this.deptid = "";
455
-        this.getList();
456
-      }
457
-    },
458
-    handle_success(res) {
459
-      if (res.state == "success") {
460
-        this.dialogTableVisible = false;
461
-        this.getList();
462
-        this.$message.success("导入成功");
463
-      }
464
-    },
465
-    handle_remove() {},
466
-    btn_export() {
467
-      const exportparams = {
468
-        page: this.pageParams.pageindex, // 第几页
469
-        pagesize: this.pageParams.pagesize, // 每页几条信息
470
-        key: this.keyword, // 否	string	模糊查询
471
-        deptid: this.deptid,
472
-        isexport: 1,
473
-      };
474
-      exportExcel(exportparams, getUserExport);
326
+        this.hosid = "";
327
+        if (data.parentid != "-1") {
328
+          this.deptid = data.id;
329
+          this.importData.deptid = data.id;
330
+          this.hosid = "";
331
+          this.getList();
332
+        }
333
+        if (data.parentid == "-1") {
334
+          this.hosid = data.id;
335
+          this.deptid = "";
336
+          this.getList();
337
+        }
338
+      },
339
+      handle_success(res) {
340
+        if (res.state == "success") {
341
+          this.dialogTableVisible = false;
342
+          this.getList();
343
+          this.$message.success("导入成功");
344
+        }
345
+      },
346
+      handle_remove() {},
347
+      btn_export() {
348
+        const exportparams = {
349
+          page: this.pageParams.pageindex, // 第几页
350
+          pagesize: this.pageParams.pagesize, // 每页几条信息
351
+          key: this.keyword, // 否	string	模糊查询
352
+          deptid: this.deptid,
353
+          isexport: 1,
354
+        };
355
+        exportExcel(exportparams, getUserExport);
356
+      },
475 357
     },
476
-  },
477
-};
358
+  };
478 359
 </script>
479 360
 
480 361
 <style rel="stylesheet/scss" lang="scss" scoped>
481
-.usermanage .filter-item.el-input {
482
-  width: 240px;
483
-}
484
-
485
-.usermanage {
486
-  padding: 10px 10px 20px 10px;
487
-}
488
-
489
-.usermanage .user_img {
490
-  width: 56px;
491
-  height: 56px;
492
-  border-radius: 50%;
493
-}
494
-
495
-.filter-container {
496
-  .el-select {
497
-    margin-right: 10px;
362
+  .usermanage .filter-item.el-input {
363
+    width: 240px;
498 364
   }
499 365
 
500
-  .el-date-editor {
501
-    margin-right: 10px;
366
+  .usermanage {
367
+    padding: 10px 10px 20px 10px;
502 368
   }
503 369
 
504
-  .el-cascader {
505
-    margin-right: 10px;
370
+  .usermanage .user_img {
371
+    width: 56px;
372
+    height: 56px;
373
+    border-radius: 50%;
506 374
   }
507 375
 
508
-  .filter-item {
509
-    vertical-align: top;
376
+  .filter-container {
377
+    .el-select {
378
+      margin-right: 10px;
379
+    }
380
+
381
+    .el-date-editor {
382
+      margin-right: 10px;
383
+    }
384
+
385
+    .el-cascader {
386
+      margin-right: 10px;
387
+    }
388
+
389
+    .filter-item {
390
+      vertical-align: top;
391
+    }
510 392
   }
511
-}
512 393
 </style>

+ 45 - 19
CallCenterWeb.UI/RMYYAPP/pages/myTask/myTask.vue

@@ -178,28 +178,54 @@
178 178
 					})
179 179
 				})
180 180
 			}
181
-			
182
-			const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*_).{8,20}$/
183
-			const pass = uni.getStorageSync('loginpass');
184
-			if (!reg.test(pass)) {
185
-				uni.showModal({
186
-					title: '提示',
187
-					content: '您的密码不符合规范,请更新密码!',
188
-					showCancel: false,
189
-					success: function(res) {
190
-						if (res.confirm) {
191
-							uni.navigateTo({
192
-								url: "/pages/setting/fontSizeSettingPass/fontSizeSettingPass"
193
-							})
194
-						} else if (res.cancel) {
195
-							console.log('取消');
196
-						}
197
-					}
198
-				});
199
-			}
181
+			this.updatePass()			
182
+			this.isLongPass()
200 183
 			// uni.hideTabBar()
201 184
 		},
202 185
 		methods: {
186
+			updatePass(){
187
+				const reg = /^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*_).{8,20}$/
188
+				const pass = uni.getStorageSync('loginpass');
189
+				if (!reg.test(pass)) {
190
+					uni.showModal({
191
+						title: '提示',
192
+						content: '您的密码不符合规范,请更新密码!',
193
+						showCancel: false,
194
+						success: function(res) {
195
+							if (res.confirm) {
196
+								uni.navigateTo({
197
+									url: "/pages/setting/fontSizeSettingPass/fontSizeSettingPass"
198
+								})
199
+							} else if (res.cancel) {
200
+								console.log('取消');
201
+							}
202
+						}
203
+					});
204
+				}
205
+			},
206
+			isLongPass(){
207
+				const params = {}
208
+				this.$http.get('UserAccount/GetUserPasswordTime', params).then(res => {
209
+					if (res.state == "success") {
210
+						if(res.data == 1){
211
+							uni.showModal({
212
+								title: '提示',
213
+								content: '您的密码已经超三个月未修改,请更新密码!',
214
+								showCancel: false,
215
+								success: function(res) {
216
+									if (res.confirm) {
217
+										uni.navigateTo({
218
+											url: "/pages/setting/fontSizeSettingPass/fontSizeSettingPass"
219
+										})
220
+									} else if (res.cancel) {
221
+										console.log('取消');
222
+									}
223
+								}
224
+							});
225
+						}
226
+					}
227
+				})
228
+			},
203 229
 			radioChange: function(evt) {
204 230
 				this.onchangedept = evt.detail.value;
205 231
 				console.log(evt.detail.value)

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

@@ -19,7 +19,7 @@
19 19
 			<view class="listCell" @click="trunFontSizeSettingPass">
20 20
 				<image src="/static/Wd.png"></image>
21 21
 				<text>修改密码</text>
22
-				<text class="versionNum">*</text>
22
+				<text class="versionNum">********</text>
23 23
 			</view>
24 24
 			<view class="listCell" @click="trunFontSizeSetting">
25 25
 				<image src="/static/Wd.png"></image>