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

调整antdv引起的运行错误

master
453530270@qq.com 3 years ago
parent
0eed4d04b4
commit
d371b30bb8
4 changed files with 361 additions and 417 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. 546
      package-lock.json
  2. 19
      src/App.vue
  3. 209
      src/components/page/order/index.vue
  4. 4
      src/main.js

546
package-lock.json
View File

File diff suppressed because it is too large

19
src/App.vue
View File

@ -1,22 +1,23 @@
<template> <template>
<a-locale-provider :locale="zh_CN"> <a-config-provider :locale="locale">
<div id="app"> <div id="app">
<router-view/> <router-view/>
</div> </div>
</a-locale-provider> </a-config-provider>
</template> </template>
<script> <script>
import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN'; // import zh_CN from 'ant-design-vue/lib/locale-provider/zh_CN';
import moment from 'moment'; import zhCN from 'ant-design-vue/es/locale/zh_CN';
import 'moment/locale/zh-cn'; // import moment from 'moment';
moment.locale('zh-cn'); // import 'moment/locale/zh-cn';
// moment.locale('zh-cn');
export default { export default {
name: 'App', name: 'App',
data(){ data(){
return{ return {
zh_CN locale: zhCN,
} };
}, },
} }
</script> </script>

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

@ -8,22 +8,22 @@
</div> </div>
<div class="body"> <div class="body">
<div class="query"> <div class="query">
<a-row type="flex" justify="space-between" > <a-row type="flex" justify="space-between">
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="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 :lg="12" :xl="8" :xxl="6" class="query_item query_item3"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item3">
<span>委托方/授权方：</span> <span>委托方/授权方：</span>
<a-input v-model="query.entrust_name" placeholder="名称/交易主体唯一标志码"/> <a-input v-model="query.entrust_name" placeholder="名称/交易主体唯一标志码" />
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item3"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item3">
<span>购买方/被授权方：</span> <span>购买方/被授权方：</span>
<a-input v-model="query.buy_name" placeholder="名称/交易主体唯一标志码"/> <a-input v-model="query.buy_name" placeholder="名称/交易主体唯一标志码" />
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
<span>交易标的：</span> <span>交易标的：</span>
<a-input v-model="query.goods_name" placeholder="名称/标的ISLI标志码"/> <a-input v-model="query.goods_name" placeholder="名称/标的ISLI标志码" />
</a-col> </a-col>
<!-- <a-col :span="5" class="query_item" > <!-- <a-col :span="5" class="query_item" >
@ -37,7 +37,8 @@
</a-col> --> </a-col> -->
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
<span>收费类型：</span> <span>收费类型：</span>
<a-select default-value="" v-model="query.charges_type" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.charges_type"
:getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
<a-select-option value="1">免费</a-select-option> <a-select-option value="1">免费</a-select-option>
<a-select-option value="2">付费</a-select-option> <a-select-option value="2">付费</a-select-option>
@ -45,16 +46,18 @@
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item"> <a-col :lg="12" :xl="8" :xxl="6" class="query_item">
<span>交易方式：</span> <span>交易方式：</span>
<a-select default-value="" v-model="query.entrust_type" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.entrust_type"
:getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="">全部</a-select-option> <a-select-option value="">全部</a-select-option>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
<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 :lg="12" :xl="8" :xxl="6" class="query_item" > <a-col :lg="12" :xl="8" :xxl="6" class="query_item" style="display:none">
<span>订单状态：</span> <span>订单状态：</span>
<a-select default-value="" v-model="query.transaction_status" mode="multiple" :maxTagCount="1" :maxTagTextLength="1" :getPopupContainer="(triggerNode) => triggerNode.parentNode"> <a-select default-value="" v-model="query.transaction_status"
<a-select-option value="" @click.native='selectAll'>全部</a-select-option> :getPopupContainer="(triggerNode) => triggerNode.parentNode">
<a-select-option value="" @click.native='selectAll'>全部</a-select-option>
<a-select-option value="1">待付款</a-select-option> <a-select-option value="1">待付款</a-select-option>
<a-select-option value="2">待交付</a-select-option> <a-select-option value="2">待交付</a-select-option>
<a-select-option value="3">待结算</a-select-option> <a-select-option value="3">待结算</a-select-option>
@ -64,25 +67,25 @@
</a-col> </a-col>
<a-col :lg="12" :xl="8" :xxl="6" class="query_item query_item2"> <a-col :lg="12" :xl="8" :xxl="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 :lg="12" :xl="8" :xxl="12" class="query_item query_item3"> <!-- <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3" style="display:noen">
<span>标的金额：</span> <span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/> <a-input v-model="query.biaodi_start" placeholder="最小值" />
<el-col :span="10" v-html="'\u00a0'"/> <el-col :span="10" v-html="'\u00a0'" />
<el-col style="color:#d9d9d9;">-</el-col> <el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/> <el-col :span="10" v-html="'\u00a0'" />
<a-input v-model="query.biaodi_end" placeholder="最大值"/> <a-input v-model="query.biaodi_end" placeholder="最大值" />
</a-col> </a-col> -->
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3"> <!-- <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span> <span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/> <a-input v-model="query.dingdan_start" placeholder="最小值" />
<el-col :span="10" v-html="'\u00a0'"/> <el-col :span="10" v-html="'\u00a0'" />
<el-col style="color:#d9d9d9;">-</el-col> <el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/> <el-col :span="10" v-html="'\u00a0'" />
<a-input v-model="query.dingdan_end" placeholder="最大值"/> <a-input v-model="query.dingdan_end" placeholder="最大值" />
</a-col> </a-col> -->
<a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1"> <a-col :lg="24" :xl="8" :xxl="24" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button> <a-button type="primary" class="query_button" @click="getList(1)">查 询</a-button>
@ -97,12 +100,12 @@
<a-button type="primary" class="query_button">导 出</a-button> <a-button type="primary" class="query_button">导 出</a-button>
<!-- <a-button type="primary" class="query_button">获 取</a-button> --> <!-- <a-button type="primary" class="query_button">获 取</a-button> -->
</div> </div>
<a-table :columns="columns" :data-source="data" bordered :pagination="false" > <a-table :columns="columns" :data-source="data" bordered :pagination="false" rowKey="id">
<template slot="type" slot-scope="type"> <template slot="type" slot-scope="type">
<span>{{type==1?'委托订单':type==2?'认证订单':'服务订单'}}</span> <span>{{ type == 1 ? '委托订单' : type == 2 ? '认证订单' : '服务订单' }}</span>
</template> </template>
<template slot="status" slot-scope="status"> <template slot="status" slot-scope="status">
<span>{{status==1?'待付款':status==2?'待交付':status==3?'待结算':status==4?'已终止':'已关闭'}}</span> <span>{{ status == 1 ? '待付款' : status == 2 ? '待交付' : status == 3 ? '待结算' : status == 4 ? '已终止' : '已关闭' }}</span>
</template> </template>
<template slot="operation" slot-scope="item"> <template slot="operation" slot-scope="item">
<a-space :size="24"> <a-space :size="24">
@ -111,19 +114,11 @@
</a-space> </a-space>
</template> </template>
</a-table> </a-table>
<a-pagination <a-pagination class="pagination" size="small" :total="total" v-model="page" :page-size="limit"
class="pagination" :show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`" :page-size-options="pageSizeOptions"
size="small" @showSizeChange="onShowSizeChange" @change="changePage" show-size-changer>
:total="total"
v-model="page"
:page-size="limit"
:show-total="total => `第 ${startTotal} - ${endTotal} 条 / 总共 ${total} 条`"
:page-size-options="pageSizeOptions"
@showSizeChange="onShowSizeChange"
@change="changePage"
show-size-changer >
<template slot="buildOptionText" slot-scope="props"> <template slot="buildOptionText" slot-scope="props">
<span >{{ props.value }}条/页</span> <span>{{ props.value }}条/页</span>
</template> </template>
</a-pagination> </a-pagination>
</div> </div>
@ -134,38 +129,38 @@
</template> </template>
<script> <script>
import Operation from '../../Operation.vue' import Operation from '../../Operation.vue'
import {getOrderList} from '../../../api/index' import { getOrderList } from '../../../api/index'
export default { export default {
data() { data() {
return{ return {
query:{ query: {
batchcode:'', batchcode: '',
entrust_name:'', entrust_name: '',
buy_name:'', buy_name: '',
goods_name:'', goods_name: '',
order_type:'', order_type: '',
entrust_type:'', entrust_type: '',
transaction_status:[''], transaction_status: '',
createtime:[], createtime: [],
goods_isli:'', goods_isli: '',
charges_type:'', charges_type: '',
biaodi_start:'', // biaodi_start: '',
biaodi_end:'', // biaodi_end: '',
dingdan_start:'', // dingdan_start: '',
dingdan_end:'', // dingdan_end: '',
}, },
batchcode:'', batchcode: '',
visible:false, visible: false,
visible2:false, visible2: false,
pageSizeOptions: ['10', '20', '30', '40', '50'], pageSizeOptions: ['10', '20', '30', '40', '50'],
total:0, total: 0,
startTotal:1, startTotal: 1,
endTotal:10, endTotal: 10,
limit:10, limit: 10,
// 当前页数 // 当前页数
page:1, page: 1,
data:[], data: [],
columns:[ columns: [
// { // {
// title: '序号', // title: '序号',
// dataIndex: 'id', // dataIndex: 'id',
@ -174,7 +169,7 @@ export default {
// }, // },
{ {
title: '订单创建时间', title: '订单创建时间',
width:'120px', width: '120px',
dataIndex: 'createtime', dataIndex: 'createtime',
// align:'center' // align:'center'
}, },
@ -186,7 +181,7 @@ export default {
{ {
title: '委托方/授权方', title: '委托方/授权方',
dataIndex: 'entrust_name', dataIndex: 'entrust_name',
width:'125px', width: '125px',
// align:'center' // align:'center'
}, },
{ {
@ -196,7 +191,7 @@ export default {
}, },
{ {
title: '购买方/被授权方', title: '购买方/被授权方',
width:'135px', width: '135px',
dataIndex: 'buy_username', dataIndex: 'buy_username',
// width:'130px', // width:'130px',
// align:'center' // align:'center'
@ -209,105 +204,103 @@ export default {
// }, // },
{ {
title: '交易方式', title: '交易方式',
width:'90px', width: '90px',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
// align:'center' // align:'center'
}, },
{ {
title: '标的金额', title: '标的金额',
dataIndex: 'goods_price', dataIndex: 'goods_price',
width:'90px', width: '90px',
// align:'center' // align:'center'
}, },
{ {
title: '交易佣金', title: '交易佣金',
dataIndex: 'total_service_charge', dataIndex: 'total_service_charge',
width:'90px', width: '90px',
// align:'center' // align:'center'
}, },
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',
width:'90px', width: '90px',
// align:'center' // align:'center'
}, },
{ {
title: '交易状态', title: '交易状态',
width:'90px', width: '90px',
dataIndex: 'status', dataIndex: 'status',
scopedSlots: { customRender: 'status' }, scopedSlots: { customRender: 'status' },
// align:'center' // align:'center'
}, },
{ {
title: '操作', title: '操作',
width:'170px', width: '170px',
scopedSlots: { customRender: 'operation' }, scopedSlots: { customRender: 'operation' },
align:'center' align: 'center'
}, },
] ]
} }
}, },
components:{ components: {
Operation, Operation,
orderDataSelect: () => import('../../dateSelect/order.vue'), orderDataSelect: () => import('../../dateSelect/order.vue'),
orderDetails: () => import('../../orderDetails/index.vue'), orderDetails: () => import('../../orderDetails/index.vue'),
}, },
created(){ created() {
if(this.$route.query){ if (this.$route.query) {
this.query.goods_isli=this.$route.query.goods_islicode this.query.goods_isli = this.$route.query.goods_islicode
} }
this.getList() this.getList()
}, },
methods:{ methods: {
// 重置query // 重置query
resetQurey(){ resetQurey() {
Object.assign(this.query, this.$options.data().query) Object.assign(this.query, this.$options.data().query)
this.getList() this.getList()
}, },
getList(type){ getList(type) {
let data=this.query let data = this.query
data.limit=this.limit data.limit = this.limit
if(type==1){ if (type == 1) {
this.page=1 this.page = 1
} }
data.page=this.page data.page = this.page
getOrderList(data).then(res=>{ getOrderList(data).then(res => {
if(res.code==200){ if (res.code == 200) {
this.data=res.data.data this.data = res.data.data
this.startTotal=res.data.start this.startTotal = res.data.start
this.endTotal=res.data.end this.endTotal = res.data.end
this.total=res.data.total this.total = res.data.total
}else{ } else {
this.$message.error(res.msg); this.$message.error(res.msg);
} }
}) })
}, },
SelectOrder(val){ SelectOrder(val) {
this.batchcode=val this.batchcode = val
this.visible2=true this.visible2 = true
}, },
SelectDate(val){ SelectDate(val) {
this.visible=true this.visible = true
this.batchcode=val this.batchcode = val
}, },
// 切换一页显示多少条 // 切换一页显示多少条
onShowSizeChange(current, pageSize){ onShowSizeChange(current, pageSize) {
this.page=1 this.page = 1
this.limit = pageSize; this.limit = pageSize;
this.getList() this.getList()
}, },
// 切换页数 // 切换页数
changePage(page, pageSize){ changePage(page, pageSize) {
this.page=page this.page = page
this.getList() this.getList()
}, },
// //
selectAll(){ selectAll() {
} }
} }
} }
</script> </script>
<style scoped> <style scoped></style>
</style>

4
src/main.js
View File

@ -24,8 +24,8 @@ Vue.prototype.$echarts = echarts;
// Vue.prototype.$host = 'http://10.14.1.197:9090' // Vue.prototype.$host = 'http://10.14.1.197:9090'
// Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试 // Vue.prototype.$host = 'http://wenhua.xingtongworld.com/' //兴通测试
Vue.prototype.$host = 'http://10.24.4.156' //正式服 // Vue.prototype.$host = 'http://10.24.4.156' //正式服
// Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest // Vue.prototype.$host = 'http://10.14.1.197:9090' //javatest

Write Preview
Loading…
Cancel
Save