Commit e0b54889 authored by caimeng's avatar caimeng

下班前提交一下

parent d79805f6
......@@ -6,7 +6,8 @@
<el-row>
<el-col v-for='(o, index) in clientIdCardInfoResponse' :key='index' :span='4' :offset='index > 0 ? 1 : 0'>
<el-card :body-style="{ padding: '10px' }">
<el-image class='el-card-image' :src='o[1]' @click.native='showImgViewer(clientIdCardInfoResponse,"idCard")'></el-image>
<el-image class='el-card-image' :src='o[1]'
@click.native='showImgViewer(clientIdCardInfoResponse,"idCard")'></el-image>
<div class='el-card-intro'>
<span v-if='o[0]==="frontImgPath"'>身份证正面</span>
<span v-else>身份证反面</span>
......@@ -21,7 +22,8 @@
<el-row>
<el-col v-for='(o, index) in faceInfoResponse' :key='index' :span='4' :offset='index > 0 ? 1 : 0'>
<el-card :body-style="{ padding: '10px' }">
<el-image class='el-card-image' :src='o[1]' @click.native='showImgViewer(faceInfoResponse,"face")'></el-image>
<el-image class='el-card-image' :src='o[1]'
@click.native='showImgViewer(faceInfoResponse,"face")'></el-image>
<div class='el-card-intro'>
<span v-if='o[0]==="panoramaImgPath"'>全景照</span>
<span v-else-if='o[0]==="randomImgPath"'>随机照</span>
......@@ -38,26 +40,31 @@
<el-row>
<el-col v-for='(o, index) in creditAttachInfo' :key='index' :span='4' :offset='index > 0 ? 1 : 0'>
<el-card :body-style="{ padding: '10px' }">
<el-image class='el-card-image' :src='o.echoList[0]'
@click.native='showImgViewer(o.echoList,"annex")'></el-image>
<el-image class='el-card-image' :src='o.screenList[0]'
@click.native='showImgViewer(o.screenList,"annex")'></el-image>
<div class='el-card-intro'>
<span>{{ o.tit }}</span>
<span>{{ o.attachTypeStr }}</span>
</div>
</el-card>
</el-col>
</el-row>
</template>
<template v-if='supplAttachInfo.length'>
<block-header title='客户附件信息' />
<el-row v-if='false'>
<el-col v-for='(o, index) in data.PRODUCTS' :key='index' :span='4' :offset='index > 0 ? 1 : 0'>
<el-row>
<el-col v-for='(o, index) in supplAttachInfo' :key='index' :span='4' :offset='index > 0 ? 1 : 0'>
<el-card :body-style="{ padding: '10px' }">
<el-image class='el-card-image' :src='o.content' :preview-src-list='imgList'></el-image>
<el-image class='el-card-image' :src='o.screenList[0]'
@click.native='showImgViewer(o.screenList,"annex")'></el-image>
<div class='el-card-intro'>
<span>{{ o.name }}</span>
<span>{{ o.attachTypeStr }}</span>
</div>
</el-card>
</el-col>
</el-row>
</template>
<!--机审报告-->
<template v-if='reportResponse!==null'>
......@@ -94,7 +101,7 @@
clientIdCardInfoResponse: [],
reportResponse: null,
thirdPartyReport: null,
supplAttachInfo: [],
imgViewerVisible: false,
imgList: []
......@@ -108,18 +115,18 @@
creditAttachInfo,
faceInfoResponse,
reportResponse,
thirdPartyReport
thirdPartyReport,
supplAttachInfo
} = this.info
this.data = this.info
this.approvalResultResponse = approvalResultResponse
this.clientIdCardInfoResponse = Object.entries(clientIdCardInfoResponse)
this.faceInfoResponse = Object.entries(faceInfoResponse)
this.creditAttachInfo = JSON.parse(creditAttachInfo)
this.creditAttachInfo = creditAttachInfo // 授信图片信息
this.reportResponse = reportResponse
this.thirdPartyReport = thirdPartyReport
console.log(creditAttachInfo, '信息')
this.supplAttachInfo = supplAttachInfo // 附件信息
},
methods: {
......@@ -130,11 +137,11 @@
case 'face':
const arr = []
item.forEach(o => {
console.log(o,'是啥');
console.log(o, '是啥')
arr.push(o[1])
})
console.log(arr,'预览图片的地址');
console.log(arr, '预览图片的地址')
this.imgList = arr
......
......@@ -7,6 +7,7 @@ import ApprovalResult from '@/components/approval-result'
import AuditResult from '@/components/audit-result'
import UserBaseInfo from '@/components/user-base-info'
import UserProjectInfo from '@/components/user-project-info'
import moment from 'moment'
export default {
name: 'Minix',
......@@ -22,6 +23,53 @@ export default {
UserProjectInfo,
'el-image-viewer': () => import('element-ui/packages/image/src/image-viewer')
},
data(){
return {
datePickerOptions:{
shortcuts: [
{
text: '今日',
onClick: (picker) => {
const end = new Date()
const start = moment().format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
picker.$emit('pick', [startTime, end]);
},
},
{
text: '昨日',
onClick: (picker) => {
const end = moment().subtract(1, 'days').format('YYYY-MM-DD')
const start = moment().subtract(1, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end} 23:59:59`
picker.$emit('pick', [startTime, endTime]);
},
},
{
text: '最近7天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(7, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime]);
},
},
{
text: '最近30天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(30, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime]);
},
}
],
},
}
},
methods: {
onReset(formName) {
if (formName) {
......
import request from "@/utils/request";
import request from '@/utils/request'
// 登录
export default {
// 登录
login(data) {
return request({
url: "/login",
method: "post",
url: '/login',
method: 'post',
data
});
})
},
// 登出
logout(data) {
return request({
url: "/login/logout",
method: "post",
url: '/login/logout',
method: 'post',
data
});
})
},
// 用户信息
userInfo(params) {
return request({
url: "/user/get",
method: "get",
url: '/user/get',
method: 'get',
params
});
})
},
// 发送验证码
send_msg_code(data) {
return request({
url: "/login/sendLoginSms",
method: "post",
url: '/login/sendLoginSms',
method: 'post',
data
});
})
},
// 获取菜单列表
menu(params) {
return request({
url: "/sysUser/getRouters",
method: "get",
url: '/sysUser/getRouters',
method: 'get',
params
});
})
},
// 商户列表
merchant_list(data) {
return request({
url: "/macy/selectMacyList",
method: "post",
url: '/macy/selectMacyList',
method: 'post',
data
});
})
},
// 商户新增
merchant_add(data) {
return request({
url: "/macy/createdMacy",
method: "post",
url: '/macy/createdMacy',
method: 'post',
data
});
})
},
// 商户更新
merchant_update(data) {
return request({
url: "/macy/editMacy",
method: "post",
url: '/macy/editMacy',
method: 'post',
data
});
})
},
// 商户详情
merchant_view(params) {
return request({
url: "/macy/selectMacyByTenantNo",
method: "get",
url: '/macy/selectMacyByTenantNo',
method: 'get',
params
});
})
},
// 产品列表
merchant_select(params) {
return request({
url: "/macy/selectList",
method: "get",
url: '/macy/selectList',
method: 'get',
params
});
})
},
// 产品列表
prod_list(data) {
return request({
url: "/macy/selectProductPageList",
method: "post",
url: '/macy/selectProductPageList',
method: 'post',
data
});
})
},
// 产品新增
prod_add(data) {
return request({
url: "/macy/createdProductInfo",
method: "post",
url: '/macy/createdProductInfo',
method: 'post',
data
});
})
},
// 产品编辑
prod_update(data) {
return request({
url: "/macy/editProductInfo",
method: "post",
url: '/macy/editProductInfo',
method: 'post',
data
});
})
},
// 产品上下架
prod_switch_upDown(params) {
return request({
url: "/macy/editProductInfoByStatus",
method: "get",
url: '/macy/editProductInfoByStatus',
method: 'get',
params
});
})
},
// 产品查看
prod_view(params) {
return request({
url: "/macy/selectProductInfoByappNo",
method: "get",
url: '/macy/selectProductInfoByappNo',
method: 'get',
params
});
})
},
// 申请列表
apply_list(data) {
return request({
url: "/zeus/pageQueryApply",
method: "post",
url: '/zeus/pageQueryApply',
method: 'post',
data
});
})
},
// 推送
apply_push(params) {
return request({
url: "/zeus/applyRetryPush",
method: "get",
url: '/zeus/applyRetryPush',
method: 'get',
params
});
})
},
// 公告列表
notice_list(data) {
return request({
url: "/smgw/getBackPageList",
method: "post",
url: '/smgw/getBackPageList',
method: 'post',
data
});
})
},
// 公告发送
notice_add(data) {
return request({
url: "/smgw/sendZnx",
method: "post",
url: '/smgw/sendZnx',
method: 'post',
data
});
})
},
// 公告编辑
notice_detail(data) {
return request({
url: "/smgw/getNotice",
method: "post",
url: '/smgw/getNotice',
method: 'post',
data
});
})
},
// 公告编辑
notice_edit(data) {
return request({
url: "/smgw/updateNotice",
method: "post",
url: '/smgw/updateNotice',
method: 'post',
data
});
})
},
// 回现APP设置
app_setting(params) {
return request({
url: "/manage/getList",
method: "get",
url: '/manage/getList',
method: 'get',
params
});
})
},
// 变更状态
app_setting_update(data) {
return request({
url: "/manage/update",
method: "post",
url: '/manage/update',
method: 'post',
data
});
})
},
// 变更状态
dict(params) {
return request({
url: "/dictData/selectBydictType",
method: "get",
url: '/dictData/selectBydictType',
method: 'get',
params
});
})
},
......@@ -200,64 +200,101 @@ export default {
// 预授信列表
preCreditList(data) {
return request({
url: "/credit/preList",
method: "post",
url: '/credit/preList',
method: 'post',
data
});
})
},
// 预授信详情
preCreditDetail(params) {
return request({
url: "/credit/preDetail",
method: "get",
url: '/credit/preDetail',
method: 'get',
params
});
})
},
// 预授信申述
preCreditPlead(params) {
return request({
url: "/credit/preSubmit",
method: "post",
url: '/credit/preSubmit',
method: 'post',
data
});
})
},
// 授信列表
creditList(data) {
return request({
url: "/credit/creditList",
method: "post",
url: '/credit/creditList',
method: 'post',
data
});
})
},
// 授信详情
creditDetail(params) {
return request({
url: "/credit/creditDetail",
method: "get",
url: '/credit/creditDetail',
method: 'get',
params
});
})
},
// 授信详情申述
creditPlead(data) {
return request({
url: "/credit/myAllotSubmit",
method: "post",
url: '/credit/myAllotSubmit',
method: 'post',
data
});
})
},
// 初始化过滤条件的基础数据
initSearchData(data) {
return request({
url: "/credit/statusList",
method: "post",
url: '/credit/statusList',
method: 'post',
data
});
})
},
// 审批管理
// 初始化审批订单列表
initApproveList(data) {
return request({
url: '/approve/myOrderList',
method: 'post',
data
})
},
// 初始化审批订单详情
initApproveDetail(data) {
return request({
url: '/approve/myOrderDetail',
method: 'post',
data
})
},
// 审批人员上下线
approveOnOff(data) {
return request({
url: '/approve/onLineOrOffLine',
method: 'post',
data
})
},
// 转派
approveReassignment(data) {
return request({
url: '/approve/reassignment',
method: 'post',
data
})
},
// 审批订单审批提交
approveSubmit(data) {
return request({
url: '/approve/myOrderSubmit',
method: 'post',
data
})
}
};
}
const getters = {
searchData: state => state.common.searchData,
user: state => state.user.user
}
export default getters
......@@ -59,8 +59,7 @@ const actions = {
commit('setUsername', user.nickName)
}
// 设置假的token
// 设置token
const accessToken = Cookies.get('x-auth-token')
if (accessToken) {
commit('setAccessToken', accessToken)
......@@ -72,9 +71,6 @@ const actions = {
*/
async send_msg_code({ commit }, userInfo) {
const result = await API.send_msg_code(userInfo)
console.log(result, '验证码返回结果')
if (result.success) {
return result
}
......@@ -85,17 +81,25 @@ const actions = {
* @returns
*/
async getUserInfo({ commit, dispatch, state }) {
const {user} = state;
const result = await API.userInfo({
//loginName: user.loginName
loginName: 'caimm'
})
});
if (result.success) {
const { loginName } = result.result
commit('setUsername', loginName)
//commit('setAvatar')
commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif')
// 当不传递roles或ability时,默认使用管理员权限,可查看所有路由和按钮
const { loginName,userCell,userName,status } = result.result;
commit('setUsername', userName)
commit('setAvatar', 'https://i.gtimg.cn/club/item/face/img/2/15922_100.gif');
commit('setUser', result.result)
if(status==='NORMAL'){
dispatch('acl/setFull', true, { root: true })
}else{
await dispatch('resetAll')
}
} else {
await dispatch('resetAll')
}
......
......@@ -3,41 +3,56 @@
<!--搜索-->
<block-header title='搜索' />
<div class='search'>
<el-form
label-suffix=':'
:inline='true'
:model='queryForm'
class='form-inline'
>
<el-form-item label='授信类型'>
<el-form label-suffix=':' :inline='true' ref='form' :model='queryForm' class='form-inline'>
<el-form-item prop='creditNo' label='授信编号'>
<el-input
v-model='queryForm.tenantNo'
v-model='queryForm.creditNo'
clearable
placeholder='请输入机构编号'
placeholder='请输入授信编号'
/>
</el-form-item>
<el-form-item label='审批状态'>
<el-form-item prop='realName' label='客户姓名'>
<el-input
v-model='queryForm.appName'
v-model='queryForm.realName'
clearable
placeholder='请输入机构名称'
placeholder='请输入客户姓名'
/>
</el-form-item>
<el-form-item label='创建时间'>
<el-input
v-model='queryForm.appName'
clearable
placeholder='请输入机构名称'
/>
<el-form-item label='授信类型'>
<el-select clearable v-model='queryForm.creditType' placeholder='请选择授信类型'>
<el-option
v-for='(item,index) in searchData.creditTypeResponseList'
:label='item.creditTypeStr'
:key='index'
:value='item.creditType'></el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button
icon='el-icon-search'
type='primary'
@click='onSubmit'
<el-form-item label='审批状态'>
<el-select clearable v-model='queryForm.creditStatus' placeholder='请选择授信类型'>
<el-option
v-for='(item,index) in searchData.creditStatusResponseList'
:label='item.creditStatusStr'
:key='index'
:value='item.creditStatus'></el-option>
</el-select>
</el-form-item>
<el-form-item prop='time' label='申请时间'>
<el-date-picker
v-model='queryForm.time'
type='datetimerange'
:picker-options='pickerConfig'
range-separator='至'
start-placeholder='开始时间'
end-placeholder='结束时间'
>
搜 索
</el-button>
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button icon='el-icon-search' type='primary' @click='onSearch'>搜 索</el-button>
<el-button icon='el-icon-delete' type='default' @click="onReset('form')">重置</el-button>
</el-form-item>
</el-form>
</div>
......@@ -46,7 +61,7 @@
<block-header title='订单列表' />
<el-form label-suffix=':' label-width='80px'>
<el-form-item label='上线开关'>
<el-switch v-model='value2'></el-switch>
<el-switch @change='handleChangeOnLineStatus' v-model='isOnLine'></el-switch>
</el-form-item>
</el-form>
......@@ -133,12 +148,11 @@
<!--分页-->
<el-pagination
:current-page='queryForm.current'
:layout='layout'
layout='total, prev, pager, next'
:page-size='queryForm.size'
:total='total'
background
@current-change='handleCurrentChange'
@size-change='handleSizeChange'
/>
<!--转派弹框-->
......@@ -153,6 +167,8 @@
import _ from 'lodash'
import API from '@/server/api'
import Reassignment from './components/reassignment'
import { mapGetters } from 'vuex'
import Vue from 'vue'
export default {
name: 'ApprovalOrder',
......@@ -161,8 +177,7 @@
},
data() {
return {
value2: true,
isOnLine: false,
visible: false,
checkList: ['授信编号', '客户姓名', '对应BD', '商户区域', '审核金额', '审核结果', '审批状态', '创建时间'],
......@@ -213,14 +228,20 @@
],
list: [],
listLoading: true,
layout: 'total, sizes, prev, pager, next, jumper',
total: 0,
pickerConfig: this.datePickerOptions,
queryForm: {
current: 1,
size: 10,
status: '',
appName: '',
tenantNo: ''
creditNo: '',
realName: '',
creditStatus: '',
creditType: '',
time: '',
startTime: '',
endTime: ''
}
}
},
......@@ -234,17 +255,23 @@
})
return _.sortBy(finallyArray, (item) => item.order)
//return finallyArray;
}
},
created() {
//防止三级以上路由时多次走created
if (this.$route.name === this.$options.name) this.fetchData()
...mapGetters(['searchData', 'user'])
},
mounted() {
this.fetchData()
},
methods: {
onSubmit() {
onSearch() {
const { time } = this.queryForm
this.queryForm.current = 1
if (time) {
this.queryForm.startTime = time[0]
this.queryForm.endTime = time[1]
} else {
this.queryForm.startTime = ''
this.queryForm.endTime = ''
}
this.fetchData()
},
handleView(row) {
......@@ -254,28 +281,42 @@
query: { appNo }
})
},
handleSizeChange(val) {
this.queryForm.size = val
this.fetchData()
},
handleCurrentChange(val) {
this.queryForm.current = val
this.fetchData()
},
handleQuery() {
this.queryForm.current = 1
this.fetchData()
},
async fetchData() {
this.listLoading = true
const result = await API.prod_list(this.queryForm)
const form = this.queryForm
const params = Object.assign({}, form)
delete params.time
params.userId = this.user.userId
const result = await API.initApproveList({ ...params })
const { records, total } = result.result
this.list = records
this.total = total
this.listLoading = false
},
// 转派弹框
async handleClick(row) {
this.visible = true
},
// 修改上下线状态
async handleChangeOnLineStatus(e) {
const userId = this.user.userId
const userDutyState = e ? 'ONLINE' : 'OFFLINE'
const result = await API.approveOnOff({
userId,
userDutyState
});
if(result.success){
Vue.prototype.$baseMessage(
'操作成功',
'success'
)
}
}
}
}
......
......@@ -50,7 +50,7 @@
<el-date-picker
v-model="queryForm.time"
type="datetimerange"
:picker-options="pickerOptions"
:picker-options="pickerConfig"
range-separator="至"
start-placeholder="开始时间"
end-placeholder="结束时间"
......@@ -112,12 +112,11 @@
<el-pagination
:current-page="queryForm.current"
:layout="layout"
layout='total, prev, pager, next'
:page-size="queryForm.size"
:total="total"
background
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
/>
</div>
</template>
......@@ -185,51 +184,8 @@
],
list: [],
listLoading: true,
layout: "total, prev, pager, next",
total: 1,
pickerOptions:{
shortcuts: [
{
text: '今日',
onClick: (picker) => {
const end = new Date()
const start = moment().format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
picker.$emit('pick', [startTime, end]);
},
},
{
text: '昨日',
onClick: (picker) => {
const end = moment().subtract(1, 'days').format('YYYY-MM-DD')
const start = moment().subtract(1, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end} 23:59:59`
picker.$emit('pick', [startTime, endTime]);
},
},
{
text: '最近7天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(7, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime]);
},
},
{
text: '最近30天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(30, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime]);
},
}
],
},
pickerConfig:this.datePickerOptions,
queryForm: {
current: 1,
size: 9,
......@@ -266,6 +222,15 @@
},
methods: {
onSearch() {
const { time } = this.queryForm;
this.queryForm.current = 1;
if (time) {
this.queryForm.startTime = time[0];
this.queryForm.endTime = time[1];
} else {
this.queryForm.startTime = "";
this.queryForm.endTime = "";
}
this.fetchData();
},
// 预授信详情
......@@ -276,21 +241,16 @@
query: { creditNo }
})
},
handleSizeChange(val) {
this.queryForm.size = val;
this.fetchData();
},
handleCurrentChange(val) {
this.queryForm.current = val;
this.fetchData();
},
handleQuery() {
this.queryForm.current = 1;
this.fetchData();
},
async fetchData() {
this.listLoading = true;
const result = await API.creditList(this.queryForm);
const form = this.queryForm;
const params = Object.assign({}, form);
delete params.time;
const result = await API.creditList({...params});
const { records, total } = result.result;
this.list = records;
this.total = total;
......
......@@ -40,7 +40,7 @@
<el-date-picker
v-model='queryForm.time'
type='datetimerange'
:picker-options='pickerOptions'
:picker-options='pickerConfig'
:default-time="['00:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
range-separator='至'
......@@ -110,7 +110,7 @@
<el-pagination
:current-page='queryForm.current'
:layout='layout'
layout='total, prev, pager, next'
:page-size='queryForm.size'
:total='total'
background
......@@ -174,51 +174,8 @@
],
list: [],
listLoading: true,
layout: 'total, prev, pager, next',
pickerConfig:this.datePickerOptions,
total: 1,
pickerOptions: {
shortcuts: [
{
text: '今日',
onClick: (picker) => {
const end = new Date()
const start = moment().format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
picker.$emit('pick', [startTime, end])
}
},
{
text: '昨日',
onClick: (picker) => {
const end = moment().subtract(1, 'days').format('YYYY-MM-DD')
const start = moment().subtract(1, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end} 23:59:59`
picker.$emit('pick', [startTime, endTime])
}
},
{
text: '最近7天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(7, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime])
}
},
{
text: '最近30天',
onClick: (picker) => {
const end = moment().format('YYYY-MM-DD HH:mm:ss')
const start = moment().subtract(30, 'days').format('YYYY-MM-DD')
const startTime = `${start} 00:00:00`
const endTime = `${end}`
picker.$emit('pick', [startTime, endTime])
}
}
]
},
queryForm: {
current: 1,
size: 10,
......
......@@ -253,7 +253,8 @@ export default {
try {
this.loading = true;
await this.login(this.form);
await this.$router.push(this.handleRoute());
console.log(this.handleRoute(),'是啥');
await this.$router.push('/index');
} finally {
this.loading = false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment