需求池641 待联调

.env.development

@@ -1,5 +1,5 @@
 # 接口地址
-VITE_APP_API_URL="http://192.168.77.4:8619/api"
-# VITE_APP_API_URL="http://8.136.199.33:8619/api"
+# VITE_APP_API_URL="http://192.168.77.4:8619/api"
+VITE_APP_API_URL="http://8.136.199.33:8619/api"
 # crm系统地址
 VITE_CRM_SYSTEM_URL="https://rddptest.hzinsights.com/login"

src/directives/modules/overflow-tooltip.js

@@ -26,7 +26,7 @@ export const overflowTooltip={
       if(!value){
         throw new Error('请设置长度溢出的元素的css选择器')
       }
-      console.log(tooltipNode);
+      // console.log(tooltipNode);
       if(!tooltipNode){
         throw new Error('找不到el-tooltip组件')
       }

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

@@ -5,7 +5,7 @@
   import permissionQyDia from '../components/permissionQyDia.vue'
   import {getContractSearchList,getServiceDetail} from '@/api/crm'
   import {registerAdd,registerEdit,contractRegisterCheck} from '@/api/financialMana'
-  import {intervalDataRequest} from '@/utils/common-methods'
+  // import {intervalDataRequest} from '@/utils/common-methods'
   import financialCommon from '../composition/common'
 
   const contractSourceArray=['非CRM合同导入','CRM合同导入']
@@ -148,10 +148,10 @@
   const sellerListType=ref(3)
   // 选中的销售数组
   const cascaderSelectSeller=ref([])
-  // 销售是否离职
-  const isSellerLeave={ficc:false,qy:false}
-  // 标识合规原本的销售是否已离职
-  let isLeave=false
+  // // 销售是否离职
+  // const isSellerLeave={ficc:false,qy:false}
+  // // 标识合规原本的销售是否已离职
+  // let isLeave=false
 
   // 查看套餐报价单 图片
   const previewImage=ref('')
@@ -222,7 +222,13 @@
       contractInfoForm.value && contractInfoForm.value.clearValidate()
     },0)
   }
