apply-clients 3.4.97 → 3.4.98-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.
@@ -8,8 +8,8 @@ var compiler = webpack(config)
8
8
  // var proxy = httpProxy.createProxyServer()
9
9
  // var ldap = 'http://121.36.79.201:8400'
10
10
  // var applyinstall = 'http://121.36.79.201:8400'
11
- var ldap = 'http://192.168.50.4:8400'
12
- var applyinstall = 'http://192.168.50.4:8400'
11
+ var ldap = 'http://121.36.106.17:8400'
12
+ var applyinstall = 'http://121.36.106.17:8400'
13
13
 
14
14
  var proxyTable = {
15
15
  '/apply/rs/entity': {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "apply-clients",
3
- "version": "3.4.97",
3
+ "version": "3.4.98-2",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -143,6 +143,7 @@
143
143
  <data-grid v-if="$parent.showData" :model="model" partial='list' v-ref:grid class="list_area table_sy">
144
144
  <template partial='head'>
145
145
  <tr class="title">
146
+ <th style="white-space: nowrap;">操作</th>
146
147
  <th style="white-space: nowrap;">序号</th>
147
148
  <th style="white-space: nowrap;">工程编号</th>
148
149
  <th style="white-space: nowrap;">客户名称</th>
@@ -156,11 +157,22 @@
156
157
  <th style="white-space: nowrap;">报建日期</th>
157
158
  <th style="white-space: nowrap;">付款笔数</th>
158
159
  <th style="white-space: nowrap;">确认付款笔数</th>
159
- <th style="white-space: nowrap;">操作</th>
160
160
  </tr>
161
161
  </template>
162
162
  <template partial='body'>
163
163
  <tr>
164
+ <td style="text-align: center;">
165
+ <dropdown>
166
+ <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
167
+ <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
168
+ </button>
169
+ <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
170
+ <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func.personexpression)">
171
+ <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
172
+ </li>
173
+ </ul>
174
+ </dropdown>
175
+ </td>
164
176
  <td style="text-align: center;">
165
177
  <nobr>{{$index+1}}</nobr>
166
178
  </td>
@@ -200,18 +212,7 @@
200
212
  <td style="text-align: center;">
201
213
  <nobr>{{row.confirmtotal}}</nobr>
202
214
  </td>
203
- <td style="text-align: center;">
204
- <dropdown>
205
- <button @click="$parent.$parent.$parent.checkfuncs(row)" type="button" data-toggle="dropdown" style="border: 0px;background: none;">
206
- <span class="glyphicon glyphicon-th-list" style="position: inherit;"></span>
207
- </button>
208
- <ul slot="dropdown-menu" class="dropdown-menu dropdown-menu-right">
209
- <li v-for="(index,func) in $parent.$parent.$parent.funcs" v-if="$parent.$parent.$parent.$parent.showFunc(func.personexpression)">
210
- <a href="#" @click="$parent.$parent.$parent.$parent.func(func,row)">{{func.title}}</a>
211
- </li>
212
- </ul>
213
- </dropdown>
214
- </td>
215
+
215
216
  </tr>
216
217
  </template>
217
218
  </data-grid>
@@ -562,8 +562,8 @@
562
562
  {resolveMsg: null, rejectMsg: '查询失败!!!'}
563
563
  )
564
564
  for (let i =0;i<res1.data.length;i++){
565
- if (isEmpty(res1.data[i].f_confirm_person) || isEmpty(res1.data[i].f_auditor_person)){
566
- this.$showAlert(`当前${defname}环节,费用未收费确认和审核,请仔细检查并点击保存`, 'warning', 3000)
565
+ if (isEmpty(res1.data[i].f_confirm_person)){
566
+ this.$showAlert(`当前${defname}环节,费用未收费确认,请仔细检查并点击保存`, 'warning', 3000)
567
567
  throw null
568
568
  }
569
569
  }
@@ -1615,7 +1615,7 @@
1615
1615
  // let f_room_suffix = f_room ? this.config.f_room_suffix : ''
1616
1616
  let f_room_suffix = f_room ? '室' : ''
1617
1617
 
1618
- let f_address = f_pcd + f_street + f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
1618
+ let f_address = f_residential_area + f_building + f_building_suffix + f_unit + f_unit_suffix + f_floor + f_floor_suffix + f_room + f_room_suffix
1619
1619
  this.setLabelValue("地址", f_address)
1620
1620
  }
