system-clients 3.3.1 → 3.3.2-v3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.info +1 -0
- package/package.json +104 -104
- package/src/LodopFuncs.js +71 -103
- package/src/components/Main.vue +14 -22
- package/src/components/Util.js +15 -0
- package/src/components/equipment/PcAdd.vue +1 -1
- package/src/components/equipment/PcList.vue +3 -3
- package/src/components/equipment/PhoneAdd.vue +1 -1
- package/src/components/equipment/PhoneList.vue +2 -2
- package/src/components/equipment/PosAdd.vue +11 -7
- package/src/components/equipment/PosList.vue +5 -3
- package/src/components/equipment/PosManage.vue +1 -1
- package/src/components/equipment/PosParamAdd.vue +2 -2
- package/src/components/equipment/PosParamList.vue +2 -2
- package/src/components/materialManage/materialList.vue +1 -1
- package/src/components/parammanage/ParamPage.vue +12 -12
- package/src/components/parammanage/ParamPages.vue +2 -2
- package/src/components/parammanage/SinglePage.vue +8 -8
- package/src/components/parammanage/SinglePages.vue +2 -2
- package/src/components/server/AddChangeMsg.vue +1 -1
- package/src/components/server/ChangeDeclare.vue +1 -1
- package/src/components/server/Login.vue +44 -35
- package/src/components/server/ModifyPw.vue +0 -1
- package/src/components/server/PcdBuildingSelect.vue +6 -8
- package/src/components/server/ResSelect.vue +0 -3
- package/src/components/server/ResSelectGroup.vue +1 -1
- package/src/components/server/RoleSelector.vue +2 -3
- package/src/components/server/TestResSelectGroup.vue +1 -1
- package/src/filiale/baole/Login.vue +22 -21
- package/src/filiale/chengtou/Login.vue +22 -21
- package/src/filiale/dongguan/Login.vue +22 -21
- package/src/filiale/dongguan/Main.vue +3 -5
- package/src/filiale/furuike/Login.vue +23 -24
- package/src/filiale/furuike/Main.vue +26 -39
- package/src/filiale/gehua/Main.vue +3 -5
- package/src/filiale/konggang/Login.vue +22 -21
- package/src/filiale/qianneng/Login.vue +22 -21
- package/src/filiale/qianneng/Main.vue +3 -5
- package/src/filiale/qianneng/ModifyPw.vue +0 -1
- package/src/filiale/rizhao/Login.vue +21 -20
- package/src/filiale/rizhao/Main.vue +3 -3
- package/src/filiale/shiquan/Login.vue +22 -21
- package/src/filiale/tianyi/Login.vue +22 -21
- package/src/filiale/tongchuan/Login.vue +22 -21
- package/src/filiale/tongchuan/Main.vue +6 -8
- package/src/filiale/weinan/Main.vue +6 -7
- package/src/filiale/wenxi/Login.vue +22 -21
- package/src/filiale/wenxi/Main.vue +3 -5
- package/src/filiale/wuhai/Main.vue +3 -6
- package/src/filiale/yuchuan/Login.vue +23 -22
- package/src/filiale/yuchuan/Main.vue +3 -5
- package/src/filiale/zhoukou/Main.vue +3 -5
- package/src/plugins/EncryptUtil.js +1 -1
- package/src/plugins/GetLoginInfoService.js +85 -20
- package/src/stores/AppData.js +1 -1
- package/build.gradle +0 -6
- package/src/filiale/ruihua/Login.vue +0 -549
- package/src/filiale/ruihua/system.js +0 -5
|
@@ -145,6 +145,7 @@ import co from 'co'
|
|
|
145
145
|
import $ from 'jquery'
|
|
146
146
|
import Vue from 'vue'
|
|
147
147
|
import {HttpResetClass} from 'vue-client'
|
|
148
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
148
149
|
|
|
149
150
|
let daibanJson = require('../../util/Daiban.json')
|
|
150
151
|
|
|
@@ -175,7 +176,6 @@ let saveGen = function *(self) {
|
|
|
175
176
|
console.log('登录配置', self.config)
|
|
176
177
|
if (self.config.isMac) {
|
|
177
178
|
// 获取该登录人分公司下的mac配置
|
|
178
|
-
// todo v4
|
|
179
179
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
180
180
|
resolveMsg: null,
|
|
181
181
|
rejectMsg: null
|
|
@@ -205,12 +205,15 @@ let saveGen = function *(self) {
|
|
|
205
205
|
}
|
|
206
206
|
}
|
|
207
207
|
console.log(self.$login.depPrompt)
|
|
208
|
-
//
|
|
209
|
-
|
|
210
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
208
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
209
|
+
if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
211
210
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
212
211
|
self.modifyPwShow = true
|
|
213
212
|
})
|
|
213
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
214
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
215
|
+
self.modifyPwShow = true
|
|
216
|
+
})
|
|
214
217
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
215
218
|
self.depPromptShow = true
|
|
216
219
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -236,6 +239,7 @@ let saveGen = function *(self) {
|
|
|
236
239
|
|
|
237
240
|
} catch (ret) {
|
|
238
241
|
console.error('登录失败', ret)
|
|
242
|
+
self.$login.s = null
|
|
239
243
|
let msg
|
|
240
244
|
if (ret instanceof Error) {
|
|
241
245
|
msg = ret
|
|
@@ -262,19 +266,19 @@ export default {
|
|
|
262
266
|
this.titleShow = this.$appdata.getSingleValue('关于我们')
|
|
263
267
|
window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
|
|
264
268
|
this.vTime = this.format(new Date(window.versionTime));
|
|
265
|
-
try{
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
}catch(e){}
|
|
269
|
+
// try{
|
|
270
|
+
// let http = new HttpResetClass()
|
|
271
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
272
|
+
// {data:{
|
|
273
|
+
// tablename: 't_changedeclare',
|
|
274
|
+
// condition: ` f_type ='变更通知' `
|
|
275
|
+
// }
|
|
276
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
277
|
+
// if(res.data.length>0){
|
|
278
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
279
|
+
// this.notice=res.data[0].f_change_message
|
|
280
|
+
// }
|
|
281
|
+
// }catch(e){}
|
|
278
282
|
|
|
279
283
|
this.loginother();
|
|
280
284
|
$('#login-button').click(function (event) {
|
|
@@ -283,10 +287,8 @@ export default {
|
|
|
283
287
|
})
|
|
284
288
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
285
289
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
286
|
-
console.log(subUrl)
|
|
287
290
|
this.model.ename = window.atob(subUrl[0])
|
|
288
291
|
this.model.password = window.atob(subUrl[1])
|
|
289
|
-
console.log('this.model.ename',this.model.ename)
|
|
290
292
|
this.otherLogin = true
|
|
291
293
|
this.confirm()
|
|
292
294
|
}else{
|
|
@@ -364,7 +366,7 @@ export default {
|
|
|
364
366
|
} else {
|
|
365
367
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
366
368
|
}
|
|
367
|
-
await http.load('POST', '/
|
|
369
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
368
370
|
tablename:'t_order_center',
|
|
369
371
|
condition:condition
|
|
370
372
|
}}, {
|
|
@@ -440,7 +442,6 @@ export default {
|
|
|
440
442
|
if (this.config.distanceLogin) {
|
|
441
443
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
442
444
|
let ename = this.$login.getUrlParames('name');
|
|
443
|
-
// todo v4
|
|
444
445
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
445
446
|
if(logininfo.data){
|
|
446
447
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -143,6 +143,7 @@ import co from 'co'
|
|
|
143
143
|
import $ from 'jquery'
|
|
144
144
|
import Vue from 'vue'
|
|
145
145
|
import {HttpResetClass} from 'vue-client'
|
|
146
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
146
147
|
|
|
147
148
|
let daibanJson = require('../../util/Daiban.json')
|
|
148
149
|
|
|
@@ -173,7 +174,6 @@ let saveGen = function *(self) {
|
|
|
173
174
|
console.log('登录配置', self.config)
|
|
174
175
|
if (self.config.isMac) {
|
|
175
176
|
// 获取该登录人分公司下的mac配置
|
|
176
|
-
// todo v4
|
|
177
177
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
178
178
|
resolveMsg: null,
|
|
179
179
|
rejectMsg: null
|
|
@@ -203,12 +203,15 @@ let saveGen = function *(self) {
|
|
|
203
203
|
}
|
|
204
204
|
}
|
|
205
205
|
console.log(self.$login.depPrompt)
|
|
206
|
-
//
|
|
207
|
-
|
|
208
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
206
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
207
|
+
if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
209
208
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
210
209
|
self.modifyPwShow = true
|
|
211
210
|
})
|
|
211
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
212
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
213
|
+
self.modifyPwShow = true
|
|
214
|
+
})
|
|
212
215
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
213
216
|
self.depPromptShow = true
|
|
214
217
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -234,6 +237,7 @@ let saveGen = function *(self) {
|
|
|
234
237
|
|
|
235
238
|
} catch (ret) {
|
|
236
239
|
console.error('登录失败', ret)
|
|
240
|
+
self.$login.s = null
|
|
237
241
|
let msg
|
|
238
242
|
if (ret instanceof Error) {
|
|
239
243
|
msg = ret
|
|
@@ -260,19 +264,19 @@ export default {
|
|
|
260
264
|
this.titleShow = this.$appdata.getSingleValue('关于我们')
|
|
261
265
|
window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
|
|
262
266
|
this.vTime = this.format(new Date(window.versionTime));
|
|
263
|
-
try{
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
}catch(e){}
|
|
267
|
+
// try{
|
|
268
|
+
// let http = new HttpResetClass()
|
|
269
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
270
|
+
// {data:{
|
|
271
|
+
// tablename: 't_changedeclare',
|
|
272
|
+
// condition: ` f_type ='变更通知' `
|
|
273
|
+
// }
|
|
274
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
275
|
+
// if(res.data.length>0){
|
|
276
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
277
|
+
// this.notice=res.data[0].f_change_message
|
|
278
|
+
// }
|
|
279
|
+
// }catch(e){}
|
|
276
280
|
|
|
277
281
|
this.loginother();
|
|
278
282
|
$('#login-button').click(function (event) {
|
|
@@ -281,10 +285,8 @@ export default {
|
|
|
281
285
|
})
|
|
282
286
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
283
287
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
284
|
-
console.log(subUrl)
|
|
285
288
|
this.model.ename = window.atob(subUrl[0])
|
|
286
289
|
this.model.password = window.atob(subUrl[1])
|
|
287
|
-
console.log('this.model.ename',this.model.ename)
|
|
288
290
|
this.otherLogin = true
|
|
289
291
|
this.confirm()
|
|
290
292
|
}else{
|
|
@@ -362,7 +364,7 @@ export default {
|
|
|
362
364
|
} else {
|
|
363
365
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
364
366
|
}
|
|
365
|
-
await http.load('POST', '/
|
|
367
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
366
368
|
tablename:'t_order_center',
|
|
367
369
|
condition:condition
|
|
368
370
|
}}, {
|
|
@@ -438,7 +440,6 @@ export default {
|
|
|
438
440
|
if (this.config.distanceLogin) {
|
|
439
441
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
440
442
|
let ename = this.$login.getUrlParames('name');
|
|
441
|
-
// todo v4
|
|
442
443
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
443
444
|
if(logininfo.data){
|
|
444
445
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -149,6 +149,7 @@ import co from 'co'
|
|
|
149
149
|
import $ from 'jquery'
|
|
150
150
|
import Vue from 'vue'
|
|
151
151
|
import {HttpResetClass} from 'vue-client'
|
|
152
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
152
153
|
|
|
153
154
|
let daibanJson = require('../../util/Daiban.json')
|
|
154
155
|
|
|
@@ -179,7 +180,6 @@ let saveGen = function *(self) {
|
|
|
179
180
|
console.log('登录配置', self.config)
|
|
180
181
|
if (self.config.isMac) {
|
|
181
182
|
// 获取该登录人分公司下的mac配置
|
|
182
|
-
// todo v4
|
|
183
183
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
184
184
|
resolveMsg: null,
|
|
185
185
|
rejectMsg: null
|
|
@@ -209,12 +209,15 @@ let saveGen = function *(self) {
|
|
|
209
209
|
}
|
|
210
210
|
}
|
|
211
211
|
console.log(self.$login.depPrompt)
|
|
212
|
-
//
|
|
213
|
-
|
|
214
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
212
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
213
|
+
if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
215
214
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
216
215
|
self.modifyPwShow = true
|
|
217
216
|
})
|
|
217
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
218
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
219
|
+
self.modifyPwShow = true
|
|
220
|
+
})
|
|
218
221
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
219
222
|
self.depPromptShow = true
|
|
220
223
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -240,6 +243,7 @@ let saveGen = function *(self) {
|
|
|
240
243
|
|
|
241
244
|
} catch (ret) {
|
|
242
245
|
console.error('登录失败', ret)
|
|
246
|
+
self.$login.s = null
|
|
243
247
|
let msg
|
|
244
248
|
if (ret instanceof Error) {
|
|
245
249
|
msg = ret
|
|
@@ -264,19 +268,19 @@ export default {
|
|
|
264
268
|
title: '登录',
|
|
265
269
|
async ready () {
|
|
266
270
|
this.titleShow = true
|
|
267
|
-
try{
|
|
268
|
-
|
|
269
|
-
|
|
270
|
-
|
|
271
|
-
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
}catch(e){}
|
|
271
|
+
// try{
|
|
272
|
+
// let http = new HttpResetClass()
|
|
273
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
274
|
+
// {data:{
|
|
275
|
+
// tablename: 't_changedeclare',
|
|
276
|
+
// condition: ` f_type ='变更通知' `
|
|
277
|
+
// }
|
|
278
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
279
|
+
// if(res.data.length>0){
|
|
280
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
281
|
+
// this.notice=res.data[0].f_change_message
|
|
282
|
+
// }
|
|
283
|
+
// }catch(e){}
|
|
280
284
|
|
|
281
285
|
this.loginother();
|
|
282
286
|
$('#login-button').click(function (event) {
|
|
@@ -285,10 +289,8 @@ export default {
|
|
|
285
289
|
})
|
|
286
290
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
287
291
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
288
|
-
console.log(subUrl)
|
|
289
292
|
this.model.ename = window.atob(subUrl[0])
|
|
290
293
|
this.model.password = window.atob(subUrl[1])
|
|
291
|
-
console.log('this.model.ename',this.model.ename)
|
|
292
294
|
this.otherLogin = true
|
|
293
295
|
this.confirm()
|
|
294
296
|
}else{
|
|
@@ -353,7 +355,7 @@ export default {
|
|
|
353
355
|
} else {
|
|
354
356
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
355
357
|
}
|
|
356
|
-
await http.load('POST', '/
|
|
358
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
357
359
|
tablename:'t_order_center',
|
|
358
360
|
condition:condition
|
|
359
361
|
}}, {
|
|
@@ -429,7 +431,6 @@ export default {
|
|
|
429
431
|
if (this.config.distanceLogin) {
|
|
430
432
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
431
433
|
let ename = this.$login.getUrlParames('name');
|
|
432
|
-
// todo v4
|
|
433
434
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
434
435
|
if(logininfo.data){
|
|
435
436
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -97,8 +97,7 @@ let getwartermakr = async function (self) {
|
|
|
97
97
|
tablename: 't_singlevalue',
|
|
98
98
|
condition: " 1=1 and name=\'水印内容\'"
|
|
99
99
|
};
|
|
100
|
-
|
|
101
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
100
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
102
101
|
if (result && result.data.length > 0) {
|
|
103
102
|
self.showwatermakeflag = true;
|
|
104
103
|
createWaterMark(result.data[0].value);
|
|
@@ -242,7 +241,7 @@ export default {
|
|
|
242
241
|
this.OrderDaiBan = ''
|
|
243
242
|
this.AppDaiBan = ''
|
|
244
243
|
let http = new HttpResetClass()
|
|
245
|
-
await http.load('POST', '/
|
|
244
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
246
245
|
tablename:'t_order_center',
|
|
247
246
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
248
247
|
}}, {
|
|
@@ -314,7 +313,7 @@ export default {
|
|
|
314
313
|
}
|
|
315
314
|
},
|
|
316
315
|
openUrl() {
|
|
317
|
-
var url = `
|
|
316
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
318
317
|
window.open(url, '_blank')
|
|
319
318
|
},
|
|
320
319
|
hindsetting() {
|
|
@@ -393,7 +392,6 @@ export default {
|
|
|
393
392
|
username: this.$login.f.name,
|
|
394
393
|
usertelephone: this.$login.f.f_user_telephone
|
|
395
394
|
}
|
|
396
|
-
// todo v4
|
|
397
395
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
398
396
|
window.location.reload()
|
|
399
397
|
}
|
|
@@ -136,6 +136,7 @@ import co from 'co'
|
|
|
136
136
|
import $ from 'jquery'
|
|
137
137
|
import Vue from 'vue'
|
|
138
138
|
import {HttpResetClass} from 'vue-client'
|
|
139
|
+
import {isPasswordModificationExpired} from '../../components/Util'
|
|
139
140
|
|
|
140
141
|
let daibanJson = require('../../util/Daiban.json')
|
|
141
142
|
|
|
@@ -166,7 +167,6 @@ let saveGen = function *(self) {
|
|
|
166
167
|
console.log('登录配置', self.config)
|
|
167
168
|
if (self.config.isMac) {
|
|
168
169
|
// 获取该登录人分公司下的mac配置
|
|
169
|
-
// todo v4
|
|
170
170
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
|
171
171
|
resolveMsg: null,
|
|
172
172
|
rejectMsg: null
|
|
@@ -196,12 +196,15 @@ let saveGen = function *(self) {
|
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
console.log(self.$login.depPrompt)
|
|
199
|
-
//
|
|
200
|
-
|
|
201
|
-
if ((!self.otherLogin) && self.config.weakPassword && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
199
|
+
// 弱口令验证(默认开启,跳转过来的不进行验证)
|
|
200
|
+
if ((!self.otherLogin) && !(/^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{8,16}$/.test(self.model.password))) {
|
|
202
201
|
self.$showMessage('登录系统: 此账户的密码过于简单,请修改密码后重新登陆!!!', ['confirm']).then((res) => {
|
|
203
202
|
self.modifyPwShow = true
|
|
204
203
|
})
|
|
204
|
+
} else if ((!self.otherLogin) && isPasswordModificationExpired(self.$login.f.f_last_modification_time)) {
|
|
205
|
+
self.$showMessage('登录系统: 您的密码已超过两个半月未修改,请修改密码后重新登录!!!', ['confirm']).then((res) => {
|
|
206
|
+
self.modifyPwShow = true
|
|
207
|
+
})
|
|
205
208
|
} else if ((!self.otherLogin) && self.$login.depPrompt) {
|
|
206
209
|
self.depPromptShow = true
|
|
207
210
|
if (self.$login.showDaiBan && self.$login.r.includes('展示预约信息')){
|
|
@@ -228,6 +231,7 @@ let saveGen = function *(self) {
|
|
|
228
231
|
|
|
229
232
|
} catch (ret) {
|
|
230
233
|
console.error('登录失败', ret)
|
|
234
|
+
self.$login.s = null
|
|
231
235
|
let msg
|
|
232
236
|
if (ret instanceof Error) {
|
|
233
237
|
msg = ret
|
|
@@ -264,14 +268,12 @@ export default {
|
|
|
264
268
|
st: obj.ticket,
|
|
265
269
|
serviceKey: this.config.serviceKey
|
|
266
270
|
}
|
|
267
|
-
// todo v4
|
|
268
271
|
this.$resetpost('/sso/logic/serviceValidate', params,{resolveMsg: null, rejectMsg: null}).then((re) => {
|
|
269
272
|
// this.$showMessage("re----" + JSON.stringify(re))
|
|
270
273
|
if (re.data.code === 200) {
|
|
271
274
|
this.showlogin = false
|
|
272
275
|
let condition = `ename = '${re.data.data.userName}'`
|
|
273
|
-
|
|
274
|
-
this.$resetpost('api/af-system/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
276
|
+
this.$resetpost('rs/sql/singleTable', {data: { items: '*', tablename: 't_user', condition: condition}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
275
277
|
if (res.data && res.data.length > 0) {
|
|
276
278
|
this.model.ename = res.data[0].ename
|
|
277
279
|
this.model.password = res.data[0].password
|
|
@@ -295,19 +297,19 @@ export default {
|
|
|
295
297
|
this.titleShow = this.$appdata.getSingleValue('关于我们')
|
|
296
298
|
window.versionTime = window.versionTime ? window.versionTime : new Date().getTime()
|
|
297
299
|
this.vTime = this.format(new Date(window.versionTime));
|
|
298
|
-
try{
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
}catch(e){}
|
|
300
|
+
// try{
|
|
301
|
+
// let http = new HttpResetClass()
|
|
302
|
+
// let res = await http.load('POST', 'rs/sql/singleTable',
|
|
303
|
+
// {data:{
|
|
304
|
+
// tablename: 't_changedeclare',
|
|
305
|
+
// condition: ` f_type ='变更通知' `
|
|
306
|
+
// }
|
|
307
|
+
// }, {resolveMsg: null, rejectMsg: null})
|
|
308
|
+
// if(res.data.length>0){
|
|
309
|
+
// console.log("---------------获取通知",res.data[0].f_change_message)
|
|
310
|
+
// this.notice=res.data[0].f_change_message
|
|
311
|
+
// }
|
|
312
|
+
// }catch(e){}
|
|
311
313
|
|
|
312
314
|
this.loginother();
|
|
313
315
|
$('#login-button').click(function (event) {
|
|
@@ -316,10 +318,8 @@ export default {
|
|
|
316
318
|
})
|
|
317
319
|
if (window.location.search && window.location.search.indexOf('af_key') !== -1&& window.location.search.indexOf('af_n') !== -1) {
|
|
318
320
|
const subUrl = window.location.search.replace('?af_key=','').split('&af_n=')
|
|
319
|
-
console.log(subUrl)
|
|
320
321
|
this.model.ename = window.atob(subUrl[0])
|
|
321
322
|
this.model.password = window.atob(subUrl[1])
|
|
322
|
-
console.log('this.model.ename',this.model.ename)
|
|
323
323
|
this.otherLogin = true
|
|
324
324
|
this.confirm()
|
|
325
325
|
}else{
|
|
@@ -401,7 +401,7 @@ export default {
|
|
|
401
401
|
} else {
|
|
402
402
|
condition =` f_orderstate is null and (f_address in( select f_address from t_user_address where f_slice_area='柠条塔') or f_address like '%柠条塔%') `
|
|
403
403
|
}
|
|
404
|
-
await http.load('POST', '/
|
|
404
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
405
405
|
tablename:'t_order_center',
|
|
406
406
|
condition:condition
|
|
407
407
|
}}, {
|
|
@@ -477,7 +477,6 @@ export default {
|
|
|
477
477
|
if (this.config.distanceLogin) {
|
|
478
478
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
|
479
479
|
let ename = this.$login.getUrlParames('name');
|
|
480
|
-
// todo v4
|
|
481
480
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
|
482
481
|
if(logininfo.data){
|
|
483
482
|
if(logininfo.data.ename && logininfo.data.password){
|
|
@@ -178,8 +178,7 @@ let getwartermakr = async function (self) {
|
|
|
178
178
|
tablename: 't_singlevalue',
|
|
179
179
|
condition: " 1=1 and name=\'水印内容\'"
|
|
180
180
|
};
|
|
181
|
-
|
|
182
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
181
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
183
182
|
if (result && result.data.length > 0) {
|
|
184
183
|
self.showwatermakeflag = true;
|
|
185
184
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -328,7 +327,7 @@ export default {
|
|
|
328
327
|
this.OrderDaiBan = ''
|
|
329
328
|
this.AppDaiBan = ''
|
|
330
329
|
let http = new HttpResetClass()
|
|
331
|
-
await http.load('POST', '/
|
|
330
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
332
331
|
tablename:'t_order_center',
|
|
333
332
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
334
333
|
}}, {
|
|
@@ -400,44 +399,33 @@ export default {
|
|
|
400
399
|
}
|
|
401
400
|
},
|
|
402
401
|
async workorderOverRemind(){
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
402
|
+
if(this.functions && this.functions.f_role_name && this.functions.f_role_name.indexOf('管理员') !== -1 && this.functions.f_role_name.indexOf('管理人员') == -1){
|
|
403
|
+
let res = await new HttpResetClass().load('POST', '/rs/sql/tel_singleTable', {
|
|
404
|
+
"data": {
|
|
405
|
+
"items": "*",
|
|
406
|
+
"tablename": "t_organization",
|
|
407
|
+
"condition": `parentid = '${this.functions.orgid}'`
|
|
408
|
+
}
|
|
409
|
+
}, {resolveMsg: null, rejectMsg: null})
|
|
410
|
+
const f_filialeids = [this.functions.orgid]
|
|
411
|
+
for (const f of res.data) {
|
|
412
|
+
f_filialeids.push(f.id)
|
|
412
413
|
}
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
|
|
420
|
-
|
|
421
|
-
|
|
422
|
-
|
|
423
|
-
|
|
424
|
-
|
|
425
|
-
// }
|
|
426
|
-
//
|
|
427
|
-
// const data = {
|
|
428
|
-
// condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
|
|
429
|
-
// }
|
|
430
|
-
// new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
431
|
-
// if(res.data && res.data.n !== 0){
|
|
432
|
-
// /*this.$showMessage('你有'+res.data.n+'个工单已逾期,请尽快处理')*/
|
|
433
|
-
// this.yuqitishi = true
|
|
434
|
-
// this.num = res.data.n
|
|
435
|
-
// }
|
|
436
|
-
// })
|
|
437
|
-
// }
|
|
414
|
+
|
|
415
|
+
const data = {
|
|
416
|
+
condition: `f_filiale_id in (${f_filialeids.join(',')}) and overday >= 0`
|
|
417
|
+
}
|
|
418
|
+
new HttpResetClass().load('POST','rs/sql/serviceDetails/n', {data}, {resolveMsg: null, rejectMsg: null}).then(res=>{
|
|
419
|
+
if(res.data && res.data.n !== 0){
|
|
420
|
+
/*this.$showMessage('你有'+res.data.n+'个工单已逾期,请尽快处理')*/
|
|
421
|
+
this.yuqitishi = true
|
|
422
|
+
this.num = res.data.n
|
|
423
|
+
}
|
|
424
|
+
})
|
|
425
|
+
}
|
|
438
426
|
},
|
|
439
427
|
openUrl() {
|
|
440
|
-
var url = `
|
|
428
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
441
429
|
window.open(url, '_blank')
|
|
442
430
|
},
|
|
443
431
|
hindsetting() {
|
|
@@ -516,7 +504,6 @@ export default {
|
|
|
516
504
|
username: this.$login.f.name,
|
|
517
505
|
usertelephone: this.$login.f.f_user_telephone
|
|
518
506
|
}
|
|
519
|
-
// todo v4
|
|
520
507
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
521
508
|
window.location.reload()
|
|
522
509
|
}
|
|
@@ -151,8 +151,7 @@ let getwartermakr = async function (self) {
|
|
|
151
151
|
tablename: 't_singlevalue',
|
|
152
152
|
condition: " 1=1 and name=\'水印内容\'"
|
|
153
153
|
};
|
|
154
|
-
|
|
155
|
-
let result = await self.$resetpost('api/af-revenue/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
154
|
+
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
156
155
|
if (result && result.data.length > 0) {
|
|
157
156
|
self.showwatermakeflag = true;
|
|
158
157
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -292,7 +291,7 @@ export default {
|
|
|
292
291
|
this.OrderDaiBan = ''
|
|
293
292
|
this.AppDaiBan = ''
|
|
294
293
|
let http = new HttpResetClass()
|
|
295
|
-
await http.load('POST', '/
|
|
294
|
+
await http.load('POST', '/rs/sql/singleTable', {data: {
|
|
296
295
|
tablename:'t_order_center',
|
|
297
296
|
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
298
297
|
}}, {
|
|
@@ -364,7 +363,7 @@ export default {
|
|
|
364
363
|
}
|
|
365
364
|
},
|
|
366
365
|
openUrl() {
|
|
367
|
-
var url = `
|
|
366
|
+
var url = `https://liuli.aofengcloud.com:31467`
|
|
368
367
|
window.open(url, '_blank')
|
|
369
368
|
},
|
|
370
369
|
hindsetting() {
|
|
@@ -423,7 +422,6 @@ export default {
|
|
|
423
422
|
username: this.$login.f.name,
|
|
424
423
|
usertelephone: this.$login.f.f_user_telephone
|
|
425
424
|
}
|
|
426
|
-
// todo v4
|
|
427
425
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
428
426
|
window.location.reload()
|
|
429
427
|
}
|