system-phone 3.0.49-57 → 3.0.49-58
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/stores/AppData.js +23 -5
package/package.json
CHANGED
package/src/stores/AppData.js
CHANGED
|
@@ -15,10 +15,20 @@ let GetAppDataService = {
|
|
|
15
15
|
let result = await new HttpResetClass().load('POST',url1, {data: {f_filialeids: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
|
|
16
16
|
console.log('system加载参数')
|
|
17
17
|
console.log(JSON.stringify(result))
|
|
18
|
-
|
|
18
|
+
let newdata = {
|
|
19
|
+
singleValues : result.data.singleValues,
|
|
20
|
+
params: result.data.params
|
|
21
|
+
}
|
|
22
|
+
if(Vue.isv4 && result.data.code == 200){
|
|
23
|
+
newdata = {
|
|
24
|
+
singleValues : result.data.data.singleValues,
|
|
25
|
+
params: result.data.data.params
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
newdata.singleValues.forEach((item) => {
|
|
19
29
|
this.singleValues[item.name] = item.value
|
|
20
30
|
})
|
|
21
|
-
|
|
31
|
+
newdata.params.forEach((item) => {
|
|
22
32
|
let value = []
|
|
23
33
|
item.f_paramvalues.forEach((item, index) => {
|
|
24
34
|
value[index] = {}
|
|
@@ -28,15 +38,23 @@ let GetAppDataService = {
|
|
|
28
38
|
this.params[item.name] = value
|
|
29
39
|
})
|
|
30
40
|
if (!noSale){
|
|
31
|
-
let url2 = `${Vue.androidUtil.getProxyUrl()}/rs/logic/
|
|
41
|
+
let url2 = `${Vue.androidUtil.getProxyUrl()}/rs/logic/getSaleInitData`
|
|
32
42
|
if(Vue.isv4){
|
|
33
43
|
url2 = `${Vue.androidUtil.getProxyUrl()}/api/af-revenue/logic/getSaleInitData`
|
|
34
44
|
}
|
|
35
45
|
let getParams = await new HttpResetClass().load('post',url2, {data: {f_orgid: Vue.user.orgid}}, {resolveMsg: null, rejectMsg: null})
|
|
36
46
|
console.log('获取营收参数')
|
|
37
47
|
console.log(JSON.stringify(getParams))
|
|
38
|
-
|
|
39
|
-
getParams.data.gasbrands
|
|
48
|
+
let newsaledata = {
|
|
49
|
+
gasbrands : getParams.data.gasbrands
|
|
50
|
+
}
|
|
51
|
+
if(Vue.isv4 && getParams.data.code == 200){
|
|
52
|
+
newsaledata = {
|
|
53
|
+
gasbrands : getParams.data.data.gasbrands
|
|
54
|
+
}
|
|
55
|
+
}
|
|
56
|
+
if (newsaledata) {
|
|
57
|
+
newsaledata.gasbrands.forEach((item, index) => {
|
|
40
58
|
this.saleParams.gasbrands[index] = {}
|
|
41
59
|
this.saleParams.gasbrands[index].label = item.f_meter_brand
|
|
42
60
|
this.saleParams.gasbrands[index].value = item.f_meter_brand
|