1621
1621
  }
@@ -30,7 +30,7 @@
30
30
  type="button"
31
31
  class="btn btn-info head-but"
32
32
  @click="$parent.$parent.showChargeModal()"
33
- :disabled="$parent.$parent.mark === 1 || ($parent.$parent.selectdata.f_cumulative_payment_money >= $parent.$parent.selectdata.f_due_money || $parent.$parent.selectdata.f_surplus_money === 0)"
33
+
34
34
  >新增收费</button>
35
35
  </th>
36
36
  </tr>
@@ -113,7 +113,7 @@
113
113
  @click="$parent.$parent.showConfirmModal(row,'确认收款')"
114
114
  >确认收款</button>
115
115
  </nobr>
116
- <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
116
+ <!-- <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
117
117
  <button
118
118
  type="button"
119
119
  name="button"
@@ -121,7 +121,7 @@
121
121
  :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
122
122
  @click="$parent.$parent.showConfirmModal(row,'确认审核')"
123
123
  >确认审核</button>
124
- </nobr>
124
+ </nobr>-->
125
125
  <nobr v-if="row.f_charge_status !== '退款'">
126
126
  <button
127
127
  type="button"
@@ -163,20 +163,89 @@
163
163
  close-on-select ></input-select>
164
164
  </div>
165
165
  </div>
166
- <!-- <div class="form-group col-sm-12" :class="[$v.paymentterm.required ? 'has-error' : '']">
167
- <label class="col-sm-2 control-label">收费项目:</label>
168
- <div class="col-sm-10">
169
- <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.paymentterm.selectedItems" v-validate:paymentterm='{required: true }'>
170
- <v-select width="100%" class="select select_list" placeholder='请选择'
171
- v-model="charge.f_payment_term"
172
- :value.sync="charge.f_payment_term"
173
- :options='paymentTerm'
174
- :multiple="true"
175
- v-ref:paymentterm
176
- ></v-select>
166
+ <div v-for="(i, item) in charge.charges" class="form-group col-sm-12 panel panel-info">
167
+ <div class="panel-heading head col-sm-12" style="background-color: #e8f4ff;margin-bottom: 10px">
168
+ <div class="col-sm-6 text-left">收费项目{{$index+1}}信息</div>
169
+ <div class="col-sm-6 text-right"><button
170
+ class="button_delete button_spacing"
171
+ v-if="!item.f_userfiles_id"
172
+ @click.prevent="deleteUserFile(i)"
173
+ >删除</button></div>
177
174
  </div>
