Browse Source

Merge branch 'feature' of http://120.46.222.128:10021/elink-star/epmet-work-pc into feature-xiaowang

7.31
是小王呀\24601 1 year ago
parent
commit
76a9b56c45
  1. 2
      src/views/modules/communityParty/activity/eventDetails.vue
  2. 11
      src/views/modules/communityParty/comPromotion/add.vue
  3. 2
      src/views/modules/shequzhili/eventOld/cpts/event-detail.vue
  4. 10
      src/views/modules/shequzhili/eventOld/cpts/event-info.vue
  5. 25
      src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue
  6. 3
      src/views/modules/workSys/promotionTab/AddpromotionTab.vue
  7. 16
      src/views/modules/workSys/promotionTab/index.vue
  8. 3
      src/views/modules/workSys/promotionTab/viewPromotionalTags.vue

2
src/views/modules/communityParty/activity/eventDetails.vue

@ -92,7 +92,7 @@
</div>
</div>
<!-- 报名名单 -->
<div v-if="formData.status!==0||formData.online == 1" style="margin-top: 20px;">
<div v-if="formData.status!==0 && formData.online == 1" style="margin-top: 20px;">
<div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
报名名单
</div>

11
src/views/modules/communityParty/comPromotion/add.vue

@ -172,10 +172,13 @@ export default {
}
this.formType=typeid
console.log(this.formData,"5164");
console.log(typeid);
console.log(this.formType,"5164");
this.endLoading();
this.setDefaultReleaseTime()
if(typeid=="add"){
this.setDefaultReleaseTime()
}
},
async advertisingTag () {
const url = "/actual/base/advertisingTag/page"
@ -276,6 +279,7 @@ export default {
let url = '/actual/base/communityPublicity/update'
this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0
this.formData.status=0
console.log(this.formData,"formData");
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
@ -296,6 +300,7 @@ export default {
console.log(this.formData,"formData");
this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0
const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) {
this.$message({

2
src/views/modules/shequzhili/eventOld/cpts/event-detail.vue

@ -12,7 +12,7 @@
<template v-if="!info.gridName">
<el-select v-model.trim="info.gridId" placeholder="请选择" clearable class="cell-width-1">
<el-option v-for="item in gridList" :key="item.value" :label="item.label"
:value="item.value">
:value="item.value" @click.native="$emit('handelCLickGridId',item)">
</el-option>
</el-select>
</template>

10
src/views/modules/shequzhili/eventOld/cpts/event-info.vue

@ -40,7 +40,7 @@
<div :class="['g-total', { 'g-left': projectProcess.length > 0, 'g-left-top40': pageType == 'info' }]">
<event-detail ref="ref_detail" :type="pageType" :eventId="eventId" :eventDetailData="eventDetailData"
:source="source" @handleToProject="handleToProject" @handleToDemand="handleToDemand"
@handleToIssue="handleToIssue" @handleClose="handleClose"></event-detail>
@handleToIssue="handleToIssue" @handleClose="handleClose" @handelCLickGridId="handelCLickGridId"></event-detail>
<div v-if="!eventDetailData.operationId && pageTypeCopy == 'dispose'" class="process-form">
<el-card :class="{ 'box-card': source === 'visiual' }">
@ -523,7 +523,9 @@ export default {
this.$message.error("请选择处理方式!");
}
},
handelCLickGridId(val){
this.grid = val.value;
},
async handelDispose() {
this.$refs.ref_processinfo_dispose.getProcessInfo();
if (this.$refs.ref_processinfo_dispose.okflag) {
@ -538,7 +540,9 @@ export default {
}
this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo;
this.replayInfo.icEventId = this.eventId;
this.replayInfo.openFlag = null
this.replayInfo.openFlag = null;
this.replayInfo.openId = this.eventDetailCopy.openId;
this.replayInfo.gridId = this.grid;
//
let url = "/governance/icEventOld/reply";
await this.submitDispose(url, this.replayInfo);

25
src/views/modules/shequzhili/eventOld/cpts/process-form-demand.vue

@ -24,7 +24,7 @@
prop="categoryCode">
<div :class="{ 'visiual-form': source === 'visiual' }">
<el-cascader v-model.trim="formData.categoryCode" :options="demandOptions" clearable class="cell-width-1"
<el-cascader v-model.trim="formData.categoryCode" :props="{label:'categoryName',value:'categoryCode',children:'childCateList'}" :options="demandOptions" clearable class="cell-width-1"
@change="handleCateSlect"></el-cascader>
</div>
@ -363,9 +363,8 @@ export default {
// }
// },
async getDemandOptions() {
const url = "/governance/icresidemanddict/demandoption"
let params = {}
const { data, code, msg } = await requestPost(url, params)
const url = "/actual/base/serviceitem/listAllCategory"
const { data, code, msg } = await requestPost(url)
if (code === 0) {
this.demandOptions = this.getFlagData(
this.getTreeData(data),
@ -391,10 +390,10 @@ export default {
if (!Array.isArray(data)) return [];
let arr = data.map((item) => {
let _item = {};
if (item.children) {
if (item.children.length === 0)
_item = { ...item, children: undefined };
else _item = { ...item, children: this.getTreeData(item.children) };
if (item.childCateList) {
if (item.childCateList.length === 0)
_item = { ...item, childCateList: undefined };
else _item = { ...item, childCateList: this.getTreeData(item.childCateList) };
} else {
_item = { ...item };
}
@ -406,8 +405,8 @@ export default {
if (!Array.isArray(data)) return [];
let arr1 = data.filter((item) => item[flag]);
let arr2 = arr1.map((item) => {
if (item.children)
return { ...item, children: this.getFlagData(item.children, flag) };
if (item.childCateList)
return { ...item, childCateList: this.getFlagData(item.childCateList, flag) };
else return item;
});
// console.log('arrr-oppp', arr2)
@ -432,11 +431,11 @@ export default {
this.$message.error("请先选择服务类型!");
return;
}
const url = "/actual/base/serviceitem/listServerOrg";
const url = "/actual/base/serviceitem/listServerOrgNewTask";
let params = {
serviceTypeId: this.formData.categoryCode,
serverOrgCategoryCode: this.formData.categoryCode[1],
serverOrgType: val,
businessType: "resi_service",
serverParentOrgCategoryCode:this.formData.categoryCode[0],
};
let { data, code, msg } = await requestPost(url, params);
if (code == 0) {

3
src/views/modules/workSys/promotionTab/AddpromotionTab.vue

@ -11,6 +11,9 @@
</el-input>
</div>
</el-form-item>
<el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
<el-switch v-model="status" :active-value="1" :inactive-value="0"></el-switch>
</el-form-item>
</el-form>
</div>

16
src/views/modules/workSys/promotionTab/index.vue

@ -7,7 +7,12 @@
<el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="首页显示">
<el-select class="item_width_1" v-model.trim="status" size="small" placeholder="请选择" clearable>
<el-option v-for="item in statuslist" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
</el-form-item>
<div style="display: flex; justify-content: flex-end;">
<el-button style="margin-left:10px" class="diy-button--blue" size="small"
@click="handleSearch">查询</el-button>
@ -29,12 +34,17 @@
<el-table-column label="序号" header-align="center" align="center" type="index" width="80"></el-table-column>
<el-table-column prop="tagName" header-align="center" align="center" label="标签名称" >
</el-table-column>
<el-table-column prop="enabled" header-align="center" align="center" label="首页显示" >
<el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
<template slot-scope="scope">
<span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
</template>
</el-table-column>
<el-table-column prop="enabled" header-align="center" align="center" label="首页显示" width="380">
<template slot-scope="scope">
<span>{{ scope.row.status === 1 ? '显示' : '关闭' }}</span>
</template>
</el-table-column>
<el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" >
<el-table-column prop="createdTime" header-align="center" align="center" label="创建时间" width="380">
</el-table-column>
<el-table-column label="操作" fixed="right" width="250" header-align="center" align="center" class="operate">

3
src/views/modules/workSys/promotionTab/viewPromotionalTags.vue

@ -8,6 +8,9 @@
<span>{{ tagName }}</span>
</div>
</el-form-item>
<el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
<el-switch v-model="online" disabled></el-switch>
</el-form-item>
</el-form>
</div>

Loading…
Cancel
Save