hbchen 2 years ago
parent
commit
a6f0977c4b

+ 5 - 5
src/views/financialManagement/contractProgress-component/InvoiceAndPayment.vue

@@ -101,11 +101,6 @@
     IandP.moneyData.haveMoney = 
     Math.round((IandP.moneyData.haveMoneyFICC+IandP.moneyData.haveMoneyQY)*100)/100
   })
-  watch(()=>props.IPDetailInfo.contract_register_id,(value)=>{
-    if(value){
-      setIandPDetail()
-    }
-  }) 
 // ------------------------------------------方法
   // 切换套餐类型
   const productIdChange=(value,row)=>{
@@ -382,6 +377,11 @@
     }
     intervalDataRequest(()=> props.currencyList.length>0 ,intervalCallback,1)
   }
+  watch(()=>props.IPDetailInfo.contract_register_id,(value)=>{
+    if(value){
+      setIandPDetail()
+    }
+  },{ immediate: true }) 
 
   defineExpose({hasRegisteFinish:()=>IandP.moneyData.waitMoney==0,iandPSubmit})
 

+ 2 - 2
src/views/financialManagement/contractProgress.vue

@@ -354,7 +354,7 @@
             </div>
           </div>
           <!-- 开票登记 -->
-          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_payment!=1" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice" 
           :style="{order:operationtype=='invoice'?2:0}"
           style="margin-top:20px ;" v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']">
             <div class="info-box-head" @click="unfoldOrFlod(1)"
@@ -370,7 +370,7 @@
             </div>
           </div>
           <!-- 到款登记 -->
-          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_payment!=1" 
+          <div class="info-box" v-if="operationtype!='compliance' && detailInfo.has_invoice" 
           v-permission="['financial:list:invoice','financial:list:placement','financial:list:viewIandP','or']"
           style="margin-top:20px;order: 1;">
             <div class="info-box-head" @click="unfoldOrFlod(2)"