ltlzx
/
wenhuaDate_admin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化文档“4月18-1月19总结 ”内容

master
ltlzx 4 years ago
parent
07fc5830ff
commit
74fd3de933
19 changed files with 316 additions and 233 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 14
      src/assets/css/main.css
  2. 5
      src/components/Home.vue
  3. 53
      src/components/Sidebar.vue
  4. 42
      src/components/billDetails/index.vue
  5. 18
      src/components/dateSelect/index.vue
  6. 16
      src/components/orderDetails/index.vue
  7. 25
      src/components/page/admission/index.vue
  8. 26
      src/components/page/classification/Category.vue
  9. 23
      src/components/page/classification/DataQuery.vue
  10. 16
      src/components/page/fundSettlement/index.vue
  11. 10
      src/components/page/fundSettlement/splitProportion.vue
  12. 46
      src/components/page/layout/index.vue
  13. 37
      src/components/page/order/closed.vue
  14. 37
      src/components/page/order/completed.vue
  15. 41
      src/components/page/order/index.vue
  16. 24
      src/components/page/order/pendingPayment.vue
  17. 37
      src/components/page/order/toBeDelivered.vue
  18. 37
      src/components/page/order/toBeSettled.vue
  19. 4
      src/utils/request.js

14
src/assets/css/main.css
View File

