apply-clients 5.0.35-30 → 5.0.35-31

package/package.json

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

package/src/components/product/Common/ApplyValidateBill.vue

@@ -38,17 +38,23 @@
       }
     },
     props: ['data','show'],
-    ready () {
-
+   async ready () {
+      /*debugger
       console.log(this.data.f_bill_type)
       if (this.data.f_bill_type) {
-        getCurrentBill(this)
+        await  getCurrentBill(this)
+        console.log('打印参数',this.data.f_process_id)
 
-      }
+      }*/
     },
     watch : {
-      'show' (val) {
-          getCurrentBill(this)
+      data:{
+        deep:true,
+        immediate:true,
+        async handler(){
+          console.log('1111155555')
+          await getCurrentBill(this)
+        }
       }
     }
   }

package/src/components/product/Function/functions/InstallFee.vue

@@ -420,7 +420,7 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_payment_method: '',
@@ -430,7 +430,7 @@
         },
         charges: [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}],
         // 启用发票管理需要对票号进行验证
-        hasValidateBill: true,
+        hasValidateBill: false,
         validateOk: false,
         userinfoRow: {
           rows: []
@@ -581,7 +581,7 @@
           f_charge_collectors: this.$login.f.name,
           f_charge_date: '',
           f_charge_remarks: '',
-          f_filiale: this.$login.f.f_fengongsi,
+          f_filiale: '',
           f_process_id: '',
           f_apply_num: '',
           f_charging_status: '有效',
@@ -729,7 +729,7 @@
           this.addItem.f_charge_collectors = this.$login.f.name
           this.addItem.f_charge_date = this.model.f_charge_date
           this.addItem.f_charge_remarks = this.model.f_charge_remarks
-          this.addItem.f_filiale = this.$login.f.f_fengongsi
+          this.addItem.f_filiale = this.model.f_payment_account =='安泰' ? '欣泰集团.安泰天然气' : '欣泰天然气'
           this.addItem.f_process_id = this.infee.f_process_id
           this.addItem.f_apply_num = this.infee.f_apply_num
           this.model.rows.push(this.addItem)
@@ -953,7 +953,7 @@
 
       // 获取数据
       async load() {
-
+        console.log('load被重新调用111')
         this.refresh = !this.refresh
         console.log("刷新validate，重新加载" + this.refresh)
         // this.ifsearch = !this.ifsearch
@@ -1006,6 +1006,8 @@
         this.oldInfo.f_address = this.model.f_address;
         this.model.f_isone = ['否'];
         this.charges = [{f_project_item: '合同总额', f_amount: 0, f_price: 0, f_money: 0}];
+        this.hasValidateBill=true
+        console.log('load被重新调用222')
       }
     },
     computed: {