sale-client 3.6.217 → 3.6.218

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.
Files changed (7) hide show
  1. package/package.json +1 -1
  2. package/src/components/charge/business/ShowCardSellGas.vue +12 -2
  3. package/src/filiale/tongchuan/CardMeterCenter.vue +12 -3
  4. package/src/filiale/tongchuan/IOTMeterCenter.vue +12 -3
  5. package/src/filiale/tongchuan/bill/CustQueryEticket.vue +1 -1
  6. package/src/filiale/yuncheng/meterinfodetail.vue +257 -0
  7. package/src/filiale/yuncheng/sale.js +3 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.6.217",
3
+ "version": "3.6.218",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/components/charge/business/ShowCardSellGas.vue CHANGED
@@ -152,17 +152,27 @@
152
152
  </div>
153
153
  <div class="row" style="padding-top: 0.5em;">
154
154
 
155
- <div class="col-sm-4" v-if="!mjshow">
155
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment != '银行转账'">
156
156
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
157
157
  <input class="input_search" style="width:60%" type="text"
158
158
  v-model="model.f_serial_number" placeholder="业务单号">
159
159
  </div>
160
- <div class="col-sm-4" v-if="mjshow"
160
+ <div class="col-sm-4" v-if="mjshow && model.f_payment != '银行转账'"
161
161
  :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
162
162
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
163
163
  <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
164
164
  v-model="model.f_serial_number" placeholder="业务单号">
165
165
  </div>
166
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
167
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
168
+ <input class="input_search" style="width:60%" type="text"
169
+ v-model="model.f_serial_number" placeholder="银行流水">
170
+ </div>
171
+ <div class="col-sm-4" v-if="mjshow && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
172
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
173
+ <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
174
+ v-model="model.f_serial_number" placeholder="银行流水">
175
+ </div>
166
176
 
167
177
 
168
178
  <div class="col-sm-8">
package/src/filiale/tongchuan/CardMeterCenter.vue CHANGED
@@ -173,18 +173,27 @@
173
173
  </div>
174
174
  </div>
175
175
  <div class="row" style="padding-top: 0.5em;">
176
- <div class="col-sm-4" v-if="!mjshow">
176
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment != '银行转账'">
177
177
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
178
178
  <input class="input_search" style="width:60%" type="text"
179
179
  v-model="model.f_serial_number" placeholder="业务单号">
180
180
  </div>
181
- <div class="col-sm-4" v-if="mjshow"
181
+ <div class="col-sm-4" v-if="mjshow && model.f_payment != '银行转账'"
182
182
  :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
183
183
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
184
184
  <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
185
185
  v-model="model.f_serial_number" placeholder="业务单号">
186
186
  </div>
187
-
187
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
188
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
189
+ <input class="input_search" style="width:60%" type="text"
190
+ v-model="model.f_serial_number" placeholder="银行流水">
191
+ </div>
192
+ <div class="col-sm-4" v-if="mjshow && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
193
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
194
+ <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
195
+ v-model="model.f_serial_number" placeholder="银行流水">
196
+ </div>
188
197
 
189
198
  <div class="col-sm-8">
190
199
  <label for="f_comments" class="font_normal_body">&nbsp;备&emsp;&emsp;注</label>
package/src/filiale/tongchuan/IOTMeterCenter.vue CHANGED
@@ -141,17 +141,26 @@
141
141
  </div>
142
142
  </div>
143
143
  <div class="row" style="padding-top: 0.5em;">
144
- <div class="col-sm-4" v-if="!mjshow" >
144
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment != '银行转账'" >
145
145
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
146
146
  <input class="input_search" style="width:60%" type="text"
147
147
  v-model="model.f_serial_number" placeholder="业务单号">
148
148
  </div>
149
- <div class="col-sm-4" v-if="mjshow" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
149
+ <div class="col-sm-4" v-if="mjshow && model.f_payment != '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
150
150
  <label for="f_serial_number" class=" font_normal_body">业务单号</label>
