Merge remote-tracking branch 'origin/dev' into dev

project/sass/apps/Announce/AppAnnounce/components/Add.vue

@@ -81,6 +81,7 @@
                           :limit="9"
                           action="/app/wxcp/upload/uploadFile"
                           accept=".jpg,.png,.jpeg"
+                          :on-exceed="onExceed"
                           :http-request="v => submitUpload(v, '1')">
                           <div class="content-item" trigger>
                             <img src="https://cdn.cunwuyun.cn/dvcp/announce/big-img.png" />
@@ -96,6 +97,7 @@
                           :limit="9"
                           action="/app/wxcp/upload/uploadFile"
                           accept=".mp4"
+                          :on-exceed="onExceed"
                           :http-request="v => submitUpload(v, '2')">
                           <div class="content-item" trigger>
                             <img src="https://cdn.cunwuyun.cn/dvcp/announce/big-video.png" />
@@ -109,6 +111,7 @@
                           :show-file-list="false"
                           :before-upload="v => handleChange(v, 20, '.zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt')"
                           :limit="9"
+                          :on-exceed="onExceed"
                           action="/app/wxcp/upload/uploadFile"
                           accept=".zip,.rar,.doc,.docx,.xls,.xlsx,.ppt,.pptx,.pdf,.txt"
                           :http-request="v => submitUpload(v, '3')">
@@ -245,6 +248,7 @@
                   v-model="dateForm.choiceTime"
                   type="datetime"
                   size="small"
+                  :picker-options="pickerOptions"
                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="请选择定时发送时间">
                 </el-date-picker>
@@ -319,7 +323,12 @@
         },
         girdNames: '',
         id: '',
-        tagsList: []
+        tagsList: [],
+        pickerOptions: {
+          disabledDate: e => {
+            return e.getTime() < (Date.now() - 60 * 1000 * 60 * 24)
+          }
+        }
       }
     },
 
@@ -523,6 +532,10 @@
         return true
       },
 
+      onExceed () {
+        this.$message.error(`最多上传9个附件`)
+      },
+
       submitUpload (file, type) {
         const fileType = {
           '1': 'image',
@@ -553,7 +566,11 @@
       onDateForm () {
         this.$refs.dateForm.validate((valid) => {
           if (valid) {
-            this.confirm(1)
+            if (new Date(this.dateForm.choiceTime).getTime() < Date.now()) {
+              return this.$message.error('定时发送时间不得早于当前时间')
+            } else {
+              this.confirm(1)
+            }
           }
         })
       },

project/sass/apps/Announce/AppAnnounce/components/Detail.vue

@@ -180,9 +180,9 @@
               <div class="bottom-search">
                 <div class="left">
                   <el-radio-group v-model="search2.sendStatus" size="small" @change="search2.current = 1, getGroupInfo()">
-                    <el-radio-button size="small" label="0">未执行</el-radio-button>
-                    <el-radio-button size="small" label="1">已执行</el-radio-button>
-                    <el-radio-button size="small" label="2">无法执行</el-radio-button>
+                    <el-radio-button size="small" label="0">未送达</el-radio-button>
+                    <el-radio-button size="small" label="1">已送达</el-radio-button>
+                    <el-radio-button size="small" label="2">无法送达</el-radio-button>
                   </el-radio-group>
                   <div class="userSelcet" placeholder="请选择创建人">
                     <span v-if="search2.deptartId"><ai-open-data type="departmentName" :openid="search2.deptartId"></ai-open-data></span>
@@ -388,13 +388,12 @@
           const nowTime = this.$moment(new Date())
           const min = nowTime.diff(this.info.remindTime, 'minute')
           this.min = (60 - min)
-          console.log(nowTime.diff(this.info.remindTime, 'minute'))
 
           if (this.min <= 0) {
             this.isDisabled = false
+            clearInterval(this.timer)
           } else {
             this.isDisabled = true
-            clearInterval(this.timer)
           }
         }, 1000)
       },

project/sass/apps/Announce/AppAnnounceStatistics/AppAnnounceStatistics.vue

@@ -262,6 +262,7 @@
           this.isEffectTimeSelect = true
           this.dialogDate = true
         }else {
+          this.effectType = type
           this.getEffect()
         }
       },
@@ -327,6 +328,7 @@
           this.isEffectTimeSelect = false
           this.dialogDate = true
         }else {
+          this.departType = type
           this.getDepart()
         }
       },
@@ -383,10 +385,9 @@
             axisPointer: {
               type: 'shadow'
             },
-            formatter: function(data) {
+            formatter: (data) => {
               var index = data[0].dataIndex
-              let name = `<ai-open-data type="departmentName" openid="${this.departBarData[index].deptId}" class="name"></ai-open-data><br/>宣发任务数：${this.departBarData[index].taskCount}`
-              return name
+              return `<ww-open-data type="departmentName" openid="${this.departBarData[index].deptId}"></ww-open-data><br/>宣发任务数：${data[0].value}`
             }
           },
           dataZoom: [