dmc
/
test-web
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge branch 'master' of https://gitee.com/dmc_qq/etc-project

master
shenbo781 3 years ago
parent
1b5880a7ed bb574dd68a
commit
9388e2041d
4 changed files with 408 additions and 285 deletions
Unified View Show Diff Stats
  1. 1
    1
      .env.development
  2. 1
    1
      .env.production
  3. 380
    248
      src/views/fancongcong/advancepaymentaccount/advancepaymentaccount.vue
  4. 26
    35
      src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue

+ 1
- 1
.env.development View File



# .env.development # .env.development
# base api # base api
VITE_APP_BASE_URL = 'http://localhost:8080'
VITE_APP_BASE_URL = '10.52.0.172:10389/csms/'

+ 1
- 1
.env.production View File



# .env.production # .env.production
# base api # base api
VITE_APP_BASE_URL = 'http://localhost:8080'
VITE_APP_BASE_URL = '10.52.0.172:10389/csms/'

+ 380
- 248
src/views/fancongcong/advancepaymentaccount/advancepaymentaccount.vue View File

<template> <template>
<div class="app_container">
<div class="menu">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="导入时间">
<div class="block">
<el-date-picker v-model="value1" type="datetime" placeholder="请选择申请开始时间" />
</div>
<el-icon>
<semi-select />
</el-icon>
<div class="block">
<el-date-picker v-model="value2" type="datetime" placeholder="请选择申请结束时间" />
</div>
</el-form-item>
<el-form-item label="对方账号">
<el-input v-model="formInline.user" placeholder="对方账号" />
</el-form-item>
<el-form-item label="对方户名">
<el-input v-model="formInline.user" placeholder="对方户名" />
</el-form-item>
<el-form-item label="交易流水编号">
<el-input v-model="formInline.user" placeholder="交易流水编号" />
</el-form-item>
<el-form-item>
<el-button :icon="Search" type="primary">查询</el-button>
<el-button type="info">重置</el-button>
<el-button type="primary">导入Excel</el-button>
<el-button type="primary">下载导入模板</el-button>
</el-form-item>
</el-form>
</div>
<el-table :data="tableData" border style="width: 100%" class="table_box" stripe >
<el-table-column prop="date" label="交易流水号" width="200px"/>
<el-table-column prop="name" label="交易时间" width="200px"/>
<el-table-column prop="address" label="支出金额" width="200px"/>
<el-table-column prop="number" label="收入金额" width="200px"/>
<el-table-column prop="time" label="对方账号" width="200px"/>
<el-table-column prop="type" label="对方户名" width="200px"/>
<el-table-column prop="regname" label="对方行名" width="200px"/>
<el-table-column prop="nonumber" label="对公账户账号" width="200px"/>
<el-table-column prop="use" label="用途" width="200px"/>
<el-table-column prop="nonumbers" label="附言" width="200px"/>
<el-table-column prop="usetype" label="摘要" width="200px"/>
<el-table-column label="操作" class="table_btn" width="500px" align="center">
<el-tooltip content="拒绝" placement="top">
<el-button type="warning" @click="опровергать">拒绝</el-button>
</el-tooltip>
<el-tooltip content="同意" placement="top">
<el-button type="warning" @click="agree">同意</el-button>
</el-tooltip>
<el-tooltip content="请输入对公账号" placement="top">
<el-button type="warning" @click="dialogFormVisible = true">请输入对公账号</el-button>
</el-tooltip>
</el-table-column>
</el-table>
<div class="page_box">
<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="1000" />
</div>
<el-dialog v-model="dialogFormVisible" :title="title">
<el-form :model="form">
<el-form-item label="输入对方对公账号" :label-width="formLabelWidth">
<el-input v-model="form.phone" autocomplete="off" disabled />
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormVisible = false">确定</el-button>
<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
</span>
</template>
</el-dialog>
</div>
<div class="app_container">
<div class="menu">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="导入时间">
<div class="block">
<el-date-picker v-model="start_time" type="datetime" placeholder="请选择申请开始时间"/>
</div>
<el-icon>
<semi-select/>
</el-icon>
<div class="block">
<el-date-picker v-model="end_time" type="datetime" placeholder="请选择申请结束时间"/>
</div>
</el-form-item>
<el-form-item label="对方账号">
<el-input v-model="formInline.Number" placeholder="对方账号"/>
</el-form-item>
<el-form-item label="对方户名">
<el-input v-model="formInline.coNumber" placeholder="对方户名"/>
</el-form-item>
<el-form-item label="交易流水编号">
<el-input v-model="formInline.user" placeholder="交易流水编号"/>
</el-form-item>
<el-form-item>
<el-button :icon="Search" type="primary" @click="grabble">查询</el-button>
<el-button type="info" @click="resive">重置</el-button>
<el-button type="primary">导入Excel</el-button>
<el-button type="primary">下载导入模板</el-button>
</el-form-item>
</el-form>
</div>
<el-table :data="tableData" border style="width: 100%" class="table_box" stripe>
<el-table-column prop="serialNo" label="交易流水号" width="200px"/>
<el-table-column prop="createTime" label="交易时间" width="200px"/>
<el-table-column prop="outFee" label="支出金额" width="200px"/>
<el-table-column prop="incomeFee" label="收入金额" width="200px"/>
<el-table-column prop="reciprocalAccount" label="对方账号" width="200px"/>
<el-table-column prop="reciprocalAccountName" label="对方户名" width="200px"/>
<el-table-column prop="reciprocalBankName" label="对方行名" width="200px"/>
<el-table-column prop="reciprocalAccountName" label="对公账户账号" width="200px"/>
<el-table-column prop="useage" label="用途" width="200px"/>
<el-table-column prop="remarks" label="附言" width="200px"/>
<el-table-column prop="snippet" label="摘要" width="200px"/>
<el-table-column label="操作" class="table_btn" width="500px" align="center">
<template v-slot="scope">
<el-tooltip content="拒绝" placement="top">
<el-button type="warning" @click="опровергать(scope.row)">拒绝</el-button>
</el-tooltip>
<el-tooltip content="同意" placement="top">
<el-button type="warning" @click="agree(scope.row)">同意</el-button>
</el-tooltip>
<el-tooltip content="请输入对公账号" placement="top">
<el-button type="warning" @click="opendialo">请输入对公账号</el-button>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<div class="page_box">
<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="pageCount" @current-change="pagechange"/>
</div>
<el-dialog v-model="dialogFormVisible" :title="title">
<el-form :model="form">
<el-form-item label="输入对方对公账号" :label-width="formLabelWidth">
<el-input v-model="form.phone" autocomplete="off"/>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="account">确定</el-button>
<el-button type="primary" @click="dialogFormVisible = false">关闭</el-button>
</span>
</template>
</el-dialog>

