财务2.6 内容调整

src/api/crm.js

@@ -40,7 +40,18 @@ export function getSellerListNoG() {
      method:'get'
  })
 }
-
+// 获取详细的销售列表（包含小组以及禁用的小组）
+ /**
+  * @param {
+ * } data 
+ * @returns 
+ */
+export function getSellerTeamList() {
+ return request({
+     url:'/crm/company_seller/team_list',
+     method:'get'
+ })
+}
 // 根据合同编号搜索合同列表
  /**
   * 

src/views/financialStatistics/waitInvoice.vue

@@ -1,5 +1,5 @@
 <script setup>
-  import {getSellerList} from '@/api/crm'
+  import {getSellerTeamList} from '@/api/crm'
   import {getWaitInvoiceList} from '@/api/financialStatistics'
 
   import currencyAmountBox from './components/currencyAmountBox.vue';
@@ -31,7 +31,7 @@
   }
   // 获取销售列表
   const getSellerListFun=()=>{
-    getSellerList().then(res=>{
+    getSellerTeamList().then(res=>{
       sellerArray.value = res.data?.all_list || []
     })
   }
@@ -56,16 +56,24 @@
       tableData.rowMergeArray=[]
       tableData.list=[]
       dataTemp.map((item,index) =>{
-        tableData.rowMergeArray.push(item.invoice_payment_list.length)
-        item.invoice_payment_list.map((it,ind) =>{
-          if(ind>0){
-            tableData.rowMergeArray.push(0)
-          }
+        if(!item.invoice_payment_list?.length>0){
+          tableData.rowMergeArray.push(1)
           tableData.list.push({
             serial_number:searchParams.page_size*(searchParams.current-1)+index+1,
-            ...item,...it
+            ...item
           })
-        })
+        }else{
+          tableData.rowMergeArray.push(item.invoice_payment_list.length)
+          item.invoice_payment_list.map((it,ind) =>{
+            if(ind>0){
+              tableData.rowMergeArray.push(0)
+            }
+            tableData.list.push({
+              serial_number:searchParams.page_size*(searchParams.current-1)+index+1,
+              ...item,...it
+            })
+          })
+        }
       })
 
       tableData.currencyList = res.data?.list?.not_invoice_currency_total || []
@@ -83,7 +91,7 @@
   }
   // 合并单元格
   const cellMerge=({ row,column,rowIndex,columnIndex})=>{
-    if([0,1,2,3,4,5,6,7,8].includes(columnIndex)){
+    if([0,1,2,3,4,5,6].includes(columnIndex)){
       const _row = tableData.rowMergeArray[rowIndex];
       return {
         rowspan: _row,

src/views/financialStatistics/waitPayment.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { getSellerList } from '@/api/crm'
+import { getSellerTeamList } from '@/api/crm'
 import {getWaitPaymentList} from '@/api/financialStatistics'
 
 import currencyAmountBox from './components/currencyAmountBox.vue'
@@ -28,9 +28,9 @@ const sellerChange = (value) => {
     searchList()
 }
 // 获取销售列表
-const getSellerListFun = () => {
-    getSellerList().then(res => {
-        sellerArray.value = res.data?.all_list || []
+const getSellerListFun=()=>{
+    getSellerTeamList().then(res=>{
+      sellerArray.value = res.data?.all_list || []
     })
 }
 
@@ -55,7 +55,7 @@ const getList = () => {
       dataTemp.map((item,index) =>{
         tableData.list.push({
         serial_number:searchParams.page_size*(searchParams.current-1)+index+1,
-        ...item,...item.invoice_payment_list[0]
+        ...item,...(item.invoice_payment_list?item.invoice_payment_list[0]:{})
         })
       })
       tableData.currencyList = res.data?.list?.invoice_currency_total || []