限时特惠、生日营销添加

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/components/addOrEdit.vue

@@ -5,7 +5,20 @@
         <el-input v-model="ruleForm.activityName" placeholder="请输入活动名称"></el-input>
       </el-form-item>
       <el-form-item label="活动时间" prop="activityTime">
-        <el-input v-model="ruleForm.activityTime" placeholder="请输入活动时间"></el-input>
+        <el-date-picker
+        v-model="ruleForm.activityTime"
+        :picker-options="pickerOptions"
+        class="filter-item"
+        type="daterange"
+        format="yyyy年MM月dd日"
+        value-format="yyyy-MM-dd"
+        align="left"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      />
+        <!-- <el-input v-model="ruleForm.activityTime" placeholder="请输入活动时间"></el-input> -->
       </el-form-item>
       <el-form-item label="活动描述" prop="activityDescription">
         <el-input v-model="ruleForm.activityDescription" placeholder="请输入活动描述"></el-input>
@@ -26,9 +39,9 @@
 
 <script>
 import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getOrder, addOrder, editOrder } from '@/api/marketingManagement/fullGiveMarketing'
+import { getFullMarketingDetail, addFullMarketing, editFullMarketing } from '@/api/marketingManagement/fullGiveMarketing'
 import { validateTel } from '@/utils/validate'
-import { filterContent } from '@/utils'
+import { filterContent ,pickerOptions} from '@/utils'
 
 export default {
   name: 'AddOrEdit',
@@ -54,6 +67,7 @@ export default {
         children: 'entityJson'
       },
       sourceOptions: [], // 工单来源下拉数据
+      pickerOptions ,// 日期数据
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
@@ -91,35 +105,48 @@ export default {
         if (valid) {
           this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content)// 保存内容时去掉 html 标签
           this.loading = true
-          // 添加
-          if (!this.rowid) {
-            addOrder(this.ruleForm).then(response => {
+          return new Promise(resolve=>{
+            const params={
+              F_Type:4,
+              F_ID:this.rowid ? this.rowid : '',
+              F_Name:this.ruleForm.activityName,//活动名称
+              F_Describe:this.ruleForm.activityDescription,//活动描述
+              F_StartTime:this.ruleForm.activityTime && this.ruleForm.activityTime[0],//政策开始时间
+              F_EndTime:this.ruleForm.activityTime && this.ruleForm.activityTime[1],//政策结束时间
+              F_Commodity:this.ruleForm.boundGoods,//商品ID
+              F_Money:this.ruleForm.commodityActivityPrice,//活动价格
+            }
+            // 添加
+            if (!this.rowid) {
+              addFullMarketing(params).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$parent.$layer.close(this.layerid)
+                  if (this.callid) {
+                    this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
+                  } else {
+                    this.$parent.btn_search() // 重新加载父级数据
+                  }
+                  this.$message.success('恭喜你，添加成功!')
+                }
+              }).catch(() => {
+                this.loading = false
+              })
+              return
+            }
+            // 编辑
+            editFullMarketing(params).then(response => {
               this.loading = false
               if (response.state.toLowerCase() === 'success') {
                 this.$parent.$layer.close(this.layerid)
-                if (this.callid) {
-                  this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
-                } else {
-                  this.$parent.getList() // 重新加载父级数据
-                }
-                this.$message.success('恭喜你，添加成功!')
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success('恭喜你，编辑成功!')
               }
             }).catch(() => {
               this.loading = false
             })
-            return
-          }
-          // 编辑
-          editOrder(this.ruleForm).then(response => {
-            this.loading = false
-            if (response.state.toLowerCase() === 'success') {
-              this.$parent.$layer.close(this.layerid)
-              this.$parent.getList() // 重新加载父级数据
-              this.$message.success('恭喜你，编辑成功!')
-            }
-          }).catch(() => {
-            this.loading = false
           })
+          
         } else {
           this.$message.error('请输入有效的必填项信息!')
           return false
@@ -131,9 +158,14 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getOrder(rid).then(response => {
+      getFullMarketingDetail(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
+          const res = response.data
+          this.ruleForm.activityName = res.F_Name;
+          this.ruleForm.activityDescription = res.F_Describe;
+          this.ruleForm.boundGoods = res.F_Commodity;
+          this.ruleForm.commodityActivityPrice = res.F_Money;
+          this.ruleForm.activityTime = [res.F_StartTime,res.F_EndTime];
         }
       })
     },

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/components/detail.vue

@@ -4,24 +4,24 @@
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
           <el-col :md="21">
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ ordercode }}</h1>
-            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 {{ createtime }}</p>
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />限时特惠</h1>
+            <p class="title_sub"><span class="green">{{ activityName }}</span> 	足力健 </p>
           </el-col>
           <el-col :md="24" class="order_detail_content">
             <el-col :md="6" class="order_detail_item">
