小问题

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

@@ -72,7 +72,7 @@
       contract_amount:'',
       contract_type:'',
       has_payment:'',
-      has_invoice_payment:'',
+      has_invoice:'',
       actual_pay_companies:'',
       relate_contract_code:'',
       relate_contract_main_code:'',
@@ -181,7 +181,7 @@
     compliance.form.contract_amount='',
     compliance.form.contract_type='',
     compliance.form.has_payment='',
-    compliance.form.has_invoice_payment='',
+    compliance.form.has_invoice='',
     compliance.form.actual_pay_companies='',
     compliance.form.relate_contract_code='',
     compliance.form.relate_contract_main_code='',
@@ -227,7 +227,7 @@
     }
   }) 
 
-  watch(()=>compliance.form.has_invoice_payment,(value)=>{
+  watch(()=>compliance.form.has_invoice,(value)=>{
     console.log(value);
   }) 
   
@@ -237,8 +237,8 @@
   const contractTypeChange=(value)=>{
     if(!value) return 
     compliance.form.has_payment = value[0]
-    if(value[0]==0){
-      compliance.form.has_invoice_payment=true
+    if(compliance.form.has_payment==0){
+      compliance.form.has_invoice=true
     }
     compliance.form.contract_type = value[1]
     if(compliance.form.contract_type==1){
@@ -305,14 +305,14 @@
     if(selectItem.contract_business_type_int==2){
       // 代付合同
       compliance.form.has_payment=1
-      compliance.form.has_invoice_payment=true
+      compliance.form.has_invoice=true
       compliance.form.company_name=selectItem.actual_company_name
       compliance.form.relate_contract_code=selectItem.relate_contract_code
       compliance.form.actual_pay_companies=selectItem.company_name
     }else{
       //自付合同 也可能是非标代付
       compliance.form.has_payment=0
-      compliance.form.has_invoice_payment=true
+      compliance.form.has_invoice=true
       compliance.form.company_name=selectItem.company_name
       compliance.form.relate_contract_code=''
       compliance.form.actual_pay_companies=''
@@ -323,7 +323,7 @@
       //非标代付合同
       if(res.data.RelationContractDetailList && res.data.RelationContractDetailList.length>0 && selectItem.contract_business_type_int==1){
         compliance.form.has_payment=1
-        compliance.form.has_invoice_payment=false
+        compliance.form.has_invoice=false
         compliance.form.relate_contract_code = res.data.RelationContractDetailList.map(it => it.ContractCode).join(',')
         compliance.form.company_name=selectItem.company_name
         compliance.form.actual_pay_companies=res.data.RelationContractDetailList.map(it => it.CompanyName).join(',')
@@ -559,6 +559,12 @@
           compliance.form.has_payment=0
           compliance.form.actual_pay_companies=''
         }
+
+        if(compliance.form.has_invoice){
+          compliance.form.has_invoice=1
+        }else{
+          compliance.form.has_invoice=0
+        }
         // 检验合同名称或者合同有效期是否重复
         if(compliance.form.contract_register_id){
           // 编辑
@@ -720,8 +726,8 @@
     else if(serviceData.qYDiaType==2) serviceData.checkedPermissionQySmall=list
   }
 
-    // 有效期变更触发函数
-    const contractValidityDateChane=(value)=>{
+  // 有效期变更触发函数
+  const contractValidityDateChane=(value)=>{
     if(value){
       compliance.form.start_date=value[0]
       compliance.form.end_date=value[1]
@@ -775,7 +781,7 @@
     compliance.form.contract_amount=props.detailInfo.contract_amount
     compliance.form.contract_type=props.detailInfo.contract_type
     compliance.form.has_payment=props.detailInfo.has_payment
-    compliance.form.has_invoice_payment=props.detailInfo.has_invoice_payment
+    compliance.form.has_invoice=props.detailInfo.has_invoice
     compliance.form.actual_pay_companies=props.detailInfo.actual_pay_companies
     compliance.form.relate_contract_code=props.detailInfo.relate_contract_code
     compliance.form.relate_contract_main_code=props.detailInfo.relate_contract_main_code
@@ -877,15 +883,15 @@
             <el-form-item label="合同编号" prop="contract_code" id="selectContract">
               <el-input v-model="compliance.form.contract_code" placeholder="请输入合同编号"
               v-if="compliance.form.contract_source==0" >
-                <template #prefix v-if="compliance.contractTypeCheck.length>0">
-                  <span>{{ compliance.form.has_invoice_payment?'实际使用方':'代付方' }}</span>
+                <template #prefix v-if="compliance.form.has_payment==1">
+                  <span>{{ compliance.form.has_invoice?'代付方':'实际使用方' }}</span>
                 </template>
               </el-input>
               <scrollableSelect :loadMoreMethod="loadContractNoMore" v-model="compliance.form.contract_code" placeholder="请搜索合同编号" v-else
               :searchMethod="contractNoSearch" @change="selectContractNo" useLoading :isLoading="contractNoInfo.contractNoLoading" 
               >
-                <template #prefix v-if="compliance.contractTypeCheck.length>0">
-                  <span>{{ compliance.form.has_invoice_payment?'实际使用方':'代付方' }}</span>
+                <template #prefix v-if="compliance.form.has_payment==1">
+                  <span>{{ compliance.form.has_invoice?'代付方':'实际使用方' }}</span>
                 </template>
                 <el-option :label="item.contract_code" :value="item.contract_code" v-for="item in contractNoInfo.contractNoArray" :key="item.contract_id"></el-option>
               </scrollableSelect>
@@ -932,7 +938,7 @@
               <el-cascader :options="contractTypeArray" placeholder="请选择合同类型" @change="contractTypeChange"
               v-model="compliance.contractTypeCheck" :clearable="false" key="contractType">
               </el-cascader>
-              <el-checkbox v-model="compliance.form.has_invoice_payment" style="margin-left: 20px;"
+              <el-checkbox v-model="compliance.form.has_invoice" style="margin-left: 20px;"
               v-show="compliance.form.has_payment==1">（开票、到款）</el-checkbox>
             </el-form-item>
             <el-form-item label="关联主合同" prop="relate_contract_main_code" 
@@ -950,9 +956,9 @@
                 </el-tooltip>
               </div>
             </el-form-item>
-            <el-form-item :label="compliance.form.has_invoice_payment?'关联客户合同':'关联代付合同'" prop="relate_contract_code" v-if="compliance.form.has_payment">
+            <el-form-item :label="compliance.form.has_invoice?'关联客户合同':'关联代付合同'" prop="relate_contract_code" v-if="compliance.form.has_payment">
               <el-input v-model="compliance.form.relate_contract_code" 
-              :placeholder="compliance.form.has_invoice_payment?'请输入实际使用方合同编号':'请输入代付合同编号'" />
+              :placeholder="compliance.form.has_invoice?'请输入实际使用方合同编号':'请输入代付合同编号'" />
             </el-form-item>
             <el-form-item label="合同状态" prop="contract_status">
               <el-select v-model="compliance.form.contract_status" 

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

@@ -171,7 +171,9 @@
     if(!row.isEdit){
       // 编辑 -> 确定
       row.isEdit=true
-      row.service_product_id=''
+      if(row.service_product_id==0){
+        row.service_product_id=''
+      }
       return
     }
     const flag = canAddorEdit(props.type,row)

src/views/financialManagement/contractProgress.vue

@@ -274,7 +274,7 @@
         contract_amount:res.data.contract_amount,
         contract_type:res.data.contract_type,
         has_payment:res.data.has_payment,
-        has_invoice_payment:res.data.has_invoice_payment,
+        has_invoice:res.data.has_invoice==1,
         actual_pay_companies:res.data.actual_pay_companies,
         relate_contract_code:res.data.relate_contract_code,
         relate_contract_main_code:res.data.relate_contract_main_code,