sale-client 3.4.71 → 3.4.75

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 (49) hide show
  1. package/.gradle/5.2.1/fileHashes/fileHashes.lock +0 -0
  2. package/.gradle/{5.5 → 6.1.1}/executionHistory/executionHistory.bin +0 -0
  3. package/.gradle/6.1.1/executionHistory/executionHistory.lock +0 -0
  4. package/.gradle/{5.5 → 6.1.1}/fileChanges/last-build.bin +0 -0
  5. package/.gradle/{5.5 → 6.1.1}/fileHashes/fileHashes.bin +0 -0
  6. package/.gradle/6.1.1/fileHashes/fileHashes.lock +0 -0
  7. package/.gradle/{5.5 → 6.1.1}/gc.properties +0 -0
  8. package/.gradle/7.1/dependencies-accessors/dependencies-accessors.lock +0 -0
  9. package/.gradle/7.1/executionHistory/executionHistory.bin +0 -0
  10. package/.gradle/7.1/executionHistory/executionHistory.lock +0 -0
  11. package/.gradle/7.1/fileHashes/fileHashes.bin +0 -0
  12. package/.gradle/7.1/fileHashes/fileHashes.lock +0 -0
  13. package/.gradle/buildOutputCleanup/buildOutputCleanup.lock +0 -0
  14. package/.gradle/buildOutputCleanup/cache.properties +2 -2
  15. package/.gradle/buildOutputCleanup/outputFiles.bin +0 -0
  16. package/.gradle/checksums/checksums.lock +0 -0
  17. package/build/dev-server.js +5 -3
  18. package/package.json +1 -1
  19. package/src/components/charge/business/CardMeterCenter.vue +26 -0
  20. package/src/components/charge/business/DigitalCharge.vue +6 -6
  21. package/src/components/charge/business/OtherChargeNew.vue +9 -10
  22. package/src/components/charge/gasloss/gasLossOperate.vue +15 -10
  23. package/src/components/chargeBatch/ChargeGroupList.vue +267 -0
  24. package/src/components/chargeBatch/ChargeManageGroup.vue +2 -2
  25. package/src/components/revenue/Common/PaymentCode.vue +3 -3
  26. package/src/components/revenue/HandManager/MbpeopleList.vue +6 -6
  27. package/src/components/revenue/HandManager/MeterBookUser.vue +33 -2
  28. package/src/components/revenue/HandManager/RemainAdjustment.vue +282 -282
  29. package/src/components/revenue/base/leftview/meterinfodetail.vue +186 -186
  30. package/src/components/revenue/comprehen/ComprehenOperation/OverCharge/OverUseCharge.vue +407 -408
  31. package/src/components/revenue/comprehen/Maintenance/hand/handListMaintain.vue +615 -615
  32. package/src/filiale/macheng/UserBaseInfoNew.vue +346 -0
  33. package/src/filiale/macheng/sale.js +42 -41
  34. package/src/filiale/qianneng/GasPriceList.vue +18 -7
  35. package/src/filiale/qianneng/MbpeopleList.vue +2 -17
  36. package/src/filiale/tongchuan/bill/CustQueryEticket.vue +2 -2
  37. package/src/filiale/wuhai/MeterinfoTest.vue +891 -891
  38. package/src/filiale/wuhai/OtherChargeNew.vue +590 -0
  39. package/src/filiale/wuhai/Userinfo.vue +177 -177
  40. package/src/filiale/wuhai/sale.js +17 -16
  41. package/src/main.js +1 -1
  42. package/src/plugins/CardService.js +12 -0
  43. package/src/plugins/ChangeMeterService.js +751 -751
  44. package/src/sale.js +2 -0
  45. package/.gradle/5.5/executionHistory/executionHistory.lock +0 -0
  46. package/.gradle/5.5/fileContent/fileContent.lock +0 -0
  47. package/.gradle/5.5/fileHashes/fileHashes.lock +0 -0
  48. package/build/libs/SaleClient-3.1.1-11.jar +0 -0
  49. package/build/tmp/jar/MANIFEST.MF +0 -2
