diff --git a/src/views/modules/points/acitveproductinfo-add-or-update.vue b/src/views/modules/points/acitveproductinfo-add-or-update.vue
index 6f98a25f..c090d436 100644
--- a/src/views/modules/points/acitveproductinfo-add-or-update.vue
+++ b/src/views/modules/points/acitveproductinfo-add-or-update.vue
@@ -1,76 +1,92 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
-    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
-          <el-form-item label="商品名称" prop="name">
-          <el-input v-model="dataForm.name" placeholder="商品名称"></el-input>
-      </el-form-item>
-          <el-form-item label="描述" prop="content">
-          <el-input v-model="dataForm.content" placeholder="描述"></el-input>
-      </el-form-item>
-          <el-form-item label="积分" prop="points">
-          <el-input v-model="dataForm.points" placeholder="积分"></el-input>
-      </el-form-item>
-          <el-form-item label="显示图片" prop="headPic">
-          <el-input v-model="dataForm.headPic" placeholder="显示图片"></el-input>
-      </el-form-item>
-          <el-form-item label="兑换开始时间" prop="startTime">
-          <el-input v-model="dataForm.startTime" placeholder="兑换开始时间"></el-input>
-      </el-form-item>
-          <el-form-item label="兑换结束时间" prop="endTime">
-          <el-input v-model="dataForm.endTime" placeholder="兑换结束时间"></el-input>
-      </el-form-item>
-          <el-form-item label="上架状态1:上架，0：下架" prop="state">
-          <el-input v-model="dataForm.state" placeholder="上架状态1:上架，0：下架"></el-input>
-      </el-form-item>
-          <el-form-item label="库存数量" prop="amount">
-          <el-input v-model="dataForm.amount" placeholder="库存数量"></el-input>
-      </el-form-item>
-          <el-form-item label="部门名称" prop="deptName">
-          <el-input v-model="dataForm.deptName" placeholder="部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="部门ID" prop="deptId">
-          <el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门" prop="parentDeptIds">
-          <el-input v-model="dataForm.parentDeptIds" placeholder="父所有部门"></el-input>
-      </el-form-item>
-          <el-form-item label="父所有部门名称" prop="parentDeptNames">
-          <el-input v-model="dataForm.parentDeptNames" placeholder="父所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门ID" prop="allDeptIds">
-          <el-input v-model="dataForm.allDeptIds" placeholder="所有部门ID"></el-input>
-      </el-form-item>
-          <el-form-item label="所有部门名称" prop="allDeptNames">
-          <el-input v-model="dataForm.allDeptNames" placeholder="所有部门名称"></el-input>
-      </el-form-item>
-          <el-form-item label="删除标记 0：未删除，1：已删除" prop="delFlag">
-          <el-input v-model="dataForm.delFlag" placeholder="删除标记 0：未删除，1：已删除"></el-input>
-      </el-form-item>
-          <el-form-item label="乐观锁" prop="revision">
-          <el-input v-model="dataForm.revision" placeholder="乐观锁"></el-input>
-      </el-form-item>
-          <el-form-item label="创建人" prop="createdBy">
-          <el-input v-model="dataForm.createdBy" placeholder="创建人"></el-input>
-      </el-form-item>
-          <el-form-item label="创建时间" prop="createdTime">
-          <el-input v-model="dataForm.createdTime" placeholder="创建时间"></el-input>
-      </el-form-item>
-          <el-form-item label="更新人" prop="updatedBy">
-          <el-input v-model="dataForm.updatedBy" placeholder="更新人"></el-input>
-      </el-form-item>
-          <el-form-item label="更新时间" prop="updatedTime">
-          <el-input v-model="dataForm.updatedTime" placeholder="更新时间"></el-input>
-      </el-form-item>
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" label-width="120px">
+        <el-form-item label="商品名称" prop="name">
+            <el-input v-model="dataForm.name" placeholder="商品名称"></el-input>
+        </el-form-item>
+        <el-form-item label="描述" prop="content">
+            <el-input type="textarea" :rows="2" v-model="dataForm.content" placeholder="描述"></el-input>
+        </el-form-item>
+        <el-form-item label="积分" prop="points">
+            <el-input-number v-model="dataForm.points" :min="0" :max="1000000000" label="积分" style="width: 200px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="显示图片" prop="headPic">
+            <el-upload
+                    class="avatar-uploader"
+                    :action="uploadUrl"
+                    :show-file-list="false"
+                    :on-success="handleAvatarSuccess"
+                    :before-upload="beforeAvatarUpload">
+                <img v-if="dataForm.headPic" :src="dataForm.headPic" class="avatar">
+                <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+            <el-upload
+                    ref="upload"
+                    :action="uploadUrl"
+                    :class="{hide:hideUpload}"
+                    list-type="picture-card"
+                    :file-list="dataForm.images"
+                    :limit=1
+                    :on-preview="handlePictureCardPreview"
+                    :on-remove="handleRemove"
+                    :on-success="handleAvatarSuccess"
+                    :on-error="handelError"
+                    :before-upload="beforeAvatarUpload"
+                    style="width:480px">
+                <i class="el-icon-plus"></i>
+            </el-upload>
+            <el-dialog :visible.sync="dialogVisible">
+                <img width="100%" :src="dialogImageUrl" alt="">
+            </el-dialog>
+            <div><font color="gray">1张图</font></div>
+        </el-form-item>
+        <el-form-item label="兑换开始时间" prop="startTime">
+            <el-date-picker
+                    v-model="dataForm.startTime"
+                    type="datetime"
+                    placeholder="兑换开始时间"
+                    style="width: 200px">
+            </el-date-picker>
+        </el-form-item>
+        <el-form-item label="兑换结束时间" prop="endTime">
+            <el-date-picker
+                    v-model="dataForm.endTime"
+                    type="datetime"
+                    placeholder="兑换结束时间"
+                    style="width: 200px">
+            </el-date-picker>
+        </el-form-item>
+        <el-form-item label="上架状态" prop="state">
+            <el-select v-model="dataForm.state" placeholder="上架状态" style="width: 200px">
+                <el-option v-for="item in stateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+                </el-option>
+            </el-select>
+        </el-form-item>
+        <el-form-item label="库存数量" prop="amount">
+            <el-input-number v-model="dataForm.amount" :min="0" :max="1000000000" label="库存数量" style="width: 200px"></el-input-number>
+        </el-form-item>
+        <el-form-item label="部门" prop="deptId">
+            <el-cascader
+                    ref="name"
+                    v-model="dataForm.deptIdsArr"
+                    :options="options"
+                    :props="{ checkStrictly: true }"
+                    @visible-change="changeHandle"
+                    style="width:50%;"
+            >
+            </el-cascader>
+        </el-form-item>
       </el-form>
     <template slot="footer">
       <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
