fix(finance): 财务分析

src/api/bi/finance.js

@@ -79,7 +79,9 @@ export const getFinanceDetailAPI = (data) => {
       startDate: parseTime(data.date[0], `{y}-{m}-{d}`),
       endDate:  parseTime(data.date[1], `{y}-{m}-{d}`),
       pageNum: data.pageNum,
-      pageSize: data.pageSize
+      pageSize: data.pageSize,
+      // 直播间展开行里的订单详情需要带分销商（没有值参数也不会传递）
+      fenxiaoId: data.fenxiaoId
     }
   })
 }
@@ -95,10 +97,10 @@ export const getFinanceSubListAPI = (data) => {
     method: 'POST',
     data: {
       subType: 0, // 直播间的
-      zbjQdType: data.zbjQdType,
+      zbjQdType: data.zbjQdType instanceof Array ? data.zbjQdType : data.zbjQdType ? [data.zbjQdType] : [],
       flavor: data.flavorErp,
       specName: data.specNameErp,
-      zbjQdTypeAll: data.zbjQdTypeAll,
+      zbjQdTypeAll: false,
       flavorErpAll: data.flavorErpAll,
       specNameErpAll: data.specNameErpAll,
       series: data.seriesPrdMap.map(o => o[0]),

src/components/Pagination/index.vue

@@ -82,13 +82,13 @@ function handleSizeChange(val) {
   }
   emit('pagination', { page: currentPage.value, limit: val })
   if (props.autoScroll) {
-    scrollTo(0, 800)
+    // scrollTo(0, 800)
   }
 }
 function handleCurrentChange(val) {
   emit('pagination', { page: val, limit: pageSize.value })
   if (props.autoScroll) {
-    scrollTo(0, 800)
+    // scrollTo(0, 800)
   }
 }
 

src/utils/request.js

@@ -63,7 +63,7 @@ service.interceptors.request.use(config => {
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
         const message = '数据正在处理，请勿重复提交';
         console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        // return Promise.reject(new Error(message))
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }

src/views/bi/finance/index.vue

@@ -115,13 +115,15 @@
       <el-table :data="tableList"
         border
         @expand-change="expandChangeFn"
-        @mousedown="handleMouseDown">
+        @mousedown="handleMouseDown"
+        ref="expandTableRef">
         <el-table-column type="expand">
           <template #default="props">
             <div class="expand-div">
               <el-table :data="expandTableList"
                 show-overflow-tooltip
-                class="expand-table">
+                class="expand-table"
+                v-loading="expandLoading">
                 <el-table-column v-for="item in columns"
                   :key="item.prop"
                   :label="item.label"
@@ -142,7 +144,7 @@
               <pagination :total="expandTotal"
                 v-model:page="expandQuery.pageNum"
                 v-model:limit="expandQuery.pageSize"
-                @pagination="expandChangeFn"></pagination>
+                @pagination="getSubList"></pagination>
             </div>
 
           </template>
@@ -457,16 +459,35 @@ const formatter = (row, column, value) => {
 // 展开行
 const expandTableList = ref([])
 const expandTotal = ref(0)
-let nowExpandRow = ref(null)
-const expandChangeFn = async (row) => {
-  if (row) nowExpandRow = row
+let lastExpandRow = ref(null) // 上一次展开的行
+const expandTableRef = ref(null)
+const expandLoading = ref(false)
+const expandChangeFn = async (row, nowRow) => {
+  // 展开
+  if (nowRow.length > 0) {
+    // 折叠掉之前展开的行
+    lastExpandRow && expandTableRef.value.toggleRowExpansion(lastExpandRow, false)
+    lastExpandRow = row
+    nextTick(() => {
+      getSubList()
+    })
+  } else {
+    // 折叠
+    lastExpandRow = null
+  }
+  expandTableList.value = []
+}
+const getSubList = async () => {
+  expandLoading.value = true
+  // 参数顺序不能更改
   const res = await getFinanceSubListAPI({
-    ...nowExpandRow,
     ...queryParams.value,
+    ...lastExpandRow,
     ...expandQuery.value
   })
   expandTableList.value = res.data.list
   expandTotal.value = res.data.total
+  expandLoading.value = false
 }
 
 const handleMouseDown = (event) => {