需求池641 合规登记、开票登记、到款登记、预登记，离职销售回显 提测

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

@@ -5,7 +5,6 @@
   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 financialCommon from '../composition/common'
 
   const contractSourceArray=['非CRM合同导入','CRM合同导入']
@@ -147,11 +146,6 @@
   const sellerListType=ref(3)
   // 选中的销售数组
   const cascaderSelectSeller=ref([])
-  // // 销售是否离职
-  // const isSellerLeave={ficc:false,qy:false}
-  // // 标识合规原本的销售是否已离职
-  // let isLeave=false
-
   // 查看套餐报价单 图片
   const previewImage=ref('')
   // 查看套餐报价单 标题
@@ -264,8 +258,6 @@
   // 销售修改
   const sellerChange=(value)=>{
     let ficcSeller,qySeller
-    // 一旦发生修改，离职的提示就消失
-    // isSellerLeave.ficc=isSellerLeave.qy=false
 
     if(value?.length>0){
       for (let i = 0; i < value.length; i++) {
@@ -390,37 +382,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
-    // }
   }
 
   // 合规登记-提交
   const complianceSubmit=()=>{
     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 
-        //     }
-        //   }
-        // }
         compliance.form.services=[]
         compliance.form.service_amount=[]
         if(serviceData.checkedServiceQy.length==0 && serviceData.checkedService.length==0){
@@ -654,42 +621,6 @@
     compliance.form.seller_ids=value+''
   }
 
-  // 对于销售的处理
-  // 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=()=>{
     serviceData.varietyDiaType='edit'
@@ -779,20 +710,12 @@
     compliance.contractValidityDate=[compliance.form.start_date,compliance.form.end_date]
     // 合同类型回显
     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
-    // }
     // 销售显示
     sellerListType.value=props.detailInfo.sellerListType
-
-    // 拿到销售列表后才去做处理
-    // intervalDataRequest(()=> props.sellerData.all_list>0 ,sellerOperation(para),1)
-
+    if(sellerListType.value==3){
+      cascaderSelectSeller.value = compliance.form.seller_ids.split(',').map(item => +item)
+    }
+    
     compliance.hasQYSeller = props.detailInfo.rai_seller_id?true:false
     
     // 套餐金额
@@ -902,11 +825,6 @@
               :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?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

@@ -73,17 +73,6 @@
     // 已经登记的开票/到款 开票登记的时候是到款，到款登记的时候是开票
     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 isIandPExpand=reactive({
@@ -151,27 +140,6 @@
       // 找到第一条就break掉
       break
     }
-    // 判断销售是否离职
-    if(sellerId){
-      if(value==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+'-已离职'
-        }
-      }else{
-        if(props.sellerData.rai_list.findIndex(seller => seller.seller_id==sellerId)==-1){
-          sellerId = sellerName+'-已离职'
-          sellerName=sellerName+'-已离职'
-        }
-      }
-    }
     row=Object.assign(row,{
         service_product_id:value,              
         seller_id:sellerId,
@@ -199,11 +167,6 @@
 
   // 销售更改
   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
   }
 
@@ -249,28 +212,6 @@
         break
       }
     }
-    // 判断销售是否离职
-    // 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:'',
@@ -292,8 +233,6 @@
     const flag = canAddorEdit(props.type,row)
     if(flag==1){
       setRowData()
-      // amountForm.amountData.push({service_product_id:sellerListType.value == 3?'':sellerListType.value,origin_amount:'',
-      // amount:'',invoice_date:'',remark:'',seller_id:'',seller_name:'',amountDomType:'text',remarkDomType:'text'})
     }else{
       ElMessage.error(flag)
     }
@@ -665,25 +604,11 @@
                   <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'}]">
-                    <!-- <el-select v-model="row.seller_id" :disabled="type=='到款'&& row.hasRelativeSeller" 
-                    style="width: 143px;" 
-                     filterable  >
-                      <el-option :label="item.seller_name" :value="item.seller_id" 
-                      v-for="item in sellerData.ficc_list" :key="item.seller_id">
-                      </el-option>
-                    </el-select> -->
                     <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;"
-                    :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 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

@@ -3,7 +3,7 @@
 
   import {useRouter,useRoute} from 'vue-router'
   import {useStore} from 'vuex'
-  import {getSellerList,getSellerListNoG} from '@/api/crm'
+  import {getSellerTeamList} from '@/api/crm'
   import {getServiceList,registerDetail,preRegistrationDetail} from '@/api/financialMana'
   import {getCurrencyList} from '@/api/common'
 
@@ -67,9 +67,7 @@
   })
   //所有的销售列表包括ficc和权益
   const allSeller=ref({
-    all_list:[],
-    ficc_list:[],
-    rai_list:[]
+    all_list:[]
   })
   // 货币列表
   const currencyList=ref([])
@@ -123,22 +121,10 @@
   }
   //获取销售列表
   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
