解决冲突

src/api/crm.js

@@ -28,6 +28,19 @@ export function getSellerList() {
       method:'get'
   })
 }
+// 获取销售列表 - 无分组
+ /**
+  * @param {
+ * } data 
+ * @returns 
+ */
+export function getSellerListNoG() {
+ return request({
+     url:'/crm/company_seller/all_list',
+     method:'get'
+ })
+}
+
 // 根据合同编号搜索合同列表
  /**
   * 

src/views/financialManagement/contractProgress.vue

@@ -5,7 +5,7 @@
   import {useRouter,useRoute} from 'vue-router'
   import {useStore} from 'vuex'
   import {ElMessage} from 'element-plus'
-  import {getSellerList,getContractSearchList,getServiceDetail} from '@/api/crm'
+  import {getSellerList,getContractSearchList,getServiceDetail,getSellerListNoG} from '@/api/crm'
   import {getServiceList,registerAdd,registerDetail,registerEdit,registerInvoice,
     registerPayment,contractRegisterCheck,preRegistrationDetail} from '@/api/financialMana'
   import {getCurrencyList} from '@/api/common'
@@ -48,7 +48,7 @@
     form:{
       product_ids:'1,2',
       supplement:0, // 是否是补录合同
-      contract_register_id:'',
+      contract_register_id:0,
       crm_contract_id:0,
       contract_source:0,
       contract_code:'',
@@ -142,8 +142,8 @@
     contractNoTotal:0,
     contractNoLoading:false,
     // --------------套餐信息
-    showServiceFicc:false,
-    showServiceQy:false,
+    // showServiceFicc:false,
+    // showServiceQy:false,
     // 选中的套餐 - ficc
     checkedService:[],
     // 选中的套餐 - 权益
@@ -200,7 +200,9 @@
     // 开票时 权益的销售列表
     sellerInvoiceListQ:[]
   })
-  // 销售列表类型1-单Ficc 2-单权益 3-ficc和权益
+  // 开票到款类型 1-单Ficc 2-单权益 3-ficc和权益
+  const InvoiceAndPaymentType=ref(3)
+  // 合规时销售类型 1-单Ficc 2-单权益 3-ficc和权益
   const sellerListType=ref(3)
   // ---------------开票信息
   const invoiceForm=reactive({
@@ -248,7 +250,12 @@
   const rmbRate=ref(1)
 
   //---------------------------所有的销售列表包括ficc和权益
-  let allSellerArray={}
+  //所有的销售列表包括ficc和权益
+  let allSellerArray={
+    all_list:[],
+    ficc_list:[],
+    rai_list:[]
+  }
 
   // 销售列表
   const sellerArray=ref([])
@@ -266,10 +273,10 @@
         const element = value[i];
         if(element[0]==2){
           // ficc
-          ficcSeller = element[2]
+          ficcSeller = element[element.length-1]
         }else if(element[0]==5){
           //权益
-          qySeller = element[2]
+          qySeller = element[element.length-1]
         }else{
           // 离职的销售
           isLeaveSeller=true
@@ -286,38 +293,38 @@
       }
       cascaderSelectSeller.value=[ficcSeller,qySeller]
       contractInfo.form.seller_ids= cascaderSelectSeller.value.join(',')
-      if(!contractInfo.form.contract_register_id){
-        // 新增的时候根据销售选择是否显示套餐
-        if(ficcSeller && qySeller){
-          // 都有
-          contractInfo.showServiceFicc=true
-          contractInfo.showServiceQy=true
-          if(!contractInfo.form.contract_register_id){
-            // 新增的情况才置空
-            contractInfo.form.services_amount = contractInfo.form.services_Qy_amount = ''
-          }
-        }else if(!ficcSeller){
-          // 没有ficc销售
-          contractInfo.showServiceFicc=false
-          contractInfo.showServiceQy=true
-          contractInfo.form.services_Qy_amount = contractInfo.form.contract_amount
-          contractInfo.form.services_amount =''
-        }else{
-          // 没有权益销售
-          contractInfo.showServiceFicc=true
-          contractInfo.showServiceQy=false
-          contractInfo.form.services_amount = contractInfo.form.contract_amount
-          contractInfo.form.services_Qy_amount =''
-        }
-      }
+      // if(!contractInfo.form.contract_register_id){
+      //   // 新增的时候根据销售选择是否显示套餐
+      //   if(ficcSeller && qySeller){
+      //     // 都有
+      //     contractInfo.showServiceFicc=true
+      //     contractInfo.showServiceQy=true
+      //     if(!contractInfo.form.contract_register_id){
+      //       // 新增的情况才置空
+      //       contractInfo.form.services_amount = contractInfo.form.services_Qy_amount = ''
+      //     }
+      //   }else if(!ficcSeller){
+      //     // 没有ficc销售
+      //     contractInfo.showServiceFicc=false
+      //     contractInfo.showServiceQy=true
+      //     contractInfo.form.services_Qy_amount = contractInfo.form.contract_amount
+      //     contractInfo.form.services_amount =''
+      //   }else{
+      //     // 没有权益销售
+      //     contractInfo.showServiceFicc=true
+      //     contractInfo.showServiceQy=false
+      //     contractInfo.form.services_amount = contractInfo.form.contract_amount
+      //     contractInfo.form.services_Qy_amount =''
+      //   }
+      // }
     }else{
       if(contractInfo.form.contract_register_id){
         ElMessage.warning('合规套餐类型已定，不允许修改销售数量')
         cascaderSelectSeller.value = contractInfo.form.seller_ids.split(',').map(item => +item)
         return 
       }
-      contractInfo.showServiceFicc = contractInfo.showServiceQy=true
-      contractInfo.form.services_amount = contractInfo.form.services_Qy_amount = ''
+      // contractInfo.showServiceFicc = contractInfo.showServiceQy=true
+      // contractInfo.form.services_amount = contractInfo.form.services_Qy_amount = ''
       cascaderSelectSeller.value=[]
     }
   }
@@ -441,16 +448,23 @@
   //   contractInfo.moneyData.waitPlacementMoney=Math.round(contractInfo.moneyData.waitPlacementMoney*100)/100
   // })
 
-  watch(()=>contractInfo.form.contract_amount,(newVal)=>{
-    if(contractInfo.showServiceFicc && contractInfo.showServiceQy){
-      return 
-    }else if(!contractInfo.showServiceFicc){
-      contractInfo.form.services_Qy_amount = newVal
-    }else{
-      contractInfo.form.services_amount = newVal
-    }
-    
-  })
+  // watch(()=>contractInfo.form.new_company,(newVal)=>{
+  //   if(newVal==1){
+  //     is_new_company.value=true
+  //   }else{
+  //     is_new_company.value=false
+  //   }
+  // })
+
+  // watch(()=>contractInfo.form.contract_amount,(newVal)=>{
+  //   if(contractInfo.showServiceFicc && contractInfo.showServiceQy){
+  //     return 
+  //   }else if(!contractInfo.showServiceFicc){
+  //     contractInfo.form.services_Qy_amount = newVal
+  //   }else{
+  //     contractInfo.form.services_amount = newVal
+  //   }
+  // })
 
   // -----------------------method
   // 权限验证
@@ -489,12 +503,23 @@
   }
   //获取销售列表
   const getSellerListFun=()=>{
-    getSellerList().then(res=>{
-      allSellerArray=res.data || {}
+    // 无分组
+    getSellerListNoG().then(res=>{
+      if(!res.data) return 
+      allSellerArray.ficc_list = res.data.FiccSeller
+      allSellerArray.rai_list = res.data.RaiSeller
+      allSellerArray.all_list=[
+        {seller_id: 2,seller_name: "FICC销售",child:allSellerArray.ficc_list},
+        {seller_id: 5,seller_name: "权益销售",child:allSellerArray.rai_list}
+      ]
       sellerArray.value = allSellerArray.all_list || []
-      contractInfo.sellerInvoiceListF = allSellerArray.ficc_list || []
-      contractInfo.sellerInvoiceListQ = allSellerArray.rai_list || []
     })
+    // 有分组
+    // getSellerList().then(res=>{
+      // allSellerArray=res.data || {}
+      // contractInfo.sellerInvoiceListF = allSellerArray.ficc_list || []
+      // contractInfo.sellerInvoiceListQ = allSellerArray.rai_list || []
+    // })
   }
   // 获取服务列表
   const getServiceListFun=()=>{
@@ -559,7 +584,7 @@
     contractInfo.checkedPermissionQySmall=[]
     sellerArray.value=value==0?allSellerArray.all_list||[]:[]
 
-    sellerListType.value = value==0?3:''
+    InvoiceAndPaymentType.value = value==0?3:''
 
     // 1-大套餐  2-小套餐
     contractInfo.serviceType=0
@@ -672,7 +697,13 @@
     getServiceDetail({contract_id:selectItem.contract_id}).then(res=>{
       // console.log(res);
       let servivesTemp = res.data?res.data.Service||[]:[]
+
       if(selectItem.product_id==1){
+        // 清空权益套餐
+        contractInfo.serviceVarietyShowQy = false
+        contractInfo.serviceTypeQy = 0
+        contractInfo.checkedServiceQy=[]
+        contractInfo.form.services_Qy_amount = ''
         // FICC套餐
         // 小套餐
         let smallService = servivesTemp.find(item => item.ServiceTemplateId==2)
@@ -682,8 +713,12 @@
         contractInfo.serviceType = !!smallService?2:hasBigService?1:0
         contractInfo.checkedService=servivesTemp.map(item => item.ServiceTemplateId)
         contractInfo.checkedPermission=smallService?smallService.ChartPermissionIds||[]:[]
-        contractInfo.form.services_Qy_amount = ''
       }else{
+        // 清空FICC套餐
+        contractInfo.serviceVarietyShow = false
+        contractInfo.serviceType = 0
+        contractInfo.checkedService=[]
+        contractInfo.form.services_amount = ''
         //权益
         // 权益大套餐
         let bigServiceQY = servivesTemp.find(item => item.FMSServiceTemplateId==11 || item.FMSServiceTemplateId==12)
@@ -702,14 +737,14 @@
           contractInfo.checkedPermissionQyBig = []
           contractInfo.checkedPermissionQySmall = smallServiceQY.map(item => item.FMSServiceTemplateId)
         }
-        contractInfo.form.services_amount = ''
+        
       }
       contractInfo.varietyDiaType='edit'
 
     })
 
     contractInfo.form.product_ids = selectItem.product_id.toString()
-    sellerListType.value = selectItem.product_id
+    InvoiceAndPaymentType.value = selectItem.product_id
     sellerArray.value = selectItem.product_id==1?allSellerArray.ficc_list||[]:allSellerArray.rai_list || []
     // console.log(contractInfo.form);
     contractInfo.form.company_name=selectItem.company_name
@@ -743,8 +778,8 @@
       'start_date','contract_amount','relate_contract_code','actual_pay_companies'
     ])
   
-    contractInfo.showServiceFicc = selectItem.product_id == 1
-    contractInfo.showServiceQy = selectItem.product_id == 2
+    // contractInfo.showServiceFicc = selectItem.product_id == 1
+    // contractInfo.showServiceQy = selectItem.product_id == 2
 
   }
 
@@ -767,11 +802,11 @@
   const addTableRow=(type)=>{
     if(type=='invoice'){
       invoiceForm.invoiceData.push({
-        service_product_id:sellerListType.value == 3?'':sellerListType.value,origin_amount:'',amount:'',invoice_date:'',remark:'',
+        service_product_id:InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value,origin_amount:'',amount:'',invoice_date:'',remark:'',
       seller_id:'',seller_name:'',amountDomType:'text',remarkDomType:'text'})
     }else{
       placementForm.placementData.push({
-        service_product_id:sellerListType.value == 3?'':sellerListType.value,origin_amount:'',
+        service_product_id:InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value,origin_amount:'',
         amount:'',invoice_date:'',remark:'',amountDomType:'text',remarkDomType:'text'})
     }
   }
@@ -844,7 +879,7 @@
       tempArr=placementForm.placementData
       word='到款'
     }
-    if(tempArr[index].origin_amount=='' && tempArr[index].amount=='' && (tempArr[index].service_product_id=='' || sellerListType.value != 3)
+    if(tempArr[index].origin_amount=='' && tempArr[index].amount=='' && (tempArr[index].service_product_id=='' || InvoiceAndPaymentType.value != 3)
     && tempArr[index].invoice_date=='' && !haveSalesman){
       // 没有内容 直接删除
       tempArr.splice(index,1)
@@ -1012,12 +1047,20 @@
         }
         contractInfo.form.services=[]
         contractInfo.form.service_amount=[]
+        
+        if(contractInfo.checkedServiceQy.length==0 && contractInfo.checkedService.length==0){
+          ElMessage.warning('请选择套餐')
+          return 
+        }
+        let hasFICCservice=false
+        let hasQYservice=false
         // FICC
-        if(contractInfo.showServiceFicc){
-          if(contractInfo.checkedService.length==0){
-            ElMessage.warning('请选择FICC套餐')
-            return 
-          }
+        if(contractInfo.checkedService.length>0){
+          // if(contractInfo.checkedService.length==0){
+          //   ElMessage.warning('请选择FICC套餐')
+          //   return 
+          // }
+          hasFICCservice=true
           if((!contractInfo.checkedPermission || contractInfo.checkedPermission.length==0) 
           && contractInfo.checkedService.some(serviceId =>serviceId==2)){
             ElMessage.warning('请保存FICC小套餐品种')
@@ -1053,15 +1096,17 @@
             return 
           }
           contractInfo.form.service_amount.push({product_id:1,service_amount:+contractInfo.form.services_amount})
+          contractInfo.form.services_amount = +parseFloat(contractInfo.form.services_amount).toFixed(2) || 0
         }
         
         // 权益
-        if(contractInfo.showServiceQy){
-          if(contractInfo.checkedServiceQy.length==0){
-            ElMessage.warning('请选择权益套餐')
-            return 
-          }
+        if(contractInfo.checkedServiceQy.length>0){
+          // if(contractInfo.checkedServiceQy.length==0){
+          //   ElMessage.warning('请选择权益套餐')
+          //   return 
+          // }
           // 权益大套餐
+          hasQYservice=true
           if((!contractInfo.checkedPermissionQyBig || contractInfo.checkedPermissionQyBig.length==0) 
           && contractInfo.checkedServiceQy.some(serviceId =>serviceId==10)){
             ElMessage.warning('请保存权益大套餐类型')
@@ -1117,13 +1162,21 @@
             return 
           }
           contractInfo.form.service_amount.push({product_id:2,service_amount:+contractInfo.form.services_Qy_amount})
+          contractInfo.form.services_Qy_amount = +parseFloat(contractInfo.form.services_Qy_amount).toFixed(2) || 0
         }
-        
+        let servicesAll=0
+        if(hasFICCservice&&hasQYservice){
+          servicesAll = Math.round((contractInfo.form.services_Qy_amount+contractInfo.form.services_amount)*100)/100
+        }else if(hasFICCservice){
+          servicesAll = contractInfo.form.services_amount
+          contractInfo.form.services_Qy_amount=''
+        }else{
+          servicesAll = contractInfo.form.services_Qy_amount
+          contractInfo.form.services_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
-        // console.log(contractInfo.form.services_amount,contractInfo.form.services_Qy_amount);
-        let servicesAll = Math.round((contractInfo.form.services_Qy_amount+contractInfo.form.services_amount)*100)/100
+        // console.log(contractInfo.form.services_amount,contractInfo.form.services_Qy_amount,servicesAll);
         if(servicesAll!=contractInfo.form.contract_amount){
           ElMessage.error('套餐总金额不等于合同金额')
           return 
@@ -1153,7 +1206,7 @@
           }
           // 新增
           contractRegisterCheck({company_name:contractInfo.form.company_name,
-            start_date:contractInfo.form.start_date,end_date:contractInfo.form.end_date}).then(res=>{
+            start_date:contractInfo.form.start_date,end_date:contractInfo.form.end_date,seller_ids:contractInfo.form.seller_ids}).then(res=>{
             if(res.data?.exist){
               // 存在给提示
               ElMessageBox.confirm('已登记过相同的合同，是否继续操作？',
@@ -1385,6 +1438,28 @@
         },10)
       }
 
+      // 开票到款时的展示方式
+      let hasFICC = res.data.service_amount_list.some(item => item.product_id==1)
+      let hasQY = res.data.service_amount_list.some(item => item.product_id==2)
+      if(hasFICC && hasQY){
+        InvoiceAndPaymentType.value = 3
+      }else if(!hasFICC){
+        InvoiceAndPaymentType.value = 2
+      }else{
+        InvoiceAndPaymentType.value = 1
+      }
+      // 合规时的销售
+      if(res.data.seller_id && res.data.rai_seller_id){
+        sellerListType.value=3
+        sellerArray.value = allSellerArray.all_list
+        cascaderSelectSeller.value = res.data.seller_ids.split(',').map(item => +item) 
+      }else if(!res.data.seller_id){
+        sellerListType.value=2
+        sellerArray.value=allSellerArray.rai_list
+      }else{
+        sellerListType.value=1
+        sellerArray.value=allSellerArray.ficc_list
+      }
       rmbRate.value=res.data.rmb_rate
       if(haveGetCurrencyList.value){
         // 拿到货币列表后才去取单位
@@ -1400,9 +1475,9 @@
       }
       // 套餐金额
       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
+      res.data.service_amount_list.find(it => it.product_id==1).service_amount:''
       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==2).service_amount:0
+      res.data.service_amount_list.find(it => it.product_id==2).service_amount:''
       res.data.service_list.map(item =>{
         if(item.service_template_id==2){
           // ficc小套餐
@@ -1445,16 +1520,8 @@
       }).filter(Boolean)
       contractInfo.contractValidityDate=[res.data.start_date,res.data.end_date]
       
-      if(res.data.seller_id && res.data.rai_seller_id){
-        sellerListType.value = 3
-      }else if(!res.data.seller_id){
-        sellerListType.value = 2
-      }else{
-        sellerListType.value = 1
-      }
-      
       invoiceForm.invoiceData[0].service_product_id = 
-      placementForm.placementData[0].service_product_id=sellerListType.value == 3?'':sellerListType.value
+      placementForm.placementData[0].service_product_id=InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value
 
       // 开票
       // console.log(res.data.service_amount_list.find(item => item.product_id==1),res.data.service_amount_list.find(item => item.product_id==2));
@@ -1494,7 +1561,7 @@
         // 添加一行空的
         if(contractInfo.operationtype=='invoice'){
           invoiceForm.invoiceData.push({
-            service_product_id:sellerListType.value == 3?'':sellerListType.value,              
+            service_product_id:InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value,              
             origin_amount:'',
             amount:'',
             invoice_date:'',
@@ -1533,7 +1600,7 @@
         // 添加一行空的
         if(contractInfo.operationtype=='placement'){
           placementForm.placementData.push({
-            service_product_id:sellerListType.value == 3?'':sellerListType.value,
+            service_product_id:InvoiceAndPaymentType.value == 3?'':InvoiceAndPaymentType.value,
             origin_amount:'',
             amount:'',
             invoice_date:'',
@@ -1729,7 +1796,7 @@
                 </div>
                 <div class="info-row">
                   <div class="info-row-title" >套餐信息</div>
-                  <div class="info-row-services" v-if="contractInfo.showServiceFicc">
+                  <div class="info-row-services">
                     <div class="info-row-services-header" id="info-row-services-header">
                       <span>FICC套餐</span>
                       <el-input v-model="contractInfo.form.services_amount" :disabled="contractInfo.operationtype!='compliance'"
@@ -1766,7 +1833,7 @@
                       </el-checkbox>
                     </el-checkbox-group>
                   </div>
-                  <div class="info-row-services" v-if="contractInfo.showServiceQy">
+                  <div class="info-row-services">
                     <div class="info-row-services-header" id="info-row-services-header">
                       <span>权益套餐</span>
                       <el-input v-model="contractInfo.form.services_Qy_amount" :disabled="contractInfo.operationtype!='compliance'"
@@ -1828,7 +1895,7 @@
                   <div class="info-row-title">开票信息</div>
                   <div class="info-row-invoice-payment">
                     <div class="invoice-payment-title">
-                      <div v-if="contractInfo.showServiceFicc && contractInfo.showServiceQy" style="margin-right: 30px;margin-bottom: 20px;">
+                      <div v-if="InvoiceAndPaymentType==3" style="margin-right: 30px;margin-bottom: 20px;">
                         <div class="invoice-payment-money-multiple" :style="{height:isIandPExpand.haveInvoice?'135px':'59px'}">
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.haveInvoice=!isIandPExpand.haveInvoice">
                             <span style="margin-right: 20px;">已开票金额</span>
@@ -1857,7 +1924,7 @@
                         <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData?.haveInvoiceMoney)}}</span>
                         （{{ contractInfo.currencyUnit }}）
                       </div>
-                      <div v-if="contractInfo.showServiceFicc && contractInfo.showServiceQy" style="margin-bottom: 20px;">
+                      <div v-if="InvoiceAndPaymentType==3" style="margin-bottom: 20px;">
                         <div class="invoice-payment-money-multiple" :style="{height:isIandPExpand.waitInvoice?'135px':'59px'}">
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.waitInvoice=!isIandPExpand.waitInvoice">
                             <span style="margin-right: 20px;">剩余开票金额</span>
@@ -1896,7 +1963,7 @@
                             {{$index+1}}
                           </template>
                         </el-table-column>
-                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="sellerListType==3">
+                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="InvoiceAndPaymentType==3">
                           <template #header>
                             <span style="color: var(--dangerColor);">*</span>套餐类型
                           </template>
@@ -2025,7 +2092,7 @@
                   <div class="info-row-title">到款信息</div>
                   <div class="info-row-invoice-payment">
                     <div class="invoice-payment-title">
-                      <div v-if="contractInfo.showServiceFicc && contractInfo.showServiceQy" style="margin-right: 30px;margin-bottom: 20px;">
+                      <div v-if="InvoiceAndPaymentType==3" style="margin-right: 30px;margin-bottom: 20px;">
                         <div class="invoice-payment-money-multiple" :style="{height:isIandPExpand.havePlacement?'135px':'59px'}">
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.havePlacement=!isIandPExpand.havePlacement">
                             <span style="margin-right: 20px;">已到款金额</span>
@@ -2055,7 +2122,7 @@
                         <span class="invoice-payment-money">{{moneyFormatter(contractInfo.moneyData.havePlacementMoney)}}</span>
                         （{{ contractInfo.currencyUnit }}）
                       </div>
-                      <div v-if="contractInfo.showServiceFicc && contractInfo.showServiceQy" style="margin-bottom: 20px;">
+                      <div v-if="InvoiceAndPaymentType==3" style="margin-bottom: 20px;">
                         <div class="invoice-payment-money-multiple" :style="{height:isIandPExpand.waitPlacement?'135px':'59px'}">
                           <div class="invoice-payment-money-multiple-head" @click="isIandPExpand.waitPlacement=!isIandPExpand.waitPlacement">
                             <span style="margin-right: 20px;">剩余到款金额</span>
@@ -2094,7 +2161,7 @@
                             {{$index+1}}
                           </template>
                         </el-table-column>
-                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="sellerListType==3">
+                        <el-table-column label="套餐类型" width="160" align="center" prop="service_product_id" v-if="InvoiceAndPaymentType==3">
                           <template #header>
                             <span style="color: var(--dangerColor);">*</span>套餐类型
                           </template>