sale-client 4.1.75 → 4.1.76
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/build/dev-server.js +4 -4
- package/package.json +1 -1
- package/src/components/revenue/HandManager/WebHand.vue +1 -1
- package/src/filiale/jinhong/AutoAccountsDetail.vue +0 -8
- package/src/filiale/jinhong/CardList.vue +3 -3
- 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 +0 -2
- package/.gradle/vcs-1/gc.properties +0 -0
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 ] = ['http://
|
|
4
|
+
const [ serverRul, localUrl ] = ['http://192.168.50.67:31467/', 'http://192.168.50.67:31467/']
|
|
5
5
|
var merge = require('webpack-merge')
|
|
6
6
|
var baseConfig = require('./webpack.dev.conf')
|
|
7
7
|
var devConfig = {
|
|
@@ -42,9 +42,9 @@ var devConfig = {
|
|
|
42
42
|
// target: 'http://410663id1ia4.vicp.fun'
|
|
43
43
|
// },
|
|
44
44
|
// '/api/af-revenue/sql': {
|
|
45
|
-
//
|
|
46
|
-
//
|
|
47
|
-
//
|
|
45
|
+
// pathRewrite: {
|
|
46
|
+
// '/api/af-revenue/sql': '/sql'
|
|
47
|
+
// },
|
|
48
48
|
// target: localUrl
|
|
49
49
|
// },
|
|
50
50
|
'/rs/pay': {
|
package/package.json
CHANGED
|
@@ -41,7 +41,7 @@
|
|
|
41
41
|
<export-excel
|
|
42
42
|
:data="$parent.$parent.getCondition"
|
|
43
43
|
:field="$parent.$parent.getfield"
|
|
44
|
-
sqlurl="api/af-revenue/logic/saleExport" sql-name="
|
|
44
|
+
sqlurl="api/af-revenue/logic/saleExport" sql-name="sale_getWebHand" template-name='物联网抄表导出'
|
|
45
45
|
:choose-col="true">
|
|
46
46
|
</export-excel>
|
|
47
47
|
<div
|
|
@@ -5,10 +5,6 @@
|
|
|
5
5
|
<label class = "col-sm-4">客户名称:</label>
|
|
6
6
|
<span class = "col-sm-8" style="text-align:left">{{model.f_user_name}}</span>
|
|
7
7
|
</div>
|
|
8
|
-
<div class="row">
|
|
9
|
-
<label class = "col-sm-4">客户编号:</label>
|
|
10
|
-
<span class = "col-sm-8" style="text-align:left">{{data.f_userinfo_id}}</span>
|
|
11
|
-
</div>
|
|
12
8
|
<div class="row">
|
|
13
9
|
<label class = "col-sm-4">上期底数:</label>
|
|
14
10
|
<span class = "col-sm-2" style="text-align:left">{{model.f_last_tablebase}}</span>
|
|
@@ -27,10 +23,6 @@
|
|
|
27
23
|
<label class = "col-sm-4" >本期结余:</label>
|
|
28
24
|
<span class = "col-sm-2" style="text-align:left">{{model.f_curbalance}}</span>
|
|
29
25
|
</div>
|
|
30
|
-
<div class="row">
|
|
31
|
-
<label class = "col-sm-4">操作人:</label>
|
|
32
|
-
<span class = "col-sm-8" style="text-align:left">{{model.f_operator}}</span>
|
|
33
|
-
</div>
|
|
34
26
|
<div class="row">
|
|
35
27
|
<label class = "col-sm-4">操作时间:</label>
|
|
36
28
|
<span class = "col-sm-8" style="text-align:left">{{data.f_operate_date}}</span>
|
|
@@ -70,7 +70,7 @@
|
|
|
70
70
|
row.type==='物联网赠气'|| row.type==='物联网赠费'|| row.type==='卡表赠费'|| row.type==='卡表赠气'||
|
|
71
71
|
row.type==='卡表收费撤销'||row.type==='物联网补费' || row.type==='物联网扣费'||row.type==='机表补费'||
|
|
72
72
|
row.type==='机表扣费'||row.type==='物联网补气'||row.type==='物联网扣气'||row.type==='气损收费' ||
|
|
73
|
-
row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气' || row.type === '清零补气' ||
|
|
73
|
+
row.type === '气表清零' || row.type === '掉气补气' || row.type === '其他补气' || row.type === '清零补气' || row.type === '自动下账' ||
|
|
74
74
|
row.type === '换表补气' || row.type === '过户'|| row.type ==='价格补差' || row.type ==='价格补差撤销') && row.type!=='新增户档案' && row.type!=='转气转出' && row.type!=='转气转入'">
|
|
75
75
|
<button data-toggle="dropdown" style="border: 0px;background: none;" type="button"
|
|
76
76
|
v-if="row.f_user_state==='正常'||row.f_user_state==='预备'||row.type==='气损收费' ">
|
|
@@ -89,7 +89,7 @@
|
|
|
89
89
|
<li>
|
|
90
90
|
<a @click.stop="$parent.$parent.$parent.operate('票据补打', row)" href="#">票据补打</a>
|
|
91
91
|
</li>
|
|
92
|
-
<li>
|
|
92
|
+
<li v-if="row.type !== '自动下账'">
|
|
93
93
|
<a @click.stop="$parent.$parent.$parent.operate('撤销', row)" href="#">撤销</a>
|
|
94
94
|
</li>
|
|
95
95
|
</ul>
|
|
@@ -138,7 +138,7 @@
|
|
|
138
138
|
<machinemetercenter-cancel-detail :data="row" v-if="row.type === '机表收费撤销'"></machinemetercenter-cancel-detail>
|
|
139
139
|
<machinemetercenter-cancel-detail :data="row" v-if="row.type == '预存缴费撤销'"></machinemetercenter-cancel-detail>
|
|
140
140
|
<othercharge-cancel-detail :data="row" v-if="row.type === '其他收费撤销'"></othercharge-cancel-detail>
|
|
141
|
-
<
|
|
141
|
+
<replacecardmanagecancel-detail :data="row" v-if="row.type === '补卡撤销'"></replacecardmanagecancel-detail>
|
|
142
142
|
<iotmetercenter-cancel-detail :data="row" v-if="row.type === '物联网收费撤销'"></iotmetercenter-cancel-detail>
|
|
143
143
|
<feededuction-detail :data="row" v-if="row.type === '补费' ||row.type === '扣费' ||row.type === '补气' ||row.type === '扣气' "></feededuction-detail>
|
|
144
144
|
<with-gas :data="row" v-if="row.type==='物联网赠气' || row.type==='物联网赠费'||row.type==='卡表赠气'||row.type==='卡表赠费'"></with-gas>
|
|
Binary file
|
|
Binary file
|
|
File without changes
|
|
Binary file
|
|
File without changes
|