|
@@ -456,22 +456,22 @@
|
|
<script>
|
|
<script>
|
|
import moment from 'moment';
|
|
import moment from 'moment';
|
|
import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
|
|
import { getAction, postAction, downFile, downFilePost } from '@/api/manage';
|
|
-
|
|
|
|
|
|
+import qs from 'qs'
|
|
|
|
|
|
let listColumns=[
|
|
let listColumns=[
|
|
{
|
|
{
|
|
title: '订单名称',
|
|
title: '订单名称',
|
|
- dataIndex: 'name',
|
|
|
|
|
|
+ dataIndex: 'orderTitle',
|
|
align: 'center',
|
|
align: 'center',
|
|
- key: 'name',
|
|
|
|
- scopedSlots: { customRender: 'name' }
|
|
|
|
|
|
+ key: 'orderTitle',
|
|
|
|
+ scopedSlots: { customRender: 'orderTitle' }
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '订单编号',
|
|
title: '订单编号',
|
|
dataIndex: 'id',
|
|
dataIndex: 'id',
|
|
align: 'center',
|
|
align: 'center',
|
|
key: 'tag',
|
|
key: 'tag',
|
|
- scopedSlots: { customRender: 'tag' }
|
|
|
|
|
|
+ scopedSlots: { customRender: 'id' }
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '订单发起人',
|
|
title: '订单发起人',
|
|
@@ -482,17 +482,17 @@ let listColumns=[
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '订单状态',
|
|
title: '订单状态',
|
|
- dataIndex: 'time',
|
|
|
|
|
|
+ dataIndex: 'orderStatus',
|
|
align: 'center',
|
|
align: 'center',
|
|
- key: 'time',
|
|
|
|
- scopedSlots: { customRender: 'time' }
|
|
|
|
|
|
+ key: 'orderStatus',
|
|
|
|
+ scopedSlots: { customRender: 'orderStatus' }
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '更新时间',
|
|
title: '更新时间',
|
|
- dataIndex: 'remarks',
|
|
|
|
|
|
+ dataIndex: 'materialFinishTime',
|
|
align: 'center',
|
|
align: 'center',
|
|
- key: 'remarks',
|
|
|
|
- scopedSlots: { customRender: 'remarks' }
|
|
|
|
|
|
+ key: 'materialFinishTime',
|
|
|
|
+ scopedSlots: { customRender: 'materialFinishTime' }
|
|
},
|
|
},
|
|
{
|
|
{
|
|
title: '操作',
|
|
title: '操作',
|
|
@@ -504,37 +504,7 @@ let listColumns=[
|
|
},
|
|
},
|
|
]
|
|
]
|
|
|
|
|
|
-let marterialData=[
|
|
|
|
- {
|
|
|
|
- name:'1111',
|
|
|
|
- type:'真人',
|
|
|
|
- status:'待审核',
|
|
|
|
- time:'2020-10-20 19:23:12',
|
|
|
|
- id:0,
|
|
|
|
- remarks:'xx'
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name:'2211',
|
|
|
|
- type:'vlog',
|
|
|
|
- status:'已完成',
|
|
|
|
- time:'2020-10-20 19:23:12',
|
|
|
|
- id:1
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name:'3331',
|
|
|
|
- type:'真人',
|
|
|
|
- status:'已驳回',
|
|
|
|
- time:'2020-10-20 19:23:12',
|
|
|
|
- id:2
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- name:'4444',
|
|
|
|
- type:'真人',
|
|
|
|
- status:'待审核',
|
|
|
|
- time:'2020-10-20 19:23:12',
|
|
|
|
- id:3
|
|
|
|
- },
|
|
|
|
-]
|
|
|
|
|
|
+
|
|
export default {
|
|
export default {
|
|
data() {
|
|
data() {
|
|
const panes = [
|
|
const panes = [
|
|
@@ -559,7 +529,7 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
columns:[...listColumns],
|
|
columns:[...listColumns],
|
|
- data:[...marterialData],
|
|
|
|
|
|
+ data:[],
|
|
loading:false,
|
|
loading:false,
|
|
ipagination: {
|
|
ipagination: {
|
|
current: 1,
|
|
current: 1,
|
|
@@ -681,20 +651,33 @@ export default {
|
|
},
|
|
},
|
|
|
|
|
|
tableHttp(type){
|
|
tableHttp(type){
|
|
- if(type==0){
|
|
|
|
-
|
|
|
|
|
|
+ let params=this.handlerParams(type)
|
|
|
|
+ params={
|
|
|
|
+ ...params,
|
|
|
|
+ pageNo:this.ipagination.current,
|
|
|
|
+ pageSize:this.ipagination.pageSize
|
|
}
|
|
}
|
|
- getAction('/platform/order/listByCreator',{
|
|
|
|
-
|
|
|
|
- }).then(res=>{
|
|
|
|
|
|
+ getAction('/platform/order/listByCreatorOrDesignLeader',params).then(res=>{
|
|
|
|
+ console.log(res);
|
|
|
|
+ if(res.success){
|
|
|
|
+ this.data=res.result.records;
|
|
|
|
+ this.ipagination.total=res.result.total;
|
|
|
|
|
|
|
|
+ }
|
|
})
|
|
})
|
|
},
|
|
},
|
|
|
|
|
|
- handlerParams(type){
|
|
|
|
- if(type==1){
|
|
|
|
-
|
|
|
|
- }
|
|
|
|
|
|
+ handlerParams(status){
|
|
|
|
+ if(status==1){
|
|
|
|
+
|
|
|
|
+ }else if(status==2){
|
|
|
|
+
|
|
|
|
+ }else if(status==3){
|
|
|
|
+ return {
|
|
|
|
+ orderStatus:0,
|
|
|
|
+ design:this.userInfo.id
|
|
|
|
+ }
|
|
|
|
+ }
|
|
}
|
|
}
|
|
},
|
|
},
|
|
mounted(){
|
|
mounted(){
|
|
@@ -705,6 +688,7 @@ export default {
|
|
this.roleCode=localStorage.getItem('roleCode')
|
|
this.roleCode=localStorage.getItem('roleCode')
|
|
console.log(this.$route.query.status)
|
|
console.log(this.$route.query.status)
|
|
this.activeKey=this.$route.query.status
|
|
this.activeKey=this.$route.query.status
|
|
|
|
+ this.tableHttp(this.$route.query.status)
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|