151
151
  <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
152
152
  v-model="model.f_serial_number" placeholder="业务单号">
153
153
  </div>
154
-
154
+ <div class="col-sm-4" v-if="!mjshow && model.f_payment == '银行转账'" >
155
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
156
+ <input class="input_search" style="width:60%" type="text"
157
+ v-model="model.f_serial_number" placeholder="银行流水">
158
+ </div>
159
+ <div class="col-sm-4" v-if="mjshow && model.f_payment == '银行转账'" :class="[$v.f_serial_number.required || $v.f_serial_number.dctest ? 'has-error' : 'has-success']">
160
+ <label for="f_serial_number" class=" font_normal_body">银行流水</label>
161
+ <input class="input_search" style="width:60%" type="text" v-validate:f_serial_number='{required: true }'
162
+ v-model="model.f_serial_number" placeholder="银行流水">
163
+ </div>
155
164
  <div class="col-sm-8">
156
165
  <label for="f_comments" class="font_normal_body">&nbsp;&nbsp;&nbsp;备&nbsp;注&nbsp;&nbsp;&nbsp;</label>
157
166
  <input class="input_search" style="width:77%" v-model="model.f_comments" rows="1" placeholder="备注">
package/src/filiale/tongchuan/bill/CustQueryEticket.vue CHANGED
@@ -225,7 +225,7 @@
225
225
  </button>
226
226
  <button type="button" class="btn button_search"
227
227
  v-if="diytick"
228
- :disabled="diytick && !(row.f_paper_name&&row.name&&row.money&&row.f_address_phone&&invoice_type)"
228
+ :disabled="diytick && !(row.f_paper_name&&row.name&&row.money&&row.f_buy_address&&row.f_buy_phone&&invoice_type)"
229
229
  @click='openCustETicket'>确认收费
230
230
  </button>
231
231
  </footer>
