Merge branch 'zhangyong/milestone-20250913-现金管理二期' into milestone-20251104-现金二期

src/views/home.vue

@@ -174,7 +174,7 @@ console.log('权限测试',selectStatusById());
 // 获取消息
 const getMessage = async () => {
   try {
-    let params = selectStatusById();
+    let params = {status: selectStatusById()};
     const res = await API({
       url: '/getMessage',
       method: 'POST',

src/views/moneyManage/receiveDetail/receiveFinance.vue

@@ -94,6 +94,16 @@
                                 已驳回
                             </el-button>
                         </el-button-group>
+                        <div class="info-tooltip">
+                            <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                                content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                                <template #reference>
+                                    <el-icon class="service-icon">
+                                        <Warning />
+                                    </el-icon>
+                                </template>
+                            </el-popover>
+                        </div>
                     </div>
                     <!-- 删除客服的“添加收款”按钮 -->
                     <div class="btnAdd"></div>
@@ -877,7 +887,7 @@ const getlist = async () => {
 
         // 地区处理
         const markets = ref(null)
-        if(searchData.value.markets) {
+        if (searchData.value.markets) {
             markets.value = searchData.value.markets[searchData.value.markets.length - 1]
             console.log('地区转换', markets.value)
         }
@@ -895,7 +905,7 @@ const getlist = async () => {
                     submitterMarket: receivedMarket,
                     goodsName: goodsName,
                     // market: MarketNameForId(searchData.value.market)
-                    market:markets.value
+                    market: markets.value
                 }
             }
         });
@@ -1373,18 +1383,37 @@ const handlePagination = (type, val) => {
         }
 
         .btns {
+            width: 100%;
             display: flex;
             align-items: center;
             justify-content: space-between;
             padding-bottom: 10px;
 
             .tabs {
+                width: 100%;
                 min-width: 300px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
 
                 .btnItem {
                     margin-left: 10px;
                     border-radius: 5px;
                 }
+
+                .info-tooltip {
+                    display: flex;
+                    align-items: center;
+                }
+
+                .service-icon {
+                    color: #666;
+                    cursor: pointer;
+                    font-size: 18px;
+                    transition: all 0.3s ease;
+                    padding: 4px;
+                    border-radius: 50%;
+                }
             }
         }
 

src/views/moneyManage/receiveDetail/receiveHead.vue

@@ -87,8 +87,16 @@
                             </el-button>
                         </el-button-group>
                     </div>
-                    <!-- 删除客服的“添加收款”按钮 -->
-                    <div class="btnAdd"></div>
+                    <div class="info-tooltip">
+                        <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                            content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                            <template #reference>
+                                <el-icon class="service-icon">
+                                    <Warning />
+                                </el-icon>
+                            </template>
+                        </el-popover>
+                    </div>
                 </div>
 
                 <div class="table">
@@ -1190,6 +1198,20 @@ const handlePagination = (type, val) => {
                     border-radius: 5px;
                 }
             }
+
+            .info-tooltip {
+                display: flex;
+                align-items: center;
+            }
+
+            .service-icon {
+                color: #666;
+                cursor: pointer;
+                font-size: 18px;
+                transition: all 0.3s ease;
+                padding: 4px;
+                border-radius: 50%;
+            }
         }
 
 

src/views/moneyManage/receiveDetail/receiveManage.vue

@@ -94,6 +94,16 @@
                                 已驳回
                             </el-button>
                         </el-button-group>
+                        <div class="info-tooltip">
+                            <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                                content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                                <template #reference>
+                                    <el-icon class="service-icon">
+                                        <Warning />
+                                    </el-icon>
+                                </template>
+                            </el-popover>
+                        </div>
                     </div>
                     <!-- 删除客服的“添加收款”按钮 -->
                     <div class="btnAdd"></div>
@@ -612,9 +622,6 @@ import _ from 'lodash';
 import { Plus } from '@element-plus/icons-vue';
 import { startsWith } from './utils/util.js'
 
-// 筛选地区树
-const market = ref([])
-
 // 地区财务专属组件
 import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue';
 
@@ -639,6 +646,9 @@ const tableData = ref([]);
 const total = ref(0);
 const pageInfo = ref({ pageSize: 10, pageNum: 1 });
 
+// 筛选地区树
+const market = ref([])
+
 // 搜索条件
 const searchData = ref({});
 const defaultTime = [new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)];
@@ -894,7 +904,7 @@ const getlist = async () => {
                     paymentCurrency: payCurrencySelect,
                     submitterMarket: receivedMarket,
                     goodsName: goodsName,
-                    //market: MarketNameForId(searchData.value.market)
+                    // market: MarketNameForId(searchData.value.market)
                     market: markets.value
                 }
             }
@@ -1373,18 +1383,37 @@ const handlePagination = (type, val) => {
         }
 
         .btns {
+            width: 100%;
             display: flex;
             align-items: center;
             justify-content: space-between;
             padding-bottom: 10px;
 
             .tabs {
+                width: 100%;
                 min-width: 300px;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
 
                 .btnItem {
                     margin-left: 10px;
                     border-radius: 5px;
                 }
+
+                .info-tooltip {
+                    display: flex;
+                    align-items: center;
+                }
+
+                .service-icon {
+                    color: #666;
+                    cursor: pointer;
+                    font-size: 18px;
+                    transition: all 0.3s ease;
+                    padding: 4px;
+                    border-radius: 50%;
+                }
             }
         }
 

src/views/moneyManage/receiveDetail/receiveService.vue

@@ -68,6 +68,16 @@
                     <div class="btnAdd">
                         <el-button @click="openAddForm" type="success">添加收款</el-button>
                     </div>
+                    <div class="info-tooltip">
+                        <el-popover placement="top" title="数据说明" :width="260" trigger="hover"
+                            content="收款的所有页面：订单记录默认按照付款时间降序排列" popper-class="custom-popover" :show-arrow="false">
+                            <template #reference>
+                                <el-icon class="service-icon">
+                                    <Warning />
+                                </el-icon>
+                            </template>
+                        </el-popover>
+                    </div>
                 </div>
 
                 <div class="table">
@@ -1112,6 +1122,20 @@ onMounted(async () => {
             .btnAdd {
                 padding-left: 10px;
             }
+
+            .info-tooltip {
+                display: flex;
+                align-items: center;
+            }
+
+            .service-icon {
+                color: #666;
+                cursor: pointer;
+                font-size: 18px;
+                transition: all 0.3s ease;
+                padding: 4px;
+                border-radius: 50%;
+            }
         }
 
         .table {