接口对接，部分

src/api/financialMana.js

@@ -59,6 +59,23 @@ export function registerListExport(data) {
       responseType:'blob'
   })
 }
+
+ /**
+  * 合同名称或者合同有效期查询校验
+  * @param {
+ * company_name - 客户名称 - 必填
+ * start_date - 开始日期：格式2022-11-22 - 必填
+ * end_date - 开始日期：格式2022-11-22 - 必填
+ * } data 
+ * @returns 
+ */
+export function contractRegisterCheck(data) {
+ return request({
+     url:'/contract/register/check_contract_code',
+     method:'get',
+     params:data
+ })
+}
 // 合规登记 - 新增
  /**
   * 

src/views/financialManagement/components/permissionQyDia.vue

@@ -48,9 +48,9 @@
             it.checked=false
           })
         })
-        permissionDia.permissionChecked=[...props.hasCheckedPermission]
-        U:for (let i = 0,len=permissionDia.permissionChecked.length; i < len; i++) {
-          const permission_id = +permissionDia.permissionChecked[i];
+        // permissionDia.permissionChecked=[...props.hasCheckedPermission]
+        U:for (let i = 0,len=props.hasCheckedPermission.length; i < len; i++) {
+          const permission_id = +props.hasCheckedPermission[i];
           for (let j = 0,jLen=props.permissionData.length; j < jLen; j++) {
             const element = props.permissionData[j];
             let index=element.children.findIndex(it => it.service_template_id==permission_id)
@@ -83,6 +83,7 @@
   }
  
   const submit=()=>{
+    permissionDia.permissionChecked=[]
     if(props.serviceType==2){
       props.permissionData.map(item =>{
         permissionDia.permissionChecked=[...permissionDia.permissionChecked,...item.check_list]

src/views/financialManagement/contractProgress.vue

@@ -6,7 +6,8 @@
   import {useStore} from 'vuex'
   import {ElMessage} from 'element-plus'
   import {getSellerList,getContractSearchList,getServiceDetail} from '@/api/crm'
-  import {getServiceList,registerAdd,registerDetail,registerEdit,registerInvoice,registerPayment} from '@/api/financialMana'
+  import {getServiceList,registerAdd,registerDetail,registerEdit,registerInvoice,
+    registerPayment,contractRegisterCheck} from '@/api/financialMana'
   import {getCurrencyList} from '@/api/common'
   import scrollableSelect from '@/components/scrollable-select/index.vue'
 
@@ -52,6 +53,7 @@
       currency_unit:'CNY',
       new_company:0,
       seller_ids:'',
+      seller_id:0,
       // seller_name:'',
       contract_status:'',
       start_date:'',
@@ -67,7 +69,6 @@
       service_amount:[],
       services:[],
       services_amount:'',
-      servicesQy:[],
       services_Qy_amount:'',
       service_remark:'',
       remark:""
@@ -119,8 +120,8 @@
     contractNoTotal:0,
     contractNoLoading:false,
     // --------------套餐信息
-    showServiceFicc:true,
-    showServiceQy:true,
+    showServiceFicc:false,
+    showServiceQy:false,
     // 选中的套餐 - ficc
     checkedService:[],
     // 选中的套餐 - 权益
@@ -171,13 +172,17 @@
         isFold:true,
         domHeight:'0'
       }
-    ]
+    ],
+    // 开票时 FICC的销售列表
+    sellerInvoiceListF:[],
+    // 开票时 权益的销售列表
+    sellerInvoiceListQ:[]
   })
   // ---------------开票信息
   const invoiceForm=reactive({
     invoiceData:[
       {
-        service_type:'',
+        service_product_id:'',
         origin_amount:'',
         amount:'',
         invoice_date:'',
@@ -194,7 +199,7 @@
   const placementForm=reactive({
     placementData:[
       {
-        service_type:'',
+        service_product_id:'',
         origin_amount:'',
         amount:'',
         invoice_date:'',
@@ -229,7 +234,6 @@
   const cascaderSelectSeller=ref([])
 
   const sellerChange=(value)=>{
-    console.log(value);
     let ficcSeller,qySeller;
     if(value?.length>0){
       for (let i = 0; i < value.length; i++) {
@@ -272,9 +276,8 @@
 
   const elMessageDom=ref(null)
 
-  const selectVisible=(value,service_type,that,selectRef)=>{
-    console.log(value);
-    if(value && !service_type){
+  const selectVisible=(value,that,selectRef)=>{
+    if(value){
       if(!elMessageDom.value){
         elMessageDom.value=ElMessage.warning('请选择套餐类型')
         setTimeout(()=>{
@@ -376,6 +379,8 @@
     getSellerList().then(res=>{
       allSellerArray=res.data || {}
       sellerArray.value = allSellerArray.all_list || []
+      contractInfo.sellerInvoiceListF = allSellerArray.ficc_list || []
+      contractInfo.sellerInvoiceListQ = allSellerArray.rai_list || []
     })
   }
   // 获取服务列表
@@ -413,6 +418,7 @@
       currency_unit:'CNY',
       new_company:0,
       seller_ids:'',
+      seller_id:'',
       // seller_name:'',
       contract_status:'',
       start_date:'',
@@ -567,8 +573,8 @@
     contractInfo.form.end_date=selectItem.end_date
     contractInfo.contractValidityDate=[selectItem.start_date,selectItem.end_date]
     contractInfo.form.contract_amount=selectItem.price
-    // contractInfo.form.seller_name=selectItem.seller_name
-    contractInfo.form.seller_ids=selectItem.seller_id
+    contractInfo.form.seller_id=selectItem.seller_id
+    contractInfo.form.seller_ids=selectItem.seller_id+''
     contractInfo.form.contract_type=selectItem.contract_type_key
     contractInfo.form.relate_contract_code=selectItem.relate_contract_code
     contractInfo.form.actual_company_name=selectItem.actual_company_name
@@ -584,7 +590,7 @@
   }
   // 销售选中
   const selectSeller=(value)=>{
-    // contractInfo.form.seller_name=sellerArray.value.find(item => item.admin_id==value).seller_name
+    contractInfo.form.seller_ids=value+''
   }
 
   const submit=()=>{
@@ -600,17 +606,17 @@
   // 添加行
   const addTableRow=(type)=>{
     if(type=='invoice'){
-      invoiceForm.invoiceData.push({service_type:'',origin_amount:'',amount:'',invoice_date:'',remark:'',
+      invoiceForm.invoiceData.push({service_product_id:'',origin_amount:'',amount:'',invoice_date:'',remark:'',
       seller_id:'',seller_name:'',amountDomType:'text',remarkDomType:'text'})
     }else{
-      placementForm.placementData.push({service_type:'',origin_amount:'',amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
+      placementForm.placementData.push({service_product_id:'',origin_amount:'',amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
     }
   }
 
   // 表格添加行
   const addRow=(type,row,index)=>{
     console.log(type,row,index);
-    if(!(row.amount && row.invoice_date && row.service_type)){
+    if(!(row.amount && row.invoice_date && row.service_product_id)){
       ElMessage.error('请填写完整信息')
       return
     }
@@ -620,10 +626,10 @@
         return
       }
       invoiceForm.invoiceData.splice((index+1),0,
-      {service_type:'',origin_amount:'',amount:'',invoice_date:'',remark:'',seller_id:'',seller_name:'',amountDomType:'text',remarkDomType:'text'})
+      {service_product_id:'',origin_amount:'',amount:'',invoice_date:'',remark:'',seller_id:'',seller_name:'',amountDomType:'text',remarkDomType:'text'})
     }else{
       placementForm.placementData.splice((index+1),0,
-      {service_type:'',origin_amount:'',amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
+      {service_product_id:'',origin_amount:'',amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
     }
   }
   // 表格删除行
@@ -645,7 +651,7 @@
       tempArr=placementForm.placementData
       word='到款'
     }
-    if(tempArr[index].origin_amount=='' && tempArr[index].amount=='' && tempArr[index].service_type==''
+    if(tempArr[index].origin_amount=='' && tempArr[index].amount=='' && tempArr[index].service_product_id==''
     && tempArr[index].invoice_date=='' && !haveSalesman){
       // 没有内容 直接删除
       tempArr.splice(index,1)
@@ -729,10 +735,11 @@
     }
   }
   // 合规登记-提交
-  const complianceSubmit=()=>{
+  const 
+  complianceSubmit=()=>{
     // console.log(contractInfo.checkedService);
     contractInfoForm.value.validate(valid=>{
-      // if(valid){
+      if(valid){
         contractInfo.form.services=[]
         // FICC
         if(contractInfo.showServiceFicc){
@@ -760,6 +767,16 @@
               contractInfo.form.services.push({service_template_id:serviceItem.service_template_id,title:serviceItem.title})
             }
           })
+          // 套餐金额
+          
+          if(!contractInfo.form.services_amount){
+            ElMessage.error('请填写FICC套餐金额')
+            return 
+          }
+          if(!parseFloat(contractInfo.form.services_amount)){
+            ElMessage.error('FICC套餐金额格式错误')
+            return 
+          }
         }
         
         // 权益
@@ -781,50 +798,105 @@
             ElMessage.warning('请保存行业套餐品种')
             return 
           }
-          console.log(contractInfo.checkedServiceQy,contractInfo.serviceArrayQy);
+          console.log(contractInfo.checkedServiceQy);
           contractInfo.checkedServiceQy.map(serviceId=>{
-          let serviceItem = contractInfo.serviceArrayQy.find(it=> it.service_template_id==serviceId)
-          contractInfo.form.services.push({service_template_id:serviceItem.service_template_id,title:serviceItem.title})
+            console.log(contractInfo.serviceArrayQy);
+            let serviceItem = contractInfo.serviceArrayQy.find(it=> it.service_template_id==serviceId)
+            if(serviceItem)
+            contractInfo.form.services.push({service_template_id:serviceItem.service_template_id,title:serviceItem.title})
             // 权益大套餐
             if(serviceId==10){
               let subServiceItem = serviceItem.children.find(it=> it.service_template_id==contractInfo.checkedPermissionQyBig[0])
               contractInfo.form.services.push({service_template_id:subServiceItem.service_template_id,title:subServiceItem.title})
             }else if(serviceId==13){
+              // 行业套餐
+              const hasSubList=[0,0,0,0,0]
               contractInfo.checkedPermissionQySmall.map(serviceTemplateId=>{
-                console.log(serviceTemplateId);
-                
-                let subServiceItem = serviceItem.children.find(it=> it.service_template_id==serviceTemplateId)
-                contractInfo.form.services.push(subServiceItem)
+                for (let i = 0; i < serviceItem.children.length; i++) {
+                  const element = serviceItem.children[i];
+                  let subItem=element.children.find(it =>it.service_template_id == serviceTemplateId)
+                  if(subItem){
+                    contractInfo.form.services.push({service_template_id:subItem.service_template_id,title:subItem.title})
+                    hasSubList[i]=element.service_template_id
+                    break;
+                  }
+                }
+              })
+              hasSubList.map(serviceTemplateId =>{
+                if(serviceTemplateId){
+                  let tempItem = serviceItem.children.find(it => it.service_template_id==serviceTemplateId)
+                  contractInfo.form.services.push({service_template_id:tempItem.service_template_id,title:tempItem.title})
+                }
               })
+              
             }
           })
-          console.log(contractInfo.form.services);
+          // console.log(contractInfo.form.services);
+          // 套餐金额
+          if(!contractInfo.form.services_Qy_amount){
+            ElMessage.error('请填写权益套餐金额')
+            return 
+          }
+          if(!parseFloat(contractInfo.form.services_Qy_amount)){
+            ElMessage.error('权益套餐金额格式错误')
+            return 
+          }
         }
-
         
-        contractInfo.form.contract_amount = parseFloat(contractInfo.form.contract_amount)
+        contractInfo.form.contract_amount = +parseFloat(contractInfo.form.contract_amount).toFixed(2)
+        contractInfo.form.services_amount = +parseFloat(contractInfo.form.services_amount).toFixed(2) || 0
+        contractInfo.form.services_Qy_amount = +parseFloat(contractInfo.form.services_Qy_amount).toFixed(2) || 0
+        let servicesAll = Math.round((contractInfo.form.services_Qy_amount+contractInfo.form.services_amount)*100)/100
+        if(servicesAll!=contractInfo.form.contract_amount){
+          ElMessage.error('套餐总金额不等于合同金额')
+          return 
+        }
+        contractInfo.form.service_amount = [{product_id:1,service_amount:contractInfo.form.services_amount},
+        {product_id:2,service_amount:contractInfo.form.services_Qy_amount}]
         if(!contractInfo.form.has_payment) contractInfo.form.has_payment=0
         console.log(contractInfo.form);
-        // if(contractInfo.form.contract_register_id){
-        //   // 编辑
-        //   registerEdit(contractInfo.form).then(res=>{
-        //     let messageHint=ElMessage.success('合规登记编辑成功')
-        //     setTimeout(()=>{
-        //       messageHint.close()
-        //       router.replace('/financial/list')
-        //     },1000)
-        //   })
-        // }else{
-        //   // 新增
-        //   registerAdd(contractInfo.form).then(res=>{
-        //     let messageHint=ElMessage.success('合规登记成功')
-        //     setTimeout(()=>{
-        //       messageHint.close()
-        //       router.replace('/financial/list')
-        //     },1000)
-        //   })
-        // }
-      // }
+        // 检验合同名称或者合同有效期是否重复
+        if(contractInfo.form.contract_register_id){
+          // 编辑
+          registerEdit(contractInfo.form).then(res=>{
+            let messageHint=ElMessage.success('合规登记编辑成功')
+            setTimeout(()=>{
+              messageHint.close()
+              router.replace('/financial/list')
+            },1000)
+          })
+        }else{
+          // 新增
+          contractRegisterCheck({company_name:contractInfo.form.company_name,
+            start_date:contractInfo.form.start_date,end_date:contractInfo.form.end_date}).then(res=>{
+            if(res.data?.exist){
+              // 存在给提示
+              ElMessageBox.confirm('已登记过相同的合同，是否继续操作？',
+              '操作提示',{
+                type:'warning',
+                confirmButtonText: '确定',
+                cancelButtonText: '取消'
+              }).then(resp=>{
+                registerAdd(contractInfo.form).then(res=>{
+                  let messageHint=ElMessage.success('合规登记成功')
+                  setTimeout(()=>{
+                    messageHint.close()
+                    router.replace('/financial/list')
+                  },1000)
+                })
+              }).catch(()=>{})
+            }else{
+              registerAdd(contractInfo.form).then(res=>{
+                let messageHint=ElMessage.success('合规登记成功')
+                setTimeout(()=>{
+                  messageHint.close()
+                  router.replace('/financial/list')
+                },1000)
+              })
+            }
+          })
+        }
+      }
     })
   }
 
@@ -880,13 +952,8 @@
   const registrationCancel=()=>{
     router.back()
   }
-  const canServiceShow=(serviceTemplateId,service_type ='Ficc')=>{
-    if(service_type=='Ficc'){
-      return contractInfo.form.services.find(item => item.service_template_id == serviceTemplateId) && contractInfo.operationtype!='compliance'
-    }else{
-      return contractInfo.form.servicesQy.find(item => item.service_template_id == serviceTemplateId) && contractInfo.operationtype!='compliance'
-    }
-    
+  const canServiceShow=(serviceTemplateId)=>{
+    return contractInfo.form.services.find(item => item.service_template_id == serviceTemplateId) && contractInfo.operationtype!='compliance'
   }
   // 查看套餐 - ficc
   const viewService=(serviceTemplateId)=>{
@@ -904,7 +971,7 @@
 
   // 查看套餐 - 权益
   const viewServiceQy=(serviceTemplateId,diaType)=>{
-    if(!canServiceShow(serviceTemplateId,'Qy')) return 
+    if(!canServiceShow(serviceTemplateId)) return 
     contractInfo.varietyDiaShowQy=true
     contractInfo.qYDiaType = diaType
     contractInfo.varietyDiaType='view'
@@ -1006,7 +1073,7 @@
         currency_unit:res.data.currency_unit,
         new_company:res.data.new_company,
         seller_ids:res.data.seller_ids,
-        // seller_name:res.data.seller_name,
+        seller_id:res.data.seller_id,
         contract_status:res.data.contract_status,
         start_date:res.data.start_date,
         end_date:res.data.end_date,
@@ -1021,20 +1088,20 @@
         remark:res.data.remark,
         contract_source:res.data.contract_source,
       }
-      // contractServiceType.value=res.data.ifFicc
-      if(res.data.ifFicc){
-        sellerArray.value=[{
-          admin_id: 13,
-          admin_name: "时代1",
-          real_name: "时代1"
-        }]
+      // 销售
+      if(res.data.contract_source == 0){
+        cascaderSelectSeller.value = res.data.seller_ids.split(',').map(item => +item)
+        contractInfo.showServiceFicc = contractInfo.showServiceQy=true
       }else{
-        sellerArray.value=[{
-          admin_id: 14,
-          admin_name: "时代2",
-          real_name: "时代2"
-        }]
+        if(res.data.rai_seller_name){
+          sellerArray.value=allSellerArray.rai_list
+          contractInfo.showServiceQy=true
+        }else{
+          sellerArray.value=allSellerArray.ficc_list
+          contractInfo.showServiceFicc=true
+        }
       }
+
       rmbRate.value=res.data.rmb_rate
       console.log(rmbRate.value,res.data.rmb_rate);
       if(haveGetCurrencyList.value){
@@ -1049,30 +1116,53 @@
           }
         },10)
       }
-
+      // 套餐金额
+      contractInfo.form.services_amount = res.data.service_amount_list.find(it => it.product_id==1)?
+      res.data.service_amount_list.find(it => it.product_id==1).service_amount:0
+      contractInfo.form.services_Qy_amount = res.data.service_amount_list.find(it => it.product_id==2)?
+      res.data.service_amount_list.find(it => it.product_id==1).service_amount:0
       res.data.service_list.map(item =>{
-          // 小套餐
-          if(item.service_template_id==2){
-            contractInfo.form.services.push({
-              service_template_id:item.service_template_id,
-              value:item.value,
-              chart_permission_ids:item.chart_permission_ids,
-              chart_permission_id:item.chart_permission_id,
-              title:item.title
-            })
-            contractInfo.checkedPermission=item.chart_permission_ids.split(',')
-          }else{
-            contractInfo.form.services.push(item)
-          }
+        if(item.service_template_id==2){
+          // ficc小套餐
+          contractInfo.form.services.push({
+            service_template_id:item.service_template_id,
+            value:item.value,
+            chart_permission_ids:item.chart_permission_ids,
+            chart_permission_id:item.chart_permission_id,
+            title:item.title
+          })
+          contractInfo.checkedPermission=item.chart_permission_ids.split(',')
+        }else if(item.service_template_id==11 || item.service_template_id==12){
+          // 权益大套餐
+          contractInfo.checkedPermissionQyBig = [item.service_template_id]
+          contractInfo.form.services.push(item)
+        }else if([19,20,21,22,23,24,25,26,27].includes(item.service_template_id)){
+          // 行业套餐
+          contractInfo.checkedPermissionQySmall.push(item.service_template_id)
+          contractInfo.form.services.push(item)
+        }else{
+          contractInfo.form.services.push(item)
+        }
       })
       // console.log(contractInfo.form.services);
-      contractInfo.contractValidityDate=[res.data.start_date,res.data.end_date]
       contractInfo.checkedService=res.data.service_list.map(item => {
-        let serviceId=item.service_template_id
-        // 大套餐或者小套餐
-        if(serviceId==1 || serviceId==2) serciveChange(true,serviceId,'ficc',false)
-        return serviceId
-      })
+        if(item.product_id==1){
+          let serviceId=item.service_template_id
+          // 大套餐或者小套餐
+          if(serviceId==1 || serviceId==2) serciveChange(true,serviceId,'ficc',false)
+          return serviceId
+        }
+      }).filter(Boolean)
+      contractInfo.checkedServiceQy=res.data.service_list.map(item => {
+        if(item.product_id==2){
+          let serviceId=item.service_template_id
+          // 权益大套餐或者行业套餐
+          if(serviceId==10 || serviceId==13) serciveChange(true,serviceId==10?1:2,'qy',false)
+          return serviceId
+        }
+      }).filter(Boolean)
+      contractInfo.contractValidityDate=[res.data.start_date,res.data.end_date]
+
       // 开票
       contractInfo.moneyData.allInvoiceMoney = contractInfo.moneyData.allPlacementMoney=res.data.contract_amount
       contractInfo.moneyData.haveInvoiceMoney=res.data.invoiced_amount
@@ -1082,7 +1172,7 @@
         res.data.invoice_list.map(item=>{
           invoiceForm.invoiceData.push({
             invoice_id:item.contract_invoice_id,
-            service_type:item.service_type,
+            service_product_id:item.service_product_id,
             origin_amount:item.origin_amount,
             amount:item.amount,
             invoice_date:item.invoice_time,
@@ -1094,7 +1184,7 @@
         // 添加一行空的
         if(contractInfo.operationtype=='invoice'){
           invoiceForm.invoiceData.push({
-            service_type:'',              
+            service_product_id:'',              
             origin_amount:'',
             amount:'',
             invoice_date:'',
@@ -1112,7 +1202,7 @@
         res.data.payment_list.map(item=>{
           placementForm.placementData.push({
             invoice_id:item.contract_invoice_id,
-            service_type:item.service_type,
+            service_product_id:item.service_product_id,
             origin_amount:item.origin_amount,
             amount:item.amount,
             is_pre_pay:item.is_pre_pay,
@@ -1123,7 +1213,7 @@
         // 添加一行空的
         if(contractInfo.operationtype=='placement'){
           placementForm.placementData.push({
-            service_type:'',
+            service_product_id:'',
             origin_amount:'',
             amount:'',
             invoice_date:'',
@@ -1147,7 +1237,7 @@
     contractInfo.form.start_date = route.query.start_date
     contractInfo.form.end_date = route.query.end_date
     contractInfo.form.seller_ids = route.query.seller_id
-    // contractInfo.form.seller_name = route.query.seller_name
+    contractInfo.form.seller_id = +route.query.seller_id
     contractInfo.contractValidityDate = [contractInfo.form.start_date,contractInfo.form.end_date]
     cascaderSelectSeller.value = [parseInt(route.query.seller_id)]
   }
@@ -1198,7 +1288,7 @@
                         size="large" @change="isNewChange" :disabled="contractInfo.form.contract_type!='' && contractInfo.form.contract_type!=3 "  />
                       </el-form-item>
                       <el-form-item label="销售" prop="seller_ids">
-                        <el-select v-if="contractInfo.form.contract_source==1" v-model="contractInfo.form.seller_ids" placeholder="请选择销售" 
+                        <el-select v-if="contractInfo.form.contract_source==1" v-model="contractInfo.form.seller_id" placeholder="请选择销售" 
                         filterable @change="selectSeller" :disabled="contractInfo.operationtype!='compliance'">
                           <el-option :label="item.seller_name" :value="item.seller_id" v-for="item in sellerArray" :key="item.admin_id"></el-option>
                         </el-select>
@@ -1317,7 +1407,7 @@
                       <div class="service-small" v-for="(item,index) in [1,2]" :key="item">
                         <el-checkbox :label="contractInfo.serviceArrayQy[index]?.service_template_id" style="margin-right: 0;"
                         @change="(e) => serciveChange(e,item,'qy')" 
-                          :class="{'viewService':canServiceShow(contractInfo.serviceArrayQy[index]?.service_template_id,'Qy')}"
+                          :class="{'viewService':canServiceShow(contractInfo.serviceArrayQy[index]?.service_template_id)}"
                           :disabled="contractInfo.serviceTypeQy!=0 && contractInfo.serviceTypeQy != item" 
                           @click="viewServiceQy(contractInfo.serviceArrayQy[index]?.service_template_id,item)">
                           {{contractInfo.serviceArrayQy[index]?.title}}
@@ -1435,20 +1525,20 @@
                             {{$index+1}}
                           </template>
                         </el-table-column>
-                        <el-table-column label="套餐类型" width="160" align="center" prop="service_type" v-if="contractServiceType==3">
+                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="contractServiceType==3">
                           <template #header>
                             <span style="color: var(--dangerColor);">*</span>套餐类型
                           </template>
                           <template #default="{row,$index}">
-                            <el-form-item :prop="`invoiceData.${$index}.service_type`" :show-message="false" v-if="!row.invoice_id"
+                            <el-form-item :prop="`invoiceData.${$index}.service_product_id`" :show-message="false" v-if="!row.invoice_id"
                             :rules="{required:true,message:()=>{ ElMessage.error('套餐类型不能为空')},trigger:'change'}">
-                              <el-select v-model="row.service_type" style="width: 124px;"
+                              <el-select v-model="row.service_product_id" style="width: 124px;"
                               placeholder="请选择套餐" filterable>
                                 <el-option label="FICC套餐" :value="1"></el-option>
                                 <el-option label="权益套餐" :value="2"></el-option>
                               </el-select>
                             </el-form-item>
-                            <span v-else>{{ row.service_type || '--' }}</span>
+                            <span v-else>{{ row.service_product_id || '--' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="开票金额" width="160" show-overflow-tooltip  align="center" prop="origin_amount">
@@ -1496,12 +1586,22 @@
                           <template #default="{row,$index}">
                             <el-form-item :prop="`invoiceData.${$index}.seller_id`" :show-message="false" v-if="!row.invoice_id"
                             :rules="{required:true,message:()=>{ ElMessage.error('销售不能为空')},trigger:'change'}">
-                              <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_type${$index}`'
-                              placeholder="请选择销售" filterable @visible-change="(value)=>selectVisible(value,row.service_type,this,`invoiceData-service_type${$index}`)">
-                                <el-option :label="item.real_name" :value="item.admin_id" 
-                                v-for="item in contractInfo.sellerList" :key="item.admin_id">
+                              <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_product_id${$index}`'
+                              placeholder="请选择销售" filterable v-if="row.service_product_id==1">
+                                <el-option :label="item.seller_name" :value="item.seller_id" 
+                                v-for="item in contractInfo.sellerInvoiceListF" :key="item.seller_id">
                                 </el-option>
                               </el-select>
+                              <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_product_id${$index}`'
+                              placeholder="请选择销售" filterable v-else-if="row.service_product_id==2">
+                                <el-option :label="item.seller_name" :value="item.seller_id" 
+                                v-for="item in contractInfo.sellerInvoiceListQ" :key="item.seller_id">
+                                </el-option>
+                              </el-select>
+                              <el-select v-model="row.seller_id" style="width: 124px;" :ref='`invoiceData-service_product_id${$index}`'
+                              placeholder="请选择销售" v-else
+                                @visible-change="(value)=>selectVisible(value,this,`invoiceData-service_product_id${$index}`)">
+                              </el-select>
                             </el-form-item>
                             <span v-else>{{ row.seller_name || '--' }}</span>
                           </template>
@@ -1619,20 +1719,20 @@
                             {{$index+1}}
                           </template>
                         </el-table-column>
-                        <el-table-column label="套餐类型" width="160" align="center" prop="service_type" v-if="contractServiceType==3">
+                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="contractServiceType==3">
                           <template #header>
                             <span style="color: var(--dangerColor);">*</span>套餐类型
                           </template>
                           <template #default="{row,$index}">
-                            <el-form-item :prop="`placementData.${$index}.service_type`" :show-message="false" v-if="!row.invoice_id"
+                            <el-form-item :prop="`placementData.${$index}.service_product_id`" :show-message="false" v-if="!row.invoice_id"
                             :rules="{required:true,message:()=>{ ElMessage.error('套餐类型不能为空')},trigger:'change'}">
-                              <el-select v-model="row.service_type" style="width: 124px;"
+                              <el-select v-model="row.service_product_id" style="width: 124px;"
                               placeholder="请选择套餐" filterable>
                                 <el-option label="FICC套餐" :value="1"></el-option>
                                 <el-option label="权益套餐" :value="2"></el-option>
                               </el-select>
                             </el-form-item>
-                            <span v-else>{{ row.service_type || '--' }}</span>
+                            <span v-else>{{ row.service_product_id || '--' }}</span>
                           </template>
                         </el-table-column>
                         <el-table-column label="到款金额" width="160" align="center" prop="origin_amount">

src/views/financialManagement/financialList.vue

@@ -246,7 +246,7 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
                 @click="router.push('/financial/placementPre')" class="element-common-button">到款预登记</el-button> -->
               </div>
               <div class="financial-top-option-zone-right">
-                <a href="https://hzstatic.hzinsights.com/static/fms/excel/财务列表-导入模板.xlsx" download>
+                <a href="https://hzchart.oss-cn-shanghai.aliyuncs.com/static/fms/excel/财务列表-导入模版（新）.xlsx" download>
                   <el-button class="element-common-button" size="large"
                   v-permission="'financial:list:complianceImport'">下载导入模版</el-button>
                 </a>
@@ -270,7 +270,11 @@ const statusArray=[{id:1,label:"进行中"},{id:2,label:"已完成"}]
               prop="contract_code" fixed="left" min-width="150"></el-table-column>
               <el-table-column label="客户名称" align="center" prop="company_name"
               show-overflow-tooltip min-width="120"></el-table-column>
-              <el-table-column label="销售" align="center" prop="seller_name" width="120"></el-table-column>
+              <el-table-column label="销售" align="center" prop="seller_name" width="120">
+                <template #default="{row}">
+                  {{ row.seller_name+(row.seller_name&&row.rai_seller_name?`、`:'')+row.rai_seller_name }}
+                </template>
+              </el-table-column>
               <el-table-column label="合同类型" align="center" width="90" prop="contract_type"
               v-if="financial.tabelColumnShowArr.includes('contract_type')">
                 <template #default="{row}">