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

Merge branch 'master' of https://git.xingtongworld.com/ltlzx/wenhuaDate_admin

master
luyisha 3 years ago
parent
1141a58e6f 285dfcfa4c
commit
dd2d8f2376
9 changed files with 196 additions and 21 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. 12
      src/components/page/afterService/invoice.vue
  2. 37
      src/components/page/order/closed.vue
  3. 36
      src/components/page/order/completed.vue
  4. 14
      src/components/page/order/index.vue
  5. 38
      src/components/page/order/pendingPayment.vue
  6. 36
      src/components/page/order/toBeDelivered.vue
  7. 36
      src/components/page/order/toBeSettled.vue
  8. 4
      src/main.js
  9. 4
      src/utils/request.js

12
src/components/page/afterService/invoice.vue
View File

@ -57,7 +57,11 @@
<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 :lg="24" :xl="24" :xxl="12" class="query_item query_item1"> <a-col :lg="8" :xl="8" :xxl="6" class="query_item">
<span>发票号码：</span>
<a-input v-model="query.batchcode"/>
</a-col>
<a-col :lg="24" :xl="24" :xxl="24" class="query_item query_item1">
<a-space :size="21"> <a-space :size="21">
<a-button type="primary" class="query_button" @click="getAllDate(1)">查 询</a-button> <a-button type="primary" class="query_button" @click="getAllDate(1)">查 询</a-button>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -142,6 +146,12 @@ export default {
width:'160px' width:'160px'
// align:'center' // align:'center'
}, },
{
title: '发票号码',
dataIndex: 'ticketid',
width:'120px'
// align:'center'
},
{ {
title: '发票编号', title: '发票编号',
dataIndex: 'ticketid', dataIndex: 'ticketid',

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

@ -51,11 +51,27 @@
<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 query_item2"> <a-col :lg="12" :xl="8" :xxl="12" 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="16" :xxl="6" class="query_item query_item1"> <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.biaodi_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.dingdan_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="16" :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>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -117,6 +133,10 @@ export default {
createtime:[], createtime:[],
goods_isli:'', goods_isli:'',
charges_type:'', charges_type:'',
biaodi_start:'',
biaodi_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
visible:false, visible:false,
visible2:false, visible2:false,
@ -165,6 +185,7 @@ export default {
// width:'130px', // width:'130px',
// align:'center' // align:'center'
}, },
// { // {
// title: '订单类型', // title: '订单类型',
// dataIndex: 'type', // dataIndex: 'type',
@ -177,6 +198,18 @@ export default {
width:'90px', width:'90px',
// align:'center' // align:'center'
}, },
{
title: '标的金额',
dataIndex: 'goods_price',
width:'90px',
// align:'center'
},
{
title: '交易佣金',
dataIndex: 'total_service_charge',
width:'90px',
// align:'center'
},
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',

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

@ -51,11 +51,27 @@
<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 query_item2"> <a-col :lg="12" :xl="8" :xxl="12" 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="16" :xxl="6" class="query_item query_item1"> <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.biaodi_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.dingdan_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="16" :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>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -117,6 +133,10 @@ export default {
createtime:[], createtime:[],
goods_isli:'', goods_isli:'',
charges_type:'', charges_type:'',
biaodi_start:'',
biaodi_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
visible:false, visible:false,
visible2:false, visible2:false,
@ -177,6 +197,18 @@ export default {
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
// align:'center' // align:'center'
}, },
{
title: '标的金额',
dataIndex: 'goods_price',
width:'90px',
// align:'center'
},
{
title: '交易佣金',
dataIndex: 'total_service_charge',
width:'90px',
// align:'center'
},
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',

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

