Merge branch 'bd-dev' of http://47.94.45.65:3000/angelo/web-base-admin into bd-test

src/api/activity.js

@@ -81,3 +81,12 @@ export function declarationActivityRecordList(params) {
   })
 }
 
+// 报单赠送统计列表
+
+export function declarationActivitySummaryList(params) {
+  return request({
+    url: '/activity/manage/acDeclarationRecord//list-total',
+    method: 'get',
+    params
+  })
+}

src/router/index.js

@@ -2110,6 +2110,12 @@ export const constantRoutes = [
             name: 'DeclarationActivityRecordList',
             component: () => import('@/views/marketing/declarationActivity/record'),
             meta: { title: '报单赠送记录' }
+          },
+          {
+            path: 'declarationActivitySummary',
+            name: 'DeclarationActivitySummary',
+            component: () => import('@/views/marketing/declarationActivity/summary'),
+            meta: { title: '报单赠送统计' }
           }
         ]
       },

src/views/marketing/declarationActivity/index.vue

@@ -202,7 +202,7 @@ import topBar from '@/components/topBar'
 import * as api from '@/api/activity.js'
 import { activityStatus } from '@/api/giftGoods.js'
 export default {
-  name: 'Bzpz',
+  name: 'DeclarationActivity',
   components: {
     topBar
   },

src/views/marketing/declarationActivity/record.vue

@@ -13,7 +13,23 @@
           label-width="auto"
         >
           <el-row :gutter="40">
-            <!-- 一层 -->
+            <el-col :span="4">
+              <el-form-item label="报单中心会员编号">
+                <el-input
+                  v-model="select.referenceCode"
+                  style="width:100%"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="新会员编号">
+                <el-input
+                  v-model="select.memberCode"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
             <el-col :span="4">
               <el-form-item :label="'活动名称'">
                 <el-input
@@ -106,30 +122,31 @@
           <el-table
             v-loading="loading"
             :data="tableData"
-            style="width: 100%"
+            style="width: 100%;"
             height="710px"
             :header-cell-style="{ background: '#EEEEEE' }"
             :row-class-name="tableRowClassName"
             @selection-change="handleSelectionChange"
           >
-            <el-table-column
-              type="selection"
-              width="55"
-            />
+
             <el-table-column
               align="center"
               prop="actName"
               :label="'活动名称'"
+              width="150"
+              fixed
             />
             <el-table-column
               align="center"
               prop="referenceCode"
               label="报单中心会员编号"
+              width="160"
             />
             <el-table-column
               align="center"
               prop="referenceName"
               label="报单中心会员姓名"
+              width="140"
             />
             <el-table-column
               align="center"
@@ -140,27 +157,32 @@
               align="center"
               prop="memberCode"
               label="新会员编号"
+              width="120"
             />
             <el-table-column
               align="center"
               prop="memberName"
-              label="芯会员名称"
+              label="新会员名称"
+              width="120"
             />
 
             <el-table-column
               align="center"
               prop="orderCode"
               label="订单编号"
+              width="190"
             />
             <el-table-column
               align="center"
               prop="payTime"
               label="支付时间"
+              width="160"
             />
             <el-table-column
               align="center"
               prop="specifyLevelVal"
               label="指定等级"
+              width="90"
             />
             <el-table-column
               align="center"
@@ -199,7 +221,7 @@ import topBar from '@/components/topBar'
 import * as api from '@/api/activity.js'
 import { activityStatus } from '@/api/giftGoods.js'
 export default {
-  name: 'Bzpz',
+  name: 'DeclarationActivityRecord',
   components: {
     topBar
   },
@@ -217,7 +239,16 @@ export default {
       creationTime: [],
       creationTime1: [],
       creationTime2: [],
-      select: {},
+      select: {
+        referenceCode: '',
+        memberCode: '',
+        actName: '',
+        activityStatus: '',
+        startActStartDate: '',
+        endActStartDate: '',
+        startActEndDate: '',
+        endActEndDate: ''
+      },
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -277,17 +308,6 @@ export default {
       this.select.startCreationTime = val ? val[0] : ''
       this.select.endCreationTime = val ? val[1] : ''
     },
-    // 点击修改
-    redirectDetail(id, index) {
-      this.$router.push({
-        path: 'updateInfo',
-        query: {
-          pkId: id,
-          controlType: index
-        }
-      })
-    },
-
     // 获取列表
     getDataList() {
       this.loading = true

src/views/marketing/declarationActivity/summary.vue

@@ -0,0 +1,342 @@
+<template>
+  <div class="page">
+    <topBar
+      v-if="topList.length > 0"
+      :top-list="topList"
+      :moren="moren"
+    />
+    <div class="main">
+      <div class="form_all">
+        <el-form
+          ref="select"
+          :model="select"
+          label-width="auto"
+        >
+          <el-row :gutter="40">
+            <el-col :span="4">
+              <el-form-item :label="'活动名称'">
+                <el-input
+                  v-model="select.actName"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item :label="'活动状态'">
+                <el-select
+                  v-model="select.activityStatus"
+                  clearable
+                  :placeholder="'请选择'"
+                >
+                  <el-option
+                    v-for="item in actStatus"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="4">
+              <el-form-item label="产品编号">
+                <el-input
+                  v-model="select.productCode"
+                  clearable
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'开始日期'">
+                <el-date-picker
+                  v-model="creationTime"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <el-form-item :label="'结束日期'">
+                <el-date-picker
+                  v-model="creationTime1"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime1"
+                />
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="8">
+              <el-form-item :label="'创建日期'">
+                <el-date-picker
+                  v-model="creationTime2"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  type="datetimerange"
+                  :range-separator="'至'"
+                  :start-placeholder="'开始日期'"
+                  :end-placeholder="'结束日期'"
+                  @change="changeTime2"
+                />
+              </el-form-item>
+            </el-col> -->
+            <el-col :span="4">
+              <el-button
+                type="primary"
+                size="small"
+                @click="getDataList"
+              > {{ '搜索' }}</el-button>
+              <el-button
+                size="small"
+                class="resetBtn"
+                @click="reset"
+              > {{ '重置' }}</el-button>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+      <div class="main_a">
+        <div class="mainbtn">
+
+          <el-button
+            v-hasButtons="['declarationActivitySummaryExport']"
+            size="small"
+            class="exportBtn"
+            @click="handleExport"
+          > {{ '导出' }}</el-button>
+        </div>
+        <div class="maintable">
+          <el-table
+            v-loading="loading"
+            :data="tableData"
+            style="width: 100%;"
+            height="710px"
+            :header-cell-style="{ background: '#EEEEEE' }"
+            :row-class-name="tableRowClassName"
+            @selection-change="handleSelectionChange"
+          >
+
+            <el-table-column
+              align="center"
+              prop="actName"
+              :label="'活动名称'"
+            />
+            <el-table-column
+              align="center"
+              prop="productCode"
+              label="产品编号"
+            />
+            <el-table-column
+              align="center"
+              prop="productName"
+              label="产品名称"
+              min-width="300"
+            />
+            <el-table-column
+              align="center"
+              prop="specsName"
+              label="产品规格"
+            />
+            <el-table-column
+              align="center"
+              prop="quantity"
+              label="数量"
+              width="120"
+            />
+          </el-table>
+        </div>
+      </div>
+    </div>
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getDataList"
+    />
+  </div>
+</template>
+
+<script>
+import topBar from '@/components/topBar'
+import * as api from '@/api/activity.js'
+import { activityStatus } from '@/api/giftGoods.js'
+export default {
+  name: 'DeclarationActivitySummary',
+  components: {
+    topBar
+  },
+  filters: {
+    isAgree(val) {
+      if (!val) {
+        return '允许'
+      } else {
+        return '禁止'
+      }
+    }
+  },
+  data() {
+    return {
+      creationTime: [],
+      creationTime1: [],
+      creationTime2: [],
+      select: {
+        productCode: '',
+        actName: '',
+        activityStatus: '',
+        startActStartDate: '',
+        endActStartDate: '',
+        startActEndDate: '',
+        endActEndDate: ''
+      },
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 50
+      },
+      addOrEdit: '',
+      total: 0,
+      dialogVisible: false,
+      tableData: [],
+      loading: false,
+      moren: 'declarationActivitySummary',
+      topList: [
+        {
+          name: '报单赠送统计',
+          path: 'declarationActivitySummary'
+        }
+      ],
+      form: {
+        name: ''
+      },
+      rules: {
+        name: [{ required: true, message: '请输入规格类型', trigger: 'blur' }]
+      },
+      actStatus: []
+    }
+  },
+  mounted() {
+    // 获取下拉
+    this.getData()
+    // 获取列表
+    this.getDataList()
+  },
+  methods: {
+    // 重置
+    reset() {
+      this.select = {}
+      this.creationTime = []
+      this.creationTime1 = []
+      this.creationTime2 = []
+      this.getDataList()
+    },
+    getData() {
+      activityStatus().then((res) => {
+        this.actStatus = res.data
+      })
+    },
+
+    changeTime(val) {
+      this.select.startActStartDate = val ? val[0] : ''
+      this.select.endActStartDate = val ? val[1] : ''
+    },
+    changeTime1(val) {
+      this.select.startActEndDate = val ? val[0] : ''
+      this.select.endActEndDate = val ? val[1] : ''
+    },
+    changeTime2(val) {
+      this.select.startCreationTime = val ? val[0] : ''
+      this.select.endCreationTime = val ? val[1] : ''
+    },
+
+    // 获取列表
+    getDataList() {
+      this.loading = true
+      api
+        .declarationActivitySummaryList(
+          Object.assign({}, this.queryParams, this.select, { actType: 31 })
+        )
+        .then((res) => {
+          this.tableData = res.rows
+          this.total = res.total
+          this.loading = false
+        })
+    },
+    handleSelectionChange(val) {},
+    /** 导出按钮操作 */
+    handleExport() {
+      this.$confirm('是否确认导出所有数据项?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then((_) => {
+        this.download(
+          'activity/manage/acDeclarationRecord/list-total-export',
+          Object.assign({}, { actType: 31 }, this.queryParams, this.select),
+          `${'报单赠送统计'}${new Date().getTime()}.xlsx`
+        )
+      })
+    },
+    tableRowClassName({ row, rowIndex }) {
+      if (rowIndex % 2 == 1) {
+        return 'warning-row'
+      } else if (rowIndex % 2 == 0) {
+        return 'success-row'
+      }
+      return ''
+    }
+  }
+}
+</script>
+<style scoped lang="scss">
+::v-deep .el-table .warning-row {
+  background: #f9f9f9;
+}
+
+::v-deep .el-table .success-row {
+  background: #ffffff;
+}
+::v-deep .el-table thead {
+  color: #000000;
+}
+::v-deep .el-select {
+  width: 100%;
+}
+.page {
+  padding: 20px;
+  background: #f9f9f9;
+  font-size: 14px;
+  .main {
+    // background: #ffffff;
+    border-radius: 8px;
+    display: flex;
+    flex-direction: column;
+    .main_a {
+      background: #fff;
+      border-radius: 8px;
+      justify-content: space-between;
+      align-items: center;
+      box-shadow: 0px 2px 20px 0px rgba(238, 238, 238, 0.5);
+    }
+    .mainbtn {
+      padding: 0;
+    }
+    .maintable {
+      flex: 1;
+    }
+  }
+}
+::v-deep .el-date-editor.el-input,
+.el-date-editor.el-input__inner {
+  width: 100%;
+}
+.form_all {
+  padding: 0 20px;
+  margin-bottom: 10px;
+  background: #fff;
+}
+</style>

src/views/marketing/declarationActivity/update.vue

@@ -80,12 +80,12 @@
           <td style="border:0" />
           <td colspan="2">
             <el-select v-model="ctem.registerAuthority">
-              <el-option v-for="item in registerList" :key="item.value" :label="item.label" :value="item.value"></el-option>
+              <el-option v-for="item in registerList" :key="item.value" :label="item.label" :value="item.value" />
             </el-select>
           </td>
           <td colspan="2">
             <el-select v-model="ctem.specifyLevel">
-              <el-option v-for="item in gradeRangList" :key="item.pkId" :label="item.gradeName" :value="item.pkId"></el-option>
+              <el-option v-for="item in gradeRangList" :key="item.pkId" :label="item.gradeName" :value="item.pkId" />
             </el-select>
           </td>
           <td
@@ -110,7 +110,7 @@
                   v-model="stem.specsName"
                   disabled
                 />
-               
+
               </div>
               <div class="tableFlex_i">
                 <el-input v-model="stem.quantity" />
@@ -297,18 +297,12 @@
 
 <script>
 import * as api from '@/api/giftGoods.js'
-import topBar from '@/components/topBar'
-import ImageUpload from '@/components/ImageUpload'
 import { isLocals } from '../../../utils/numberToCurrency'
 import {
   getgradeRanglist,
   getRegistration
 } from '@/api/level'
 export default {
-  components: {
-    topBar,
-    ImageUpload
-  },
   data() {
     return {
       dialogVisible: false,
@@ -345,7 +339,7 @@ export default {
       pageData: {},
       queryData: [],
       registerList: [],
-      gradeRangList: [],
+      gradeRangList: []
     }
   },
   mounted() {
@@ -414,7 +408,6 @@ export default {
           item.acDeclarationConfigParam[this.showCndex].acDeclarationProductParamList[
             this.showIndex
           ].quantity = this.selectData.quantity
-          
         })
 
         // this.dialogVisible = false

src/views/marketing/declarationActivity/updateInfo.vue

@@ -111,7 +111,7 @@ import ImageUpload from '@/components/ImageUpload'
 import UpdateInfo from '@/views/marketing/declarationActivity/update'
 import { updateDeclarationActivityList, addDeclarationActivityList, getDeclarationActivityDetail } from '@/api/activity.js'
 export default {
-  name: 'AddDirectPushUpgrade',
+  name: 'DeclarationActivityUpdateInfo',
   components: {
     ImageUpload,
     UpdateInfo,