Merge branch 'V4.3.3_XiaoWang' into dev

2 years ago · 2dd587151e
5 changed files with 69 additions and 25 deletions
--- a/src/views/modules/communityParty/activity/eventDetails.vue
+++ b/src/views/modules/communityParty/activity/eventDetails.vue
@ -87,24 +87,24 @@
                        <div style="font-size: 15px; color: black; margin-left: -30px;margin-bottom: 10px;">
                            报名名单
                        </div>
-                        <el-table class="table" border style="width: 100%">
+                        <el-table class="table" border style="width: 100%" :data="NameList">
                            <el-table-column label="序号" header-align="center" align="center" type="index"
                                width="50"></el-table-column>

-                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                            <el-table-column prop="name" header-align="center" align="center" label="姓名"
                                min-width="80">
                            </el-table-column>
-                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
+                            <el-table-column prop="mobile" header-align="center" align="center" label="联系电话"
                                min-width="100">
                            </el-table-column>
-                            <el-table-column prop="type" header-align="center" align="center" label="报名时间"
+                            <el-table-column prop="createdTime" header-align="center" align="center" label="报名时间"
                                min-width="80">
                            </el-table-column>
-                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                            <el-table-column prop="remark" header-align="center" align="center"
                                label="备注说明" show-overflow-tooltip min-width="120">

                            </el-table-column>
-                            <el-table-column prop="contact" header-align="center" align="center" label="签到" width="80">
+                            <el-table-column prop="signFlag" header-align="center" align="center" label="签到" width="80">
                            </el-table-column>
                            <el-table-column prop="contactMobile" header-align="center" align="center" label="签到地点"
                                width="120">
@ -117,23 +117,23 @@
                        <div style="font-size: 15px; color: black; margin-left: -30px; margin-bottom: 10px;">
                            活动实况
                        </div>
-                        <el-table class="table" border style="width: 100%">
+                        <el-table class="table" border style="width: 100%" :data="actList">
                            <el-table-column label="序号" header-align="center" align="center" type="index"
                                width="50"></el-table-column>

-                            <el-table-column prop="unitName" header-align="center" align="center" label="姓名"
+                            <el-table-column prop="nickname" header-align="center" align="center" label="姓名"
                                min-width="100">
                            </el-table-column>
                            <el-table-column prop="agencyName" header-align="center" align="center" label="联系电话"
                                min-width="80">
                            </el-table-column>
-                            <el-table-column prop="type" header-align="center" align="center" label="实况内容"
+                            <el-table-column prop="desc" header-align="center" align="center" label="实况内容"
                                min-width="280">
                            </el-table-column>
-                            <el-table-column prop="serviceMatterListShow" header-align="center" align="center"
+                            <el-table-column prop="images" header-align="center" align="center"
                                label="活动照片" show-overflow-tooltip min-width="120">
                                <template slot-scope="scope">
-                                    <div v-for="(item, index) in scope.row.serviceMatterListShow" :key="index"
+                                    <div v-for="(item, index) in scope.row.images" :key="index"
                                        style="display: flex;">
                                        <img :src="item.url"
                                            style="max-width: 20px; max-height: 20px; margin-right: 10px;" />
@ -156,6 +156,7 @@
 import { Loading } from "element-ui"; // 引入Loading服务
 import nextTick from "dai-js/tools/nextTick";
 import daiMap from "@/utils/dai-map";
+import { requestPost,requestGet } from "@/js/dai/request";

 var map;
 var search;
@ -169,27 +170,49 @@ export default {
        return {
            formData: {},
            initLoading: false,
+            NameList:[],
+            actList:[],
+            activityId:""
        };
    },
    components: {},