<el-dialog v-model="dialogFormVisibles" title="驳回申请">
<el-form :model="form">
<el-form-item label="驳回原因" :label-width="formLabelWidth">
<el-input v-model="form.data_msg" autocomplete="off" placeholder="请输入驳回原因"/>
</el-form-item>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="dialogFormVisibles = false">关闭</el-button>
<el-button type="primary" @click="getMsg">确定</el-button>
</span>
</template>
</el-dialog>
</div>
</template> </template>


<script lang="ts" setup> <script lang="ts" setup>
//模块导入
import {
Search
} from '@element-plus/icons-vue'
import {
reactive,
ref
} from 'vue'
import {ElMessage, ElMessageBox} from 'element-plus'
//模块导入
import { Search } from '@element-plus/icons-vue'
import { reactive, ref, getCurrentInstance, onMounted } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'


//变量声明
const formInline = reactive({
user: '',
region: '',
})
const onSubmit = () => {
console.log('submit!')
}
let title = ref("对公账户信息")
const options = [{
value: '',
label: '全部',
},
{
value: '1',
label: '驳回',
},
{
value: '0',
label: '待审核',
},
{
value: '1',
label: '已启用',
},
{
value: '2',
label: '待修改初始密码',
},
]
let value1 = ref('')
let value2 = ref('')
let value3 = ref('')
let value4 = ref('')
let dialogTableVisible = ref(false)
let dialogFormVisible = ref(false)
let formLabelWidth = '140px'
let form = reactive({
phone: '13078580843',//手机号
region: '',//验证码
delivery: false,//是否展示详细
number:''//对公账户资金账户编号
})
const optiones = [{
value: '2',
label: '2',
},
{
value: '6',
label: '6',
},
{
value: '10',
label: '10',
},
{
value: '15',
label: '15',
},
{
value: '30',
label: '30',
},
]
const defaultTime = new Date(2000, 1, 1, 12, 0, 0)
const shortcuts = [{
text: 'Today',
value: new Date(),
},
{
text: 'Yesterday',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24)
return date
},
},
{
text: 'A week ago',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
return date
},
},
]
const tableData = [
{
date: '34625032',
name: '2022-05-07',
address: '0.0',
number: "5000.0",
time: "2021-06-22T12:52:17",
type: "23921001040002085",
regname: "贵州省黔西南州水文水资源局",
regtime: "中国农业银行股份有限公司兴义南盘江支行",
nonumber:"szm123456",
nonumbers:"贵E15389充ETC",
use:"测试",
usetype:"小额来账自动入账"
}
]
//变量声明
const { proxy } = getCurrentInstance()
const formInline = ref({
user:'',
region: '',
number:'',
coNumber:'',
user:'',
})
const onSubmit = () => {
console.log('submit!')
}
let title = ref('对公账户信息')
const options = [
{
value: '',
label: '全部'
},
{
value: '1',
label: '驳回'
},
{
value: '0',
label: '待审核'
},
{
value: '1',
label: '已启用'
},
{
value: '2',
label: '待修改初始密码'
}
]
let start_time = ref('') //申请选择开始时间
let end_time = ref('') //申请选择结束时间
let value3 = ref('')
let value4 = ref('')
let pageNo = ref(1)
let dialogTableVisible = ref(false)
let dialogFormVisible = ref(false)
let dialogFormVisibles = ref(false)
let pageCount = ref(0) //总页数
let formLabelWidth = '140px'
let form = reactive({
phone: '13078580843', //手机号
region: '', //验证码
delivery: false, //是否展示详细
number: '', //对公账户资金账户编号
data_msg:'',//驳回原因
data_id:''//点击表格获取的id
})
const optiones = [
{
value: '2',
label: '2'
},
{
value: '6',
label: '6'
},
{
value: '10',
label: '10'
},
{
value: '15',
label: '15'
},
{
value: '30',
label: '30'
}
]
const defaultTime = new Date(2000, 1, 1, 12, 0, 0)
const shortcuts = [
{
text: 'Today',
value: new Date()
},
{
text: 'Yesterday',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24)
return date
}
},
{
text: 'A week ago',
value: () => {
const date = new Date()
date.setTime(date.getTime() - 3600 * 1000 * 24 * 7)
return date
}
}
]
const tableData = ref([
{
accountId: 11,
channelId: 53,
channelName: 'LMJVTSCAA',
createTime: '1984/01/11 16:42:41',
fileName: 'LGCRFGITS',
filePath: 'MHWXGWCPR',
id: '820000199611275614',
incomeFee: 78,
outFee: 91,
reason: 'JMQOEDBRD',
reciprocalAccount: 'CUCUQBHPR',
reciprocalAccountName: 'SGUUYJEIJ',
reciprocalBankName: 'JIUPWBXSY',
remarks: 'HVLJOFURE',
serialNo: 'MBBHHKVNX',
snippet: 'PPFAKYCKG',
staffId: 'MQWJVIMRO',
staffName: 'JQLOMWANP',
status: 1,
transTime: 'MYHFJBLCP',
updateTime: '1982/10/14 13:50:50',
useage: 'OYQYKVWPG'
}
])