File without changes
@@ -1,2 +1,2 @@
1
- #Mon Jan 10 21:02:00 CST 2022
2
- gradle.version=5.5
1
+ #Mon Jan 17 13:48:02 CST 2022
2
+ gradle.version=6.1.1
Binary file
@@ -10,7 +10,7 @@ var compiler = webpack(config)
10
10
 
11
11
  // Define HTTP proxies to your custom API backend
12
12
  // https://github.com/chimurai/http-proxy-middleware
13
- var bendi = 'http://127.0.0.1:8082/',bendi1 = 'http://119.146.1.106:8300/'
13
+ var bendi = 'http://aotesoft.f3322.net:8400/',bendi1 = 'http://119.146.1.106:8300/'
14
14
  // 公司测试服务
15
15
  var fuwu = 'http://aotesoft.f3322.net:8400/'
16
16
  //铜川正式
@@ -88,13 +88,15 @@ var proxyTable = {
88
88
  target: fuwu
89
89
  },
90
90
  '/rs/report': {
91
- target:fuwu
91
+ target: 'http://127.0.0.1:8079'
92
92
  },
93
93
  '/rs/vue': {
94
94
  target: fuwu
95
95
  },
96
96
  '/rs': {
97
- target: fuwu
97
+ // target: 'http://192.168.30.63:8081/'
98
+ target: 'http://aotesoft.f3322.net:8400/'
99
+ // target:fuwu
98
100
  }
99
101
  }
100
102
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sale-client",
3
- "version": "3.4.71",
3
+ "version": "3.4.75",
4
4
  "description": "收费模块前台组件",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
@@ -466,6 +466,32 @@
466
466
  }
467
467
  }
468
468
  }
469
+ let nowrite_param = {
470
+ f_userfiles_id: self.row.f_userfiles_id,
471
+ }
472
+ let getNoWriteCard = await self.$resetpost('rs/sql/getnowritecard', {data: nowrite_param}, {
473
+ resolveMsg: null,
474
+ rejectMsg: '获取限购值失败!!'
475
+ })
476
+ if(getNoWriteCard.data.length >0){
477
+ self.$showMessage(`三小时内存在写卡失败的记录,是否重新写卡?`, ['confirm', 'cancel']).then(async (res) => {
478
+ if (res === 'confirm') {
479
+ let url = 'http://127.0.0.1:8003/'+ getNoWriteCard.data[0].f_cardpost
480
+ let param = JSON.parse(getNoWriteCard.data[0].f_cardparam)
481
+ let cardRes = await self.$resetpost(url, param, {resolveMsg: null, rejectMsg: '重新写卡失败'})
482
+ if (cardRes.data.Err || cardRes.data.Exception) {
483
+ self.$showAlert(`卡服务错误:${cardRes.data.Err}${cardRes.data.Exception},请联系开发人员处理!!`, 'danger', 3000)
484
+ self.$dispatch('refresh', self.row)
485
+ } else {
486
+ self.$resetpost('rs/logic/writeCardAgin', getNoWriteCard.data[0], {resolveMsg: '重新写卡成功', rejectMsg: '重新写卡失败'})
487
+ self.$dispatch('success')
488
+ }
489
+ }else{
490
+ self.$dispatch('refresh', self.row)
491
+ }
492
+ })
493
+ }
494
+
469
495
  }
