Merge branch 'bug-fix'

src/views/financialManagement/contractProgress-component/Compliance.vue

@@ -319,7 +319,7 @@
     }
     // 获取套餐详情
     getServiceDetail({contract_id:selectItem.contract_id}).then(res=>{
-
+      if(!res.data) return 
       //非标代付合同
       if(res.data.RelationContractDetailList && res.data.RelationContractDetailList.length>0 && selectItem.contract_business_type_int==1){
         compliance.form.has_payment=1
@@ -329,8 +329,13 @@
         compliance.form.actual_pay_companies=res.data.RelationContractDetailList.map(it => it.CompanyName).join(',')
       }
       compliance.contractTypeCheck = [compliance.form.has_payment,compliance.form.contract_type]
-
-      let servivesTemp = res.data?res.data.Service||[]:[]
+      let servivesTemp
+      if(selectItem.contract_type_key==3){
+        // 代付合同 套餐取 关联合同的套餐
+        servivesTemp=res.data.RelationContractDetailList[0]?res.data.RelationContractDetailList[0].Service||[]:[]
+      }else{
+        servivesTemp=res.data.Service || []
+      }
       if(selectItem.product_id==1){
         // 清空权益套餐
         serviceData.serviceVarietyShowQy = false

src/views/financialManagement/registrationPre.vue

@@ -405,10 +405,10 @@ const preIorP=(row)=>{
     preDialog.preForm.invoice_type = row.invoice_type==3?4:3
     preDialog.preForm.service_product_id=row.service_product_id==0?'':row.service_product_id
     preDialog.preForm.pre_register_id = row.pre_register_id || 0
+    preDialog.preForm.currency_unit=row.currency_unit
     if(res.data.list.length>0){
       preDialog.preForm.contract_invoice_id = res.data.list[0].contract_invoice_id || 0
       preDialog.preForm.amount=res.data.list[0].amount
-      preDialog.preForm.currency_unit=res.data.list[0].currency_unit
       preDialog.preForm.seller_id=res.data.list[0].seller_id
       preDialog.preForm.invoice_type=res.data.list[0].invoice_type
       preDialog.preForm.register_date=res.data.list[0].register_date