package/src/filiale/yuncheng/meterinfodetail.vue ADDED
@@ -0,0 +1,257 @@
1
+ <template>
2
+ <partial-view v-ref:pv>
3
+ <div class="panel panel-info auto" style="margin-top: auto">
4
+ <div class="panel-heading" style="height: 35px">
5
+ <h4 style="display:inline-block;margin-top: auto">表具信息</h4>
6
+ </div>
7
+ <div class="auto ">
8
+ <div class="row" v-if="data.f_customer">
9
+ <label class = "col-sm-5 " style="color: brown">团缴编号</label>
10
+ <span class = "col-sm-7" style="color: brown">{{data.f_customer?data.f_customer:'无'}}</span>
11
+ </div>
12
+ <div class="row">
13
+ <label class = "col-sm-5 " >气表类型</label>
14
+ <span class = "col-sm-7">{{data?data.f_meter_type:dafault.f_meter_brand}}</span>
15
+ </div>
16
+ <div class="row">
17
+ <label class = "col-sm-5 " >气表品牌</label>
18
+ <span class = "col-sm-7">{{data?data.f_meter_brand:dafault.f_meter_brand}}</span>
19
+ </div>
20
+ <div class="row">
21
+ <label class = "col-sm-5 " >气表型号</label>
22
+ <span class = "col-sm-7">{{data?data.f_meter_style:dafault.f_meter_style}}</span>
23
+ </div>
24
+ <div class="row">
25
+ <label class="col-sm-5" style="color: brown">表具状态</label>
26
+ <span class="col-sm-7" style="color: brown">{{data?data.f_table_state:dafault.f_table_state}}</span>
27
+ </div>
28
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
29
+ <label class = "col-sm-5 " style="color: brown">系统余额</label>
30
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_amount:dafault.f_balance_amount}}</span>
31
+ </div>
32
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
33
+ <label class = "col-sm-5 " style="color: brown">系统余量</label>
34
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_balance_gas:dafault.f_balance_gas}}</span>
35
+ </div>
36
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按金额'">
37
+ <label class = "col-sm-5 " style="color: brown">表上余额</label>
38
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
39
+ </div>
40
+ <div class="row" v-if="data.f_meter_type.includes('物联网') && data.f_collection_type === '按气量'">
41
+ <label class = "col-sm-5 " style="color: brown">表上余量</label>
42
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_jval:dafault.f_jval}}</span>
43
+ </div>
44
+ <div class="row">
45
+ <label class = "col-sm-5 " >初始表底数</label>
46
+ <span class = "col-sm-7" >{{data?data.f_initial_base:dafault.f_initial_base}}</span>
47
+ </div>
48
+ <div class="row">
49
+ <label class = "col-sm-5 " >表当前底数</label>
50
+ <span class = "col-sm-7" >{{data?data.f_meter_base:dafault.f_meter_base}}</span>
51
+ </div>
52
+ <div class="row" v-show="data.f_times">
53
+ <label class = "col-sm-5 " >写卡次数</label>
54
+ <span class = "col-sm-7" >{{data?data.f_times:dafault.f_times}}</span>
55
+ </div>
56
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
57
+ <label class = "col-sm-5 ">物联网次数</label>
58
+ <span class = "col-sm-7" >{{data?data.f_iot_times:dafault.f_iot_times}}</span>
59
+ </div>
60
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
61
+ <label class = "col-sm-5 ">表累购金额</label>
62
+ <span class = "col-sm-7" >{{data?data.f_total_fee:dafault.f_total_fee}}</span>
63
+ </div>
64
+ <div class="row" v-if="data.f_meter_type.includes('物联网')">
65
+ <label class = "col-sm-5 ">户累购金额</label>
66
+ <span class = "col-sm-7" >{{data?data.f_total_fee_all:dafault.f_total_fee_all}}</span>
67
+ </div>
68
+ <div class="row" v-if="(data.f_meter_type === '机表' || data.f_meter_type === '物联网表') && data.f_deduction_gas > 0">
69
+ <label class = "col-sm-5 " >剩余抵扣量</label>
70
+ <span class = "col-sm-7" >{{data?data.f_deduction_gas:dafault.f_deduction_gas}}</span>
71
+ </div>
72
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
73
+ <label class = "col-sm-5 " style="color: brown" >户累购气量</label>
74
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas_all:dafault.f_total_gas_all}}</span>
75
+ </div>
76
+ <div class="row" v-if="(data.f_meter_brand.includes('数码表'))">
77
+ <label class = "col-sm-5 " style="color: brown" >累购气量</label>
78
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
79
+ </div>
80
+ <div class="row" v-if="data.f_meter_type.includes('卡表') && data.f_meter_type === '气量卡表'">
81
+ <label class = "col-sm-5 " style="color: brown" >累购气量</label>
82
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_gas:dafault.f_total_gas}}</span>
83
+ </div>
84
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
85
+ <label class = "col-sm-5 " style="color: brown">累购金额</label>
86
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_total_fee:dafault.f_total_fee}}</span>
87
+ </div>
88
+ <div class="row" v-if="data.f_meter_type.includes('卡表')">
89
+ <label class = "col-sm-5 " style="color: brown">累购写卡金额</label>
90
+ <span class = "col-sm-7" style="color: brown">{{data?data.f_write_totalfee:dafault.f_total_fee}}</span>
91
+ </div>
92
+ <div class="row">
93
+ <label class = "col-sm-5 " >气表表号</label>
94
+ <span class = "col-sm-7">{{data?data.f_meternumber:dafault.f_meternumber}}</span>
95
+ </div>
96
+ <div class="row">
97
+ <label class = "col-sm-5 " >防盗卡号1</label>
98
+ <span class = "col-sm-7">{{data?data.f_defendcard:dafault.f_defendcard}}</span>
99
+ </div>
100
+ <div class="row">
101
+ <label class = "col-sm-5 " >防盗卡号2</label>
102
+ <span class = "col-sm-7">{{data?data.f_defendcard_two:dafault.f_defendcard_two}}</span>
103
+ </div>
104
+ <div class="row" v-if="data.f_meter_type.includes('卡表') || (data.f_meter_type.includes('物联网表') && data.f_hascard==='是')">
105
+ <label class = "col-sm-5 " >卡&emsp;&emsp;号</label>
106
+ <span class = "col-sm-7">{{data?data.f_card_id:dafault.f_card_id}}</span>
107
+ </div>
108
+ <!-- <div class="row" v-if="data.f_meter_type.includes('卡表') || data.f_meter_type.includes('物联网表') && data.f_hascard==='是'">-->
109
+ <!-- <label class = "col-sm-5 " >写卡次数</label>-->
110
+ <!-- <span class = "col-sm-7">{{data?data.f_times:dafault.f_times}}</span>-->
111
+ <!-- </div>-->
112
+ <div class="row">
113
+ <label class = "col-sm-5 " >用气性质</label>
114
+ <span class = "col-sm-7">{{data?data.f_gasproperties:dafault.f_gasproperties}}</span>
115
+ </div>
116
+ <div class="row">
117
+ <label class = "col-sm-5 " >气价名称</label>
118
+ <span class = "col-sm-7">{{data?data.f_price_name:dafault.f_price_name}}</span>
119
+ </div>
120
+ <!--<div class="row" v-if="data.f_balance < 0">-->
121
+ <!--<label class = "col-sm-5 " >账户欠费</label>-->
122
+ <!--<span class = "col-sm-7" title="不包含违约金">{{data?0 - (data.f_balance - 0):dafault.f_balance}}</span>-->
123
+ <!--</div>-->
124
+ <!--<div class="row" v-else>-->
125
+ <!--<label class = "col-sm-5 " >账户余额</label>-->
126
+ <!--<span class = "col-sm-7">{{data?data.f_balance:dafault.f_balance}}</span>-->
127
+ <!--</div>-->
128
+ <div class="row" v-if="data.f_remanent_money > 0">
129
+ <label class = "col-sm-5 " >应补金额</label>
130
+ <span class = "col-sm-7">{{data?data.f_remanent_money:dafault.f_remanent_money}}</span>
131
+ </div>
132
+ <div class="row" v-if="data.f_remanent_gas > 0">
133
+ <label class = "col-sm-5 " >应补气量</label>
134
+ <span class = "col-sm-7">{{data?data.f_remanent_gas:dafault.f_remanent_gas}}</span>
135
+ </div>
136
+ <div class="row">
137
+ <label class = "col-sm-5 " >表&emsp;&emsp;向</label>
138
+ <span class = "col-sm-7">{{data?data.f_aroundmeter:dafault.f_hand_date}}</span>
139
+ </div>
140
+ <div class="row">
141
+ <label class = "col-sm-5 " >抄表册名</label>
142
+ <span class = "col-sm-7">{{data?'['+data.f_book_code + '] '+ (data.f_book_name ? data.f_book_name:''):dafault.f_book_name}}</span>
143
+ </div>
144
+ <div class="row">
145
+ <label class = "col-sm-5 " >抄表册册序号</label>
146
+ <span class = "col-sm-7">{{data?data.f_meter_book_sort:dafault.f_meter_book_sort}}</span>
147
+ </div>
148
+ <div class="row">
149
+ <label class = "col-sm-5 " >安装位置</label>
150
+ <span class = "col-sm-7">{{data?data.f_position:dafault.f_position}}</span>
151
+ </div>
152
+ <div class="row">
153
+ <label class = "col-sm-5 " >置换人员</label>
154
+ <span class = "col-sm-7">{{data?data.f_gas_person:dafault.f_hand_date}}</span>
155
+ </div>
156
+ <div class="row">
157
+ <label class = "col-sm-5 " >置换时间</label>
158
+ <span class = "col-sm-7">{{data?data.f_gas_date.substring(0,7):dafault.f_hand_date}}</span>
159
+ </div>
160
+ <div class="row">
161
+ <label class = "col-sm-5 " >抄表员</label>
162
+ <span class = "col-sm-7">{{data?data.f_inputtor:dafault.f_inputtor}}</span>
163
+ </div>
164
+ <div class="row">
165
+ <label class = "col-sm-5 " >上次抄表日</label>
166
+ <span class = "col-sm-7">{{data?data.f_hand_date.substring(0,7):dafault.f_hand_date}}</span>
167
+ </div>
168
+ <div class="row">
169
+ <label class = "col-sm-5 " >建档日期</label>
170
+ <span class = "col-sm-7">{{data?data.f_input_date.substring(0,7):dafault.f_input_date}}</span>
171
+ </div>
172
+ <div class="row">
173
+ <label class = "col-sm-5 " >备&emsp;&emsp;注</label>
174
+ <span class = "col-sm-7">{{data?data.comments:dafault.comments}}</span>
175
+ </div>
176
+ </div>
177
+ </div>
178
+ </partial-view>
179
+ </template>
180
+
181
+ <script>
182
+ /*用户档案相关信息组件*/
183
+ export default {
184
+ ready () {
185
+ console.log('看看userinfo里面接收的data数据', this.data)
186
+ },
187
+ title: '客户基本信息',
188
+ data () {
189
+ return {
190
+ dafault: {
191
+ f_total_gas_all: 0,
192
+ f_total_fee_all:0,
193
+ f_balance_amount: 0,
194
+ f_balance_gas: 0,
195
+ f_initial_base: 0,
196
+ f_meter_base: 0,
197
+ f_deduction_gas: 0,
198
+ f_total_gas: 0,
199
+ f_total_fee: 0,
200
+ f_card_id: '*****',
201
+ f_times: 0,
202
+ f_iot_times: 0,
203
+ f_meternumber: 0,
204
+ f_gasproperties: '****',
205
+ f_price_name: '****',
206
+ f_meter_brand: '****',
207
+ f_balance: 0,
208
+ f_defendcard: '****',
209
+ f_defendcard_two: '****',
210
+ f_user_type: '**',
211
+ f_remanent_gas: 0,
212
+ f_position: '****',
213
+ f_inputtor: '****',
214
+ f_jval: 0,
215
+ f_table_state: 0
216
+ },
217
+ model: null
218
+ }
219
+ },
220
+ props: ['data'],
221
+ methods: {
222
+ dealmsg (val) {
223
+ this.$dispatch('deal-msg', val)
224
+ }
225
+ },
226
+ watch: {
227
+ 'data' (val) {
228
+ console.log('val========', val)
229
+ }
230
+ }
231
+ }
232
+ </script>
233
+ <style lang="less">
234
+ .row {
235
+ /*border-bottom:1px solid #F2F6FA;*/
236
+ margin-left: 0;
237
+ margin-right: 0;
238
+ }
239
+ // . {
240
+ // height: 23px;
241
+ // border-right: 1px solid #F2F6FA;
242
+ // margin-bottom: 0;
243
+ // text-align: left;
244
+ // }
245
+ // #address {
246
+ // border-left: 1px solid #F2F6FA;
247
+ // }
248
+ // #user-info {
249
+ // padding:6px;
250
+ // span {
251
+ // padding-left: 5px;
252
+ // }
253
+ // }
254
+ // #address1 {
255
+ // border-right: 0;
256
+ // }
257
+ </style>
package/src/filiale/yuncheng/sale.js CHANGED
@@ -2,6 +2,9 @@
2
2
  import Vue from 'vue'
3
3
 
4
4
  export default function () {
5
+
6
+ // 当前选择用户的表具基本信息
7
+ Vue.component('user-meterinfodetail', (resolve) => { require(['./meterinfodetail'], resolve) })
5
8
  // 高拍仪
6
9
  Vue.component('high-meter', (resolve) => {
7
10
  require(['./HighMeterCard'], resolve)