From f2a4004b0ba93efd5877a0b9f61c71fb820f7dbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com>
Date: Tue, 28 May 2024 18:00:34 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A80.5,?=
 =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=861?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/activity/index.vue |  84 ++--
 .../activity/initiateActivity.vue             |  17 +-
 .../communityParty/activity/summDetails.vue   | 360 ++++++++++++++++++
 .../modules/workSys/typeActivity/index.vue    |  39 +-
 .../workSys/typeActivity/typeActivityadd.vue  |  84 ++--
 .../workSys/typeActivity/typeDetails.vue      |  37 +-
 6 files changed, 516 insertions(+), 105 deletions(-)
 create mode 100644 src/views/modules/communityParty/activity/summDetails.vue

diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue
index fd2cc4ef9..b48fde690 100644
--- a/src/views/modules/communityParty/activity/index.vue
+++ b/src/views/modules/communityParty/activity/index.vue
@@ -4,9 +4,9 @@
       <el-form :inline="true" :model="formData" ref="ref_searchform" :label-width="'100px'">
         <div>
 
-          <el-form-item label="活动类型" prop="typtId">
-            <el-select class="item_width_1" v-model.trim="formData.typtId" size="small" placeholder="全部" clearable>
-              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.typeName">
+          <el-form-item label="活动类型" prop="typeId">
+            <el-select class="item_width_1" v-model.trim="formData.typeId" size="small" placeholder="全部" clearable>
+              <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -63,7 +63,7 @@
           <el-button style="" class="diy-button--add" size="small" @click="handleAdd">+ 活动记录</el-button>
         </div>
 
-        <el-button style="" class="diy-button--add" size="small">导出</el-button>
+        <!-- <el-button style="" class="diy-button--add" size="small">导出</el-button> -->
       </div>
 
       <el-table class="table" :data="tableData" border :height="tableHeight" v-loading="tableLoading"
@@ -94,7 +94,7 @@
           </template>
         </el-table-column>
 
-        <el-table-column label="操作" fixed="right" width="140" header-align="center" align="center" class="operate">
+        <el-table-column label="操作" fixed="right" width="180" header-align="center" align="center" class="operate">
           <template slot-scope="scope">
 
             <el-button type="text" style="color:#1C6AFD;text-decoration: underline;" size="small"
@@ -104,13 +104,13 @@
               @click="handleEdit(scope.row)">编辑</el-button>
 
               <el-button type="text" v-if="scope.row.status == 2" style="color:#1C6AFD;text-decoration: underline;" size="small"
-              @click="handleEdit(scope.row)">活动总结</el-button>
+              @click="handleSumm(scope.row)">活动总结</el-button>
 
             <!-- <el-button  type="text"
               style="color:#00A7A9;text-decoration: underline;" size="small"
               @click="handleEdit(scope.row)">修改</el-button> -->
               
-            <el-button v-if="agencyId===scope.row.agencyId" type="text"
+            <el-button v-if="scope.row.status !== 2" type="text"
               style="color:#D51010;text-decoration: underline;" size="small"
               @click="handleDelete(scope.row)">删除</el-button>
           </template>
@@ -142,12 +142,18 @@
       <event-details ref="ref_detail" :gridList="gridList" @diaDetailClose="detailClosed"></event-details>
     </el-dialog>
 
+    <el-dialog :visible.sync="summShow" :close-on-click-modal="false" :close-on-press-escape="false" :title="'活动详情'"
+      width="950px" top="5vh" class="dialog-h" @closed="summDetailClose">
+      <summ-details ref="ref_detail" :gridList="gridList" @summDetailClose="summDetailClose"></summ-details>
+    </el-dialog>
+
   </div>
 </template>
   <script>
   
   import eventDetails from './eventDetails'
   import initiateActivity from './initiateActivity'
+  import summDetails from './summDetails'
   import util from '@js/util.js';
   import { requestPost,requestGet } from "@/js/dai/request";
   import { mapGetters } from 'vuex'
@@ -183,15 +189,14 @@
         formData: {
           activityName: "",
           status: "",
-          typtId: "",
+          typeId: "",
           startTime: "",
           endTime: "",
           address: "",
           assistingParty: ""
         },
-  
-  
         tableData: [],