-      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+      <el-button type="primary" :disabled="isAble" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
     </template>
   </el-dialog>
 </template>
 
 <script>
 import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
 export default {
   data () {
     return {
@@ -81,23 +97,30 @@ export default {
         content: '',
         points: '',
         headPic: '',
+        images: [],
         startTime: '',
         endTime: '',
         state: '',
         amount: '',
         deptName: '',
         deptId: '',
-        parentDeptIds: '',
-        parentDeptNames: '',
+        deptIdsArr: [],
         allDeptIds: '',
         allDeptNames: '',
-        delFlag: '',
-        revision: '',
-        createdBy: '',
-        createdTime: '',
-        updatedBy: '',
-        updatedTime: ''
-      }
+        parentDeptIds: '',
+        parentDeptNames: ''
+      },
+      stateArr: [
+        { dictValue: '1', dictName: '上架' },
+        { dictValue: '0', dictName: '下架' }
+      ],
+      options: [],
+      isAble: false,
+      uploadUrl: '',
+      loading: false,
+      dialogImageUrl: '',
+      dialogVisible: false,
+      hideUpload: false
     }
   },
   computed: {
@@ -113,7 +136,7 @@ export default {
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         headPic: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         startTime: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@@ -132,40 +155,15 @@ export default {
         ],
         deptId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        parentDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptIds: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        allDeptNames: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        delFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        revision: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        createdTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedBy: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        updatedTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
   },
+  created: function () {
+    this.getOptions()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/oss/file/uploadImg?token=${Cookies.get('token')}`
+    // this.uploadUrl = `http://219.146.91.110:10000/epdc-api/oss/file/uploadImg?token=${Cookies.get('token')}`
+  },
   methods: {
     init () {
       this.visible = true
@@ -176,6 +174,91 @@ export default {
         }
       })
     },
