sale-client 3.6.565 → 3.6.566
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/5.2.1/fileChanges/last-build.bin +0 -0
- package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
- package/.gradle/5.2.1/gc.properties +0 -0
- package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
- package/.gradle/buildOutputCleanup/cache.properties +2 -0
- package/.gradle/vcs-1/gc.properties +0 -0
- package/build/dev-server.js +6 -15
- package/package.json +1 -1
- package/src/App.vue +1 -1
- package/src/filiale/tongchuan/UserAddressInFile.vue +4 -4
- package/src/main.js +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
2
|
var checkVersion = require('./versionCheck.js')
|
|
3
3
|
checkVersion()
|
|
4
|
-
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:
|
|
4
|
+
const [ serverRul, localUrl, v4Url ] = ['http://192.168.50.67:30785/', 'http://localhost:8080/', 'http://192.168.50.67:30785']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -26,18 +26,6 @@ var devConfig = {
|
|
|
26
26
|
target: serverRul,
|
|
27
27
|
changeOrigin: true
|
|
28
28
|
},
|
|
29
|
-
'/api/af-revenue/logic/': {
|
|
30
|
-
pathRewrite: { '^/api/af-revenue/logic/': '/rs/logic/' },
|
|
31
|
-
target: serverRul
|
|
32
|
-
},
|
|
33
|
-
'/api/af-revenue/report/': {
|
|
34
|
-
pathRewrite: { '^/api/af-revenue/report/': '/rs/report/' },
|
|
35
|
-
target: serverRul
|
|
36
|
-
},
|
|
37
|
-
'/api/af-revenue/sql/': {
|
|
38
|
-
pathRewrite: { '^/api/af-revenue/sql/': '/rs/sql/' },
|
|
39
|
-
target: serverRul
|
|
40
|
-
},
|
|
41
29
|
'/invoice/rs/logic/getInvoice': {
|
|
42
30
|
target: serverRul
|
|
43
31
|
},
|
|
@@ -57,6 +45,9 @@ var devConfig = {
|
|
|
57
45
|
target: localUrl
|
|
58
46
|
},
|
|
59
47
|
'/invoice': {
|
|
48
|
+
// pathRewrite: {
|
|
49
|
+
// '/invoice/rs/logic': '/logic'
|
|
50
|
+
// },
|
|
60
51
|
target: serverRul
|
|
61
52
|
},
|
|
62
53
|
'/rs/batchSettlement': {
|
|
@@ -122,8 +113,8 @@ var devConfig = {
|
|
|
122
113
|
target: serverRul
|
|
123
114
|
},
|
|
124
115
|
'/rs': {
|
|
125
|
-
target:
|
|
126
|
-
changeOrigin: true
|
|
116
|
+
target: serverRul
|
|
117
|
+
// changeOrigin: true
|
|
127
118
|
}
|
|
128
119
|
}
|
|
129
120
|
}
|
package/package.json
CHANGED
package/src/App.vue
CHANGED
|
@@ -230,10 +230,9 @@
|
|
|
230
230
|
this.model.f_address_state = '已通气'
|
|
231
231
|
this.initAreas(this.f_filialeids)
|
|
232
232
|
// 添加特殊地址选省市区
|
|
233
|
-
|
|
234
|
-
this.
|
|
235
|
-
this.
|
|
236
|
-
this.initareas(` f_filialeid = '${this.f_filialeids}'`)
|
|
233
|
+
this.initpcds(` 1=1`)
|
|
234
|
+
this.initstreets(` f_pcd_id = '${this.model.f_pcd_id}' `)
|
|
235
|
+
this.initareas(` f_street_id = '${this.model.f_street_id}'`)
|
|
237
236
|
},
|
|
238
237
|
|
|
239
238
|
// 初始化片区
|
|
@@ -622,6 +621,7 @@
|
|
|
622
621
|
this.operation='modify'
|
|
623
622
|
this.onedata='one'
|
|
624
623
|
this.model=Object.assign({},row)
|
|
624
|
+
this.initdata()
|
|
625
625
|
if(row.f_special=='1'){
|
|
626
626
|
this.usertype = true
|
|
627
627
|
}else{
|
package/src/main.js
CHANGED
|
@@ -2,7 +2,7 @@ import Vue from 'vue'
|
|
|
2
2
|
import all from 'vue-client/src/all'
|
|
3
3
|
import App from './App'
|
|
4
4
|
import system from 'system-clients/src/system'
|
|
5
|
-
import FilialeSale from './filiale/
|
|
5
|
+
import FilialeSale from './filiale/bayan/sale'
|
|
6
6
|
import sale from './sale'
|
|
7
7
|
import address from 'address-client/src/address'
|
|
8
8
|
import ldap from 'ldap-clients/src/ldap'
|