470
496
  export default {
471
497
  title: '卡表收费',
@@ -4,14 +4,14 @@
4
4
  <validator name='v'>
5
5
  <form novalidate class="form-horizontal">
6
6
  <div class="row">
7
- <div class="col-sm-4">
8
- <label for="f_paytype" class=" font_normal_body" title="参数名称:付款方式">收款方式</label>
9
- <v-select id="f_payment"
10
- v-model="f_payment"
7
+ <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
8
+ <label class=" font_normal_body" title="参数名称:付款方式">收款方式</label>
9
+ <input type="text" v-show="false" v-model="$refs.payment.selectedItems" v-validate:payment='{required: true }'>
10
+ <v-select v-model="model.f_payment"
11
11
  placeholder='请选择'
12
12
  :value.sync="model.f_payment"
13
- :options='paytype'
14
- close-on-select clear-button></v-select>
13
+ close-on-select
14
+ :options='paytype' clear-button v-ref:payment></v-select>
15
15
  </div>
16
16
  <div class="col-sm-4"
17
17
  :class="[$v.f_pregas.required || $v.f_pregas.dctest? 'has-error' : 'has-success']">
@@ -11,7 +11,7 @@
11
11
  <div class="col-sm-4" :class="{'has-success':row.f_brand_spec,'select-error':!row.f_brand_spec}">
12
12
  <label for="f_brand_spec" class="font_normal_body " title="参数名称:品名及规格">收费类型</label>
13
13
  <v-select id="f_brand_spec"
14
- placeholder='材料'
14
+ placeholder='请选择'
15
15
  v-model="row.f_brand_spec"
16
16
  :value.sync="row.f_brand_spec"
17
17
  :options='brandspec'
@@ -24,7 +24,7 @@
24
24
  <v-select
25
25
  style="width: 100px"
26
26
  v-model="row.f_typename"
27
- placeholder='品名'
27
+ placeholder='请选择'
28
28
  :value.sync="row.f_typename"
29
29
  :options='gettypename'
30
30
  @change="setTypenumber"
@@ -36,7 +36,7 @@
36
36
  <v-select
37
37
  style="width: 100px"
38
38
  v-model="row.f_typenumber"
39
- placeholder='型号'
39
+ placeholder='请选择'
40
40
  :value.sync="row.f_typenumber"
41
41
  :options='gettypenumber'
42
42
  @change="setTypeprice"
@@ -96,15 +96,14 @@
96
96
 
97
97
 
98
98
  <div class="row" style="margin-top:10px;">
99
- <div class="col-sm-4">
100
- <label for="f_paytype" class="font_normal_body" title="参数名称:付款方式">收款方式</label>
101
- <v-select id="f_payment"
102
- v-model="f_payment"
99
+ <div class="col-sm-4 form-group" :class="[$v.payment.required ? 'select-error' : '']">
100
+ <label class=" font_normal_body" title="参数名称:付款方式">收款方式</label>
101
+ <input type="text" v-show="false" v-model="$refs.payment.selectedItems" v-validate:payment='{required: true }'>
102
+ <v-select v-model="model.f_payment"
103
103
  placeholder='请选择'
104
104
  :value.sync="model.f_payment"
105
- :options='paytype'
106
- close-on-select clear-button>
107
- </v-select>
105
+ close-on-select
106
+ :options='paytype' clear-button v-ref:payment></v-select>
108
107
  </div>
109
108
  <div class="col-sm-4">
110
109
  <label for="f_print" class="font_normal_body">&nbsp;打印格式</label>
@@ -1,6 +1,6 @@
1
1
  <template>
2
2
  <div class="flex-row auto">
3
- <div class="span auto" style="height: 90%">
3
+ <div class="span auto" style="height: 98%;overflow-y: auto;">
4
4
  <validator name='v'>
5
5
  <form novalidate class="form-horizontal">
6
6
  <div class="flex-auto">
@@ -135,7 +135,7 @@
135
135
 
136
136
  </div>
137
137
 
138
- <!-- <payment-code v-ref:paymentcode :payment="model.f_payment" :row="row" :money="model.f_collection"></payment-code>-->
138
+ <payment-code v-ref:paymentcode :payment="model.f_payment" :money="model.f_collection"></payment-code>
139
139
 
140
140
  </div>
141
141
  <!-- <div class="auto">-->
@@ -152,7 +152,7 @@
152
152
  let gasLossGen = async function (self) {
153
153
  try {
154
154
  // 加入扫码盒付款码支付流水号
155
- // self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
155
+ self.model.f_serial_id = self.$refs.paymentcode.paymentCodeReturnData.f_out_trade_no
156
156
  // let resid = await self.$LogicService.otherCharge(self.model, self.row)
157
157
  self.model.f_bill_style=self.model.f_print
158
158
  let http = new HttpResetClass()
@@ -190,7 +190,11 @@
190
190
  }
191
191
 
192
192
  let asyncGasLoss = async function (self) {
193
- await self.$getConfig(self, 'gasLossCharge')
193
+ try{
194
+ await self.$getConfig(self, 'gasLossCharge')
195
+ } catch(error){
196
+ console.log('无配置文件')
197
+ }
194
198
  self.model.f_print = self.config.printType
195
199
  self.model.f_payment = self.config.payment
196
200
  self.model.f_use_type = self.config.billType
@@ -229,6 +233,7 @@
229
233
  f_depid: Vue.$login.f.depids,
230
234
  f_depname: Vue.$login.f.deps,
231
235
  f_operat_type: '气损收费',
236
+ f_print: '',
232
237
  gaslossdetail:[{}]
233
238
  },
234
239
  print: false,
@@ -248,7 +253,6 @@
248
253
  services: this.$appdata.getParam('服务人员')
249
254
  }
250
255
  },
