diff --git a/src/api/common.js b/src/api/common.js
index 3ec1ae0..c487bcb 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -27,3 +27,11 @@ export function getDownloadUrl(type, fileName) {
     })
   }
 
+//   获取特殊备案类型
+export function getSpecialRecordType() {
+    return request({
+      url: `/system/DictionaryData/590018069787575557`,
+      method: 'get'
+    })
+  }
+
diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index 1c0b38d..54977f8 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -31,7 +31,7 @@ body,
 }
 
 .common-info-box {
-  height: calc(100vh - 200px);
+  height: calc(100vh - 150px);
 }
 .item-box {
   width: 100%;
@@ -69,7 +69,7 @@ a {
   justify-content: flex-start;
   align-items: center;
   flex-direction: row;
-  color: #C0C4CC;
+  color: #757678;
   line-height: 30px;
   .label {
     color: #000;
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 2bd0d98..e62b650 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -45,7 +45,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="4">
               <companyForm />
             </el-col>
           </el-col>
@@ -85,6 +85,47 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24" v-show="isFilings">
+            <el-col :span="12">
+               <el-form-item label="特殊备案类型" prop="specialRecordType">
+                <el-select v-model="infoForm.specialRecordType" placeholder="请选择特殊备案类型" style="width: 100%;">
+                  <el-option v-for="v in specialRecordTypeOption" :key="v.id" :label="v.fullName" :value="v.id" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item label="特殊备案内容" prop="specialRecordContent">
+                <el-input
+                  v-model="infoForm.specialRecordContent"
+                  placeholder="请输入"
+                  show-word-limit
+                  :style="{ width: '100%' }"
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="特殊备案号" prop="specialRecordNumber">
+                <el-input
+                  v-model="infoForm.specialRecordNumber"
+                  placeholder="请输入特殊备案号"
+                  maxlength="200"
+                ></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="特殊备案时间" prop="specialRecordTime">
+                <el-date-picker
+                  v-model="infoForm.specialRecordTime"
+                  type="date"
+                  placeholder="特殊备案时间"
+                  style="width: 100%;">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="系统名称" prop="systemName">
               <el-input
@@ -267,6 +308,10 @@ export default {
         officeAddress: "",
         systemIcon: "",
         areaId: "",
+        specialRecordType: '',
+        specialRecordContent: '',
+        specialRecordNumber: '',
+        specialRecordTime: '',
       },
       infoRules: {
         systemName: {
@@ -311,8 +356,10 @@ export default {
       companyInfo: {},
       systemTypeOptions: [],
       systemClassOptions: [],
+      specialRecordTypeOption: [],
       areaOptions: [],
       btnLoading: false,
+      isFilings: false,
     };
   },
   watch: {},
@@ -367,22 +414,25 @@ export default {
     },
     async openDialog() {
       this.visible = true;
+      this.isFilings = false;
       this.reset();
       this.infoForm_loading = true;
       await this.initCompanyList();
       await this.initSystemTypeList();
       await this.initAreaTypeList();
+      await this.initSpecialRecordTypeOption();
       this.type == "edit" && (await this.initForm());
       this.infoForm_loading = false;
     },
     async initForm() {
       let { data } = await getSystemDetail(this.systemId);
       this.infoForm = data;
-      this.initSystemClassList(data.systemType);
+      this.handleSystemTypeChange(data.systemType);
       await this.companyChange(data.companyId);
       this.$forceUpdate();
     },
     handleSystemTypeChange(val) {
+      this.isFilings = Boolean(val != '580634746028033285');
       this.infoForm.systemClass = "";
       this.initSystemClassList(val);
     },
diff --git a/src/filters/index.js b/src/filters/index.js
index f0b0008..8147035 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -168,11 +168,11 @@ export function dynamicTextUP(value, options) {
     if (!options || !Array.isArray(options)) return value.join()
     let textList = []
     for (let i = 0; i < value.length; i++) {
-      let item = options.filter(o => o.id == value[i])[0]
-      if (!item || !item.fullName) {
+      let item = options.filter(o => o.Id == value[i])[0]
+      if (!item || !item.FullName) {
         textList.push(value[i])
       } else {
-        textList.push(item.fullName)
+        textList.push(item.FullName)
       }
     }
     return textList.join()
@@ -182,6 +182,26 @@ export function dynamicTextUP(value, options) {
   if (!item || !item.FullName) return value
   return item.FullName
 }
+export function dynamicTextClassName(value, options) {
+  if (!value) return ''
+  if (Array.isArray(value)) {
+    if (!options || !Array.isArray(options)) return value.join()
+    let textList = []
+    for (let i = 0; i < value.length; i++) {
+      let item = options.filter(o => o.Id == value[i])[0]
+      if (!item || !item.ClassName) {
+        textList.push(value[i])
+      } else {
+        textList.push(item.ClassName)
+      }
+    }
+    return textList.join()
+  }
+  if (!options || !Array.isArray(options)) return value
+  let item = options.filter(o => o.Id == value)[0]
+  if (!item || !item.ClassName) return value
+  return item.ClassName
+}
 // 代码生成器数据匹配 Code
 export function dynamicTextCode(value, options) {
   
diff --git a/src/mixins/info.js b/src/mixins/info.js
index ea1d43f..280386e 100644
--- a/src/mixins/info.js
+++ b/src/mixins/info.js
@@ -4,7 +4,8 @@ export default {
         return {
             systemTypeOptions: [],
             areaOptions: [],
-            systemClassOptions: []
+            systemClassOptions: [],
+            specialRecordTypeOption: [],
         }
     },
     created() {},
@@ -24,6 +25,11 @@ export default {
             !list && (list = await this.$store.dispatch('getSystemType', val));
             this.systemClassOptions = list;
         },
+        async initSpecialRecordTypeOption() {
+            let list = this.$store.state.meta.specialRecordTypeList;
+            !list && (list = await this.$store.dispatch('getTypeListByCode', 'specialRecordType'));
+            this.specialRecordTypeOption = list;
+        },
 
     },
 }
\ No newline at end of file
diff --git a/src/store/modules/meta.js b/src/store/modules/meta.js
index eeec1c6..7d47454 100644
--- a/src/store/modules/meta.js
+++ b/src/store/modules/meta.js
@@ -1,7 +1,7 @@
 // 下拉字段配置
 import { register } from "@/api";
 // 系统类型
-import { getSystemTypeList } from "@/api/common";
+import { getSystemTypeList, getSpecialRecordType } from "@/api/common";
 // 所属区县
 import { getAreaSelect } from "@/api/baseData/area";
 // 系统分类
@@ -15,6 +15,7 @@ const meta = {
         area: '', // 系统类型
         systemClass: {},
         externalAssistanceList: '', // 外协
+        specialRecordTypeList: '', // 特殊备案
     },
 
     mutations: {
@@ -30,6 +31,9 @@ const meta = {
         SET_EXTERNALASSISTANCE_CLASS: (state, data) => {
             state.externalAssistanceList = data;
         },
+        SET_SPECIALRECORDTYPELIST_CLASS: (state, data) => {
+            state.specialRecordTypeList = data;
+        },
     },
 
     actions: {
@@ -54,6 +58,12 @@ const meta = {
                             resolve(res.data)
                         }).catch(error => { reject(error) })
                         break;
+                    case 'specialRecordType':
+                        getSpecialRecordType().then(res => {
+                            commit('SET_SPECIALRECORDTYPELIST_CLASS', res.data.list)
+                            resolve(res.data.list)
+                        }).catch(error => { reject(error) })
+                        break;
 
                     default:
                         break;
diff --git a/src/utils/define.js b/src/utils/define.js
index b2ff517..a447fbc 100644
--- a/src/utils/define.js
+++ b/src/utils/define.js
@@ -1,13 +1,13 @@
 // 开发环境接口配置
 // JAVA Boot版本对应后端接口地址
 // JAVA Cloud对应网关地址
-const APIURl = 'http://localhost:8080'
+const APIURl = 'http://8.130.38.56:8043'
 
 module.exports = {
   APIURl: APIURl,
   timeout: process.env.NODE_ENV === 'development' ? 10000 : 1000000,
-  WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/websocket' : process.env.VUE_APP_BASE_WSS,
-  // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
+  // WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/websocket' : process.env.VUE_APP_BASE_WSS,
+  WebSocketUrl: process.env.NODE_ENV === 'development' ? APIURl.replace('http', 'ws') + '/api/message/websocket' : process.env.VUE_APP_BASE_WSS,
   comUploadUrl: process.env.VUE_APP_BASE_API + '/api/file/Uploader',
   comUrl: process.env.VUE_APP_BASE_API,
   // 本地文件预览
diff --git a/src/utils/ncc.js b/src/utils/ncc.js
index d3cfd3f..0eaf4e1 100644
--- a/src/utils/ncc.js
+++ b/src/utils/ncc.js
@@ -218,6 +218,21 @@ const ncc = {
     if (!cellValue) return ''
     return dayjs(cellValue).format(format)
   },
+  timeDeadLine(time){
+    let date = (new Date()).getTime();
+    let timeDiff = time - date;
+
+    if(timeDiff < 0) {
+      // 超时
+      return 'danger'
+    } else if(timeDiff / (1000 * 60 * 60 * 24) < 3) {
+      // 小于三天警告即将超时
+      return 'warning'
+    } else {
+      // 未超时
+      return 'primary'
+    }
+  },
   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 6e82bbe..ec7d5ad 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -74,8 +74,8 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
-					<el-form-item label="截止时间" prop="endTime">
-						<el-date-picker v-model="suggestionForm.endTime" type="date" placeholder="选择日期"></el-date-picker>
+					<el-form-item label="截止时间" prop="deadline">
+						<el-date-picker v-model="suggestionForm.deadline" type="date" placeholder="选择日期"></el-date-picker>
 					</el-form-item>
 				</el-col>
 			</el-form>
@@ -122,7 +122,7 @@
 					disposalSuggestions: "", //处置建议
 					judgmentOpinions: "", //判断意见
 					judgmentClass: "", //判断分类
-					endTime: '',
+					deadline: '',
 				}
 			}
 		},
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 558c629..4e6967c 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -203,8 +203,5 @@
    height: calc(100% - 47px);
    overflow-y: scroll;
  }
- .item-body {
-   height: calc(100% - 35px);
- }
 }
 </style>
\ No newline at end of file
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index e46f617..a9fb8f1 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -354,8 +354,5 @@ export default {
     height: calc(100% - 47px);
     overflow-y: scroll;
   }
-  .item-body {
-    height: calc(100% - 35px);
-  }
 }
 </style>
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index c3e4435..57f46fd 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -42,13 +42,6 @@
         <el-col :span="23">
           <el-form-item label="平台名称" prop="platformName">
             <SelsctLoad v-model="dataForm.platformName"/>
-            <!-- <el-input
-              v-model="dataForm.platformName"
-              placeholder="请输入"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input> -->
           </el-form-item>
         </el-col>
         <el-col :span="23">
@@ -78,19 +71,13 @@
         </el-col>
         <el-col :span="23">
           <el-form-item label="关键词" prop="questionClass">
-            <el-select
+            <el-input
               v-model="dataForm.questionClass"
-              placeholder="请选择"
+              placeholder="请输入关键词"
               clearable
               :style="{ width: '100%' }"
             >
-              <el-option
-                v-for="(item, index) in questionClassOptions"
-                :key="index"
-                :label="item.fullName"
-                :value="item.id"
-              ></el-option>
-            </el-select>
+            </el-input>
           </el-form-item>
         </el-col>
         <el-col :span="23">
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 303ea65..630b30d 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -5,7 +5,7 @@
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
     lock-scroll
-    width="70%"
+    width="50%"
   >
     <el-row :gutter="15" style="padding-top: 10px">
       <el-form
@@ -59,6 +59,38 @@
             </NCC-UploadFz>
           </el-form-item>
         </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('recordCommunicationArea') && !dataForm.id">
+          <el-form-item label="台账区域" prop="recordCommunicationArea">
+            <el-checkbox-group v-model="dataForm.recordCommunicationArea" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in areaOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll('area')">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll('area')">反选</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-if="ncc.hasFormP('recordCommunicationOut') && !dataForm.id">
+          <el-form-item label="台账外协" prop="recordCommunicationOut">
+            <el-checkbox-group v-model="dataForm.recordCommunicationOut" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in communicationOutOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll">反选</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
         <el-col :span="23" v-if="ncc.hasFormP('communicationArea') && dataForm.id">
           <el-form-item label="传达区域" prop="communicationArea">
             <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
@@ -145,6 +177,8 @@ export default {
         title: undefined,
         content: undefined,
         releaseTime: undefined,
+        recordCommunicationOut: [],
+        recordCommunicationArea: [],
         annex: [],
         communicationArea: [],
         communicationOut: [],
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index c36a424..253eadb 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -39,7 +39,11 @@
             <NCC-table v-loading="listLoading" :data="list">
               <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
               <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip/>
-              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip/>
+              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip width="80">
+                <template slot-scope="scope">
+                  <el-tag :type="scope.row.state == '已发布' ? 'success' : 'warning'">{{scope.row.state}}</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column prop="creatorTime" label="发布时间" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
               <el-table-column label="传达区域" prop="communicationArea" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ JSON.parse(scope.row.communicationArea) | dynamicText(communicationAreaOptions) }}</template>
