Browse Source

Merge branch 'bug_mk' into dev

# Conflicts:
#	src/views/modules/shequzhili/eventOld/eventList.vue
V4.3.3_XiaoWang
mk 1 year ago
parent
commit
4aa7a984fb
  1. 4
      src/views/dataBoardMain/main-navbar.vue
  2. 2
      src/views/modules/communityParty/activity/eventDetails.vue
  3. 5
      src/views/modules/communityParty/activity/index.vue
  4. 2
      src/views/modules/communityParty/activity/initiateActivity.vue
  5. 22
      src/views/modules/communityParty/comPromotion/add.vue
  6. 2
      src/views/modules/communityParty/comPromotion/index.vue
  7. 11
      src/views/modules/shequzhili/eventOld/eventList.vue
  8. 3
      src/views/modules/workSys/promotionTab/AddpromotionTab.vue
  9. 7
      src/views/modules/workSys/promotionTab/index.vue
  10. 3
      src/views/modules/workSys/promotionTab/viewPromotionalTags.vue

4
src/views/dataBoardMain/main-navbar.vue

@ -220,12 +220,12 @@ export default {
params = { orgId: this.value, level: this.getChooseLabel(this.value) }; params = { orgId: this.value, level: this.getChooseLabel(this.value) };
} }
this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => { this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => {
console.log(data);
this.value = data.id; this.value = data.id;
this.$store.dispatch("chooseArea/chooseName", { this.$store.dispatch("chooseArea/chooseName", {
orgId: data.id, orgId: data.id,
level: data.level, level: data.level,
}); });
console.log(children,data,"children");
let children = await this.dealTreeData(data.children); let children = await this.dealTreeData(data.children);
if (data.parentId) { if (data.parentId) {
this.options = [ this.options = [
@ -260,9 +260,11 @@ export default {
label: item.name, label: item.name,
children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null, children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null,
})); }));
console.log(data,"sdffs");
return data; return data;
}, },
setSelectName(index) { setSelectName(index) {
console.log(index,"index");
const name = this.options.filter((item) => item.value === index)[0].label; const name = this.options.filter((item) => item.value === index)[0].label;
const width = name.length > 5 ? name.length * 14 + 25 : 120; const width = name.length > 5 ? name.length * 14 + 25 : 120;
this.selectWidth = width; this.selectWidth = width;

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

@ -92,7 +92,7 @@
</div> </div>
</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 style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
报名名单 报名名单
</div> </div>

5
src/views/modules/communityParty/activity/index.vue

@ -398,7 +398,7 @@
pageSize: 10, pageSize: 10,
pageNo: 1, pageNo: 1,
typeName: "", typeName: "",
enabled: 0 enabled: 1
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {
@ -434,6 +434,9 @@
this.detailShow = true this.detailShow = true
this.formTitle = '详情' this.formTitle = '详情'
console.log('rowmememmeme',row) console.log('rowmememmeme',row)
if(this.typeList){
row.typeName = this.typeList.filter(item=>item.id === row.typeId)[0].typeName || '--'
}
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_detail.initForm(row) this.$refs.ref_detail.initForm(row)
// this.$refs.ref_form.initForm('detail', row.id) // this.$refs.ref_form.initForm('detail', row.id)

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

@ -343,7 +343,7 @@ export default {
pageSize: 20, pageSize: 20,
pageNo: 1, pageNo: 1,
typeName: "", typeName: "",
enabled: 0 enabled: 1
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)
if (code === 0) { if (code === 0) {

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

@ -37,7 +37,7 @@
</el-form-item> </el-form-item>
<el-form-item label="首页置顶" style="display: block" prop="top" label-width="150px"> <el-form-item label="首页置顶" style="display: block" prop="top" label-width="150px">
<el-switch v-model="formData.top" :active-value="1" :inactive-value="0" @change="handleOnlineRegistration"></el-switch> <el-switch v-model="formData.top" @change="handleOnlineRegistration"></el-switch>
</el-form-item> </el-form-item>
<el-form-item label="消息推送" label-width="140px" prop="sendMsg"> <el-form-item label="消息推送" label-width="140px" prop="sendMsg">
@ -92,7 +92,7 @@ export default {
adverTagList:[], adverTagList:[],
////// //////
top:false, top:false,
fileList: [],// fileList: {},//
activityImgs:[],// activityImgs:[],//
formType: 'add', // addedit,records formType: 'add', // addedit,records
// records:false, // records:false,
@ -115,8 +115,8 @@ export default {
coverPic: "",// coverPic: "",//
releaseTime: "",// releaseTime: "",//
sendMsg: false,// sendMsg: false,//
top: 0,// top: false,//
status: 1 // status: 0 //
}, },
serviceList: [], serviceList: [],
// gridList: [], // gridList: [],
@ -167,18 +167,14 @@ export default {
this.startLoading(); this.startLoading();
if(row!=null){ if(row!=null){
this.formData = JSON.parse(JSON.stringify(row)); this.formData = JSON.parse(JSON.stringify(row));
this.fileList.push({fileUrl:this.formData.coverPic}) console.log(this.formData.coverPic);
console.log(this.formData.coverPic,'see');
} }
this.formType=typeid this.formType=typeid
console.log(typeid);
console.log(this.formType,"5164");
this.endLoading();
if(typeid=="add"){
this.setDefaultReleaseTime()
}
console.log(this.formData,"5164");
this.endLoading();
this.setDefaultReleaseTime()
}, },
async advertisingTag () { async advertisingTag () {
const url = "/actual/base/advertisingTag/page" const url = "/actual/base/advertisingTag/page"
@ -279,7 +275,6 @@ export default {
let url = '/actual/base/communityPublicity/update' let url = '/actual/base/communityPublicity/update'
this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0 this.formData.top= this.formData.top? 1:0
this.formData.status=0
console.log(this.formData,"formData"); console.log(this.formData,"formData");
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
@ -300,7 +295,6 @@ export default {
console.log(this.formData,"formData"); console.log(this.formData,"formData");
this.formData.sendMsg= this.formData.sendMsg? 1:0 this.formData.sendMsg= this.formData.sendMsg? 1:0
this.formData.top= this.formData.top? 1:0 this.formData.top= this.formData.top? 1:0
const { data, code, msg } = await requestPost(url, this.formData) const { data, code, msg } = await requestPost(url, this.formData)
if (code === 0) { if (code === 0) {
this.$message({ this.$message({

2
src/views/modules/communityParty/comPromotion/index.vue

@ -288,7 +288,7 @@
// console.log(row) // console.log(row)
const url = "/actual/base/communityPublicity/updateStatus" const url = "/actual/base/communityPublicity/updateStatus"
let params={ let params={
status:0, status:1,
id:row.id id:row.id
} }
const { data, code, msg } = await requestPost(url, params) const { data, code, msg } = await requestPost(url, params)

11
src/views/modules/shequzhili/eventOld/eventList.vue

@ -640,7 +640,7 @@ export default {
this.getTableData(); this.getTableData();
}, },
async handleVote(row){ async handleVote(row){
const url = "/governance/icEventOld/updateSpecialColumn"; const url = "/governance/icEventOld/reply";
let params = { let params = {
icEventId:row.icEventId, icEventId:row.icEventId,
@ -649,14 +649,7 @@ export default {
} }
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
console.log(data);
if (code === 0) {
this.$message.success("操作成功!");
this.getTableData();
} else {
this.$message.error("操作失败!");
}
}, },
async handleDel(rowData) { async handleDel(rowData) {
let message = "确认删除?"; let message = "确认删除?";

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

@ -11,9 +11,6 @@
</el-input> </el-input>
</div> </div>
</el-form-item> </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> </el-form>
</div> </div>

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

@ -7,12 +7,7 @@
<el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入"> <el-input v-model.trim="tagName" size="small" class="item_width_1" clearable placeholder="请输入">
</el-input> </el-input>
</el-form-item> </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;"> <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>

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

@ -8,9 +8,6 @@
<span>{{ tagName }}</span> <span>{{ tagName }}</span>
</div> </div>
</el-form-item> </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> </el-form>
</div> </div>

Loading…
Cancel
Save