+        summShow:false,
   
         //form相关
         formShow: false,
@@ -207,7 +212,7 @@
       }
     },
     components: {
-       eventDetails, initiateActivity
+       eventDetails, initiateActivity,summDetails
     },
     async created () {
   
@@ -283,14 +288,6 @@
           this.$message.error(msg)
         }
       },
-
-      // handleCateCHange(val) {
-      //   if (val.length === 2) {
-      //     this.formData.serviceMatter = val[1];
-      //   } else {
-      //     this.formData.serviceMatter = val[0];
-      //   }
-      // },
       async getDemandOptions() {
         this.$http
           .post("/actual/base/serviceitem/listAllCategory")
@@ -357,6 +354,7 @@
         } else {
           this.$message.error(msg)
         }
+        console.log("饿么么么么么",this.typeList)
       },
   
       diaClose () {
@@ -375,6 +373,11 @@
         this.$refs.ref_detail.diaDestroy()
         this.detailShow = false
       },
+      summDetailClose () {
+        // console.log('this.$refs.ref_detail关闭不了为什么')
+        // this.$refs.ref_detail.diaDestroy()
+        this.summShow = false
+      },
   
   
       handleDetail (row) {
@@ -386,6 +389,15 @@
           // this.$refs.ref_form.initForm('detail', row.id)
         })
       },
+      handleSumm(row){
+        this.summShow = true
+        this.formTitle = '总结'
+        // console.log('row',row)
+        this.$nextTick(() => {
+          this.$refs.ref_detail.initForm(row.id)
+          // this.$refs.ref_form.initForm('detail', row.id)    activityImgs   sumUp
+        })
+      },
   
       // handleAdd () {
       //   this.formTitle = '新增'
