Merge remote-tracking branch 'origin/feature/contentsecurity'

# Conflicts:
#	src/views/modules/contentSecurity/checkrecords.vue
#	src/views/modules/contentSecurity/violationsrecords.vue

src/views/modules/contentSecurity/checkrecords.vue

@@ -79,7 +79,16 @@
         <el-table-column prop="suggestion" label="审核状态" header-align="center" align="center"></el-table-column>
         <el-table-column prop="label" label="检测结果分类" header-align="center" align="center" width="120"></el-table-column>
         <el-table-column prop="system" label="系统状态" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="deptName" label="所属部门" min-width="150" show-overflow-tooltip header-align="center" align="center"></el-table-column>
+        <el-table-column prop="allDeptNames" label="所有部门名称" min-width="350"
+                         show-overflow-tooltip  header-align="center" align="center"></el-table-column>
+<!--        <el-table-column prop="rate" label="分类概率" header-align="center" align="center"></el-table-column>-->
+<!--        <el-table-column prop="allPass" 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" width=180></el-table-column>
+<!--        <el-table-column prop="updatedBy" label="更新人" header-align="center" align="center"></el-table-column>-->
         <el-table-column prop="auditTime" label="审核时间" header-align="center" align="center" width=180></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
@@ -126,7 +135,9 @@ export default {
         startTime:'',
         endTime:'',
         suggestionCode:'',
-        systemStatus:''
+        systemStatus:'',
+        deptName:'',
+        allDeptNames:''
       },
       suggestionList:[],
       handleVisible:false,

src/views/modules/contentSecurity/violationsrecords.vue

@@ -75,8 +75,16 @@
         <el-table-column prop="content" label="内容" header-align="center" align="left" min-width="400" show-overflow-tooltip></el-table-column>
         <el-table-column prop="label" label="检测结果分类" header-align="center" align="center" width="120"></el-table-column>
         <el-table-column prop="rate" label="分类概率" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="提交时间" header-align="center" align="center" width="180"></el-table-column>
+          <el-table-column prop="deptName" label="所属部门" header-align="center" show-overflow-tooltip min-width="150" align="center"></el-table-column>
-        <el-table-column prop="auditTime" label="审批时间" header-align="center" align="center" width="180"></el-table-column>
+          <el-table-column prop="allDeptNames" label="所有部门名称" min-width="350"
+                           show-overflow-tooltip 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" width=180></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 prop="auditTime" label="审批时间" header-align="center" align="center" width=180></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
             <el-button  type="text" size="small" @click="selectDetails(scope.row.id)">{{ '查看详情' }}</el-button>
