Browse Source

lihuilin/feature-20251104102812-现金二期
lihuilin 1 week ago
parent
commit
85290ba848
  1. 16
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  2. 12
      src/views/moneyManage/receiveDetail/receiveHead.vue
  3. 12
      src/views/moneyManage/receiveDetail/receiveManage.vue
  4. 6
      src/views/moneyManage/receiveDetail/receiveService.vue
  5. 2
      src/views/usergold/gold/clientCountDetail.vue

16
src/views/moneyManage/receiveDetail/receiveFinance.vue

@ -611,7 +611,7 @@ import moment from 'moment';
import _ from 'lodash';
import { Plus } from '@element-plus/icons-vue';
import { startsWith } from './utils/util.js'
import { isNumber } from 'lodash'
//
import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue';
@ -752,6 +752,11 @@ const exportExcel = async function () {
payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const cashRoleId = '1';
const submitterMarket = adminData.value.markets;
searchData.value.status = 46;
@ -867,6 +872,11 @@ const getlist = async () => {
payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
// ID=1
const cashRoleId = '1';
const receivedMarket = adminData.value.markets;
@ -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
}
}
});

12
src/views/moneyManage/receiveDetail/receiveHead.vue

@ -503,7 +503,7 @@ import moment from 'moment';
import _ from 'lodash';
import { Plus } from '@element-plus/icons-vue';
import { startsWith } from './utils/util.js'
import { isNumber } from 'lodash'
//
const market = ref([])
@ -609,6 +609,11 @@ const exportExcel = async function () {
payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const cashRoleId = '2';
const submitterMarket = adminData.value.markets;
searchData.value.status = 46;
@ -765,6 +770,11 @@ const getlist = async () => {
console.log('地区转换', markets.value)
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const result = await request({
url: '/cashCollection/selectCollection',
data: {

12
src/views/moneyManage/receiveDetail/receiveManage.vue

@ -611,7 +611,7 @@ import moment from 'moment';
import _ from 'lodash';
import { Plus } from '@element-plus/icons-vue';
import { startsWith } from './utils/util.js'
import { isNumber } from 'lodash'
//
const market = ref([])
@ -752,6 +752,11 @@ const exportExcel = async function () {
payCurrencySelect = CurrencyForId(searchData.value.paymentCurrency);
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const cashRoleId = '1';
const submitterMarket = adminData.value.markets;
searchData.value.status = 46;
@ -882,6 +887,11 @@ const getlist = async () => {
console.log('地区转换', markets.value)
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const result = await request({
url: '/cashCollection/selectCollection',
data: {

6
src/views/moneyManage/receiveDetail/receiveService.vue

@ -414,6 +414,7 @@ import moment from 'moment'
import { useAdminStore } from '@/store/index.js'
import { hasMenuPermission } from '@/utils/menuTreePermission.js'
import _ from 'lodash'
import { isNumber } from 'lodash'
//
import { addFormRule } from './utils/recriveFormRules.js'
import { productList, MarketNameForId, CurrencyForId, marketList, statusList } from './utils/staticData.js'
@ -510,6 +511,11 @@ const getlist = async () => {
searchData.value.market = ''
}
if (searchData.value.jwcode && !isNumber(searchData.value.jwcode)) {
ElMessage.error('精网号只能是数字')
return
}
const result = await request({
url: '/cashCollection/selectCollection',
data: {

2
src/views/usergold/gold/clientCountDetail.vue

@ -138,7 +138,7 @@ const get = async function (val) {
if (typeof val === 'number') {
getObj.value.pageNum = val
}
if (getTime.value.length === 2) {//
if (getTime.value && getTime.value.length === 2) {//
goldDetail.value.startTime = moment(getTime.value[0]).format('YYYY-MM-DD HH:mm:ss');
goldDetail.value.endTime = moment(getTime.value[1]).format('YYYY-MM-DD HH:mm:ss');
} else {

Loading…
Cancel
Save