@ -35,6 +35,7 @@ body {
background-color: white; background-color: white;
padding-left: 36px; padding-left: 36px;
padding-right: 30px; padding-right: 30px;
min-width: 1460px;
} }
.f_title{ .f_title{
font-size:16px font-size:16px
@ -44,16 +45,19 @@ body {
align-items: center; align-items: center;
margin-top: 14px; margin-top: 14px;
} }
.query_item .ant-input,.query_item .ant-select{ .query_item .ant-select{
width: 160px; width: 160px;
} }
.query_item .ant-input{
max-width: 160px;
}
.query_item2 .ant-input{ .query_item2 .ant-input{
width: 213px; max-width: 213px ;
} }
.query_item >span{ .query_item >span{
display: inline-block; display: inline-block;
/* min-width: 96px; */ /* min-width: 96px; */
min-width: 85px; min-width: 100px;
/* padding: 10px; */ /* padding: 10px; */
} }
@ -74,6 +78,7 @@ body {
padding-right: 30px; padding-right: 30px;
box-sizing: border-box; box-sizing: border-box;
overflow-y: auto; overflow-y: auto;
min-width: 1460px;
} }
.table_title{ .table_title{
display: flex; display: flex;
@ -96,8 +101,9 @@ body {
margin-top: 21px; margin-top: 21px;
} }
.ant-table-tbody > tr > td { .ant-table-tbody > tr > td {
padding: 11px 16px; padding: 11px 14px;
} }
.ant-table-thead > tr > th { .ant-table-thead > tr > th {
padding: 11px 16px; padding: 11px 16px;
text-align: center;
} }

5
src/components/Home.vue
View File

@ -21,7 +21,10 @@ import {getUserData} from '../api/index'
export default { export default {
data () { data () {
return { return {
data:{} data:{
accountName:'',
auth:[]
},
} }
}, },
components: { components: {

53
src/components/Sidebar.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<div class="sidebar_body"> <div class="sidebar_body">
<a-menu theme="dark" mode="inline" :default-selected-keys="[key]" class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange"> <a-menu theme="dark" mode="inline" :default-selected-keys="[key]" class="sidebar" :defaultOpenKeys="[openKey]" :open-keys="openKeys" @openChange="onOpenChange">
<template v-for="item in items"> <template v-for="item in items1">
<a-menu-item v-if="!item.children " :key="item.key" :disabled="item.isShow"> <a-menu-item v-if="!item.children " :key="item.key" :disabled="item.isShow">
<router-link :to="item.url"> <router-link :to="item.url">
<!-- <a-icon :type="item.icon" /> --> <!-- <a-icon :type="item.icon" /> -->
@ -56,7 +56,8 @@ export default {
key:'/admission', key:'/admission',
title:'文化数据入场管理', title:'文化数据入场管理',
auth:'CulturalDataAdmissionManagement', auth:'CulturalDataAdmissionManagement',
isShow:true isShow:true,
children:[]
}, },
{ {
icon:'', icon:'',
@ -98,18 +99,19 @@ export default {
key:'/layout', key:'/layout',
title:'数据展示布局管理', title:'数据展示布局管理',
auth:'DataDisplayLayoutManagement', auth:'DataDisplayLayoutManagement',
isShow:true isShow:true,
children:[]
}, },
] ],
items1:[]
} }
}, },
created(){ created(){
this.key=this.$route.path this.key=this.$route.path
this.showMenu() // this.showMenu()
}, },
methods:{ methods:{
onOpenChange(openKeys) { onOpenChange(openKeys) {
const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1); const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1);
// console.info(latestOpenKey) // console.info(latestOpenKey)
// console.info(openKeys) // console.info(openKeys)
@ -120,10 +122,21 @@ export default {
} }
}, },
showMenu(){ showMenu(){
console.info(this.auth1)
if(this.auth1.length==0){
this.items=[]
}else{
let List=[]
for(let i3 in this.items){ for(let i3 in this.items){
let item=this.items[i3] let item=this.items[i3]
// this.items.map(item=>{ // this.items.map(item=>{
if(item.children){ if(item.children.length!=0){
let data={
url:item.url,
key:item.key,
title:item.title,
children:[]
}
for(let i in item.children){ for(let i in item.children){
let item1=item.children[i] let item1=item.children[i]
if(item1.key==this.key){ if(item1.key==this.key){
@ -133,27 +146,43 @@ export default {
for(let i1 in this.auth1){ for(let i1 in this.auth1){
let item2=this.auth1[i1] let item2=this.auth1[i1]
if(item2==item1.auth){ if(item2==item1.auth){
this.items[i3].children[i].isShow=false let children={
url:item1.url,
key:item1.key,
title:item1.title,
}
data.children.push(children)
// this.items[i3].children[i].isShow=false
// item1.isShow=true // item1.isShow=true
} }
} }
} }
console.info(data)
List.push(data)
}else{ }else{
for(let i1 in this.auth1){ for(let i1 in this.auth1){
let item2=this.auth1[i1] let item2=this.auth1[i1]
if(item2==item.auth){ if(item2==item.auth){
this.items[i3].isShow=false let data={
url:item.url,
key:item.key,
title:item.title,
}
List.push(data)
// this.items[i3].isShow=false
// item.isShow=true // item.isShow=true
} }
} }
} }
} }
console.info(this.items) this.items1=List
}
}, },
}, },
watch:{ watch:{
auth(val){ auth(val,oldVal){
this.auth1=this.auth this.auth1=val
this.showMenu() this.showMenu()
}, },
$route(to,form){ $route(to,form){

42
src/components/billDetails/index.vue
View File

@ -79,128 +79,128 @@
title: '结算时间', title: '结算时间',
dataIndex: '', dataIndex: '',
width:'120px', width:'120px',
align:'center' // // align:'center'
}, },
{ {
title: '用户编码', title: '用户编码',
dataIndex: 'user_isli', dataIndex: 'user_isli',
width:'120px', width:'120px',
align:'center' // // align:'center'
}, },
{ {
title: '客户名称', title: '客户名称',
dataIndex: 'order_user.name', dataIndex: 'order_user.name',
width:'120px', width:'120px',
align:'center' // // align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '分中心编号', title: '分中心编号',
dataIndex: 'center_number', dataIndex: 'center_number',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '分中心名称', title: '分中心名称',
dataIndex: 'center_name', dataIndex: 'center_name',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '服务机构编号', title: '服务机构编号',
dataIndex: 'service_number', dataIndex: 'service_number',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '服务机构名称', title: '服务机构名称',
dataIndex: 'service_name', dataIndex: 'service_name',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '银行卡号', title: '银行卡号',
dataIndex: 'order_user.publicAccount', dataIndex: 'order_user.publicAccount',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '银行名称', title: '银行名称',
dataIndex: 'order_user.bankName', dataIndex: 'order_user.bankName',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '期初资金', title: '期初资金',
dataIndex: 'preliminary_capital', dataIndex: 'preliminary_capital',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '可用资金', title: '可用资金',
dataIndex: 'available_capital', dataIndex: 'available_capital',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '可出资金', title: '可出资金',
dataIndex: 'disburse_capital', dataIndex: 'disburse_capital',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '佣金/服务费（含税）', title: '佣金/服务费（含税）',
dataIndex: 'service_charge', dataIndex: 'service_charge',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '委托费', title: '委托费',
dataIndex: 'entrust_cost', dataIndex: 'entrust_cost',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '当日买入金额', title: '当日买入金额',
dataIndex: 'thatday_buy_money', dataIndex: 'thatday_buy_money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '当日卖出金额', title: '当日卖出金额',
dataIndex: 'thatday_sale_money', dataIndex: 'thatday_sale_money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '服务费分配', title: '服务费分配',
dataIndex: 'service_charge_allot', dataIndex: 'service_charge_allot',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '资金余额', title: '资金余额',
dataIndex: 'capital_remaining', dataIndex: 'capital_remaining',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '冻结保证金', title: '冻结保证金',
dataIndex: 'freeze_earnest_money', dataIndex: 'freeze_earnest_money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'close_status', dataIndex: 'close_status',
scopedSlots: { customRender: 'close_status' }, scopedSlots: { customRender: 'close_status' },
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
], ],
} }

18
src/components/dateSelect/index.vue
View File

@ -9,13 +9,13 @@
</span> </span>
<p>授权方信息</p> <p>授权方信息</p>
<div class="tab_body"> <div class="tab_body">
<template v-if="userinfo.length!=0"> <template v-if="userinfo">
<div class="tab_body_content" v-for="(item,index) in userinfo" :key="index"> <div class="tab_body_content" >
<p class="tab_body_p">认证类型：{{item.userType}}</p> <p class="tab_body_p">认证类型：{{userinfo.userType}}</p>
<p class="tab_body_p">认证状态：{{item.state==0?'认证中':item.state==1?'认证成功':'认证失败'}}</p> <p class="tab_body_p">认证状态：{{userinfo.state==0?'认证中':userinfo.state==1?'认证成功':'认证失败'}}</p>
<p class="tab_body_p">基本信息：{{item.name}}</p> <p class="tab_body_p">基本信息：{{userinfo.name}}</p>
<p class="tab_body_p">统一社会信用代码：{{item.uscc}}</p> <p class="tab_body_p">统一社会信用代码：{{userinfo.uscc}}</p>
<p class="tab_body_p">账户ISLI标识码：{{item.islicode}}</p> <p class="tab_body_p">账户ISLI标识码：{{userinfo.islicode}}</p>
<!-- <p class="tab_body_p">机构类型：{{item.userType}}</p> <!-- <p class="tab_body_p">机构类型：{{item.userType}}</p>
<p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p> <p class="tab_body_p" v-if="item.certType">证件类型：{{item.certType}}</p>
@ -53,13 +53,15 @@
<template v-if="entrust_goods.goods.length!=0"> <template v-if="entrust_goods.goods.length!=0">
<div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index"> <div class="tab_content " v-for="(item,index) in entrust_goods.goods" :key="index">
<div class="tab_content_infoImg"> <div class="tab_content_infoImg">
<img src="../../assets/img/test.png" class="tab_content_img"> <img :src="item.goods_image" class="tab_content_img" v-if="item.goods_image!=''">
<img src="../../assets/img/test.png" class="tab_content_img" v-else>
</div> </div>
<div class="tab_content_right"> <div class="tab_content_right">
<div class="content_right_title">标的名称：{{item.goods_name}}</div> <div class="content_right_title">标的名称：{{item.goods_name}}</div>
<div class="content_info"> <div class="content_info">
<div class="content_info_left"> <div class="content_info_left">
<p>标志码：{{item.goods_islicode}}</p> <p>标志码：{{item.goods_islicode}}</p>
<p>交易关联标识符：{{item.contract_code}}</p>
<p>标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p> <p>标的类型：{{item.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
<p>交易方式：{{item.goods_entrust==1?'转让':'许可'}}</p> <p>交易方式：{{item.goods_entrust==1?'转让':'许可'}}</p>
<p>权益：{{item.goods_ownership_str}}</p> <p>权益：{{item.goods_ownership_str}}</p>

16
src/components/orderDetails/index.vue
View File

@ -146,50 +146,50 @@
title: '结算方', title: '结算方',
dataIndex: 'close_side', dataIndex: 'close_side',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '结算内容', title: '结算内容',
dataIndex: 'close_message', dataIndex: 'close_message',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '金额', title: '金额',
dataIndex: 'money', dataIndex: 'money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
// { // {
// title: '税率', // title: '税率',
// dataIndex: 'tax_rate', // dataIndex: 'tax_rate',
// width:'120px', // width:'120px',
// align:'center' // // align:'center'
// }, // },
{ {
title: '税额', title: '税额',
dataIndex: 'tax_rate_money', dataIndex: 'tax_rate_money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '结算金额', title: '结算金额',
dataIndex: 'close_money', dataIndex: 'close_money',
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'close_status', dataIndex: 'close_status',
scopedSlots: { customRender: 'close_status' }, scopedSlots: { customRender: 'close_status' },
width:'120px', width:'120px',
align:'center' // align:'center'
}, },
{ {
title: '结算流水号', title: '结算流水号',
dataIndex: 'close_number', dataIndex: 'close_number',
width:'220px', width:'220px',
align:'center' // align:'center'
}, },
] ]
} }

