From 61009cfc74119047aa3169d20989698e765b924b Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Mon, 12 Aug 2024 16:11:12 +0800
Subject: [PATCH] 2024/8/8

---
 src/components/CompanyForm/index.vue              |   2 +-
 src/components/InfoEditRecord/index.vue           |   2 +-
 src/components/InfoForm/index.vue                 |   2 +-
 src/components/PasswordForm/index.vue             |   2 +-
 src/utils/ncc.js                                  |  15 +++++++++++++++
 src/views/DisposalSuggestions/Form.vue            |   7 +++++--
 src/views/baseCaseHandling/Form.vue               | 528 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/baseCaseHandling/index.vue              | 136 ++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------
 src/views/baseInspectionReport/Form.vue           |  59 +++++++++++++++++++++++++++++++++--------------------------
 src/views/baseSpecialAction/Form.vue              |  10 ++++++++--
 src/views/baseSpecialAction/index.vue             |   6 +++---
 src/views/baseSystemInfo/DetailForm.vue           |  16 ++++++++--------
 src/views/baseSystemInfo/InspectForm.vue          |  58 +++++++++++++++++++++++++++++++++-------------------------
 src/views/homePage/components/news/NewsDialog.vue |   2 +-
 src/views/overView/Overview.vue                   |  35 +++++++++++++++++++++++++++--------
 src/views/overView/msgForm.vue                    | 124 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------
 16 files changed, 504 insertions(+), 500 deletions(-)

diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index 165eb39..73775e6 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -14,7 +14,7 @@
       width="60%"
       top="15vh"
       :modal-append-to-body="false"
-      class="NCC-dialog company-dialog"
+      class="NCC-dialog NCC-dialog_center company-dialog"
     >
       <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right"
 				 :rules="rules" v-lodding="loading">
diff --git a/src/components/InfoEditRecord/index.vue b/src/components/InfoEditRecord/index.vue
index 83265e9..8f53466 100644
--- a/src/components/InfoEditRecord/index.vue
+++ b/src/components/InfoEditRecord/index.vue
@@ -12,7 +12,7 @@
       width="80%"
       top="10vh"
       :modal-append-to-body="false"
-      class="NCC-dialog dialog-box"
+      class="NCC-dialog NCC-dialog_center dialog-box"
       destroy-on-close
     >
       <el-row :gutter="20">
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 307cbab..76a4118 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -12,7 +12,7 @@
       width="80%"
       top="10vh"
       :modal-append-to-body="false"
-      class="NCC-dialog dialog-box"
+      class="NCC-dialog NCC-dialog_center dialog-box"
       destroy-on-close
     >
       <el-form
diff --git a/src/components/PasswordForm/index.vue b/src/components/PasswordForm/index.vue
index ee4f9a2..4a34e3f 100644
--- a/src/components/PasswordForm/index.vue
+++ b/src/components/PasswordForm/index.vue
@@ -11,7 +11,7 @@
       append-to-body
       width="600px"
       :modal-append-to-body="false"
-      class="NCC-dialog dialog-box"
+      class="NCC-dialog NCC-dialog_center dialog-box"
       destroy-on-close
     >
       <el-form ref="form" :model="user" :rules="rules" label-width="80px">
diff --git a/src/utils/ncc.js b/src/utils/ncc.js
index 0eaf4e1..86b6f7e 100644
--- a/src/utils/ncc.js
+++ b/src/utils/ncc.js
@@ -233,6 +233,21 @@ const ncc = {
       return 'primary'
     }
   },
