@@ -241,7 +250,8 @@
state: 1,
start_time: '',
over_time: '',
- member_sum: '',
+ member_sum: '',
+ organizer:'',
sponsor: '',
guidance_unit: '',
bear_unit: '',
@@ -312,7 +322,8 @@
state: res?.state,
start_time: res?.start_time,
over_time: res?.over_time,
- member_sum: res?.member_sum,
+ member_sum: res?.member_sum,
+ organizer:res?.organizer,
sponsor: res?.sponsor,
guidance_unit: res?.guidance_unit,
bear_unit: res?.bear_unit,
@@ -341,10 +352,10 @@
}
if (this.guidePictureList.length > 0) {
for (var g of this.guidePictureList) {
- if (h.response) {
- this.form.guide_picture = h.response.id
+ if (g.response) {
+ this.form.guide_picture = g.response.id
} else {
- this.form.guide_picture = h.id
+ this.form.guide_picture = g.id
}
}
} else {
diff --git a/src/views/exhibit/index.vue b/src/views/exhibit/index.vue
index fe40f17..3da6420 100644
--- a/src/views/exhibit/index.vue
+++ b/src/views/exhibit/index.vue
@@ -62,35 +62,18 @@ export default {
label:"展览名称",
prop:'name',
align:'left',
- },
- {
- label:"举办展厅",
- prop:'hall.name',
- align:'center',
+ width:240,
+ fixed:'left'
},
{
label:"展览类型",
prop:'type',
align:'center',
+ width:120,
formatter(value){
return value==1?'陈列展览':'临时展览'
}
},
- {
- label:"开始时间",
- prop:'start_time',
- align:'center',
- },
- {
- label:"结束时间",
- prop:'over_time',
- align:'center',
- },
- {
- label:"容纳人数",
- prop:'member_sum',
- align:'center',
- },
{
label:"展览状态",
prop:'state',
@@ -113,7 +96,7 @@ export default {
// }>
//
// )
-
+
if(row.state===1){
return ( < div style = {
{
@@ -133,9 +116,39 @@ export default {
}
} >已结束
)
}
-
+
}
},
+ {
+ label:"开始时间",
+ prop:'start_time',
+ align:'center',
+ width:180,
+ },
+ {
+ label:"结束时间",
+ prop:'over_time',
+ align:'center',
+ width:180,
+ },
+ {
+ label:"举办展厅",
+ prop:'hall.name',
+ align:'center',
+ width:120,
+ },
+ {
+ label:"容纳人数",
+ prop:'member_sum',
+ align:'center',
+ width:100,
+ },
+ {
+ label:"发布时间",
+ prop:'release_time',
+ align:'center',
+ width:180,
+ },
]
}
},
@@ -147,7 +160,8 @@ export default {
title:this.select.name,
sort_name:'state',
sort_name_tow:'release_time',
- sort_type:"DESC"
+ sort_type:"DESC",
+ sort_type_tow:'DESC'
})
this.list = res.data
this.total = res.total
diff --git a/src/views/order/parkorder.vue b/src/views/order/parkorder.vue
index ecffd62..8dfbcbe 100644
--- a/src/views/order/parkorder.vue
+++ b/src/views/order/parkorder.vue
@@ -43,8 +43,8 @@
-
+