system-clients 3.2.87 → 3.2.89
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.json +2 -2
- package/src/components/Main.vue +2 -1
- package/src/components/equipment/EquipmentManage.vue +83 -83
- package/src/components/equipment/PcAdd.vue +115 -115
- package/src/components/equipment/PcList.vue +119 -119
- package/src/components/equipment/PcManage.vue +61 -61
- package/src/components/equipment/PhoneAdd.vue +118 -118
- package/src/components/equipment/PhoneList.vue +113 -113
- package/src/components/equipment/PhoneManage.vue +61 -61
- package/src/components/equipment/PosAdd.vue +6 -10
- package/src/components/equipment/PosList.vue +3 -5
- package/src/components/equipment/PosParamAdd.vue +1 -1
- package/src/components/equipment/PosParamList.vue +2 -2
- package/src/components/parammanage/ParamPage.vue +12 -12
- package/src/components/parammanage/SinglePage.vue +8 -8
- package/src/components/server/Login.vue +17 -35
- package/src/components/server/ModifyPw.vue +1 -0
- package/src/components/server/PcdBuildingSelect.vue +2 -0
- package/src/components/server/RoleSelector.vue +3 -2
- package/src/filiale/baole/Login.vue +2 -0
- package/src/filiale/chengtou/Login.vue +2 -0
- package/src/filiale/dongguan/Login.vue +2 -0
- package/src/filiale/dongguan/Main.vue +2 -0
- package/src/filiale/furuike/Login.vue +4 -0
- package/src/filiale/furuike/Main.vue +2 -0
- package/src/filiale/gehua/Main.vue +2 -0
- package/src/filiale/konggang/Login.vue +2 -0
- package/src/filiale/qianneng/Login.vue +584 -582
- package/src/filiale/qianneng/Main.vue +2 -0
- package/src/filiale/qianneng/ModifyPw.vue +1 -0
- package/src/filiale/rizhao/Login.vue +2 -0
- package/src/filiale/shiquan/Login.vue +2 -0
- package/src/filiale/tianyi/Login.vue +2 -0
- package/src/filiale/tongchuan/Login.vue +2 -0
- package/src/filiale/tongchuan/Main.vue +3 -1
- package/src/filiale/weinan/Main.vue +924 -923
- package/src/filiale/weinan/system.js +7 -7
- package/src/filiale/wenxi/Login.vue +2 -0
- package/src/filiale/wenxi/Main.vue +2 -0
- package/src/filiale/wuhai/Main.vue +3 -0
- package/src/filiale/yuchuan/Login.vue +2 -0
- package/src/filiale/yuchuan/Main.vue +2 -0
- package/src/filiale/zhoukou/Main.vue +2 -0
- package/src/plugins/GetLoginInfoService.js +13 -75
- package/src/stores/AppData.js +1 -1
- package/.gradle/3.5.1/taskHistory/taskHistory.lock +0 -0
- package/.gradle/7.4/checksums/checksums.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/dependencies-accessors.lock +0 -0
- package/.gradle/7.4/dependencies-accessors/gc.properties +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.bin +0 -0
- package/.gradle/7.4/executionHistory/executionHistory.lock +0 -0
- package/.gradle/7.4/fileChanges/last-build.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.bin +0 -0
- package/.gradle/7.4/fileHashes/fileHashes.lock +0 -0
- package/.gradle/7.4/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +0 -2
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
@@ -161,6 +161,7 @@ let getwartermakr = async function (self) {
|
|
161
161
|
tablename: 't_singlevalue',
|
162
162
|
condition: " 1=1 and name=\'水印内容\'"
|
163
163
|
};
|
164
|
+
// todo v4
|
164
165
|
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
165
166
|
if (result && result.data.length > 0) {
|
166
167
|
self.showwatermakeflag = true;
|
@@ -431,6 +432,7 @@ export default {
|
|
431
432
|
username: this.$login.f.name,
|
432
433
|
usertelephone: this.$login.f.f_user_telephone
|
433
434
|
}
|
435
|
+
// todo v4
|
434
436
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
435
437
|
window.location.reload()
|
436
438
|
}
|
@@ -62,6 +62,7 @@
|
|
62
62
|
// let res = yield self.$post('rs/db/modifypassword', {data: self.deliver})
|
63
63
|
// let res = yield self.$resetpost('/rs/db/modifypwd', {data: self.deliver})
|
64
64
|
// Util.f.password = self.deliver.newpassword
|
65
|
+
// todo v4
|
65
66
|
let res = yield self.$resetpost('/rs/user/modifypwd', {data: self.deliver })
|
66
67
|
self.$login.f.password = self.deliver.newpassword
|
67
68
|
if (res.data) {
|
@@ -127,6 +127,7 @@ import {HttpResetClass} from 'vue-client'
|
|
127
127
|
|
128
128
|
|
129
129
|
|
130
|
+
// todo v4
|
130
131
|
let saveGen = function *(self) {
|
131
132
|
try {
|
132
133
|
if(self.$login){
|
@@ -298,6 +299,7 @@ export default {
|
|
298
299
|
if (this.config.distanceLogin) {
|
299
300
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
300
301
|
let ename = this.$login.getUrlParames('name');
|
302
|
+
// todo v4
|
301
303
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
302
304
|
if(logininfo.data){
|
303
305
|
if(logininfo.data.ename && logininfo.data.password){
|
@@ -174,6 +174,7 @@
|
|
174
174
|
console.log('登录配置', self.config)
|
175
175
|
if (self.config.isMac) {
|
176
176
|
// 获取该登录人分公司下的mac配置
|
177
|
+
// todo v4
|
177
178
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
178
179
|
resolveMsg: null,
|
179
180
|
rejectMsg: null
|
@@ -435,6 +436,7 @@
|
|
435
436
|
if (this.config.distanceLogin) {
|
436
437
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
437
438
|
let ename = this.$login.getUrlParames('name');
|
439
|
+
// todo v4
|
438
440
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
439
441
|
if(logininfo.data){
|
440
442
|
if(logininfo.data.ename && logininfo.data.password){
|
@@ -178,6 +178,7 @@ let saveGen = function *(self) {
|
|
178
178
|
console.log('登录配置', self.config)
|
179
179
|
if (self.config.isMac) {
|
180
180
|
// 获取该登录人分公司下的mac配置
|
181
|
+
// todo v4
|
181
182
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
182
183
|
resolveMsg: null,
|
183
184
|
rejectMsg: null
|
@@ -442,6 +443,7 @@ export default {
|
|
442
443
|
if (this.config.distanceLogin) {
|
443
444
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
444
445
|
let ename = this.$login.getUrlParames('name');
|
446
|
+
// todo v4
|
445
447
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
446
448
|
if(logininfo.data){
|
447
449
|
if(logininfo.data.ename && logininfo.data.password){
|
@@ -171,6 +171,7 @@ let saveGen = function *(self) {
|
|
171
171
|
console.log('登录配置', self.config)
|
172
172
|
if (self.config.isMac) {
|
173
173
|
// 获取该登录人分公司下的mac配置
|
174
|
+
// todo v4
|
174
175
|
let getMacs = yield self.$resetpost('rs/sql/equipmentQuery', {data: {condition: `f_filialeids like '%${self.$login.f.f_orgids}%'`}}, {
|
175
176
|
resolveMsg: null,
|
176
177
|
rejectMsg: null
|
@@ -447,6 +448,7 @@ export default {
|
|
447
448
|
if (this.config.distanceLogin) {
|
448
449
|
if (this.$login && this.$login.getUrlParames('name') ) {
|
449
450
|
let ename = this.$login.getUrlParames('name');
|
451
|
+
// todo v4
|
450
452
|
let logininfo = await this.$resetpost('rs/logic/getLoginData',{data:{ename:ename}},{resolveMsg: null, rejectMsg: null});
|
451
453
|
if(logininfo.data){
|
452
454
|
if(logininfo.data.ename && logininfo.data.password){
|
@@ -212,6 +212,7 @@ let getwartermakr = async function (self) {
|
|
212
212
|
tablename: 't_singlevalue',
|
213
213
|
condition: " 1=1 and name=\'水印内容\'"
|
214
214
|
};
|
215
|
+
// todo v4
|
215
216
|
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
216
217
|
if (result && result.data.length > 0) {
|
217
218
|
self.showwatermakeflag = true;
|
@@ -376,6 +377,7 @@ let createWaterMark = function (userName) {
|
|
376
377
|
this.model.f_stopgas_id = this.notices.id
|
377
378
|
this.model.f_user_id = this.$login.f.id
|
378
379
|
console.log('保存', this.model)
|
380
|
+
// todo v4
|
379
381
|
this.$resetpost('rs/logic/savenoticenotarize', this.model, {resolveMsg: '保存成功', rejectMsg: '保存失败'}).then((res) => {
|
380
382
|
this.model.f_stopgas_id = ''
|
381
383
|
this.model.f_user_id = ''
|
@@ -566,7 +568,6 @@ let createWaterMark = function (userName) {
|
|
566
568
|
res.data.forEach(itre => {
|
567
569
|
let band = null
|
568
570
|
if ('f_dynamic_expire' in itre) {
|
569
|
-
console.log(itre.f_dynamic_expire)
|
570
571
|
if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
|
571
572
|
let todayold = new Date(itre.f_dynamic_expire)
|
572
573
|
todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
|
@@ -696,6 +697,7 @@ let createWaterMark = function (userName) {
|
|
696
697
|
username: this.$login.f.name,
|
697
698
|
usertelephone: this.$login.f.f_user_telephone
|
698
699
|
}
|
700
|
+
// todo v4
|
699
701
|
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
700
702
|
window.location.reload()
|
701
703
|
}
|