+  stateDeadLine(time){
+    let date = (new Date()).getTime();
+    let timeDiff = time - date;
+
+    if(timeDiff < 0) {
+      // 超时
+      return `(已超时)`
+    } else if(timeDiff / (1000 * 60 * 60 * 24) < 3) {
+      // 小于三天警告即将超时
+      return `(即将超时)`
+    } else {
+      // 未超时
+      return ''
+    }
+  },
   storageSet(obj) {
     for (let i in obj) {
       cacheItem(i, obj[i])
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index f344b7a..f9ed044 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -86,7 +86,7 @@
             label-width="100px"
             label-position="right"
           >
-            <el-col :span="24">
+            <!-- <el-col :span="24">
               <el-form-item
                 :label="isSHILevel ? '处置要求' : '处置建议'"
                 prop="disposalSuggestions"
@@ -102,7 +102,7 @@
                 >
                 </el-input>
               </el-form-item>
-            </el-col>
+            </el-col> -->
             <!-- <el-col :span="24">
               <el-form-item label="截止时间" prop="deadline">
                 <el-date-picker
@@ -195,6 +195,9 @@ export default {
         judgmentClass: [
           { required: true, message: "请选择审核类型", trigger: "change" },
         ],
+        judgmentOpinions: [
+          { required: true, message: "请填写研判意见", trigger: "bulr" }
+        ]
       },
       showSuggsetion: false,
       judgmentClassOption: [],
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 2e171d3..56ae3f7 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -1,305 +1,231 @@
 <template>
-    <div>
-        <el-row :gutter="15">
-            <el-form ref="elForm" :model="dataForm" :rules="rules" size="small" label-width="125px" label-position="right" :disabled="setting.readonly">
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="主键" prop="id">
-						<el-input v-model="dataForm.id" placeholder="请输入" clearable :disabled="judgeWrite('id')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('registrationTime')">
-					<el-form-item label="登记时间" prop="registrationTime">
-						<el-date-picker v-model="dataForm.registrationTime" placeholder="请选择" clearable :disabled="judgeWrite('registrationTime')" :style='{"width":"100%"}' type='datetime' format="yyyy-MM-dd HH:mm:ss" value-format="timestamp" >
-						</el-date-picker>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('number')">
-					<el-form-item label="文号" prop="number">
-						<el-input v-model="dataForm.number" placeholder="请输入" clearable :disabled="judgeWrite('number')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('systemName')">
-					<el-form-item label="网站/APP名称" prop="systemName">
-						<el-input v-model="dataForm.systemName" placeholder="请输入" clearable :disabled="judgeWrite('systemName')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('registeredEntity')">
-					<el-form-item label="注册主体" prop="registeredEntity">
-						<el-input v-model="dataForm.registeredEntity" placeholder="请输入" clearable :disabled="judgeWrite('registeredEntity')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('category')">
-					<el-form-item label="类别" prop="category">
-						<el-select v-model="dataForm.category" placeholder="请选择" clearable :disabled="judgeWrite('category')" :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in categoryOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('recordNumber')">
-					<el-form-item label="备案号" prop="recordNumber">
-						<el-input v-model="dataForm.recordNumber" placeholder="请输入" clearable :disabled="judgeWrite('recordNumber')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('districtCounty')">
-					<el-form-item label="所属区（市）县" prop="districtCounty">
-						<NCC-Address v-model="dataForm.districtCounty" placeholder="请选择" clearable :disabled="judgeWrite('districtCounty')" :level="2" >
-						</NCC-Address>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('illegalReasons')">
-					<el-form-item label="违法原因" prop="illegalReasons">
-						<el-input v-model="dataForm.illegalReasons" placeholder="请输入" clearable :disabled="judgeWrite('illegalReasons')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('punishmentRequirements')">
-					<el-form-item label="处罚要求" prop="punishmentRequirements">
-						<el-input v-model="dataForm.punishmentRequirements" placeholder="请输入" clearable :disabled="judgeWrite('punishmentRequirements')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('punishmentContent')">
-					<el-form-item label="处罚内容" prop="punishmentContent">
-						<el-input v-model="dataForm.punishmentContent" placeholder="请输入" :disabled="judgeWrite('punishmentContent')" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('state')">
-					<el-form-item label="状态" prop="state">
-						<el-select v-model="dataForm.state" placeholder="请选择" clearable :disabled="judgeWrite('state')" :style='{"width":"100%"}' >
-							<el-option v-for="(item, index) in stateOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-						</el-select>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('record')">
-					<el-form-item label="笔录" prop="record">
-						<NCC-UploadFz v-model="dataForm.record" :disabled="judgeWrite('record')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('caseHandlingOpinions')">
-					<el-form-item label="案件处理意见" prop="caseHandlingOpinions">
-						<NCC-UploadFz v-model="dataForm.caseHandlingOpinions" :disabled="judgeWrite('caseHandlingOpinions')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('enforcementRecords')">
-					<el-form-item label="执法记录" prop="enforcementRecords">
-						<NCC-UploadFz v-model="dataForm.enforcementRecords" :disabled="judgeWrite('enforcementRecords')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('noticeLetter')">
-					<el-form-item label="行政处罚意见告知" prop="noticeLetter">
-						<NCC-UploadFz v-model="dataForm.noticeLetter" :disabled="judgeWrite('noticeLetter')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('punishmentDecision')">
-					<el-form-item label="行政处罚决定" prop="punishmentDecision">
-						<NCC-UploadFz v-model="dataForm.punishmentDecision" :disabled="judgeWrite('punishmentDecision')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="judgeShow('closingReport')">
-					<el-form-item label="行政处罚结案报告" prop="closingReport">
-						<NCC-UploadFz v-model="dataForm.closingReport" :disabled="judgeWrite('closingReport')" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-						</NCC-UploadFz>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="工作流ID" prop="taskId">
-						<el-input v-model="dataForm.taskId" placeholder="请输入" clearable :disabled="judgeWrite('taskId')" :style='{"width":"100%"}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="创建用户" prop="creatorUserId">
-						<el-input v-model="dataForm.creatorUserId" placeholder="系统自动生成" readonly :disabled="judgeWrite('creatorUserId')" >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="创建时间" prop="creatorTime">
-						<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly :disabled="judgeWrite('creatorTime')" >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="修改用户" prop="lastModifyUserId">
-						<el-input v-model="dataForm.lastModifyUserId" placeholder="系统自动生成" readonly :disabled="judgeWrite('lastModifyUserId')" >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24" v-if="false" >
-					<el-form-item label="修改时间" prop="lastModifyTime">
-						<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly :disabled="judgeWrite('lastModifyTime')" >
-						</el-input>
-					</el-form-item>
-				</el-col>
-            </el-form>
-        </el-row>
-        <UserBox v-if="userBoxVisible" ref="userBox" @submit="submit" />
-    </div>
+  <el-dialog
+    :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="50%"
+    v-loading="loading"
+  >
+    <el-row :gutter="15">
+      <el-form
+        ref="elForm"
+        :model="dataForm"
+        size="small"
+        label-width="110px"
+        label-position="right"
+        :disabled="!!isDetail"
+        :rules="rules"
+      >
+        <el-col :span="24" v-if="false">
+          <el-form-item label="主键" prop="id">
+            <el-input v-model="dataForm.id" placeholder="请输入" clearable />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="系统名称" prop="systemName">
+			      <el-select
+ 			        v-model="dataForm.systemName"
+ 			        filterable
+ 			        remote
+ 			        reserve-keyword
+ 			        placeholder="请输入关键词"
+ 			        :remote-method="getSystemSelect"
+               @change="systemChange"
+ 			        :loading="system_loading">
+ 			        <el-option
+ 			          v-for="item in systemOption"
+ 			          :key="item.value"
+ 			          :label="item.systemName"
+ 			          :value="item.id">
+ 			        </el-option>
+ 			      </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="注册主体" prop="registeredEntity">
+            <el-input v-model="dataForm.registeredEntity" placeholder="选择系统自动带出" clearable disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="系统类别" prop="category">
+            <el-input v-model="dataForm.category" placeholder="选择系统自动带出" clearable disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备案号" prop="recordNumber">
+            <el-input v-model="dataForm.recordNumber" placeholder="选择系统自动带出" clearable disabled/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="所属区县" prop="districtCounty">
+              <el-radio-group
+                v-model="dataForm.districtCounty"
+                placeholder="请选择所属区县"
+                style="line-height: 22px"
+              >
+                <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{
+                  v.fullName
+                }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="违法原因" prop="illegalReasons">
+            <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="处罚要求" prop="punishmentRequirements">
+            <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="处罚内容" prop="punishmentContent">
+            <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200"/>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" v-if="!isDetail" @click="submit(1)">{{isSHILevel ? '下 发' : '上 报'}}</el-button>
+      <el-button type="info" v-if="!isDetail" @click="submit(0)">保 存</el-button>
+    </span>
+  </el-dialog>
 </template>
 <script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { previewDataInterface } from '@/api/systemData/dataInterface'
-	export default {
-		data(){
-			return {
-				visible: false,
-				setting:{},
-				eventType: '',
-				userBoxVisible:false,
-				dataForm: {
-					id:'',
-					id:undefined,
-					registrationTime:undefined,
-					number:undefined,
-					systemName:undefined,
-					registeredEntity:undefined,
-					category:undefined,
-					recordNumber:undefined,
-					districtCounty:[],
-					illegalReasons:undefined,
-					punishmentRequirements:undefined,
-					punishmentContent:undefined,
-					state:undefined,
-					record:[],
-					caseHandlingOpinions:[],
-					enforcementRecords:[],
-					noticeLetter:[],
-					punishmentDecision:[],
-					closingReport:[],
-					taskId:undefined,
-					creatorUserId:undefined,
-					creatorTime:undefined,
-					lastModifyUserId:undefined,
-					lastModifyTime:undefined,
-				},
-				rules: {
-				},
-				categoryOptions:[{"fullName":"选项一","id":"选项一"},{"fullName":"","id":"选项二"}],
-				stateOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-			}
-		},
-		computed: {},
-        watch: {},
-        created() {
-		},
-		mounted() {},
-		methods: {
-			goBack() {
-                this.$emit('refresh')
-            },
-			init(data) {
-				this.dataForm.id = data.id || 0;
-                this.loading = true
-				this.setting = data
-				this.visible = true;
-				this.$nextTick(() => {
-					this.$refs['elForm'].resetFields();
-					if (this.dataForm.id) {
-						request({
-							url: '/Extend/BaseCaseHandling/' + this.dataForm.id,
-							method: 'get'
-						}).then(res =>{
-							this.dataForm = res.data;
-						  if(!this.dataForm.districtCounty)this.dataForm.districtCounty=[];
-						  if(!this.dataForm.record)this.dataForm.record=[];
-						  if(!this.dataForm.caseHandlingOpinions)this.dataForm.caseHandlingOpinions=[];
-						  if(!this.dataForm.enforcementRecords)this.dataForm.enforcementRecords=[];
-						  if(!this.dataForm.noticeLetter)this.dataForm.noticeLetter=[];
-						  if(!this.dataForm.punishmentDecision)this.dataForm.punishmentDecision=[];
-						  if(!this.dataForm.closingReport)this.dataForm.closingReport=[];
-						})
-					}
-					else{
-						this.dataForm.flowId = data.flowId
-					}
-					this.loading = false
-					this.$emit('setPageLoad')
-				})
-			},
-			dataFormSubmit(eventType) {				
-				this.$refs['elForm'].validate((valid) => {
-					if (valid) {
-						if (eventType === 'audit' || eventType === 'reject') {
-            				this.$emit('eventReciver', this.dataForm, eventType)
-            				return
-          				}
-						this.dataForm.flowState = eventType === 'submit' ? 0 : 1
-						this.eventType = eventType
-						if (this.eventType === 'submit') {
-							this.$confirm('您确定要提交当前流程吗, 是否继续?', '提示', {
-								type: 'warning'
-							}).then(() => {
-								this.request()
-							}).catch(() => { });
-						} else {
-							this.request()
-						}
-					}
-				})
-			},
-			request() {
-				if (!this.dataForm.id) {
-					delete (this.dataForm.id)
-					request({
-						url: '/Extend/BaseCaseHandling',
-						method: 'post',
-						data: this.dataForm
-					}).then((res) => {
-						this.$message({
-							message: res.msg,
-							type: 'success',
-							duration: 1000,
-							onClose: () => {
-								this.visible = false
-								this.$emit('close', true)
-							}
-						})
-					})
-				}else{
-					request({
-						url: '/Extend/BaseCaseHandling/' + this.dataForm.id,
-						method: 'PUT',
-						data: this.dataForm
-					}).then((res) => {
-						this.$message({
-							message: res.msg,
-							type: 'success',
-							duration: 1000,
-							onClose: () => {
-								this.visible = false
-								this.$emit('close', true)
-							}
-						})
-					})
-				}
-			},
-			judgeShow(id) {
-				if (!this.setting.formOperates || !this.setting.formOperates.length) return true
-				let arr = this.setting.formOperates.filter(o => o.id === id) || []
-				if (!arr.length) return true
-				let item = arr[0]
-				return item.read
-			},
-			judgeWrite(id) {
-				if (!this.setting.formOperates || !this.setting.formOperates.length) return false
-				let arr = this.setting.formOperates.filter(o => o.id === id) || []
-				if (!arr.length) return true
-				let item = arr[0]
-				return !item.write
-			},
-		}
-	}
-</script>
+import infoMixin from "@/mixins/info";
+import request from "@/utils/request";
+import { getSystemDetail } from "@/api/baseData/info";
+import { dynamicTextUP } from "@/filters/index";
 
+export default {
+  mixins: [infoMixin],
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      isDetail: false,
+      dataForm: {
+		    id: undefined,
+		    registrationTime: undefined,
+		    systemName: undefined,
+		    registeredEntity: undefined,
+		    category: undefined,
+		    recordNumber: undefined,
+		    districtCounty: undefined,
+		    illegalReasons: undefined,
+		    punishmentRequirements: undefined,
+		    punishmentContent: undefined,
+		    state: undefined,
+		    record: undefined,
+		    caseHandlingOpinions: undefined,
+		    enforcementRecords: undefined,
+		    noticeLetter: undefined,
+		    punishmentDecision: undefined,
+		    closingReport: undefined,
+	    },
+      rules: {
+        systemName: [
+          { required: true, message: "请选择系统名称", trigger: "change" }
+        ],
+        districtCounty: [
+          { required: true, message: "请选择所属区域", trigger: "change" }
+        ],
+      },
+      systemOption: [],
+      system_loading: false,
+      areaOptions: [],
+    };
+  },
+  computed: {
+    isSHILevel() {
+      // 判断角色是否为‘市级办公室’
+      return this.$store.state.user.islader;
+    },
+  },
+  watch: {},
+  created() {
+    this.getSystemSelect();
+    this.initSystemTypeList();
+    this.initAreaTypeList();
+  },
+  mounted() {},
+  methods: {
+    // 获取系统列表
+    getSystemSelect(val) {
+      let query = {
+        SystemName: val || "",
+      };
+      this.system_loading = true;
+      request({
+        url: "/Extend/basesysteminfo/GetNoPagingList",
+        method: "get",
+        params: query,
+      }).then(({data}) => {
+        this.systemOption = data;
+        this.system_loading = false;
+      })
+    },
+    // 系统名称改变
+    systemChange(val) {
+      getSystemDetail(val).then(({data}) => {
+        this.dataForm.registeredEntity = data.companyId;
+        this.dataForm.category = dynamicTextUP(data.systemType, this.systemTypeOptions);
+        this.dataForm.recordNumber = data.specialRecordNumber || '--';
+        this.dataForm.districtCounty = data.areaId;
+      })
+    },
+    goBack() {
+      this.$emit("refresh");
+    },
+    init(id, isDetail) {
+      this.dataForm.id = id || 0;
+      this.isDetail = isDetail || false;
+      //   this.loading = true;
+      this.visible = true;
+      this.$nextTick(() => {
+        this.$refs["elForm"].resetFields();
+        if (this.dataForm.id) {
+          request({
+            url: `/Extend/BaseCaseHandling/${this.dataForm.id}`,
+            method: "GET",
+          }).then((res) => {
+            this.dataForm = res.data;
+            // this.loading = false;
+          });
+        }
+      });
+    },
+    // 提交
+    submit(type) {
+      // type: 1 上报 0 保存
+      let obj = {
+        ...this.dataForm,
+        isReport: type,
+      }
+			this.$refs['elForm'].validate((valid) => {
+        if(!type || valid) {
+          request({
+            url: `/Extend/BaseCaseHandling`,
+            method: "POST",
+            data: obj,
+          }).then((res) => {
+            this.$message({
+              type: "success",
+              message: res.msg,
+              onClose: () => {
+                this.visible = false;
+                this.$emit("refresh", true);
+              },
+            });
+          });
+        }
+      })
+    }
+  },
+};
+</script>
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index a9fb8f1..9b32a34 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -10,7 +10,7 @@
                 <el-form-item label="">
                   <el-input
                     v-model="query.number"