@@ -47,7 +51,11 @@
               <el-table-column label="传达外协" prop="communicationOut" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ JSON.parse(scope.row.communicationOut) | dynamicText(communicationOutOptions) }}</template>
               </el-table-column>
-              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
+              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/>
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index 7574def..f73be0f 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -34,12 +34,19 @@
             <NCC-table v-loading="listLoading" :data="list">
               <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip />
               <el-table-column prop="title" label="标题" align="left" show-overflow-tooltip />
-              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip />
-              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat"
-                show-overflow-tooltip />
+              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip >
+                <template slot-scope="scope">
+                  <el-tag :type="scope.row.state == '已填写' ? 'success' : 'warning'">{{ scope.row.state }}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
+                <template slot-scope="scope">
+                    <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
+                </template>
+              </el-table-column>
               <el-table-column label="操作" fixed="right" width="130">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="toFillForm(scope.row)">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button>
+                  <el-button type="text" @click="toFillForm(scope.row)" :disabled="ncc.timeDeadLine(scope.row.deadline) == 'danger' && scope.row.state == '已填写'">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button>
                   <!-- <el-button type="text" @click="toFillForm(scope.row)" v-if="scope.row.state == '已填写'">详情</el-button> -->
                 </template>
               </el-table-column>
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
new file mode 100644
index 0000000..9420b1b
--- /dev/null
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -0,0 +1,371 @@
+<template>
+  <el-dialog
+    title="详情"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center systemInfoDialog"
+    lock-scroll
+    width="70%"
+  >
+    <el-row :gutter="15" style="height: 65vh" v-loading="loading">
+      <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
+        <el-tab-pane label="应用信息" name="1">
+          <div class="system-info">
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">主体企业:</div>
+                    {{ dataForm.companyName || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">系统类型:</div>
+                    {{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}
+                </div>
+            </el-col>
+            <template
+              v-if="
+                dataForm.systemType &&
+                dataForm.systemType != '580634746028033285'
+              "
+            >
+              <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">特殊备案类型:</div>
+                    {{ dataForm.systemType || "--" }}
+                </div>
+              </el-col>
+              <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">特殊备案内容:</div>
+                    {{ dataForm.systemType || "--" }}
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">特殊备案号:</div>
+                    {{ dataForm.systemType || "--" }}
+                </div>
+              </el-col>
+              <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">特殊备案时间:</div>
+                    {{ dataForm.systemType || "--" }}
+                </div>
+              </el-col>
+            </template>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">系统名称:</div>
+                    {{ dataForm.systemName || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">系统分类:</div>
+                    {{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">备案许可证:</div>
+                    {{ dataForm.recordLicense || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">归属平台:</div>
+                    {{ dataForm.platform || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">域名:</div>
+                    {{ dataForm.domain || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">下载量:</div>
+                    {{ dataForm.systemDownloadVolume || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">版本:</div>
+                    {{ dataForm.version || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">负责人姓名:</div>
+                    {{ dataForm.principalName || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">负责人电话:</div>
+                    {{ dataForm.principalPhone || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">办公地址:</div>
+                    {{ dataForm.officeAddress || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">系统图标:</div>
+                    {{ dataForm.systemIcon || "--" }}
+                </div>
+            </el-col>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="公司信息" name="2">
+          <div class="company-info">
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">公司名称:</div>
+                    {{ companyForm.companyName || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">社会信用代:</div>
+                    {{ companyForm.socialCreditAgency || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">公司法人:</div>
+                    {{ companyForm.legalPerson || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">公司地址:</div>
+                    {{ companyForm.address || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">联系人:</div>
+                    {{ companyForm.contactUser || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">联系方式:</div>
+                    {{ companyForm.contactPhone || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="12">
+                <div class="form-item">
+                    <div class="label w-100">所属区县:</div>
+                    {{ companyForm.areaName || "--" }}
+                </div>
+            </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">其他信息:</div>
+                    <div v-html="companyForm.otherInfo"></div>
+                </div>
+            </el-col>
+          </div>
+        </el-tab-pane>
+        <el-tab-pane label="核查处置记录" name="3">核查处置记录</el-tab-pane>
+        <el-tab-pane label="网信执法记录" name="4">网信执法记录</el-tab-pane>
+        <el-tab-pane label="数据日志" name="5">
+          <div class="infinite-list-wrapper" style="overflow:auto;height: calc(65vh - 45px);">
+            <el-timeline class="list" v-infinite-scroll="initInfoRecord" :infinite-scroll-disabled="record_disabled">
+              <el-timeline-item
+                  placement="top"
+                  v-for="(v, i) in updataRecordList"
+                  :key="i"
+                >
+                  <el-card>
+                    <h4 v-if="v.content">
+                      <!-- <p v-for="(item, index) in v.updataList" :key="index">
+                        将“{{ item.PropertyName }}”从“{{
+                          item.OldValue
+                        }}”改为“{{ item.NewValue }}”
+                      </p> -->
+                      <p v-for="(item, index) in v.changeRecord" :key="index">{{ item }}</p>
+                    </h4>
+                    <h4 v-else>
+                      <p>{{ v.describe }}</p>
+                    </h4>
+                    <p>{{ v.creatorUserId }} 提交于 {{ v.updataTime }}</p>
+                  </el-card>
+              </el-timeline-item>
+            </el-timeline>
+            <p v-if="record_loading">加载中...</p>
+            <p v-if="updataRecordList.length && record_noMore">没有更多了</p>
+            <el-empty v-if="!updataRecordList.length && !record_loading" description="暂无数据"></el-empty>
+          </div>
+        </el-tab-pane>
+      </el-tabs>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+</template>
+<script>
+import request from "@/utils/request";
+import { getSystemDetail, getUpdataRecord } from "@/api/baseData/info";
+import { getCompanyInfoById } from "@/api/baseData/company";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+
+      activeName: "1",
+
+      // 应用信息
+      dataForm: {
+        id: undefined,
+        questionFrom: undefined,
+        platformName: undefined,
+        platformType: undefined,
+        questionType: undefined,
+        questionClass: undefined,
+        questionContent: undefined,
+        link: undefined,
+        obtainEvidence: [],
+        annex: [],
+      },
+      systemTypeOptions: [],
+      systemClassOptions: [],
+
+      // 公司信息
+      companyForm: {},
+
+      // 数据日志
+      record_loading: false,
+      queryList: {
+        pageIndex: 1,
+        pageSize: 10,
+      },
+      updataRecordList: [],
+      record_total: ''
+    };
+  },
+  computed: {
+    record_noMore() {
+      return this.updataRecordList.length >= this.record_total;
+    },
+    record_disabled () {
+      return this.record_loading || this.record_noMore;
+    }
+  },
+  watch: {},
+  created() {
+    this.initSystemTypeList();
+  },
+  mounted() {},
+  methods: {
+    init(row) {
+      this.visible = true;
+      this.dataForm.id = row.Id;
+      this.activeName = '1'
+      this.$nextTick(() => {
+        this.initSystemForm(this.dataForm.id, row.companyName)
+      });
+    },
+    handleClick(e) {
+      console.log(e);
+      
+        switch (e.index) {
+            case '1':
+                // 公司信息
+                this.initCompanyForm();
+                
+                break;
+            case '4':
+                this.updataRecordList = [];
+                this.queryList = {
+                  pageIndex: 1,
+                  pageSize: 10,
+                };
+                // 数据日志
+                this.initInfoRecord();
+                break;
+        
+            default:
+                break;
+        }
+        
+    },
+
+    // 初始化应用信息
+    async initSystemForm(id, companyName) {
+        this.loading = true;
+        let { data } = await getSystemDetail(id);
+        await this.initSystemClassList(data.systemType);
+        this.dataForm = data;
+        this.dataForm.companyName = companyName;
+        this.loading = false;
+    },
+    async initSystemTypeList() {
+      let list = this.$store.state.meta.system;
+      !list &&
+        (list = await this.$store.dispatch("getTypeListByCode", "system"));
+      this.systemTypeOptions = list;
+    },
+
+    async initSystemClassList(val) {
+        let list = this.$store.state.meta.systemClass[val];
+        !list && (list = await this.$store.dispatch('getSystemType', val));
+        this.systemClassOptions = list;
+    },
+
+    // 初始化公司信息
+    async initCompanyForm() {
+      this.loading = true;
+      let res = await getCompanyInfoById(this.dataForm.companyId);
+      this.companyForm = res.data;
+      this.loading = false;
+    },
+
+    // 数据日志
+    async initInfoRecord() {
+      this.record_loading = true;
+      await getUpdataRecord({
+        id: this.dataForm.id,
+        ...this.queryList,
+      }).then(({ data }) => {
+        data.list.forEach((item) => {
+          let date = new Date(item.creatorTime * 1000);
+          item.updataTime = this.$m(date).format("YYYY-MM-DD HH:mm:ss");
+          item.updataList = JSON.parse(item.content);
+          item.changeRecord = item.content ? JSON.parse(item.describe) : item.describe;
+        });
+        this.record_total = data.pagination.total
+        this.updataRecordList = [...this.updataRecordList, ...data.list];
+        this.record_loading = false;
+        this.queryList.pageIndex += 1;
+      });
+    },
+  
+    goBack() {
+      this.$emit("refresh");
+    },
+    
+  },
+};
+</script>
+<style lang="scss" scoped>
+.systemInfoDialog {
+  :deep(.el-dialog__body) {
+    overflow: unset !important;
+    :deep(.el-tabs__content) {
+      height: calc(65vh - 45px);
+    }
+  }
+}
+</style>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 8d5a291..2bf0f6e 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -123,9 +123,6 @@
               <el-table-column label="操作" width="250">
                 <!-- 查看，修改，归属地变更，上报 -->
                 <template slot-scope="scope">
-                  <InfoEditRecord class="btn_dialog" :systemId="scope.row.Id">
-                    <el-button size="mini" type="text">查看</el-button>
-                  </InfoEditRecord>
                   <infoForm
                     class="btn_dialog"
                     type="edit"
@@ -134,6 +131,7 @@
                   >
                     <el-button size="mini" type="text">修改</el-button>
                   </infoForm>
+                  <el-button size="mini" type="text" @click="toDetail(scope.row)">查看</el-button>
                   <el-button
                     size="mini"
                     type="text"
@@ -146,12 +144,12 @@
                     @click="toInspection(scope.row)"
                     >上报</el-button
                   >
-                  <el-button
+                  <!-- <el-button
                     size="mini"
                     type="text"
                     @click="toChangeRecord(scope.row)"
                     >整改清单</el-button
-                  >
+                  > -->
                 </template>
               </el-table-column>
             </NCC-table>
@@ -215,6 +213,7 @@
           @refresh="refresh"
         />
         <ChangeRecord v-if="ChangeRecordVisible" ref="ChangeRecord"/>
+        <DetailForm v-if="DetailFormVisible" ref="DetailForm"/>
       </div>
     </div>
   </div>
@@ -225,14 +224,13 @@ import { getInfoList } from "@/api/baseData/info";
 import { applnyChageArea } from "@/api/baseData/info";
 import infoMixin from "@/mixins/info";
 import InspectionForm from "./InspectForm.vue";
+import DetailForm from './DetailForm.vue'
 import ChangeRecord from "./ChangeRecord.vue";
 
 export default {
   name: "SystemInfo",
   mixins: [infoMixin],
-  components: {
-    InspectionForm, ChangeRecord
-  },
+  components: { InspectionForm, ChangeRecord, DetailForm },
   data() {
     return {
       loading: false,
@@ -274,6 +272,9 @@ export default {
       InspectionFormVisible: false,
       ChangeRecordVisible: false,
       btnLoading: false,
+
+      // 详情
+      DetailFormVisible: false,
     };
   },
   created() {
@@ -345,6 +346,14 @@ export default {
         this.loading = false;
       });
     },
+    toDetail(row) {
+      console.log(row);
+      
+      this.DetailFormVisible = true;
+      this.$nextTick(() => {
+        this.$refs.DetailForm.init(row);
+      });
+    },
     // 上报
     toInspection(row) {
       this.InspectionFormVisible = true;
diff --git a/src/views/homePage/HomePage.vue b/src/views/homePage/HomePage.vue
index e2587d3..f3c40ce 100644
--- a/src/views/homePage/HomePage.vue
+++ b/src/views/homePage/HomePage.vue
@@ -22,9 +22,6 @@
           <infoForm type="add" @reInit="toSearchInfoList">
             <el-button type="success">新增</el-button>
           </infoForm>
-          <el-button type="text" style="color: #fff; margin-left: 10px"
-            >更多</el-button
-          >
         </div>
         <div class="info">
           <router-view ref="info"></router-view>
diff --git a/src/views/homePage/components/Header.vue b/src/views/homePage/components/Header.vue
index af6bf94..94699ce 100644
--- a/src/views/homePage/components/Header.vue
+++ b/src/views/homePage/components/Header.vue
@@ -88,7 +88,7 @@ header {
   .user {
     position: absolute;
     right: 33px;
-    top: 25px;
+    top: 13px;
     display: flex;
     align-items: center;
     flex-direction: row;
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 9545774..5193356 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -158,7 +158,7 @@ export default {
         flex-direction: row;
         justify-content: space-between;
         align-items: center;
-        color: #ccc;
+        color: #454040;
         font-size: 12px;
         line-height: 30px;
       }
diff --git a/src/views/homePage/components/news/index.vue b/src/views/homePage/components/news/index.vue
index 97e6214..bfd0d4d 100644
--- a/src/views/homePage/components/news/index.vue
+++ b/src/views/homePage/components/news/index.vue
@@ -44,6 +44,7 @@ export default {
   methods: {
     changeMagNum(val) {
       this.isHaveMsg = val ? true : false;
+      this.messageCount = val;
     },
     initWebSocket() {
       console.log("1");
@@ -69,8 +70,6 @@ export default {
           let data = JSON.parse(event.data);
           console.log(data, "event.data");
           if (data.method == "initMessage") {
-            this.messageCount =
-              data.unreadMessageCount + data.unreadNoticeCount;
             this.isTwinkle = !!data.unreadNums.length;
             this.$refs.MessageDialog.init();
           }
@@ -82,9 +81,12 @@ export default {
           }
           //消息推送（消息公告用的）
           if (data.method == "messagePush") {
-            console.log("messagePush", "消息推送（消息公告用的）", data);
-            this.messageCount += data.unreadNoticeCount;
-            if (this.$refs.MessageList.visible) this.$refs.MessageList.init();
+            this.$refs.MessageDialog.init();
+            this.$notify({
+              title: '消息推送',
+              message: data.title,
+              position: 'bottom-right'
+            });
           }
           //用户过期
           if (data.method == "logout") {
diff --git a/src/views/homePage/homePage.scss b/src/views/homePage/homePage.scss
index e9651c5..2d2cccf 100644
--- a/src/views/homePage/homePage.scss
+++ b/src/views/homePage/homePage.scss
@@ -7,7 +7,7 @@
   background-repeat: no-repeat; /* 不重复背景图片 */
 }
 .content {
-    margin-top: 56px;
+    margin-top: 13px;
     position: relative;
     .navs {
       position: absolute;
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index fee0941..da7cbe2 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -20,7 +20,11 @@
                 <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="130"/>
+                <el-table-column prop="deadLine" label="任务期限" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="140">
+                  <template slot-scope="scope">
+                    <el-tag :type="ncc.timeDeadLine(scope.row.deadLine)">{{ ncc.tableDateFormat(scope.row, 'deadLine', scope.row.deadLine) }}</el-tag>
+                  </template>
+                </el-table-column>
                 <el-table-column label="操作" width="100">
                   <template slot-scope="scope">
                     <el-button type="primary" size="small" @click="handleTask(scope.row)">处理</el-button>
@@ -119,7 +123,7 @@
         </div>
       </el-col>
     </el-row>
-    <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refreshDataList="msgRefresh"/>
+    <MsgForm v-if="MsgFormVisible" ref="MsgForm" @refresh="msgRefresh"/>
     <HandleInspectForm v-if="HandleInspectFormVisible" ref="HandleInspectForm" @refresh="(val) => {taskRefresh('HandleInspectFormVisible', val)}"/>
     <NCC-Form v-if="formVisible" ref="NCCForm" @refreshDataList="(val) => {taskRefresh('formVisible', val)}" />
   </div>
@@ -200,6 +204,8 @@ export default {
         this.msgList = res.data.list;
         this.msgTotal = res.data.pagination.total;
         this.msgLoading = false;
+      }).catch(() => {
+        this.msgLoading = false;
       });
     },
     resetMsg() {
@@ -252,6 +258,8 @@ export default {
         this.taskList = res.data.list;
         this.taskTotal = res.data.pagination.total;
         this.taskLoading = false;
+      }).catch(() => {
+        this.taskLoading = false;
       });
     },
     resetTask() {
@@ -310,7 +318,7 @@ export default {
     background-color: rgba(244, 244, 245, 0.38);
     margin-bottom: 15px;
     &.todo {
-      height: calc(100vh - 210px);
+      height: calc(100vh - 160px);
     }
     //&.earmarked {
       // height: calc(50vh - 115px);
@@ -320,7 +328,7 @@ export default {
     //   height: calc(50vh - 60px);
     // }
     &.msg {
-      height: calc(100vh - 200px);
+      height: calc(100vh - 160px);
       margin-bottom: 0;
     }
     .item-title {
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index 2d06d56..9c9e272 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -1,131 +1,245 @@
 <template>
-    <el-dialog
-      :title="isDetail ? '通知详情' : '发布通知'"
-      :close-on-click-modal="false"
-      :visible.sync="visible"
-      class="NCC-dialog NCC-dialog_center msg-dialog"
-      lock-scroll
-      width="50%"
+  <el-dialog
+    :title="isDetail ? '通知详情' : '发布通知'"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center msg-dialog"
+    lock-scroll
+    width="50%"
+  >
+    <el-row :gutter="15" style="padding-top: 10px" v-if="!isDetail">
+      <el-form
+        ref="elForm"
+        :model="dataForm"
+        size="small"
+        label-width="80px"
+        label-position="right"
+        :disabled="!!isDetail"
+        :rules="rules"
+      >
+        <el-col :span="24">
+          <el-form-item label="通知标题" prop="title">
+            <el-input v-model="dataForm.title"></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="内容" prop="bodyContent">
+            <NCC-Quill
+              v-model="dataForm.bodyContent"
+              placeholder="请输入内容..."
+              :disabled="!!isDetail"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="附件上传" prop="imgUrl">
+            <NCC-UploadFz
+              v-model="dataForm.imgUrl"
+              :fileSize="5"
+              sizeUnit="MB"
+              :limit="9"
+              buttonText="点击上传"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="传达区域" prop="communicationArea">
+            <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in areaOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll('area')"
+                >全选</el-button
+              >
+              <el-button size="mini" @click="closeAreaAll('area')"
+                >反选</el-button
+              >
+            </div>
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="传达外协" prop="communicationOut">
+            <el-checkbox-group v-model="dataForm.communicationOut" :style="{}">
+              <el-checkbox
+                v-for="(item, index) in communicationOutOptions"
+                :key="index"
+                :label="item.id"
+                >{{ item.fullName }}</el-checkbox
+              >
+            </el-checkbox-group>
+            <div style="margin-top: 10px">
+              <el-button size="mini" @click="selectAreaAll">全选</el-button>
+              <el-button size="mini" @click="closeAreaAll">反选</el-button>
+            </div>
+          </el-form-item>
+        </el-col>
+      </el-form>
+    </el-row>
+    <el-row
+      :gutter="15"
+      style="padding-top: 10px"
+      class="msg-box"
+      v-loading="loading"
+      v-else
     >
-      <el-row :gutter="15" style="padding-top: 10px">
-        <el-form
-            ref="elForm"
-            :model="dataForm"
-            size="small"
-            label-width="100px"
-            label-position="right"
-            :disabled="!!isDetail"
-            :rules="rules">
-            <el-col :span="24">
-              <el-form-item label="通知标题" prop="title">
-                <el-input v-model="dataForm.title"></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="内容" prop="bodyContent">
-                <NCC-Quill v-model="dataForm.bodyContent" placeholder="请输入内容..." :disabled="!!isDetail" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="图片上传" prop="imgUrl">
-                <NCC-UploadFz v-model="dataForm.imgUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
-              </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" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
-      </span>
-    </el-dialog>
-  </template>
-  <script>
-  import request from "@/utils/request";
-  export default {
-    components: {},
-    props: [],
-    data() {
-      return {
-        loading: false,
-        visible: false,
-        isDetail: false,
-        dataForm: {
-            id: '',
-            title: '',
-            bodyContent: '',
-            imgUrl: [],
-            categoryId: 'cc225c68421644f79037aaf624ccccc0',
-            isType: '0',
-        },
-        rules: {
-            title: [
-                { required: true, message: '请输入标题', trigger: 'blur' },
-            ],
-            bodyContent: [
-                { required: true, message: '请输入内容', trigger: 'blur' },
-            ],
-        },
-      };
+      <div class="msg-title">{{ dataForm.title }}</div>
+      <div class="content" v-html="dataForm.bodyContent"></div>
+      <div class="files"></div>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import request from "@/utils/request";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: false,
+      visible: false,
+      isDetail: false,
+      dataForm: {
+        id: "",
+        title: "",
+        bodyContent: "",
+        imgUrl: [],
+        categoryId: "cc225c68421644f79037aaf624ccccc0",
+        isType: "0",
+        communicationArea: [],
+        communicationOut: [],
+      },
+      rules: {
+        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        bodyContent: [
+          { required: true, message: "请输入内容", trigger: "blur" },
+        ],
+      },
+      areaOptions: [],
+      communicationOutOptions: [],
+    };
+  },
+  computed: {},
+  watch: {},
+  created() {
+    this.initAreaTypeList();
+    this.initCommunicationOutOptions();
+  },
+  mounted() {},
+  beforeDestroy() {},
+  methods: {
+    goBack() {
+      this.$emit("refresh");
     },
-    computed: {},
-    watch: {},
-    created() {
-     
+    init(id, isDetail) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+      this.isDetail = isDetail || false;
+      this.$nextTick(() => {
+        !this.dataForm.id && this.$refs["elForm"].resetFields();
+        if (this.dataForm.id) {
+          this.loading = true;
+          request({
+            url: `/SubDev/ZyOaArticle/${this.dataForm.id}`,
+            method: "GET",
+          }).then((res) => {
+            this.dataForm = res.data;
+            this.loading = false;
+          });
+        }
+      });
     },
-    mounted() {},
-    beforeDestroy() {
+    async initAreaTypeList() {
+      let list = this.$store.state.meta.area;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "area"));
+      this.areaOptions = list;
     },
-    methods: {
-
-      goBack() {
-        this.$emit("refresh");
-      },
-      init(id, isDetail) {
-        this.dataForm.id = id || 0;
-        this.visible = true;
-        this.isDetail = isDetail || false;
-        this.$nextTick(() => {
-            this.$refs["elForm"].resetFields();
-            if(this.dataForm.id) {
-                request({
-                  url: `/SubDev/ZyOaArticle/${this.dataForm.id}`,
-                  method: "GET",
-                }).then((res) => {
-                    this.dataForm = res.data;
-                    console.log(this.dataForm);
-                });
-            }
-        });
-      },
-      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)
-						}
-					})
-				})
-            }
-        })
-      },
+    async initCommunicationOutOptions() {
+      let list = this.$store.state.meta.externalAssistanceList;
+      !list &&
+        (list = await this.$store.dispatch(
+          "getTypeListByCode",
+          "externalAssistance"
+        ));
+      this.communicationOutOptions = list;
     },
-  };
-  </script>
-  <style lang="scss" scoped>
-  .msg-dialog {
-    :deep(.el-dialog__body) {
-      max-height: 50vh;
-      overflow-y: scroll;
-    }
+    // 全选
+    selectAreaAll(type) {
+      if (type == "area") {
+        this.dataForm.communicationArea = this.areaOptions.map(
+          (option) => option.id
+        );
+      } else {
+        this.dataForm.communicationOut = this.communicationOutOptions.map(
+          (option) => option.id
+        );
+      }
+    },
+    // 反选
+    closeAreaAll(type) {
+      if (type == "area") {
+        this.dataForm.communicationArea = this.areaOptions
+          .filter(
+            (option) => !this.dataForm.communicationArea.includes(option.id)
+          )
+          .map((option) => option.id);
+      } else {
+        this.dataForm.communicationOut = this.communicationOutOptions
+          .filter(
+            (option) => !this.dataForm.communicationOut.includes(option.id)
+          )
+          .map((option) => option.id);
+      }
+    },
+    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);
+              },
+            });
+          });
+        }
+      });
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.msg-dialog {
+  :deep(.el-dialog__body) {
+    max-height: 50vh;
+    overflow-y: scroll;
+  }
+}
+.msg-box {
+  .msg-title {
+    text-align: center;
+    font-size: 14px;
+    font-weight: 700;
+    line-height: 30px;
+    border-bottom: #e8e8e8 1px solid;
+    margin-bottom: 8px;
+    color: #000;
   }
-  </style>
-  
\ No newline at end of file
+}
+</style>
diff --git a/src/views/workFlow/components/FlowBox.vue b/src/views/workFlow/components/FlowBox.vue
index 3c71eeb..3083fc4 100644
--- a/src/views/workFlow/components/FlowBox.vue
+++ b/src/views/workFlow/components/FlowBox.vue
@@ -48,12 +48,12 @@
           <component :is="currentView" @close="goBack" ref="form" @eventReciver="eventReciver"
             @setLoad="setLoad" @setPageLoad="setPageLoad" />
         </el-tab-pane>
-        <el-tab-pane label="流程信息" v-loading="loading">
+        <!-- <el-tab-pane label="流程信息" v-loading="loading">
           <Process :conf="flowTemplateJson" v-if="flowTemplateJson.nodeId" />
         </el-tab-pane>
         <el-tab-pane label="流转记录" v-if="setting.opType!='-1'" v-loading="loading">
           <recordList :list='flowTaskOperatorRecordList' :endTime='endTime' />
-        </el-tab-pane>
+        </el-tab-pane> -->
       </el-tabs>
       <el-dialog :title="eventType==='audit'?'审批通过':'审批拒绝'" :close-on-click-modal="false"
         :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll append-to-body