sale-client-xianyang 3.3.447 → 3.3.448
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 +7 -7
- package/package.json +1 -1
- package/src/components/revenue/base/rightview/CardList.vue +1 -1
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|
package/build/dev-server.js
CHANGED
|
@@ -6,13 +6,13 @@ var proxyMiddleware = require('http-proxy-middleware')
|
|
|
6
6
|
|
|
7
7
|
var app = express()
|
|
8
8
|
var compiler = webpack(config)
|
|
9
|
-
var server = 'http://
|
|
10
|
-
var local = 'http://
|
|
9
|
+
var server = 'http://172.16.16.162:8300'
|
|
10
|
+
var local = 'http://172.16.16.162:8300'
|
|
11
11
|
var proxyTable = {
|
|
12
12
|
'/rs/file': {
|
|
13
13
|
target: server
|
|
14
14
|
},
|
|
15
|
-
'/rs/sql/
|
|
15
|
+
'/rs/sql/address_getAddress': {
|
|
16
16
|
target: server
|
|
17
17
|
},
|
|
18
18
|
'/rs/logic/address_updateuseraddress': {
|
|
@@ -22,7 +22,7 @@ var proxyTable = {
|
|
|
22
22
|
target: server
|
|
23
23
|
},
|
|
24
24
|
'/rs/logic/changeMeter': {
|
|
25
|
-
target:
|
|
25
|
+
target: local
|
|
26
26
|
},
|
|
27
27
|
'/pos': {
|
|
28
28
|
target: server
|
|
@@ -80,13 +80,13 @@ var proxyTable = {
|
|
|
80
80
|
target: server
|
|
81
81
|
},
|
|
82
82
|
'/rs/logic': {
|
|
83
|
-
target:
|
|
83
|
+
target: local
|
|
84
84
|
},
|
|
85
85
|
'/rs/entity': {
|
|
86
|
-
target:
|
|
86
|
+
target: local
|
|
87
87
|
},
|
|
88
88
|
'/rs/sql': {
|
|
89
|
-
target:
|
|
89
|
+
target: local
|
|
90
90
|
},
|
|
91
91
|
'/webmeter': {
|
|
92
92
|
target: server
|
package/package.json
CHANGED
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
<a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>
|
|
69
69
|
</li>
|
|
70
70
|
<li
|
|
71
|
-
v-if="row.state === 1 && (row.payment !== '微信支付' && row.payment !== '银行') && (row.type === '换表补气' || row.type === '清零补气' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费' || row.type === '过户' || row.type === '换新表' || row.type === '换控制器' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '补卡' || row.type === '过户'|| row.type === '发卡售气')">
|
|
71
|
+
v-if="row.state === 1 && row.f_operator!=='微信公众号' && (row.payment !== '微信支付' && row.payment !== '银行') && (row.type === '换表补气' || row.type === '清零补气' || row.type === '物联网开户' || row.type === '物联网收费' || row.type === '其他收费' || row.type === '过户' || row.type === '换新表' || row.type === '换控制器' || row.type === '气表清零' || row.type === '机表收费' || row.type === '超用收费' || row.type === '补卡' || row.type === '过户'|| row.type === '发卡售气')">
|
|
72
72
|
<a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
|
|
73
73
|
</li>
|
|
74
74
|
<li
|