-                    placeholder="文号"
+                    placeholder="档案号"
                     clearable
                   />
                 </el-form-item>
@@ -82,61 +82,23 @@
               :data="list"
               @sort-change="sortChange"
             >
-              <el-table-column prop="id" label="主键" align="left" />
-              <el-table-column
-                prop="registrationTime"
-                label="登记时间"
-                align="left"
-              />
-              <el-table-column prop="number" label="文号" align="left" />
-              <el-table-column
-                prop="systemName"
-                label="网站/APP名称"
-                align="left"
-                width="150"
-              />
-              <el-table-column
-                prop="registeredEntity"
-                label="注册主体"
-                align="left"
-              />
+              <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
+              <el-table-column prop="number" label="档案号" align="left" show-overflow-tooltip/>
+              <el-table-column prop="registrationTime" label="登记时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/>
+              <el-table-column prop="systemName" label="网站/APP名称" align="left" width="150" show-overflow-tooltip/>
+              <el-table-column prop="registeredEntity" label="注册主体" align="left" show-overflow-tooltip/>
               <el-table-column label="类别" prop="category" align="left">
-                <template slot-scope="scope">{{
-                  scope.row.category | dynamicText(categoryOptions)
-                }}</template>
+                <template slot-scope="scope">{{ scope.row.category | dynamicText(categoryOptions) }}</template>
               </el-table-column>
