system-clients 3.2.90 → 3.2.91-tongchuan
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/.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 +2 -0
- package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
- package/.gradle/file-system.probe +0 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/gradle/wrapper/gradle-wrapper.jar +0 -0
- package/gradle/wrapper/gradle-wrapper.properties +5 -0
- package/package.json +2 -2
- package/src/components/Main.vue +4 -6
- package/src/components/Util.js +357 -343
- 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 +10 -6
- package/src/components/equipment/PosList.vue +5 -3
- 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 +36 -18
- package/src/components/server/ModifyPw.vue +0 -1
- package/src/components/server/PcdBuildingSelect.vue +0 -2
- package/src/components/server/ResSelectGroup.vue +211 -211
- package/src/components/server/RoleSelector.vue +2 -3
- package/src/filiale/baole/Login.vue +0 -2
- package/src/filiale/chengtou/Login.vue +0 -2
- package/src/filiale/dongguan/Login.vue +0 -2
- package/src/filiale/dongguan/Main.vue +0 -2
- package/src/filiale/furuike/Login.vue +0 -4
- package/src/filiale/furuike/Main.vue +0 -2
- package/src/filiale/gehua/Main.vue +0 -2
- package/src/filiale/konggang/Login.vue +0 -2
- package/src/filiale/qianneng/Login.vue +582 -584
- package/src/filiale/qianneng/Main.vue +0 -2
- package/src/filiale/qianneng/ModifyPw.vue +0 -1
- package/src/filiale/rizhao/Login.vue +0 -2
- package/src/filiale/rizhao/Main.vue +1 -1
- package/src/filiale/shiquan/Login.vue +0 -2
- package/src/filiale/tianyi/Login.vue +0 -2
- package/src/filiale/tongchuan/Login.vue +567 -563
- package/src/filiale/tongchuan/Main.vue +16 -3
- package/src/filiale/weinan/Main.vue +923 -924
- package/src/filiale/weinan/system.js +7 -7
- package/src/filiale/wenxi/Login.vue +0 -2
- package/src/filiale/wenxi/Main.vue +0 -2
- package/src/filiale/wuhai/Main.vue +0 -3
- package/src/filiale/yuchuan/Login.vue +0 -2
- package/src/filiale/yuchuan/Main.vue +0 -2
- package/src/filiale/zhoukou/Main.vue +0 -2
- package/src/plugins/EncryptUtil.js +53 -53
- package/src/plugins/GetLoginInfoService.js +540 -474
- package/src/stores/AppData.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "system-clients",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.91-tongchuan",
|
|
4
4
|
"description": "系统基础框架",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"directories": {
|
|
@@ -79,7 +79,7 @@
|
|
|
79
79
|
"style": "0.0.3",
|
|
80
80
|
"style-loader": "^0.20.3",
|
|
81
81
|
"url-loader": "^0.5.7",
|
|
82
|
-
"vue-client": "1.24.
|
|
82
|
+
"vue-client": "1.24.107-test",
|
|
83
83
|
"vue-hot-reload-api": "^1.2.0",
|
|
84
84
|
"vue-html-loader": "^1.0.0",
|
|
85
85
|
"vue-loader": "^8.2.1",
|
package/src/components/Main.vue
CHANGED
|
@@ -189,7 +189,6 @@ let getwartermakr = async function (self) {
|
|
|
189
189
|
tablename: 't_singlevalue',
|
|
190
190
|
condition: " 1=1 and name=\'水印内容\'"
|
|
191
191
|
};
|
|
192
|
-
// todo v4
|
|
193
192
|
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
194
193
|
if (result && result.data.length > 0) {
|
|
195
194
|
self.showwatermakeflag = true;
|
|
@@ -322,7 +321,9 @@ let createWaterMark = function (userName) {
|
|
|
322
321
|
// }
|
|
323
322
|
this.changeShow()
|
|
324
323
|
const istelRemindTimes =this.$appdata.getSingleValue("是否开启工单提醒定时器")
|
|
324
|
+
this.getDaiBan()
|
|
325
325
|
if(istelRemindTimes=='是'){
|
|
326
|
+
this.getOrderList()
|
|
326
327
|
this.getTimesgotoWorkOrderSite()
|
|
327
328
|
}
|
|
328
329
|
const isapplyRemind =this.$appdata.getSingleValue("是否开启提醒")
|
|
@@ -471,6 +472,7 @@ let createWaterMark = function (userName) {
|
|
|
471
472
|
res.data.forEach(itre => {
|
|
472
473
|
let band = null
|
|
473
474
|
if ('f_dynamic_expire' in itre) {
|
|
475
|
+
console.log(itre.f_dynamic_expire)
|
|
474
476
|
if (itre.f_dynamic_expire !== null && itre.f_dynamic_expire !== '') {
|
|
475
477
|
let todayold = new Date(itre.f_dynamic_expire)
|
|
476
478
|
todayold.setDate(todayold.getDate() - parseInt(this.$appdata.getSingleValue('动态库提醒天数设置')))
|
|
@@ -600,11 +602,7 @@ let createWaterMark = function (userName) {
|
|
|
600
602
|
username: this.$login.f.name,
|
|
601
603
|
usertelephone: this.$login.f.f_user_telephone
|
|
602
604
|
}
|
|
603
|
-
|
|
604
|
-
try {
|
|
605
|
-
await this.$resetget('api/af-system/user/logout', {resolveMsg: '退出成功', rejectMsg: null})
|
|
606
|
-
}catch(e){
|
|
607
|
-
}
|
|
605
|
+
await this.$resetpost('rs/logic/logOut', data, {resolveMsg: '退出成功', rejectMsg: null})
|
|
608
606
|
window.location.reload()
|
|
609
607
|
}
|
|
610
608
|
})
|