25
src/components/page/admission/index.vue
View File

@ -129,47 +129,48 @@ export default {
page:1, page:1,
data:[], data:[],
columns:[ columns:[
{ // {
title: '序号', // title: '序号',
dataIndex: 'id', // dataIndex: 'id',
width:'65px', // width:'65px',
align:'center' // align:'center'
}, // },
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: 'ISLI标识码', title: 'ISLI标识码',
dataIndex: 'goods_islicode', dataIndex: 'goods_islicode',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '授权方', title: '授权方',
dataIndex: 'username', dataIndex: 'username',
align:'center' // align:'center'
}, },
{ {
title: '标的类型', title: '标的类型',
dataIndex: 'goods_type', dataIndex: 'goods_type',
scopedSlots:{customRender:'goods_type'}, scopedSlots:{customRender:'goods_type'},
align:'center' // align:'center'
}, },
{ {
title: '数据状态', title: '数据状态',
dataIndex: 'goods_status', dataIndex: 'goods_status',
scopedSlots:{customRender:'goods_status'}, scopedSlots:{customRender:'goods_status'},
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
width:'250px',
align:'center' align:'center'
}, },
] ]

26
src/components/page/classification/Category.vue
View File

@ -8,8 +8,8 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>一级分类：</span> <span>一级分类：</span>
<a-select default-value="" @change="handleChange" v-model="query.top_class"> <a-select default-value="" @change="handleChange" v-model="query.top_class">
<a-select-option :value="item" v-for="(item,index) in oneList" :key="index"> <a-select-option :value="item" v-for="(item,index) in oneList" :key="index">
@ -17,7 +17,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>二级分类：</span> <span>二级分类：</span>
<a-select default-value="" v-model="query.son_class"> <a-select default-value="" v-model="query.son_class">
<a-select-option :value="item" v-for="(item,index) in twoList" :key="index"> <a-select-option :value="item" v-for="(item,index) in twoList" :key="index">
@ -25,7 +25,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>创建人员：</span> <span>创建人员：</span>
<a-select default-value="" v-model="query.user_id"> <a-select default-value="" v-model="query.user_id">
<a-select-option :value="item.id" v-for="(item,index) in userList" :key="index"> <a-select-option :value="item.id" v-for="(item,index) in userList" :key="index">
@ -33,7 +33,7 @@
</a-select-option> </a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item" > <a-col :span="6" class="query_item" >
<span>使用状态：</span> <span>使用状态：</span>
<a-select default-value="" v-model="query.usestatus"> <a-select default-value="" v-model="query.usestatus">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -41,11 +41,11 @@
<a-select-option value="1">禁用</a-select-option> <a-select-option value="1">禁用</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="12" class="query_item query_item2">
<span>创建时间：</span> <span>创建时间：</span>
<a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/> <a-range-picker valueFormat="YYYY-MM-DD" v-model="query.createtime"/>
</a-col> </a-col>
<a-col :span="19" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button> <a-button type="primary" class="query_button" @click="getAllDate">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -173,33 +173,33 @@ export default {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: '一级分类名称', title: '一级分类名称',
dataIndex: 'top_class', dataIndex: 'top_class',
align:'center' // align:'center'
}, },
{ {
title: '二级分类名称', title: '二级分类名称',
dataIndex: 'son_class', dataIndex: 'son_class',
align:'center' // align:'center'
}, },
{ {
title: '使用状态', title: '使用状态',
dataIndex: 'status', dataIndex: 'status',
scopedSlots:{customRender:'status'}, scopedSlots:{customRender:'status'},
align:'center' // align:'center'
}, },
{ {
title: '创建人员', title: '创建人员',
dataIndex: 'account_name', dataIndex: 'account_name',
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
], ],
oneList:[], oneList:[],

