apply-clients 3.5.5-86 → 3.5.5-87

package/package.json

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

package/src/filiale/fugou/android/AppServiceControl.vue

@@ -1778,17 +1778,29 @@ export default {
       }
     },
     'onblur' (index) {
-      if(this.show_data.fields[index].label==="优惠金额"){
-        let contract=this.getLableValue('合同金额')
-        let add=this.getLableValue('追加款')
-        let money = this.getLableValue('优惠金额')
-        //转为数字，然后contract减去money，保留两位小数
-        let money_num = parseFloat(money)
-        let add_num = parseFloat(add)
-        let contract_num = parseFloat(contract)
-        let new_contract = contract_num+add_num - money_num
-        this.setLabelValue('应交金额', new_contract.toFixed(2))
+      if(this.show_data.f_apply_type === '改管报建'){
+        if(this.show_data.fields[index].label==="优惠金额"){
+          let contract=this.getLableValue('总金额')
+          let money = this.getLableValue('优惠金额')
+          let contract_num = parseFloat(contract)
+          let money_num = parseFloat(money)
+          let new_contract = contract_num - money_num
+          this.setLabelValue('应交金额', new_contract.toFixed(2))
+        }
+      }else{
+        if(this.show_data.fields[index].label==="优惠金额"){
+          let contract=this.getLableValue('合同金额')
+          let add=this.getLableValue('追加款')
+          let money = this.getLableValue('优惠金额')
+          //转为数字，然后contract减去money，保留两位小数
+          let money_num = parseFloat(money)
+          let add_num = parseFloat(add)
+          let contract_num = parseFloat(contract)
+          let new_contract = contract_num+add_num - money_num
+          this.setLabelValue('应交金额', new_contract.toFixed(2))
+        }
       }
+
     },
     'oninput' (index) {},
     'initializtionView' () {},

package/src/filiale/fugou/pc/ServiceControl.vue

@@ -1596,6 +1596,29 @@
       },
       selectSearch (val, index) {},
       'onblur' (index) {
+        if(this.show_data.f_apply_type === '改管报建'){
+          if(this.show_data.fields[index].label==="优惠金额"){
+            let contract=this.getLableValue('总金额')
+            let money = this.getLableValue('优惠金额')
+            let contract_num = parseFloat(contract)
+            let money_num = parseFloat(money)
+            let new_contract = contract_num - money_num
+            this.setLabelValue('应交金额', new_contract.toFixed(2))
+          }
+        }else{
+          if(this.show_data.fields[index].label==="优惠金额"){
+            let contract=this.getLableValue('合同金额')
+            let add=this.getLableValue('追加款')
+            let money = this.getLableValue('优惠金额')
+            //转为数字，然后contract减去money，保留两位小数
+            let money_num = parseFloat(money)
+            let add_num = parseFloat(add)
+            let contract_num = parseFloat(contract)
+            let new_contract = contract_num+add_num - money_num
+            this.setLabelValue('应交金额', new_contract.toFixed(2))
+          }
+        }
+
       },
       'oninput' (index) {},
       'initializtionView' () {},