178
- </div>-->
179
- <div class="form-group col-sm-12" :class="[$v.f_payment_term.required ? 'has-error' : '']">
175
+ <div class="form-group col-sm-12" :class="[$v.item.f_payment_term.required ? 'has-error' : '']">
176
+ <label class="col-sm-2 control-label">收费项目:</label>
177
+ <div class="col-sm-10">
178
+ <input type="text" v-show="false" v-model="item.f_payment_term" v-validate:f_payment_term = "['required']" >
179
+ <input-select width="100%" class="select select_list" placeholder='请选择'
180
+ v-model="item.f_payment_term"
181
+ :value.sync="item.f_payment_term"
182
+ :options='paymentTerm'
183
+ :value-single="true"
184
+ close-on-select ></input-select>
185
+ </div>
186
+ </div>
187
+ <div class="form-group col-sm-12" :class="[$v.item.f_charge_money.required ? 'has-error' : '']">
188
+ <label class="col-sm-2 control-label">收费金额:</label>
189
+ <div class="col-sm-10">
190
+ <input type="text"
191
+ class="form-control input_view"
192
+ style="width: 100%"
193
+ placeholder="0.00"
194
+ @change="moneyChange(i)"
195
+ v-validate:f_charge_money = "['required']"
196
+ v-model="item.f_charge_money" />
197
+ </div>
198
+ </div>
199
+ <div class="form-group col-sm-12" :class="[$v.item.f_payment_method.required ? 'has-error' : '']">
200
+ <label class="col-sm-2 control-label">付款方式:</label>
201
+ <div class="col-sm-10">
202
+ <input type="text" v-show="false" v-model="item.f_payment_method" v-validate:f_payment_method = "['required']" >
203
+ <input-select
204
+ placeholder='请选择' width="100%"
205
+ v-model="item.f_payment_method"
206
+ :value.sync="item.f_payment_method"
207
+ :options='paymentMethod'
208
+ class="select select_list"
209
+ :value-single="true"
210
+ @change="changePaymentMethod()"
211
+ close-on-select ></input-select>
212
+ </div>
213
+ </div>
214
+ <div class="form-group col-sm-12">
215
+ <label class="col-sm-2 control-label">金额大写:</label>
216
+ <div class="col-sm-10">
217
+ <input type="text"
218
+ class="form-control input_view"
219
+ style="width: 100%"
220
+ :value="smalltoBIG(0)"
221
+ readonly
222
+ v-model.sync="item.f_amount_words" />
223
+ </div>
224
+ </div>
225
+ <div class="form-group col-sm-12">
226
+ <label class="col-sm-2 control-label">备注:</label>
227
+ <div class="col-sm-10">
228
+ <input type="text"
229
+ class="form-control input_view"
230
+ style="width: 100%"
231
+ v-model="item.f_charge_remarks" />
232
+ </div>
233
+ </div>
234
+ <div class="form-group col-sm-12">
235
+ <label class="col-sm-2 control-label">实际收款时间:</label>
236
+ <div class="col-sm-10">
237
+ <datepicker id="startDate" placeholder="实际收款时间"
238
+ style="width: 60%!important;"
239
+ v-model="item.f_actual_date"
240
+ :value.sync="item.f_actual_date"
241
+ :format="'yyyy-MM-dd HH:mm:ss'"
242
+ :show-reset-button="true"
243
+ >
244
+ </datepicker>
245
+ </div>
246
+ </div>
247
+ </div>
248
+ <!-- <div class="form-group col-sm-12" :class="[$v.f_payment_term.required ? 'has-error' : '']">
180
249
  <label class="col-sm-2 control-label">收费项目:</label>
181
250
  <div class="col-sm-10">
182
251
  <input type="text" v-show="false" v-model="charge.f_payment_term" v-validate:f_payment_term = "['required']" >
@@ -216,34 +285,6 @@
216
285
  close-on-select ></input-select>
217
286
  </div>
218
287
  </div>
219
- <div class="form-group col-sm-12" v-if="charge.f_payment_method === '银行转账'" :class="[$v.f_payer_name.required ? 'has-error' : '']">
220
- <label class="col-sm-2 control-label">付款方名称:</label>
221
- <div class="col-sm-10">
222
- <input type="text"
223
- class="form-control input_view"
224
- style="width: 100%"
225
- v-validate:f_payer_name = "['required']"
226
- v-model="charge.f_payer_name" value="" />
227
- </div>
228
- </div>
229
- <div class="form-group col-sm-12" v-if="charge.f_payment_method === '银行转账'" :class="[$v.f_payer_account.required ? 'has-error' : '']">
230
- <label class="col-sm-2 control-label">付款方账号:</label>
231
- <div class="col-sm-10">
232
- <input type="text" style="width: 100%" class="form-control input_view"
233
- v-validate:f_payer_account = "['required']"
234
- v-model="charge.f_payer_account" value=""/>
235
- </div>
236
- </div>
237
- <div class="form-group col-sm-12" v-if="charge.f_payment_method === '银行转账'" :class="[$v.f_payer_number.required ? 'has-error' : '']">
238
- <label class="col-sm-2 control-label">付款流水号:</label>
239
- <div class="col-sm-10">
240
- <input type="text"
241
- class="form-control input_view"
242
- style="width: 100%" @change="payerNumberChange()"
243
- v-validate:f_payer_number = "['required']"
244
- v-model="charge.f_payer_number" value="" />
245
- </div>
246
- </div>
247
288
  <div class="form-group col-sm-12">