//事件
//同意申请
const agree = (row) => {
console.log(row.id)
dialogFormVisible.value = false;
ElMessageBox.confirm('确定通过这个申请?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
proxy.$request.post('/advancepayment/confirm', {}, {
        baseURL: 'http://localhost:8089',
id:row.id,
// message:form.data_msg,
value:0
    }).then((res) => {
        console.log(res,form.data_id,form.value);
if(res.data.success){
ElMessage({
type: 'success',
message: '操作成功！'
})
grabble()
}
    }).catch((err) => {
        console.log(err);
    })
})
.catch(() => {
ElMessage({
type: '取消',
message: '已取消'
})
})
}
//驳回申请
const опровергать = (row) => {
dialogFormVisible.value = false;
form.data_id = row.id
ElMessageBox.confirm('确定驳回这个申请?', '警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
})
.then(() => {
dialogFormVisibles.value = true;
})
.catch(() => {
ElMessage({
type: '取消',
message: '已取消'
})
})
}
//驳回申请原因
const getMsg=()=>{
proxy.$request.post('/advancepayment/confirm', {}, {
        baseURL: 'http://localhost:8089',
id:form.data_id,
message:form.data_msg,
value:1
    }).then((res) => {
console.log(res,form.data_id,form.data_msg);
if(res.data.success){
ElMessage({
type: 'success',
message: '操作成功！'
})
dialogFormVisibles.value = false;
grabble()
}
    }).catch((err) => {
        console.log(err);
    })
}


