wangyifang
/
szgb-book-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

up

Browse Source
master
lion 2 years ago
parent f5691a90e5
commit f93e575bbf
7 changed files with 91 additions and 49 deletions
Show Stats Download Patch File Download Diff File

12
src/views/active/activity.vue
Unescape View File

@ -819,11 +819,13 @@
that.$message.error('请选择活动场次时间');
return false;
}
let checktime = that.compareDate(k.start_time, k.end_plan);
if (!checktime) {
that.$message.error('截止时间不能晚于开始时间');
return false;
}
// let checktime = that.compareDate(k.start_time, k.end_plan);
// if (!checktime) {
// that.$message.error('截止时间不能晚于开始时间');
// return false;
// }
upTotal += parseInt(k.total)
}
that.form.total = upTotal

27
src/views/exhibit/component/addExhibit.vue
Unescape View File

@ -79,7 +79,7 @@
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>开始时间：
</div>
<div class="xy-table-item-content">
<el-date-picker style="width: 300px;" v-model="form.start_time" value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker style="width: 300px;" default-time="09:00:00" v-model="form.start_time" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" placeholder="选择开始时间">
</el-date-picker>
</div>
@ -91,7 +91,7 @@
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>结束时间：
</div>
<div class="xy-table-item-content">
<el-date-picker style="width: 300px;" v-model="form.over_time" value-format="yyyy-MM-dd HH:mm:ss"
<el-date-picker style="width: 300px;" default-time="16:00:00" v-model="form.over_time" value-format="yyyy-MM-dd HH:mm:ss"
type="datetime" placeholder="选择日期时间">
</el-date-picker>
</div>
@ -107,7 +107,16 @@
</div>
</div>
</template>
<template v-slot:organizer>
<div class="xy-table-item">
<div class="xy-table-item-label">
<span style="color: red;font-weight: 600;padding-right: 4px;"></span>主办单位：
</div>
<div class="xy-table-item-content">
<el-input v-model="form.organizer" placeholder="请输入主办单位" clearable style="width: 300px;"></el-input>
</div>
</div>
</template>
<template v-slot:sponsor>
<div class="xy-table-item">
<div class="xy-table-item-label">
@ -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 {

60
src/views/exhibit/index.vue
Unescape View File

@ -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 {
// }>
// </el-switch>
// )
if(row.state===1){
return ( < div style = {
{
@ -133,9 +116,39 @@ export default {
}
} >已结束</div > )
}
}
},
{
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

4
src/views/order/parkorder.vue
Unescape View File

@ -43,8 +43,8 @@
<Button ghost size="small" @click="show(scope.row)" type="primary"
style="margin-left: 10px;">查看</Button>
<Button v-if="scope.row['orderno']==null" ghost size="small" @click="appointmentOrder(scope.row)" type="info"
style="margin-left: 10px;">第三方下单</Button>
<!-- <Button v-if="scope.row['orderno']==null" ghost size="small" @click="appointmentOrder(scope.row)" type="info"
style="margin-left: 10px;">第三方下单</Button> -->
</div>
<div v-else-if="column.type=='type'">
<div v-if="scope.row[column.field]==1">小车位</div>

4
src/views/relic/component/addRelic.vue
Unescape View File

@ -73,6 +73,7 @@
</div>
<div class="xy-table-item-content">
<el-upload :action="action"
:file-list="heatPictureList"
list-type="picture-card"
style="width:600px"
:limit="1" :auto-upload="true" :data="uploadOther"
@ -189,7 +190,8 @@
head_picture: res?.head_picture,
content: res?.content
}
res.head_upload?this.heatPictureList.push(res.head_upload):''
res.head_upload?this.heatPictureList.push(res.head_upload):''
console.log("this.heatPictureList",this.heatPictureList)
},
submit() {
if(this.heatPictureList.length>0){

27
src/views/relic/index.vue
Unescape View File

@ -62,22 +62,33 @@ export default {
label:"名称",
prop:'name',
align:'left',
},
{
label:"文物年限",
prop:'history_time',
align:'center',
// width:240,
fixed:'left'
},
{
label:"文物等级",
prop:'grade',
align:'center',
width:100,
},
{
label:"文物组成",
prop:'contain',
align:'center',
}
width:240,
},
{
label:"文物年限",
prop:'history_time',
align:'center',
width:120,
},
{
label:"发布时间",
prop:'release_time',
align:'center',
width:180,
},
]
}
},
@ -89,7 +100,9 @@ export default {
const res = await index({
page_size:this.select.pageSize,
page:this.select.pageIndex,
name:this.select.name
name:this.select.name,
sort_name:'release_time',
sort_type:"DESC",
})
this.list = res.data
this.total = res.total

6
src/views/resource/addressinfo.vue
Unescape View File

@ -225,9 +225,9 @@
},
resetForm(formName) {
var that = this;
this.$refs.tiny.setContent("");
this.$refs.tiny1.setContent("");
this.$refs.tiny2.setContent("");
// this.$refs.tiny.setContent("");
// this.$refs.tiny1.setContent("");
// this.$refs.tiny2.setContent("");
this.$refs[formName].resetFields();
that.dialogFormVisible = false;
},

Write Preview
Loading…
Cancel
Save