Browse Source

优化

master
ltlzx 4 years ago
parent
commit
ab23f3f657
  1. 8
      src/api/index.js
  2. 17
      src/components/Sidebar.vue
  3. 2
      src/components/dateSelect/index.vue
  4. 2
      src/components/orderDetails/index.vue
  5. 2
      src/components/page/admission/index.vue
  6. 26
      src/components/page/classification/DataQuery.vue
  7. 4
      src/components/page/order/closed.vue
  8. 4
      src/components/page/order/completed.vue
  9. 4
      src/components/page/order/index.vue
  10. 4
      src/components/page/order/pendingPayment.vue
  11. 4
      src/components/page/order/toBeDelivered.vue
  12. 4
      src/components/page/order/toBeSettled.vue
  13. 3
      src/utils/request.js

8
src/api/index.js

@ -232,3 +232,11 @@ export const setPaySetting = query => {
data: query data: query
}); });
}; };
//手动下架委托数据
export const offGoods = query => {
return request({
url: '/admin/goods.Goods/offGoods',
method: 'post',
data: query
});
};

17
src/components/Sidebar.vue

@ -1,6 +1,6 @@
<template> <template>
<div class="sidebar_body"> <div class="sidebar_body">
<a-menu theme="dark" mode="inline" :default-selected-keys="[key]" class="sidebar" :defaultOpenKeys="[openKey]"> <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 items">
<a-menu-item v-if="!item.children" :key="item.key"> <a-menu-item v-if="!item.children" :key="item.key">
<router-link :to="item.url"> <router-link :to="item.url">
@ -32,6 +32,7 @@ export default {
return{ return{
key:'', key:'',
openKey:'', openKey:'',
openKeys:[],
items:[ items:[
{ {
icon:'', icon:'',
@ -94,9 +95,21 @@ export default {
}, },
created(){ created(){
this.key=this.$route.path this.key=this.$route.path
this.showMenu() this.showMenu()
}, },
methods:{ methods:{
onOpenChange(openKeys) {
const latestOpenKey = openKeys.find(key => this.openKeys.indexOf(key) === -1);
console.info(latestOpenKey)
console.info(openKeys)
if (this.items.length <=latestOpenKey) {
this.openKeys = openKeys;
} else {
this.openKeys = latestOpenKey ? [latestOpenKey] : [];
}
},
showMenu(){ showMenu(){
this.items.map(item=>{ this.items.map(item=>{
if(item.children){ if(item.children){
@ -104,6 +117,8 @@ export default {
let item1=item.children[i] let item1=item.children[i]
if(item1.key==this.key){ if(item1.key==this.key){
this.openKey=item.key this.openKey=item.key
this.openKeys.push(item.key)
console.info(this.openKeys)
break break
} }
} }

2
src/components/dateSelect/index.vue

@ -61,7 +61,7 @@
<div class="content_info_left"> <div class="content_info_left">
<p>标志码{{item.goods_islicode}}</p> <p>标志码{{item.goods_islicode}}</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>
<p>委托周期{{item.contractual_period==1?'永久':item.contractual_period==2?'单次':'周期'}}</p> <p>委托周期{{item.contractual_period==1?'永久':item.contractual_period==2?'单次':'周期'}}</p>
<p>收费类型{{item.charges_type==1?'免费':'付费'}}</p> <p>收费类型{{item.charges_type==1?'免费':'付费'}}</p>

2
src/components/orderDetails/index.vue

@ -51,7 +51,7 @@
<div class="oreder_info"> <div class="oreder_info">
<p>标的名称{{order_info.goods_name}}</p> <p>标的名称{{order_info.goods_name}}</p>
<p>标的类型{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p> <p>标的类型{{order_info.goods_type==1?'文化资源数据':'文化数字内容'}}</p>
<p>委托类型{{order_info.goods_entrust==1?'转让':'授权'}}</p> <p>交易方式{{order_info.goods_entrust==1?'转让':'授权'}}</p>
<p>权属类型{{order_info.goods_ownership_str}}</p> <p>权属类型{{order_info.goods_ownership_str}}</p>
<p>交易价额¥ {{order_info.price}}</p> <p>交易价额¥ {{order_info.price}}</p>
<p>交易数量{{order_info.transaction_count}}</p> <p>交易数量{{order_info.transaction_count}}</p>

2
src/components/page/admission/index.vue

@ -39,7 +39,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" class="query_item">
<span>委托类型</span> <span>交易方式</span>
<a-select default-value="" v-model="query.goods_entrust"> <a-select default-value="" v-model="query.goods_entrust">
<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>

26
src/components/page/classification/DataQuery.vue

@ -40,7 +40,7 @@
</a-select> </a-select>
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" class="query_item">
<span>委托类型</span> <span>交易方式</span>
<a-select v-model="query.goods_entrust"> <a-select v-model="query.goods_entrust">
<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>
@ -72,9 +72,9 @@
<div class="table"> <div class="table">
<div class="table_title"> <div class="table_title">
<span >查询结果</span> <span >查询结果</span>
<a-button type="primary" class="query_button" @click="getGoods"> </a-button> <a-button type="primary" class="query_button" @click="getGoods"> </a-button>
</div> </div>
<a-table :columns="columns" :data-source="data" bordered :pagination="false"> <a-table :columns="columns" :data-source="data" bordered :pagination="false" :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template slot="goods_status" slot-scope="goods_status"> <template slot="goods_status" slot-scope="goods_status">
<span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span> <span>{{goods_status==1?'上架中':goods_status==2?'下架中':goods_status==3?'已转让':'已失效'}}</span>
</template> </template>
@ -113,7 +113,7 @@
import Operation from '../../Operation.vue' import Operation from '../../Operation.vue'
import dataSelect from '../../dateSelect/index.vue' import dataSelect from '../../dateSelect/index.vue'
import operationRecords from '../../operationRecords/index.vue' import operationRecords from '../../operationRecords/index.vue'
import {getAllDate,getLog,manualGetGoods} from '../../../api/index' import {getAllDate,getLog,offGoods} from '../../../api/index'
export default { export default {
data() { data() {
return{ return{
@ -126,6 +126,7 @@ export default {
data_type:'', data_type:'',
createtime:[], createtime:[],
}, },
selectedRowKeys:[],
visible:false, visible:false,
// //
goods_islicode:'', goods_islicode:'',
@ -200,15 +201,19 @@ export default {
this.getAllDate() this.getAllDate()
}, },
methods:{ methods:{
onSelectChange(selectedRowKeys) {
this.selectedRowKeys = selectedRowKeys;
},
getGoods(){ getGoods(){
manualGetGoods().then(res=>{ let data={goods_isli:this.selectedRowKeys}
offGoods(data).then(res=>{
if(res.code==200){ if(res.code==200){
if(res.data.count==0){ // if(res.data.count==0){
this.$message.success('无新增委托数据'); // this.$message.success('');
}else{ // }else{
this.$message.success('成功获取'+res.data.count+'个委托数据!'); this.$message.success('下架成功');
this.getAllDate() this.getAllDate()
} // }
}else{ }else{
this.$message.error(res.msg); this.$message.error(res.msg);
} }
@ -230,6 +235,7 @@ export default {
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
this.selectedRowKeys=[]
}else{ }else{
this.$message.error(res.msg); this.$message.error(res.msg);
} }

4
src/components/page/order/closed.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -160,7 +160,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

4
src/components/page/order/completed.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -160,7 +160,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

4
src/components/page/order/index.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -174,7 +174,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

4
src/components/page/order/pendingPayment.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -159,7 +159,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

4
src/components/page/order/toBeDelivered.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -160,7 +160,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

4
src/components/page/order/toBeSettled.vue

@ -37,7 +37,7 @@
</a-col> </a-col>
<a-col :span="5" class="query_item"> <a-col :span="5" 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>
<a-select-option value="1">转让</a-select-option> <a-select-option value="1">转让</a-select-option>
@ -160,7 +160,7 @@ export default {
align:'center' align:'center'
}, },
{ {
title: '委托类型', title: '交易方式',
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
align:'center' align:'center'
}, },

3
src/utils/request.js

@ -4,7 +4,8 @@ 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://192.168.66.254:8080', baseURL:'http://58.30.231.138:8899',
// baseURL:'http://192.168.66.254:8080',
timeout: 5000, timeout: 5000,
}); });

Loading…
Cancel
Save