//事件
//同意申请
const agree = (id:any) => {
ElMessageBox.confirm(
'确定同意?',
'警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
ElMessage({
type: 'success',
message: '操作成功！',
})
})
.catch(() => {
ElMessage({
type: '取消',
message: '已取消',
})
})
}
//驳回申请
const опровергать = (id:any) => {
ElMessageBox.confirm(
'确定拒绝?',
'警告', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning',
}
)
.then(() => {
ElMessage({
type: 'success',
message: '操作成功！',
})
})
.catch(() => {
ElMessage({
type: '取消',
message: '已取消',
})
})
//搜索
const grabble = () => {
let data = {
corporateAccountId: 'string',
endTime: '2020/01/01 00:00:00',
pageNo: 0,
pageSize: 0,
startTime: '2020/01/01 00:00:00',
type: 0,
baseURL: 'http://localhost:8089'
}

proxy.$request
.post('/advancepayment/queryPage', {}, data)
.then((res) => {
console.log(res, form.data_id, form.value)
if (res.data.success) {
tableData.value = res.data.result
console.log('res', tableData)
pageCount.value = res.data.pageCount
}
})
.catch((err) => {
console.log(err)
})
}

onMounted(() => {
grabble()
})

//获取当前页数据
const pagechange = (el) => {
console.log('el', el)
pageNo.value = el
grabble()
}

//重置
const resive = () => {
console.log('重置')
start_time.value = '';
end_time.value = '';
formInline.value.number= '';
formInline.value.coNumber = '';
formInline.value.user= '';
}

//填入对方对公账号
const account = ()=>{
let data = {
id:form.data_id,
accountId:form.phone,
baseURL: 'http://localhost:8089'
} }
proxy.$request.post('/advancepayment/account', {}, data).then((res) => {
console.log(res, form.data_id, form.value)
if (res.data.success) {
dialogFormVisible.value = false;
grabble();
}
})
.catch((err) => {
console.log(err)
})
}
//打开填写对公账户的弹窗
const opendialo = (row)=>{
form.data_id = row.id;
dialogFormVisible.value = true;
}
</script> </script>


<style lang="scss"> <style lang="scss">
.app_container {
padding: 20px;
display: flex;
flex-direction: column;
.app_container {
padding: 20px;
display: flex;
flex-direction: column;


.table_box {
margin-top: 25px;
.table_btn{
display: flex;
flex-direction: column;
align-self: stretch;
align-content: space-around;
align-items: flex-start;
}
}
.table_box {
margin-top: 25px;
.table_btn {
display: flex;
flex-direction: column;
align-self: stretch;
align-content: space-around;
align-items: flex-start;
}
}


.page_box {
margin-top: 25px;
}
}
.page_box {
margin-top: 25px;
}
}
</style> </style>

