需求池369 联调

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} from '@/api/financialMana'
   import {getCurrencyList} from '@/api/common'
@@ -45,7 +45,7 @@
       product_ids:'1,2',
       pre_pay_id:0, //到款预登记Id
       supplement:0, // 是否是补录合同
-      contract_register_id:'',
+      contract_register_id:0,
       crm_contract_id:0,
       contract_source:0,
       contract_code:'',
@@ -245,7 +245,11 @@
   const rmbRate=ref(1)
 
   //所有的销售列表包括ficc和权益
-  let allSellerArray=[]
+  let allSellerArray={
+    all_list:[],
+    ficc_list:[],
+    rai_list:[]
+  }
 
   // 销售列表
   const sellerArray=ref([])
@@ -259,10 +263,10 @@
         const element = value[i];
         if(element[0]==2){
           // ficc
-          ficcSeller = element[2]
+          ficcSeller = element[element.length-1]
         }else{
           //权益
-          qySeller = element[2]
+          qySeller = element[element.length-1]
         }
       }
       // 编辑，不允许修改销售数量
@@ -442,12 +446,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=()=>{
@@ -1218,7 +1233,7 @@
 
 // ----------------------created
   // 合规登记Id
-  contractInfo.form.contract_register_id = parseInt(route.query.complianceId) || ''
+  contractInfo.form.contract_register_id = parseInt(route.query.complianceId) || 0
   // 到款预登记Id
   supplementaryId = parseInt(route.query.supplementaryId) || ''
   // complianceId没有，认为是合规登记