Browse Source

编辑校验,活动bug修改

lihuilin/feature-20251104102812-现金二期
ZhangYong 2 weeks ago
parent
commit
a182ab2685
  1. 2
      src/components/MoneyManage/ProductSelect.vue
  2. 26
      src/views/moneyManage/receiveDetail/receiveService.vue

2
src/components/MoneyManage/ProductSelect.vue

@ -137,7 +137,7 @@ watch(selectedValue, (newVal) => {
const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机构活跃度','AI机构探测神器'] const AIProduct = ['AI机构追踪', 'AI机构出击', 'AI机构资金', 'AI机构活跃度','AI机构探测神器']
const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘','超级机构探测神器'] const superProduct = ['超级机构透视', '超级机构伏击', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘','超级机构探测神器']
const InfoFee = ['静态信息费', '博股会员']
const InfoFee = ['静态信息费', '博股会员','HC信息费']
const menuData = [ const menuData = [
{ {
name: '美股', name: '美股',

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

@ -66,7 +66,6 @@
<div class="div-card2"> <div class="div-card2">
<el-card class="card2"> <el-card class="card2">
<div class="btns"> <div class="btns">
<!-- 删除财务专属的标签页切换 -->
<div class="btnAdd"> <div class="btnAdd">
<el-button @click="openAddForm" type="success">添加收款</el-button> <el-button @click="openAddForm" type="success">添加收款</el-button>
</div> </div>
@ -405,7 +404,7 @@ import { hasMenuPermission } from '@/utils/menuTreePermission.js'
import _ from 'lodash' import _ from 'lodash'
// //
import { addFormRule } from './utils/recriveFormRules.js' import { addFormRule } from './utils/recriveFormRules.js'
import { productList, MarketNameForId, CurrencyForId, marketList, statusList, numUnitList } from './utils/staticData.js'
import { productList, MarketNameForId, CurrencyForId, marketList, statusList } from './utils/staticData.js'
// ===================== ===================== // ===================== =====================
const adminStore = useAdminStore(); const adminStore = useAdminStore();
@ -414,6 +413,7 @@ const adminData = ref({}) // 管理员信息
const tableData = ref([]) // const tableData = ref([]) //
const total = ref(0) // const total = ref(0) //
const pageInfo = ref({ pageSize: 10, pageNum: 1 }) // const pageInfo = ref({ pageSize: 10, pageNum: 1 }) //
const numUnitList = ref(['年', '月'])
// //
const kefu = ref(true) const kefu = ref(true)
@ -532,10 +532,13 @@ const ifGold = () => {
const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机构活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费'] const selectItems = ["AI机构追踪", "AI机构出击", "AI机构资金", "AI机构活跃度", "超级机构透视", "超级机构伏击", "超级机构猎杀", "超级机构脉搏", "超级机构罗盘", 'HC信息费']
if (selectItems.includes(addFormData.value.goodsName)) { if (selectItems.includes(addFormData.value.goodsName)) {
addFormData.value.numUnit = '' addFormData.value.numUnit = ''
numUnitList.value = ['年', '月']
} else if (addFormData.value.goodsName == '静态信息费') { } else if (addFormData.value.goodsName == '静态信息费') {
addFormData.value.numUnit = '年' addFormData.value.numUnit = '年'
numUnitList.value = ['年']
} else { } else {
addFormData.value.numUnit = '个' addFormData.value.numUnit = '个'
numUnitList.value = ['个']
} }
} }
} }
@ -549,6 +552,12 @@ const ifGroup = () => {
} else if (addFormData.value.payType === 'Ipay88-链接收款') { } else if (addFormData.value.payType === 'Ipay88-链接收款') {
isGroup.value = true isGroup.value = true
addFormData.value.receivedMarket = '马来西亚' addFormData.value.receivedMarket = '马来西亚'
} else if (addFormData.value.payType === 'E-Transfer') {
isGroup.value = true
addFormData.value.receivedMarket = '加拿大'
} else if (addFormData.value.payType === 'Grabpay' || addFormData.value.payType === 'Nets' || addFormData.value.payType === 'Paypal') {
isGroup.value = true
addFormData.value.receivedMarket = '新加坡'
} else { } else {
isGroup.value = false isGroup.value = false
} }
@ -561,12 +570,12 @@ const jwcodeSeachMarket = async () => {
url: '/cashCollection/getNameAndMarket', url: '/cashCollection/getNameAndMarket',
data: addFormData.value.jwcode data: addFormData.value.jwcode
}) })
if(result.code == 200){
if (result.code == 200) {
ElMessage.success('客户信息查询成功') ElMessage.success('客户信息查询成功')
addFormData.value.market = result.data.market addFormData.value.market = result.data.market
addFormData.value.marketName = result.data.marketName addFormData.value.marketName = result.data.marketName
addFormData.value.name = result.data.name addFormData.value.name = result.data.name
}else{
} else {
ElMessage.error('客户不存在') ElMessage.error('客户不存在')
} }
} catch (error) { } catch (error) {
@ -580,7 +589,9 @@ const openAddForm = (row) => {
if (row?.jwcode) { if (row?.jwcode) {
// //
addOrEdit.value = 2 addOrEdit.value = 2
addFormData.value = { ...row }
addFormData.value = { ...row,
activity: row.activityId
}
jwcodeSeachMarket() jwcodeSeachMarket()
ifGold() ifGold()
} else { } else {
@ -636,6 +647,7 @@ const handleAddForm = async () => {
// //
const handleEditForm = async () => { const handleEditForm = async () => {
try { try {
await addFormRef.value.validate();
// //
if (addFormData.value.payTime) { if (addFormData.value.payTime) {
addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss')
@ -665,7 +677,7 @@ const handleEditForm = async () => {
// //
const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)']) const customOptions = ref(['美元(USD)', '港币(HKD)', '新币(SGD)', '马币(MYR)', '泰铢(THB)', '加币(CAD)', '越南盾(VDN)', '韩元(KRW)'])
const paytypeOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal"])
const paytypeOptions = ref(["Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款", "Grabpay", "Nets", "E-Transfer", "Paypal", "银行转账", "刷卡", "现金", "支票"])
const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡', '泰国', '越南HCM', '加拿大']) const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡', '泰国', '越南HCM', '加拿大'])
const handleCurrencyChange = (option) => { const handleCurrencyChange = (option) => {
console.log('选中的币种:', option); console.log('选中的币种:', option);
@ -828,7 +840,7 @@ const submitRefund = async () => {
try { try {
if (refundFormData.value.refundModel == 0) { if (refundFormData.value.refundModel == 0) {
refundFormData.value.partRefundGold = refundFormData.value.permanentGold, refundFormData.value.partRefundGold = refundFormData.value.permanentGold,
refundFormData.value.partRefundFree = refundFormData.value.freeGold
refundFormData.value.partRefundFree = refundFormData.value.freeGold
} }
const result = await request({ const result = await request({
url: '/Money/add', url: '/Money/add',

Loading…
Cancel
Save