+ 26
- 35
src/views/fancongcong/corporateaccountManage/corporateaccountManage.vue View File

<el-form :inline="true" :model="formInline" class="demo-form-inline"> <el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="申请时间"> <el-form-item label="申请时间">
<div class="block"> <div class="block">
<el-date-picker v-model="start_time" type="datetime" placeholder="请选择申请开始时间"/>
<el-date-picker v-model="start_time" type="datetime" placeholder="请选择申请开始时间" format="YYYY/MM/DD" value-format="YYYY/MM/DD"/>
</div> </div>
<el-icon> <el-icon>
<semi-select/> <semi-select/>
</el-icon> </el-icon>
<div class="block"> <div class="block">
<el-date-picker v-model="end_time" type="datetime" placeholder="请选择申请结束时间"/>
<el-date-picker v-model="end_time" type="datetime" placeholder="请选择申请结束时间" format="YYYY/MM/DD" value-format="YYYY/MM/DD"/>
</div> </div>
</el-form-item> </el-form-item>
<el-form-item label="账号状态"> <el-form-item label="账号状态">
</el-table> </el-table>


<div class="page_box"> <div class="page_box">
<el-pagination :page-size="pageSize" :pager-count="15" layout="prev, pager, next" :total="pageCount"/>
<el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="pageCount" @current-change="pagechange"/>
</div> </div>


<el-dialog v-model="dialogFormVisible" :title="title" :show-close="false"> <el-dialog v-model="dialogFormVisible" :title="title" :show-close="false">
bankCardId:"", bankCardId:"",
corporateIdNum:formInline.number, corporateIdNum:formInline.number,
corporateName: formInline.user, corporateName: formInline.user,
endApplyTime:end_time,
endApplyTime:end_time.value,
pageNo:pageNo, pageNo:pageNo,
pageSize:номер, pageSize:номер,
startApplyTime:start_time,
startApplyTime:start_time.value,
status:cтатус_счета, status:cтатус_счета,
baseURL:'http://localhost:8089', baseURL:'http://localhost:8089',
} }
proxy.$request.post('/corporateaccount/queryPage', {},data).then((res) => { proxy.$request.post('/corporateaccount/queryPage', {},data).then((res) => {
        console.log(res);         console.log(res);
if(res.data.success){ if(res.data.success){
tableData.value = res.data.result
console.log("res",tableData)
pageCount.value = res.data.pageCount;
} }
    }).catch((err) => {     }).catch((err) => {
        console.log(err,form.delivery);         console.log(err,form.delivery);
} }


onMounted(() => { onMounted(() => {
getList()
 })

//获取详细信息，打开弹窗
const getDetil=(val)=>{
// form.value.data_id = id;
dialogFormVisible.value = true;
try {
form.data_id = val.id;
console.log("dedil_id",form.data_id);
} catch (error) {
}
}
search()
})


//获取查询数据
const getList = ()=>{
proxy.$request.post('/corporateaccount/queryPage', {}, {
        baseURL:'http://localhost:8089',
    }).then((res) => {
        console.log(res.data.result,res.data.success);
if(res.data.success){
tableData.value = res.data.result
console.log("res",tableData)
pageCount.value = res.data.pageCount;
}
    }).catch((err) => {
        console.log(err);
    })
//获取详细信息，打开弹窗
const getDetil=(val)=>{
// form.value.data_id = id;
dialogFormVisible.value = true;
try {
form.data_id = val.id;
console.log("dedil_id",form.data_id);
} catch (error) {
} }

}
//获取当前页数据
const pagechange = (el)=>{
console.log("el",el)
pageNo.value = el;
search()
}
</script> </script>


<style lang="scss"> <style lang="scss">

Write Preview
Loading…
Cancel
Save