+    getSellerTeamList().then(res=>{
+        // console.log(res);
+        allSeller.value.all_list = res.data.all_list
     })
   }
   // 获取服务列表

src/views/financialManagement/registrationPre.vue

@@ -2,7 +2,7 @@
 import { Search } from '@element-plus/icons-vue'
 import {useRouter} from 'vue-router'
 import {useStore} from 'vuex'
-import {getSellerList,getSellerListNoG} from '@/api/crm'
+import {getSellerTeamList} from '@/api/crm'
 import {getCurrencyList} from '@/api/common'
 import {getServiceList,getPreRegistrationList,preRegistrationAdd,preRegistrationCheck,
   preRegistrationDetail,preRegistrationEdit,preRegistrationDelete,preRegistrationSave} from '@/api/financialMana'
@@ -220,15 +220,7 @@ const onlyQYSellerData=computed(()=>{
 
 //获取销售列表
 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=>{
+  getSellerTeamList().then(res=>{
     sellerInvoiceListFandQ = res.data.all_list || []
   })
 }
@@ -793,13 +785,7 @@ placementPreList()
             :clearable="false">
             </el-date-picker>
         </el-form-item>
-        <el-form-item label="合同类型" prop="contract_type" label-width="90" style="margin-right: 30px;"
-          :rules="{required:true,message:'合同类型不能为空',trigger:'change'}">
-          <el-cascader :options="contractTypeArray" placeholder="请选择合同类型" style="min-width: 320px;"
-            v-model="contractTypeCheck" :clearable="false" key="contractType" @change="contractTypeChange">
-          </el-cascader>
-        </el-form-item>
-        <el-form-item label="套餐" prop="services" label-width="102" style="margin-right: 20px;"
+        <el-form-item label="套餐" prop="services" label-width="90" style="margin-right: 30px;"
         :rules="{required:true,message:'套餐不能为空',trigger:'change'}">
           <el-cascader filterable :options="servicesList" placeholder="请选择套餐" @change="(value)=>servicesChange(value,1)"
             :show-all-levels="true" v-model="dialog.selectServices" :clearable="false" ref="selectServicesRef"
@@ -807,6 +793,12 @@ placementPreList()
             key="seriveces" style="min-width: 320px;z-index: 100;">
           </el-cascader>
         </el-form-item>
+        <el-form-item label="合同类型" prop="contract_type" label-width="102" style="margin-right: 20px;"
+          :rules="{required:true,message:'合同类型不能为空',trigger:'change'}">
+          <el-cascader :options="contractTypeArray" placeholder="请选择合同类型" style="min-width: 320px;"
+            v-model="contractTypeCheck" :clearable="false" key="contractType" @change="contractTypeChange">
+          </el-cascader>
+        </el-form-item>
         <el-scrollbar max-height="470px" noresize style="margin: 0 -10px;padding: 0 10px;" >
           <div class="invoice-payment-row" 
           :style="{backgroundColor:dialog.currentEditPreId==item.pre_register_id?'#FBF9F4':'#F5F7FA',
@@ -839,26 +831,13 @@ placementPreList()
               </el-date-picker>
             </el-form-item>
             <el-form-item :label="dialog.registrationType+'销售'" :prop="`IorPInfo.${index}.seller_id`" label-width="90" style="margin-right: 0;"
-            :rules="{required:true,message:'销售不能为空',trigger:'change'}">
-              <!-- <el-select v-model="item.seller_id" style="width: 176px;"
-              placeholder="请选择销售" filterable v-if="item.service_product_id==1">
-                <el-option :label="seller.seller_name" :value="seller.seller_id" 
-                v-for="seller in sellerInvoiceListF" :key="seller.seller_id">
-                </el-option>
-              </el-select> -->
+            :rules="{required:true,message:'销售不能为空',trigger:'change'}" >
               <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;" 
-              :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 v-model="item.seller_id" style="width: 176px;" 
               placeholder="请选择销售" :disabled="dialog.registrationType=='到款' && item.contract_invoice_id" v-else
                 @visible-change="selectVisible">
@@ -934,22 +913,10 @@ placementPreList()
           </el-select>
         </el-form-item>
         <el-form-item :label="preDialog.title=='预开票'?'开票销售':'到款销售'" prop="seller_id">
-          <!-- <el-select v-model="preDialog.preForm.seller_id" style="width: 286px;"
-          placeholder="请选择销售" filterable v-if="preDialog.preForm.service_product_id==1">
-            <el-option :label="seller.seller_name" :value="seller.seller_id" 
-            v-for="seller in sellerInvoiceListF" :key="seller.seller_id">
-            </el-option>
-          </el-select> -->
           <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=='预到款'"
-          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 v-model="preDialog.preForm.seller_id" style="width: 286px;" 
           placeholder="请选择销售" v-else
             @visible-change="selectVisible">