248
289
  <label class="col-sm-2 control-label">金额大写:</label>
249
290
  <div class="col-sm-10">
@@ -254,45 +295,8 @@
254
295
  readonly
255
296
  v-model.sync="charge.f_amount_words" />
256
297
  </div>
257
- </div>
258
- <div class="form-group col-sm-12"
259
- v-if="selectdata.f_apply_type === '散户集体报建'"
260
- >
261
- <label class="col-sm-2 control-label">单价(户):</label>
262
- <div class="col-sm-10">
263
- <input type="text"
264
- class="form-control input_view"
265
- style="width: 100%"
266
- readonly
267
- v-model="selectdata.f_price" />
268
- </div>
269
- </div>
270
- <div class="form-group col-sm-12"
271
- v-if="selectdata.f_apply_type === '散户集体报建'"
272
- >
273
- <label class="col-sm-2 control-label">累计缴费金额:</label>
274
- <div class="col-sm-10">
275
- <input type="text"
276
- class="form-control input_view"
277
- style="width: 100%"
278
- readonly
279
- v-model="charge.f_cumulative_payment_money"
280
- :value="charge.f_cumulative_payment_money || 0" />
281
- </div>
282
- </div>
283
- <div class="form-group col-sm-12"
284
- v-if="selectdata.f_apply_type === '散户集体报建'"
285
- >
286
- <label class="col-sm-2 control-label">未结金额:</label>
287
- <div class="col-sm-10">
288
- <input type="text"
289
- class="form-control input_view"
290
- style="width: 100%"
291
- readonly
292
- v-model="charge.f_outstanding_amount"
293
- :value="charge.f_outstanding_amount || 0" />
294
- </div>
295
- </div>
298
+ </div>-->
299
+
296
300
  <div class="form-group col-sm-12">
297
301
  <label class="col-sm-2 control-label">应交总金额:</label>
298
302
  <div class="col-sm-10">
@@ -323,7 +327,7 @@
323
327
  v-model="selectdata.f_surplus_money" />
324
328
  </div>
325
329
  </div>
326
- <div class="form-group col-sm-12">
330
+ <!-- <div class="form-group col-sm-12">
327
331
  <label class="col-sm-2 control-label">备注:</label>
328
332
  <div class="col-sm-10">
329
333
  <input type="text"
@@ -344,9 +348,10 @@
344
348
  >
345
349
  </datepicker>
346
350
  </div>
347
- </div>
351
+ </div>-->
348
352
  </article>
349
353
  <footer slot="modal-footer" class="modal-footer">
354
+ <button type="button" class="btn btn-primary" @click="addcharges" >添加收费项目</button>
350
355
  <button type="button" class="btn btn-primary" :disabled='!$v.valid' @click="saveCharge()">新增收费</button>
351
356
  </footer>
352
357
  </modal>
@@ -515,7 +520,7 @@
515
520
  <button type="button" class="btn btn-primary" @click="ConfirmPayment()">确认收款</button>
516
521
  </footer>
517
522
  </modal>
518
- <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :backdrop="false" title="确认审核">
523
+ <!-- <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :backdrop="false" title="确认审核">
519
524
  <header slot="modal-header" class="modal-header">
520
525
  <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
521
526
  <h4 class="modal-title">确认审核</h4>
