Merge branch 'fsms_2.5' into debug

src/views/financialManagement/contractProgress.vue

@@ -588,7 +588,7 @@
       // 续约、补充 -- 老客户
       contractInfo.form.new_company = 0
     }
-    if(contractInfo.form.contract_type==3){
+    if(contractInfo.form.contract_type!=4){
       // 新签、续约
       contractInfo.form.relate_contract_main_code=''
     }
@@ -727,7 +727,7 @@
     // contractInfo.form.contract_type 1-新签 2-续约 4-补充
     contractInfo.form.contract_type=selectItem.contract_type_int==3?4:selectItem.contract_type_int
     contractInfo.form.relate_contract_code=contractInfo.form.has_payment?selectItem.relate_contract_code:''
-    contractInfo.form.relate_contract_main_code=contractInfo.form.contract_type==3?selectItem.relate_contract_main_code:''
+    contractInfo.form.relate_contract_main_code=!contractInfo.form.has_payment?selectItem.relate_contract_main_code:''
     contractInfo.contractTypeCheck = [contractInfo.form.has_payment,contractInfo.form.contract_type]
     if(sellerArray.value.findIndex(item => item.seller_id == selectItem.seller_id)==-1){
       // 为-1表示原本的销售已离职