sale-client 3.6.90 → 3.6.92
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 +3 -3
- package/package.json +1 -1
- package/src/components/charge/business/machine/MachineCharge.vue +8 -4
- package/src/components/charge/business/machine/WorkBusySmall.vue +127 -0
- package/src/components/revenue/comprehen/Bill/EticketV4/EticketRecordList.vue +3 -2
- package/src/components/revenue/comprehen/ComprehenOperation/ChangeMeter/MachineMeter.vue +1 -1
- package/src/filiale/kelai/FileUserFiles.vue +29 -30
- package/src/filiale/liaoyuan/ChargeList.vue +1 -1
- package/src/filiale/tongchuan/DisableManage.vue +2 -1
- package/src/filiale/wenxi/IOTRefund.vue +5 -4
package/build/dev-server.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
var path = require('path')
|
|
2
|
-
const [serverRul, localUrl ] = ['http://
|
|
2
|
+
const [serverRul, localUrl ] = ['http://192.168.50.4:8400/', 'http://192.168.50.4:8400/']
|
|
3
3
|
var merge = require('webpack-merge')
|
|
4
4
|
var baseConfig = require('./webpack.dev.conf')
|
|
5
5
|
var devConfig = {
|
|
@@ -70,10 +70,10 @@ var devConfig = {
|
|
|
70
70
|
target: serverRul
|
|
71
71
|
},
|
|
72
72
|
'/rs/logic': {
|
|
73
|
-
target:
|
|
73
|
+
target: localUrl
|
|
74
74
|
},
|
|
75
75
|
'/rs/sql': {
|
|
76
|
-
target:
|
|
76
|
+
target: localUrl
|
|
77
77
|
},
|
|
78
78
|
'/webmeter': {
|
|
79
79
|
target: serverRul
|
package/package.json
CHANGED
|
@@ -9,17 +9,21 @@
|
|
|
9
9
|
<p v-if="row.f_totalsplit_type === '总表'"><strong>分表承担总量 (单位: 方): {{splitAllgas}}</strong></p>
|
|
10
10
|
<machine-meter-center :data='model' :owelist="list[0].rows" :charge="config.charge" :row='row' :floor="config.floor" :ceil="config.ceil" v-ref:mainche></machine-meter-center>
|
|
11
11
|
</div>
|
|
12
|
+
<div class="span" v-if="!chargeView">
|
|
13
|
+
<work-busy-small :is-busy="!chargeView"></work-busy-small>
|
|
14
|
+
</div>
|
|
12
15
|
</div>
|
|
13
16
|
<upload :blodid="blodid" v-if="config.showupload" isremark="true" fusetype="机表收费"></upload>
|
|
14
17
|
</template>
|
|
15
18
|
<script>
|
|
16
19
|
import OweList from './OweList'
|
|
20
|
+
import WorkBusySmall from './WorkBusySmall'
|
|
17
21
|
import {HttpResetClass} from 'vue-client'
|
|
18
22
|
|
|
19
23
|
let loadGen = async function (self) {
|
|
20
24
|
await self.$getConfig(self, 'MachineCharge')
|
|
21
25
|
let http = new HttpResetClass()
|
|
22
|
-
let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！'})
|
|
26
|
+
let res = await http.load('POST', 'rs/logic/sale_getOwe', {data: {f_userinfo_id: self.row.f_userinfo_id}}, {resolveMsg: null, rejectMsg: '获取欠费出错！！', newly: true})
|
|
23
27
|
self.list = res.data
|
|
24
28
|
|
|
25
29
|
let owes = []
|
|
@@ -55,7 +59,7 @@
|
|
|
55
59
|
*/
|
|
56
60
|
export default {
|
|
57
61
|
title: '收费',
|
|
58
|
-
components: {OweList},
|
|
62
|
+
components: {OweList,WorkBusySmall},
|
|
59
63
|
data () {
|
|
60
64
|
return {
|
|
61
65
|
config: {
|
|
@@ -106,14 +110,14 @@
|
|
|
106
110
|
this.model = Object.assign({}, this.model, temp)
|
|
107
111
|
},
|
|
108
112
|
getRows (val) {
|
|
109
|
-
this.model.selectedids = []
|
|
113
|
+
this.model.selectedids = []
|
|
110
114
|
for (let i = 0; i < val.length; i++) {
|
|
111
115
|
if (val[i]) {
|
|
112
116
|
this.model.f_pregas = this.model.f_pregas + val[i].f_oughtamount
|
|
113
117
|
this.model.f_preamount = this.model.f_preamount + val[i].f_oughtfee
|
|
114
118
|
this.model.f_overdue = this.model.f_overdue + val[i].overdue
|
|
115
119
|
this.model.f_garbage_fee = this.model.f_garbage_fee + val[i].f_garbage_fee
|
|
116
|
-
this.model.selectedids.push({id:val[i].handplan_id})
|
|
120
|
+
this.model.selectedids.push({id: val[i].handplan_id})
|
|
117
121
|
}
|
|
118
122
|
}
|
|
119
123
|
if (val.length == 0) {
|
|
@@ -0,0 +1,127 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<div id="loadering_small" class="" v-if="isBusy">
|
|
3
|
+
<div class="content">
|
|
4
|
+
<div id="loader">
|
|
5
|
+
<div id="dot1" class="dot"></div>
|
|
6
|
+
<div id="dot2" class="dot"></div>
|
|
7
|
+
<div id="dot3" class="dot"></div>
|
|
8
|
+
<div id="dot4" class="dot"></div>
|
|
9
|
+
</div>
|
|
10
|
+
<h4 class="loadmessage">正在工作，请等待！</h4>
|
|
11
|
+
</div>
|
|
12
|
+
</div>
|
|
13
|
+
</template>
|
|
14
|
+
|
|
15
|
+
<script>
|
|
16
|
+
export default {
|
|
17
|
+
title: 'busy',
|
|
18
|
+
props: ['isBusy'],
|
|
19
|
+
data() {
|
|
20
|
+
return {
|
|
21
|
+
isBusy: false
|
|
22
|
+
}
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
</script>
|
|
26
|
+
|
|
27
|
+
<style>
|
|
28
|
+
#loadering_small {
|
|
29
|
+
bottom: 0;
|
|
30
|
+
right: 0;
|
|
31
|
+
left: 0;
|
|
32
|
+
z-index: 9999;
|
|
33
|
+
display: flex;
|
|
34
|
+
text-align: center;
|
|
35
|
+
margin: 15% auto;
|
|
36
|
+
flex-direction: column;
|
|
37
|
+
position: relative;
|
|
38
|
+
align-items: center;
|
|
39
|
+
background: rgba(255, 255, 255, 0.8);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
#loader {
|
|
43
|
+
display: flex;
|
|
44
|
+
justify-content: center;
|
|
45
|
+
align-items: center;
|
|
46
|
+
background: rgba(255, 255, 255, 0.8);
|
|
47
|
+
height: auto;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
.dot {
|
|
51
|
+
height: 20px;
|
|
52
|
+
width: 20px;
|
|
53
|
+
border-radius: 10px;
|
|
54
|
+
display: inline-block;
|
|
55
|
+
position: relative;
|
|
56
|
+
margin-left: 2em;
|
|
57
|
+
}
|
|
58
|
+
|
|
59
|
+
.bg-white {
|
|
60
|
+
height: 100%;
|
|
61
|
+
width: 100%;
|
|
62
|
+
background-color: rgba(255, 255, 255, 0.8);
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
#dot1 {
|
|
66
|
+
background: #ea4335;
|
|
67
|
+
animation-name: dotloader;
|
|
68
|
+
animation-duration: 1s;
|
|
69
|
+
animation-delay: 0.1s;
|
|
70
|
+
animation-iteration-count: infinite;
|
|
71
|
+
}
|
|
72
|
+
|
|
73
|
+
#dot2 {
|
|
74
|
+
background: #34a853;
|
|
75
|
+
animation-name: dotloader;
|
|
76
|
+
animation-duration: 1s;
|
|
77
|
+
animation-delay: 0.2s;
|
|
78
|
+
animation-iteration-count: infinite;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
.content {
|
|
82
|
+
top: 50%;
|
|
83
|
+
position: relative;
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
#dot3 {
|
|
87
|
+
background: #4285f4;
|
|
88
|
+
animation-name: dotloader;
|
|
89
|
+
animation-duration: 1s;
|
|
90
|
+
animation-delay: 0.3s;
|
|
91
|
+
animation-iteration-count: infinite;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
#dot4 {
|
|
95
|
+
background: #fbbc05;
|
|
96
|
+
animation-name: dotloader;
|
|
97
|
+
animation-duration: 1s;
|
|
98
|
+
animation-delay: 0.4s;
|
|
99
|
+
animation-iteration-count: infinite;
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
#loader h4 {
|
|
103
|
+
width: 100%;
|
|
104
|
+
text-align: center;
|
|
105
|
+
}
|
|
106
|
+
|
|
107
|
+
.loadmessage {
|
|
108
|
+
text-align: center;
|
|
109
|
+
margin-left: 2em;
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
@keyframes dotloader {
|
|
113
|
+
0% {
|
|
114
|
+
top: 0px;
|
|
115
|
+
}
|
|
116
|
+
15% {
|
|
117
|
+
top: 10px;
|
|
118
|
+
}
|
|
119
|
+
30% {
|
|
120
|
+
top: 0px;
|
|
121
|
+
}
|
|
122
|
+
100% {
|
|
123
|
+
top: 0px;
|
|
124
|
+
}
|
|
125
|
+
|
|
126
|
+
}
|
|
127
|
+
</style>
|
|
@@ -58,7 +58,7 @@
|
|
|
58
58
|
v-model="model.f_operate_datestarthate"
|
|
59
59
|
:value.sync="model.f_operate_datestarthate"
|
|
60
60
|
format="yyyy-MM-dd"
|
|
61
|
-
condition="f_operate_date >= '{}'"
|
|
61
|
+
condition="f_operate_date >= '{} 00:00:00'"
|
|
62
62
|
style="width:60%">
|
|
63
63
|
</datepicker>
|
|
64
64
|
</div>
|
|
@@ -68,7 +68,7 @@
|
|
|
68
68
|
v-model="model.f_operate_dateendDate"
|
|
69
69
|
:value.sync="model.f_operate_dateendDate"
|
|
70
70
|
format="yyyy-MM-dd"
|
|
71
|
-
condition=" f_operate_date <= '{}'"
|
|
71
|
+
condition=" f_operate_date <= '{} 23:59:59'"
|
|
72
72
|
style="width:60%">
|
|
73
73
|
</datepicker>
|
|
74
74
|
</div>
|
|
@@ -271,6 +271,7 @@ export default {
|
|
|
271
271
|
'f_bill_number': '发票号码',
|
|
272
272
|
'f_bill_state': '发票状态',
|
|
273
273
|
'f_charge_type': '发票类型',
|
|
274
|
+
'sell_operate_date': '收费时间',
|
|
274
275
|
'f_operate_date': '开票时间',
|
|
275
276
|
'f_operator': '开票人',
|
|
276
277
|
'sell_operator': '收款人'
|
|
@@ -25,7 +25,7 @@
|
|
|
25
25
|
import Vue from 'vue'
|
|
26
26
|
|
|
27
27
|
let validatorGen = async function (self) {
|
|
28
|
-
let hasHand = await Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_user_id = '${self.model.f_user_id}'`}}, {resolveMsg: null, rejectMsg: null})
|
|
28
|
+
let hasHand = await Vue.resetpost('rs/sql/saleSingleTable', {data: {tablename: 't_handplan', condition: `f_meter_state = '未抄表' and f_user_id = '${self.model.f_user_id}'`}}, {resolveMsg: null, rejectMsg: null, newly: true})
|
|
29
29
|
// 如果是总表判断分表是否已抄
|
|
30
30
|
console.log('换标，看有没有总分表', self.row.f_totalsplit_type)
|
|
31
31
|
let getSplitHand = false
|
|
@@ -713,37 +713,36 @@ export default {
|
|
|
713
713
|
f_depname: this.$login.f.deps
|
|
714
714
|
}
|
|
715
715
|
let self = this
|
|
716
|
-
this.$resetpost('rs/logic/newPrepareSettleFileImport',param, {rejectMsg:'上传失败'},10 * 60 * 1000).then(res => {
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
720
|
-
}
|
|
721
|
-
})
|
|
722
|
-
// try {
|
|
723
|
-
// axios.post('rs/logic/newPrepareSettleFileImport',
|
|
724
|
-
// {data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
|
|
725
|
-
// if (res.data) {
|
|
726
|
-
// self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
|
|
727
|
-
// self.iswork = false
|
|
728
|
-
// // this.$showAlert('导入成功','success',2000)
|
|
729
|
-
// }
|
|
730
|
-
// })
|
|
731
|
-
// } catch (error) {
|
|
732
|
-
// if (error.response) {
|
|
733
|
-
// if (error.response.status == 500) {
|
|
734
|
-
// this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
|
|
735
|
-
// } else if (error.response.status == 404) {
|
|
736
|
-
// this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
|
|
737
|
-
// } else {
|
|
738
|
-
// this.$showAlert(error.response.data, 'danger', 2000)
|
|
739
|
-
// }
|
|
740
|
-
// } else if (error.request) {
|
|
741
|
-
// this.$showAlert(error.request, 'danger', 2000)
|
|
742
|
-
// } else {
|
|
743
|
-
// this.$showAlert(error.message, 'danger', 2000)
|
|
716
|
+
// this.$resetpost('rs/logic/newPrepareSettleFileImport',param, {rejectMsg:'上传失败'},10 * 60 * 1000).then(res => {
|
|
717
|
+
// if (res.data) {
|
|
718
|
+
// self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
|
|
719
|
+
// self.iswork = false
|
|
744
720
|
// }
|
|
745
|
-
//
|
|
746
|
-
|
|
721
|
+
// })
|
|
722
|
+
try {
|
|
723
|
+
axios.post('rs/logic/newPrepareSettleFileImport',
|
|
724
|
+
{data: param}, {timeout: 10 * 60 * 1000}).then((res) => {
|
|
725
|
+
if (res.data) {
|
|
726
|
+
self.$showMessage(`本次上传共上传${res.data.totalsum}条数据, 成功${res.data.successnum}条,失败${res.data.errorsum}条，具体失败数据请在稽查查询错误查询中查看！！`)
|
|
727
|
+
self.iswork = false
|
|
728
|
+
}
|
|
729
|
+
})
|
|
730
|
+
} catch (error) {
|
|
731
|
+
if (error.response) {
|
|
732
|
+
if (error.response.status == 500) {
|
|
733
|
+
this.$showAlert('服务繁忙,请重试!!!', 'danger', 3000)
|
|
734
|
+
} else if (error.response.status == 404) {
|
|
735
|
+
this.$showAlert('服务运行中,请耐心等待后进行重试!!', 'danger', 3000)
|
|
736
|
+
} else {
|
|
737
|
+
this.$showAlert(error.response.data, 'danger', 2000)
|
|
738
|
+
}
|
|
739
|
+
} else if (error.request) {
|
|
740
|
+
this.$showAlert(error.request, 'danger', 2000)
|
|
741
|
+
} else {
|
|
742
|
+
this.$showAlert(error.message, 'danger', 2000)
|
|
743
|
+
}
|
|
744
|
+
this.iswork = false
|
|
745
|
+
}
|
|
747
746
|
this.$refs.file.$el.querySelector('input').value = ''
|
|
748
747
|
this.batchMeterShow = false
|
|
749
748
|
this.search()
|
|
@@ -30,7 +30,7 @@
|
|
|
30
30
|
<div class="form-group col-sm-4" v-if="$parent.$parent.clientWidth<1600">
|
|
31
31
|
<label class="font_normal_body">客户名称</label>
|
|
32
32
|
<input type="text" class="input_search" style="width:60%" v-model="model.f_user_name" placeholder='客户名称'
|
|
33
|
-
@keyup.enter="search(), $parent.$parent.clean()" condition="f_user_name
|
|
33
|
+
@keyup.enter="search(), $parent.$parent.clean()" condition="f_user_name like '%{}%'">
|
|
34
34
|
</div>
|
|
35
35
|
<div class="form-group col-sm-4">
|
|
36
36
|
<label class="font_normal_body">旧客户号</label>
|
|
@@ -3,8 +3,9 @@
|
|
|
3
3
|
<validator name='v'>
|
|
4
4
|
<form class="form-horizontal">
|
|
5
5
|
<div class="row">
|
|
6
|
-
<div class="col-sm-4 form-group">
|
|
6
|
+
<div class="col-sm-4 form-group" :class="[$v.reason.required ? 'has-error' : '']">
|
|
7
7
|
<label for="f_reason" class="font_normal_body">停用原因</label>
|
|
8
|
+
<input type="text" v-show="false" v-model="$refs.reason.selectedItems" v-validate:reason='{required: true }'>
|
|
8
9
|
<v-select v-model="model.f_reason"
|
|
9
10
|
placeholder='停用原因'
|
|
10
11
|
:value.sync="model.f_reason"
|
|
@@ -151,10 +151,11 @@
|
|
|
151
151
|
// this.$showAlert('按气量缴费的物联网表退费功能尚未开放！！', 'warning', 3000)
|
|
152
152
|
this.model.f_price = this.data.f_price
|
|
153
153
|
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
154
|
+
console.log(123)
|
|
155
|
+
if (this.data.f_calculation !== '系统结算' && this.data.f_issupport_feededuction === '否') {
|
|
156
|
+
this.check = false
|
|
157
|
+
this.$showAlert('该表型不支持扣费！！', 'warning', 3000)
|
|
158
|
+
}
|
|
158
159
|
}
|
|
159
160
|
},
|
|
160
161
|
methods: {
|