23
src/components/page/classification/DataQuery.vue
View File

@ -8,7 +8,7 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="5" class="query_item">
<span>ISLI标识码：</span> <span>ISLI标识码：</span>
<a-input v-model="query.islicode"/> <a-input v-model="query.islicode"/>
@ -154,45 +154,46 @@ export default {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: 'ISLI标识码', title: 'ISLI标识码',
dataIndex: 'goods_islicode', dataIndex: 'goods_islicode',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '授权方', title: '授权方',
dataIndex: 'username', dataIndex: 'username',
align:'center' // align:'center'
}, },
{ {
title: '标的类型', title: '标的类型',
dataIndex: 'goods_type', dataIndex: 'goods_type',
scopedSlots:{customRender:'goods_type'}, scopedSlots:{customRender:'goods_type'},
align:'center' // align:'center'
}, },
{ {
title: '数据状态', title: '数据状态',
dataIndex: 'goods_status', dataIndex: 'goods_status',
scopedSlots:{customRender:'goods_status'}, scopedSlots:{customRender:'goods_status'},
align:'center' // align:'center'
}, },
{ {
title: '委托状态', title: '委托状态',
dataIndex: 'entrust_status', dataIndex: 'entrust_status',
scopedSlots:{customRender:'entrust_status'}, scopedSlots:{customRender:'entrust_status'},
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' width:'170px',
// align:'center'
}, },
] ]
} }
@ -270,5 +271,7 @@ export default {
} }
</script> </script>
<style scoped> <style scoped>
.query_item >span{
min-width: 85px !important;
}
</style> </style>

