apply-clients 4.1.18-weinan → 4.1.20-weinan

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "4.1.18-weinan",
+  "version": "4.1.20-weinan",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/app_apply/AppChargeManagement.vue

@@ -47,10 +47,10 @@
               <p class="col-xs-4 text-left font"><b>金额大写</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_amount_words }}</p>
             </div>
-            <div class="row">
+<!--            <div class="row">
               <p class="col-xs-4 text-left font"><b>收费项目</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_payment_term }}</p>
-            </div>
+            </div>-->
             <div class="row">
               <p class="col-xs-4 text-left font"><b>付款方式</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_payment_method }}</p>
@@ -75,6 +75,10 @@
               <p class="col-xs-4 text-left font"><b>收费日期</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_charge_date }}</p>
             </div>
+            <div class="row">
+              <p class="col-xs-4 text-left font"><b>支付状态</b></p>
+              <p class="col-xs-8 text-left input-font">{{ row.f_paystate }}</p>
+            </div>
             <div class="row">
               <p class="col-xs-4 text-left font"><b>备注</b></p>
               <p class="col-xs-8 text-left input-font">{{ row.f_charge_remarks }}</p>
@@ -193,14 +197,16 @@ export default {
         payment_terms:[{f_payment_term: '',f_charge_money: '',f_amount_words:'',f_payment_method : ''}]
       },
       order: {},
-      timeLeft: 120,
+      timeLeft: 300,
       paymentInterval: null,
       orderInterval: null,
       filiale:"",
       config: {
 
       },
-      title1:''
+      title1:'',
+      // 收费编号
+      f_charge_number:''
     }
   },
   ready () {
@@ -256,6 +262,8 @@ export default {
         clearTimeout(this.paymentInterval)
         clearTimeout(this.orderInterval)
         this.timeLeft = 10
+        // 修改支付状态
+        this.updatestate('支付成功')
         // 清除二维码
         this.clearQrCode()
         this.showQrCode = false
@@ -369,6 +377,7 @@ export default {
       }).then(ress=>{
         console.log('ress',ress)
         if(ress.data.code == '200'){
+          this.f_charge_number = ress.data.f_charge_number
           this.showQrCode = true
           this.$nextTick(()=>{
             this.qrcode()
@@ -546,10 +555,24 @@ export default {
     closeQRCode(){
       clearTimeout(this.paymentInterval)
       clearTimeout(this.orderInterval)
-      this.timeLeft = 120
+      this.timeLeft = 300
+      // 修改支付状态
+      this.updatestate('支付失败')
       // 清除二维码
       this.clearQrCode()
       this.showQrCode = false
+    },
+    async updatestate(state){
+      let data = {
+        f_out_trade_no:this.order.f_out_trade_no,
+        f_charge_number:this.f_charge_number,
+        f_paystate:state
+      }
+      let http = new HttpResetClass()
+      let res = await http.load('POST', `${this.$androidUtil.getProxyUrl()}/rs/logic/updatestate`, {data:data}, {
+            resolveMsg: null,
+            rejectMsg: '修改失败！！！'
+          })
     }
     // async getConfig () {
     //   let http = new HttpResetClass()
@@ -583,14 +606,15 @@ export default {
         clearTimeout(this.paymentInterval)
         clearTimeout(this.orderInterval)
 
-        this.timeLeft = 120
-
+        this.timeLeft = 300
+        // 修改支付状态
+        this.updatestate('支付失败')
         // 清除二维码
         this.clearQrCode()
 
         this.showQrCode = false
 
-        this.$showMessage('订单支付超时！！！')
+        this.$showMessage('订单支付超时！！！,如果已支付成功，我们将在1-2两个工作日内退款')
       }
     },
     /*'selectdata.showfei' (val){

package/src/components/app_apply/ServiceView.vue

@@ -263,7 +263,14 @@
         let fields = this.data.fields
         let flag = false
         for (const item of fields) {
-          if (item.type === 'select' && item.label === '工程状态'&& (item.value === '正在施工' || item.value === '未开工' )&& item.disabledButton) {
+          if (item.type !== 'checkbox' && item.required && !item.value) {
+            if (item.value === 0) {
+              flag = false
+            } else {
+              flag = true
+            }
+          }
+          if (item.type === 'select' && item.label === '工程状态' && (item.value === '正在施工' || item.value === '未开工') && item.disabledButton) {
             flag = true
           }
         }

package/src/components/product/Process/Service/ServiceControl.vue

@@ -1054,6 +1054,39 @@ export default {
           }
         }
         if (this.show_data.fields[index].label === '其他费用') {
+          let http = new HttpResetClass()
+          let data = {
+            num1: this.getLableValue('单价'),
+            num2: this.getLableValue('户数'),
+            operator: '*'
+          }
+          try {
+            let res = await http.load('POST', 'rs/logic/compute', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+            data = {
+              num1: res.data,
+              num2: this.getLableValue('其他费用'),
+              operator: '+'
+            }
+            res = await http.load('POST', 'rs/logic/compute', {data: data}, {
+              resolveMsg: null,
+              rejectMsg: null
+            })
+            this.setLabelValue('合同金额',res.data)
+            if(this.show_data.f_apply_type === '居民报建'){
+              this.show_data.f_contract_money = res.data
+              this.show_data.f_due_money = res.data
+              this.show_data.f_surplus_money = res.data
+              this.setLabelValue('应交总金额',res.data)
+              this.setLabelValue('未结总金额',res.data)
+            }
+          } catch (e) {
+            this.$showAlert(e.data.msg, 'warning', 3000)
+          }
+        }
+        /*if (this.show_data.fields[index].label === '其他费用') {
           let http = new HttpResetClass()
           let data = {
             num1: this.getLableValue(this.show_data.fields[index].label),
@@ -1076,7 +1109,7 @@ export default {
           } catch (e) {
             this.$showAlert(e.data.msg, 'warning', 3000)
           }
-        }
+        }*/
       }
       // ========================= 武安 =================================
       // 号码检测