-              <el-table-column
-                prop="recordNumber"
-                label="备案号"
-                align="left"
-              />
-              <el-table-column
-                prop="districtCounty"
-                label="所属区（市）县"
-                align="left"
-                width="150"
-              />
-              <el-table-column
-                prop="illegalReasons"
-                label="违法原因"
-                align="left"
-              />
-              <el-table-column
-                prop="punishmentRequirements"
-                label="处罚要求"
-                align="left"
-              />
-              <el-table-column
-                prop="punishmentContent"
-                label="处罚内容"
-                align="left"
-              />
-              <el-table-column label="状态" prop="state" align="left">
-                <template slot-scope="scope">{{
-                  scope.row.state | dynamicText(stateOptions)
-                }}</template>
+              <el-table-column prop="recordNumber" label="备案号" align="left" show-overflow-tooltip/>
+              <el-table-column prop="districtCounty" label="所属区（市）县" align="left" width="150">
+                <template slot-scope="scope">{{ scope.row.districtCounty | dynamicText(areaOptions) }}</template>
               </el-table-column>
-              <el-table-column prop="flowState" label="状态" width="100">
+              <el-table-column prop="illegalReasons" label="违法原因" align="left" show-overflow-tooltip/>
+              <el-table-column prop="punishmentRequirements" label="处罚要求" align="left" show-overflow-tooltip/>
+              <el-table-column prop="punishmentContent" label="处罚内容"  align="left" show-overflow-tooltip/>
+              <el-table-column label="状态" prop="state" align="left" />
+              <!-- <el-table-column prop="flowState" label="状态" width="100">
                 <template slot-scope="scope">
                   <el-tag v-if="scope.row.flowState == 1">等待审核</el-tag>
                   <el-tag type="success" v-else-if="scope.row.flowState == 2"