-              活动名称：{{ phone }}
+              活动名称：{{ activityName }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              活动时间：{{ sex }}
+              活动时间：{{ activityTime }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              活动描述：{{ sourcename }}
+              活动描述：{{ activityDescription }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              绑定商品：{{ sourcetype }}
+              绑定商品：{{ boundGoods }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              商品活动价格：{{ address }}
+              商品活动价格：{{ commodityActivityPrice }}
             </el-col>
           </el-col>
         </el-card>
@@ -31,7 +31,7 @@
 </template>
 
 <script>
-import { getOrder } from '@/api/order/orderSearch'
+import { getFullMarketingDetail } from '@/api/marketingManagement/fullGiveMarketing'
 import { mapGetters } from 'vuex'
 import { filterContent } from '@/utils'
 
@@ -51,16 +51,11 @@ export default {
     return {
       activeName: 'first',
       ordercode: '', // 工单编号
-      name: '', // 姓名
-      phone: '', // 电话
-      sex: '', // 性别
-      address: '', // 地址
-      sourcename: '', // 工单来源
-      sourcetype: '', // 工单类型
-      content: '', // 工单内容
-      createtime: '', // 创建时间
-      createuser: '', // 创建人
-      fileList: [] // 附件
+      activityName: '', //活动名称
+      activityTime: '', //活动时间
+      activityDescription: '', //活动描述
+	  boundGoods: '', //绑定商品
+      commodityActivityPrice: '', //商品活动价格
     }
   },
   computed: {
@@ -79,26 +74,14 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getOrder(rid).then(response => {
+      getFullMarketingDetail(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
-          this.ordercode = res.ordercode // 工单编号
-          this.name = res.name // 姓名
-          this.phone = res.phone // 电话
-          this.sex = res.sex // 性别
-          res.provincename = res.provincename === null ? '' : res.provincename
-          res.cityname = res.cityname === null ? '' : res.cityname
-          res.address = res.address === null ? '' : res.address
-          this.address = res.provincename + res.cityname + res.address // 地址
-          this.sourcename = res.sourcename // 工单来源
-          this.sourcetype = res.typename // 工单类型
-          this.content = filterContent.content(res.content) // 工单内容
-          this.createtime = res.createtime // 创建时间
-          this.createuser = res.createuser + '-' + res.createusername // 创建人
-          // 附件
-          if (res.files) {
-            this.fileList = res.files
-          }
+          const res = response.data
+          this.activityName = res.F_Name;
+          this.activityDescription = res.F_Describe;
+          this.boundGoods = res.F_Commodity;
+          this.commodityActivityPrice = res.F_Money;
+          this.activityTime = res.F_StartTime+'-'+res.F_EndTime;
         }
       })
     }

CallCenterWeb.UI/src/views/marketingManagement/limitedTimeOffer/index.vue

@@ -6,16 +6,17 @@
         <span slot="label">{{ item.label }}</span>
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
           <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" label="活动名称" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="活动时间" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="活动描述" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="绑定商品" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="商品活动价格" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Name" label="活动名称" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_StartTime" label="活动开始时间" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_EndTime" label="活动结束时间" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Describe" label="活动描述" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_CommodityName" label="绑定商品" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Money" label="商品活动价格" align="center" fixed width=""></el-table-column>
           <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.ordercode)">详情</el-button>
-              <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.ordercode)">编辑</el-button>
-              <el-button v-permission="'HY_delete'" type="text" @click="btn_delete(scope.row.id)">删除</el-button>
+              <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
+              <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.F_ID.toString())">编辑</el-button>
+              <el-button v-permission="'HY_delete'" type="text" @click="btn_delete(scope.row.F_ID.toString())">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -35,7 +36,7 @@
 
 <script>
 
-import { getOrderLists, deleteOrder } from '@/api/marketingManagement/fullGiveMarketing'
+import { getOrderLists, deleteFullMarketing } from '@/api/marketingManagement/fullGiveMarketing'
 import searchFilter from './components/searchFilter'
 import addOrEdit from './components/addOrEdit'
 import detail from './components/detail'
@@ -62,25 +63,25 @@ export default {
       dataLists: [],// 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], //选中的id
-      activeName: "fourth",
+      activeName: "3",
       tabMapOptions: [{
           label: '全部',
-          key: 'first',
+          key: '3',
           num: 0,
         },
         {
           label: '进行中',
-          key: 'second',
+          key: '1',
           num: 0,
         },
         {
           label: '预告中',
-          key: 'third',
+          key: '0',
           num: 0,
         },
         {
           label: '已结束',
-          key: 'fourth',
+          key: '2',
           num: 0,
         }
       ],
@@ -101,13 +102,14 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
-          date: this.searchDatas.date, //日期
+          type: 4, //限时特惠活动
+          process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.data.total
-            this.dataLists = response.data.rows
+            this.pageParams.total = response.total
+            this.dataLists = response.rows
           }
         })
         resolve()
