From ff36c85d27e37589b090d748dec6edbf61aac3b8 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Thu, 22 Aug 2024 17:10:11 +0800
Subject: [PATCH] 1

---
 src/store/modules/meta.js                       |  12 ++++++++++--
 src/utils/ncc.js                                |   6 +++++-
 src/views/DisposalSuggestions/Form.vue          |  10 +++++-----
 src/views/DisposalSuggestions/index.vue         |   6 +++---
 src/views/Login.vue                             |   4 ++--
 src/views/baseCaseHandling/Form.vue             |   2 +-
 src/views/baseCaseHandling/index.vue            |  56 +++++++++++++++-----------------------------------------
 src/views/baseInspectionReport/Form.vue         | 270 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/baseInspectionReport/index.vue        |  15 +++++++--------
 src/views/baseListHazardousSamples/index.vue    |  85 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------
 src/views/basePrincipalResponsibility/Form.vue  |  66 +++++++++++++++++++++++++++++++++++++++++++++++++-----------------
 src/views/basePrincipalResponsibility/index.vue |  96 ++++++++++++++++--------------------------------------------------------------------------------
 src/views/baseSpecialAction/Form.vue            | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------------
 src/views/baseSpecialAction/index.vue           |  29 ++++++++++++++++++-----------
 src/views/overView/Overview.vue                 |   8 ++++++--
 15 files changed, 394 insertions(+), 451 deletions(-)

diff --git a/src/store/modules/meta.js b/src/store/modules/meta.js
index b7b16f6..8cc34ea 100644
--- a/src/store/modules/meta.js
+++ b/src/store/modules/meta.js
@@ -70,8 +70,16 @@ const meta = {
                         break;
                     case 'stateType':
                         getState().then(res => {
-                            console.log(res.data, 'list');
-                            
+                            let tagType = [
+                                { name: '1', type: 'danger' }, // 未上报
+                                { name: '2', type: 'danger' }, // 未下发
+                                { name: '3', type: 'warning' }, // 待处理
+                                { name: '4', type: 'success' }, // 已处理
+                                { name: '5', type: 'info' }, // 仅保存
+                            ];
+                            res.data.forEach(v => {
+                                v.tagType = tagType.find(item => v.EnCode == item.name).type || '';
+                            });
                             commit('SET_STATETYPE_LIST', res.data)
                             resolve(res.data)
                         }).catch(error => { reject(error) })
diff --git a/src/utils/ncc.js b/src/utils/ncc.js
index 86b6f7e..1a20521 100644
--- a/src/utils/ncc.js
+++ b/src/utils/ncc.js
@@ -248,6 +248,10 @@ const ncc = {
       return ''
     }
   },
+  getStateTagType(val, list) {
+    if(!list.length || !val) return '';
+    return list.find(v => v.Id == val).tagType || '';
+  },
   storageSet(obj) {
     for (let i in obj) {
       cacheItem(i, obj[i])
@@ -352,6 +356,6 @@ const ncc = {
     const hasPermission = btnList.some(btn => btn.enCode === enCode)
     if (hasPermission) return true
     return false
-  }
+  },
 }
 export default ncc
\ No newline at end of file
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index 894f2ad..bc1945f 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="判研建议"
+    title="研判建议"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
@@ -20,13 +20,13 @@
           </el-col>
           <el-col :span="24">
             <div class="form-item">
-              <div class="label w-100">平台名称</div>
+              <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>
+              <div class="label w-100">系统类型</div>
               {{ dataForm.platformType || "--" }}
             </div>
           </el-col>
@@ -77,7 +77,7 @@
       </el-col>
       <el-col :span="14">
         <el-row>
-          <el-col :span="24" class="form_title"> 判研建议 </el-col>
+          <el-col :span="24" class="form_title"> 研判建议 </el-col>
           <el-form
             ref="suggestionForm"
             :rules="rules"
@@ -265,7 +265,7 @@ export default {
         !this.suggestionForm.reviewType
       ) {
         this.$message({
-          message: "判研建议不能为空！",
+          message: "研判建议不能为空！",
           type: "danger",
         });
       }
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 3db01e6..50e255b 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -37,8 +37,8 @@
            </el-row>
            <div class="NCC-common-layout-main NCC-flex-main">
                <NCC-table v-loading="listLoading" :data="list">
-                   <el-table-column show-overflow-tooltip prop="platformName" label="平台名称" align="left" />
-                   <el-table-column show-overflow-tooltip label="平台类型" prop="platformType" align="left">
+                   <el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
+                   <el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
                            <template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
                    </el-table-column>
                    <el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left">
@@ -57,7 +57,7 @@
                    </el-table-column> -->
                    <el-table-column label="操作" fixed="right" width="100">
                         <template slot-scope="scope">
-                           <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >判研</el-button>
+                           <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >研判</el-button>
                        </template>
                    </el-table-column>
                </NCC-table>
