Browse Source

9.29收款明细进度更新

zhangyong/milestone-20250913-现金管理
ZhangYong 1 week ago
parent
commit
57a95e2948
  1. 2
      .env.development
  2. 1
      .gitignore
  3. 327
      src/views/moneyManage/receiveDetail/receiveDetail.vue
  4. 2
      stats.html

2
.env.development

@ -13,4 +13,4 @@ VITE_UPLOAD_URL=http://39.101.133.168:8828/hljw/api/aws/upload
# 本地 # 本地
#VITE_API_BASE='http://localhost:8081/' #VITE_API_BASE='http://localhost:8081/'
# sunjiabei # sunjiabei
# VITE_API_BASE='http://192.168.0.34:8081/'
# VITE_API_BASE='http://192.168.1.70:8081/'

1
.gitignore

@ -25,3 +25,4 @@ dist-ssr
# 忽略 # 忽略
stats.html stats.html
.env.development .env.development
stats.html

327
src/views/moneyManage/receiveDetail/receiveDetail.vue

@ -100,7 +100,22 @@
</el-table-column> </el-table-column>
<el-table-column prop="permanentGold" label="付款金额" width="120px"> <el-table-column prop="permanentGold" label="付款金额" width="120px">
</el-table-column> </el-table-column>
<el-table-column prop="freeGold" label="支付方式" width="110px">
<el-table-column prop="moneyType" label="到账币种" v-if="caiwu && activeTab == 'pass'" width="150px" ></el-table-column>
<el-table-column prop="getMoney" 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" >
<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> </el-table-column>
<el-table-column prop="remark" label="付款时间" width="100px" /> <el-table-column prop="remark" label="付款时间" width="100px" />
<el-table-column prop="payModel" label="转账凭证" width="110px"> <el-table-column prop="payModel" label="转账凭证" width="110px">
@ -116,7 +131,11 @@
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="" label="备注" width="150px" show-overflow-tooltip>
<el-table-column prop="bankOrder" label="银行流水订单号" v-if="caiwu && activeTab == 'pass'" width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="submiter" label="提交人" width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="auditor" label="审核人" v-if="caiwu && activeTab == 'pass'" width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="mask" label="备注" width="150px" show-overflow-tooltip></el-table-column>
<el-table-column prop="getMoneyTime" label="到账时间" v-if="caiwu && activeTab == 'pass'" width="150px" show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column v-if="kefu" fixed="right" prop="orderStatus" label="订单状态" width="100px" /> <el-table-column v-if="kefu" fixed="right" prop="orderStatus" label="订单状态" width="100px" />
<el-table-column fixed="right" label="操作" width="100px" v-if="activeTab != 'reject'"> <el-table-column fixed="right" label="操作" width="100px" v-if="activeTab != 'reject'">
@ -129,7 +148,7 @@
<span v-else-if="activeTab == 'wait' && !kefu" style="color: #2741DE;" <span v-else-if="activeTab == 'wait' && !kefu" style="color: #2741DE;"
@click="openAuditForm">审核</span> @click="openAuditForm">审核</span>
<span v-else-if="activeTab == 'pass' && !kefu" style="color: #2741DE;" <span v-else-if="activeTab == 'pass' && !kefu" style="color: #2741DE;"
@click="openEditForm">编辑</span>
@click="openEditForm(scope.row)">编辑</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -205,7 +224,7 @@
<el-input v-model="auditFormData.userName" placeholder="请输入客户姓名" /> <el-input v-model="auditFormData.userName" placeholder="请输入客户姓名" />
</el-form-item> </el-form-item>
<el-form-item label="所属地区"> <el-form-item label="所属地区">
<el-input readonly v-model="auditFormData.market" />
<el-input disabled="true" v-model="auditFormData.market" />
</el-form-item> </el-form-item>
<el-form-item label="活动名称"> <el-form-item label="活动名称">
<el-input v-model="auditFormData.jwcode" placeholder="请输入活动名称" /> <el-input v-model="auditFormData.jwcode" placeholder="请输入活动名称" />
@ -272,16 +291,16 @@
<div class="left"> <div class="left">
<el-form class="editForm" label-width="4.5vw" label-position="left"> <el-form class="editForm" label-width="4.5vw" label-position="left">
<el-form-item label="精网号"> <el-form-item label="精网号">
<el-input v-model="openEditForm.jwcode" placeholder="请输入驳回理由" />
<el-input v-model="editFormData.jwcode" placeholder="请输入驳回理由" />
</el-form-item> </el-form-item>
<el-form-item label="客户姓名"> <el-form-item label="客户姓名">
<el-input v-model="openEditForm.userName" placeholder="请输入客户姓名" />
<el-input v-model="editFormData.userName" placeholder="请输入客户姓名" />
</el-form-item> </el-form-item>
<el-form-item label="所属地区"> <el-form-item label="所属地区">
<el-input disabled="true" v-model="openEditForm.market" placeholder="请输入所属地区" />
<el-input disabled="true" v-model="editFormData.market" placeholder="请输入所属地区" />
</el-form-item> </el-form-item>
<el-form-item label="活动名称"> <el-form-item label="活动名称">
<el-input v-model="openEditForm.jwcode" placeholder="请输入活动名称" />
<el-input v-model="editFormData.jwcode" placeholder="请输入活动名称" />
</el-form-item> </el-form-item>
<el-form-item label="产品名称"> <el-form-item label="产品名称">
<el-select placeholder="请选择产品名称" clearable></el-select> <el-select placeholder="请选择产品名称" clearable></el-select>
@ -290,13 +309,13 @@
<el-select placeholder="请选择付款币种" clearable></el-select> <el-select placeholder="请选择付款币种" clearable></el-select>
</el-form-item> </el-form-item>
<el-form-item label="付款金额"> <el-form-item label="付款金额">
<el-input v-model="openEditForm.jwcode" placeholder="请输入付款金额" />
<el-input v-model="editFormData.jwcode" placeholder="请输入付款金额" />
</el-form-item> </el-form-item>
<el-form-item label="支付方式"> <el-form-item label="支付方式">
<el-select placeholder="请选择支付方式" clearable></el-select> <el-select placeholder="请选择支付方式" clearable></el-select>
</el-form-item> </el-form-item>
<el-form-item label="付款时间"> <el-form-item label="付款时间">
<el-time-picker v-model="openEditForm.time" placeholder="请选择付款时间" />
<el-time-picker v-model="editFormData.time" placeholder="请选择付款时间" />
</el-form-item> </el-form-item>
<el-form-item label="转账凭证"> <el-form-item label="转账凭证">
<div class="pic"> <div class="pic">
@ -304,7 +323,7 @@
list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload" list-type="picture-card" :auto-upload="false" :before-upload="beforeUpload"
:on-error="handelImgErr" :on-change="handleImageChange" :on-error="handelImgErr" :on-change="handleImageChange"
:http-request="customUpload"> :http-request="customUpload">
<img v-if="auditFormData.imageUrl" :src="auditFormData.imageUrl" class="avatar"
<img v-if="editFormData.imageUrl" :src="editFormData.imageUrl" class="avatar"
style="height: 100%; width: 100%; object-fit: cover;" /> style="height: 100%; width: 100%; object-fit: cover;" />
<el-icon v-else class="avatar-uploader-icon"> <el-icon v-else class="avatar-uploader-icon">
<Plus /> <Plus />
@ -323,29 +342,34 @@
</div> </div>
<div class="right"> <div class="right">
<el-form class="editFormRighrt" label-width="4.5vw" label-position="left"> <el-form class="editFormRighrt" label-width="4.5vw" label-position="left">
<el-form-item label="精网号">
<el-input v-model="openEditForm.jwcode" placeholder="请输入驳回理由" />
</el-form-item>
<el-form-item label="客户姓名">
<el-input v-model="openEditForm.userName" placeholder="请输入客户姓名" />
</el-form-item>
<el-form-item label="所属地区">
<el-input disabled="true" v-model="openEditForm.market" placeholder="请输入所属地区" />
<el-form-item label="到账货币">
<el-select placeholder="请选择产品名称" clearable></el-select>
</el-form-item> </el-form-item>
<el-form-item label="活动名称">
<el-input v-model="openEditForm.jwcode" placeholder="请输入活动名称" />
<el-form-item label="到账金额">
<el-input v-model="addFormData.userName" placeholder="请输入到账金额" />
</el-form-item> </el-form-item>
<el-form-item label="产品名称">
<el-select placeholder="请选择产品名称" clearable></el-select>
<el-form-item label="手续费">
<el-input disabled="true" v-model="addFormData.market" placeholder="请输入手续费" />
</el-form-item> </el-form-item>
<el-form-item label="付款币种">
<el-select placeholder="请选择付款币种" clearable></el-select>
<el-form-item label="银行流水订单号">
<el-input v-model="addFormData.jwcode" placeholder="请输入银行流水订单号" />
</el-form-item> </el-form-item>
<el-form-item label="驳回理由">
<el-input v-model="addFormData.mask" type="textarea" :rows="4" placeholder="请输入驳回理由"
maxlength="100" show-word-limit />
<el-form-item label="到账时间">
<el-input v-model="addFormData.jwcode" placeholder="请输入到账时间" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<span class="editBtns">
<button class="editBtn1">
<text class="txt">
取消
</text>
</button>
<button class="editBtn2">
<text class="txt">
提交
</text>
</button>
</span>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@ -356,6 +380,7 @@ import { ref, watch } from 'vue';
import { ElMessage } from 'element-plus' import { ElMessage } from 'element-plus'
import API from '@/util/http.js' import API from '@/util/http.js'
import { color } from 'echarts'; import { color } from 'echarts';
import { template } from 'lodash';
//==================== ========================= //==================== =========================
const activeTab = ref('wait') const activeTab = ref('wait')
@ -453,12 +478,14 @@ const customUpload = async (options) => {
} }
} }
//================== =========================
//================== =========================
const editFormData = ref({ const editFormData = ref({
}) })
const editFormisible = ref(false) const editFormisible = ref(false)
const openEditForm = () => {
const openEditForm = (row) => {
console.log('编辑时该行数据:',row);
editFormData.value = row
editFormisible.value = true editFormisible.value = true
} }
const closeEditForm = () => { const closeEditForm = () => {
@ -513,80 +540,124 @@ const pageInfo = ref({
const total = ref(0) const total = ref(0)
const tableData = [ const tableData = [
{
jwcode: 'HW2023001',
name: '张三',
market: '北京',
activity: '春季促销活动',
rateName: '黄金投资产品A',
money: '人民币',
permanentGold: '5000.00',
freeGold: '银行转账',
remark: '2023-03-15 10:30:00',
voucher: 'https://example.com/images/voucher1.jpg',
orderStatus: '待审核',
},
{
jwcode: 'HW2023002',
name: '李四',
market: '上海',
activity: '夏日特惠活动',
rateName: '白银理财产品B',
money: '人民币',
permanentGold: '3000.00',
freeGold: '支付宝',
remark: '2023-06-20 14:15:00',
voucher: 'https://example.com/images/voucher2.jpg',
orderStatus: '已通过',
},
{
jwcode: 'HW2023003',
name: '王五',
market: '广州',
activity: '秋季回馈活动',
rateName: '铂金收藏产品C',
money: '美元',
permanentGold: '1000.00',
freeGold: '微信支付',
remark: '2023-09-10 09:20:00',
voucher: '',
orderStatus: '已撤回',
},
{
jwcode: 'HW2023004',
name: '赵六',
market: '深圳',
activity: '冬季感恩活动',
rateName: '钻石尊享产品D',
money: '欧元',
permanentGold: '1000.00',
freeGold: '信用卡',
remark: '2023-12-05 16:40:00',
voucher: 'https://example.com/images/voucher4.jpg',
orderStatus: '已驳回',
rejectReason: '无',
},
{
jwcode: 'HW2023005',
name: '孙七',
market: '成都',
activity: '周年庆典活动',
rateName: '翡翠投资产品E',
money: '人民币',
permanentGold: '8000.00',
freeGold: '银行转账',
remark: '2024-01-20 11:10:00',
voucher: '',
orderStatus: '已驳回',
}
];
{
"jwcode": "HM2024001",
"name": "张三",
"market": "华东区",
"activity": "2024春季促销活动",
"rateName": "年度会员套餐A",
"money": "人民币",
"permanentGold": 2980.00,
"moneyType": "人民币",
"getMoney": 2980.00,
"shouxufei": 59.60,
"pastType": "支付宝转账",
"remark": "2024-05-10 09:23",
"voucher": "https://example.com/voucher/1.jpg",
"payModel": "https://example.com/icon/alipay.png",
"bankOrder": "ALIPAY2024051000001",
"submiter": "李四(运营部)",
"auditor": "王五(财务部)",
"mask": "客户主动购买,无特殊备注",
"getMoneyTime": "2024-05-10 10:05",
"orderStatus": "已通过"
},
{
"jwcode": "HM2024002",
"name": "李四",
"market": "华北区",
"activity": "新客首单优惠",
"rateName": "季度体验套餐B",
"money": "美元",
"permanentGold": 99.00,
"moneyType": "人民币",
"getMoney": 712.00,
"shouxufei": 14.24,
"pastType": "PayPal",
"remark": "2024-05-11 14:56",
"voucher": "https://example.com/voucher/2.jpg",
"payModel": "https://example.com/icon/paypal.png",
"bankOrder": "PAYPAL2024051100002",
"submiter": "赵六(国际部)",
"auditor": "孙七(财务部)",
"mask": "跨境支付,汇率按当日中间价计算",
"getMoneyTime": "2024-05-12 08:30",
"orderStatus": "待审核"
},
{
"jwcode": "HM2024003",
"name": "王五",
"market": "华南区",
"activity": "老客召回活动",
"rateName": "月度续费套餐C",
"money": "人民币",
"permanentGold": 399.00,
"moneyType": "人民币",
"getMoney": null,
"shouxufei": null,
"pastType": "微信支付",
"remark": "2024-05-12 11:18",
"voucher": "https://example.com/voucher/3.jpg",
"payModel": "https://example.com/icon/wechat.png",
"bankOrder": "WECHAT2024051200003",
"submiter": "钱八(客服部)",
"auditor": null,
"mask": "到账信息待财务补充",
"getMoneyTime": null,
"orderStatus": "已撤回"
},
{
"jwcode": "HM2024004",
"name": "赵六",
"market": "西区",
"activity": "企业团购活动",
"rateName": "企业定制套餐D",
"money": "人民币",
"permanentGold": 15800.00,
"moneyType": "人民币",
"getMoney": 15800.00,
"shouxufei": 316.00,
"pastType": "银行对公转账",
"remark": "2024-05-13 09:45",
"voucher": "https://example.com/voucher/4.jpg",
"payModel": "https://example.com/icon/bank.png",
"bankOrder": "BANK2024051300004",
"submiter": "周九(销售部)",
"auditor": "吴十(财务部)",
"mask": "10人企业团单,享受95折优惠",
"getMoneyTime": "2024-05-13 11:20",
"orderStatus": "已通过"
},
{
"jwcode": "HM2024005",
"name": "孙七",
"market": "东北区",
"activity": "节日特惠活动",
"rateName": "年度会员套餐A",
"money": "人民币",
"permanentGold": 2780.00,
"moneyType": "人民币",
"getMoney": 2780.00,
"shouxufei": 55.60,
"pastType": "银联支付",
"remark": "2024-05-14 15:30",
"voucher": null,
"payModel": null,
"bankOrder": "UNIONPAY2024051400005",
"submiter": "郑一(市场部)",
"auditor": "王二(财务部)",
"mask": "凭证暂未上传,已提醒客户补充",
"getMoneyTime": "2024-05-14 16:45",
"orderStatus": "待审核"
}
]
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.content {
.content { //
height: 100%; height: 100%;
width: 83vw; width: 83vw;
.card1 {
.card1 { //
width: 100%; width: 100%;
.row { .row {
@ -613,12 +684,12 @@ const tableData = [
} }
.card2 {
.card2 { // card
width: 100%; width: 100%;
margin-top: 2vh; margin-top: 2vh;
.btns {
.btns { //
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
@ -652,7 +723,7 @@ const tableData = [
} }
} }
:deep(.adddialog) {
:deep(.adddialog) { //
min-width: 500px; min-width: 500px;
background-color: #F3FAFE !important; background-color: #F3FAFE !important;
margin-top: 8vh; margin-top: 8vh;
@ -702,7 +773,7 @@ const tableData = [
} }
} }
:deep(.editdialog) {
:deep(.editdialog) { //
min-width: 990px; min-width: 990px;
background-color: #F3FAFE !important; background-color: #F3FAFE !important;
margin-top: 8vh; margin-top: 8vh;
@ -744,7 +815,7 @@ const tableData = [
} }
.content {
.content { //
display: flex; display: flex;
height: 100%; height: 100%;
width: 100%; width: 100%;
@ -757,7 +828,7 @@ const tableData = [
flex: 1; flex: 1;
.editFormRighrt { .editFormRighrt {
padding: 0 60px 1vh 40px;
padding: 0 60px 0 40px;
.el-date-editor { .el-date-editor {
display: flex; display: flex;
@ -789,13 +860,57 @@ const tableData = [
} }
} }
} }
.editBtns {
display: flex;
justify-content: center;
margin-top: 60px;
.txt {
color: #f3fafe;
text-align: center;
font-family: "PingFang SC";
font-size: 14px;
font-style: normal;
font-weight: 700;
line-height: 22px;
}
.editBtn1 {
min-width: 80px;
padding: 5px 12px;
justify-content: center;
align-items: center;
gap: 4px;
border-radius: 4px;
background: #7E91FF;
border: none;
box-shadow: 0 0 4px 0 #00000040;
}
.editBtn2 {
display: flex;
width: 80px;
min-width: 80px;
padding: 5px 12px;
justify-content: center;
align-items: center;
gap: 4px;
border-radius: 4px;
background: #2741DE;
border: none;
box-shadow: 0 0 4px 0 #00000040;
margin-left: 60px;
}
}
} }
} }
} }
:deep(.adddialog .el-form-item__label) {
:deep(.adddialog .el-form-item__label) { //
min-width: 80px; min-width: 80px;
width: auto; width: auto;
font-weight: 800; font-weight: 800;

2
stats.html
File diff suppressed because it is too large
View File

Loading…
Cancel
Save