@@ -153,43 +115,20 @@
                   >
                   <el-tag type="info" v-else>等待提交</el-tag>
                 </template>
-              </el-table-column>
-              <el-table-column label="操作" fixed="right" width="100">
+              </el-table-column> -->
+              <el-table-column label="操作" fixed="right" width="180">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    :disabled="[1, 2, 5].indexOf(scope.row.flowState) > -1"
-                    @click="addOrUpdateHandle(scope.row.id)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    type="text"
-                    :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1"
-                    @click="handleDel(scope.row.id)"
-                    class="NCC-table-delBtn"
-                    >删除</el-button
-                  >
-                  <el-button
-                    size="mini"
-                    type="text"
-                    :disabled="!scope.row.flowState"
-                    @click="
-                      addOrUpdateHandle(scope.row.id, scope.row.flowState)
-                    "
-                    >详情</el-button
-                  >
+                  <el-button type="text" :disabled="[1, 2, 5].indexOf(scope.row.flowState) > -1" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+                  <el-button type="text" :disabled="[1, 2, 5].indexOf(scope.row.flowState) > -1" @click="addOrUpdateHandle(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
+                  <el-button type="text" :disabled="[1, 2, 3, 5].indexOf(scope.row.flowState) > -1" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
+                  <el-button size="mini" type="text" :disabled="!scope.row.flowState" @click="   addOrUpdateHandle(scope.row.id, scope.row.flowState) " >详情</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
-            <pagination
-              :total="total"
-              :page.sync="listQuery.currentPage"
-              :limit.sync="listQuery.pageSize"
-              @pagination="initData"
-            />
+            <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initData"/>
           </div>
         </div>
-        <FlowBox v-if="flowVisible" ref="FlowBox" @close="colseFlow" />
+        <FlowBox v-if="flowVisible" ref="FlowBox" @refresh="colseFlow" />
         <ExportBox
           v-if="exportBoxVisible"
           ref="ExportBox"
@@ -200,12 +139,14 @@
   </div>
 </template>
 <script>
+import infoMixin from "@/mixins/info";
 import request from "@/utils/request";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
