Merge branch 'bug_mk' into dev

# Conflicts: # src/views/modules/shequzhili/eventOld/eventList.vue
1 year ago · 4aa7a984fb
10 changed files with 21 additions and 40 deletions
--- a/src/views/dataBoardMain/main-navbar.vue
+++ b/src/views/dataBoardMain/main-navbar.vue
@ -220,12 +220,12 @@ export default {
        params = { orgId: this.value, level: this.getChooseLabel(this.value) };
      }
      this.$http.post(`/gov/org/agency/maporg`, params).then(async ({ data: { data } }) => {
-        console.log(data);
        this.value = data.id;
        this.$store.dispatch("chooseArea/chooseName", {
          orgId: data.id,
          level: data.level,
        });
+        console.log(children,data,"children");
        let children = await this.dealTreeData(data.children);
        if (data.parentId) {
          this.options = [
@ -260,9 +260,11 @@ export default {
        label: item.name,
        children: item.children && item.children.length ? this.dealTreeData(item.children, level++) : null,
      }));
+      console.log(data,"sdffs");
      return data;
    },
    setSelectName(index) {
+      console.log(index,"index");
      const name = this.options.filter((item) => item.value === index)[0].label;
      const width = name.length > 5 ? name.length * 14 + 25 : 120;
      this.selectWidth = width;
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/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>
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@ -398,7 +398,7 @@
          pageSize: 10,
          pageNo: 1,
          typeName: "",
-          enabled: 0
+          enabled: 1
        }
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
@ -434,6 +434,9 @@
        this.detailShow = true
        this.formTitle = '详情'
        console.log('rowmememmeme',row)
+        if(this.typeList){
+          row.typeName = this.typeList.filter(item=>item.id === row.typeId)[0].typeName || '--'
+        }
        this.$nextTick(() => {
          this.$refs.ref_detail.initForm(row)
          // this.$refs.ref_form.initForm('detail', row.id)
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@ -343,7 +343,7 @@ export default {
                pageSize: 20,
                pageNo: 1,
                typeName: "",
-                enabled: 0
+                enabled: 1
            }
            const { data, code, msg } = await requestPost(url, params)
            if (code === 0) {
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@ -37,7 +37,7 @@
                </el-form-item>

                <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 label="消息推送" label-width="140px" prop="sendMsg">
@ -92,7 +92,7 @@ export default {
        adverTagList:[],
        //////
          top:false,
-          fileList: [],//封面图片
+          fileList: {},//封面图片
          activityImgs:[],//活动照片
          formType: 'add', //表单操作类型 add新增，edit编辑,records记录
        //   records:false,
@ -115,8 +115,8 @@ export default {
            coverPic: "",//封面图
            releaseTime: "",//发布时间
            sendMsg: false,//是否推送
-            top: 0,//是否置顶
-            status: 1 //状态
+            top: false,//是否置顶
+            status: 0 //状态
        },
          serviceList: [],
        //   gridList: [],
@ -167,18 +167,14 @@ export default {
            this.startLoading();
            if(row!=null){
                 this.formData = JSON.parse(JSON.stringify(row));
-                 this.fileList.push({fileUrl:this.formData.coverPic})
-                 console.log(this.formData.coverPic,'see');
+                 console.log(this.formData.coverPic);
             
            }
            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 () {
          const url = "/actual/base/advertisingTag/page"
@ -279,7 +275,6 @@ 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) {
@ -300,7 +295,6 @@ 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({
--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@ -288,7 +288,7 @@
            // console.log(row)
          const url = "/actual/base/communityPublicity/updateStatus"
    			let params={
-            status:0,
+            status:1,
            id:row.id
          }
          const { data, code, msg } = await requestPost(url, params)
--- a/src/views/modules/shequzhili/eventOld/eventList.vue
+++ b/src/views/modules/shequzhili/eventOld/eventList.vue
@ -640,7 +640,7 @@ export default {
            this.getTableData();
        },
        async handleVote(row){
-          const url = "/governance/icEventOld/updateSpecialColumn";
+          const url = "/governance/icEventOld/reply";
            let params = {

                icEventId:row.icEventId,
@ -649,14 +649,7 @@ export default {
            }
    
            const { data, code, msg } = await requestPost(url, params);
-            
-            if (code === 0) {
-                this.$message.success("操作成功！");
-                this.getTableData();
-            } else {
-                this.$message.error("操作失败！");
-            }
-     
+            console.log(data);
        },
        async handleDel(rowData) {
            let message = "确认删除?";
--- a/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
+++ b/src/views/modules/workSys/promotionTab/AddpromotionTab.vue
@ -11,9 +11,6 @@
                </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>
  
--- a/src/views/modules/workSys/promotionTab/index.vue
+++ b/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>
          </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>
--- a/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
+++ b/src/views/modules/workSys/promotionTab/viewPromotionalTags.vue
@ -8,9 +8,6 @@
                        <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>