-    created() { },
+    created() { 
+
+    },

    mounted () {
+   
    },

    methods: {
-        async activityType () {
-        const url = "/actual/base/activityType/page"
+        async communityActivityApplicationRecord () {
+        const url = "/actual/base/communityActivityApplicationRecord/page"
        let params = {
-          // agencyId: this.agencyId
          pageSize: 20,
          pageNo: 1,
-          typeName: "",
-          enabled: 0
+          activityId:this.activityId
+        }
+        console.log("df ");
+        const { data, code, msg } = await requestGet(url, params)
+        if (code === 0) {
+     
+          this.NameList=data.list
+          console.log( this.NameList);
+        } else {
+          this.$message.error(msg)
+        }
+      },
+      async livereclist () {
+        const url = "/heart/resi/act/livereclist"
+        let params = {
+          pageSize: 20,
+          pageNo: 1,
+          actId:this.formData.id
        }
        const { data, code, msg } = await requestPost(url, params)
        if (code === 0) {
-          this.typeList = data.list
+          this.actList=data.actLives
+          console.log(data);
        } else {
          this.$message.error(msg)
        }
@ -206,9 +229,12 @@ export default {
        },

        async initForm(row) {
-            console.log("df ");
+
            this.startLoading();
            this.formData = JSON.parse(JSON.stringify(row));
+            console.log(this.formData,"this.formData");
+            this.activityId=this.formData.id
+            console.log(    this.activityId,"this.activ");
            this.initLoading = true;
            // console.log('this.formData,',this.formData);

@ -223,6 +249,8 @@ export default {
                longitude = 116.39743841556731;
            }
            this.endLoading();
+            this.communityActivityApplicationRecord()
+            this.livereclist()
        },

        // 开启加载动画
--- a/src/views/modules/communityParty/comPromotion/add.vue
+++ b/src/views/modules/communityParty/comPromotion/add.vue
@ -25,7 +25,7 @@

                <el-form-item label="封面图片" label-width="140px" prop="coverPic">
                    <template>
-                        <upload-image :defaultFileList="fileList" :limit="1" @change="onChangeFileList"></upload-image>
+                        <upload-image :defaultFileList="fileList" :limit="1" @file-removed="handleFileRemoved" @change="onChangeFileList"></upload-image>
                    </template>
                </el-form-item>

@ -90,6 +90,7 @@ export default {
            sendMsg: 0,//是否推送
            top: 0,//是否置顶
            status: 0 //状态
+      
          }

          return _form
@ -121,6 +122,7 @@ export default {
          serviceList: [],
        //   gridList: [],
          agencyId: '',
+          agencyName:"",

          demandOptions: [],
          uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
@ -130,11 +132,19 @@ export default {
  },
  components: { Tinymce, UploadImage },
  mounted() {
+    this.agencyName=this.$store.state.user.agencyName,
+    this.agencyId=this.$store.state.user.agencyId,
      this.advertisingTag()
      
  },

  methods: {
+    handleFileRemoved(file) {
+      // 处理从子组件接收到的删除文件的信息
+      console.log('File removed:', file);
+      this.formData.coverPic=""
+      // 例如，可以在这里更新父组件的文件列表或执行其他操作
+    },

    // 获取广告标签
    advertisingTag(){
@ -251,11 +261,14 @@ export default {
          }, 10000)

          this.$refs['ref_form'].validate((valid, messageObj) => {
+            this.formData.agencyName= this.agencyName
+            this.formData.agencyId= this.agencyId
            console.log("this.formData看看里面村的什么",this.formData)
            if (!valid) {
              app.util.validateRule(messageObj)
              this.btnDisable = false
            } else {
+
              this.addActivity()
            }
          })
@ -264,6 +277,7 @@ export default {
          if (this.formType === 'edit') {
              let url = '/actual/base/communityPublicity/update'
              this.formData.sendMsg= this.formData.sendMsg? 1:0
+        
              const { data, code, msg } = await requestPost(url, this.formData)
              if (code === 0) {
                  this.$message({
@ -282,7 +296,6 @@ export default {
              let url = '/actual/base/communityPublicity/save'
              console.log(this.formData,"formData");
              this.formData.sendMsg= this.formData.sendMsg? 1:0
-              console.log(this.formData);
              const { data, code, msg } = await requestPost(url, this.formData)
              if (code === 0) {
                  this.$message({
--- a/src/views/modules/communityParty/comPromotion/event.vue
+++ b/src/views/modules/communityParty/comPromotion/event.vue
@ -13,7 +13,7 @@
                        <div class="m-info-prop" style="flex: 0 0 50%;">
                            <span class="u-info-title-2">标签: </span>
                            <span style="margin-right: 10px;">&nbsp;</span>
-                            <span>{{ formData.tagId || "--" }}</span>
+                            <span>{{ formData.tagName || "--" }}</span>
                        </div>
                    </div>

@ -130,7 +130,7 @@ export default {
            this.startLoading();
            this.formData = JSON.parse(JSON.stringify(row));
            this.initLoading = true;
-
+            console.log(this.formData,"sdf ");
            this.endLoading();
        },

--- a/src/views/modules/communityParty/comPromotion/index.vue
+++ b/src/views/modules/communityParty/comPromotion/index.vue
@ -53,13 +53,13 @@
      <span>{{ scope.row.status === 1 ? '已下线' : '已发布' }}</span>
    </template>
  </el-table-column>
-  <el-table-column prop="createdTime" header-align="center" align="center" label="发布单位" width="200">
+  <el-table-column prop="agencyName" header-align="center" align="center" label="发布单位" width="200">
  </el-table-column>
  <el-table-column prop="releaseTime" header-align="center" align="center" label="发布时间" width="200">
  </el-table-column>
  <el-table-column prop="top" header-align="center" align="center" label="置顶" width="100">
    <template slot-scope="scope">
-      <span>{{ scope.row.top === 1 ? '是' : '否' }}</span>
+      <span>{{ scope.row.top === 0 ? '是' : '否' }}</span>
    </template>
  </el-table-column>
  <el-table-column prop="topp" header-align="center" align="center" label="点赞数" width="100">
--- a/src/views/modules/plugins/rent/upload-image.vue
+++ b/src/views/modules/plugins/rent/upload-image.vue
@ -80,7 +80,10 @@ export default {
                    this.fileList.splice(key, 1)
                }
            })
+            this.$emit('file-removed', file);
+            console.log(this.fileList);
        },
+        
        handlePictureCardPreview(file) {
            this.dialogImageUrl = file.url
            this.dialogVisible = true