apply-clients 7.1.36-yuchuan-48 → 7.1.36-yuchuan-50

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apply-clients",
-  "version": "7.1.36-yuchuan-48",
+  "version": "7.1.36-yuchuan-50",
   "description": "报建前端模块",
   "main": "src/index.js",
   "directories": {

package/src/components/product/ApplyCharge/ApplyChargeList.vue

@@ -991,7 +991,7 @@ export default {
     },
     showChongZhengModal(row) {
       this.charge = row;
-      if (this.$login.f.rolesnames.includes("营业厅报装")) {
+      if (this.$login.f.rolesnames.includes("营业厅报装") ||this.$login.f.name==='微信') {
         this.detailGen(this, "发票作废信息", "确认作废", "cancel");
       } else {
         this.showChongZheng = false;

package/src/components/product/Process/Processes/chargeManagement.vue

@@ -124,7 +124,7 @@
                      style="width: 100%"
                      v-validate:f_feecount = "['required']"
                      v-model="charge.f_feecount"
-                     readonly
+                     @blur="feecountchange"
                      :value="selectdata.f_install_count"
               />
             </div>
@@ -345,7 +345,8 @@ export default {
         data: null
       },       // 记录
       charge: {
-
+        f_amount_words:'',
+        f_charge_money:''
       }
     }
   },
@@ -648,9 +649,7 @@ export default {
       return head + s.replace(/(零.)*零元/, '元').replace(/(零.)+/g, '零').replace(/^整$/, '零元整')
     },
     async showChargeModal() {
-      if(this.selectdata.f_apply_type == '民用报建'){
-        this.feecountchange()
-      }
+      this.feecountchange()
       this.showCharge = true
     },
     async search () {
@@ -673,8 +672,10 @@ export default {
       this.search()
     },
     feecountchange(){
-      this.charge.f_charge_money = Number(this.selectdata.f_price) * Number(this.charge.f_feecount || this.selectdata.f_install_count)
-      this.charge.f_amount_words = this.smalltoBIG(this.charge.f_charge_money)
+      if(this.selectdata.f_apply_type == '民用报建'){
+        this.charge.f_charge_money = Number(this.selectdata.f_price) * Number(this.charge.f_feecount || this.selectdata.f_install_count)
+        this.charge.f_amount_words = this.smalltoBIG(this.charge.f_charge_money)
+      }
     }
   },
   events: {