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

查询接口对接

zhangyong/milestone-20250913-现金管理
ZhangYong 2 months ago
parent
9404923330
commit
b3a4f6b264
3 changed files with 108 additions and 185 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. 4
      .env.development
  2. 54
      src/components/MoneyManage/ProductSelect.vue
  3. 235
      src/views/moneyManage/receiveDetail/receiveDetail.vue

4
.env.development
View File

@ -1,4 +1,4 @@
VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# VITE_API_BASE='https://hwjb.homilychart.com/dev/admin'
# 测试环境
# VITE_API_BASE='http://54.255.212.181:10704/'
# 正式环境
@ -11,6 +11,6 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# zhangyong
# VITE_API_BASE='http://192.168.3.83:8081/'
# 本地
#VITE_API_BASE='http://localhost:8081/'
VITE_API_BASE='http://localhost:8081/'
# sunjiabei
# VITE_API_BASE='http://192.168.1.70:8081/'

54
src/components/MoneyManage/ProductSelect.vue
View File

@ -38,8 +38,17 @@
</div>
<div class="productOption" v-show="productisOpen">
<hr class="line">
<div class="checktxt">软件</div>
<div class="marketprodut">
<div class="one">
<div class="firstMenu" v-for="(menu, index) in menuData" :key="menu.name" @click="clickmenu(index)">
{{ menu.name }}
<el-icon>
<ArrowDown />
</el-icon>
</div>
</div>
<hr class="line">
</div>
<div class="ai">
<div class="checktxt">AI机构探测神器</div>
@ -77,6 +86,7 @@
import { ref, watch, onMounted } from 'vue';
import { ArrowDown } from '@element-plus/icons-vue';
const searchData = ref('')
const isOpen = ref(false)
const coinisOpen = ref(false)
@ -113,7 +123,20 @@ const selectedValue = ref([])
const AIProduct = ['AI机构追踪', 'AI机构出击 ', 'AI机构资金', 'AI机活跃度']
const superProduct = ['超级机构透视', '超级机构伏击 ', '超级机构猎杀', '超级机构脉搏', '超级机构罗盘']
const InfoFee = ['静态信息费']
const menuData = [
{
name: '美股',
options: ['美服软件', '美服金卡', '美服套餐']
},
{
name: '新加坡股',
options: ['新加坡软件', '新加坡服务']
},
{
name: '韩股',
options: ['韩服工具', '韩服会员']
}
];
// 监听金币充值选中状态变化
watch(isCoinRechargeChecked, (newVal) => {
if (newVal) {
@ -138,6 +161,11 @@ watch(selectedSoftwareItems, (newVals) => {
selectedItem.value = selectedValue.value[0] || '';
});
//软件相关
const activeIndex = ref(false)
const clickmenu = (index) => {
}
onMounted(() => {
const initValue = props.modelValue;
if (initValue.length === 0) return;
@ -263,23 +291,21 @@ onMounted(() => {
border-top: 1px solid #7E91FF;
}
.checktxt {
color: #5870ff;
font-family: "PingFang SC";
font-size: 13px;
font-style: normal;
font-weight: 700;
line-height: 22px;
margin: 10px 20px;
}
.productOption {
width: 100%;
.ai {
width: 100%;
.checktxt {
color: #5870ff;
font-family: "PingFang SC";
font-size: 13px;
font-style: normal;
font-weight: 700;
line-height: 22px;
margin: 10px 20px;
}
}
}
}

235
src/views/moneyManage/receiveDetail/receiveDetail.vue
View File

@ -5,33 +5,34 @@
<div class="row">
<div class="rowItem">
<el-text style="width: 4vw;">精网号</el-text>
<el-input placeholder="请输入精网号" style="width:10vw;" clearable></el-input>
<el-input v-model="searchData.jwcode" placeholder="请输入精网号" style="width:10vw;"
clearable></el-input>
</div>
<div class="rowItem">
<el-text style="width: 4vw;">客户姓名</el-text>
<el-input placeholder="请输入客户姓名" style="width:10vw;" clearable></el-input>
<el-input v-model="searchData.name" placeholder="请输入客户姓名" style="width:10vw;" clearable></el-input>
</div>
<div class="rowItem">
<el-text style="width: 4vw;">所属地区</el-text>
<el-select placeholder="请选择所属地区" style="width:10vw;" clearable></el-select>
<el-select v-model="searchData.market" placeholder="请选择所属地区" style="width:10vw;" clearable></el-select>
</div>
<div class="rowItem">
<el-text style="width: 4vw;">订单状态</el-text>
<el-select placeholder="请选择订单状态" style="width: 10vw;" clearable></el-select>
<el-select v-model="searchData.status" placeholder="请选择订单状态" style="width: 10vw;" clearable></el-select>
</div>
<div class="rowItem">
<el-text style="width: 4vw;">支付方式</el-text>
<el-select placeholder="请选择支付方式" style="width: 10vw;" clearable></el-select>
<el-select v-model="searchData.payType" placeholder="请选择支付方式" style="width: 10vw;" clearable></el-select>
</div>
</div>
<div class="row" style="margin-top: 10px;">
<div class="rowItem">
<el-text style="width: 4vw;">活动名称</el-text>
<el-select placeholdert="请选择活动方式" style="width: 10vw;" clearable></el-select>
<el-select v-model="searchData.activity" placeholdert="请选择活动方式" style="width: 10vw;" clearable></el-select>
</div>
<div class="rowItem">
<el-text style="width: 4vw;">产品名称</el-text>
<el-select placeholder="请选择产品名称" style="width: 10vw;" clearable></el-select>
<el-select v-model="searchData.goodsName" placeholder="请选择产品名称" style="width: 10vw;" clearable></el-select>
</div>
<div class="rowItem" style="width: 30vw">
<el-text style="width: 4vw; margin-left: 0.5vw;">付款时间</el-text>
@ -43,7 +44,7 @@
</div>
<div class="row" style="margin-top: 10px;">
<div class="buttons">
<el-button type="primary">查询</el-button>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="success">重置</el-button>
<el-button type="primary">导出excel</el-button>
<el-button type="primary" style="background-color: #5870FF;">导出列表</el-button>
@ -95,32 +96,32 @@
<el-table-column fixed="left" prop="name" label="姓名" width="110px" />
<el-table-column prop="market" label="所属地区" width="80px" />
<el-table-column prop="activity" label="活动名称" width="120px" />
<el-table-column prop="rateName" label="产品名称" width="120px" />
<el-table-column prop="rateNum" label="产品数量" width="120px" />
<el-table-column prop="moneyType" label="付款币种" width="100px">
<el-table-column prop="goodsName" label="产品名称" width="120px" />
<el-table-column prop="goodNum" label="产品数量" width="120px" />
<el-table-column prop="paymentCurrency" label="付款币种" width="100px">
</el-table-column>
<el-table-column prop="permanentGold" label="付款金额" width="120px">
<el-table-column prop="paymentAmount" label="付款金额" width="120px">
</el-table-column>
<el-table-column prop="getMoneyType" label="到账币种" v-if="caiwu && activeTab == 'pass'"
<el-table-column prop="receivedCurrency" label="到账币种" v-if="caiwu && activeTab == 'pass'"
width="150px"></el-table-column>
<el-table-column prop="getMoney" label="到账金额" v-if="caiwu && activeTab == 'pass'" width="150px">
<el-table-column prop="receivedAmount" label="到账金额" v-if="caiwu && activeTab == 'pass'" width="150px">
<template #default="scope">
<div v-if="!scope.row.getMoney">
<text style="color: #FA5A1E;">待补充</text>
</div>
</template>
</el-table-column>
<el-table-column prop="shouxufei" label="手续费" v-if="caiwu && activeTab == 'pass'" width="150px">
<el-table-column prop="handlingCharge" label="手续费" v-if="caiwu && activeTab == 'pass'" width="150px">
<template #default="scope">
<div v-if="!scope.row.shouxufei">
<text style="color: #FA5A1E;">待补充</text>
</div>
</template>
</el-table-column>
<el-table-column prop="pastType" label="支付方式" width="110px">
<el-table-column prop="payType" label="支付方式" width="110px">
</el-table-column>
<el-table-column prop="remark" label="付款时间" width="100px" />
<el-table-column prop="payModel" label="转账凭证" width="110px">
<el-table-column prop="payTime" label="付款时间" width="100px" />
<el-table-column prop="voucher" label="转账凭证" width="110px">
<template #default="scope">
<div v-if="scope.row.voucher"
style="display: flex; justify-content: center; align-items: center; cursor: pointer;"
@ -133,9 +134,9 @@
</div>
</template>
</el-table-column>
<el-table-column prop="bankOrder" label="银行流水订单号" v-if="caiwu && activeTab == 'pass'"
<el-table-column prop="bankCode" label="银行流水订单号" v-if="caiwu && activeTab == 'pass'"
width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="submiter" label="提交人" width="150px"
<el-table-column prop="submitterName" label="提交人" width="150px"
show-overflow-tooltip></el-table-column>
<el-table-column prop="auditor" label="审核人" v-if="caiwu && activeTab == 'pass' || 'reject'"
width="150px" show-overflow-tooltip></el-table-column>
@ -220,7 +221,7 @@
<el-input v-model="addFormData.jwcode" placeholder="请输入活动名称" />
</el-form-item>
<el-form-item label="产品名称" required>
<ProductSelect v-model="addFormData.rateName"></ProductSelect>
<ProductSelect v-model="addFormData.rateName"></ProductSelect>
</el-form-item>
<el-form-item label="产品数量" required>
<div style="padding-right: 50px; display: flex;">
@ -240,7 +241,8 @@
</CurrencySelect>
</el-form-item>
<el-form-item label="到账地区" required>
<CurrencySelect v-model="addFormData.MoneyAddress" :items="MoneyAddressOptions" placeholder="请选择支付方式">
<CurrencySelect v-model="addFormData.MoneyAddress" :items="MoneyAddressOptions"
placeholder="请选择支付方式">
</CurrencySelect>
</el-form-item>
<el-form-item label="付款时间" required>
@ -447,6 +449,46 @@ import { color } from 'echarts';
import { template } from 'lodash';
import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'
import ProductSelect from '@/components/MoneyManage/ProductSelect.vue'
import { Search } from '@element-plus/icons-vue';
import request from '@/util/http.js'
//===================== 查询相关 =================================
const tableData = ref([])
const searchData = ref({
})
const getTime = ref({
startTime:'',
endTime:''
})
const search = ()=>{
getlist()
}
//获得表格数据接口
const getlist = async () => {
try {
const result = await request({
url: '/cashCollection/selectCollection',
data: {
...pageInfo.value,
cashCollection: {
...searchData.value,
...getTime.value
}
}
})
console.log('返回参数：',result);
tableData.value = result.list
ElMessage.success('查询成功')
} catch(error) {
console.log(error);
}
}
//==================== 标签切换 =========================
const activeTab = ref('wait')
@ -503,7 +545,7 @@ const customOptions = ref(['新币', '马币', '港币', '美元', '英镑', '
//支付方式
const paytypeOptions = ref(["银行转账", "刷卡", "现金", "支票", "Grabpay", "Nets", "E-Transfer", "Paypal", "Stripe-链接收款", "PaymentAsia-链接收款", "Ipay88-链接收款"])
const MoneyAddressOptions = ref(['马来西亚','香港','新加坡'])
const MoneyAddressOptions = ref(['马来西亚', '香港', '新加坡'])
const handleCurrencyChange = (option) => {
console.log('选中的币种:', option);
};
@ -675,152 +717,7 @@ const handleMouseMove = (e) => {
// Y坐标与鼠标保持一致（垂直居中对齐）
tooltipTop.value = e.clientY - 10;
};
const tableData = [
{
"jwcode": "HM20240601",
"name": "张三",
"market": "华东区",
"activity": "2024年中促销",
"rateName": "年度会员套餐A",
"moneyType": "人民币",
"permanentGold": 2980.00,
"getMoneyType": "人民币",
"getMoney": 2980.00,
"shouxufei": 59.60,
"pastType": "支付宝转账",
"remark": "2024-06-01 09:30",
"voucher": "https://mock-img.com/voucher/2024060101.jpg",
"payModel": "https://mock-img.com/icon/alipay.png",
"bankOrder": "ALIPAY202406010001",
"submiter": "李四（运营部）",
"auditor": "王五（财务部）",
"mask": "客户主动购买，无特殊需求",
"rejectTime": null,
"rejectReason": null,
"getMoneyTime": "2024-06-01 10:15",
"orderStatus": "已撤回"
},
{
"jwcode": "HM20240602",
"name": "李四",
"market": "华北区",
"activity": "新客首单优惠",
"rateName": "季度体验套餐B",
"moneyType": "美元",
"permanentGold": 99.00,
"getMoneyType": "人民币",
"getMoney": 712.50,
"shouxufei": 14.25,
"pastType": "PayPal",
"remark": "2024-06-02 14:15",
"voucher": "https://mock-img.com/voucher/2024060201.jpg",
"payModel": "https://mock-img.com/icon/paypal.png",
"bankOrder": "PAYPAL202406020001",
"submiter": "赵六（国际部）",
"auditor": "孙七（财务部）",
"mask": "跨境支付，汇率按当日中间价计算",
"rejectTime": null,
"rejectReason": null,
"getMoneyTime": "2024-06-02 16:40",
"orderStatus": "已通过"
},
{
"jwcode": "HM20240603",
"name": "王五",
"market": "华南区",
"activity": "老客召回活动",
"rateName": "月度续费套餐C",
"moneyType": "人民币",
"permanentGold": 399.00,
"getMoneyType": null,
"getMoney": null,
"shouxufei": null,
"pastType": "微信支付",
"remark": "2024-06-03 11:20",
"voucher": "https://mock-img.com/voucher/2024060301.jpg",
"payModel": "https://mock-img.com/icon/wechat.png",
"bankOrder": null,
"submiter": "钱八（客服部）",
"auditor": null,
"mask": "待财务补充到账信息",
"rejectTime": null,
"rejectReason": null,
"getMoneyTime": null,
"orderStatus": "待审核"
},
{
"jwcode": "HM20240604",
"name": "赵六",
"market": "西区",
"activity": "企业团购活动",
"rateName": "企业定制套餐D",
"moneyType": "人民币",
"permanentGold": 15800.00,
"getMoneyType": null,
"getMoney": null,
"shouxufei": null,
"pastType": "银行对公转账",
"remark": "2024-06-04 09:05",
"voucher": null,
"payModel": null,
"bankOrder": null,
"submiter": "周九（销售部）",
"auditor": "吴十（财务部）",
"mask": null,
"rejectTime": "2024-06-04 10:30",
"rejectReason": "未上传转账凭证，需补充后重新提交",
"getMoneyTime": null,
"orderStatus": "已驳回"
},
{
"jwcode": "HM20240605",
"name": "孙七",
"market": "东北区",
"activity": "节日特惠活动",
"rateName": "年度会员套餐A",
"moneyType": "人民币",
"permanentGold": 2780.00,
"getMoneyType": "人民币",
"getMoney": 2780.00,
"shouxufei": 55.60,
"pastType": "银联支付",
"remark": "2024-06-05 15:40",
"voucher": "https://mock-img.com/voucher/2024060501.jpg",
"payModel": "https://mock-img.com/icon/unionpay.png",
"bankOrder": "UNION202406050001",
"submiter": "郑一（市场部）",
"auditor": "王二（财务部）",
"mask": "客户使用节日优惠券，已核减200元",
"rejectTime": null,
"rejectReason": null,
"getMoneyTime": "2024-06-05 16:25",
"orderStatus": "已通过"
},
{
"jwcode": "HM20240606",
"name": "周八",
"market": "华北区",
"activity": "新客首单优惠",
"rateName": "季度体验套餐B",
"moneyType": "人民币",
"permanentGold": 359.00,
"getMoneyType": null,
"getMoney": null,
"shouxufei": null,
"pastType": "微信支付",
"remark": "2024-06-06 13:10",
"voucher": "https://mock-img.com/voucher/2024060601.jpg",
"payModel": "https://mock-img.com/icon/wechat.png",
"bankOrder": null,
"submiter": "吴九（客服部）",
"auditor": "郑十（财务部）",
"mask": null,
"rejectTime": "2024-06-06 14:00",
"rejectReason": "付款金额与订单金额不符（订单359元，实付349元）",
"getMoneyTime": null,
"orderStatus": "已驳回"
}
]
</script>
<style scoped lang="scss">
.content {

Write Preview
Loading…
Cancel
Save