16
src/components/page/fundSettlement/index.vue
View File

@ -115,17 +115,17 @@ export default {
title: '序号', title: '序号',
dataIndex: 'id', dataIndex: 'id',
width:'65px', width:'65px',
align:'center' // align:'center'
}, },
{ {
title: '用户编码', title: '用户编码',
dataIndex: 'islicode', dataIndex: 'islicode',
align:'center' // align:'center'
}, },
{ {
title: '客户名称', title: '客户名称',
dataIndex: 'userinfo.name', dataIndex: 'userinfo.name',
align:'center' // align:'center'
}, },
// { // {
// title: '结算账户', // title: '结算账户',
@ -135,28 +135,28 @@ export default {
{ {
title: '银行账号', title: '银行账号',
dataIndex: 'userinfo.publicAccount', dataIndex: 'userinfo.publicAccount',
align:'center' // align:'center'
}, },
{ {
title: '银行名称', title: '银行名称',
dataIndex: 'userinfo.bankName', dataIndex: 'userinfo.bankName',
align:'center' // align:'center'
}, },
{ {
title: '用户类型', title: '用户类型',
dataIndex: 'userinfo.userType', dataIndex: 'userinfo.userType',
align:'center' // align:'center'
}, },
{ {
title: '结算状态', title: '结算状态',
dataIndex: 'close_status', dataIndex: 'close_status',
scopedSlots: { customRender: 'close_status' }, scopedSlots: { customRender: 'close_status' },
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

10
src/components/page/fundSettlement/splitProportion.vue
View File

@ -203,28 +203,28 @@ export default {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: '规则名称', title: '规则名称',
dataIndex: 'rule_name', dataIndex: 'rule_name',
align:'center' // align:'center'
}, },
{ {
title: '使用状态', title: '使用状态',
dataIndex: 'status', dataIndex: 'status',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
align:'center' // align:'center'
}, },
{ {
title: '创建人员', title: '创建人员',
dataIndex: 'username', dataIndex: 'username',
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
], ],
userList:[], userList:[],

46
src/components/page/layout/index.vue
View File

@ -197,40 +197,40 @@ export default {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: 'ISLI标识码', title: 'ISLI标识码',
dataIndex: 'goods_islicode', dataIndex: 'goods_islicode',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '授权方', title: '授权方',
dataIndex: 'username', dataIndex: 'username',
align:'center' // align:'center'
}, },
{ {
title: '标的类型', title: '标的类型',
dataIndex: 'goods_type', dataIndex: 'goods_type',
scopedSlots:{customRender:'goods_type'}, scopedSlots:{customRender:'goods_type'},
align:'center' // align:'center'
}, },
{ {
title: '数据状态', title: '数据状态',
dataIndex: 'goods_status', dataIndex: 'goods_status',
scopedSlots:{customRender:'goods_status'}, scopedSlots:{customRender:'goods_status'},
align:'center' // align:'center'
}, },
{ {
title: '是否展示', title: '是否展示',
dataIndex: 'is_recommend', dataIndex: 'is_recommend',
scopedSlots: { customRender: 'is_recommend' }, scopedSlots: { customRender: 'is_recommend' },
align:'center' // align:'center'
}, },
], ],
columns:[ columns:[
@ -243,40 +243,36 @@ export default {
{ {
title: '创建时间', title: '创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: 'ISLI标识码', title: 'ISLI标识码',
dataIndex: 'goods_islicode', dataIndex: 'goods_islicode',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '授权方', title: '授权方',
dataIndex: 'username', dataIndex: 'username',
align:'center' // align:'center'
}, },
{ {
title: '标的类型', title: '标的类型',
dataIndex: 'goods_type', dataIndex: 'goods_type',
scopedSlots:{customRender:'goods_type'}, scopedSlots:{customRender:'goods_type'},
align:'center' // align:'center'
}, },
{ {
title: '数据状态', title: '数据状态',
dataIndex: 'goods_status', dataIndex: 'goods_status',
scopedSlots:{customRender:'goods_status'}, scopedSlots:{customRender:'goods_status'},
align:'center' // align:'center'
},
{
title: '操作',
scopedSlots: { customRender: 'operation' },
align:'center'
}, },
] ]
} }
}, },
@ -357,6 +353,20 @@ export default {
this.query.type=val this.query.type=val
this.active=val-1 this.active=val-1
this.selectedRowKeys1=[] this.selectedRowKeys1=[]
if(this.active==2){
let data={
title: '操作',
scopedSlots: { customRender: 'operation' },
// align:'center'
}
this.columns.push(data)
}else{
for (let i=0; i<this.columns.length; i++){
if (this.columns[i].title == '操作'){
this.columns.splice(i, 1)
}
}
}
this.getList() this.getList()
}, },
getList(){ getList(){

37
src/components/page/order/closed.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode"/> <a-input v-model="query.batchcode"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,11 +44,11 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>创建时间：</span> <span>创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="14" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -131,27 +131,29 @@ export default {
{ {
title: '订单创建时间', title: '订单创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' width:'160px',
// align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
align:'center' width:'130px',
// align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
@ -162,17 +164,20 @@ export default {
{ {
title: '交易方式', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' width:'90px',
// align:'center'
}, },
{ {
title: '交易总额', title: '交易总额',
dataIndex: 'total_money', dataIndex: 'total_money',
align:'center' width:'90px',
// align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

37
src/components/page/order/completed.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode"/> <a-input v-model="query.batchcode"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,11 +44,11 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>创建时间：</span> <span>创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="14" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -131,27 +131,29 @@ export default {
{ {
title: '订单创建时间', title: '订单创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' width:'160px',
// align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
align:'center' width:'130px',
// align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
@ -161,18 +163,21 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' // align:'center'
}, },
{ {
title: '交易总额', title: '交易总额',
dataIndex: 'total_money', dataIndex: 'total_money',
align:'center' width:'90px',
// align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

41
src/components/page/order/index.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode" /> <a-input v-model="query.batchcode" />
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,7 +44,7 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item" > <a-col :span="6" class="query_item" >
<span>交易状态：</span> <span>交易状态：</span>
<a-select default-value="" v-model="query.transaction_status"> <a-select default-value="" v-model="query.transaction_status">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -55,11 +55,11 @@
<a-select-option value="5">已关闭</a-select-option> <a-select-option value="5">已关闭</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>订单创建时间：</span> <span>订单创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="9" class="query_item query_item1"> <a-col :span="6" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -144,28 +144,30 @@ export default {
}, },
{ {
title: '订单创建时间', title: '订单创建时间',
width:'160px',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
align:'center' width:'130px',
// align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
@ -175,24 +177,27 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' // align:'center'
}, },
{ {
title: '交易总额', title: '交易总额',
dataIndex: 'total_money', dataIndex: 'total_money',
align:'center' // align:'center'
}, },
{ {
title: '交易状态', title: '交易状态',
width:'90px',
dataIndex: 'status', dataIndex: 'status',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

24
src/components/page/order/pendingPayment.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode"/> <a-input v-model="query.batchcode"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,11 +44,11 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>订单创建时间：</span> <span>订单创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="14" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -129,13 +129,14 @@ export default {
}, },
{ {
title: '订单创建时间', title: '订单创建时间',
width:'160px',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' // align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
@ -150,6 +151,7 @@ export default {
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
width:'130px',
align:'center' align:'center'
}, },
// { // {
@ -160,6 +162,7 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },
@ -170,6 +173,7 @@ export default {
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' align:'center'
}, },

37
src/components/page/order/toBeDelivered.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode"/> <a-input v-model="query.batchcode"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,11 +44,11 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>订单创建时间：</span> <span>订单创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="14" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -131,27 +131,29 @@ export default {
{ {
title: '订单创建时间', title: '订单创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' width:'160px',
// align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
align:'center' width:'130px',
// align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
@ -161,18 +163,21 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' // align:'center'
}, },
{ {
title: '交易总额', title: '交易总额',
dataIndex: 'total_money', dataIndex: 'total_money',
align:'center' width:'90px',
// align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

37
src/components/page/order/toBeSettled.vue
View File

@ -8,20 +8,20 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row justify="space-between" > <a-row type="flex" justify="space-between" >
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>订单编号：</span> <span>订单编号：</span>
<a-input v-model="query.batchcode"/> <a-input v-model="query.batchcode"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>授权方：</span> <span>授权方：</span>
<a-input v-model="query.entrust_name"/> <a-input v-model="query.entrust_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>被授权方：</span> <span>被授权方：</span>
<a-input v-model="query.buy_name"/> <a-input v-model="query.buy_name"/>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>标的名称:</span> <span>标的名称:</span>
<a-input v-model="query.goods_name"/> <a-input v-model="query.goods_name"/>
</a-col> </a-col>
@ -36,7 +36,7 @@
</a-select> </a-select>
</a-col> --> </a-col> -->
<a-col :span="5" class="query_item"> <a-col :span="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type"> <a-select default-value="" v-model="query.entrust_type">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
@ -44,11 +44,11 @@
<a-select-option value="2">授权</a-select-option> <a-select-option value="2">授权</a-select-option>
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item query_item2"> <a-col :span="6" class="query_item query_item2">
<span>创建时间：</span> <span>创建时间：</span>
<a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/> <a-range-picker v-model="query.createtime" valueFormat="YYYY-MM-DD"/>
</a-col> </a-col>
<a-col :span="14" class="query_item query_item1"> <a-col :span="12" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList">查 询</a-button> <a-button type="primary" class="query_button" @click="getList">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -131,27 +131,29 @@ export default {
{ {
title: '订单创建时间', title: '订单创建时间',
dataIndex: 'createtime', dataIndex: 'createtime',
align:'center' width:'160px',
// align:'center'
}, },
{ {
title: '订单编号', title: '订单编号',
dataIndex: 'batchcode', dataIndex: 'batchcode',
align:'center' // align:'center'
}, },
{ {
title: '授权方/卖方', title: '授权方/卖方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
align:'center' // align:'center'
}, },
{ {
title: '标的名称', title: '标的名称',
dataIndex: 'goods_name', dataIndex: 'goods_name',
align:'center' // align:'center'
}, },
{ {
title: '被授权方/买方', title: '被授权方/买方',
dataIndex: 'buy_username', dataIndex: 'buy_username',
align:'center' width:'130px',
// align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
@ -161,18 +163,21 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' // align:'center'
}, },
{ {
title: '交易总额', title: '交易总额',
dataIndex: 'total_money', dataIndex: 'total_money',
align:'center' width:'90px',
// align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' // align:'center'
}, },
] ]
} }

4
src/utils/request.js
View File

@ -3,8 +3,8 @@ import axios from 'axios';
const service = axios.create({ const service = axios.create({
// process.env.NODE_ENV === 'development' 来判断是否开发环境 // process.env.NODE_ENV === 'development' 来判断是否开发环境
// baseURL:process.env.NODE_ENV == 'production' ? 'https://yztapi.xingtongworld.com' : '/api/', // baseURL:process.env.NODE_ENV == 'production' ? 'https://yztapi.xingtongworld.com' : '/api/',
// baseURL:'http://jiao.api.alpha.xingtongworld.com', baseURL:'http://jiao.api.alpha.xingtongworld.com',
baseURL:'http://58.30.231.138:8899', // baseURL:'http://58.30.231.138:8899',
// baseURL:'http://192.168.66.254:8080', // baseURL:'http://192.168.66.254:8080',
timeout: 5000, timeout: 5000,
}); });

Write Preview
Loading…
Cancel
Save