Merge branch 'techPool_677'

src/api/financialMana.js

@@ -312,6 +312,8 @@ export function getPreRegistrationList(data) {
  * start_date - 约定开始日期
  * end_date - 约定结束日期
  * services - 套餐列表
+ * contract_type 1-新签 2-续约 4-补充
+ * has_payment 0-指自付 1-代付
  * } data 
  * @returns 
  */
@@ -350,6 +352,8 @@ export function preRegistrationAdd(data) {
  * invoice_id
  * contract_register_id 
  * detail_type(1编辑 2预开票/到款)
+ * contract_type 1-新签 2-续约 4-补充
+ * has_payment 0-指自付 1-代付
  * } data 
  * @returns 
  */

src/views/financialManagement/contractProgress.vue

@@ -75,7 +75,9 @@
   // ------------------ 预登记
   const supplementary_item={
     id:0,
-    invoice_type:0
+    invoice_type:0,
+    has_payment:undefined,
+    contract_type:undefined
   }
   // 预登记信息
   const supplementaryInfo=ref({})
@@ -193,6 +195,8 @@
   // 到款预登记Id
   supplementary_item.id = parseInt(route.query.supplementaryId) || 0
   supplementary_item.invoice_type = parseInt(route.query.invoice_type) || 0
+  supplementary_item.has_payment = route.query.has_payment?parseInt(route.query.has_payment) : ""
+  supplementary_item.contract_type = parseInt(route.query.contract_type) || ""
   // complianceId没有，认为是合规登记
   operationtype=contractRegisterId?(route.query.type || 'view'):'compliance'
 
@@ -297,7 +301,9 @@
   }else if(supplementary_item.id){
     // 拿到预登记详情信息
     preRegistrationDetail({contract_register_id:supplementary_item.id,
-    invoice_type:supplementary_item.invoice_type}).then(res=>{
+    invoice_type:supplementary_item.invoice_type,
+    has_payment:supplementary_item.has_payment,
+    contract_type:supplementary_item.contract_type}).then(res=>{
       if(!res.data) return
       supplementaryInfo.value={
         id:supplementary_item.id,

src/views/financialManagement/registrationPre.vue

@@ -288,7 +288,8 @@ const deleteRegistrationPreRow=(index,row)=>{
 const editRegistrationPre=(row)=>{
   dialog.hasServiceChange=false
   preRegistrationDetail({contract_register_id:row.contract_register_id,
-  invoice_type:row.invoice_type,detail_type:1}).then(res=>{
+  invoice_type:row.invoice_type,detail_type:1,has_payment:row.has_payment,
+  contract_type:row.contract_type}).then(res=>{
     if(!res.data) return
     dialog.registrationPreForm.contract_register_id = res.data.contract_register_id
     dialog.registrationPreForm.company_name = res.data.company_name
@@ -402,7 +403,10 @@ const submitForm=()=>{
           {company_name:params.company_name,
             start_date:params.start_date,
             end_date:params.end_date,
-            services:params.services})
+            services:params.services,
+            has_payment:params.has_payment,
+            contract_type:params.contract_type,
+          })
         if(!checkRes.data) return
         if(checkRes.data.exist!==0){
           let promptText = checkRes.data.type==0?
@@ -494,7 +498,7 @@ watch(()=>preDialog.validityDate,(newVal)=>{
 const preIorP=(row)=>{
   preRegistrationDetail({contract_register_id:row.contract_register_id,
   invoice_type:row.invoice_type==3?4:3,pre_register_id:row.pre_register_id,arrive_id:row.arrive_id,
-  invoice_id:row.invoice_id,detail_type:2}).then(res=>{
+  invoice_id:row.invoice_id,detail_type:2,has_payment:row.has_payment,contract_type:row.contract_type}).then(res=>{
     if(!res.data) return
     preDialog.preForm.contract_register_id = res.data.contract_register_id
     preDialog.preForm.company_name = res.data.company_name
@@ -642,7 +646,9 @@ const searchPlacementPre=()=>{
 const supplementaryContract=(row)=>{  
   router.push({path:'/financial/list/contractProgress',query:{
     supplementaryId:row.contract_register_id,
-    invoice_type:row.invoice_type
+    invoice_type:row.invoice_type,
+    has_payment:row.has_payment,
+    contract_type:row.contract_type
   }})
 }
 // 查看备注