251
- props: ['row'],
252
256
  ready () {
253
257
  asyncGasLoss(this)
254
258
  },
@@ -280,7 +284,8 @@
280
284
  clean(){
281
285
  this.model={
282
286
  f_collection: 0,
283
- f_payment: '',
287
+ f_payment: this.config.payment,
288
+ f_print: this.config.printType,
284
289
  f_bill_style: '',
285
290
  f_comments: '',
286
291
  f_charge_person: '',
@@ -299,10 +304,10 @@
299
304
  },
300
305
  async confirm () {
301
306
  // // 先调用付款码支付组件流程
302
- // let ss = await this.$refs.paymentcode.flowPath()
303
- // this.$refs.paymentcode.paymentCodeShow = false
304
- // console.log('付款码操作返回', ss)
305
- // if (!ss.result) return
307
+ let ss = await this.$refs.paymentcode.flowPath()
308
+ this.$refs.paymentcode.paymentCodeShow = false
309
+ console.log('付款码操作返回', ss)
310
+ if (!ss.result) return
306
311
 
307
312
  gasLossGen(this)
308
313
  },
@@ -0,0 +1,267 @@
1
+ <template>
2
+ <div class="flex" @keyup.enter="search" :style="{height:(oweShow?'auto':'100%')}">
3
+ <criteria-paged :model="model" v-ref:paged :pager="!oweShow">
4
+ <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
5
+ <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
6
+ <div class="row">
7
+ <div :class="$parent.$parent.style">
8
+ <label class="font_normal_body">组织机构</label>
9
+ <res-select restype='organization'
10
+ @res-select="$parent.$parent.getorg"
11
+ :is-mul="false"
12
+ :initresid='$parent.$parent.curorgid'>
13
+ </res-select>
14
+ </div>
15
+ <div :class="$parent.$parent.style">
16
+ <label class="font_normal_body">客戶编码</label>
17
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_customer"
18
+ condition="f_customer like '%{}%'" placeholder="客戶编码"/>
19
+ </div>
20
+ <div :class="$parent.$parent.style" v-show="!$parent.$parent.listShow">
21
+ <label class="font_normal_body">客戶名称</label>
22
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
23
+ condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
24
+ </div>
25
+
26
+ <div class="col-sm-3 form-group button-range">
27
+ <button class="button_search button_spacing" @click="search()">查询</button>
28
+ <button class="button_new button_spacing" style="width: max-content;" @click="$parent.$parent.add()" v-if="!$parent.$parent.chargeToChoose">建档
29
+ </button>
30
+ <button class="button_clear button_spacing" @click="clear">清空</button>
31
+ <div style="float: right" class="button_spacing"
32
+ :class="{'button_shrink_top': criteriaShow,'button_shrink_bottom': !criteriaShow}"
33
+ @click="criteriaShow = !criteriaShow"></div>
34
+ </div>
35
+ <div class="row" v-show="criteriaShow">
36
+ <div :class="$parent.$parent.style" v-show="$parent.$parent.listShow">
37
+ <label class="font_normal_body">客戶名称</label>
38
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_name"
39
+ condition="f_user_name like '%{}%'" placeholder="客戶名称"/>
40
+ </div>
41
+ <div :class="$parent.$parent.style">
42
+ <label class="font_normal_body">客戶地址</label>
43
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_address"
44
+ condition="f_address like '%{}%'" placeholder="客戶地址"/>
45
+ </div>
46
+ <div :class="$parent.$parent.style">
47
+ <label class="font_normal_body">客户电话</label>
48
+ <input type="text" class="input_search" style="width:60%" v-model="model.f_user_phone"
49
+ condition="f_user_phone like '%{}%'" placeholder="客户电话"/>
50
+ </div>
51
+ <div :class="$parent.$parent.style">
52
+ <label class="font_normal_body">是否欠费</label>
53
+ <v-select v-model="model.oughtfee"
54
+ :search="fasle"
55
+ placeholder='是否欠费'
56
+ :value.sync="model.oughtfee"
57
+ :options='$parent.$parent.oughtfee'
58
+ condition="f_oughtfee_all {}"
59
+ close-on-select style="width: 60%"></v-select>
60
+ </div>
61
+ </div>
62
+ </div>
63
+ </div>
64
+ </criteria>
65
+ <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid v-if="!$parent.oweShow" @dblclick="$parent.showOwe">
66
+ <template partial='head'>
67
+ <tr>
68
+ <th>
69
+ <nobr>序号</nobr>
70
+ </th>
71
+ <th>
72
+ <nobr>客戶编码</nobr>
73
+ </th>
74
+ <th>
75
+ <nobr>客戶名称</nobr>
76
+ </th>
77
+ <th>
78
+ <nobr>账户结余</nobr>
79
+ </th>
80
+ <th>
81
+ <nobr>客戶类型</nobr>
82
+ </th>
83
+ <th>
84
+ <nobr>客戶地址</nobr>
85
+ </th>
86
+ <th>
87
+ <nobr>客戶电话</nobr>
88
+ </th>
89
+ <th>
90
+ <nobr>团缴户数</nobr>
91
+ </th>
92
+ <th>
93
+ <nobr>欠费金额</nobr>
94
+ </th>
95
+ <th>
96
+ <nobr>操作</nobr>
97
+ </th>
98
+ </tr>
99
+ </template>
100
+ <template partial='body'>
101
+ <tr>
102
+ <td style="text-align:center">
103
+ <nobr>{{ $index + 1 }}</nobr>
104
+ </td>
105
+ <td style="text-align:center">
106
+ <nobr>{{ row.f_customer }}</nobr>
107
+ </td>
108
+ <td style="text-align:center">
109
+ <nobr>{{ row.f_user_name }}</nobr>
110
+ </td>
111
+ <td style="text-align:center">
112
+ <nobr>{{ row.f_balance }}</nobr>
113
+ </td>
114
+ <td style="text-align:center">
115
+ <nobr>{{ row.f_user_type }}</nobr>
116
+ </td>
117
+ <td style="text-align:center">
118
+ <nobr>{{ row.f_address }}</nobr>
119
+ </td>
120
+ <td style="text-align:center">
121
+ <nobr>{{ row.f_user_phone }}</nobr>
122
+ </td>
123
+ <td style="text-align:center" v-if="!$parent.$parent.$parent.chargeToChoose">
124
+ <button @click.stop="$parent.$parent.$parent.operate(row)"
125
+ class="btn btn-link"><b>{{ row.sumuserfiles }}</b>
126
+ </button>
127
+ </td>
128
+ <td style="text-align:center" v-else>
129
+ <nobr>{{ row.sumuserfiles }}</nobr>
130
+ </td>
131
+ <td style="text-align:center" v-else>
132
+ <nobr>{{ row.f_oughtfee_all }}</nobr>
133
+ </td>
134
+ <td style="text-align:center">
135
+ <nobr>
136
+ <button type="button" name="button" class="btn btn-link"
137
+ @click.stop="$parent.$parent.$parent.print(row)">打印明细
138
+ </button>
139
+ <button type="button" name="button" class="btn btn-link"
140
+ @click.stop="$parent.$parent.$parent.export(row)">导出明细
141
+ </button>
142
+ </nobr>
143
+ </td>
144
+ </tr>
145
+ </template>
146
+ <template partial='foot'></template>
147
+ </data-grid>
148
+ </criteria-paged>
149
+ </div>
150
+
151
+ <export-excel
152
+ :isshow="false" :data="getCondition" :field="getfield" :choose-col="true" v-ref:excel
153
+ sqlurl="rs/logic/saleExport" sql-name="batchOweQuery" template-name='团体欠费明细导出'>
154
+ </export-excel>
155
+
156
+ <print-data :sum-field="getfield" :model="$parent.model" :field="getfield"
157
+ :sumone = "false" :defaultfield="$parent.$parent.defaultfield"
158
+ titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
159
+ :sumsmodel="$parent.$parent.sumsmodel">
160
+ </print-data>
161
+
162
+ <owe-record-query v-if="oweShow" :f_civill_id="f_civill_id"></owe-record-query>
163
+ </template>
164
+
165
+ <script>
166
+ import {PagedList} from 'vue-client'
167
+
168
+ export default {
169
+ data () {
170
+ return {
171
+ oughtfee: [{label: '全部', value: ''}, {label: '是', value: '> 0'}, {label: '否', value: '<= 0'}],
172
+ model: new PagedList('rs/sql/ncarchivesQuery', 20),
173
+ // 公司下拉
174
+ curorgid: [this.$login.f.orgid],
175
+ f_orgid: '',
176
+ f_civill_id: null,
177
+ oweShow: false,
178
+ getCondition: null,
179
+ getfield: null,
180
+ config: {
181
+ // 导出列
182
+ excelHeaders: {
183
+ 'f_userinfo_code': '客户编号',
184
+ 'f_user_name': '客户姓名',
185
+ 'f_meter_classify': '气表类型',
186
+ 'c': '欠费期数',
187
+ 'f_hand_date': '欠费区间',
188
+ 'f_last_tablebase': '上期底数',
189
+ 'f_tablebase': '本期底数',
190
+ 'f_oughtamount': '用气量',
191
+ 'f_oughtfee': '用气金额',
192
+ 'f_debt_money': '已交金额',
193
+ 'f_oughtfee_new': '应交气费',
194
+ 'overdue': '滞纳金',
195
+ 'f_oughtfee_all': '合计欠费'
196
+ }
197
+ }
198
+ }
199
+ },
200
+ title: '档案查询',
201
+ props: {
202
+ f_filialeids: {
203
+ type: String
204
+ },
205
+ style: {
206
+ type: String,
207
+ default: 'col-sm-3 form-group'
208
+ },
209
+ // 控制在修改数据时显示少的查询条件,剩余隐藏
210
+ listShow: {
211
+ type: Boolean,
212
+ default: false
213
+ },
214
+ // 收费时的展示控制
215
+ chargeToChoose: {
216
+ type: Boolean,
217
+ default: false
218
+ }
219
+ },
220
+ ready () {
221
+ this.getfield = this.config.excelHeaders
222
+ this.search()
223
+ },
224
+ methods: {
225
+ // 导出
226
+ export (row) {
227
+ this.getCondition = {condition: `p.f_civill_id = ${row.id}`}
228
+ this.$refs.excel.exportExcel()
229
+ },
230
+ showOwe (row) {
231
+ if (this.chargeToChoose) {
232
+ this.f_civill_id = row.id
233
+ this.oweShow = true
234
+ }
235
+ },
236
+ search () {
237
+ this.$refs.paged.$refs.cri.search()
238
+ },
239
+ add () {
240
+ if (this.f_filialeids) {
241
+ this.$refs.paged.$refs.grid.selectStore.selected = null
242
+ this.$dispatch('add')
243
+ } else {
244
+ this.$showAlert('请先选择左上角的所在分公司', 'warning', 2000)
245
+ }
246
+ },
247
+ operate (val) {
248
+ this.$dispatch('operate', val)
249
+ },
250
+ selfSearch (args) {
251
+ if (!this.f_orgid) {
252
+ this.getorg([this.$login.f.orgid])
253
+ }
254
+ args.condition = `${args.condition} and f_orgid in ${this.f_orgid}`
255
+ this.oweShow = false
256
+ this.model.search(args.condition, args.model)
257
+ this.$refs.paged.$refs.grid.selectInit()
258
+ this.$dispatch('newsearch')
259
+ },
260
+ getorg (val) {
261
+ this.f_orgid = this.$login.convertToIn(val)
262
+ this.f_filialeids = val[0]
263
+ }
264
+ }
265
+
266
+ }
267
+ </script>
@@ -1,7 +1,7 @@
1
1
  <template>
2
2
  <div id="ChargeManageBatch" class="flex-row three" v-show="listpage">
3
3
  <div class="binary-left" style="width:83%;overflow-y: scroll">
4
- <archives-list v-ref:archiveslist charge-to-choose></archives-list>
4
+ <charge-group-list v-ref:archiveslist charge-to-choose></charge-group-list>
5
5
  </div>
6
6
  <div class="binary-right" style="width:22%">
7
7
  <ul class="nav nav-pills span nav-tabs" style="height:auto;margin:8px 0px;padding:4px 0;border-bottom: 1px solid #e7e7e7;">
@@ -26,7 +26,7 @@
26
26
  <script>
27
27
  import CardListRewrite from './CardList'
28
28
  export default {
29
- title: '批量缴费',
29
+ title: '团体缴费',
30
30
  components: {CardListRewrite},
31
31
  data () {
32
32
  return {
@@ -73,9 +73,9 @@
73
73
  // 付款码支付流程
74
74
  async ConfirmCode () {
75
75
  let data = {
76
- f_userinfo_id: this.row.f_userinfo_id,
77
- f_user_id: this.row.f_user_id,
78
- f_userfiles_id: this.row.f_userfiles_id,
76
+ f_userinfo_id: this.row ? this.row.f_userinfo_id : null,
77
+ f_user_id: this.row ? this.row.f_user_id : null,
78
+ f_userfiles_id: this.row ? this.row.f_userfiles_id : null,
79
79
  money: this.money,
80
80
  f_payment: this.payment,
81
81
  auth_code: this.paymentCode,
@@ -18,12 +18,12 @@
18
18
  <div class="form-group button-range" style="float: right">
19
19
  <button class="button_search button_spacing" @click="$parent.$parent.search()">查询</button>
20
20
  <button class="button_clear button_spacing" @click="clear">清空</button>
21
- <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
22
- <export-excel
23
- :data="{condition:$parent.$parent.condition}"
24
- :field="$parent.$parent.getfield"
25
- sqlurl="rs/logic/exportfile" sql-name="salembPeopleList" template-name='表册用户导出'
26
- :choose-col="true"></export-excel>
21
+ <!-- <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>-->
22
+ <!-- <export-excel-->
23
+ <!-- :data="{condition:$parent.$parent.condition}"-->
24
+ <!-- :field="$parent.$parent.getfield"-->
25
+ <!-- sqlurl="rs/logic/exportfile" sql-name="salembPeopleList" template-name='表册用户导出'-->
26
+ <!-- :choose-col="true"></export-excel>-->
27
27
  <div style="float: right" class="button_spacing"
28
28
  :class="{'button_shrink_top': $parent.$parent.criteriaShow,'button_shrink_bottom': !$parent.$parent.criteriaShow}"
29
29
  @click="$parent.$parent.criteriaShow = !$parent.$parent.criteriaShow"></div>
@@ -15,12 +15,13 @@
15
15
  <button class="button_search" style="margin-right: 10px" @click="search()" v-el:cba>查询</button>
16
16
  <button class="button_search" v-if="$parent.$parent.editsort==false" @click="$parent.$parent.editsort=true" v-el:cba>调整顺序</button>
17
17
  <button class="button_search" v-if="$parent.$parent.editsort==true" @click="$parent.$parent.saveEditSort" v-el:cba>保存顺序</button>
18
-
19
18
  <export-excel
20
19
  :data="{condition: $parent.$parent.condition}"
21
20
  :field="$parent.$parent.getfield"
22
- sqlurl="rs/logic/saleExport" sql-name="getMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
21
+ sqlurl="rs/logic/exportfile" sql-name="saleGetMeterBookUser" :template-name="$parent.$parent.model.rows[0].f_book_name+'抄表册名'"
23
22
  :choose-col="true"></export-excel>
23
+ <button class="button_export button_spacing" @click="$parent.$parent.importFile">导入</button>
24
+
24
25
  <div
25
26
  :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"
26
27
  @click="$parent.$parent.criteriaShow=!$parent.$parent.criteriaShow"
@@ -227,6 +228,14 @@
227
228
 
228
229
  </footer>
229
230
  </modal>
231
+ <modal :show.sync="show" width="800px" title="文件导入" v-ref:modal large backdrop="false">
232
+ <article slot="modal-body" class="modal-body">
233
+ <file-upload class="my-file-uploader " name="UploadFile" style="border-radius: 2px;"
234
+ action="rs/file/uploadFile" tagname="导入表册用户" v-ref:file multiple></file-upload>
235
+ </article>
236
+ <footer slot="modal-footer" class="modal-footer">
237
+ </footer>
238
+ </modal>
230
239
  </template>
231
240
 
232
241
  <script>
@@ -273,6 +282,7 @@
273
282
  editsort:false,
274
283
  config: {
275
284
  excelHeaders: {
285
+ 'f_userfiles_id': '系统识别号',
276
286
  'f_book_name': '抄表册名称',
277
287
  'f_userinfo_code': '客户编号',
278
288
  'f_user_name': '客户姓名',
@@ -296,6 +306,9 @@
296
306
  readyGen(this)
297
307
  },
298
308
  methods: {
309
+ importFile () {
310
+ this.show = true
311
+ },
299
312
  async sortEdit(position){
300
313
  if(!this.fileinfo.code){
301
314
  this.$showMessage('请输入目标用户编号')
@@ -514,6 +527,24 @@
514
527
  this.search()
515
528
  }
516
529
  },
530
+ events: {
531
+ onFileUpload: function (file, res) {
532
+ // let URL = res.f_downloadpath.substring(res.f_downloadpath.lastIndexOf(":\\") + 2)
533
+ // res.f_downloadpath = "http://" + location.host + "/" + URL
534
+ // res.f_downloadpath.replace('\\','/')
535
+ this.$resetpost('rs/logic/upLoadBookFile',
536
+ {data: {
537
+ condition: this.condition,
538
+ filepath: res.f_downloadpath
539
+ }
540
+ },
541
+ {resolveMsg: null, rejectMsg: '上传失败'}).then((res) => {
542
+ this.show = false
543
+ this.$showAlert(`导入成功`, 'success', 2000)
544
+ this.search()
545
+ })
546
+ }
547
+ },
517
548
  computed: {
518
549
  inputtores () {
519
550
  // 获取抄表员