@ -69,19 +69,19 @@
</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.entrust_name" 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.entrust_name" 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.entrust_name" 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.entrust_name" 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">
@ -144,10 +144,14 @@ export default {
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_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
batchcode:'', batchcode:'',
visible:false, visible:false,

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

@ -51,11 +51,27 @@
<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 query_item2"> <a-col :lg="12" :xl="8" :xxl="12" 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="16" :xxl="6" class="query_item query_item1"> <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.biaodi_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.dingdan_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="16" :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>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -116,6 +132,10 @@ export default {
createtime:'', createtime:'',
goods_isli:'', goods_isli:'',
charges_type:'', charges_type:'',
biaodi_start:'',
biaodi_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
batchcode:'', batchcode:'',
visible:false, visible:false,
@ -176,11 +196,23 @@ export default {
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
}, },
{
title: '标的金额',
dataIndex: 'goods_price',
width:'90px',
// align:'center'
},
{
title: '交易佣金',
dataIndex: 'total_service_charge',
width:'90px',
// align:'center'
},
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',
width:'90px', width:'90px',
// align:'center'
}, },
{ {
title: '操作', title: '操作',

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

@ -51,11 +51,27 @@
<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 query_item2"> <a-col :lg="12" :xl="8" :xxl="12" 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="16" :xxl="6" class="query_item query_item1"> <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.biaodi_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.dingdan_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="16" :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>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -117,6 +133,10 @@ export default {
createtime:[], createtime:[],
goods_isli:'', goods_isli:'',
charges_type:'', charges_type:'',
biaodi_start:'',
biaodi_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
visible:false, visible:false,
visible2:false, visible2:false,
@ -176,6 +196,18 @@ export default {
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
// align:'center' // align:'center'
}, },
{
title: '标的金额',
dataIndex: 'goods_price',
width:'90px',
// align:'center'
},
{
title: '交易佣金',
dataIndex: 'total_service_charge',
width:'90px',
// align:'center'
},
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',

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

@ -51,11 +51,27 @@
<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 query_item2"> <a-col :lg="12" :xl="8" :xxl="12" 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="16" :xxl="6" class="query_item query_item1"> <a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>标的金额：</span>
<a-input v-model="query.biaodi_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.biaodi_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="8" :xxl="12" class="query_item query_item3">
<span>订单金额：</span>
<a-input v-model="query.dingdan_start" placeholder="最小值"/>
<el-col :span="10" v-html="'\u00a0'"/>
<el-col style="color:#d9d9d9;">-</el-col>
<el-col :span="10" v-html="'\u00a0'"/>
<a-input v-model="query.dingdan_end" placeholder="最大值"/>
</a-col>
<a-col :lg="12" :xl="16" :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>
<a-button class="query_button" @click="resetQurey">重 置</a-button> <a-button class="query_button" @click="resetQurey">重 置</a-button>
@ -117,6 +133,10 @@ export default {
createtime:[], createtime:[],
goods_isli:'', goods_isli:'',
charges_type:'', charges_type:'',
biaodi_start:'',
biaodi_end:'',
dingdan_start:'',
dingdan_end:'',
}, },
visible:false, visible:false,
visible2:false, visible2:false,
@ -176,6 +196,18 @@ export default {
dataIndex: 'entrust_type', dataIndex: 'entrust_type',
// align:'center' // align:'center'
}, },
{
title: '标的金额',
dataIndex: 'goods_price',
width:'90px',
// align:'center'
},
{
title: '交易佣金',
dataIndex: 'total_service_charge',
width:'90px',
// align:'center'
},
{ {
title: '订单金额', title: '订单金额',
dataIndex: 'total_money', dataIndex: 'total_money',

4
src/main.js
View File

@ -22,9 +22,9 @@ Vue.prototype.$echarts = echarts;
// 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' // 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

4
src/utils/request.js
View File

@ -3,9 +3,9 @@ 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://10.24.4.156', //正式服 baseURL:'http://10.24.4.156', //正式服
// baseURL:'10.14.1.197:9090', //新服 // baseURL:'10.14.1.197:9090', //新服
// baseURL:'http://192.168.66.254:8080', // baseURL:'http://192.168.66.254:8080',

Write Preview
Loading…
Cancel
Save