+    getOptions () {
+      this.$http.get(`/sys/user/deptOptions/getDeptAuthByUser`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      }).catch(() => {})
+    },
+    changeHandle (value, selectedData) {
+      let allDeptIds = '0,'
+      let allDeptNames = '市北区委-'
+      if (this.$refs['name']._data.checkedValue !== null && this.$refs['name']._data.checkedValue.length > 0) {
+        let nameArrStr = this.$refs['name']._data.inputValue
+        let nameArr = nameArrStr.split(' / ')
+        for (var i = 0; i < this.$refs['name']._data.checkedValue.length; i++) {
+          allDeptIds += this.$refs['name']._data.checkedValue[i] + ','
+          allDeptNames += nameArr[i] + '-'
+        }
+      }
+      this.dataForm.allDeptIds = allDeptIds.length > 0 ? allDeptIds.substring(0, allDeptIds.length - 1) : allDeptIds
+      this.dataForm.allDeptNames = allDeptNames.length > 0 ? allDeptNames.substring(0, allDeptNames.length - 1) : allDeptNames
+      this.dataForm.parentDeptIds = this.dataForm.allDeptIds.substring(0, this.dataForm.allDeptIds.lastIndexOf(','))
+      this.dataForm.parentDeptNames = this.dataForm.allDeptNames.substring(0, this.dataForm.allDeptNames.lastIndexOf('-'))
+      this.dataForm.deptId = this.dataForm.allDeptIds.substring(this.dataForm.allDeptIds.lastIndexOf(',')).replace(',', '')
+      this.dataForm.deptName = this.dataForm.allDeptNames.substring(this.dataForm.allDeptNames.lastIndexOf('-')).replace('-', '')
+    },
+    beforeAvatarUpload (file) {
+      if (this.dataForm.images.length === 1) {
+        this.$message.error('最多上传1张图片!')
+        return false
+      }
+      this.loading = true
+      this.isAble = true
+      const isJPG = file.type === 'image/jpeg'
+      const isPNG = file.type === 'image/png'
+      // const isLt1M = file.size / 1024 / 1024 < 1
+      // 判断是否符合格式要求
+      if (!isJPG && !isPNG) {
+        this.$message.error('上传文件必须是jpg、png格式!')
+        this.loading = false
+        this.isAble = false
+        return false
+      }
+    },
+    handleAvatarSuccess (res, file) {
+      this.loading = false
+      this.isAble = false
+      if (res === null || res.data === null || res.data.imgUrl === null) {
+        this.$message.error('文件上传失败！')
+        this.handleErrorRemove(file)
+        return false
+      }
+      this.dataForm.images.push({ url: res.data.imgUrl, thumbnail: res.data.thumbnail, fileType: 1 })
+      this.hideUpload = this.dataForm.images.length >= 1
+      // 头像控件使用 to do
+      this.dataForm.headPic = res.data.imgUrl
+    },
+    handleErrorRemove (file) {
+      // 实现缩略图模板时删除文件
+      let fileList = this.$refs.upload.uploadFiles
+      for (var i = 0; i < fileList.length; i++) {
+        let item = fileList[i]
+        if (item.url === file.url) {
+          fileList.splice(i, 1)
+        }
+      }
+    },
+    handelError () {
+      this.loading = false
+      this.isAble = false
+      this.$message.error('上传文件失败!')
+    },
+    handleRemove (file, fileList) {
+      for (var i = 0; i < this.dataForm.images.length; i++) {
+        let item = this.dataForm.images[i]
+        if (item.url === file.url) {
+          this.dataForm.images.splice(i, 1)
+        }
+      }
+      this.hideUpload = this.dataForm.images.length >= 1
+    },
+    handlePictureCardPreview (file) {
+      this.dialogImageUrl = file.url
+      this.dialogVisible = true
+    },
     // 获取信息
     getInfo () {
       this.$http.get(`/points/acitveproductinfo/${this.dataForm.id}`).then(({ data: res }) => {
@@ -213,3 +296,8 @@ export default {
   }
 }
 </script>
+<style>
+    .hide .el-upload--picture-card {
+        display: none;
+    }
+</style>
diff --git a/src/views/modules/points/acitveproductinfo.vue b/src/views/modules/points/acitveproductinfo.vue
index f5cfedf4..30abb368 100644
--- a/src/views/modules/points/acitveproductinfo.vue
+++ b/src/views/modules/points/acitveproductinfo.vue
@@ -1,47 +1,71 @@
 <template>
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-points__acitveproductinfo}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
+        <el-form-item label="商品名称" prop="name" label-width="100px">
+          <el-input v-model="dataForm.name" placeholder="商品名称" clearable @keyup.native="btKeyUpname"></el-input>
+        </el-form-item>
+        <el-form-item label="上架状态" prop="state">
+          <el-select v-model="dataForm.state" placeholder="上架状态" clearable>
+            <el-option v-for="item in stateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br/>
+        <el-form-item label="兑换开始时间"
+                      prop="startTime" label-width="100px">
+          <el-date-picker v-model="dataForm.startTime"
+                          type="date"
+                          :picker-options="pickerBeginDateBefore"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="至"
+                      label-width="25px"
+                      prop="endTime">
+          <el-date-picker v-model="dataForm.endTime"
+                          type="date"
+                          :picker-options="pickerBeginDateAfter"
+                          value-format="yyyy-MM-dd"
+                          format="yyyy-MM-dd"
+                          placeholder="选择日期时间"
+                          style="width:200px" @change="changeTime">
+          </el-date-picker>
         </el-form-item>
         <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataListSearch()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('points:acitveproductinfo:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('points:acitveproductinfo:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="id" label="商品id" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="name" label="商品名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="content" label="描述" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="points" label="积分" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="headPic" label="显示图片" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="startTime" label="兑换开始时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="endTime" label="兑换结束时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="state" label="上架状态1:上架，0：下架" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="amount" label="库存数量" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="deptId" label="部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptIds" label="父所有部门" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="parentDeptNames" label="父所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptIds" label="所有部门ID" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="allDeptNames" label="所有部门名称" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="delFlag" label="删除标记 0：未删除，1：已删除" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdBy" label="创建人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="updatedTime" label="更新时间" header-align="center" align="center"></el-table-column>
+        <el-table-column label="序号" width="50px" align="center">
+          <template slot-scope="scope">
+            {{scope.$index+1}}
+          </template>
+        </el-table-column>
+        <!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
+        <el-table-column prop="name" label="商品名称" header-align="center" align="center" min-width="150"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="content" label="描述" header-align="center" align="center" min-width="200"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="points" label="积分" header-align="center" align="center" min-width="150"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="headPic" label="显示图片" header-align="center" align="center" min-width="200"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="startTime" label="兑换开始时间" header-align="center" align="center" min-width="170"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="endTime" label="兑换结束时间" header-align="center" align="center" min-width="170"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="stateName" label="上架状态" header-align="center" align="center" min-width="150"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="amount" label="库存数量" header-align="center" align="center" min-width="150"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptName" label="部门名称" header-align="center" align="center" min-width="150"  show-overflow-tooltip></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center" min-width="170"  show-overflow-tooltip></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission('points:acitveproductinfo:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission('points:acitveproductinfo:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -74,12 +98,42 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
+        id: '',
+        name: '',
+        state: '',
+        startTime: '',
+        endTime: ''
+      },
+      stateArr: [
+        { dictValue: '1', dictName: '上架' },
+        { dictValue: '0', dictName: '下架' }
+      ],
+      pickerBeginDateBefore: {
+        disabledDate: (time) => {
+          let beginDateVal = this.dataForm.endTime
+          if (beginDateVal) {
+            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
+          }
+        }
+      },
+      pickerBeginDateAfter: {
+        disabledDate: (time) => {
+          let EndDateVal = this.dataForm.startTime
+          if (EndDateVal) {
+            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
+          }
+        }
       }
     }
   },
   components: {
     AddOrUpdate
+  },
+  methods: {
+    btKeyUpname (e) {
+      e.target.value = e.target.value.replace(/[`~!@#$%^&*()_+=<>?:"{}|·~！@#￥%……&*（）——+={}|《》？：“”【】、；‘’，。、]/g, '')
+      this.dataForm.name = e.target.value
+    }
   }
 }
 </script>