diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index ec7d5ad..db07307 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -1,201 +1,288 @@
 <template>
-	<el-dialog title="判研建议" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
-		<el-row :gutter="15" class="" >
-			<el-col :span="24" class="form_title">
-				巡查上报详情
-			</el-col>
-			<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules" v-loading="loading">
-					<el-col :span="24" v-if="false" >
-						<el-form-item label="主键" prop="id">
-							<el-input v-model="dataForm.id" placeholder="--" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="平台名称" prop="platformName">
-							<el-input v-model="dataForm.platformName" placeholder="--" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="平台类型" prop="platformType">
-							<el-select v-model="dataForm.platformType" placeholder="--" clearable :style='{"width":"100%"}' >
-								<el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id" ></el-option>
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="问题类型" prop="questionType">
-							<el-radio-group v-model="dataForm.questionType" :style='{}' >
-								<el-radio v-for="(item, index) in questionTypeOptions" :key="index" :label="item.id"  >{{item.fullName || '--'}}</el-radio>
-							</el-radio-group>
-						</el-form-item>
-					</el-col>
-					<el-col :span="12">
-						<el-form-item label="问题分类" prop="questionClass">
-							<el-select v-model="dataForm.questionClass" 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-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="问题内容" prop="questionContent">
-							<el-input v-model="dataForm.questionContent" placeholder="--" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="有害链接" prop="link">
-							<el-input v-model="dataForm.link" placeholder="--" clearable :style='{"width":"100%"}' >
-							</el-input>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="取证内容" prop="obtainEvidence">
-							<NCC-UploadFz v-model="dataForm.obtainEvidence" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-							</NCC-UploadFz>
-						</el-form-item>
-					</el-col>
-					<el-col :span="24">
-						<el-form-item label="附件上传" prop="annex">
-							<NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" >
-							</NCC-UploadFz>
-						</el-form-item>
-					</el-col>
-			</el-form>
-			<el-col :span="24" class="form_title">
-				判研建议
-			</el-col>
-			<el-form ref="suggestionForm" :model="suggestionForm" size="small" label-width="100px" label-position="right">
-				<el-col :span="24">
-					<el-form-item :label="isSHILevel ? '处置要求' : '处置建议'" prop="disposalSuggestions">
-						<el-input v-model="suggestionForm.disposalSuggestions" placeholder="请输入处置建议" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
-						</el-input>
-					</el-form-item>
-				</el-col>
-				<el-col :span="24">
-					<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>
-		</el-row>
-		<span slot="footer" class="dialog-footer">
-			<el-button @click="visible = false">取 消</el-button>
-			<el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
-			<el-button type="info" @click="dataFormSubmit()" v-if="isSHILevel">存 档</el-button>
-		</span>
-	</el-dialog>
+  <el-dialog
+    title="判研建议"
+    :close-on-click-modal="false"
+    :visible.sync="visible"
+    class="NCC-dialog NCC-dialog_center"
+    lock-scroll
+    width="60%"
+	v-loading="loading"
+  >
+    <el-row :gutter="15" class="">
+      <el-col :span="10" style="border-right: 1px solid #e6e6e6;">
+        <el-row>
+          <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">问题来源</div>
+              {{ dataForm.source || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">平台名称</div>
+              {{ dataForm.platformName || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">平台类型</div>
+              {{ dataForm.platformType || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">问题类型</div>
+              {{ dataForm.questionType || "--" }}
+            </div>
+          </el-col>
+          <template v-if="dataForm.questionType == '错误表述'">
+            <el-col :span="24">
+              <div class="form-item">
+                <div class="label w-100">正确描述</div>
+                {{ dataForm.accurateDescription || "--" }}
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="form-item">
+                <div class="label w-100">错误描述</div>
+                {{ dataForm.incorrectDescription || "--" }}
+              </div>
+            </el-col>
+          </template>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">关键词</div>
+              {{ dataForm.questionClass || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">问题内容</div>
+              {{ dataForm.questionContent || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">有害链接</div>
+              {{ dataForm.link || "--" }}
+            </div>
+          </el-col>
+          <el-col :span="24">
+            <div class="form-item">
+              <div class="label w-100">取证内容</div>
+            </div>
+          </el-col>
+        </el-row>
+      </el-col>
+      <el-col :span="14">
+        <el-row>
+          <el-col :span="24" class="form_title"> 判研建议 </el-col>
+          <el-form
+            ref="suggestionForm"
+            :rules="rules"
+            :model="suggestionForm"
+            size="small"
+            label-width="100px"
+            label-position="right"
+          >
+            <el-col :span="24">
+              <el-form-item
+                :label="isSHILevel ? '处置要求' : '处置建议'"
+                prop="disposalSuggestions"
+              >
+                <el-input
+                  v-model="suggestionForm.disposalSuggestions"
+                  placeholder="请输入处置建议"
+                  show-word-limit
+                  :style="{ width: '100%' }"
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+				  maxlength="200"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="24">
+              <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-col :span="24">
+              <el-form-item label="研判类型" prop="judgmentClass">
+                <el-radio-group
+                  v-model="suggestionForm.judgmentClass"
+                  size="medium"
+				  @change="judgmentClassChange"
+                >
+                  <el-radio label="不采纳">不采纳</el-radio>
+                  <el-radio label="执法">执法</el-radio>
+                  <el-radio label="存档">存档</el-radio>
+                  <el-radio label="进一步处置">进一步处置</el-radio>
+                </el-radio-group>
+              </el-form-item>
+            </el-col>
+			<el-col :span="24" v-if="showSuggsetion">
+              <el-form-item
+                label="研判意见"
+                prop="judgmentOpinions"
+              >
+                <el-input
+                  v-model="suggestionForm.judgmentOpinions"
+                  placeholder="请输入研判意见"
+                  show-word-limit
+                  :style="{ width: '100%' }"
+                  type="textarea"
+                  :autosize="{ minRows: 4, maxRows: 4 }"
+				  maxlength="200"
+                >
+                </el-input>
+              </el-form-item>
+            </el-col>
+          </el-form>
+        </el-row>
+      </el-col>
+    </el-row>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
+    </span>
+  </el-dialog>
 </template>
 <script>
-	import request from '@/utils/request'
-	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
-	import { getDetail, disposalSuggestions } from '@/api/systemData/dataInterface'
-	export default {
-		components: {},
-		props: [],
-		data() {
-			return {
-				loading: true,
-				visible: false,
-				isDetail: true,
-				dataForm: {
-					id:undefined,
-					platformName:undefined,
-					platformType:undefined,
-					questionType:undefined,
-					questionClass:undefined,
-					questionContent:undefined,
-					link:undefined,
-					obtainEvidence:[],
-					annex:[],
-				},
-				rules: {
-				},
-				sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
-				platformTypeOptions : [],
-				questionTypeOptions : [],
-				questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
-				stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
+import request from "@/utils/request";
+import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
+import { getDetail, disposalSuggestions } from "@/api/systemData/dataInterface";
+export default {
+  components: {},
+  props: [],
+  data() {
+    return {
+      loading: true,
+      visible: false,
+      isDetail: true,
+      dataForm: {
+        id: undefined,
+        platformName: undefined,
+        platformType: undefined,
+        questionType: undefined,
+        questionClass: undefined,
+        questionContent: undefined,
+        link: undefined,
+        obtainEvidence: [],
+        annex: [],
+      },
+      sourceOptions: [
+        { fullName: "市网信办线索", id: "市网信办线索" },
+        { fullName: "自主巡查发现", id: "自主巡查发现" },
+      ],
+      platformTypeOptions: [],
+      questionTypeOptions: [],
+      questionClassOptions: [
+        { fullName: "选项一", id: "1" },
+        { fullName: "选项二", id: "2" },
+      ],
+      stageOptions: [
+        { fullName: "选项一", id: "1" },
+        { fullName: "选项二", id: "2" },
+      ],
 
-				suggestionForm: {
-					disposalSuggestions: "", //处置建议
-					judgmentOpinions: "", //判断意见
-					judgmentClass: "", //判断分类
-					deadline: '',
-				}
-			}
-		},
-		computed: {
-			isSHILevel() {
-    		  // 判断角色是否为‘市级办公室’
-    		  return this.$store.state.user.islader;
-    		},
-		},
-        watch: {},
-        created() {
-			this.getplatformTypeOptions();
-			this.getquestionTypeOptions();
-		},
-		mounted() {
-        },
-		methods: {
-			getplatformTypeOptions(){
-				getDictionaryDataSelector('576279943168656645').then(res => {
-					this.platformTypeOptions = res.data.list
-				});
-			},
-			getquestionTypeOptions(){
-				getDictionaryDataSelector('577006814432855301').then(res => {
-					this.questionTypeOptions = res.data.list
-				});
-			},
-			goBack() {
-                this.$emit('refresh')
+      suggestionForm: {
+        disposalSuggestions: "", //处置建议
+        judgmentOpinions: "", //判断意见
+        judgmentClass: "", //判断分类
+        deadline: "",
+        judgmentClass: "",
+      },
+      rules: {
+        judgmentClass: [
+          { required: true, message: "请选择审核类型", trigger: "change" },
+        ],
+      },
+	  showSuggsetion: false,
+    };
+  },
+  computed: {
+    isSHILevel() {
+      // 判断角色是否为‘市级办公室’
+      return this.$store.state.user.islader;
+    },
+  },
+  watch: {},
+  created() {
+    this.getplatformTypeOptions();
+    this.getquestionTypeOptions();
+  },
+  mounted() {},
+  methods: {
+    getplatformTypeOptions() {
+      getDictionaryDataSelector("576279943168656645").then((res) => {
+        this.platformTypeOptions = res.data.list;
+      });
+    },
+    getquestionTypeOptions() {
+      getDictionaryDataSelector("577006814432855301").then((res) => {
+        this.questionTypeOptions = res.data.list;
+      });
+    },
+    goBack() {
+      this.$emit("refresh");
+    },
+    init(id, isDetail) {
+      this.dataForm.id = id || 0;
+      this.visible = true;
+	  this.showSuggsetion = false;
+      this.$nextTick(async () => {
+        this.$refs["suggestionForm"].resetFields();
+        if (this.dataForm.id) {
+		  this.loading = true;
+          let res = await getDetail(this.dataForm.id);
+          this.dataForm = res.data;
+          this.loading = false;
+          if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
+          if (!this.dataForm.annex) this.dataForm.annex = [];
+        }
+      });
+    },
+	judgmentClassChange(v) {
+		this.showSuggsetion = Boolean(v == '进一步处置' || v == '不采纳')
+	},
+    dataFormSubmit() {
+      if (
+        !this.suggestionForm.disposalSuggestions &&
+        !this.suggestionForm.judgmentOpinions &&
+        !this.suggestionForm.judgmentClass
+      ) {
+        this.$message({
+          message: "判研建议不能为空！",
+          type: "danger",
+        });
+      }
+      this.$refs["suggestionForm"].validate(async (valid) => {
+        if (valid) {
+          let res = await disposalSuggestions(this.dataForm);
+          this.$message({
+            message: res.msg,
+            type: "success",
+            duration: 1000,
+            onClose: () => {
+              (this.visible = false), this.$emit("refresh", true);
             },
-			init(id, isDetail) {
-				this.dataForm.id = id || 0;
-                this.visible = true;
-				this.$nextTick(async () => {
-					this.$refs['elForm'].resetFields();
-					this.$refs['suggestionForm'].resetFields();
-					if (this.dataForm.id) {
-						let res = await getDetail(this.dataForm.id)
-						this.dataForm = res.data;
-						this.loading = false;
-						if(!this.dataForm.obtainEvidence)this.dataForm.obtainEvidence=[];
-						if(!this.dataForm.annex)this.dataForm.annex=[];
-					}
-				})
-			},
-			dataFormSubmit() {
-				if(!this.suggestionForm.disposalSuggestions && !this.suggestionForm.judgmentOpinions && !this.suggestionForm.judgmentClass) {
-					this.$message({
-						message: '判研建议不能为空！',
-						type: 'danger',
-					})
-				}
-				this.$refs['suggestionForm'].validate(async (valid) => {
-                    if (valid) {
-						let res = await disposalSuggestions(this.dataForm);
-						this.$message({
-							message: res.msg,
-							type: 'success',
-							duration: 1000,
-							onClose: () => {
-								this.visible = false, this.$emit('refresh', true)
-							}
-						})
-                    }
-                })
-			},
-		}
-	}
+          });
+        }
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-	.form_title {
-		line-height: 30px;
-		padding-left: 40px;
-		color: #409eff;
-	}
+.form_title {
+  line-height: 30px;
+  padding-left: 40px;
+  color: #409eff;
+}
 </style>
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 57f46fd..051e07f 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -29,9 +29,9 @@
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="问题来源" prop="platformName">
+          <el-form-item label="问题来源" prop="source">
             <el-input
-              v-model="dataForm.platformName"
+              v-model="dataForm.source"
               placeholder="请输入问题来源"
               clearable
               :style="{ width: '100%' }"
@@ -41,7 +41,21 @@
         </el-col>
         <el-col :span="23">
           <el-form-item label="平台名称" prop="platformName">
-            <SelsctLoad v-model="dataForm.platformName"/>
+            <el-select
+              v-model="dataForm.platformName"
+              filterable
+              remote
+              reserve-keyword
+              placeholder="请输入平台名称"
+              :remote-method="loadList"
+              :loading="name_loading">
+              <el-option
+                v-for="item in nameOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value">
+              </el-option>
+            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="23">
@@ -56,19 +70,54 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-
-        <el-col :span="23">
+        <el-col :span="13">
           <el-form-item label="问题类型" prop="questionType">
-            <el-radio-group v-model="dataForm.questionType" :style="{}">
+            <el-radio-group v-model="dataForm.questionType" @change="questionTypeChange">
               <el-radio
                 v-for="(item, index) in questionTypeOptions"
                 :key="index"
-                :label="item.id"
+                :label="item.fullName"
                 >{{ item.fullName }}</el-radio
               >
+              <el-radio label="其他">其他</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
+        <template v-if="otherQuestion">
+          <el-col :span="10">
+              <el-input
+                v-model="dataForm.otherQuestionType"
+                placeholder="请输入问题类型"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+          </el-col>
+        </template>
+        <template v-if="showErrflag">
+          <el-col :span="12">
+            <el-form-item label="正确描述" prop="accurateDescription">
+              <el-input
+                v-model="dataForm.accurateDescription"
+                placeholder="请输入正确描述"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="错误描述" prop="incorrectDescription">
+              <el-input
+                v-model="dataForm.incorrectDescription"
+                placeholder="请输入错误描述"
+                clearable
+                :style="{ width: '100%' }"
+              >
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </template>
         <el-col :span="23">
           <el-form-item label="关键词" prop="questionClass">
             <el-input
@@ -104,28 +153,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="12">
-          <el-form-item label="正确描述" prop="platformName">
-            <el-input
-              v-model="dataForm.platformName"
-              placeholder="请输入正确描述"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="11">
-          <el-form-item label="错误描述" prop="platformName">
-            <el-input
-              v-model="dataForm.platformName"
-              placeholder="请输入错误描述"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
-          </el-form-item>
-        </el-col>
+
         <el-col :span="23">
           <el-form-item label="取证内容" prop="obtainEvidence">
             <NCC-UploadFz
@@ -152,6 +180,7 @@
 import request from "@/utils/request";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import { getDetail, addForm, updataForm } from "@/api/systemData/dataInterface";
+import { getInfoList } from "@/api/baseData/info";
 export default {
   components: {},
   props: [],
@@ -159,18 +188,22 @@ export default {
     return {
       loading: false,
       visible: false,
+      name_loading: false,
       isDetail: false,
       dataForm: {
-        id: "",
         id: undefined,
+        source: undefined,
         platformName: undefined,
         platformType: undefined,
         questionType: undefined,
         questionClass: undefined,
         questionContent: undefined,
         link: undefined,
+        accurateDescription: undefined,
+        incorrectDescription: undefined,
         obtainEvidence: [],
         annex: [],
+        otherQuestionType: undefined
       },
       rules: {
         platformType: [
@@ -197,16 +230,39 @@ export default {
         { fullName: "选项一", id: "1" },
         { fullName: "选项二", id: "2" },
       ],
+      showErrflag: false,
+      otherQuestion: false,
+      nameOptions: [],
     };
   },
   computed: {},
   watch: {},
   created() {
+    this.loadList();
     this.getplatformTypeOptions();
     this.getquestionTypeOptions();
   },
   mounted() {},
   methods: {
+    loadList(query) {
+      this.name_loading = true;
+      getInfoList({pageIndex: 1, pageSize: 100, keyword: query }).then(({ data }) => {
+        let list = [];
+        data.list.length &&
+          data.list.forEach((item) => {
+            list.push({
+              label: item.SysytemInfo.SystemName,
+              value: item.SysytemInfo.Id,
+            });
+          });
+        this.nameOptions = list;
+        this.name_loading = false;
+      });
+    },
+    questionTypeChange(v) {
+      this.showErrflag = Boolean(v == '错误表述');
+      this.otherQuestion = Boolean(v == '其他');
+    },
     async getplatformTypeOptions() {
       let list = this.$store.state.meta.system;
       !list &&
@@ -224,20 +280,37 @@ export default {
     init(id, isDetail) {
       this.dataForm.id = id || 0;
       this.visible = true;
+      this.otherQuestion = false;
+      this.showErrflag = false;
       this.isDetail = isDetail || false;
       this.$nextTick(async () => {
         this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
           let res = await getDetail(this.dataForm.id);
           this.dataForm = res.data;
+          if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) {
+            this.dataForm.otherQuestionType = res.data.questionType;
+            this.dataForm.questionType = '其他';
+          }
           if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
           if (!this.dataForm.annex) this.dataForm.annex = [];
+          this.$nextTick(() => {
+            this.questionTypeChange(this.dataForm.questionType);
+          })
         }
       });
     },
+    getQuestionTypeName() {
+      if(this.dataForm.questionType == '其他') {
+        return this.dataForm.otherQuestionType;
+      } else {
+        return this.dataForm.questionType;
+      }
+    },
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
+          this.dataForm.questionType = this.getQuestionTypeName();
           let res = !this.dataForm.id
             ? await addForm(this.dataForm)
             : await updataForm(this.dataForm);
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index c344ef9..3fb556d 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -1,6 +1,6 @@
 <template>
 	 <div class="SystemInfo item-box common-info-box">
-    <div class="item-title">巡查上报</div>
+    <div class="item-title">{{isSHILevel ? '线索录入' : '巡查上报'}}</div>
     <div class="item-body">
 		<div class="NCC-common-layout">
 		<div class="NCC-common-layout-center">
@@ -131,7 +131,12 @@
 				stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
 			}
         },
-		computed: {},
+		computed: {
+            isSHILevel() {
+              // 判断角色是否为‘市级办公室’
+              return this.$store.state.user.islader;
+            },
+        },
 		created() {
 			this.initData()
 			this.getplatformTypeOptions();
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 630b30d..638dfa2 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -59,39 +59,7 @@
             </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-col :span="23" v-if="ncc.hasFormP('communicationArea')">
           <el-form-item label="传达区域" prop="communicationArea">
             <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
               <el-checkbox
@@ -107,7 +75,7 @@
             </div>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('communicationOut') && dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('communicationOut')">
           <el-form-item label="传达外协" prop="communicationOut">
             <el-checkbox-group v-model="dataForm.communicationOut" :style="{}">
               <el-checkbox
@@ -177,8 +145,6 @@ export default {
         title: undefined,
         content: undefined,
         releaseTime: undefined,
-        recordCommunicationOut: [],
-        recordCommunicationArea: [],
         annex: [],
         communicationArea: [],
         communicationOut: [],
@@ -319,12 +285,12 @@ export default {
         if (valid) {
           this.btnLoading = true;
           if (!this.dataForm.id) {
-            let {title, content} = this.dataForm;
+            let {title, content, annex, communicationArea, communicationOut} = this.dataForm;
             // 新增
             request({
               url: `/Extend/BaseSpecialAction`,
               method: "post",
-              data: { title, content },
+              data: { title, content, annex, communicationArea, communicationOut },
             }).then((res) => {
               this.$message({
                 message: res.msg,
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 253eadb..9f5495f 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -103,10 +103,10 @@ export default {
       communicationOutOptions: [],
     };
   },
-  created() {
-    this.initAreaTypeList();
-    this.initCommunicationOutOptions();
-    this.initData()
+  async created() {
+    await this.initAreaTypeList();
+    await this.initCommunicationOutOptions();
+    this.initData();
   },
   computed: {
 		isSHILevel() {
diff --git a/src/views/baseSpecialAction/infoForm.vue b/src/views/baseSpecialAction/infoForm.vue
index ebae4ac..6ebc416 100644
--- a/src/views/baseSpecialAction/infoForm.vue
+++ b/src/views/baseSpecialAction/infoForm.vue
@@ -23,7 +23,16 @@
             <el-table :data="tableData" style="width: 100%" v-loading="loading" stripe>
               <el-table-column type="index" width="50" />
               <el-table-column prop="originName" label="部门名称" />
-              <el-table-column prop="state" label="状态" />
+              <el-table-column prop="state" label="状态" >
+                <template slot-scope="scope">
+                  <el-tag :type="scope.row.state == '已填写' ? 'success' : 'warning'">{{scope.row.state}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column label="操作" fixed="right" width="80" >
+                <template slot-scope="scope">
+                  <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已填写'">详情</el-button>
+                </template>
+              </el-table-column>
             </el-table>
             <pagination :total="total" :page.sync="listQuery.currentPage" :limit.sync="listQuery.pageSize" @pagination="initList"/>
         </el-col>
@@ -83,6 +92,9 @@ export default {
           });
         }
     },
+    toDetail(row) {
+
+    }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index 9c9e272..6826936 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -43,8 +43,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="传达区域" prop="communicationArea">
-            <el-checkbox-group v-model="dataForm.communicationArea" :style="{}">
+          <el-form-item label="传达区域" prop="communicationAreas">
+            <el-checkbox-group v-model="dataForm.communicationAreas" :style="{}">
               <el-checkbox
                 v-for="(item, index) in areaOptions"
                 :key="index"
@@ -63,8 +63,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="传达外协" prop="communicationOut">
-            <el-checkbox-group v-model="dataForm.communicationOut" :style="{}">
+          <el-form-item label="传达外协" prop="communicationOuts">
+            <el-checkbox-group v-model="dataForm.communicationOuts" :style="{}">
               <el-checkbox
                 v-for="(item, index) in communicationOutOptions"
                 :key="index"
@@ -116,8 +116,8 @@ export default {
         imgUrl: [],
         categoryId: "cc225c68421644f79037aaf624ccccc0",
         isType: "0",
-        communicationArea: [],
-        communicationOut: [],
+        communicationAreas: [],
+        communicationOuts: [],
       },
       rules: {
         title: [{ required: true, message: "请输入标题", trigger: "blur" }],
@@ -176,11 +176,11 @@ export default {
     // 全选
     selectAreaAll(type) {
       if (type == "area") {
-        this.dataForm.communicationArea = this.areaOptions.map(
+        this.dataForm.communicationAreas = this.areaOptions.map(
           (option) => option.id
         );
       } else {
-        this.dataForm.communicationOut = this.communicationOutOptions.map(
+        this.dataForm.communicationOuts = this.communicationOutOptions.map(
           (option) => option.id
         );
       }
@@ -188,15 +188,15 @@ export default {
     // 反选
     closeAreaAll(type) {
       if (type == "area") {
-        this.dataForm.communicationArea = this.areaOptions
+        this.dataForm.communicationAreas = this.areaOptions
           .filter(
-            (option) => !this.dataForm.communicationArea.includes(option.id)
+            (option) => !this.dataForm.communicationAreas.includes(option.id)
           )
           .map((option) => option.id);
       } else {
-        this.dataForm.communicationOut = this.communicationOutOptions
+        this.dataForm.communicationOuts = this.communicationOutOptions
           .filter(
-            (option) => !this.dataForm.communicationOut.includes(option.id)
+            (option) => !this.dataForm.communicationOuts.includes(option.id)
           )
           .map((option) => option.id);
       }