huangqizhen
/
gold-vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'milestone-20251104-现金二期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20251104-现金二期

lihuilin/feature-20251104102812-现金二期
zhangrenyuan 1 week ago
parent
ce53f8ffbd 8073772130
commit
f978327d9f
10 changed files with 175 additions and 27 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 48
      src/views/home.vue
  2. 6
      src/views/moneyManage/executor/executor.vue
  3. 33
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  4. 26
      src/views/moneyManage/receiveDetail/receiveHead.vue
  5. 37
      src/views/moneyManage/receiveDetail/receiveManage.vue
  6. 24
      src/views/moneyManage/receiveDetail/receiveService.vue
  7. 4
      src/views/moneyManage/refundDetail/refundCharge.vue
  8. 4
      src/views/moneyManage/refundDetail/refundFinance.vue
  9. 18
      src/views/moneyManage/refundDetail/refundHeader.vue
  10. 2
      src/views/moneyManage/refundDetail/refundService.vue

48
src/views/home.vue
View File

@ -14,7 +14,7 @@ import goTop from '@/assets/SvgIcons/go-top.svg'
import {getOrderPage} from '@/utils/goToCheck.js'
import {groupMessages} from "@/utils/getMessage.js"
import {findMenuById,permissionMapping} from "@/utils/menuTreePermission.js"
import {useMessageStore} from '@/store/index.js'
// ------------------ ICONS ------------------
@ -128,13 +128,57 @@ const toggleFlag = () => {
const messageStore = useMessageStore()
const {messages} = storeToRefs(messageStore)
//根据用户id查询消息状态
const selectStatusById = () => {
// 定义权限检查函数
const hasPermission = (permission) => findMenuById(menuTree.value, permission);
// 初始化状态数组
const status = [];
// ===== 收款流程状态 =====
// 地区财务收款待审核
if (hasPermission(permissionMapping.area_finance_collection_pending)) {
status.push(0);
}
// 地区负责人收款待审核
else if (hasPermission(permissionMapping.area_manager_collection_pending)) {
status.push(0);
}
// ===== 退款流程状态 =====
// 地区财务退款审核
if (hasPermission(permissionMapping.audit_area_finance_refund)) {
status.push(10);
}
// 地区负责人退款审核
else if (hasPermission(permissionMapping.audit_area_manager_refund)) {
status.push(20);
}
// 总部财务退款审核
else if (hasPermission(permissionMapping.audit_headquarters_refund)) {
status.push(30);
}
// 执行人待处理
else if (hasPermission(permissionMapping.view_execution_details)) {
status.push(40);
}
// 去重并返回结果（单一角色下实际不会有重复）
return [...new Set(status)];
};
console.log('权限测试',selectStatusById());
// 获取消息
const getMessage = async () => {
try {
let params = {status: selectStatusById()};
const res = await API({
url: '/getMessage',
method: 'POST',
data: {}
data: params
});
if (res?.data) {

6
src/views/moneyManage/executor/executor.vue
View File

@ -13,7 +13,7 @@
<el-text size="large" style="width:4vw;">产品名称</el-text>
<el-cascader v-model="searchForm.goodsName" :options="productList" style="width: 10vw;" clearable />
</div>
<div class="search">
<div class="search" v-if="adminData.markets === '总部'">
<el-text size="large" style="width:4vw;">所属地区</el-text>
<el-cascader style="width: 9vw;" v-model="searchForm.markets" :options="market" placeholder="请选择所属地区"
clearable />
@ -295,7 +295,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,
name: searchForm.value.name,
markets: searchForm.value.markets,
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,
statuses: statusesParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；
@ -306,7 +306,7 @@ const getRefund = async function () {
sTime: dateRange.value && dateRange.value[0] ? dayjs(dateRange.value[0]).format('YYYY-MM-DD HH:mm:ss') : "",
eTime: dateRange.value && dateRange.value[1] ? dayjs(dateRange.value[1]).format('YYYY-MM-DD HH:mm:ss') : "",
adminId: adminData.value.id,
account: adminData.value.account,
executor: adminData.value.account,
refundChannels: searchForm.value.refundChannels
}
}

33
src/views/moneyManage/receiveDetail/receiveFinance.vue
View File

@ -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%;
}
}
}

26
src/views/moneyManage/receiveDetail/receiveHead.vue
View File

@ -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%;
}
}

37
src/views/moneyManage/receiveDetail/receiveManage.vue
View File

@ -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%;
}
}
}

24
src/views/moneyManage/receiveDetail/receiveService.vue
View File

@ -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 {

4
src/views/moneyManage/refundDetail/refundCharge.vue
View File

@ -436,7 +436,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statuses.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；
@ -607,7 +607,7 @@ const exportExcel = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statuses.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；

4
src/views/moneyManage/refundDetail/refundFinance.vue
View File

@ -490,7 +490,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；
@ -658,7 +658,7 @@ const exportExcel = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
markets: searchForm.value.markets,//地区
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；

18
src/views/moneyManage/refundDetail/refundHeader.vue
View File

@ -37,7 +37,7 @@
<div class="item2">
<el-text size="large" style="width:4vw;">支付方式</el-text>
<el-select v-model="searchForm.payType" style="width:9vw;" placeholder="请选择支付方式" clearable>
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
<el-option v-for="item in channelOptions" :key="item" :label="item" :value="item" />
</el-select>
</div>
<div class="item2" style="width: 28.5vw;">
@ -477,7 +477,7 @@ const getRefund = async function () {
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
ElMessage.error('精网号必须为数字')
return
}
@ -488,7 +488,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,
name: searchForm.value.name,
markets: searchForm.value.markets,
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,
statuses: statusParam.value,
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),
@ -622,12 +622,12 @@ const exportExcel = async function () {
}
const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
ElMessage.error('精网号必须为数字')
return
}
if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
ElMessage.error('精网号必须为数字')
return
}
const params = {
pageNum: pagination.value.pageNum,
@ -635,7 +635,7 @@ const exportExcel = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,
name: searchForm.value.name,
markets: searchForm.value.markets,
markets: searchForm.value.markets && searchForm.value.markets.length > 0 ? [searchForm.value.markets[searchForm.value.markets.length - 1]] : [],
goodsName: goodsName,
statuses: statusParam.value,
paymentCurrency: CurrencyForId(searchForm.value.paymentCurrency),

2
src/views/moneyManage/refundDetail/refundService.vue
View File

@ -297,7 +297,7 @@ const getRefund = async function () {
cashRecordDTO: {
jwcode: searchForm.value.jwcode,//精网号
name: searchForm.value.name,//姓名
markets: searchForm.value.market,//地区
markets: searchForm.value.market && searchForm.value.market.length > 0 ? [searchForm.value.market[searchForm.value.market.length - 1]] : [],
goodsName: goodsName,//商品名
statuses: statusParam.value,//10：地区财务待审核；12：地区财务驳回；
// 20：地区负责人待审核；22：地区负责人驳回；

Write Preview
Loading…
Cancel
Save