sale-client 3.6.286 → 3.6.287-2
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 +101 -108
- package/package.json +3 -3
- package/src/components/charge/ChargeOper.vue +12 -13
- package/src/components/charge/business/OtherChargeNew.vue +2 -29
- package/src/components/revenue/base/leftview/SafeCheck.vue +6 -6
- package/src/components/revenue/invoiceuse/InvoiceChargeList.vue +1 -0
- package/src/filiale/ancheng/NewMeterList.vue +607 -601
- package/src/filiale/qianneng/sale.js +103 -103
- package/src/main.js +33 -33
package/build/dev-server.js
CHANGED
|
@@ -1,108 +1,101 @@
|
|
|
1
|
-
var path = require('path')
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
var
|
|
6
|
-
var
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
'/rs/
|
|
41
|
-
target: serverRul
|
|
42
|
-
},
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
'/rs/logic/
|
|
52
|
-
target: serverRul
|
|
53
|
-
},
|
|
54
|
-
//
|
|
55
|
-
'/rs/
|
|
56
|
-
target: serverRul
|
|
57
|
-
},
|
|
58
|
-
'/rs/
|
|
59
|
-
target: serverRul
|
|
60
|
-
},
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
}
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
target: serverRul
|
|
103
|
-
// changeOrigin: true
|
|
104
|
-
},
|
|
105
|
-
}
|
|
106
|
-
}
|
|
107
|
-
}
|
|
108
|
-
module.exports = merge(baseConfig, devConfig)
|
|
1
|
+
var path = require('path')
|
|
2
|
+
const [ serverRul, localUrl, v4Url ] =
|
|
3
|
+
['http://221.193.244.147:8400/#', 'http://127.0.0.1:8080/', 'http://192.168.50.4:8400/']
|
|
4
|
+
var merge = require('webpack-merge')
|
|
5
|
+
var baseConfig = require('./webpack.dev.conf')
|
|
6
|
+
var devConfig = {
|
|
7
|
+
devServer: {
|
|
8
|
+
contentBase: path.join(__dirname, 'src'),
|
|
9
|
+
hot: true,
|
|
10
|
+
publicPath: baseConfig.output.publicPath,
|
|
11
|
+
historyApiFallback: true,
|
|
12
|
+
host: '127.0.0.1',
|
|
13
|
+
port: 8089,
|
|
14
|
+
open: false,
|
|
15
|
+
stats: {
|
|
16
|
+
colors: false, // 配置控制台输出彩色日志
|
|
17
|
+
chunks: false, // 不输出构建 chunk 信息
|
|
18
|
+
children: false // 不输出子模块构建信息
|
|
19
|
+
},
|
|
20
|
+
proxy: {
|
|
21
|
+
'/api': {
|
|
22
|
+
target: v4Url
|
|
23
|
+
},
|
|
24
|
+
'/invoice/rs/logic/getInvoice': {
|
|
25
|
+
target: serverRul
|
|
26
|
+
},
|
|
27
|
+
'/rs/file': {
|
|
28
|
+
target: serverRul
|
|
29
|
+
},
|
|
30
|
+
'/webapps': {
|
|
31
|
+
target: serverRul
|
|
32
|
+
},
|
|
33
|
+
'/rs/sql/singleTable': {
|
|
34
|
+
target: serverRul
|
|
35
|
+
},
|
|
36
|
+
'/invoice': {
|
|
37
|
+
target: serverRul
|
|
38
|
+
},
|
|
39
|
+
// 查找资源服务数据
|
|
40
|
+
'/rs/search': {
|
|
41
|
+
target: serverRul
|
|
42
|
+
},
|
|
43
|
+
// 查找资源服务数据
|
|
44
|
+
'/rs/logic/getLogin': {
|
|
45
|
+
target: serverRul
|
|
46
|
+
},
|
|
47
|
+
// 查找资源服务数据
|
|
48
|
+
'/rs/logic/getInitData': {
|
|
49
|
+
target: serverRul
|
|
50
|
+
},
|
|
51
|
+
'/rs/logic/getSaleInitData': {
|
|
52
|
+
target: serverRul
|
|
53
|
+
},
|
|
54
|
+
// 用户登录服务地址
|
|
55
|
+
'/rs/user': {
|
|
56
|
+
target: serverRul
|
|
57
|
+
},
|
|
58
|
+
'/rs/path': {
|
|
59
|
+
target: serverRul
|
|
60
|
+
},
|
|
61
|
+
'/rs/data': {
|
|
62
|
+
target: serverRul
|
|
63
|
+
},
|
|
64
|
+
'/rs/license': {
|
|
65
|
+
target: serverRul
|
|
66
|
+
},
|
|
67
|
+
'/rs/db': {
|
|
68
|
+
target: serverRul
|
|
69
|
+
},
|
|
70
|
+
'/excel': {
|
|
71
|
+
target: serverRul
|
|
72
|
+
},
|
|
73
|
+
'/rs/config': {
|
|
74
|
+
target: serverRul
|
|
75
|
+
},
|
|
76
|
+
'/rs/report': {
|
|
77
|
+
target: serverRul
|
|
78
|
+
},
|
|
79
|
+
'/rs/vue': {
|
|
80
|
+
target: serverRul
|
|
81
|
+
},
|
|
82
|
+
'/rs/logic/webHandReverse': {
|
|
83
|
+
target: 'http://localhost:8085'
|
|
84
|
+
},
|
|
85
|
+
'/rs/logic': {
|
|
86
|
+
target: serverRul
|
|
87
|
+
},
|
|
88
|
+
'/rs/sql': {
|
|
89
|
+
target: serverRul
|
|
90
|
+
},
|
|
91
|
+
'/webmeter': {
|
|
92
|
+
target: serverRul
|
|
93
|
+
},
|
|
94
|
+
'/rs': {
|
|
95
|
+
target: serverRul
|
|
96
|
+
// changeOrigin: true
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
module.exports = merge(baseConfig, devConfig)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "sale-client",
|
|
3
|
-
"version": "3.6.
|
|
3
|
+
"version": "3.6.287-02",
|
|
4
4
|
"description": "收费模块前台组件",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"qrcodejs2": "^0.0.2",
|
|
25
25
|
"vue": "^1.0.17",
|
|
26
26
|
"webpack-dev-server": "^2.11.5",
|
|
27
|
-
"vue-client": "1.24.
|
|
27
|
+
"vue-client": "1.24.137",
|
|
28
28
|
"yarn": "^1.22.10"
|
|
29
29
|
},
|
|
30
30
|
"devDependencies": {
|
|
@@ -90,7 +90,7 @@
|
|
|
90
90
|
"sinon-chai": "^2.8.0",
|
|
91
91
|
"style": "0.0.3",
|
|
92
92
|
"style-loader": "^0.20.3",
|
|
93
|
-
"system-clients": "3.2.
|
|
93
|
+
"system-clients": "3.2.61",
|
|
94
94
|
"url-loader": "^0.5.7",
|
|
95
95
|
"vue-clipboard2": "0.3.1",
|
|
96
96
|
"vue-hot-reload-api": "^1.2.0",
|
|
@@ -17,7 +17,7 @@
|
|
|
17
17
|
|
|
18
18
|
<script>
|
|
19
19
|
import {HttpResetClass} from 'vue-client'
|
|
20
|
-
import Vue from
|
|
20
|
+
import Vue from 'vue'
|
|
21
21
|
|
|
22
22
|
let getNewmetermsg = async function (self, row) {
|
|
23
23
|
self.cardInfo = undefined
|
|
@@ -169,7 +169,7 @@ let getBtnsGen = async function (self) {
|
|
|
169
169
|
|
|
170
170
|
export default {
|
|
171
171
|
title: '业务操作',
|
|
172
|
-
data() {
|
|
172
|
+
data () {
|
|
173
173
|
return {
|
|
174
174
|
operBtns: [],
|
|
175
175
|
isBusiness: false,
|
|
@@ -177,13 +177,12 @@ export default {
|
|
|
177
177
|
}
|
|
178
178
|
},
|
|
179
179
|
props: ['data', 'cardInfo'],
|
|
180
|
-
ready() {
|
|
180
|
+
ready () {
|
|
181
181
|
getBtnsGen(this)
|
|
182
182
|
console.log('data,cardInfo', this.data, this.cardInfo)
|
|
183
|
-
|
|
184
183
|
},
|
|
185
184
|
methods: {
|
|
186
|
-
business(btn) {
|
|
185
|
+
business (btn) {
|
|
187
186
|
// // 处理按钮样式
|
|
188
187
|
// this.styleChange(btn.name)
|
|
189
188
|
// this.isBusiness = true
|
|
@@ -192,7 +191,7 @@ export default {
|
|
|
192
191
|
if (this.$refs.route.cards[0].title == '增值服务管理') {
|
|
193
192
|
this.$showMessage('切换页面后,当前页面数据会丢失,是否切换?', ['confirm', 'cancel']).then(res => {
|
|
194
193
|
if (res == 'cancel') {
|
|
195
|
-
|
|
194
|
+
|
|
196
195
|
} else {
|
|
197
196
|
// 处理按钮样式
|
|
198
197
|
this.styleChange(btn.name)
|
|
@@ -209,7 +208,7 @@ export default {
|
|
|
209
208
|
}
|
|
210
209
|
},
|
|
211
210
|
|
|
212
|
-
styleChange(name) {
|
|
211
|
+
styleChange (name) {
|
|
213
212
|
this.operBtns.forEach((res) => {
|
|
214
213
|
if (res.name === name) {
|
|
215
214
|
if (document.getElementById(res.name)) {
|
|
@@ -226,18 +225,18 @@ export default {
|
|
|
226
225
|
}
|
|
227
226
|
},
|
|
228
227
|
watch: {
|
|
229
|
-
'data'() {
|
|
228
|
+
'data' () {
|
|
230
229
|
getBtnsGen(this)
|
|
231
230
|
}
|
|
232
231
|
},
|
|
233
232
|
events: {
|
|
234
|
-
'no-button'() {
|
|
233
|
+
'no-button' () {
|
|
235
234
|
this.noButton = true
|
|
236
235
|
},
|
|
237
|
-
'has-button'() {
|
|
236
|
+
'has-button' () {
|
|
238
237
|
this.noButton = false
|
|
239
238
|
},
|
|
240
|
-
'get-new-row'(row) {
|
|
239
|
+
'get-new-row' (row) {
|
|
241
240
|
console.log('xxxxxx', row)
|
|
242
241
|
// 发生换表成功
|
|
243
242
|
getNewmetermsg(this, row)
|
|
@@ -246,7 +245,7 @@ export default {
|
|
|
246
245
|
console.log('指定按钮。。', buttonObj)
|
|
247
246
|
this.$resetpost('rs/sql/sale_getUser', {
|
|
248
247
|
data: {condition: `i.f_userinfo_code='${data.f_userinfo_code}' and u.f_filialeid = '${data.f_filialeid}'`, orderitem: `f_userinfo_id Desc`}
|
|
249
|
-
}, {resolveMsg: null, rejectMsg: '获取用户信息失败'}).then((res)=>{
|
|
248
|
+
}, {resolveMsg: null, rejectMsg: '获取用户信息失败'}).then((res) => {
|
|
250
249
|
if (buttonObj) {
|
|
251
250
|
this.$dispatch('resflushdata', res.data[0])
|
|
252
251
|
this.styleChange(buttonObj.name)
|
|
@@ -254,7 +253,7 @@ export default {
|
|
|
254
253
|
}
|
|
255
254
|
})
|
|
256
255
|
},
|
|
257
|
-
'button-specifies'(buttonObj, data) {
|
|
256
|
+
'button-specifies' (buttonObj, data) {
|
|
258
257
|
console.log('指定按钮。。', buttonObj)
|
|
259
258
|
// buttonObj 格式： {name:'机表收费', value: 'machine-meter-center'}
|
|
260
259
|
if (buttonObj) {
|
|
@@ -68,34 +68,7 @@
|
|
|
68
68
|
<button type="button" class="glyphicon glyphicon-plus btn-success" @click.stop="addadetail()"></button>
|
|
69
69
|
</div>
|
|
70
70
|
</div>
|
|
71
|
-
<!-- <div class="row" style="margin-top:10px;" v-if="row.f_brand_spec[0]=='其他费用'">-->
|
|
72
|
-
<!-- <div class="col-sm-4" :class="[$v.f_fee_type.required ? 'has-error' : 'has-success']">-->
|
|
73
|
-
<!-- <input v-validate:f_fee_type='{required: true}' v-model="row.f_fee_type" v-show="false"/>-->
|
|
74
|
-
<!-- <label for="f_fee_type" class="font_normal_body ">其他收费类型</label>-->
|
|
75
|
-
<!-- <v-select id="f_fee_type"-->
|
|
76
|
-
<!-- v-model="row.f_fee_type"-->
|
|
77
|
-
<!-- placeholder='请选择'-->
|
|
78
|
-
<!-- :value.sync="row.f_fee_type"-->
|
|
79
|
-
<!-- :options='feetype'-->
|
|
80
|
-
<!-- close-on-select clear-button>-->
|
|
81
|
-
<!-- </v-select>-->
|
|
82
|
-
<!-- </div>-->
|
|
83
|
-
|
|
84
|
-
<!-- <div class="col-sm-4">-->
|
|
85
|
-
<!-- <label for="f_fee_time" class="font_normal_body">本次购买时间</label>-->
|
|
86
|
-
<!-- <v-select id="f_fee_time"-->
|
|
87
|
-
<!-- v-model="row.f_fee_time"-->
|
|
88
|
-
<!-- placeholder='请选择'-->
|
|
89
|
-
<!-- :value.sync="row.f_fee_time"-->
|
|
90
|
-
<!-- :options='feetime'-->
|
|
91
|
-
<!-- close-on-select clear-button>-->
|
|
92
|
-
<!-- </v-select>-->
|
|
93
|
-
<!-- </div>-->
|
|
94
|
-
<!-- </div>-->
|
|
95
|
-
|
|
96
71
|
</div>
|
|
97
|
-
|
|
98
|
-
|
|
99
72
|
<div class="row" style="margin-top:10px;">
|
|
100
73
|
<div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
|
|
101
74
|
<label class=" font_normal_body" title="参数名称：付款方式">收款方式</label>
|
|
@@ -425,8 +398,8 @@ export default {
|
|
|
425
398
|
console.log('单价变化：', val)
|
|
426
399
|
if (this.model.otherdetail[val] && this.model.otherdetail[val].f_typenumber[0]) {
|
|
427
400
|
let unitprice = this.$appdata.getSingleValue(this.model.otherdetail[val].f_typenumber[0])
|
|
428
|
-
if (unitprice
|
|
429
|
-
this.model.otherdetail[val].f_unitprice = unitprice
|
|
401
|
+
if (unitprice) {
|
|
402
|
+
this.model.otherdetail[val].f_unitprice = Number(unitprice)
|
|
430
403
|
}
|
|
431
404
|
}
|
|
432
405
|
},
|
|
@@ -240,10 +240,10 @@
|
|
|
240
240
|
self.hasCheck = 0
|
|
241
241
|
}
|
|
242
242
|
|
|
243
|
-
if(new Date(self.model.f_next_check_date) < new Date(self.nowdate)){
|
|
244
|
-
self.style='text-align: center;border: #E9E9E9 solid 1px;color:red'
|
|
245
|
-
}else{
|
|
246
|
-
self.style='text-align: center;border: #E9E9E9 solid 1px;'
|
|
243
|
+
if (new Date(self.model.f_next_check_date) < new Date(self.nowdate)) {
|
|
244
|
+
self.style = 'text-align: center;border: #E9E9E9 solid 1px;color:red'
|
|
245
|
+
} else {
|
|
246
|
+
self.style = 'text-align: center;border: #E9E9E9 solid 1px;'
|
|
247
247
|
}
|
|
248
248
|
}
|
|
249
249
|
|
|
@@ -252,8 +252,8 @@
|
|
|
252
252
|
data () {
|
|
253
253
|
return {
|
|
254
254
|
model: {},
|
|
255
|
-
style:'text-align: center;border: #E9E9E9 solid 1px;',
|
|
256
|
-
nowdate:this.$login.toStandardTimeString(),
|
|
255
|
+
style: 'text-align: center;border: #E9E9E9 solid 1px;',
|
|
256
|
+
nowdate: this.$login.toStandardTimeString(),
|
|
257
257
|
hasCheck: -1,
|
|
258
258
|
imgshow: false,
|
|
259
259
|
imgshow2: false,
|