apply-clients 3.4.95 → 3.4.96

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://125.71.238.50:30789'
12
- var applyinstall = 'http://125.71.238.50:30789'
11
+ var ldap = 'http://192.168.50.4:8400'
12
+ var applyinstall = 'http://192.168.50.4: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.95",
3
+ "version": "3.4.96",
4
4
  "description": "报建前端模块",
5
5
  "main": "src/index.js",
6
6
  "directories": {
@@ -549,12 +549,24 @@
549
549
  )
550
550
  if(res.data.length!==0){
551
551
  var f_due_money= res.data[0].f_due_money
552
- var cumulative= res.data[0].f_cumulative_payment_money
552
+ var cumulative= res.data[0].f_charge_money
553
553
  if (Number(f_due_money) > Number(cumulative)) {
554
554
  this.$showAlert(`当前${defname}环节,应缴金额为:${f_due_money},费用未结清`, 'warning', 3000)
555
555
  throw null
556
556
  }
557
557
  }
558
+ let res1 = await http.load(
559
+ 'POST',
560
+ `rs/sql/getfeeconfirmation`,
561
+ {data: data},
562
+ {resolveMsg: null, rejectMsg: '查询失败!!!'}
563
+ )
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)
567
+ throw null
568
+ }
569
+ }
558
570
  if (defname=='合同签订'){
559
571
  let num = 0
560
572
  let data = {
@@ -1571,115 +1583,6 @@
1571
1583
  if (this.show_data.button.after) {
1572
1584
  this[this.show_data.button.after]()
1573
1585
  }
1574
- // // 改管报建 增容报建 优化
1575
- // if((this.show_data.f_apply_type === '改管报建'||this.show_data.f_apply_type === '增容报建') && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '缴费'){
1576
- // let datagg = {
1577
- // condition: `t.f_process_id='${this.show_data.f_process_id}'`,
1578
- // }
1579
- // let http = new HttpResetClass()
1580
- // let restgg = await http.load(
1581
- // 'POST',
1582
- // `rs/sql/checkusertwo`,
1583
- // {data: datagg},
1584
- // {resolveMsg: null, rejectMsg: '报建数据查询失败!!!'}
1585
- // )
1586
- // debugger
1587
- // if(this.show_data.f_apply_type === '改管报建'){
1588
- // restgg.data[0].processname = '改管报建流程'
1589
- // restgg.data[0].defname = '报装缴费'
1590
- // }else{
1591
- // restgg.data[0].processname = '增容报建流程'
1592
- // restgg.data[0].defname = '报装缴费'
1593
- // }
1594
- // restgg.data[0].actid = restgg.data[0].actid + 1
1595
- // this.$dispatch('apply',restgg.data[0])
1596
- //
1597
- // }
1598
- //
1599
- // // 退款报建 优化
1600
- // if(this.show_data.f_apply_type === '退款报建' && this.show_data.defname === '终止报建' && this.show_data.button.button_name === '提交'){
1601
- // let datatk = {
1602
- // condition: `t.f_process_id='${this.show_data.f_process_id}'`,
1603
- // }
1604
- // let http = new HttpResetClass()
1605
- // let resttk = await http.load(
1606
- // 'POST',
1607
- // `rs/sql/checkusertwo`,
1608
- // {data: datatk},
1609
- // {resolveMsg: null, rejectMsg: '报建数据查询失败!!!'}
1610
- // )
1611
- // debugger
1612
- // resttk.data[0].processname = '退款报建流程'
1613
- // resttk.data[0].defname = '退款'
1614
- // this.$dispatch('apply',resttk.data[0])
1615
- //
1616
- // }
1617
- //
1618
- //
1619
- // if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装申请' && this.show_data.button.button_name === '合同'){
1620
- // let data = {
1621
- // tablename: 't_apply',
1622
- // condition: `f_process_id='${this.show_data.f_process_id}'`
1623
- // }
1624
- // let http = new HttpResetClass()
1625
- // let restp = await http.load(
1626
- // 'POST',
1627
- // `rs/sql/apply_singleTable`,
1628
- // {data: data},
1629
- // {resolveMsg: null, rejectMsg: '报建数据查询失败!!!'}
1630
- // )
1631
- // debugger
1632
- // restp.data[0].processname = '散户报建流程'
1633
- // restp.data[0].defname = '合同签订'
1634
- // this.$dispatch('apply',restp.data[0])
1635
- //
1636
- // } else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '合同签订' && this.show_data.button.button_name === '提交'){
1637
- // let data2 = {
1638
- // condition: `u.id = ${this.show_data.id}`,
1639
- // data: {
1640
- // id: this.$login.f.id,
1641
- // orgid: this.$login.f.orgid
1642
- // }
1643
- // }
1644
- // let http = new HttpResetClass()
1645
- // let restp1 = await http.load(
1646
- // 'POST',
1647
- // `rs/sql/checkuser`,
1648
- // {data: data2},
1649
- // {resolveMsg: null, rejectMsg: '报建数据查询失败!!!'}
1650
- // )
1651
- // debugger
1652
- // console.log('有没有发请求打印查询的内容restp1',restp1)
1653
- // // restp1.data[0].processname = '散户报建流程'
1654
- // // restp1.data[0].defname = '报装缴费'
1655
- // this.$dispatch('apply',restp1.data[0])
1656
- // }else if(this.show_data.f_apply_type === '散户报建' && this.show_data.defname === '报装缴费' && this.show_data.button.button_name === '提交'){
1657
- // let data3 = {
1658
- // condition: `u.id = ${this.show_data.id}`,
1659
- // data: {
1660
- // id: this.$login.f.id,
1661
- // orgid: this.$login.f.orgid
1662
- // }
1663
- // }
1664
- // let http = new HttpResetClass()
1665
- // let restp2 = await http.load(
1666
- // 'POST',
1667
- // `rs/sql/checkuser`,
1668
- // {data: data3},
1669
- // {resolveMsg: null, rejectMsg: '报建数据查询失败!!!'}
1670
- // )
1671
- // debugger
1672
- // console.log('打印查询的内容',restp2)
1673
- // if(restp2.length>0){
1674
- // this.$dispatch('apply',restp2.data[0])
1675
- // }else{
1676
- // debugger
1677
- // this.$dispatch('loadPage')
1678
- // }
1679
- // }
1680
- // else{
1681
- // this.$dispatch('loadPage')
1682
- // }
1683
1586
  this.$dispatch('loadPage')
1684
1587
  },
1685
1588
  // 失去焦点出触发事件
@@ -23,6 +23,8 @@
23
23
  <th class="textNoLineBreak">作废原因</th>
24
24
  <th class="textNoLineBreak">确认人</th>
25
25
  <th class="textNoLineBreak">确认时间</th>
26
+ <th class="textNoLineBreak">审核人</th>
27
+ <th class="textNoLineBreak">审核时间</th>
26
28
  <th class="textNoLineBreak">
27
29
  <button
28
30
  type="button"
@@ -95,15 +97,31 @@
95
97
  <td style="text-align: center;">
96
98
  <nobr>{{row.f_confirm_date}}</nobr>
97
99
  </td>
100
+ <td style="text-align: center;">
101
+ <nobr>{{row.f_auditor_person}}</nobr>
102
+ </td>
103
+ <td style="text-align: center;">
104
+ <nobr>{{row.f_auditor_date}}</nobr>
105
+ </td>
98
106
  <td style="text-align: center;">
99
107
  <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person==null">
100
108
  <button
101
109
  type="button"
102
110
  name="button"
103
111
  class="btn btn-link"
104
- @click="$parent.$parent.showConfirmModal(row)"
112
+ :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
113
+ @click="$parent.$parent.showConfirmModal(row,'确认收款')"
105
114
  >确认收款</button>
106
115
  </nobr>
116
+ <nobr v-if="row.f_charge_status !== '退款'&& row.f_charge_status !== '作废' && row.f_confirm_person!=null&& row.f_auditor_person==null">
117
+ <button
118
+ type="button"
119
+ name="button"
120
+ class="btn btn-link"
121
+ :disabled="$parent.$parent.mark === 1 || row.f_charge_status === '作废'"
122
+ @click="$parent.$parent.showConfirmModal(row,'确认审核')"
123
+ >确认审核</button>
124
+ </nobr>
107
125
  <nobr v-if="row.f_charge_status !== '退款'">
108
126
  <button
109
127
  type="button"
@@ -145,7 +163,7 @@
145
163
  close-on-select ></input-select>
146
164
  </div>
147
165
  </div>
148
- <div class="form-group col-sm-12" :class="[$v.paymentterm.required ? 'has-error' : '']">
166
+ <!-- <div class="form-group col-sm-12" :class="[$v.paymentterm.required ? 'has-error' : '']">
149
167
  <label class="col-sm-2 control-label">收费项目:</label>
150
168
  <div class="col-sm-10">
151
169
  <input type="text" class="input_search" style="width:60%" v-show="false" v-model="$refs.paymentterm.selectedItems" v-validate:paymentterm='{required: true }'>
@@ -157,6 +175,18 @@
157
175
  v-ref:paymentterm
158
176
  ></v-select>
159
177
  </div>
178
+ </div>-->
179
+ <div class="form-group col-sm-12" :class="[$v.f_payment_term.required ? 'has-error' : '']">
180
+ <label class="col-sm-2 control-label">收费项目:</label>
181
+ <div class="col-sm-10">
182
+ <input type="text" v-show="false" v-model="charge.f_payment_term" v-validate:f_payment_term = "['required']" >
183
+ <input-select width="100%" class="select select_list" placeholder='请选择'
184
+ v-model="charge.f_payment_term"
185
+ :value.sync="charge.f_payment_term"
186
+ :options='paymentTerm'
187
+ :value-single="true"
188
+ close-on-select ></input-select>
189
+ </div>
160
190
  </div>
161
191
  <div class="form-group col-sm-12" :class="[$v.f_charge_money.required ? 'has-error' : '']">
162
192
  <label class="col-sm-2 control-label">收费金额:</label>
@@ -485,6 +515,124 @@
485
515
  <button type="button" class="btn btn-primary" @click="ConfirmPayment()">确认收款</button>
486
516
  </footer>
487
517
  </modal>
518
+ <modal v-if="showauditor" :show.sync="showauditor" v-ref:modal :backdrop="false" title="确认审核">
519
+ <header slot="modal-header" class="modal-header">
520
+ <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
521
+ <h4 class="modal-title">确认审核</h4>
522
+ </header>
523
+ <article slot="modal-body" class="modal-body clearfix">
524
+ <div class="form-group col-sm-12" v-if="false">
525
+ <label class="col-sm-2 control-label">缴费地址:</label>
526
+ <div class="col-sm-10">
527
+ <input type="text"
528
+ class="form-control input_view"
529
+ style="width: 100%"
530
+ readonly
531
+ v-model="charge.f_useraddres" />
532
+ </div>
533
+ </div>
534
+ <div class="form-group col-sm-12">
535
+ <label class="col-sm-2 control-label">收费金额:</label>
536
+ <div class="col-sm-10">
537
+ <input type="text"
538
+ class="form-control input_view"
539
+ style="width: 100%"
540
+ readonly
541
+ v-model="charge.f_charge_money" />
542
+ </div>
543
+ </div>
544
+ <div class="form-group col-sm-12">
545
+ <label class="col-sm-2 control-label">付款方式:</label>
546
+ <div class="col-sm-10">
547
+ <input type="text"
548
+ class="form-control input_view"
549
+ style="width: 100%"
550
+ readonly
551
+ v-model="charge.f_payment_method" />
552
+ </div>
553
+ </div>
554
+ <div class="form-group col-sm-12">
555
+ <label class="col-sm-2 control-label">金额大写:</label>
556
+ <div class="col-sm-10">
557
+ <input type="text"
558
+ class="form-control input_view"
559
+ style="width: 100%"
560
+ readonly
561
+ v-model="charge.f_amount_words" />
562
+ </div>
563
+ </div>
564
+ <div class="form-group col-sm-12">
565
+ <label class="col-sm-2 control-label">收费人员:</label>
566
+ <div class="col-sm-10">
567
+ <input type="text"
568
+ class="form-control input_view"
569
+ style="width: 100%"
570
+ readonly
571
+ v-model="charge.f_charge_collectors" />
572
+ </div>
573
+ </div>
574
+ <div class="form-group col-sm-12">
575
+ <label class="col-sm-2 control-label">确认人:</label>
576
+ <div class="col-sm-10">
577
+ <input type="text"
578
+ class="form-control input_view"
579
+ style="width: 100%"
580
+ readonly
581
+ v-model="charge.f_confirm_person" />
582
+ </div>
583
+ </div>
584
+ <div class="form-group col-sm-12">
585
+ <label class="col-sm-2 control-label">确认时间:</label>
586
+ <div class="col-sm-10">
587
+ <datepicker id="startDate" placeholder="确认时间"
588
+ style="width: 60%!important;"
589
+ v-model="charge.f_confirm_date"
590
+ :value.sync="charge.f_confirm_date"
591
+ readonly
592
+ disabled
593
+ :format="'yyyy-MM-dd HH:mm:ss'"
594
+ :show-reset-button="true"
595
+ >
596
+ </datepicker>
597
+ </div>
598
+ </div>
599
+ <div class="form-group col-sm-12">
600
+ <label class="col-sm-2 control-label">审核人:</label>
601
+ <div class="col-sm-10">
602
+ <input type="text"
603
+ class="form-control input_view"
604
+ style="width: 100%"
605
+ v-model="charge.f_auditor_person" />
606
+ </div>
607
+ </div>
608
+ <div class="form-group col-sm-12">
609
+ <label class="col-sm-2 control-label">审核时间:</label>
610
+ <div class="col-sm-10">
611
+ <datepicker id="startDate" placeholder="确认时间"
612
+ style="width: 60%!important;"
613
+ v-model="charge.f_auditor_date"
614
+ :value.sync="charge.f_auditor_date"
615
+ :default="true"
616
+ :format="'yyyy-MM-dd HH:mm:ss'"
617
+ :show-reset-button="true"
618
+ >
619
+ </datepicker>
620
+ </div>
621
+ </div>
622
+ <div class="form-group col-sm-12">
623
+ <label class="col-sm-2 control-label">备注:</label>
624
+ <div class="col-sm-10">
625
+ <input type="text"
626
+ class="form-control input_view"
627
+ style="width: 100%"
628
+ v-model="charge.f_charge_remarks" />
629
+ </div>
630
+ </div>
631
+ </article>
632
+ <footer slot="modal-footer" class="modal-footer">
633
+ <button type="button" class="btn btn-primary" @click="ConfirmPayment()">确认收款</button>
634
+ </footer>
635
+ </modal>
488
636
  <modal v-if="showPrint" :show.sync="showPrint" v-ref:modal :large="true" :backdrop="false" title="打印预览">
489
637
  <header slot="modal-header" class="modal-header">
490
638
  <button type="button" class="close" @click="closeModal"><span>&times;</span></button>
@@ -522,6 +670,7 @@ export default {
522
670
  showInvalid: false, // 作废
523
671
  showPrint: false, // 打印
524
672
  showConfirm: false, // 确认收款
673
+ showauditor: false, // 确认审核
525
674
  person:this.$login.f.name,
526
675
  model: {
527
676
  data: null
@@ -595,31 +744,84 @@ export default {
595
744
  }
596
745
  let res = await http.load('POST', 'rs/logic/confirmCharge', {data: data}, {
597
746
  resolveMsg: null,
598
- rejectMsg: '确认收款失败!!!'
747
+ rejectMsg: '提交失败!!!'
599
748
  })
600
749
  if(res.data==200){
601
- this.$showAlert('确认收款成功!!!', 'success', 3000)
750
+ this.$showAlert('提交成功!!!', 'success', 3000)
602
751
  //延时1s
603
752
  setTimeout(() => {
604
753
  this.showConfirm= false
754
+ this.showauditor= false
605
755
  }, 1000)
606
756
  }
607
757
  //重新查询
608
758
  this.search()
759
+ this.getbutton()
760
+ },
761
+ async getbutton(){
762
+ var defname = this.selectdata.defname
763
+ var processId = this.selectdata.f_process_id
764
+ let data = {
765
+ condition: `tc.f_process_id = '${processId}' and tc.defname = '${defname}'`
766
+ }
767
+ let http = new HttpResetClass()
768
+ let res = await http.load(
769
+ 'POST',
770
+ `rs/sql/getPaymentRatio`,
771
+ {data: data},
772
+ {resolveMsg: null, rejectMsg: '查询失败!!!'}
773
+ )
774
+ if(res.data.length!==0){
775
+ var f_due_money= res.data[0].f_due_money
776
+ var cumulative= res.data[0].f_charge_money
777
+ if (Number(f_due_money) == Number(cumulative)) {
778
+ let flag = true
779
+ let res1 = await http.load(
780
+ 'POST',
781
+ `rs/sql/getfeeconfirmation`,
782
+ {data: data},
783
+ {resolveMsg: null, rejectMsg: '查询失败!!!'}
784
+ )
785
+ 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)){
787
+ flag = false
788
+ }
789
+ }
790
+ if (flag){
791
+ let show_data = this.selectdata
792
+ show_data.user = this.$login.f
793
+ show_data.start_activity ='报装申请'
794
+ show_data.xmlfilename =this.selectdata.f_apply_type
795
+ show_data.button = {button_name:'提交'}
796
+ await this.$resetpost(
797
+ `rs/logic/ApplyProductService`,
798
+ {data: show_data},
799
+ {resolveMsg: null, rejectMsg: '数据保存失败'}
800
+ )
801
+ }
802
+ }
803
+ }
609
804
  },
610
805
  // 打开作废收费
611
806
  showInvalidModal(row) {
612
807
  this.charge = row
613
808
  this.showInvalid = true
614
809
  },
615
- showConfirmModal(row){
810
+ showConfirmModal(row,type){
616
811
  this.charge = row
617
- this.charge.f_confirm_person=this.person
618
- this.showConfirm= true
812
+ if (type == '确认收款'){
813
+ this.charge.f_confirm_person=this.person
814
+ this.showConfirm= true
815
+ }
816
+ if (type == '确认审核'){
817
+ this.charge.f_auditor_person=this.person
818
+ this.showauditor= true
819
+ }
619
820
  },
620
821
  // 新增收费
621
822
  async saveCharge() {
622
823
  let http = new HttpResetClass()
824
+ this.charge.defname = this.selectdata.defname
623
825
  let data = {
624
826
  apply: this.selectdata,
625
827
  user: this.$login.f,
@@ -760,6 +962,7 @@ export default {
760
962
  this.showInvalid = false
761
963
  this.showPrint = false
762
964
  this.showConfirm = false
965
+ this.showauditor = false
763
966
  this.charge = {}
764
967
  this.search()
765
968
  }