@@ -118,7 +126,9 @@ export default {
         module:'',
         startTime:'',
         endTime:'',
-        mobile:''
+        mobile:'',
+        deptName:'',
+        allDeptNames:''
       },
       pickerBeginDateBefore: {
         disabledDate: (time) => {

src/views/modules/heart/actinfo-add-or-update.vue

@@ -354,7 +354,8 @@ export default {
         reward: '',
         isBanner: '1',
         actUserDefaultState: '1',
-        bannerUrl: ''
+        bannerUrl: '',
+        isConReview: false
       },
       isSignupEndTime: {
         disabledDate (time) {
@@ -407,7 +408,8 @@ export default {
             return time.getTime() < new Date(EndDateVal).getTime()
           }
         }
-      }
+      },
+      isFirst: true
     }
   },
   created () {
@@ -565,6 +567,7 @@ export default {
     },
     init () {
       this.visible = true
+      this.dataForm.isConReview = false
       this.$nextTick(() => {
         this.$refs['dataForm'].resetFields()
         if (this.dataForm.id) {
@@ -677,8 +680,26 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/heart/actinfo/', this.dataForm).then(({ data: res }) => {
-          this.isAble = false
+          if (!this.isFirst && res.code === 533) {
-          if (res.code !== 0) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
+            this.isAble = false
             return this.$message.error(res.msg)
           }
           this.$message({

src/views/modules/master/masternotice-add-or-update.vue

@@ -50,12 +50,14 @@ export default {
         createdTime: '',
         updatedBy: '',
         updatedTime: '',
-        fileList: ''
+        fileList: '',
+        isConReview: false
       },
       url: '',
       num: 0,
       fileList: [],
-      btnAble: false
+      btnAble: false,
+      isFirst: true
     }
   },
   computed: {
@@ -72,8 +74,10 @@ export default {
   },
   methods: {
     init () {
-      this.btnAble = false
+      this.dataForm.isConReview = false
+      this.isFirst = true
       this.visible = true
+      this.btnAble = false
       this.url = `${window.SITE_CONFIG['apiURL']}/oss/file/upload?token=${Cookies.get('token')}`
       this.num = 0
       this.fileList = []
@@ -98,14 +102,32 @@ export default {
     },
     // 表单提交
     dataFormSubmitHandle: debounce(function () {
-      this.btnAble = true
       this.$refs['dataForm'].validate((valid) => {
         if (!valid) {
-          this.btnAble = false
           return false
         }
+        this.btnAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/cloudAnalysis/masternotice/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.btnAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.btnAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
+            this.btnAble = false
             return this.$message.error(res.msg)
           }
           this.$message({
@@ -114,7 +136,6 @@ export default {
             duration: 500,
             onClose: () => {
               this.visible = false
-              this.btnAble = false
               this.$emit('refreshDataList')
             }
           })

src/views/modules/workRecord/dailyrecordinfoDetail.vue

@@ -120,7 +120,8 @@ export default {
         address: '',
         joinNum: '',
         content: '',
-        images: []
+        images: [],
+        isConReview: false
       },
       isAble: false,
       meetTypeArr: [],
@@ -133,7 +134,8 @@ export default {
       loading: false,
       dialogImageUrl: '',
       dialogVisible: false,
-      options: []
+      options: [],
+      isFirst: true
     }
   },
   computed: {
@@ -227,6 +229,7 @@ export default {
     },
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -335,7 +338,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/dailyrecordinfo/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }

src/views/modules/workRecord/monthexcellentcaseDetail.vue

@@ -86,7 +86,8 @@ export default {
         content: '',
         state: '',
         images: [],
-        files: []
+        files: [],
+        isConReview: false
       },
       isAble: false,
       hideUpload: false,
@@ -99,6 +100,7 @@ export default {
       isAutoRemoveFile: true,
       fileloading: false,
       pageloading: true,
+      isFirst: true,
       isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
@@ -142,6 +144,7 @@ export default {
   methods: {
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -279,7 +282,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentcase/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }

src/views/modules/workRecord/monthexcellentgridDetail.vue

@@ -99,7 +99,8 @@ export default {
         state: '',
         allDeptIds: '',
         images: [],
-        files: []
+        files: [],
+        isConReview: false
       },
       isAble: false,
       hideUpload: false,
@@ -113,6 +114,7 @@ export default {
       fileloading: false,
       pageloading: true,
       options: [],
+      isFirst: true,
       isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
@@ -173,6 +175,7 @@ export default {
     },
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -310,7 +313,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentgrid/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }

src/views/modules/workRecord/monthexcellentpersonDetail.vue

@@ -93,7 +93,8 @@ export default {
         content: '',
         state: '',
         images: [],
-        files: []
+        files: [],
+        isConReview: false
       },
       partyFlagArr: [
         { dictValue: '0', dictName: '居民' },
@@ -110,6 +111,7 @@ export default {
       isAutoRemoveFile: true,
       fileloading: false,
       pageloading: true,
+      isFirst: true,
       isGoToInfo: '0' // 是否回到月报列表：0否；1是
     }
   },
@@ -163,6 +165,7 @@ export default {
   methods: {
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -300,7 +303,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthexcellentperson/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }

src/views/modules/workRecord/monthrecordinfoDetail.vue

@@ -94,7 +94,8 @@ export default {
         content: '',
         state: '',
         images: [],
-        files: []
+        files: [],
+        isConReview: false
       },
       isAble: false,
       hideUpload: false,
@@ -114,7 +115,8 @@ export default {
       caseId: '',
       gridId: '',
       personId: '',
-      queryDisabled: ''
+      queryDisabled: '',
+      isFirst: true
     }
   },
   computed: {
@@ -189,6 +191,7 @@ export default {
     },
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -325,7 +328,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/monthrecordinfo/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }

src/views/modules/workRecord/weekrecordinfoDetail.vue

@@ -95,7 +95,8 @@ export default {
         state: '',
         images: [],
         files: [],
-        totalConfigList: []
+        totalConfigList: [],
+        isConReview: false
       },
       isShowArr: [
         { dictValue: '0', dictName: '否' },
@@ -113,7 +114,8 @@ export default {
       dialogVisible: false,
       pageloading: true,
       isAutoRemoveFile: true,
-      colspan: 6
+      colspan: 6,
+      isFirst: true
     }
   },
   computed: {
@@ -170,6 +172,7 @@ export default {
   methods: {
     init () {
       this.dataForm.id = this.$route.query.id
+      this.dataForm.isConReview = false
       this.visible = true
       this.isAble = false
       this.$nextTick(() => {
@@ -336,7 +339,25 @@ export default {
         }
         this.isAble = true
         this.$http[!this.dataForm.id ? 'post' : 'put']('/workRecord/weekrecordinfo/', this.dataForm).then(({ data: res }) => {
-          if (res.code !== 0) {
+          if (!this.isFirst && res.code === 533) {
+            // 不是第一次提交 并且 依然是违规内容
+            this.$confirm('您提交的内容再次被判定为违规, 是否继续提交?', '提示', {
+              confirmButtonText: '是',
+              cancelButtonText: '否',
+              type: 'warning'
+            }).then(() => {
+              this.dataForm.isConReview = true
+              // 选择“是”继续提交，调用提交方法本身
+              this.dataFormSubmitHandle()
+            }).catch(() => {
+              this.isAble = false
+            })
+            return false
+          } else if (res.code === 533) {
+            this.isFirst = false
+            this.isAble = false
+            return this.$message.error(res.msg)
+          } else if (res.code !== 0) {
             this.isAble = false
             return this.$message.error(res.msg)
           }