system-clients 3.3.3-v3 → 3.3.3-v3-test
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 +1 -1
- package/src/components/Main.vue +4 -17
- package/src/components/equipment/PosList.vue +2 -3
- package/src/components/equipment/PosParamAdd.vue +2 -3
- package/src/components/materialManage/materialList.vue +1 -1
- package/src/components/parammanage/ParamPage.vue +1 -1
- package/src/components/parammanage/ParamPages.vue +2 -2
- package/src/components/parammanage/SinglePage.vue +1 -1
- package/src/components/parammanage/SinglePages.vue +2 -2
- package/src/components/server/AddChangeMsg.vue +4 -3
- package/src/components/server/ChangeDeclare.vue +2 -9
- package/src/components/server/Login.vue +11 -12
- package/src/components/server/PcdBuildingSelect.vue +8 -53
- package/src/filiale/baole/Login.vue +11 -12
- package/src/filiale/chengtou/Login.vue +11 -20
- package/src/filiale/dongguan/Login.vue +11 -12
- package/src/filiale/dongguan/Main.vue +2 -9
- package/src/filiale/furuike/Login.vue +18 -20
- package/src/filiale/furuike/Main.vue +6 -16
- package/src/filiale/gehua/Main.vue +2 -9
- package/src/filiale/konggang/Login.vue +16 -25
- package/src/filiale/qianneng/Login.vue +16 -25
- package/src/filiale/qianneng/Main.vue +2 -9
- package/src/filiale/rizhao/Main.vue +1 -5
- package/src/filiale/shiquan/Login.vue +16 -25
- package/src/filiale/tianyi/Login.vue +11 -20
- package/src/filiale/tongchuan/Login.vue +11 -20
- package/src/filiale/tongchuan/Main.vue +21 -46
- package/src/filiale/weinan/Main.vue +4 -17
- package/src/filiale/wenxi/Login.vue +16 -25
- package/src/filiale/wenxi/Main.vue +2 -9
- package/src/filiale/wuhai/Main.vue +4 -18
- package/src/filiale/yuchuan/Login.vue +11 -12
- package/src/filiale/yuchuan/Main.vue +2 -9
- package/src/filiale/zhoukou/Main.vue +2 -9
- package/src/stores/AppData.js +1 -0
|
@@ -147,11 +147,7 @@ import co from 'co'
|
|
|
147
147
|
import {HttpResetClass} from "vue-client";
|
|
148
148
|
|
|
149
149
|
let getwartermakr = async function (self) {
|
|
150
|
-
let
|
|
151
|
-
tablename: 't_singlevalue',
|
|
152
|
-
condition: " 1=1 and name=\'水印内容\'"
|
|
153
|
-
};
|
|
154
|
-
let result = await self.$resetpost('rs/sql/saleSingleTable', {data: param}, {resolveMsg: null, rejectMsg: null});
|
|
150
|
+
let result = await self.$resetpost('rs/sql/safeWatermarkQuery', {}, {resolveMsg: null, rejectMsg: null});
|
|
155
151
|
if (result && result.data.length > 0) {
|
|
156
152
|
self.showwatermakeflag = true;
|
|
157
153
|
createWaterMark(`${result.data[0].value}${self.$login.f.ename}`);
|
|
@@ -291,10 +287,7 @@ export default {
|
|
|
291
287
|
this.OrderDaiBan = ''
|
|
292
288
|
this.AppDaiBan = ''
|
|
293
289
|
let http = new HttpResetClass()
|
|
294
|
-
await http.load('POST', '/rs/sql/
|
|
295
|
-
tablename:'t_order_center',
|
|
296
|
-
condition:` (f_orderstate != '预约成功' and f_orgstr ='${this.$login.f.orgid}' and f_orderstate != '预约失败' ) or f_orderstate is null`
|
|
297
|
-
}}, {
|
|
290
|
+
await http.load('POST', '/rs/sql/safeOrderCenterQueryByOrgStr', {f_orgstr: this.$login.f.orgid}, {
|
|
298
291
|
resolveMsg: null,
|
|
299
292
|
rejectMsg: null
|
|
300
293
|
}).then((res) => {
|
package/src/stores/AppData.js
CHANGED
|
@@ -10,6 +10,7 @@ let GetAppDataService = {
|
|
|
10
10
|
// 开启卡监听
|
|
11
11
|
load () {
|
|
12
12
|
return Vue.resetpost('rs/logic/getInitData', {data: {f_filialeids: Vue.$login.f.orgid}}, {resolveMsg: null, rejectMsg: null}).then((res) => {
|
|
13
|
+
console.warn("getInitData",JSON.stringify(res),res.data)
|
|
13
14
|
res.data.singleValues.forEach((item) => {
|
|
14
15
|
this.singleValues[item.name] = item.value
|
|
15
16
|
})
|