-
+// ---------------------------------------计算
+  const onlyQYSellerData=computed(()=>{
+    return props.sellerData.all_list.filter(item => item.seller_id==5)[0].child
+  })
+  const onlyFICCSellerData=computed(()=>{
+    return props.sellerData.all_list.filter(item => item.seller_id==2)[0].child
+  })
 // ------------------------------------------------监听
   watch(()=>props.supplementaryInfo.supplement,(value)=>{
     if(value){
@@ -267,7 +273,7 @@
   const sellerChange=(value)=>{
     let ficcSeller,qySeller
     // 一旦发生修改，离职的提示就消失
-    isSellerLeave.ficc=isSellerLeave.qy=false
+    // isSellerLeave.ficc=isSellerLeave.qy=false
 
     if(value?.length>0){
       for (let i = 0; i < value.length; i++) {
@@ -392,12 +398,12 @@
       'contract_code','company_name','contract_type','seller_ids',
       'start_date','contract_amount','relate_contract_code','actual_pay_companies'
     ])
-    let sellerArray = sellerListType.value==1?props.sellerData.ficc_list:props.sellerData.rai_list
-    if(sellerArray.findIndex(item => item.seller_id == selectItem.seller_id)==-1){
-      // 为-1表示原本的销售已离职
-      compliance.form.seller_id = selectItem.seller_name
-      isLeave=true
-    }
+    // let sellerArray = sellerListType.value==1?props.sellerData.ficc_list:props.sellerData.rai_list
+    // if(sellerArray.findIndex(item => item.seller_id == selectItem.seller_id)==-1){
+    //   // 为-1表示原本的销售已离职
+    //   compliance.form.seller_id = selectItem.seller_name
+    //   isLeave=true
+    // }
   }
 
   // 合规登记-提交
@@ -405,24 +411,24 @@
     contractInfoForm.value.validate(valid=>{
       if(valid){
         // console.log(cascaderSelectSeller.value);
-        if(isLeave){
-          // 判断原本销售已离职
-          if(sellerListType.value==3){
-            if(isSellerLeave.ficc){
-              ElMessage.error('选择的FICC销售不存在或已离职')
-              return
-            }
-            if(isSellerLeave.qy){
-              ElMessage.error('选择的权益销售不存在或已离职')
-              return
-            }
-          }else{
-            if(!Number(compliance.form.seller_id)){
-              ElMessage.error('选择的销售不存在或已离职')
-              return 
-            }
-          }
-        }
+        // if(isLeave){
+        //   // 判断原本销售已离职
+        //   if(sellerListType.value==3){
+        //     if(isSellerLeave.ficc){
+        //       ElMessage.error('选择的FICC销售不存在或已离职')
+        //       return
+        //     }
+        //     if(isSellerLeave.qy){
+        //       ElMessage.error('选择的权益销售不存在或已离职')
+        //       return
+        //     }
+        //   }else{
+        //     if(!Number(compliance.form.seller_id)){
+        //       ElMessage.error('选择的销售不存在或已离职')
+        //       return 
+        //     }
+        //   }
+        // }
         compliance.form.services=[]
         compliance.form.service_amount=[]
         if(serviceData.checkedServiceQy.length==0 && serviceData.checkedService.length==0){
@@ -656,40 +662,40 @@
   }
 
   // 对于销售的处理
-  const sellerOperation=({seller_id,rai_seller_id,seller_ids,seller_name,rai_seller_name})=>{
-    if(sellerListType.value==3){
-      cascaderSelectSeller.value = seller_ids.split(',').map(item => +item) 
-      if(seller_id && props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
-        props.sellerData.all_list.push({
-          seller_id:seller_id,
-          seller_name:seller_name+'-已离职',
-          disabled:true,
-          child:null
-        })
-        isLeave=true
-        isSellerLeave.ficc=true
-      }
-      if(rai_seller_id && props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
-        props.sellerData.all_list.push({
-          seller_id:rai_seller_id,
-          seller_name:rai_seller_name+'-已离职',
-          disabled:true,
-          child:null
-        })
-        isLeave=true
-        isSellerLeave.qy=true
-      }
-    }else{
-      if(rai_seller_id&&props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
-        compliance.form.seller_id = rai_seller_name+'-已离职'
-        isLeave=true
-      }else if(seller_id && props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
-        compliance.form.seller_id = seller_name+'-已离职'
-        isLeave=true
-      }
-    }
+  // const sellerOperation=({seller_id,rai_seller_id,seller_ids,seller_name,rai_seller_name})=>{
+  //   if(sellerListType.value==3){
+  //     cascaderSelectSeller.value = seller_ids.split(',').map(item => +item) 
+  //     if(seller_id && props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
+  //       props.sellerData.all_list.push({
+  //         seller_id:seller_id,
+  //         seller_name:seller_name+'-已离职',
+  //         disabled:true,
+  //         child:null
+  //       })
+  //       isLeave=true
+  //       isSellerLeave.ficc=true
+  //     }
+  //     if(rai_seller_id && props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
+  //       props.sellerData.all_list.push({
+  //         seller_id:rai_seller_id,
+  //         seller_name:rai_seller_name+'-已离职',
+  //         disabled:true,
+  //         child:null
+  //       })
+  //       isLeave=true
+  //       isSellerLeave.qy=true
+  //     }
+  //   }else{
+  //     if(rai_seller_id&&props.sellerData.rai_list.findIndex(item => item.seller_id == rai_seller_id)==-1){
+  //       compliance.form.seller_id = rai_seller_name+'-已离职'
+  //       isLeave=true
+  //     }else if(seller_id && props.sellerData.ficc_list.findIndex(item => item.seller_id == seller_id)==-1){
+  //       compliance.form.seller_id = seller_name+'-已离职'
+  //       isLeave=true
+  //     }
+  //   }
 
-  }
+  // }
 
   // 选择品种 - ficc
   const selectVariety=()=>{
@@ -781,18 +787,18 @@
     // 合同类型回显
     compliance.contractTypeCheck = [compliance.form.has_payment,compliance.form.contract_type]
     // 销售
-    let para={
-      seller_id:props.detailInfo.seller_id,
-      rai_seller_id:props.detailInfo.rai_seller_id,
-      seller_ids:props.detailInfo.seller_ids,
-      seller_name:props.detailInfo.seller_name,
-      rai_seller_name:props.detailInfo.rai_seller_name
-    }
+    // let para={
+    //   seller_id:props.detailInfo.seller_id,
+    //   rai_seller_id:props.detailInfo.rai_seller_id,
+    //   seller_ids:props.detailInfo.seller_ids,
+    //   seller_name:props.detailInfo.seller_name,
+    //   rai_seller_name:props.detailInfo.rai_seller_name
+    // }
     // 销售显示
     sellerListType.value=props.detailInfo.sellerListType
 
     // 拿到销售列表后才去做处理
-    intervalDataRequest(()=> props.sellerData.all_list>0 ,sellerOperation(para),1)
+    // intervalDataRequest(()=> props.sellerData.all_list>0 ,sellerOperation(para),1)
 
     compliance.hasQYSeller = props.detailInfo.rai_seller_id?true:false
     
@@ -889,19 +895,25 @@
             </el-form-item>
             <el-form-item label="销售" prop="seller_ids">
               <el-cascader v-if="sellerListType==3" filterable style="min-width: 320px;width: 15vw;"
-              :options="sellerData.all_list" placeholder="请选择销售" @change="sellerChange"
-                :show-all-levels="false" v-model="cascaderSelectSeller" :clearable="false" 
-                :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child'}"
-                key="seller" >
+              :options="sellerData.all_list" placeholder="请选择销售" @change="sellerChange" 
+              :show-all-levels="false" v-model="cascaderSelectSeller" 
+              :clearable="false" :props="{multiple:true,label:'seller_name',value:'seller_id',children:'child'}"
+              key="seller" >
               </el-cascader>
               <el-select v-else-if="!sellerListType" placeholder="请选择销售" filterable  >
                 <el-option :label="item" :value="item" v-for="item in []" :key="item"></el-option>
               </el-select>
-              <el-select v-else v-model="compliance.form.seller_id" placeholder="请选择销售" 
+              <el-cascader v-else filterable style="min-width: 320px;width: 15vw;"
+              :options="sellerListType==1?onlyFICCSellerData:onlyQYSellerData" @change="selectSeller"
+              placeholder="请选择销售" :show-all-levels="false" v-model="compliance.form.seller_id" 
+              :clearable="false" :props="{multiple:false,label:'seller_name',value:'seller_id',children:'child'}"
+              key="seller-single" >
+              </el-cascader>
+              <!-- <el-select v-else v-model="compliance.form.seller_id" placeholder="请选择销售" 
               filterable @change="selectSeller" >
                 <el-option :label="item.seller_name" :value="item.seller_id" 
-                v-for="item in sellerListType==1?sellerData.ficc_list:sellerData.rai_list" :key="item.admin_id"></el-option>
-              </el-select>
+                v-for="item in sellerListType==1?onlyFICCSellerData:onlyQYSellerData" :key="item.admin_id"></el-option>
+              </el-select> -->
             </el-form-item>
             <el-form-item label="合同金额" id="contractInfo-contractAmount"
             prop="contract_amount">

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

@@ -74,16 +74,16 @@
     submittedAmountData:[]
   })
   // 销售离职验证
-  const sellerValidator=(row,callback)=>{
-    // console.log(row);
-    console.log(row);
-    if(row.seller_name.indexOf('已离职')!=-1){
-      ElMessage.error(row.seller_name)
-      return 
-    }else{
-      callback()
-    }
-  }
+  // const sellerValidator=(row,callback)=>{
+  //   // console.log(row);
+  //   console.log(row);
+  //   if(row.seller_name.indexOf('已离职')!=-1){
+  //     ElMessage.error(row.seller_name)
+  //     return 
+  //   }else{
+  //     callback()
+  //   }
+  // }
 
   //开票-到款展开和收起
   const isIandPExpand=reactive({
@@ -96,6 +96,14 @@
   const rmbRate=ref(1)
 
   const sellerListType=ref(3)
+  // 选择销售的联级选择器的ref，主要为了获取ID的同时获取名字
+  const sellerCascaderRefs=ref([])
+  // ------------------计算
+  // 只有权益销售的数据
+  const onlyQYSellerData=computed(()=>{
+    return props.sellerData.all_list.filter(item => item.seller_id==5)[0].child
+  })
+
 
   // -----------------------------监听
   // 金额-FICC
@@ -142,12 +150,13 @@
   }
 
   // 销售更改
-  const sellerChange=(row,value)=>{
-    if(row.service_product_id==1){
-      row.seller_name = [...props.sellerData.ficc_list,...props.sellerData.rai_list].find(seller => seller.seller_id==value)?.seller_name
-    }else{
-      row.seller_name = props.sellerData.rai_list.find(seller => seller.seller_id==value)?.seller_name
-    }
+  const sellerChange=(row,index)=>{
+    // if(row.service_product_id==1){
+    //   row.seller_name = [...props.sellerData.ficc_list,...props.sellerData.rai_list].find(seller => seller.seller_id==value)?.seller_name
+    // }else{
+    //   row.seller_name = props.sellerData.rai_list.find(seller => seller.seller_id==value)?.seller_name
+    // }
+    row.seller_name=sellerCascaderRefs.value[index]?.inputValue
   }
 
   // 判断表格当前行的信息是否填写完整
@@ -193,27 +202,27 @@
       }
     }
     // 判断销售是否离职
-    if(sellerId){
-      if(serviceProductId==1){
-        // FICC销售和权益销售都要判断，并且页面呈现为级联选择器
-        if([...props.sellerData.ficc_list,...props.sellerData.rai_list]
-        .findIndex(seller => seller.seller_id==sellerId)==-1){
-          props.sellerData.all_list.push({
-            seller_id:sellerId,
-            seller_name:sellerName+'-已离职',
-            disabled:true,
-            child:null
-          })
-          sellerName=sellerName+'-已离职'
-        }
-        // console.log(sellerId);
-      }else{
-        if(props.sellerData.rai_list.findIndex(seller => seller.seller_id==sellerId)==-1){
-          sellerId = sellerName+'-已离职'
-          sellerName=sellerName+'-已离职'
-        }
-      }
-    }
+    // if(sellerId){
+    //   if(serviceProductId==1){
+    //     // FICC销售和权益销售都要判断，并且页面呈现为级联选择器
+    //     if([...props.sellerData.ficc_list,...props.sellerData.rai_list]
+    //     .findIndex(seller => seller.seller_id==sellerId)==-1){
+    //       props.sellerData.all_list.push({
+    //         seller_id:sellerId,
+    //         seller_name:sellerName+'-已离职',
+    //         disabled:true,
+    //         child:null
+    //       })
+    //       sellerName=sellerName+'-已离职'
+    //     }
+    //     // console.log(sellerId);
+    //   }else{
+    //     if(props.sellerData.rai_list.findIndex(seller => seller.seller_id==sellerId)==-1){
+    //       sellerId = sellerName+'-已离职'
+    //       sellerName=sellerName+'-已离职'
+    //     }
+    //   }
+    // }
     amountForm.amountData.push({
       service_product_id:serviceProductId,              
       origin_amount:'',
@@ -605,10 +614,7 @@
                 <template #default="{row,$index}">
                   <el-form-item :prop="`amountData.${$index}.seller_id`" 
                   :show-message="false" v-show="!row.invoice_id || row.isEdit"
-                  :rules="[{required:true,message:()=>{ ElMessage.error('销售不能为空')},trigger:'change'},
-                  {validator:(rule,value,callback)=>{
-                    sellerValidator(row,callback)
-                  },trigger:'change'}]">
+                  :rules="[{required:true,message:()=>{ ElMessage.error('销售不能为空')},trigger:'change'}]">
                     <!-- <el-select v-model="row.seller_id" :disabled="type=='到款'&& row.hasRelativeSeller" 
                     style="width: 143px;" 
                      filterable  >
@@ -616,17 +622,18 @@
                       v-for="item in sellerData.ficc_list" :key="item.seller_id">
                       </el-option>
                     </el-select> -->
-                    <el-cascader :options="sellerData.all_list" v-model="row.seller_id" v-if="row.service_product_id==1"
-                    :ref='`amountData-service_product_id${$index}`' placeholder="请选择销售" @change="(value)=> sellerChange(row,value)"
+                    <el-cascader v-if="row.service_product_id"
+                    :options="row.service_product_id==1?sellerData.all_list:onlyQYSellerData" v-model="row.seller_id"
+                    :ref="el => sellerCascaderRefs[$index]=el" placeholder="请选择销售" @change="()=> sellerChange(row,$index)"
                     :props="{label:'seller_name',value:'seller_id',children:'child',emitPath:false}" 
                     :show-all-levels="false" filterable class="seller-cascader" :disabled="type=='到款'&& row.hasRelativeSeller"></el-cascader>
-                    <el-select v-model="row.seller_id" style="width: 143px;"
+                    <!-- <el-select v-model="row.seller_id" style="width: 143px;"
                     :ref='`amountData-service_product_id${$index}`' :disabled="type=='到款'&& row.hasRelativeSeller"
                     placeholder="请选择权益销售" filterable  v-else-if="row.service_product_id==2" @change="(value)=> sellerChange(row,value)">
                       <el-option :label="item.seller_name" :value="item.seller_id" 
                       v-for="item in sellerData.rai_list" :key="item.seller_id">
                       </el-option>
-                    </el-select>
+                    </el-select> -->
                     <el-select v-model="row.seller_id" style="width: 143px;" :ref='`amountData-service_product_id${$index}`'
                     placeholder="请选择销售" v-else
                       @visible-change="selectVisible">

src/views/financialManagement/contractProgress.vue

@@ -124,22 +124,22 @@
   //获取销售列表
   const getSellerListFun=()=>{
     // 无分组
-    getSellerListNoG().then(res=>{
-      if(!res.data) return 
-      allSeller.value.ficc_list = res.data.FiccSeller
-      allSeller.value.rai_list = res.data.RaiSeller
-      allSeller.value.all_list=[
-        {seller_id: 2,seller_name: "FICC销售",child:allSeller.value.ficc_list},
-        {seller_id: 5,seller_name: "权益销售",child:allSeller.value.rai_list}
-      ]
-    })
-    // 有分组
-    // getSellerList().then(res=>{
-    //     console.log(res);
-    //     allSeller.value.ficc_list = res.data.ficc_list
-    //     allSeller.value.rai_list = res.data.rai_list
-    //     allSeller.value.all_list=res.data.all_list
+    // getSellerListNoG().then(res=>{
+    //   if(!res.data) return 
+    //   allSeller.value.ficc_list = res.data.FiccSeller
+    //   allSeller.value.rai_list = res.data.RaiSeller
+    //   allSeller.value.all_list=[
+    //     {seller_id: 2,seller_name: "FICC销售",child:allSeller.value.ficc_list},
+    //     {seller_id: 5,seller_name: "权益销售",child:allSeller.value.rai_list}
+    //   ]
     // })
+    // 有分组
+    getSellerList().then(res=>{
+        console.log(res);
+        allSeller.value.ficc_list = res.data.ficc_list
+        allSeller.value.rai_list = res.data.rai_list
+        allSeller.value.all_list=res.data.all_list
+    })
   }
   // 获取服务列表
   const getServiceListFun=()=>{

src/views/financialManagement/registrationPre.vue

@@ -192,23 +192,26 @@ watch(serviceTypePre,(newVal)=>{
 // -----------------------------------------销售部分 - 开始
 //FICC&权益销售列表
 let sellerInvoiceListFandQ=[]
-//权益的销售列表
-let sellerInvoiceListQ=[]
+
+
+// 只有权益销售的数据
+const onlyQYSellerData=computed(()=>{
+  return sellerInvoiceListFandQ.filter(item => item.seller_id==5)[0].child
+})
 
 //获取销售列表
 const getSellerListFun=()=>{
-  getSellerListNoG().then(res=>{
-    if(!res.data) return 
-    sellerInvoiceListQ = res.data.RaiSeller
-    sellerInvoiceListFandQ=[
-      {seller_id: 2,seller_name: "FICC销售",child:res.data.FiccSeller},
-      {seller_id: 5,seller_name: "权益销售",child:res.data.RaiSeller}
-    ]
-  })
-  // getSellerList().then(res=>{
-  //   sellerInvoiceListF = res.data.ficc_list || []
-  //   sellerInvoiceListQ = res.data.rai_list || []
+  // getSellerListNoG().then(res=>{
+  //   if(!res.data) return 
+  //   sellerInvoiceListQ = res.data.RaiSeller
+  //   sellerInvoiceListFandQ=[
+  //     {seller_id: 2,seller_name: "FICC销售",child:res.data.FiccSeller},
+  //     {seller_id: 5,seller_name: "权益销售",child:res.data.RaiSeller}
+  //   ]
   // })
+  getSellerList().then(res=>{
+    sellerInvoiceListFandQ = res.data.all_list || []
+  })
 }
 
 let elMessageDom=null
@@ -794,17 +797,19 @@ placementPreList()
                 v-for="seller in sellerInvoiceListF" :key="seller.seller_id">
                 </el-option>
               </el-select> -->
-              <el-cascader :options="sellerInvoiceListFandQ" :disabled="dialog.registrationType=='到款' && item.contract_invoice_id" 
-              v-model="item.seller_id" v-if="item.service_product_id==1"
-               placeholder="请选择销售" :props="{label:'seller_name',value:'seller_id',children:'child',emitPath:false}" 
+              <el-cascader :options="item.service_product_id==1?sellerInvoiceListFandQ:onlyQYSellerData" 
+              :disabled="dialog.registrationType=='到款' && item.contract_invoice_id" 
+              v-model="item.seller_id" v-if="item.service_product_id"
+               :placeholder="item.service_product_id==1?'请选择销售':'请选择权益销售'" 
+               :props="{label:'seller_name',value:'seller_id',children:'child',emitPath:false}" 
               :show-all-levels="false" filterable style="max-width: 176px;"></el-cascader>
-              <el-select v-model="item.seller_id" style="width: 176px;" 
+              <!-- <el-select v-model="item.seller_id" style="width: 176px;" 
               :disabled="dialog.registrationType=='到款' && item.contract_invoice_id"
               placeholder="请选择权益销售" filterable v-else-if="item.service_product_id==2">
                 <el-option :label="seller.seller_name" :value="seller.seller_id" 
                 v-for="seller in sellerInvoiceListQ" :key="seller.seller_id">
                 </el-option>
-              </el-select>
+              </el-select> -->
               <el-select v-model="item.seller_id" style="width: 176px;" 
               placeholder="请选择销售" :disabled="dialog.registrationType=='到款' && item.contract_invoice_id" v-else
                 @visible-change="selectVisible">
@@ -881,16 +886,16 @@ placementPreList()
             v-for="seller in sellerInvoiceListF" :key="seller.seller_id">
             </el-option>
           </el-select> -->
-          <el-cascader :options="sellerInvoiceListFandQ" v-model="preDialog.preForm.seller_id" 
-          v-if="preDialog.preForm.service_product_id==1" placeholder="请选择销售" 
+          <el-cascader :options="preDialog.preForm.service_product_id==1?sellerInvoiceListFandQ:onlyQYSellerData" 
+          v-model="preDialog.preForm.seller_id" v-if="preDialog.preForm.service_product_id" placeholder="请选择销售" 
           :props="{label:'seller_name',value:'seller_id',children:'child',emitPath:false}" 
           :show-all-levels="false" filterable style="min-width: 286px;" :disabled="preDialog.title=='预到款'"></el-cascader>
-          <el-select v-model="preDialog.preForm.seller_id" style="width: 286px;" :disabled="preDialog.title=='预到款'"
+          <!-- <el-select v-model="preDialog.preForm.seller_id" style="width: 286px;" :disabled="preDialog.title=='预到款'"
           placeholder="请选择销售" filterable v-else-if="preDialog.preForm.service_product_id==2">
             <el-option :label="seller.seller_name" :value="seller.seller_id" 
             v-for="seller in sellerInvoiceListQ" :key="seller.seller_id">
             </el-option>
-          </el-select>
+          </el-select> -->
           <el-select v-model="preDialog.preForm.seller_id" style="width: 286px;" 
           placeholder="请选择销售" v-else
             @visible-change="selectVisible">