@@ -413,7 +425,6 @@
       },
       handleEdit (row) {
         this.formTitle = '修改'
-        // this.formShow = true
         this.initShow = true
         this.$nextTick(() => {
           // this.$refs.ref_form.initForm('edit', row.id)
@@ -459,26 +470,27 @@
       },
   
       async deleteActivity (row) {
-        const url = "/actual/base/icpartyactivity/delete"
+
+        // const url = "/actual/base/icpartyactivity/delete"//等待删除接口
         // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
   
-        let params = {
-          id: row.id
-        }
+        // let params = {
+        //   id: row.id
+        // }
   
-        const { data, code, msg } = await requestPost(url, params)
+        // const { data, code, msg } = await requestPost(url, params)
   
-        if (code === 0) {
-          this.$message({
-            type: "success",
-            message: "删除成功"
-          });
+        // if (code === 0) {
+        //   this.$message({
+        //     type: "success",
+        //     message: "删除成功"
+        //   });
   
-          // this.loadTable()
-          this.communityActivityList()
-        } else {
-          this.$message.error(msg)
-        }
+        //   // this.loadTable()
+        //   this.communityActivityList()
+        // } else {
+        //   this.$message.error(msg)
+        // }
       },
   
       //重置搜索条件
@@ -487,7 +499,7 @@
         this.formData = {
           activityName: "",
           status: "",
-          typtId: "",
+          typeId: "",
           startTime: "",
           endTime: "",
           address: "",
diff --git a/src/views/modules/communityParty/activity/initiateActivity.vue b/src/views/modules/communityParty/activity/initiateActivity.vue
index d53511b1e..09af43164 100644
--- a/src/views/modules/communityParty/activity/initiateActivity.vue
+++ b/src/views/modules/communityParty/activity/initiateActivity.vue
@@ -7,7 +7,7 @@
                 <el-form-item label="活动类型" label-width="150px" prop="typeId">
                     <el-select class="item_width_1" v-model.trim="formData.typeId" placeholder="请选择" clearable>
                         <el-option v-for="item in typeList" :key="item.typeName" :label="item.typeName"
-                            :value="item.typeName">
+                            :value="item.id">
                         </el-option>
                     </el-select>
                 </el-form-item>
@@ -132,11 +132,6 @@
                         </el-checkbox-group>
                     </el-form-item>
                 </div>
-
-
-
-
-
             </el-form>
         </div>
 
@@ -189,7 +184,6 @@ export default {
                 activityImgs: [],//图片列表
                 longitude: this.$store.state.user.longitude, //经度
                 latitude: this.$store.state.user.latitude,//纬度
-                imgList:[]
             }
 
             return _form
@@ -228,6 +222,7 @@ export default {
     mounted() {
         this.activityType()
         this.listServerOrg()
+        // this.initForm()
 
     },
 
@@ -455,15 +450,19 @@ export default {
                 this.$nextTick(() => {
                     if (!map) {
                         this.initMap(this.formData.latitude, this.formData.longitude);
+                        console.log("map", map)
                     } else {
                         map.setCenter(this.formData.latitude, this.formData.longitude);
                         map.setMarker(this.formData.latitude, this.formData.longitude);
+                        console.log("mapmapmap", map)
                     }
                 })
             }else if (type === 'records') {
                 this.records = true
             }
-            
+            // this.initMap(this.dataForm.latitude, this.dataForm.longitude);
+            this.initMap(this.formData.latitude, this.formData.longitude);
+            console.log("mapmapmap", map)
             this.endLoading()
 
         },
@@ -558,7 +557,7 @@ export default {
             setTimeout(() => {
                 this.btnDisable = false
             }, 10000)
-            console.log("data/actual/base/communityActivity/save",this.formData)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
             this.$refs['ref_form'].validate((valid, messageObj) => {
                 const dateObj = this.formData.startTime.split(' ');
                 const formattedDate = dateObj[0]; // 获取日期部分，即 '2424-10-22'
diff --git a/src/views/modules/communityParty/activity/summDetails.vue b/src/views/modules/communityParty/activity/summDetails.vue
new file mode 100644
index 000000000..e90f0ea3d
--- /dev/null
+++ b/src/views/modules/communityParty/activity/summDetails.vue
@@ -0,0 +1,360 @@
+<template>
+    <div>
+
+        <div class="dialog-h-content scroll-h">
+            <el-form ref="ref_form" :inline="true" :model="formData" :rules="dataRule"
+                class="form">
+                        <el-form-item label="活动总结" prop="sumUp" label-width="150px" style="display: block">
+                            <div class="item_width_1">
+                                <el-input type="textarea" autosize placeholder="请输入内容" v-model.trim="formData.sumUp">
+                                </el-input>
+                            </div>
+                        </el-form-item>
+                        <el-form-item label="活动照片" label-width="140px" prop="activityImgs">
+                            <div>
+                                <el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" :action="uploadUrl"
+                                    :data="{ customerId: customerId }" :show-file-list="true"
+                                    :file-list="formData.activityImgs" :on-preview="handleImgPreview"
+                                    :on-success="handleImgSuccess" :on-remove="handleImgRemove"
+                                    :on-exceed="handleImgExceed" :before-upload="beforeImgUpload"
+                                    list-type="picture-card" :limit="3">
+                                    <i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片 </el-upload>
+                            </div>
+                            <div>
+                                <div v-if="formData.activityImgs && formData.activityImgs.length > 0">
+                                    <img v-for="(img, index) in formData.activityImgs" :key="index" :src="img"
+                                        alt="照片" style="width: 150px; margin-right: 10px;">
+                                </div>
+                                <div v-else>
+                                    暂无照片
+                                </div>
+                            </div>
+                        </el-form-item>
+            </el-form>
+        </div>
+
+        <div class="div_btn">
+            <el-button size="small" @click="handleCancle">取 消</el-button>
+            <el-button size="small" type="primary" :disabled="btnDisable"
+                @click="handleComfirm">确
+                定</el-button>
+        </div>
+    </div>
+</template>
+
+<script>
+import { mapGetters } from 'vuex'
+import { Loading } from 'element-ui' // 引入Loading服务
+import { requestPost } from '@/js/dai/request'
+import Tinymce from '@c/tinymce2/index.vue'
+import daiMap from "@/utils/dai-map";
+import util from '@js/util.js';
+// import UploadImage from './upload-image.vue'
+import UploadImage from '@/views/modules/plugins/rent/upload-image.vue'
+
+var map
+var search
+var markers
+var infoWindowList
+var geocoder // 新建一个正逆地址解析类
+
+let loading // 加载动画
+export default {
+    data() {
+        let initFormData = () => {
+            let _form = {
+                id: "",
+                // typeId: "",
+                // activityName: "",//活动名称
+                // status: 0,//状态
+                // assistingParty: "",//协办方
+                // startTime: "",//开始时间
+                // endTime: "",//结束时间
+                // coverPic: "",//封面图片地址
+                // content: "",//活动内容
+                // address: "",//地址
+                // online: 0,//开关
+                // cutOffTime: "",//截止时间
+                // points: 0,//积分
+                // participants: 1,//活动人数
+                // sendMessage: 0,//推送数
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+                // longitude: this.$store.state.user.longitude, //经度
+                // latitude: this.$store.state.user.latitude,//纬度
+            }
+
+            return _form
+        }
+        return {
+            activityImgs:[],//活动照片
+            records:false,
+            searchOptions: [],
+            searchValue: '',
+            resultList: [],
+            num: 0,
+            loading: false,
+            timeRange: [],
+            online: false,
+
+            btnDisable: false,
+
+            keyWords: '',
+            activityId: '',
+            formData: initFormData(),
+            serviceList: [],
+            // gridList: [],
+            agencyId: '',
+
+            demandOptions: [],
+            // typeList: [],
+            // corganizerList: [],
+            uploadUrl: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadqrcodeV2',
+            customerId: localStorage.getItem('customerId'),
+
+        }
+    },
+    components: { Tinymce, UploadImage },
+    mounted() {
+    },
+
+    methods: {
+        // 上传成功
+        handleImgSuccess(res, file, fileList) {
+            if (res.code === 0 && res.msg === 'success') {
+                let format = file.name.split('.').pop();
+                let srcType = file.raw.type;
+                let type = 'file';
+                if (srcType.indexOf('image') != -1) {
+                    type = 'image';
+                } else if (srcType.indexOf('video') != -1) {
+                    type = 'video';
+                }
+                this.formData.activityImgs.push(res.data.url);
+            } else {
+                this.$message.error(res.msg);
+            }
+        },
+        // 删除图片
+        handleImgRemove(file) {
+            console.log('handleImgRemove', file);
+            if (file.response) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.response.data.url);
+                this.formData.activityImgs.splice(index, 1);
+            } else if (file.url) {
+                let index = this.formData.activityImgs.findIndex(item => item.url == file.url);
+                this.formData.activityImgs.splice(index, 1);
+            }
+        },
+        // 图片预览
+        handleImgPreview(file) {
+            console.log(file);
+            window.open(file.url || file.response.data.url);
+        },
+        // 文件数量超过限制
+        handleImgExceed() {
+            this.$message({
+                type: 'warning',
+                message: '文件数量最多不超过三个'
+            });
+        },
+        // 上传前的验证
+        beforeImgUpload(file) {
+            const isLt1M = file.size / 1024 / 1024 < 10;
+            const srcType = file.type;
+            const format = file.name.split('.').pop();
+            if (!isLt1M) {
+                this.$message.error('上传文件大小不能超过 10MB!');
+                return false;
+            }
+            if (srcType.indexOf('image') == -1) {
+                this.$message.error('仅限图片格式');
+                return false;
+            }
+            return true;
+        },
+       
+        onChangeImgs(e, rowIndex = 0) {
+            console.log('onChangeFileList', e)
+            if (e.length > 0) {
+                this.activityImgs = []
+                e.forEach(item => {
+                    let ob = {
+                        fileType: '0',
+                        fileUrl: item.response.data.url
+                    }
+                    this.activityImgs.push(ob)
+                })
+            }
+        },
+
+        handleChange(value) {
+            console.log(value);
+        },
+    
+        async initForm(type, activityId) {
+            this.startLoading()
+            // console.log("啊实打实的", type, activityId)
+            this.formData.id = type           
+            this.endLoading()
+
+        },
+
+        async loadGrid() {
+            const url = "/gov/org/customergrid/gridoption"
+
+            let params = {
+                agencyId: this.agencyId
+            }
+
+            const { data, code, msg } = await requestPost(url, params)
+
+            if (code === 0) {
+                this.gridList = data
+
+            } else {
+                this.$message.error(msg)
+            }
+
+        },
+
+        async handleComfirm() {
+            this.btnDisable = true
+            setTimeout(() => {
+                this.btnDisable = false
+            }, 10000)
+            // console.log("data/actual/base/communityActivity/save",this.formData)
+            this.$refs['ref_form'].validate((valid, messageObj) => {
+                if (!valid) {
+                    app.util.validateRule(messageObj)
+                    this.btnDisable = false
+                } else{
+                    this.addActivity()
+                }
+            })
+        },
+        async addActivity() {
+                let url = '/actual/base/communityActivity/save'
+                const { data, code, msg } = await requestPost(url, this.formData)
+                if (code === 0) {
+                    this.$message({
+                        type: 'success',
+                        message: '操作成功'
+                    })
+                    this.resetData()
+                    this.$emit('dialogOk')
+                    this.btnDisable = false
+                } else {
+                    this.btnDisable = false
+                    this.$message.error(msg)
+                }
+            
+
+        },
+
+        handleCancle() {
+            console.log("点击取消了点击取消了点击取消了")
+            this.resetData()
+            this.$emit('summDetailClose')
+            this.$emit("diaDetailClose");
+
+        },
+
+        resetData() {
+            this.formData = {
+                sumUp: "",//活动总结
+                activityImgs: [],//图片列表
+            }
+
+        },
+        // 开启加载动画
+        startLoading() {
+            loading = Loading.service({
+                lock: true, // 是否锁定
+                text: '正在加载……', // 加载中需要显示的文字
+                background: 'rgba(0,0,0,.7)' // 背景颜色
+            })
+        },
+        // 结束加载动画
+        endLoading() {
+            // clearTimeout(timer);
+            if (loading) {
+                loading.close()
+            }
+        }
+    },
+    computed: {
+        dataRule() {
+            return {
+                sumUp: [
+                    { required: true, message: '请输入活动总结', trigger: 'blur' }
+                ],
+                activityImgs: [
+                    { required: true, message: '请选择活动照片', trigger: 'blur' }
+                ]
+            }
+        },
+
+    },
+    props: {
+
+        // unitList: {
+        //     type: Array,
+        //     default: []
+        // },
+        gridList: {
+            type: Array,
+            default: []
+        },
+
+
+    }
+}
+</script>
+
+
+<style lang="scss" scoped>
+@import "@/assets/scss/modules/visual/communityManageForm.scss";
+</style>
+<style lang="scss" scoped>
+.item_width_1 {
+    width: 560px;
+
+    /deep/.tox .tox-dialog {
+        z-index: 20000;
+    }
+}
+
+.tinymce_view {
+    ::v-deep .tox .tox-dialog {
+        z-index: 2000000000;
+    }
+}
+
+.div_map {
+    position: relative;
+}
+
+.div_searchmap {
+    z-index: 5000;
+    position: absolute;
+    top: 5px;
+    left: 5px;
+}
+
+.tinymce_view {
+    height: 400px;
+    overflow: auto;
+}
+
+.text_p {
+    margin: 0;
+    padding: 0 10px;
+    border: 1px solid #d9d9d9;
+    border-radius: 5px;
+
+    >p {
+        margin: 0;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue
index d645966c2..78dbc0e24 100644
--- a/src/views/modules/workSys/typeActivity/index.vue
+++ b/src/views/modules/workSys/typeActivity/index.vue
@@ -14,8 +14,7 @@
                     <el-form-item label="首页显示">
                         <el-select class="item_width_1" v-model.trim="enabled" size="small" placeholder="请选择"
                             clearable>
-                            <el-option v-for="item in unitList" :key="item.value" :label="item.name"
-                                :value="item.value">
+                            <el-option v-for="item in enabledList" :key="item.value" :label="item.label" :value="item.value">
                             </el-option>
                         </el-select>
                     </el-form-item>
@@ -45,7 +44,7 @@
                 <el-table-column prop="typeName" header-align="center" align="center" label="类型名称" width="380">
                 </el-table-column>
                 
-                <el-table-column prop="peopleCount" header-align="center" align="center" label="创建时间" width="380">
+                <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"
@@ -57,10 +56,12 @@
                         <el-button type="text"
                             style="color:#00A7A9;text-decoration: underline;" size="small"
                             @click="handleEdit(scope.row)">修改</el-button>
+                            
 
-                        <!-- <el-button type="text"
+                        <el-button type="text"
                             style="color:#D51010;text-decoration: underline;" size="small"
-                            @click="handleDelete(scope.row)">删除</el-button> -->
+                            @click="handleDelete(scope.row)">删除</el-button>
+
                     </template>
                 </el-table-column>
             </el-table>
@@ -75,7 +76,7 @@
         <!-- 修改弹出框 -->
         <el-dialog :visible.sync="formShow" :close-on-click-modal="false" :close-on-press-escape="false"
             :title="formTitle" width="950px" top="5vh" class="dialog-h" @closed="diaClose">
-            <type-activityadd ref="ref_form" :unitList="corganizerList" :gridList="gridList"
+            <type-activityadd ref="ref_form" :gridList="gridList"
                 @dialogCancle="addFormCancle" @dialogOk="addFormOk"></type-activityadd>
         </el-dialog>
 
@@ -107,8 +108,13 @@
           tableLoading: false,
           agencyId: '',
           gridList: [],//所属网格
-          typeName:'',
-          enabled:'',
+          typeName: '',
+          enabledList: [
+            { value: 0, label: '显示' },
+            { value: 1, label: '不显示' }
+          ],
+          tableData: [],
+          enabled: '',
           //form相关
           formShow: false,
           formTitle: '新增活动',
@@ -136,6 +142,9 @@
       },
     
       methods: {
+        handleSelectionChange(){
+          // console.log("啊倒萨打算")
+        },
         handleSearch () {
           this.loadTable()
         },
@@ -151,7 +160,7 @@
             pageSize: 20,
             pageNo: 1,
             typeName: this.typeName,
-            enabled: 0
+            enabled: this.enabled
           }
           const { data, code, msg } = await requestPost(url, params)
           if (code === 0) {
@@ -236,14 +245,9 @@
         },
     
         async deleteActivity (row) {
-          const url = "/actual/base/icpartyactivity/delete"
-          // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/delete"
-    
-          let params = {
-            id: row.id
-          }
-    
-          const { data, code, msg } = await requestPost(url, params)
+          const url = "/actual/base/activityType/delete"
+          let id = [row.id]
+          const { data, code, msg } = await requestPost(url, id)
     
           if (code === 0) {
             this.$message({
@@ -260,6 +264,7 @@
         //重置搜索条件
         resetSearch () {
           this.typeName = ''
+          this.enabled = null
           this.loadTable()
         },
 
diff --git a/src/views/modules/workSys/typeActivity/typeActivityadd.vue b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
index 0e2976a5e..2973511cc 100644
--- a/src/views/modules/workSys/typeActivity/typeActivityadd.vue
+++ b/src/views/modules/workSys/typeActivity/typeActivityadd.vue
@@ -1,28 +1,31 @@
 <template>
-    <div>
-  
-      <div class="dialog-h-content scroll-h">
-        <el-form ref="ref_form" :inline="true"  :rules="dataRule"
-          class="form">
+  <div>
 
-          <el-form-item label="活动类型" label-width="150px" style="display: block">
-            <div style="width: 500px">
-              <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
-                </el-input>
-            </div>
-          </el-form-item>
-        </el-form>
-      </div>
-  
-      <div class="div_btn">
-        <el-button size="small" @click="handleCancle">取 消</el-button>
-        <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+
+        <el-form-item label="活动类型" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <el-input v-model.trim="typeName" size="small" class="item_width_1" clearable placeholder="请输入">
+            </el-input>
+          </div>
+        </el-form-item>
+
+        <el-form-item label="首页显示" style="display: block" prop="peopleCount" label-width="150px">
+          <el-switch v-model="enabledChange" @change="handleDisplay"></el-switch>
+        </el-form-item>
+      </el-form>
+    </div>
+
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+      <!-- <el-button size="small" type="primary" :disabled="btnDisable" @click="handleComfirm">确
           定</el-button> -->
-          <el-button size="small" type="primary" @click="handleComfirm">确
-          定</el-button>
-      </div>
+      <el-button size="small" type="primary" @click="handleComfirm">确
+        定</el-button>
     </div>
-  </template>
+  </div>
+</template>
     
     <script>
     import { mapGetters } from 'vuex'
@@ -44,7 +47,9 @@
       data () {
         return {
           typeName: '',
-          marde:''
+          marde:'',
+          enabledChange: false,
+          enabled: 1
     
         }
       },
@@ -55,12 +60,30 @@
       },
     
       methods: { 
+        handleDisplay(value){
+            
+            if (value) {
+                this.enabledChange = true;
+                this.enabled = 0;
+            } else {
+                this.enabledChange = false;
+                this.enabled = 1;
+            }
+            // console.log('valuevaluevalue',this.enabled)
+        },
+
         async initForm(activityId){
           console.log('activityIddetailShow',activityId)
           if(activityId !== ''){
             this.marde = 'edi'
             this.id = activityId.id
             this.typeName = activityId.typeName
+            this.enabled = activityId.enabled
+            if (this.enabled === 0) {
+              this.enabledChange = true;
+            } else {
+              this.enabledChange = false;
+            }
           }
 
             
@@ -82,10 +105,11 @@
             let url = '/actual/base/activityType/update'
             let parmer = {
               typeName: this.typeName,
-              enabled: 0,
+              enabled: this.enabled,
+              id: this.id 
               // id: this.id
             }
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg} = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -97,17 +121,17 @@
               // this.btnDisable = false
             } else {
               // this.btnDisable = false
-              this.$message.error(msg)
+              this.$message.error(internalMsg)
             }
           }else{
             let url = '/actual/base/activityType/save'
             // let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/save"
             let parmer = {
               typeName: this.typeName,
-              enabled: 0
+              enabled: this.enabled
             }
 
-            const { data, code, msg } = await requestPost(url, parmer)
+            const { data, code, msg, internalMsg} = await requestPost(url, parmer)
 
             if (code === 0) {
               this.$message({
@@ -119,7 +143,7 @@
               // this.btnDisable = false
             } else {
               // this.btnDisable = false
-              this.$message.error(msg)
+              this.$message.error(internalMsg)
             }
           }
           
@@ -135,7 +159,9 @@
     
         resetData () {
           this.typeName = '',
-          this.marde = ''
+          this.marde = '',
+          this.enabled  = 1,
+          this.enabledChange = false
     
         },
         // 开启加载动画
diff --git a/src/views/modules/workSys/typeActivity/typeDetails.vue b/src/views/modules/workSys/typeActivity/typeDetails.vue
index 71eb552fb..57ae86359 100644
--- a/src/views/modules/workSys/typeActivity/typeDetails.vue
+++ b/src/views/modules/workSys/typeActivity/typeDetails.vue
@@ -1,21 +1,27 @@
 <template>
-    <div>
+  <div>
 
-        <div class="dialog-h-content scroll-h">
-            <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
+    <div class="dialog-h-content scroll-h">
+      <el-form ref="ref_form" :inline="true" :rules="dataRule" class="form">
 
-                <el-form-item label="活动类型" label-width="150px" style="display: block">
-                    <div style="width: 500px">
-                        <span>{{ typeName }}</span>
-                    </div>
-                </el-form-item>
-            </el-form>
-        </div>
+        <el-form-item label="活动类型" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <span>{{ typeName }}</span>
+          </div>
+        </el-form-item>
 
-        <div class="div_btn">
-            <el-button size="small" @click="handleCancle">取 消</el-button>
-        </div>
+        <el-form-item label="首页显示" label-width="150px" style="display: block">
+          <div style="width: 500px">
+            <el-switch :value="enabled  === 0 ? true : false" :disabled="true"></el-switch>
+          </div>
+        </el-form-item>
+      </el-form>
     </div>
+
+    <div class="div_btn">
+      <el-button size="small" @click="handleCancle">取 消</el-button>
+    </div>
+  </div>
 </template>
     
     <script>
@@ -37,7 +43,8 @@
     export default {
       data () {
         return {
-          typeName: ''
+          typeName: '',
+          enabled:null
     
         }
       },
@@ -73,7 +80,9 @@
 
           },
           async initForm(activityId) {
+            // console.log('activityId',activityId.enabled)
               this.typeName = activityId.typeName
+              this.enabled = activityId.enabled
           },
           handleComfirm() {
             //   this.resetData()