@@ -145,7 +147,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteOrder(editId).then(response => {
+        deleteFullMarketing(editId).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.getList()
             this.$message.success('删除成功!')
@@ -155,8 +157,9 @@ export default {
         this.$message.info('已取消删除')
       })
     },
-    handleClick() {
-
+    handleClick(tab) {
+      this.activeName=tab.name;
+      this.getList();
     },
     changeSelects(selection) {
       const ids = []

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/components/addOrEdit.vue

@@ -5,14 +5,27 @@
         <el-input v-model="ruleForm.activityName" placeholder="请输入活动名称"></el-input>
       </el-form-item>
       <el-form-item label="活动时间" prop="activityTime">
-        <el-input v-model="ruleForm.activityTime" placeholder="请输入活动时间"></el-input>
+         <el-date-picker
+        v-model="ruleForm.activityTime"
+        :picker-options="pickerOptions"
+        class="filter-item"
+        type="daterange"
+        format="yyyy年MM月dd日"
+        value-format="yyyy-MM-dd"
+        align="left"
+        unlink-panels
+        range-separator="至"
+        start-placeholder="开始日期"
+        end-placeholder="结束日期"
+      />
+        <!-- <el-input v-model="ruleForm.activityTime" placeholder="请输入活动时间"></el-input> -->
       </el-form-item>
       <el-form-item label="赠送方式" prop="giftMethod">
         <el-input v-model="ruleForm.giftMethod" placeholder="请输入赠送方式"></el-input>
       </el-form-item>
-      <el-form-item label="生日当日发放" prop="birthdayIssued">
+      <!-- <el-form-item label="生日当日发放" prop="birthdayIssued">
         <el-input v-model="ruleForm.birthdayIssued" placeholder="请输入生日当日发放"></el-input>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="绑定商品" prop="boundGoods">
         <el-input v-model="ruleForm.boundGoods" placeholder="请输入绑定商品"></el-input>
       </el-form-item>
@@ -29,9 +42,9 @@
 
 <script>
 import { getProviceCity, getDictionary } from '@/api/commonAPI'
-import { getOrder, addOrder, editOrder } from '@/api/marketingManagement/fullGiveMarketing'
+import { getFullMarketingDetail, addFullMarketing, editFullMarketing } from '@/api/marketingManagement/fullGiveMarketing'
 import { validateTel } from '@/utils/validate'
-import { filterContent } from '@/utils'
+import { filterContent,pickerOptions } from '@/utils'
 
 export default {
   name: 'AddOrEdit',
@@ -57,6 +70,7 @@ export default {
         children: 'entityJson'
       },
       sourceOptions: [], // 工单来源下拉数据
+      pickerOptions ,// 日期数据
       ruleForm: {
         unique_id: '', //		否	string	callid
         ordercode: '',
@@ -95,35 +109,48 @@ export default {
         if (valid) {
           this.ruleForm.content = filterContent.delHtmlTag(this.ruleForm.content)// 保存内容时去掉 html 标签
           this.loading = true
-          // 添加
-          if (!this.rowid) {
-            addOrder(this.ruleForm).then(response => {
+          return new Promise(resolve=>{
+            const params = {
+              F_Type:2,
+              F_ID:this.rowid ? this.rowid : '',
+              F_Name:this.ruleForm.activityName,//活动名称
+              F_Describe:this.ruleForm.giftMethod,//赠送方式
+              F_StartTime:this.ruleForm.activityTime && this.ruleForm.activityTime[0],//政策开始时间
+              F_EndTime:this.ruleForm.activityTime && this.ruleForm.activityTime[1],//政策结束时间
+              F_Commodity:this.ruleForm.boundGoods,//商品ID
+              F_ActivityMode:this.ruleForm.activityMode,//活动方式
+            }
+            // 添加
+            if (!this.rowid) {
+              addFullMarketing(params).then(response => {
+                this.loading = false
+                if (response.state.toLowerCase() === 'success') {
+                  this.$parent.$layer.close(this.layerid)
+                  if (this.callid) {
+                    this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
+                  } else {
+                    this.$parent.btn_search() // 重新加载父级数据
+                  }
+                  this.$message.success('恭喜你，添加成功!')
+                }
+              }).catch(() => {
+                this.loading = false
+              })
+              return
+            }
+            // 编辑
+            editFullMarketing(params).then(response => {
               this.loading = false
               if (response.state.toLowerCase() === 'success') {
                 this.$parent.$layer.close(this.layerid)
-                if (this.callid) {
-                  this.$parent.getOrderRecord() // 重新加载来电弹屏工单记录
-                } else {
-                  this.$parent.getList() // 重新加载父级数据
-                }
-                this.$message.success('恭喜你，添加成功!')
+                this.$parent.getList() // 重新加载父级数据
+                this.$message.success('恭喜你，编辑成功!')
               }
             }).catch(() => {
               this.loading = false
             })
-            return
-          }
-          // 编辑
-          editOrder(this.ruleForm).then(response => {
-            this.loading = false
-            if (response.state.toLowerCase() === 'success') {
-              this.$parent.$layer.close(this.layerid)
-              this.$parent.getList() // 重新加载父级数据
-              this.$message.success('恭喜你，编辑成功!')
-            }
-          }).catch(() => {
-            this.loading = false
           })
+          
         } else {
           this.$message.error('请输入有效的必填项信息!')
           return false
@@ -135,9 +162,14 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getOrder(rid).then(response => {
+      getFullMarketingDetail(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
+          const res = response.data
+          this.ruleForm.activityName = res.F_Name;
+          this.ruleForm.giftMethod = res.F_Describe;
+          this.ruleForm.boundGoods = res.F_Commodity;
+          this.ruleForm.activityMode = res.F_ActivityMode;
+          this.ruleForm.activityTime = [res.F_StartTime,res.F_EndTime];
         }
       })
     },

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/components/detail.vue

@@ -4,27 +4,27 @@
       <el-col :md="24" class="order_detail_body">
         <el-card shadow="hover">
           <el-col :md="21">
-            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />工单编号：{{ ordercode }}</h1>
-            <p class="title_sub"><span class="green">{{ name }}</span> 	足力健 {{ createtime }}</p>
+            <h1 class="title"><svg-icon class="title_icon" icon-class="hongqi" />生日营销活动</h1>
+            <p class="title_sub"><span class="green">{{ activityName }}</span> 	足力健 </p>
           </el-col>
           <el-col :md="24" class="order_detail_content">
             <el-col :md="6" class="order_detail_item">
-              活动名称：{{ phone }}
+              活动名称：{{ activityName }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              活动时间：{{ sex }}
+              活动时间：{{ activityTime }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              赠送方式：{{ sourcename }}
+              赠送方式：{{ giftMethod }}
             </el-col>
-            <el-col :md="6" class="order_detail_item">
+            <!-- <el-col :md="6" class="order_detail_item">
               生日当日发放：{{ sourcetype }}
-            </el-col>
+            </el-col> -->
             <el-col :md="6" class="order_detail_item">
-              绑定商品：{{ address }}
+              绑定商品：{{ boundGoods }}
             </el-col>
             <el-col :md="6" class="order_detail_item">
-              活动方式：{{ createuser }}
+              活动方式：{{ activityMode }}
             </el-col>
           </el-col>
         </el-card>
@@ -34,7 +34,7 @@
 </template>
 
 <script>
-import { getOrder } from '@/api/order/orderSearch'
+import { getFullMarketingDetail } from '@/api/marketingManagement/fullGiveMarketing'
 import { mapGetters } from 'vuex'
 import { filterContent } from '@/utils'
 
@@ -54,16 +54,11 @@ export default {
     return {
       activeName: 'first',
       ordercode: '', // 工单编号
-      name: '', // 姓名
-      phone: '', // 电话
-      sex: '', // 性别
-      address: '', // 地址
-      sourcename: '', // 工单来源
-      sourcetype: '', // 工单类型
-      content: '', // 工单内容
-      createtime: '', // 创建时间
-      createuser: '', // 创建人
-      fileList: [] // 附件
+      activityName: '', //活动名称
+	  activityTime: '', //活动时间
+	  giftMethod: '', //赠送方式
+	  boundGoods: '', //绑定商品
+ 	  activityMode: '', //活动方式
     }
   },
   computed: {
@@ -82,26 +77,14 @@ export default {
     },
     // 详情
     getDetail(rid) {
-      getOrder(rid).then(response => {
+      getFullMarketingDetail(rid).then(response => {
         if (response.state.toLowerCase() === 'success') {
-          const res = response.data.model
-          this.ordercode = res.ordercode // 工单编号
-          this.name = res.name // 姓名
-          this.phone = res.phone // 电话
-          this.sex = res.sex // 性别
-          res.provincename = res.provincename === null ? '' : res.provincename
-          res.cityname = res.cityname === null ? '' : res.cityname
-          res.address = res.address === null ? '' : res.address
-          this.address = res.provincename + res.cityname + res.address // 地址
-          this.sourcename = res.sourcename // 工单来源
-          this.sourcetype = res.typename // 工单类型
-          this.content = filterContent.content(res.content) // 工单内容
-          this.createtime = res.createtime // 创建时间
-          this.createuser = res.createuser + '-' + res.createusername // 创建人
-          // 附件
-          if (res.files) {
-            this.fileList = res.files
-          }
+		  const res = response.data
+		  this.activityName = res.F_Name;
+          this.giftMethod = res.F_Describe;
+          this.boundGoods = res.F_Commodity;
+          this.activityMode = res.F_ActivityMode;
+          this.activityTime = res.F_StartTime+'-'+res.F_EndTime;
         }
       })
     }

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/components/searchFilter.vue

@@ -15,7 +15,7 @@
       />
       <!-- <el-date-picker v-model="searchDatas.date" type="date" placeholder="日期" class="filter-item"></el-date-picker> -->
       <el-button type="primary" class="filter-item" icon="el-icon-search" @click="btn_search">搜索</el-button>
-      <el-button v-permission="'HY_add'" type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
+      <el-button type="primary" class="filter-item" icon="el-icon-plus" @click="btn_add">添加</el-button>
       <el-button type="primary" class="filter-item" @click="btn_import"><svg-icon icon-class="daoru" />导入</el-button>
       <el-button type="primary" class="filter-item" @click="btn_export">导出</el-button>
     </div>

CallCenterWeb.UI/src/views/marketingManagement/marketingActivity/index.vue

@@ -6,17 +6,18 @@
         <span slot="label">{{ item.label }}</span>
         <el-table v-loading="loading" :data="dataLists" border stripe @selection-change="changeSelects">
           <el-table-column type="selection" width="40"></el-table-column>
-          <el-table-column type="index" label="活动名称" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="活动事件" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="赠送方式" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="生日当日发放" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="绑定商品" align="center" fixed width=""></el-table-column>
-          <el-table-column type="index" label="活动方式" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Name" label="活动名称" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_StartTime" label="开始时间" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_EndTime" label="结束时间" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_Describe" label="赠送方式" align="center" fixed width=""></el-table-column>
+          <!-- <el-table-column prop="index" label="生日当日发放" align="center" fixed width=""></el-table-column> -->
+          <el-table-column prop="F_CommodityName" label="绑定商品" align="center" fixed width=""></el-table-column>
+          <el-table-column prop="F_ActivityMode" label="活动方式" align="center" fixed width=""></el-table-column>
           <el-table-column label="操作" width="" align="center" class-name="oparate_btn" fixed="right">
             <template slot-scope="scope">
-              <el-button v-permission="'HY_detail'" type="text" @click="btn_detail(scope.row.ordercode)">详情</el-button>
-              <el-button v-permission="'HY_edit'" type="text" @click="btn_edit(scope.row.ordercode)">编辑</el-button>
-              <el-button v-permission="'HY_delete'" type="text" @click="btn_delete(scope.row.id)">删除</el-button>
+              <el-button type="text" @click="btn_detail(scope.row.F_ID.toString())">详情</el-button>
+              <el-button type="text" @click="btn_edit(scope.row.F_ID.toString())">编辑</el-button>
+              <el-button type="text" @click="btn_delete(scope.row.F_ID)">删除</el-button>
             </template>
           </el-table-column>
         </el-table>
@@ -35,7 +36,7 @@
 
 <script>
 
-import { getOrderLists, deleteOrder } from '@/api/marketingManagement/fullGiveMarketing'
+import { getOrderLists, deleteFullMarketing } from '@/api/marketingManagement/fullGiveMarketing'
 import searchFilter from './components/searchFilter'
 import addOrEdit from './components/addOrEdit'
 import detail from './components/detail'
@@ -62,25 +63,25 @@ export default {
       dataLists: [],// 列表数据
       multipleSelection: [], // 选中的数据
       selectedId: [], //选中的id
-      activeName: "fourth",
+      activeName: "3",
       tabMapOptions: [{
           label: '全部',
-          key: 'first',
+          key: '3',
           num: 0,
         },
         {
           label: '进行中',
-          key: 'second',
+          key: '1',
           num: 0,
         },
         {
           label: '预告中',
-          key: 'third',
+          key: '0',
           num: 0,
         },
         {
           label: '已结束',
-          key: 'fourth',
+          key: '2',
           num: 0,
         }
       ],
@@ -101,13 +102,14 @@ export default {
         const params = {
           pageindex: this.pageParams.pageindex, // int 第几页
           pagesize: this.pageParams.pagesize, // int 每页几条信息
-          date: this.searchDatas.date, //日期
+          type: 2, //生日营销活动
+          process: this.activeName==3?'':this.activeName
         }
         getOrderLists(params).then(response => {
           this.loading = false
           if (response.state.toLowerCase() === 'success') {
-            this.pageParams.total = response.data.total
-            this.dataLists = response.data.rows
+            this.pageParams.total = response.total
+            this.dataLists = response.rows
           }
         })
         resolve()
@@ -145,7 +147,7 @@ export default {
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
-        deleteOrder(editId).then(response => {
+        deleteFullMarketing(editId).then(response => {
           if (response.state.toLowerCase() === 'success') {
             this.getList()
             this.$message.success('删除成功!')
@@ -157,6 +159,8 @@ export default {
     },
     handleClick(tab) {
       console.log("name", tab.name)
+      this.activeName=tab.name;
+      this.getList();
     },
     changeSelects(selection) {
       const ids = []