Browse Source

lihuilin/feature-20251104102812-现金二期
lhl 1 week ago
parent
commit
957e464c84
  1. 6
      src/views/moneyManage/executor/executor.vue
  2. 4
      src/views/moneyManage/refundDetail/refundCharge.vue
  3. 4
      src/views/moneyManage/refundDetail/refundFinance.vue
  4. 18
      src/views/moneyManage/refundDetail/refundHeader.vue
  5. 2
      src/views/moneyManage/refundDetail/refundService.vue

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

@ -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,//1012
// 2022
@ -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
}
}

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

@ -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,//1012
// 2022
@ -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,//1012
// 2022

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

@ -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,//1012
// 2022
@ -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,//1012
// 2022

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

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

@ -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,//1012
// 2022

Loading…
Cancel
Save