diff --git a/src/views/Login.vue b/src/views/Login.vue
index 4ecf0b6..1a77849 100644
--- a/src/views/Login.vue
+++ b/src/views/Login.vue
@@ -56,8 +56,8 @@ export default {
   data() {
     return {
       form: {
-        account: "", // cdoffice
-        password: "", // 123456
+        account: "wd", // cdoffice
+        password: "123456", // 123456
       },
       rules: {
         account: { required: true, message: "用户名不能为空", trigger: "blur" },
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index c047866..c510b71 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -45,7 +45,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="24">
-          <el-form-item label="注册主体" prop="registeredEntity">
+          <el-form-item label="主体企业" prop="registeredEntity">
             <el-input v-model="dataForm.registeredEntity" placeholder="选择系统自动带出" clearable disabled/>
           </el-form-item>
         </el-col>
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index 6479781..05badf9 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -8,14 +8,10 @@
             <el-form @submit.native.prevent size="mini">
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-input
-                    v-model="query.number"
-                    placeholder="档案号"
-                    clearable
-                  />
+                  <el-input v-model="query.number" placeholder="请输入档案号" clearable/>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <!-- <el-col :span="4">
                 <el-form-item label="">
                   <el-date-picker
                     v-model="query.registrationTime"
@@ -27,23 +23,15 @@
                   >
                   </el-date-picker>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-input
-                    v-model="query.systemName"
-                    placeholder="网站/APP名称"
-                    clearable
-                  />
+                  <el-input v-model="query.systemName" placeholder="请输入系统名称" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-select
-                    v-model="query.category"
-                    placeholder="类别"
-                    clearable
-                  >
+                  <el-select v-model="query.category" placeholder="系统类别" clearable>
                     <el-option
                       v-for="(item, index) in systemTypeOptions"
                       :key="index"
@@ -55,28 +43,15 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="search()"
-                    >查询</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-search" @click="search()" >查询</el-button>
                 </el-form-item>
+                <div class="NCC-common-search-box-right">
+                  <el-button type="success" icon="el-icon-plus" size="mini" @click="addOrUpdateHandle()">新增</el-button>
+                </div>
               </el-col>
             </el-form>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
-            <div class="NCC-common-head">
-              <div>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  size="mini"
-                  @click="addOrUpdateHandle()"
-                  >新增</el-button
-                >
-              </div>
-            </div>
             <NCC-table
               v-loading="listLoading"
               :data="list"
@@ -85,8 +60,8 @@
               <!-- <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 prop="systemName" label="系统名称" 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 | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
@@ -98,7 +73,9 @@
               <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" >
-                <template slot-scope="scope">{{ scope.row.state | dynamicTextUP(stateOptions) }}</template>
+                <template slot-scope="scope">
+                  <el-tag :type="ncc.getStateTagType(scope.row.state, stateOptions)">{{ scope.row.state | dynamicTextUP(stateOptions) }}</el-tag>
+                </template>
               </el-table-column>
               <el-table-column label="操作" fixed="right" width="180">
                 <template slot-scope="scope">
@@ -172,10 +149,7 @@ export default {
         { fullName: "选项一", id: "选项一" },
         { fullName: "", id: "选项二" },
       ],
-      stateOptions: [
-        { fullName: "选项一", id: "1" },
-        { fullName: "选项二", id: "2" },
-      ],
+      stateOptions: [],
       areaOptions: [],
     };
   },
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index b744255..8057822 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -3,9 +3,9 @@
     :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible"
-    class="NCC-dialog NCC-dialog_center"
+    class="NCC-dialog NCC-dialog_center baseInspectionReportForm"
     lock-scroll
-    width="60%"
+    width="50%"
   >
     <el-row :gutter="15" class="NCC-dialog-content">
       <el-form
@@ -19,161 +19,93 @@
       >
         <el-col :span="23" v-if="false">
           <el-form-item label="主键" prop="id">
-            <el-input
-              v-model="dataForm.id"
-              placeholder="请输入"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+            <el-input v-model="dataForm.id" placeholder="请输入" clearable :style="{ width: '100%' }"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="23">
           <el-form-item label="问题来源" prop="source">
             <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 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">
-          <el-form-item label="平台名称" prop="platformName">
+          <el-form-item label="系统名称" prop="platformName">
             <el-select
+              ref="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>
+              placeholder="请输入系统名称"
+              @blur.native.capture="selectBlur"
+              @visible-change="visibleNameChange"
+              @change="(val) => platformNameChange(val, 'change')"
+              :loading="name_loading"
+              :disabled="!!this.dataForm.id">
+              <el-option v-for="item in nameOptions" :key="item.id" :label="item.systemName" :value="item.id"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="平台类型" prop="platformType">
-            <el-radio-group v-model="dataForm.platformType" :style="{}">
-              <el-radio
-                v-for="(item, index) in platformTypeOptions"
-                :key="index"
-                :label="item.Id"
-                >{{ item.FullName }}</el-radio
-              >
+          <el-form-item label="系统类型" prop="platformType">
+            <el-radio-group v-model="dataForm.platformType" :disabled='isDisabledTypeByName || !!this.dataForm.id'>
+              <el-radio v-for="(item, index) in platformTypeOptions" :key="index" :label="item.Id">{{ item.FullName }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="18">
+        <el-col :span="23" v-show="dataForm.platformType == '580634746028033285' && !isDisabledTypeByName">
+          <el-form-item label="归属平台" prop="selfMediaPlatformType">
+            <el-input v-model="dataForm.selfMediaPlatformType" placeholder="请输入归属平台" clearable :style="{ width: '100%' }" :disabled="!!this.dataForm.id"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="23">
           <el-form-item label="问题类型" prop="questionType">
-            <el-radio-group v-model="dataForm.questionType" @change="questionTypeChange">
-              <el-radio
-                v-for="(item, index) in questionTypeOptions"
-                :key="index"
-                :label="item.fullName"
-                >{{ item.fullName }}</el-radio
-              >
-              <el-radio label="其他">其他</el-radio>
+            <el-radio-group v-model="dataForm.questionType">
+              <el-radio v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" >{{ item.fullName }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <template v-if="otherQuestion">
-          <el-col :span="5">
-              <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" v-show="dataForm.questionType == '其他'">
+          <el-form-item label="其他问题类型" prop="otherQuestionType">
+            <el-input v-model="dataForm.otherQuestionType" placeholder="请输入其他问题类型" clearable :style="{ width: '100%' }" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="23" v-show="dataForm.questionType == '错误表述'">
+          <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="23" v-show="dataForm.questionType == '错误表述'">
+          <el-form-item label="错误描述" prop="incorrectDescription">
+            <el-input v-model="dataForm.incorrectDescription" placeholder="请输入错误描述" clearable :style="{ width: '100%' }"></el-input>
+          </el-form-item>
+        </el-col>
         <el-col :span="23">
           <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-input v-model="dataForm.questionContent" placeholder="请输入" show-word-limit :style="{ width: '100%' }" type="textarea" :autosize="{ minRows: 4, maxRows: 4 }" />
           </el-form-item>
         </el-col>
         <el-col :span="23">
-          <el-form-item label="有害链接" prop="link">
-            <el-input
-              v-model="dataForm.link"
-              placeholder="请输入"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+          <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="23">
           <el-form-item label="关键词" prop="questionClass">
-            <el-input
-              v-model="dataForm.questionClass"
-              placeholder="请输入关键词"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+            <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"
-              sizeUnit="MB"
-              :limit="9"
-              buttonText="点击上传"
-            >
-            </NCC-UploadFz>
+            <NCC-UploadFz v-model="dataForm.obtainEvidence" :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
-      >
+      <el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -194,7 +126,8 @@ export default {
       dataForm: {
         id: undefined,
         source: undefined,
-        platformName: undefined,
+        platformName: '',
+        selfMediaPlatformType: '',
         platformType: undefined,
         questionType: undefined,
         questionClass: undefined,
@@ -207,33 +140,32 @@ export default {
         otherQuestionType: undefined
       },
       rules: {
+        platformName: [
+          { required: true, message: "请选择系统名称", trigger: "blur" },
+        ],
         platformType: [
-          { required: true, message: "请选择平台类型", trigger: "change" },
+          { required: true, message: "请选择系统类型", trigger: "blur" },
         ],
         questionType: [
-          { required: true, message: "请选择问题类型", trigger: "change" },
+          { required: true, message: "请选择问题类型", trigger: "blur" },
         ],
+        // otherQuestionType: [
+        //   { required: true, message: "请输入其他问题类型", trigger: "blur" },
+        // ],
       },
-      sourceOptions: [
-        { fullName: "市网信办线索", id: "市网信办线索" },
-        { fullName: "自主巡查发现", id: "自主巡查发现" },
-      ],
+      sourceOptions: [],
       platformTypeOptions: [],
       questionTypeOptions: [],
-      questionClassOptions: [
-        { fullName: "选项一", id: "1" },
-        { fullName: "选项二", id: "2" },
-      ],
-      stageOptions: [
-        { fullName: "选项一", id: "1" },
-        { fullName: "选项二", id: "2" },
-      ],
-      showErrflag: false,
-      otherQuestion: false,
       nameOptions: [],
     };
   },
-  computed: {},
+  computed: {
+    isDisabledTypeByName() {
+      if(!this.nameOptions.length) return false;
+      let index = this.nameOptions.findIndex(v => v.id == this.dataForm.platformName);
+      return index != -1;
+    }
+  },
   watch: {},
   created() {
     this.loadList();
@@ -243,29 +175,36 @@ export default {
   },
   mounted() {},
   methods: {
-    loadList(query) {
+    selectBlur(e) {
+      let value = e.target.value;
+      if(!value) return;
+      this.dataForm.platformName = e.target.value;
+      this.platformNameChange(value, 'blur');
+    },
+    platformNameChange(val, type) {
+      let obj = this.nameOptions.find(v => type == 'blur' ? val == v.fullName : val == v.id);
+      this.dataForm.platformName = obj ? obj.id : val;
+      this.dataForm.platformType = obj ? obj.systemType : '';
+      this.dataForm.selfMediaPlatformType = obj ? obj.platform : '';
+    },
+    visibleNameChange(val) {
+      if (val) return
+      let input = this.$refs.select.$children[0].$refs.input;
+      input.blur();
+    },
+    loadList() {
       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;
+      request({
+        url: `/Extend/basesysteminfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.nameOptions = data;
         this.name_loading = false;
-      });
-    },
-    questionTypeChange(v) {
-      this.showErrflag = Boolean(v == '错误表述');
-      this.otherQuestion = Boolean(v == '其他');
+      })
     },
     async getplatformTypeOptions() {
       let list = this.$store.state.meta.system;
-      !list &&
-        (list = await this.$store.dispatch("getTypeListByCode", "system"));
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
       this.platformTypeOptions = list;
     },
     async getSourceOptions() {
@@ -278,17 +217,15 @@ export default {
     },
     getquestionTypeOptions() {
       getDictionaryDataSelector("577006814432855301").then((res) => {
-        this.questionTypeOptions = res.data.list;
+        this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
       });
     },
     goBack() {
       this.$emit("refresh");
     },
     init(id, isDetail) {
-      this.dataForm.id = id || 0;
+      this.dataForm.id = id || '';
       this.visible = true;
-      this.otherQuestion = false;
-      this.showErrflag = false;
       this.isDetail = isDetail || false;
       this.$nextTick(async () => {
         this.$refs["elForm"].resetFields();
@@ -299,28 +236,20 @@ export default {
             this.dataForm.otherQuestionType = res.data.questionType;
             this.dataForm.questionType = '其他';
           }
+          this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--';
           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);
+          let obj = {
+            ...this.dataForm,
+            questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
+          }
+          let res = !this.dataForm.id ? await addForm(obj) : await updataForm(obj);
           this.$message({
             message: res.msg,
             type: "success",
@@ -335,3 +264,10 @@ export default {
   },
 };
 </script>
+<style lang="scss" scoped>
+.baseInspectionReportForm {
+  :deep(.el-radio) {
+    margin: 0 30px 8px 0;
+  }
+}
+</style>
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 6f7f5e1..1a53953 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -28,23 +28,22 @@
 							<el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
 						</el-form-item>
 					</el-col>
+                    <div class="NCC-common-search-box-right">
+                      <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
+                      <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button> -->
+                    </div>
 				</el-form>
 			</el-row>
 			<div class="NCC-common-layout-main NCC-flex-main">
-				<div class="NCC-common-head">
-					<div>
-						<el-button type="primary" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini">新增</el-button>
-					</div>
-				</div>
                 <NCC-table v-loading="listLoading" :data="list">
-					<el-table-column show-overflow-tooltip prop="platformName" label="平台名称" align="left" />
-					<el-table-column show-overflow-tooltip label="平台类型" prop="platformType" align="left">
+					<el-table-column show-overflow-tooltip prop="platformName" label="系统名称" align="left" />
+					<el-table-column show-overflow-tooltip label="系统类型" prop="platformType" align="left">
 							<template slot-scope="scope">{{ scope.row.platformType | dynamicTextUP(systemTypeOptions) }}</template>
 					</el-table-column>
 					<el-table-column show-overflow-tooltip label="问题类型" prop="questionType" align="left">
 							<template slot-scope="scope">{{ scope.row.questionType | dynamicText(questionTypeOptions) }}</template>
 					</el-table-column>
-					<el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" />
+					<!-- <el-table-column show-overflow-tooltip prop="link" label="有害链接" align="left" /> -->
 					<el-table-column show-overflow-tooltip prop="questionClass" label="关键词" align="left" />
 					<!-- <el-table-column show-overflow-tooltip prop="department" label="部门" align="left" /> -->
 					<!-- <el-table-column show-overflow-tooltip label="问题分类" prop="questionClass" align="left">
diff --git a/src/views/baseListHazardousSamples/index.vue b/src/views/baseListHazardousSamples/index.vue
index 2c24acc..43112d7 100644
--- a/src/views/baseListHazardousSamples/index.vue
+++ b/src/views/baseListHazardousSamples/index.vue
@@ -6,7 +6,7 @@
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="16">
             <el-form @submit.native.prevent size="mini">
-              <el-col :span="4">
+              <!-- <el-col :span="4">
                 <el-form-item label="">
                   <el-date-picker
                     v-model="query.inputTime"
@@ -18,15 +18,15 @@
                   >
                   </el-date-picker>
                 </el-form-item>
-              </el-col>
-              <el-col :span="4">
+              </el-col> -->
+              <el-col :span="6">
                 <el-form-item label="">
-                  <el-input v-model="query.content" placeholder="具体内容" />
+                  <el-input v-model="query.content" placeholder="请输入具体内容" />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-select v-model="query.level" placeholder="级别" clearable>
+                  <el-select v-model="query.harmfulInformationTypes" placeholder="请选择有害类型" clearable>
                     <el-option
                       v-for="(item, index) in levelOptions"
                       :key="index"
@@ -40,7 +40,7 @@
                 <el-form-item label="">
                   <el-select
                     v-model="query.company"
-                    placeholder="涉及的企业"
+                    placeholder="请选择主体企业"
                     clearable
                   >
                     <el-option
@@ -56,7 +56,7 @@
                 <el-form-item label="">
                   <el-select
                     v-model="query.websitePlatform"
-                    placeholder="网站平台"
+                    placeholder="请选择系统"
                     clearable
                   >
                     <el-option
@@ -70,30 +70,29 @@
               </el-col>
               <el-col :span="3">
                 <el-form-item>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="search()"
-                    >查询</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                 </el-form-item>
+                <div class="NCC-common-search-box-right">
+                  <el-button type="primary" icon="el-icon-download" size="mini" @click="toExport" :loading="exportBtnLoading">导出</el-button>
+                </div>
               </el-col>
             </el-form>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
             <NCC-table v-loading="listLoading" :data="list">
-              <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
+              <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="inputTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip/>
-              <el-table-column prop="content" label="具体内容" align="left" show-overflow-tooltip/>
-              <el-table-column label="有害信息类型" prop="harmfulInformationTypes" align="left" show-overflow-tooltip />
-              <el-table-column label="涉及的企业" prop="companyStr" align="left" show-overflow-tooltip/>
-              <el-table-column label="网站平台" prop="websitePlatform" align="left" show-overflow-tooltip>
-                <template slot-scope="scope">{{ scope.row.websitePlatform | dynamicText(websitePlatformOptions) }}</template>
-              </el-table-column>
-              <el-table-column prop="creatorUserId" label="创建用户" show-overflow-tooltip align="left"/>
-              <el-table-column prop="creatorTime" label="创建时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/>
-              <el-table-column prop="lastModifyUserId" label="修改用户" align="left" show-overflow-tooltip/>
-              <el-table-column prop="lastModifyTime" label="修改时间" :formatter="ncc.tableDateFormat" show-overflow-tooltip align="left"/>
+              <el-table-column label="运营主体" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="网站平台" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="来源" prop="harmfulInformationTypes" align="left" show-overflow-tooltip />
+              <el-table-column label="问题类型" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="问题内容" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="违法原因" prop="websitePlatformStr" align="left" show-overflow-tooltip />
+              <el-table-column label="处罚内容" prop="content" align="left" show-overflow-tooltip/>
+              <!-- <el-table-column prop="creatorUserId" label="创建用户" show-overflow-tooltip align="left"/> -->
+              <!-- <el-table-column prop="creatorTime" label="创建时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/> -->
+              <!-- <el-table-column prop="lastModifyUserId" label="修改用户" align="left" show-overflow-tooltip/> -->
+              <!-- <el-table-column prop="lastModifyTime" label="修改时间" :formatter="ncc.tableDateFormat" show-overflow-tooltip align="left"/> -->
               <!-- <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
                   <el-button type="text" @click="addOrUpdateHandle(scope.row, ture)">详情</el-button>
@@ -132,7 +131,7 @@ export default {
       query: {
         inputTime: undefined,
         content: undefined,
-        level: undefined,
+        harmfulInformationTypes: undefined, // 有害类型
         company: undefined,
         websitePlatform: undefined,
       },
@@ -164,11 +163,14 @@ export default {
       ],
       harmfulInformationTypesOptions: [],
       levelOptions: [
-        { fullName: "选项一", id: "1" },
-        { fullName: "选项二", id: "2" },
+        { fullName: "巡查上报", id: "巡查上报" },
+        { fullName: "案件处理", id: "案件处理" },
       ],
       companyOptions: [],
       websitePlatformOptions: [],
+
+      // 导出
+      exportBtnLoading: false,
     };
   },
   computed: {},
@@ -176,7 +178,7 @@ export default {
     this.initData();
     this.getharmfulInformationTypesOptions();
     this.getcompanyOptions();
-    this.getwebsitePlatformOptions();
+    // this.getwebsitePlatformOptions();
   },
   methods: {
     getharmfulInformationTypesOptions() {
@@ -218,6 +220,33 @@ export default {
         this.listLoading = false;
       });
     },
+    // 导出
+    toExport() {
+      let _query = {
+        ...this.query,
+      };
+      let query = {};
+      for (let key in _query) {
+        if (Array.isArray(_query[key])) {
+          query[key] = _query[key].join();
+        } else {
+          query[key] = _query[key];
+        }
+      }
+      this.exportBtnLoading = true;
+      request({
+        url: `/extend/BaseListHazardousSamples/Actions/Export`,
+        method: "POST",
+        data: query,
+      }).then((res) => {
+        const url = process.env.VUE_APP_BASE_API + res.data.url;
+        const link = document.createElement("a");
+        link.href = url;
+        link.download = res.data.name;
+        link.click();
+        this.exportBtnLoading = false;
+      }).catch(() => this.exportBtnLoading = false);
+    },
     handleDel(id) {
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         type: "warning",
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index 5f86032..61e16ab 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -1,7 +1,7 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="50%">
+	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%" v-loading="dialogLoading">
 		<el-row :gutter="15" class="NCC-dialog-content" >
-				<el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :disabled="!!isDetail" :rules="rules">
+				<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 :style='{"width":"100%"}' >
@@ -10,17 +10,21 @@
 					</el-col>
 					<el-col :span="24" v-if="ncc.hasFormP('fileName')">
 						<el-form-item label="文件名" prop="fileName">
-							<el-input v-model="dataForm.fileName" placeholder="请输入" clearable :style='{"width":"100%"}' >
-							</el-input>
+							<el-input v-model="dataForm.fileName" placeholder="请输入文件名" clearable :style='{"width":"100%"}' />
 						</el-form-item>
 					</el-col>
 					<el-col :span="24" v-if="ncc.hasFormP('fileType')">
 						<el-form-item label="文件类型" prop="fileType">
-							<el-radio-group v-model="dataForm.fileType" :style='{}' >
+							<el-radio-group v-model="dataForm.fileType">
 								<el-radio v-for="(item, index) in fileTypeOptions" :key="index" :label="item.id"  >{{item.fullName}}</el-radio>
 							</el-radio-group>
 						</el-form-item>
 					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('otherFileType')" v-show="dataForm.fileType == '0'">
+						<el-form-item label="其他文件类型" prop="otherFileType">
+							<el-input v-model="dataForm.otherFileType" placeholder="请输入其他文件类型" clearable :style='{"width":"100%"}' />
+						</el-form-item>
+					</el-col>
 					<el-col :span="24" v-if="ncc.hasFormP('timeTakingEffect')">
 						<el-form-item label="生效时间" prop="timeTakingEffect">
 							<el-date-picker v-model="dataForm.timeTakingEffect" placeholder="请选择" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
@@ -79,10 +83,18 @@
 		components: {},
 		props: [],
 		data() {
+			var validateOtherFileType = (rule, value, callback) => {
+				if (this.dataForm.fileType == '0' &&  !value) {
+        		  callback(new Error('请输入其他文件类型'));
+        		} else {
+				  callback();
+				}
+			}
 			return {
 				loading: false,
 				visible: false,
 				isDetail: false,
+                dialogLoading: false,
 				dataForm: {
 					id:'',
 					id:undefined,
@@ -95,8 +107,12 @@
 					creatorTime:undefined,
 					lastModifyUserId:undefined,
 					lastModifyTime:undefined,
+					otherFileType: undefined,
 				},
 				rules: {
+					fileName: [{ required: true, message: '请输入文件名称', trigger: 'blur' }],
+					fileType: [{ required: true, message: '请选择文件类型', trigger: 'blur' }],
+					otherFileType: [{ validator: validateOtherFileType, trigger: 'blur' }],
 				},
 				fileTypeOptions : [],
 				btnLoading: false,
@@ -112,7 +128,7 @@
 		methods: {
 			getfileTypeOptions(){
 				getDictionaryDataSelector('577087166203561221').then(res => {
-					this.fileTypeOptions = res.data.list
+					this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]
 				});
 			},
 			goBack() {
@@ -125,19 +141,34 @@
 				this.$nextTick(() => {
 					this.$refs['elForm'].resetFields();
 					if (this.dataForm.id) {
+                        this.dialogLoading = true;
 						request({
 							url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
 							method: 'get'
 						}).then(res =>{
 							this.dataForm = res.data;
+                            this.setTileType(res.data.fileType);
 							if(!this.dataForm.fileUrl)this.dataForm.fileUrl=[];
-						})
+                            this.dialogLoading = false;
+						}).catch(() => this.dialogLoading = false)
 					}
 				})
 			},
+            setTileType(val) {
+                let index = this.fileTypeOptions.findIndex(v => v.id == val);
+                if(index == -1 || index == (this.fileTypeOptions.length - 1)) {
+                    this.dataForm.fileType = '0';
+                    this.dataForm.otherFileType = val;
+                } else {
+                    this.dataForm.fileType = val;
+                    this.dataForm.otherFileType = '';
+                }
+            },
 			dataFormSubmit() {
 				this.$refs['elForm'].validate((valid) => {
+					console.log(valid);
                     if (valid) {
+						this.dataForm.fileType = this.dataForm.fileType == '0' ? this.dataForm.otherFileType : this.dataForm.fileType;
 						this.btnLoading = true;
                         if (!this.dataForm.id) {
                             request({
@@ -149,12 +180,9 @@
                                     message: res.msg,
                                     type: 'success',
                                     duration: 1000,
-                                    onClose: () => {
-										this.btnLoading = false,
-                                        this.visible = false,
-                                            this.$emit('refresh', true)
-                                    }
                                 })
+                                this.visible = false;
+                                this.$emit('refresh', true);
                             }).catch(() => this.btnLoading = false);
                         } else {
                             request({
@@ -166,12 +194,9 @@
                                     message: res.msg,
                                     type: 'success',
                                     duration: 1000,
-                                    onClose: () => {
-										this.btnLoading = false,
-                                        this.visible = false
-                                        this.$emit('refresh', true)
-                                    }
                                 })
+                                this.visible = false;
+                                this.$emit('refresh', true);
                             }).catch(() => this.btnLoading = false);
                         }
                     }
@@ -180,3 +205,10 @@
 		}
 	}
 </script>
+<style lang="scss" scoped>
+.basePrincipalResponsibilityForm {
+	:deep(.el-radio) {
+		margin: 0 30px 8px 0;
+	}
+}
+</style>
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 4bb4ec9..10ed58c 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -6,108 +6,44 @@
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="16">
             <el-form @submit.native.prevent size="mini">
-              <el-col :span="4">
+              <el-col :span="6">
                 <el-form-item label="">
-                  <el-input
-                    v-model="query.fileName"
-                    placeholder="文件名"
-                    clearable
-                  />
+                  <el-input v-model="query.fileName" placeholder="请输入文件名" clearable/>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="6">
                 <el-form-item label="">
-                  <el-select v-model="query.fileType" placeholder="文件类型">
-                    <el-option
-                      v-for="(item, index) in fileTypeOptions"
-                      :key="index"
-                      :label="item.fullName"
-                      :value="item.id"
-                    />
-                  </el-select>
+                  <el-input v-model="query.fileType" placeholder="请输入文件类型" clearable/>
                 </el-form-item>
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <el-button
-                    type="primary"
-                    icon="el-icon-search"
-                    @click="search()"
-                    >查询</el-button
-                  >
+                  <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
             <div class="NCC-common-search-box-right">
-              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
+              <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
+              <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button> -->
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
-            <div class="NCC-common-head">
-              <div>
-                <el-button
-                  type="primary"
-                  icon="el-icon-plus"
-                  @click="addOrUpdateHandle()"
-                  size="mini"
-                  >新增</el-button
-                >
-              </div>
-            </div>
             <NCC-table v-loading="listLoading" :data="list">
-              <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
+              <!-- <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/> -->
               <el-table-column prop="fileName" label="文件名" align="left" show-overflow-tooltip/>
               <el-table-column label="文件类型" prop="fileType" align="left" show-overflow-tooltip>
-                <template slot-scope="scope">{{
-                  scope.row.fileType | dynamicText(fileTypeOptions)
-                }}</template>
+                <template slot-scope="scope">{{ scope.row.fileType | dynamicText(fileTypeOptions) }}</template>
               </el-table-column>
-              <el-table-column
-                prop="timeTakingEffect"
-                label="生效时间"
-                align="left"
-                show-overflow-tooltip
-              />
+              <el-table-column prop="timeTakingEffect" label="生效时间" align="left" show-overflow-tooltip :formatter="ncc.tableDateFormat"/>
               <el-table-column prop="content" label="具体内容" align="left" />
-              <el-table-column
-                prop="creatorUserId"
-                label="创建用户"
-                align="left"
-                show-overflow-tooltip
-              />
-              <el-table-column
-                prop="creatorTime"
-                label="创建时间"
-                :formatter="ncc.tableDateFormat"
-                align="left"
-                show-overflow-tooltip
-              />
-              <el-table-column
-                prop="lastModifyUserId"
-                label="修改用户"
-                show-overflow-tooltip
-                align="left"
-              />
-              <el-table-column
-                prop="lastModifyTime"
-                :formatter="ncc.tableDateFormat"
-                label="修改时间"
-                align="left"
-                show-overflow-tooltip
-              />
+              <!-- <el-table-column prop="creatorUserId" label="创建用户" align="left" show-overflow-tooltip/> -->
+              <el-table-column prop="creatorTime" label="创建时间" :formatter="ncc.tableDateFormat" align="left" show-overflow-tooltip/>
+              <!-- <el-table-column prop="lastModifyUserId" label="修改用户" show-overflow-tooltip align="left"/> -->
+              <!-- <el-table-column prop="lastModifyTime" :formatter="ncc.tableDateFormat" label="修改时间" align="left" show-overflow-tooltip/> -->
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
-                  <el-button
-                    type="text"
-                    @click="addOrUpdateHandle(scope.row.id)"
-                    >编辑</el-button
-                  >
-                  <el-button
-                    type="text"
-                    @click="handleDel(scope.row.id)"
-                    class="NCC-table-delBtn"
-                    >删除</el-button
-                  >
+                  <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+                  <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 60e0cf5..381d136 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -29,7 +29,7 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('title') && !dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('title')">
           <el-form-item label="标题" prop="title">
             <el-input
               v-model="dataForm.title"
@@ -41,14 +41,14 @@
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('content') && !dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('content')">
           <el-form-item label="内容" prop="content">
             <el-input v-model="dataForm.content" placeholder="请输入" show-word-limit :style="{ width: '100%' }"
               type="textarea" :autosize="{ minRows: 4, maxRows: 4 }">
             </el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('annex') && !dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('annex')">
           <el-form-item label="附件" prop="annex">
             <NCC-UploadFz
               v-model="dataForm.annex"
@@ -67,10 +67,11 @@
                 v-for="(item, index) in areaOptions"
                 :key="index"
                 :label="item.id"
+                :disabled="editType == '已发布并部署' || editType == '已发布'"
                 >{{ item.fullName }}</el-checkbox
               >
             </el-checkbox-group>
-            <div style="margin-top: 10px">
+            <div style="margin-top: 10px" v-if="!editType || editType == '已存档'">
               <el-button size="mini" @click="selectAreaAll('area')">全选</el-button>
               <el-button size="mini" @click="closeAreaAll('area')">反选</el-button>
             </div>
@@ -83,29 +84,31 @@
                 v-for="(item, index) in communicationOutOptions"
                 :key="index"
                 :label="item.id"
+                :disabled="editType == '已发布并部署' || editType == '已发布'"
                 >{{ item.fullName }}</el-checkbox
               >
             </el-checkbox-group>
-            <div style="margin-top: 10px">
+            <div style="margin-top: 10px" v-if="!editType || editType == '已存档'">
               <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('relationId') && dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('relationId')">
           <el-form-item label="填报表单" prop="relationId">
-            <el-select v-model="dataForm.relationId" placeholder="请选择专项行动填报表单" style="margin-right: 10px;width: 300px;">
+            <el-select v-model="dataForm.relationId" placeholder="请选择专项行动填报表单" style="margin-right: 10px;width: 300px;" :disabled="editType == '已发布并部署'">
               <el-option v-for="item in BaseList" :key="item.id" :label="item.fullName" :value="item.id">
               </el-option>
             </el-select>
             <el-button size="mini" type="text" @click="dialogVisible = true">没有找到表单？点击设计表单</el-button>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-if="ncc.hasFormP('deadline') && dataForm.id">
+        <el-col :span="23" v-if="ncc.hasFormP('deadline')">
           <el-form-item label="截止日期" prop="deadline">
             <el-date-picker
               v-model="dataForm.deadline"
               type="date"
+              :disabled="editType == '已发布并部署'"
               placeholder="选择截止日期">
             </el-date-picker>
           </el-form-item>
@@ -113,8 +116,10 @@
       </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" :loading="btnLoading">确 定</el-button>
+      <el-button type="primary" @click="visible = false">取 消</el-button>
+      <el-button type="primary" @click="dataFormSubmit(0)" v-if="!isDetail" :loading="btnLoading">保 存</el-button>
+      <el-button type="primary" @click="dataFormSubmit(1)" v-if="!isDetail" :loading="btnLoading">发 布</el-button>
+      <el-button type="primary" @click="dataFormSubmit(2)" v-if="!isDetail" :loading="btnLoading">发布并反馈</el-button>
     </span>
     <el-dialog class="zxDialog" title="专项行动表单设计" :visible.sync="dialogVisible" fullscreen @close="handleClose" :modal="false">
       <iframe 
@@ -135,14 +140,28 @@ export default {
   components: {},
   props: [],
   data() {
+    var validatecommunicationArea = (rule, value, callback) => {
+        if (!this.dataForm.communicationOut.length && !value.length) {
+          callback(new Error('传输区域和传输外协不能同时为空！'));
+        } else {
+          callback();
+        }
+      };
+    var validatecommunicationOut = (rule, value, callback) => {
+      if (!this.dataForm.communicationArea.length && !value.length) {
+        callback(new Error('传输区域和传输外协不能同时为空！'));
+      } else {
+        callback();
+      }
+    };
     return {
       loading: false,
       visible: false,
       isDetail: false,
+      editType: '', // 修改类型
       dataForm: {
         id: "",
         id: undefined,
-        specialActionType: undefined,
         title: undefined,
         content: undefined,
         releaseTime: undefined,
@@ -158,34 +177,12 @@ export default {
         relationId: undefined,
       },
       rules: {
-        specialActionType: [
-          {
-            required: true,
-            message: "请输入类型",
-            trigger: "change",
-          },
-        ],
-        title: [
-          {
-            required: true,
-            message: "请输入标题",
-            trigger: "blur",
-          },
-        ],
-        deadline: [
-          {
-            required: true,
-            message: "请输入截止日期",
-            trigger: "change",
-          }
-        ],
-        relationId: [
-          {
-            required: true,
-            message: "请选择关联表单",
-            trigger: "change",
-          }
-        ]
+        title: [{ required: true, message: "请输入标题", trigger: "blur" }],
+        content: [{ required: true, message: "请输入内容", trigger: "blur" }],
+        communicationArea: [{validator: validatecommunicationArea, trigger: 'blur'}],
+        communicationOut: [{validator: validatecommunicationOut, trigger: 'blur'}],
+        relationId: [{ required: true, message: "请选择专项行动填报表单", trigger: "blur"}],
+        deadline: [{ required: true, message: "请选择截止日期", trigger: "blur" }],
       },
       areaOptions: [],
       communicationOutOptions: [],
@@ -228,7 +225,6 @@ export default {
         method: "get",
       }).then((res) => {
         this.BaseList = res.data.list[0].children;
-        console.log(this.BaseList)
       });
     },
     async initAreaTypeList() {
@@ -277,60 +273,78 @@ export default {
       this.dataForm.id = row ? row.id : '';
       this.visible = true;
       this.isDetail = isDetail || false;
+      this.editType = row ? row.state : '';
       this.$nextTick(() => {
         this.$refs["elForm"].resetFields();
         if(this.dataForm.id) {
-          this.dataForm.communicationArea = JSON.parse(row.communicationArea);
-          this.dataForm.communicationOut = JSON.parse(row.communicationOut);
+          request({
+            url: `/Extend/BaseSpecialAction/${this.dataForm.id} `,
+            method: "GET",
+          }).then((res) => {
+            this.dataForm = res.data;
+            this.dataForm.annex = res.data.annex == null ? [] : res.data.annex;
+          })
         }
       });
     },
-    dataFormSubmit() {
-      this.$refs["elForm"].validate((valid) => {
-        if (valid) {
-          this.btnLoading = true;
-          if (!this.dataForm.id) {
-            let {title, content, annex, communicationArea, communicationOut} = this.dataForm;
-            // 新增
-            request({
-              url: `/Extend/BaseSpecialAction`,
-              method: "post",
-              data: { title, content, annex, communicationArea, communicationOut },
-            }).then((res) => {
-              this.$message({
-                message: res.msg,
-                type: "success",
-                duration: 1000,
-                onClose: () => {
-                  this.btnLoading = false;
-                  (this.visible = false), this.$emit("refresh", true);
-                },
-              });
-            }).catch(() => this.btnLoading = false);
-          } else {
-            // 发布任务
-            request({
-              url: "/Extend/BaseSpecialAction/Release",
-              method: "PUT",
-              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);
-                },
-              });
-            }).catch(() => this.btnLoading = false);
-          }
+    dataFormSubmit(type) {
+      this.validateForm(type, () => {
+        let obj = {
+          ...this.dataForm,
+          state: type
         }
+        let url = !this.dataForm.id ? '/Extend/BaseSpecialAction/Release' : '/Extend/BaseSpecialAction/Update';
+        let method = !this.dataForm.id ? 'PUT' : 'POST';
+        this.toPostForm(url, method, obj);
       });
     },
+    validateForm(type, callback) {
+      let list = ['title', 'content'];
+      switch (type) {
+        case 0:
+        list = ['title', 'content'];
+          break;
+        case 1:
+        list = ['title', 'content', 'communicationArea', 'communicationOut'];
+          break;
+        case 2:
+        list = ['title', 'content', 'communicationArea', 'communicationOut', 'relationId', 'deadline'];
+          break;
+      
+        default:
+          break;
+      }
+      let Promises =  list.map(v => new Promise((resolve, reject) => this.$refs["elForm"].validateField(v, err => resolve(err))));
+      Promise.all(Promises).then(values => {
+        if(values.filter(item =>item).length) {
+          return
+        } else {
+          callback && callback(values);
+        }
+      });
+    },
+    toPostForm(url, method, obj, callback) {
+      this.btnLoading = true;
+      request({
+        url,
+        method,
+        data: obj,
+      }).then((res) => {
+        this.$message({
+          message: res.msg,
+          type: "success",
+          duration: 1000,
+          onClose: () => {
+            callback && callback();
+            this.btnLoading = false;
+            (this.visible = false), this.$emit("refresh", true);
+          },
+        });
+      }).catch(() => this.btnLoading = false);
+    }
   },
 };
+
 </script>
 <style lang="scss" scoped>
 </style>
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 0834f78..69c0536 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -37,13 +37,9 @@
               </div>
             </div>
             <NCC-table v-loading="listLoading" :data="list">
-              <el-table-column prop="id" label="主键" align="left" show-overflow-tooltip/>
+              <!-- <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 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>
@@ -51,16 +47,21 @@
               <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="截止日期" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="175">
+              <el-table-column prop="state" label="状态" align="left" show-overflow-tooltip width="100">
+                <template slot-scope="scope">
+                  <el-tag :type="stateColor[`${scope.row.state}`]">{{scope.row.state}}</el-tag>
+                </template>
+              </el-table-column>
+              <el-table-column prop="deadline" label="截止日期" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="200" align="left">
                   <template slot-scope="scope">
                     <el-tag v-if="scope.row.deadline" :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 prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/>
-              <el-table-column label="操作" fixed="right" width="100">
+              <!-- <el-table-column prop="creatorUserId" show-overflow-tooltip label="创建用户" align="left"/> -->
+              <el-table-column label="操作" fixed="right" width="150">
                 <template slot-scope="scope">
-                  <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>
+                  <el-button type="text" @click="addOrUpdateHandle(scope.row)">修改</el-button>
+                  <el-button type="text" @click="toDetail(scope.row)" v-if="scope.row.state == '已发布并部署'">处理情况</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
@@ -101,6 +102,12 @@ export default {
       InfoFormVisible: false,
       communicationAreaOptions: [],
       communicationOutOptions: [],
+      stateColor: {
+        '已存档': "info",
+        '已发布': "warning",
+        '已发布并部署': "success",
+        '未发布': "",
+      },
     };
   },
   async created() {
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 6e19848..778f248 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -18,9 +18,13 @@
                 <el-table-column type="index" width="40"> </el-table-column>
                 <el-table-column prop="taskTitle" label="任务名称" show-overflow-tooltip/>
                 <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="170">
+                <el-table-column prop="taskState" label="状态" show-overflow-tooltip width="80">
+                  <template slot-scope="scope">
+                    <el-tag type="success">{{ scope.row.taskState }}</el-tag>
+                  </template>
+                </el-table-column>
+                <el-table-column prop="deadLine" label="任务期限" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="200">
                   <template slot-scope="scope">
                     <el-tag :type="`${ncc.timeDeadLine(scope.row.deadLine)}`">{{ncc.stateDeadLine(scope.row.deadLine)}}{{ ncc.tableDateFormat(scope.row, 'deadLine', scope.row.deadLine) }}</el-tag>
                   </template>
--
libgit2 0.21.4