elink-star
/
epmet-work-pc-chengyang
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'lisu_4.3.3' into dev

feature
mk 1 year ago
parent
3d6568d4e5 580e1bb611
commit
bccf06da5c
2 changed files with 40 additions and 29 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. 59
      src/views/modules/communityParty/activity/index.vue
  2. 10
      src/views/modules/workSys/typeActivity/index.vue

59
src/views/modules/communityParty/activity/index.vue
View File

@ -23,17 +23,13 @@
placeholder="请输入关键字"> placeholder="请输入关键字">
</el-input> </el-input>
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="活动时间" prop="timeRange"> <el-form-item label="活动时间" prop="timeRange">
<el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange" <el-date-picker v-model.trim="timeRange" size="small" style="width: 260px;" type="daterange"
value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间" value-format="yyyy-MM-dd HH:mm:ss" @change="handleTimeChange" range-separator="至" start-placeholder="开始时间"
end-placeholder="结束时间"> end-placeholder="结束时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="活动地点" prop="address"> <el-form-item label="活动地点" prop="address">
<el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入内容"> <el-input v-model.trim="formData.address" size="small" class="item_width_1" clearable placeholder="请输入内容">
</el-input> </el-input>
@ -47,6 +43,9 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</div>
<div>
<div style="display: flex; justify-content: flex-end;"> <div style="display: flex; justify-content: flex-end;">
<el-button style="margin-left:10px" class="diy-button--blue" size="small" <el-button style="margin-left:10px" class="diy-button--blue" size="small"
@click="handleSearch">查询</el-button> @click="handleSearch">查询</el-button>
@ -67,10 +66,10 @@
</div> </div>
<el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading" <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
style="width: 100%"> style="width: 100%;margin-top:16px">
<el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column> <el-table-column label="序号" header-align="center" align="center" type="index" width="50"></el-table-column>
<el-table-column prop="typeId" header-align="center" align="center" label="活动类型" width="180"> <el-table-column prop="typeName" header-align="center" align="center" label="活动类型" width="180">
</el-table-column> </el-table-column>
<el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180"> <el-table-column prop="activityName" header-align="center" align="center" label="活动名称" width="180">
</el-table-column> </el-table-column>
@ -103,24 +102,24 @@
<el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate"> <el-table-column label="操作" fixed="right" width="230" header-align="center" align="center" class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;text-decoration: underline;" <el-button type="text" v-if="scope.row.status == 0" style="color:#1C6AFD;"
size="small" @click="handleEdit(scope.row)">编辑</el-button> size="small" @click="handleEdit(scope.row)">编辑</el-button>
<!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;text-decoration: underline;" <!-- <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs === '' && scope.row.sumUp === ''" style="color:#1C6AFD;"
size="small" @click="handleSumm(scope.row)">活动总结</el-button> --> size="small" @click="handleSumm(scope.row)">活动总结</el-button> -->
<el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;text-decoration: underline;" <el-button type="text" v-if="scope.row.status == 2 && scope.row.activityImgs == null && scope.row.sumUp == ''" style="color:#1C6AFD;"
size="small" @click="handleSumm(scope.row)">活动总结</el-button> size="small" @click="handleSumm(scope.row)">活动总结</el-button>
<el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="text" <el-button v-if="scope.row.status == 2 || scope.row.status == 3" type="text"
style="color:#D51010;text-decoration: underline;" size="small" style="color:rgb(28, 106, 253);" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
<el-button v-if="scope.row.status == 0" type="text" <el-button v-if="scope.row.status == 0" type="text"
style="color:#D51010;text-decoration: underline;" size="small" style="color:#D51010;" size="small"
@click="handleCancel(scope.row)">取消</el-button> @click="handleCancel(scope.row)">取消</el-button>
</template> </template>
@ -298,6 +297,14 @@
this.tableData = data.list this.tableData = data.list
this.tableData.forEach((item) => { this.tableData.forEach((item) => {
this.typeList.forEach((itemuse)=>{
if(item.typeId==itemuse.id)
{
item.typeName=itemuse.typeName
}
})
const currentTime = new Date(); const currentTime = new Date();
if (item.startTime > currentTime) { if (item.startTime > currentTime) {
if( item.status === 0 ){ if( item.status === 0 ){
@ -324,12 +331,14 @@
this.updatetow() this.updatetow()
} }
} }
}); });
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
console.log(this.tableData);
}, },
async getDemandOptions() { async getDemandOptions() {
this.$http this.$http
@ -762,28 +771,30 @@
.m-search { .m-search {
background: #ffffff; background: #ffffff;
border-radius: 4px; border-radius: 4px;
padding: 30px 20px 5px; padding: 24px 10px 10px;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
margin: 20px 7px 7px;
} }
.item_width_1 { // .item_width_1 {
width: 260px; // width: 260px;
} // }
.item_width_2 { // .item_width_2 {
width: 495px; // width: 495px;
} // }
.m-table { .m-table {
background: #ffffff; background: #ffffff;
box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1);
border-radius: 4px; border-radius: 4px;
margin-top: 15px; margin-top: 15px;
padding: 23px 30px 10px; padding: 24px 16px 10px;
margin: 16px 7px 7px;
.table { // .table {
margin-top: 20px; // margin-top: 20px;
} // }
} }
.div_btn { .div_btn {

10
src/views/modules/workSys/typeActivity/index.vue
View File

@ -41,25 +41,25 @@
<el-table-column label="序号" header-align="center" align="center" type="index" <el-table-column label="序号" header-align="center" align="center" type="index"
width="80"></el-table-column> width="80"></el-table-column>
<el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380"> <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" >
</el-table-column> </el-table-column>
<el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380"> <el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
</el-table-column> </el-table-column>
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" <el-table-column label="操作" fixed="right" width="250" header-align="center" align="center"
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small" <el-button type="text" style="color:#1C6AFD;" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button type="text"
style="color:#00A7A9;text-decoration: underline;" size="small" style="color:#1C6AFD;" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button type="text" <el-button type="text"
style="color:#D51010;text-decoration: underline;" size="small" style="color:#1C6AFD;" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
</template> </template>

Write Preview
Loading…
Cancel
Save