@@ -632,7 +637,7 @@
632
637
  <footer slot="modal-footer" class="modal-footer">
633
638
  <button type="button" class="btn btn-primary" @click="ConfirmPayment()">确认收款</button>
634
639
  </footer>
635
- </modal>
640
+ </modal>-->
636
641
  <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
637
642
  <header slot="modal-header" class="modal-header">
638
643
  <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
@@ -677,7 +682,7 @@ export default {
677
682
  }, // 记录
678
683
  useraddresList: [], // 地址列表
679
684
  charge: {
680
-
685
+ charges:[]
681
686
  }
682
687
  }
683
688
  },
@@ -685,6 +690,12 @@ export default {
685
690
  this.search()
686
691
  },
687
692
  methods: {
693
+ addcharges(){
694
+ this.charge.charges.push({})
695
+ },
696
+ deleteUserFile (index) {
697
+ this.charge.charges.splice(index, 1)
698
+ },
688
699
  async payerNumberChange () {
689
700
  if (isEmpty(this.charge.f_payer_number)) {
690
701
  return
@@ -783,7 +794,7 @@ export default {
783
794
  {resolveMsg: null, rejectMsg: '查询失败!!!'}
784
795
  )
785
796
  for (let i =0;i<res1.data.length;i++){
786
- if (isEmpty(res1.data[i].f_confirm_person) || isEmpty(res1.data[i].f_auditor_person)){
797
+ if (isEmpty(res1.data[i].f_confirm_person)){
787
798
  flag = false
788
799
  }
789
800
  }
@@ -836,22 +847,24 @@ export default {
836
847
 
837
848
  this.$dispatch('breakControl', this.selectdata)
838
849
  },
839
- moneyChange () {
840
- if (isEmpty(this.charge.f_charge_money) || Number(this.charge.f_charge_money) === 0) {
850
+ moneyChange (i) {
851
+ if (isEmpty(this.charge.charges[i].f_charge_money) || Number(this.charge.charges[i].f_charge_money) === 0) {
841
852
  this.$showAlert('单笔收费不能为0元!!!', 'warning', 3000)
842
- this.charge.f_charge_money = null
853
+ this.charge.charges[i].f_charge_money = null
843
854
  return
844
855
  }
845
- if (this.selectdata.f_apply_type === '散户集体报建' && Number(this.charge.f_charge_money) > Number(this.charge.f_outstanding_amount)) {
856
+ if (this.selectdata.f_apply_type === '散户集体报建' && Number(this.charge.charges[i].f_charge_money) > Number(this.charge.charges[i].f_outstanding_amount)) {
846
857
  this.$showAlert('单笔收费不能超过未交金额!!!', 'warning', 3000)
847
- this.charge.f_charge_money = null
858
+ this.charge.charges[i].f_charge_money = null
848
859
  return
849
860
  }
850
- if (Number(this.charge.f_charge_money) > Number(this.selectdata.f_surplus_money)) {
861
+ if (Number(this.charge.charges[i].f_charge_money) > Number(this.selectdata.f_surplus_money)) {
851
862
  this.$showAlert('单笔收费不能超过未交总金额!!!', 'warning', 3000)
852
- this.charge.f_charge_money = null
863
+ this.charge.charges[i].f_charge_money = null
853
864
  return
854
865
  }
866
+ this.charge.charges[i].f_charge_money = (this.charge.charges[i].f_charge_money.match(/^\d*(\.?\d{0,2})/g)[0]) || null
867
+ this.charge.charges[i].f_amount_words = this.smalltoBIG(this.charge.charges[i].f_charge_money)
855
868
  },
856
869
  // 金额转大写
857
870
  handleInput(e) {
@@ -963,7 +976,9 @@ export default {
963
976
  this.showPrint = false
964
977
  this.showConfirm = false
965
978
  this.showauditor = false
966
- this.charge = {}
979
+ this.charge = {
980
+ charges:[]
981
+ }
967
982
  this.search()
968
983
  }
969
984
  },