提交审核时增加逾期判断

src/pages/content-manage/ads/index.vue

@@ -291,7 +291,11 @@ export default {
       }
     },
     handleAuditSubmit(val) {
+      if (this.isExpired(this.drawItem.end_time) && val.audit_status === 2) {
+        this.$message.error('这条广告结束时间已逾期下架,请驳回重新编辑')
+      } else {
         this.fetchAuditAd(val)
+      }
     },
     handleTabClick() {
       // true 强制刷新

src/pages/content-manage/article/index.vue

@@ -28,14 +28,14 @@
           :inactive-value="0"
           v-model="row.is_publish"
           @change="handlePublish(row)"
-          :disabled="!hasUpdate || row.audit_status !== 2">
+          :disabled="!hasUpdate || row.audit_status !== 2 || isExpired(row.end_time)">
         ></el-switch>
       </template>
       <!-- 置顶状态 -->
       <template v-slot:top-status="{ row }">
         <div class="table-col-top">
-          <el-switch :active-value="1" :inactive-value="0" v-model="row.is_top" @change="handleTop(row)" :disabled="!hasUpdate || row.audit_status !== 2">></el-switch>
-          <el-select v-model="row.weight" placeholder="权重" size="mini" :disabled="!hasUpdate || row.audit_status !== 2" @change="handleWeight(row)">
+          <el-switch :active-value="1" :inactive-value="0" v-model="row.is_top" @change="handleTop(row)" :disabled="!hasUpdate || row.audit_status !== 2 || isExpired(row.end_time)">></el-switch>
+          <el-select v-model="row.weight" placeholder="权重" size="mini" :disabled="!hasUpdate || row.audit_status !== 2 || isExpired(row.end_time)" @change="handleWeight(row)">
             <el-option v-for="item in 10" :label="item" :value="item" :key="item"></el-option>
           </el-select>
         </div>
@@ -47,7 +47,7 @@
           :inactive-value="0"
           v-model="row.is_recommend"
           @change="handleRecommend(row)"
-           :disabled="!hasUpdate || row.audit_status !== 2">
+           :disabled="!hasUpdate || row.audit_status !== 2 || isExpired(row.end_time)">
         ></el-switch>
       </template>
 
@@ -89,7 +89,7 @@ import DrawerForm from '../components/DrawerForm.vue'
 import TableList from '@/components/TableList'
 import AuditForm from '../components/AuditForm.vue'
 import { getArticleList, createArticle, updateArticle, auditArticle, publishArticle, topArticle, recommendArticle, batchDeleteArticle } from '@/api/contentManage'
-import { dateFormat } from '@/utils/utils'
+import { dateFormat, formatToDate } from '@/utils/utils'
 export default {
   data() {
     return {
@@ -210,6 +210,13 @@ export default {
   },
   components: { TableList, DrawerForm, AuditForm },
   methods: {
+    isExpired(time) {
+      if (time === 0) return false
+      const now = Date.now()
+      time = formatToDate(time).getTime()
+      if (now > time) return true
+      else return false
+    },
     // 审核状态
     auditStatusText(value) {
       const map = { 1: '待审核', 2: '已通过', 3: '已驳回' }
@@ -294,16 +301,11 @@ export default {
       }
     },
     handleAuditSubmit(val) {
-      auditArticle(this.drawItem.id, val).then(res => {
-        if (res.code === 0 && res.data && res.data.status) {
-          this.$message.success('审核文章成功')
-          this.$refs.tableList.refetch()
-          this.$refs.articleDrawer.closeDrawer()
-          this.dialogVisible = false
+      if (this.isExpired(this.drawItem.end_time) && val.audit_status === 2) {
+        this.$message.error('这篇文章结束时间已逾期下架,请驳回重新编辑')
       } else {
-          this.$message.error(res.message || '审核文章失败')
+        this.fetchAuditArticle(val)
       }
-      })
     },
     handleTabClick() {
       // true 强制刷新
@@ -341,6 +343,18 @@ export default {
         }
       })
     },
+    fetchAuditArticle(val) {
+      auditArticle(this.drawItem.id, val).then(res => {
+        if (res.code === 0 && res.data && res.data.status) {
+          this.$message.success('审核文章成功')
+          this.$refs.tableList.refetch()
+          this.$refs.articleDrawer.closeDrawer()
+          this.dialogVisible = false
+        } else {
+          this.$message.error(res.message || '审核文章失败')
+        }
+      })
+    },
     fetchDeleteArticle(ids) {
       batchDeleteArticle({ ids }).then(res => {
         if (res.code === 0) {

src/pages/content-manage/image-text/index.vue

@@ -28,7 +28,7 @@
           :inactive-value="0"
           v-model="row.is_publish"
           @change="handlePublish(row)"
-          :disabled="!hasUpdate || row.audit_status !== 2"
+          :disabled="!hasUpdate || row.audit_status !== 2 || isExpired(row.end_time)"
         ></el-switch>
       </template>
 
@@ -70,7 +70,7 @@ import DrawerForm from '../components/DrawerForm.vue'
 import TableList from '@/components/TableList'
 import AuditForm from '../components/AuditForm.vue'
 import { getImgTextList, createImgText, updateImgText, auditImgText, publishImgText, batchDeleteImgText } from '@/api/contentManage'
-import { dateFormat } from '@/utils/utils'
+import { dateFormat, formatToDate } from '@/utils/utils'
 export default {
   data() {
     return {
@@ -190,6 +190,13 @@ export default {
   },
   components: { TableList, DrawerForm, AuditForm },
   methods: {
+    isExpired(time) {
+      if (time === 0) return false
+      const now = Date.now()
+      time = formatToDate(time).getTime()
+      if (now > time) return true
+      else return false
+    },
     // 审核状态
     auditStatusText(value) {
       const map = { 1: '待审核', 2: '已通过', 3: '已驳回' }
@@ -257,16 +264,11 @@ export default {
       }
     },
     handleAuditSubmit(val) {
-      auditImgText(this.drawItem.id, val).then(res => {
-        if (res.code === 0 && res.data && res.data.status) {
-          this.$message.success('审核图文成功')
-          this.$refs.tableList.refetch()
-          this.dialogVisible = false
-          this.$refs.imgTextDrawer.closeDrawer()
+      if (this.isExpired(this.drawItem.end_time) && val.audit_status === 2) {
+        this.$message.error('这条图文结束时间已逾期下架,请驳回重新编辑')
       } else {
-          this.$message.error(res.message || '审核图文失败')
+        this.fetchAuditImgText(val)
       }
-      })
     },
     handleTabClick() {
       // true 强制刷新
@@ -294,6 +296,18 @@ export default {
         }
       })
     },
+    fetchAuditImgText(val) {
+      auditImgText(this.drawItem.id, val).then(res => {
+        if (res.code === 0 && res.data && res.data.status) {
+          this.$message.success('审核图文成功')
+          this.$refs.tableList.refetch()
+          this.dialogVisible = false
+          this.$refs.imgTextDrawer.closeDrawer()
+        } else {
+          this.$message.error(res.message || '审核图文失败')
+        }
+      })
+    },
     fetchDeleteImgText(ids) {
       batchDeleteImgText({ ids }).then(res => {
         if (res.code === 0) {