-import FlowBox from "@/views/workFlow/components/FlowBox";
+import FlowBox from "./Form.vue";
 import ExportBox from "./ExportBox";
 import { previewDataInterface } from "@/api/systemData/dataInterface";
 export default {
+  mixins: [infoMixin],
   components: { FlowBox, ExportBox },
   data() {
     return {
@@ -231,7 +172,7 @@ export default {
       columnList: [
         { prop: "id", label: "主键" },
         { prop: "registrationTime", label: "登记时间" },
-        { prop: "number", label: "文号" },
+        { prop: "number", label: "档案号" },
         { prop: "systemName", label: "网站/APP名称" },
         { prop: "registeredEntity", label: "注册主体" },
         { prop: "category", label: "类别" },
@@ -250,11 +191,18 @@ export default {
         { fullName: "选项一", id: "1" },
         { fullName: "选项二", id: "2" },
       ],
+      areaOptions: [],
     };
   },
-  computed: {},
+  computed: {
+    isSHILevel() {
+      // 判断角色是否为‘市级办公室’
+      return this.$store.state.user.islader;
+    },
+  },
   created() {
-    // this.initData()
+    this.initAreaTypeList();
+    this.initData();
   },
   methods: {
     sortChange({ column, prop, order }) {
@@ -306,18 +254,10 @@ export default {
         })
         .catch(() => {});
     },
-    addOrUpdateHandle(id, flowState) {
-      let data = {
-        id: id || "",
-        enCode: "#visualDevanjcl",
-        flowId: "577085427060573445",
-        formType: 1,
-        opType: flowState ? 0 : "-1",
-        status: flowState,
-      };
+    addOrUpdateHandle(id, isDetail) {
       this.flowVisible = true;
       this.$nextTick(() => {
-        this.$refs.FlowBox.init(data);
+        this.$refs.FlowBox.init(id, isDetail);
       });
     },
     search() {
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 051e07f..1db4316 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -5,7 +5,7 @@
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
     lock-scroll
-    width="70%"
+    width="60%"
   >
     <el-row :gutter="15" class="">
       <el-form
@@ -30,13 +30,14 @@
         </el-col>
         <el-col :span="23">
           <el-form-item label="问题来源" prop="source">
-            <el-input
-              v-model="dataForm.source"
-              placeholder="请输入问题来源"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+            <el-radio-group v-model="dataForm.source">
+              <el-radio
+                v-for="(item, index) in sourceOptions"
+                :key="index"
+                :label="item.Id"
+                >{{ item.FullName }}</el-radio
+              >
+            </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="23">
@@ -70,7 +71,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="13">
+        <el-col :span="18">
           <el-form-item label="问题类型" prop="questionType">
             <el-radio-group v-model="dataForm.questionType" @change="questionTypeChange">
               <el-radio
@@ -84,7 +85,7 @@
           </el-form-item>
         </el-col>
         <template v-if="otherQuestion">
-          <el-col :span="10">
+          <el-col :span="5">
               <el-input
                 v-model="dataForm.otherQuestionType"
                 placeholder="请输入问题类型"
@@ -118,17 +119,7 @@
             </el-form-item>
           </el-col>
         </template>
-        <el-col :span="23">
-          <el-form-item label="关键词" prop="questionClass">
-            <el-input
-              v-model="dataForm.questionClass"
-              placeholder="请输入关键词"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
+       
         <el-col :span="23">
           <el-form-item label="问题内容" prop="questionContent">
             <el-input
@@ -153,9 +144,19 @@
             </el-input>
           </el-form-item>
         </el-col>
-
         <el-col :span="23">
-          <el-form-item label="取证内容" prop="obtainEvidence">
+          <el-form-item label="关键词" prop="questionClass">
+            <el-input
+              v-model="dataForm.questionClass"
+              placeholder="请输入关键词"
+              clearable
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
+          <el-form-item label="附件" prop="obtainEvidence">
             <NCC-UploadFz
               v-model="dataForm.obtainEvidence"
               :fileSize="5"
@@ -212,9 +213,6 @@ export default {
         questionType: [
           { required: true, message: "请选择问题类型", trigger: "change" },
         ],
-        questionClass: [
-          { required: true, message: "请选择关键词", trigger: "change" },
-        ],
       },
       sourceOptions: [
         { fullName: "市网信办线索", id: "市网信办线索" },
@@ -239,6 +237,7 @@ export default {
   watch: {},
   created() {
     this.loadList();
+    this.getSourceOptions();
     this.getplatformTypeOptions();
     this.getquestionTypeOptions();
   },
@@ -269,6 +268,14 @@ export default {
         (list = await this.$store.dispatch("getTypeListByCode", "system"));
       this.platformTypeOptions = list;
     },
+    async getSourceOptions() {
+      request({
+        url: `/Extend/baseinspectionreport/GetReportSourceList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.sourceOptions = data;
+      })
+    },
     getquestionTypeOptions() {
       getDictionaryDataSelector("577006814432855301").then((res) => {
         this.questionTypeOptions = res.data.list;
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 182474d..31f1afc 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -6,6 +6,7 @@
     class="NCC-dialog NCC-dialog_center"
     lock-scroll
     width="50%"
+    v-loading="loading"
   >
     <el-row :gutter="15" style="padding-top: 10px">
       <el-form
@@ -272,12 +273,17 @@ export default {
     goBack() {
       this.$emit("refresh");
     },
-    init(id, isDetail) {
-      this.dataForm.id = id || 0;
+    init(row, isDetail) {
+      this.dataForm.id = row.id || 0;
       this.visible = true;
       this.isDetail = isDetail || false;
       this.$nextTick(() => {
         this.$refs["elForm"].resetFields();
+        if(this.dataForm.id) {
+          console.log(row, 'row');
+          this.dataForm.communicationArea = JSON.parse(row.communicationArea);
+          this.dataForm.communicationOut = JSON.parse(row.communicationOut);
+        }
       });
     },
     dataFormSubmit() {
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 9f5495f..706594b 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -59,7 +59,7 @@
               <el-table-column prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/>
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" v-if="scope.row.state == '未发布'">发布任务</el-button>
+                  <el-button type="text" @click="addOrUpdateHandle(scope.row)" v-if="scope.row.state == '未发布'">发布任务</el-button>
                   <el-button type="text" @click="toDetail(scope.row)" v-else>处理情况</el-button>
                 </template>
               </el-table-column>
@@ -152,10 +152,10 @@ export default {
       });
     },
    
-    addOrUpdateHandle(id, isDetail) {
+    addOrUpdateHandle(row, isDetail) {
       this.formVisible = true;
       this.$nextTick(() => {
-        this.$refs.NCCForm.init(id, isDetail);
+        this.$refs.NCCForm.init(row, isDetail);
       });
     },
     toDetail(row) {
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index 7f7d018..f33ea29 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -360,12 +360,12 @@ export default {
 };
 </script>
 <style lang="scss" scoped>
-.NCC-dialog.systemInfoDialog {
-  :deep(.el-dialog__body) {
-    overflow: unset !important;
-    :deep(.el-tabs__content) {
-      height: calc(65vh - 45px);
-    }
-  }
-}
+// .NCC-dialog.systemInfoDialog {
+//   :deep(.el-dialog__body) {
+//     overflow: unset !important;
+//     :deep(.el-tabs__content) {
+//       height: calc(65vh - 45px);
+//     }
+//   }
+// }
 </style>
diff --git a/src/views/baseSystemInfo/InspectForm.vue b/src/views/baseSystemInfo/InspectForm.vue
index 792b034..7afcb07 100644
--- a/src/views/baseSystemInfo/InspectForm.vue
+++ b/src/views/baseSystemInfo/InspectForm.vue
@@ -5,7 +5,7 @@
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
     lock-scroll
-    width="70%"
+    width="60%"
   >
     <el-row :gutter="15" class="">
       <el-form
@@ -19,13 +19,14 @@
       >
       <el-col :span="24">
           <el-form-item label="问题来源" prop="source">
-            <el-input
-              v-model="dataForm.source"
-              placeholder="请输入问题来源"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+            <el-radio-group v-model="dataForm.source">
+              <el-radio
+                v-for="(item, index) in sourceOptions"
+                :key="index"
+                :label="item.Id"
+                >{{ item.FullName }}</el-radio
+              >
+            </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="24">
@@ -59,7 +60,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="13">
+        <el-col :span="18">
           <el-form-item label="问题类型" prop="questionType">
             <el-radio-group v-model="dataForm.questionType" @change="questionTypeChange">
               <el-radio
@@ -73,7 +74,7 @@
           </el-form-item>
         </el-col>
         <template v-if="otherQuestion">
-          <el-col :span="10">
+          <el-col :span="5">
               <el-input
                 v-model="dataForm.otherQuestionType"
                 placeholder="请输入问题类型"
@@ -107,17 +108,7 @@
             </el-form-item>
           </el-col>
         </template>
-        <el-col :span="23">
-          <el-form-item label="关键词" prop="questionClass">
-            <el-input
-              v-model="dataForm.questionClass"
-              placeholder="请输入关键词"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
+       
         <el-col :span="23">
           <el-form-item label="问题内容" prop="questionContent">
             <el-input
@@ -143,7 +134,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="取证内容" prop="obtainEvidence">
+          <el-form-item label="关键词" prop="questionClass">
+            <el-input
+              v-model="dataForm.questionClass"
+              placeholder="请输入关键词"
+              clearable
+              :style="{ width: '100%' }"
+            >
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
+          <el-form-item label="附件" prop="obtainEvidence">
             <NCC-UploadFz
               v-model="dataForm.obtainEvidence"
               :fileSize="5"
@@ -205,9 +207,6 @@ export default {
         questionType: [
           { required: true, message: "请选择问题类型", trigger: "change" },
         ],
-        questionClass: [
-          { required: true, message: "请选择关键词", trigger: "change" },
-        ],
       },
       sourceOptions: [
         { fullName: "市网信办线索", id: "市网信办线索" },
@@ -229,11 +228,20 @@ export default {
   watch: {},
   created() {
     this.loadList();
+    this.getSourceOptions();
     this.getplatformTypeOptions();
     this.getquestionTypeOptions();
   },
   mounted() {},
   methods: {
+    async getSourceOptions() {
+      request({
+        url: `/Extend/baseinspectionreport/GetReportSourceList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.sourceOptions = data;
+      })
+    },
     loadList(query) {
       this.name_loading = true;
       getInfoList({pageIndex: 1, pageSize: 100, keyword: query }).then(({ data }) => {
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 5193356..4d62729 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -38,7 +38,7 @@
 </template>
 
 <script>
-import { getMessageList, ReadInfo } from "@/api/system/message";
+import { getMessageList, ReadInfo, MessageAllRead } from "@/api/system/message";
 import { message } from '@/utils/message';
 export default {
   name: "NewsDialog",
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index da7cbe2..724bebf 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -20,9 +20,9 @@
                 <el-table-column prop="taskType" label="任务类型" show-overflow-tooltip width="100"/>
                 <el-table-column prop="taskState" label="状态" show-overflow-tooltip width="80"/>
                 <el-table-column prop="taskContent" label="任务内容" show-overflow-tooltip />
-                <el-table-column prop="deadLine" label="任务期限" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="140">
+                <el-table-column prop="deadLine" label="任务期限" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="170">
                   <template slot-scope="scope">
-                    <el-tag :type="ncc.timeDeadLine(scope.row.deadLine)">{{ ncc.tableDateFormat(scope.row, 'deadLine', scope.row.deadLine) }}</el-tag>
+                    <el-tag :type="`${ncc.timeDeadLine(scope.row.deadLine)}`">{{ncc.stateDeadLine(scope.row.deadLine)}}{{ ncc.tableDateFormat(scope.row, 'deadLine', scope.row.deadLine) }}</el-tag>
                   </template>
                 </el-table-column>
                 <el-table-column label="操作" width="100">
@@ -111,13 +111,15 @@
               <el-table :data="msgList" style="width: 100%" stripe v-loading="msgLoading">
                 <el-table-column prop="title" label="标题" show-overflow-tooltip>
                 </el-table-column>
-                <el-table-column label="操作" fixed="right" width="80">
+                <el-table-column label="操作" fixed="right" width="150">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="checkDetail(scope.row)">详情</el-button>
+                    <el-button type="text" @click="checkDetail(scope.row)" v-if="isSHILevel">编辑</el-button>
+                    <el-button type="text" style="color: red;" @click="delNew(scope.row)">删除</el-button>
+                    <el-button type="text" style="color: #909399;" @click="checkDetail(scope.row, true)">详情</el-button>
                   </template>
                 </el-table-column>
               </el-table>
-              <pagination :total="msgTotal" :page.sync="msgListQuery.currentPage" :limit.sync="msgListQuery.pageSize" @pagination="getAllMsgList" />
+              <pagination :total="msgTotal" :page.sync="msgListQuery.currentPage" :limit.sync="msgListQuery.pageSize" @pagination="getAllMsgList" layout="prev, pager, next"/>
             </template>
           </div>
         </div>
@@ -220,13 +222,30 @@ export default {
       this.MsgFormVisible = false;
       val && this.getAllMsgList();
     },
-    checkDetail(row) {
-      console.log(row);
+    checkDetail(row, isDetail) {
       this.MsgFormVisible = true;
       this.$nextTick(() => {
-        this.$refs.MsgForm.init(row.id, true);
+        this.$refs.MsgForm.init(row.id, isDetail);
       })
     },
+    delNew(row) {
+      this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        let res = await request({
+          url: `/SubDev/ZyOaArticle/${row.id}`,
+          method: "DELETE",
+        });
+        this.$message({
+          message: res.msg,
+          type: 'success'
+        });
+        this.getAllMsgList();
+      });
+    },
+
     // 发布消息通知
     announceMsg() {
       this.MsgFormVisible = true;
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index e0662ef..f669b41 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -44,7 +44,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="传达区域" prop="communicationAreas">
-            <el-checkbox-group v-model="dataForm.communicationAreas" :style="{}">
+            <el-checkbox-group v-model="dataForm.communicationAreas" @change="selectChange">
               <el-checkbox
                 v-for="(item, index) in areaOptions"
                 :key="index"
@@ -64,7 +64,7 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="传达外协" prop="communicationOuts">
-            <el-checkbox-group v-model="dataForm.communicationOuts" :style="{}">
+            <el-checkbox-group v-model="dataForm.communicationOuts" @change="selectChange">
               <el-checkbox
                 v-for="(item, index) in communicationOutOptions"
                 :key="index"
@@ -88,13 +88,33 @@
     >
       <div class="msg-title">{{ dataForm.title }}</div>
       <div class="content" v-html="dataForm.bodyContent"></div>
-      <div class="files"></div>
+      <div class="files" v-if="isSHILevel">
+        <h4>查看情况</h4>
+        <div class="tag-group">
+          <span class="tag-group__title title-tag">传递区域:</span>
+          <el-tag
+            v-for="(v, i) in dataForm.communicationAreaList"
+            :key="i"
+            :type="`${v.IsRead ? 'success' : 'danger'}`"
+            :effect="`${v.IsRead ? 'dark' : 'plain'}`">
+            {{ v.FullName }}
+          </el-tag>
+        </div>
+        <div class="tag-group">
+          <span class="tag-group__title title-tag">传达外协:</span>
+          <el-tag
+            v-for="(v, i) in dataForm.communicationOutList"
+            :key="i"
+            :type="`${v.IsRead ? 'success' : 'danger'}`"
+            :effect="`${v.IsRead ? 'dark' : 'plain'}`">
+            {{ v.FullName }}
+          </el-tag>
+        </div>
+      </div>
     </div>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"
-        >确 定</el-button
-      >
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :loading="btnLoading">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -104,6 +124,20 @@ export default {
   components: {},
   props: [],
   data() {
+    var validatecommunicationAreas = (rule, value, callback) => {
+      if (!this.dataForm.communicationOuts.length && !value?.length) {
+        callback(new Error('请输入传达区域'));
+      } else {
+        callback();
+      }
+    };
+    var validatecommunicationOuts = (rule, value, callback) => {
+      if (!this.dataForm.communicationAreas.length && !value?.length) {
+        callback(new Error('请选择传达外协'));
+      } else {
+        callback();
+      }
+    }
     return {
       loading: false,
       visible: false,
@@ -123,12 +157,24 @@ export default {
         bodyContent: [
           { required: true, message: "请输入内容", trigger: "blur" },
         ],
+        communicationAreas: [
+          { validator: validatecommunicationAreas, trigger: 'change' }
+        ],
+        communicationOuts: [
+          { validator: validatecommunicationOuts, trigger: 'change' }
+        ],
       },
       areaOptions: [],
       communicationOutOptions: [],
+      btnLoading: false,
     };
   },
-  computed: {},
+  computed: {
+    isSHILevel() {
+      // 判断角色是否为‘市级办公室’
+      return this.$store.state.user.islader;
+    },
+  },
   watch: {},
   created() {
     this.initAreaTypeList();
@@ -145,7 +191,7 @@ export default {
       this.visible = true;
       this.isDetail = isDetail || false;
       this.$nextTick(() => {
-        !this.dataForm.id && this.$refs["elForm"].resetFields();
+        !this.isDetail && this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
           this.loading = true;
           request({
@@ -153,6 +199,16 @@ export default {
             method: "GET",
           }).then((res) => {
             this.dataForm = res.data;
+            let AreaList = [];
+            res.data.communicationAreaList && res.data.communicationAreaList.forEach(v => {
+              AreaList.push(v.Id);
+            });
+            this.dataForm.communicationAreas = AreaList;
+            let OutList = [];
+            res.data.communicationOutList && res.data.communicationOutList.forEach(v => {
+              OutList.push(v.Id);
+            });
+            this.dataForm.communicationOuts = OutList;
             this.loading = false;
           });
         }
@@ -183,6 +239,7 @@ export default {
           (option) => option.id
         );
       }
+      this.$forceUpdate();
     },
     // 反选
     closeAreaAll(type) {
@@ -199,27 +256,37 @@ export default {
           )
           .map((option) => option.id);
       }
+      this.$forceUpdate();
+    },
+    selectChange() {
+      this.$forceUpdate();
     },
     dataFormSubmit() {
       this.$refs["elForm"].validate((valid) => {
         if (valid) {
-          request({
-            url: `/SubDev/ZyOaArticle`,
-            method: "post",
-            data: this.dataForm,
-          }).then((res) => {
-            this.$message({
-              message: res.msg,
-              type: "success",
-              duration: 1000,
-              onClose: () => {
-                (this.visible = false), this.$emit("refresh", true);
-              },
-            });
-          });
+          !this.dataForm.id ? this.toPostForm('/SubDev/ZyOaArticle', 'post') : this.toPostForm(`/SubDev/ZyOaArticle/${this.dataForm.id}`, 'put');
         }
       });
     },
+    toPostForm(url, method) {
+      this.btnLoading = true;
+      request({
+        url,
+        method,
+        data: this.dataForm,
+      }).then((res) => {
+        this.$message({
+          message: res.msg,
+          type: "success",
+          duration: 1000,
+          onClose: () => {
+            this.btnLoading = false;
+            this.visible = false;
+            this.$emit("refresh", true);
+          },
+        });
+      });
+    }
   },
 };
 </script>
@@ -234,5 +301,18 @@ export default {
     margin-bottom: 8px;
     color: #000;
   }
+  .files {
+    border-top: #e8e8e8 1px solid;
+    padding-top: 10px;
+    margin-top: 10px;
+    .title-tag {
+      line-height: 40px;
+      font-size: 12px;
+      margin-right: 10px;
+    }
+    :deep(.el-tag) {
+      margin: 0 5px;
+    }
+  }
 }
 </style>
--
libgit2 0.21.4