From 7180000ed73203fb5b5ca8ee29b1a52c1ea2de81 Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Fri, 6 Sep 2024 16:32:14 +0800
Subject: [PATCH] 优化

---
 src/views/DisposalSuggestions/HandleForm.vue      |   4 ++--
 src/views/DisposalSuggestions/index.vue           |   4 +++-
 src/views/baseCaseHandling/Form.vue               | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------
 src/views/baseCaseHandling/index.vue              |  27 +++++++++++++++++++--------
 src/views/baseInspectionReport/Form.vue           |  56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 src/views/baseInspectionReport/index.vue          |   6 ++++--
 src/views/baseListHazardousSamples/index.vue      |   5 +++--
 src/views/basePrincipalResponsibility/Form.vue    |  24 +++++++++++++-----------
 src/views/basePrincipalResponsibility/index.vue   |   1 +
 src/views/baseSystemInfo/InspectForm.vue          | 364 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 src/views/baseSystemInfo/index.vue                |   2 +-
 src/views/homePage/components/news/NewsDialog.vue |  33 +++++++++++++++++++++++----------
 src/views/overView/msgForm.vue                    |   6 +++---
 13 files changed, 383 insertions(+), 294 deletions(-)

diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue
index 5df07e9..fb515df 100644
--- a/src/views/DisposalSuggestions/HandleForm.vue
+++ b/src/views/DisposalSuggestions/HandleForm.vue
@@ -82,10 +82,10 @@
               label-position="right"
             >
               <el-col :span="24">
-                <el-form-item label="处理说明" prop="disposalSuggestions">
+                <el-form-item label="处理结果" prop="disposalSuggestions">
                   <el-input
                     v-model="suggestionForm.disposalSuggestions"
-                    placeholder="请输入处理说明"
+                    placeholder="请输入处理结果"
                     show-word-limit
                     :style="{ width: '100%' }"
                     type="textarea"
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index b39f27e..d71eb0f 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="SystemInfo item-box common-info-box">
-   <div class="item-title">{{isSHILevel ? '上报线索研判' : '巡查处理'}}上报线索研判</div>
+   <div class="item-title">{{isSHILevel ? '上报线索研判' : '巡查处理'}}</div>
    <div class="item-body">
        <div class="NCC-common-layout">
        <div class="NCC-common-layout-center">
@@ -31,6 +31,7 @@
                    <el-col :span="4">
                        <el-form-item>
                            <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                           <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
                        </el-form-item>
                    </el-col>
                </el-form>
@@ -87,6 +88,7 @@
                showAll: false,
                query: {
                    platformName:undefined,
+                   platformNameStr: undefined,
                    platformType:undefined,
                    department:undefined,
                    questionType:undefined,
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 2e767ed..481eec9 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -9,7 +9,7 @@
     v-loading="loading"
     :modal="false"
   >
-    <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail">
+    <el-row :gutter="15" class="NCC-dialog-content" v-show="!isDetail">
       <el-form
         ref="elForm"
         :model="dataForm"
@@ -36,7 +36,7 @@
  			        @blur.native.capture="selectBlur"
               @visible-change="visibleNameChange"
               @change="(val) => platformNameChange(val, 'change')"
-              :disabled="formType"
+              :disabled="formType != 0"
  			        :loading="system_loading">
  			        <el-option v-for="item in systemOption" :key="item.value" :label="item.systemName" :value="item.id" />
  			      </el-select>
@@ -50,7 +50,7 @@
               clearable
               filterable 
               style="width: 100%"
-              :disabled="formType || dataForm.isHaveSystem"
+              :disabled="formType != 0 || dataForm.isHaveSystem"
             >
               <el-option
                 v-for="item in companyOptions"
@@ -64,21 +64,23 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="应用类别" prop="category">
-            <el-input v-model="dataForm.category" placeholder="选择系统类别" clearable :disabled="formType || dataForm.isHaveSystem"/>
+            <el-radio-group v-model="dataForm.category" :disabled="formType != 0 || dataForm.isHaveSystem">
+              <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="24">
           <el-form-item label="备案号" prop="recordNumber">
-            <el-input v-model="dataForm.recordNumber" placeholder="选择备案号" clearable :disabled="formType || dataForm.isHaveSystem"/>
+            <el-input v-model="dataForm.recordNumber" placeholder="选择备案号" clearable :disabled="formType == 2"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="24" v-if="isSHILevel">
           <el-form-item label="所属区县" prop="districtCounty">
               <el-radio-group
                 v-model="dataForm.districtCounty"
                 placeholder="请选择所属区县"
                 style="line-height: 22px"
-                :disabled="formType"
+                :disabled="formType == 2"
               >
                 <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{
                   v.fullName
@@ -88,76 +90,84 @@
         </el-col>
         <el-col :span="24">
           <el-form-item label="违法原因" prop="illegalReasons">
-            <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" :disabled="formType"/>
+            <el-input type="textarea" v-model="dataForm.illegalReasons" placeholder="请输入违法原因" clearable maxlength="200" :disabled="formType == 2"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="处罚要求" prop="punishmentRequirements">
-            <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" :disabled="formType"/>
+            <el-input type="textarea" v-model="dataForm.punishmentRequirements" placeholder="请输入处罚要求" clearable maxlength="200" :disabled="formType == 2"/>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <el-form-item label="处罚内容" prop="punishmentContent">
-            <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType"/>
+            <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType == 2"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if="(formType && isSHILevel) || dataForm.state == '592592999649641733'">
+        <el-col :span="24" v-if="isSHILevel">
           <el-form-item label="执法方式" prop="enforceType">
             <el-radio-group v-model="dataForm.enforceType">
-              <el-radio :label="'1'">柔性执法</el-radio>
-              <el-radio :label="'2'">行政执法</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="formType || dataForm.state == '592592999649641733'">
+        <el-col :span="24" v-if="!isSHILevel && formType == 2">
           <el-form-item label="执法说明" prop="enforcecontent">
-            <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入处罚内容" clearable maxlength="200"/>
+            <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入执法说明" clearable maxlength="200"/>
           </el-form-item>
         </el-col>
       </el-form>
     </el-row>
-    <el-row v-if="isDetail">
-          <el-col class="form-item">
-            <div class="label w-120">案件名称：</div>
-            <div class="text">{{ dataForm.systemNameStr || '--' }}</div>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">运营主体：</div>
-            <div class="text">{{ dataForm.registeredEntityStr || '--' }}</div>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">应用类别：</div>
-            <div class="text">{{ dataForm.category || '--' }}</div>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">备案号：</div>
-            <div class="text">{{ dataForm.recordNumber || '--' }}</div>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">所属区县：</div>
-            <div class="text">{{ areaOptions.find(item => item.id == dataForm.districtCounty).fullName }}</div>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">违法原因：</div>
-            <p class="text">{{ dataForm.illegalReasons || '--' }}</p>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">处罚要求：</div>
-            <p class="text">{{ dataForm.punishmentRequirements || '--' }}</p>
-          </el-col>
-          <el-col class="form-item">
-            <div class="label w-120">处罚内容：</div>
-            <p class="text">{{ dataForm.punishmentContent || '--' }}</p>
-          </el-col>
+    <el-row v-show="!!isDetail">
+      <el-col class="form-item">
+        <div class="label w-120">案件名称：</div>
+        <div class="text">{{ dataForm.systemNameStr || '--' }}</div>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">运营主体：</div>
+        <div class="text">{{ dataForm.registeredEntityStr || '--' }}</div>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">应用类别：</div>
+        <div class="text">{{ dataForm.categoryName || '--' }}</div>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">备案号：</div>
+        <div class="text">{{ dataForm.recordNumber || '--' }}</div>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">所属区县：</div>
+        <div class="text">{{ dataForm.districtCountyName }}</div>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">违法原因：</div>
+        <p class="text">{{ dataForm.illegalReasons || '--' }}</p>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">处罚要求：</div>
+        <p class="text">{{ dataForm.punishmentRequirements || '--' }}</p>
+      </el-col>
+      <el-col class="form-item">
+        <div class="label w-120">处罚内容：</div>
+        <p class="text">{{ dataForm.punishmentContent || '--' }}</p>
+      </el-col>
+      <el-col class="form-item" v-if="dataForm.enforceType">
+        <div class="label w-120">执法方式：</div>
+        <p class="text">{{ dataForm.enforceType || '--' }}</p>
+      </el-col>
+      <el-col class="form-item" v-if="dataForm.enforcecontent">
+        <div class="label w-120">执法说明：</div>
+        <p class="text">{{ dataForm.enforcecontent || '--' }}</p>
+      </el-col>
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
-      <template  v-if="!isDetail && !formType">
-        <el-button type="primary" v-if="!isDetail" @click="submit(1)" :loading="btnLoading">{{isSHILevel ? '下 发' : '上 报'}}</el-button>
-        <el-button type="info" v-if="!isDetail" @click="submit(0)" :loading="btnLoading">保 存</el-button>
+      <template  v-if="!isDetail">
+        <el-button type="primary" v-if="!isDetail && formType == '0'" @click="submit(1)" :loading="btnLoading">{{isSHILevel ? '下 发' : '上 报'}}</el-button>
+        <el-button type="info" v-if="!isDetail && formType == '0'" @click="submit(0)" :loading="btnLoading">保 存</el-button>
       </template>
-      <template v-if="!isDetail && formType">
-        <el-button type="primary" v-if="!isDetail" @click="handle" :loading="btnLoading">提 交</el-button>
+      <template v-if="!isDetail">
+        <el-button type="primary" v-if="!isDetail && formType != '0'" @click="handle" :loading="btnLoading">提 交</el-button>
       </template>
     </span>
   </el-dialog>
@@ -176,7 +186,7 @@ export default {
       visible: false,
       loading: false,
       isDetail: false,
-      formType: false,
+      formType: false, //  0 新增 1 编辑 2 处理
       dataForm: {
 		    id: undefined,
 		    registrationTime: undefined,
@@ -184,7 +194,9 @@ export default {
 		    registeredEntity: undefined,
 		    category: undefined,
 		    recordNumber: undefined,
+        registeredEntityStr: undefined,
 		    districtCounty: undefined,
+        systemNameStr: undefined,
 		    illegalReasons: undefined,
 		    punishmentRequirements: undefined,
 		    punishmentContent: undefined,
@@ -220,7 +232,8 @@ export default {
       system_loading: false,
       areaOptions: [],
       btnLoading: false,
-      companyOptions: []
+      companyOptions: [],
+      platformTypeOptions: [],
     };
   },
   computed: {
@@ -231,6 +244,7 @@ export default {
   },
   watch: {},
   created() {
+    this.getplatformTypeOptions();
     this.getSystemSelect();
     this.initSystemTypeList();
     this.initAreaTypeList();
@@ -238,6 +252,11 @@ export default {
   },
   mounted() {},
   methods: {
+    async getplatformTypeOptions() {
+      let list = this.$store.state.meta.system;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
+      this.platformTypeOptions = list;
+    },
       // 请求公司列表
     async initCompanyList() {
       request({
@@ -268,11 +287,10 @@ export default {
     platformNameChange(val, type) {
       let obj = this.systemOption.find(v => type == 'blur' ? val == v.fullName : val == v.id);
       this.dataForm.isHaveSystem = obj ? true : false;
-      if(!obj) return;
       this.dataForm.systemName = obj ? obj.id : val;
-      this.dataForm.registeredEntity = obj ? obj.companyId : val;
-      this.dataForm.category = obj ? obj.systemType : '';
-      this.dataForm.recordNumber = obj ? obj.platform : '';
+      this.dataForm.registeredEntity = obj ? obj.companyId : '';
+      this.dataForm.category = obj ? this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id : '';
+      // this.dataForm.recordNumber = obj ? obj.platform : '';
     },
     // 系统名称改变
     systemChange(val) {
@@ -293,19 +311,20 @@ export default {
     },
     init(id, isDetail, type) {
       // type 0 上报/下派 1 处理
-      this.formType = Boolean(type) || false;
-      this.dataForm.id = id || 0;
+      this.formType = type || '0';
+      this.dataForm.id = id || undefined;
       this.isDetail = isDetail || false;
       this.visible = true;
-      this.$forceUpdate();
       this.$nextTick(() => {
-        !isDetail && this.$refs["elForm"].resetFields();
+        this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
           this.loading = true;
           request({
             url: `/Extend/BaseCaseHandling/${this.dataForm.id}`,
             method: "GET",
           }).then(async (res) => {
+            res.data.districtCountyName = this.areaOptions.find(item => item.id == res.data.districtCounty).fullName;
+            res.data.categoryName = this.platformTypeOptions.find(v => v.Id == res.data.category || v.FullName == res.data.category).FullName;
             this.dataForm = res.data;
             this.loading = false;
           }).catch(() => {
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index 6fd41cc..64d78ba 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -26,12 +26,12 @@
               </el-col> -->
               <el-col :span="4">
                 <el-form-item label="">
-                  <el-input v-model="query.systemName" placeholder="请输入系统名称" 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"
@@ -44,9 +44,10 @@
               <el-col :span="3">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()" >查询</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</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>
+                  <el-button type="success" icon="el-icon-plus" size="mini" @click="addOrUpdateHandle('', false, '0')">新增</el-button>
                 </div>
               </el-col>
             </el-form>
@@ -60,8 +61,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="应用名称" align="left" width="150" show-overflow-tooltip/>
-              <el-table-column prop="registeredEntity" label="运营主体" align="left" show-overflow-tooltip/>
+              <el-table-column prop="systemNameStr" label="应用名称" align="left" width="150" show-overflow-tooltip />
+              <el-table-column prop="registeredEntityStr" 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>
@@ -80,8 +81,8 @@
               <el-table-column label="操作" fixed="right" width="180">
                 <template slot-scope="scope">
                   <el-button size="mini" type="text" @click="addOrUpdateHandle(scope.row.id, true) " >详情</el-button>
-                  <el-button type="text" v-if="scope.row.state == '592592903172261125' && scope.row.creatorUserId != $store.state.user.id" @click="addOrUpdateHandle(scope.row.id, false, 1)" >处理</el-button>
-                  <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
+                  <el-button type="text" v-if="scope.row.state == '592592903172261125' && scope.row.creatorUserId != $store.state.user.id" @click="addOrUpdateHandle(scope.row.id, false, '2')" >处理</el-button>
+                  <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="addOrUpdateHandle(scope.row.id, false, '1')" >编辑</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="toReportCase(scope.row.id)" >{{isSHILevel ? '下发' : '上报'}}</el-button>
                   <el-button type="text" v-if="scope.row.state == '592592614457345285' || scope.row.state == '592592756363232517'" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
                 </template>
@@ -151,6 +152,7 @@ export default {
       ],
       stateOptions: [],
       areaOptions: [],
+      systemOptions: [],
     };
   },
   computed: {
@@ -160,12 +162,21 @@ export default {
     },
   },
   created() {
+    this.initSystemOptions();
     this.initSystemTypeList();
     this.initAreaTypeList();
     this.initStateTypeOption();
     this.initData();
   },
   methods: {
+    initSystemOptions() {
+      request({
+        url: `/Extend/basesysteminfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.systemOptions = data;
+      })
+    },
     sortChange({ column, prop, order }) {
       this.listQuery.sort = order == "ascending" ? "asc" : "desc";
       this.listQuery.sidx = !order ? "" : prop;
@@ -222,7 +233,7 @@ export default {
       });
     },
     toReportCase(id) {
-      this.$confirm("确认上报/下发该案件?", "提示", {
+      this.$confirm(`确认${this.isSHILevel ? '下发' : '上报'}该案件?`, "提示", {
         type: "warning",
       })
         .then(() => {
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 4f4355b..9df43b4 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -176,6 +176,14 @@
         <div class="label w-120">附件：</div>
         <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
       </el-col>
+      <el-col class="form-item" v-if="dataForm.judgmentOpinions">
+        <div class="label w-120">研判意见：</div>
+        <div class="text">{{ dataForm.judgmentOpinions || '--' }}</div>
+      </el-col>
+      <el-col class="form-item" v-if="dataForm.disposalSuggestions">
+        <div class="label w-120">处理结果：</div>
+        <div class="text">{{ dataForm.disposalSuggestions || '--' }}</div>
+      </el-col>
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
@@ -256,6 +264,33 @@ export default {
   created() {},
   mounted() {},
   methods: {
+    async initAllList() {
+      let companyRes = await request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+      });
+      this.companyOptions = companyRes.data;
+      let SourceRes = await request({
+        url: `/Extend/baseinspectionreport/GetReportSourceList`,
+        method: "GET",
+      });
+      this.sourceOptions = SourceRes.data;
+      let list = this.$store.state.meta.system;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
+      this.platformTypeOptions = list;
+      await getDictionaryDataSelector("577006814432855301").then((res) => {
+        this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
+      });
+      this.name_loading = true
+      await request({
+        url: `/Extend/basesysteminfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        if(!data) return;
+        this.nameOptions = data;
+        this.name_loading = false;
+      });
+    },
     async initCompanyList() {
       request({
         url: `/Extend/basecomapnyinfo/GetNoPagingList`,
@@ -272,12 +307,17 @@ export default {
     },
     platformNameChange(val, type) {
       let obj = this.nameOptions.find(v => type == 'blur' ? val == v.fullName : val == v.id);
-      if(!obj) return;
       this.dataForm.platformName = obj ? obj.id : val;
-      this.dataForm.company = this.companyOptions.find(v => v.id == obj.companyId || v.companyName == obj.companyId).id;
-      console.log(this.dataForm.company, 'this.dataForm.company');
-      this.dataForm.platformType = this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id;
-      this.dataForm.selfMediaPlatformType = obj ? obj.platform : '';
+      this.dataForm.company = obj ? this.companyOptions.find(v => v.id == obj.companyId || v.companyName == obj.companyId).id : '';
+      this.dataForm.platformType = obj ? this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id : '';
+      if(obj && this.dataForm.platformType == '580634746028033285') {
+        if(this.mediaPlatList.findIndex(j => j == obj.selfMediaPlatformType) == -1) {
+          this.dataForm.selfMediaPlatformType = '其他';
+          this.dataForm.selfMediaPlatformTypeOther = obj.selfMediaPlatformType;
+        } else {
+          this.dataForm.selfMediaPlatformType = obj.selfMediaPlatformType;
+        }
+      }
     },
     visibleNameChange(val) {
       if (val) return
@@ -319,11 +359,7 @@ export default {
       this.visible = true;
       this.isDetail = isDetail || false;
       this.form_loading = true;
-      await this.initCompanyList();
-      await this.loadList();
-      await this.getSourceOptions();
-      await this.getplatformTypeOptions();
-      await this.getquestionTypeOptions();
+      await this.initAllList();
       this.$nextTick(async () => {
         !isDetail && this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 59148af..76101ec 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -25,7 +25,8 @@
 					</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-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
 						</el-form-item>
 					</el-col>
                     <div class="NCC-common-search-box-right">
@@ -67,7 +68,8 @@
 					</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)" :disabled="scope.row.stage != '577006621985604869' && scope.row.stage !='577006641364189019'">编辑</el-button>
 							<el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
 						</template>
 					</el-table-column>
diff --git a/src/views/baseListHazardousSamples/index.vue b/src/views/baseListHazardousSamples/index.vue
index 49efccc..feceb36 100644
--- a/src/views/baseListHazardousSamples/index.vue
+++ b/src/views/baseListHazardousSamples/index.vue
@@ -60,6 +60,7 @@
               <el-col :span="3">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</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>
@@ -76,8 +77,8 @@
               <el-table-column label="来源" prop="source" align="left" show-overflow-tooltip />
               <el-table-column label="问题类型" prop="questionType" align="left" show-overflow-tooltip />
               <el-table-column label="问题内容" prop="questionContent" align="left" show-overflow-tooltip />
-              <el-table-column label="违法原因" prop="illegalReasons" align="left" show-overflow-tooltip />
-              <el-table-column label="处罚内容" prop="punishmentContent" align="left" show-overflow-tooltip/>
+              <el-table-column label="违法原因" prop="unlawfulReason" align="left" show-overflow-tooltip />
+              <el-table-column label="处罚内容" prop="penaltyContent" 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/> -->
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index f415b4f..e2b8355 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -1,6 +1,6 @@
 <template>
-	<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-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="40%">
+		<el-row :gutter="15" class="NCC-dialog-content" v-loading="dialogLoading">
 				<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">
@@ -27,13 +27,13 @@
 					</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" >
+							<el-date-picker v-model="dataForm.timeTakingEffect" placeholder="请选择生效日期" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
 							</el-date-picker>
 						</el-form-item>
 					</el-col>
 					<el-col :span="24" 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 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>
@@ -121,36 +121,38 @@
 		computed: {},
         watch: {},
         created() {
-			this.getfileTypeOptions();
 		},
 		mounted() {
         },
 		methods: {
-			getfileTypeOptions(){
-				getDictionaryDataSelector('577087166203561221').then(res => {
-					this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }];
-				});
+			async getfileTypeOptions(){
+				let res = await getDictionaryDataSelector('577087166203561221');
+				this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }];
 			},
 			goBack() {
                 this.$emit('refresh')
             },
-			init(id, isDetail) {
+			async init(id, isDetail) {
 				this.dataForm.id = id || 0;
                 this.visible = true;
                 this.isDetail = isDetail || false;
+				this.dialogLoading = true;
+				await this.getfileTypeOptions();
 				this.$nextTick(() => {
 					this.$refs['elForm'].resetFields();
 					if (this.dataForm.id) {
-                        this.dialogLoading = true;
 						request({
 							url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
 							method: 'get'
 						}).then(res =>{
+							if(res.code != 200) return this.dialogLoading = false;
 							this.dataForm = res.data;
 							this.dataForm.fileUrl = res.data.fileUrlModel;
                             this.setTileType(res.data.fileType);
                             this.dialogLoading = false;
 						}).catch(() => this.dialogLoading = false)
+					} else {
+						this.dialogLoading = false;
 					}
 				})
 			},
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 10ed58c..6bd11fc 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -19,6 +19,7 @@
               <el-col :span="4">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()">查询</el-button>
+                  <el-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
diff --git a/src/views/baseSystemInfo/InspectForm.vue b/src/views/baseSystemInfo/InspectForm.vue
index 3379ef2..e1a0925 100644
--- a/src/views/baseSystemInfo/InspectForm.vue
+++ b/src/views/baseSystemInfo/InspectForm.vue
@@ -7,162 +7,109 @@
     lock-scroll
     width="60%"
   >
-    <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-col :span="24">
-          <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-row :gutter="15" class="NCC-dialog-content" v-loading="form_loading">
+      <el-form ref="elForm" :model="dataForm" size="small" label-width="100px" label-position="right" :rules="rules">
+        <el-col :span="24">
+          <el-form-item label="问题来源" prop="reportSource">
+            <el-radio-group v-model="dataForm.reportSource">
+              <el-radio v-for="(item, index) in sourceOptions" :key="index" :label="item.Id" >{{ item.FullName }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="23">
           <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">
+              @blur.native.capture="selectBlur"
+              @visible-change="visibleNameChange"
+              @change="(val) => platformNameChange(val, 'change')"
+              :loading="name_loading"
+              disabled>
+              <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="company">
+            <el-select
+              v-model="dataForm.company"
+              placeholder="请选择运营主体"
+              clearable
+              filterable 
+              style="width: 100%"
+              disabled
+            >
+              <el-option v-for="item in companyOptions" :key="item.id" :label="item.companyName" :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="24">
           <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-radio-group v-model="dataForm.platformType" disabled>
+              <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-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-col :span="23" v-show="dataForm.platformType == '580634746028033285'">
+          <el-form-item label="归属平台" prop="selfMediaPlatformType">
+            <el-radio-group v-model="dataForm.selfMediaPlatformType" :disabled="!!this.dataForm.id">
+              <el-radio v-for="(item, index) in mediaPlatList" :key="index" :label="item" >{{ item }}</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.selfMediaPlatformType == '其他'">
+          <el-form-item label="其他归属平台" prop="selfMediaPlatformTypeOther">
+            <el-input v-model="dataForm.selfMediaPlatformTypeOther" placeholder="请输入其他归属平台" clearable :style="{ width: '100%' }" />
+          </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-form-item label="问题类型" prop="questionType">
+            <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>
+        <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="link">
-            <el-input
-              v-model="dataForm.link"
-              placeholder="请输入"
-              clearable
-              :style="{ width: '100%' }"
-            >
-            </el-input>
+          <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-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>
+          <el-form-item label="附件" prop="annex">
+            <NCC-UploadFz v-model="dataForm.annex" :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()">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -170,7 +117,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";
+import { MediaPlatList } from "@/assets/data"
 export default {
   components: {},
   props: [],
@@ -178,120 +125,175 @@ export default {
     return {
       loading: false,
       visible: false,
+      name_loading: false,
       isDetail: false,
-
-      name_loading: undefined,
-      nameOptions: [],
-      otherQuestion: false,
-      showErrflag: false,
+      form_loading: true,
       dataForm: {
         id: undefined,
-        source: undefined,
-        questionFrom: undefined,
-        platformName: undefined,
+        reportSource: undefined,
+        platformNameStr: undefined,
+        platformTypeStr: undefined,
+        companyStr: undefined,
+        platformName: '',
+        selfMediaPlatformType: '',
         platformType: undefined,
         questionType: undefined,
         questionClass: undefined,
         questionContent: undefined,
         link: undefined,
-        obtainEvidence: [],
-        annex: [],
-        otherQuestionType: '',
         accurateDescription: undefined,
         incorrectDescription: undefined,
+        annex: [],
+        otherQuestionType: undefined,
+        selfMediaPlatformTypeOther: undefined,
+        company: undefined,
       },
       rules: {
+        platformName: [
+          { required: true, message: "请选择应用名称", trigger: "blur" },
+        ],
+        company: [
+          { 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" },
-      ],
+      nameOptions: [],
+      mediaPlatList: MediaPlatList,
+      companyOptions: [],
+      btnLoading: false,
     };
   },
   computed: {},
   watch: {},
-  created() {
-    this.loadList();
-    this.getSourceOptions();
-    this.getplatformTypeOptions();
-    this.getquestionTypeOptions();
-  },
+  created() {},
   mounted() {},
   methods: {
-    async getSourceOptions() {
-      request({
+    async initAllList() {
+      let companyRes = await request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+      });
+      this.companyOptions = companyRes.data;
+      let SourceRes = await request({
         url: `/Extend/baseinspectionreport/GetReportSourceList`,
         method: "GET",
+      });
+      this.sourceOptions = SourceRes.data;
+      let list = this.$store.state.meta.system;
+      !list && (list = await this.$store.dispatch("getTypeListByCode", "system"));
+      this.platformTypeOptions = list;
+      await getDictionaryDataSelector("577006814432855301").then((res) => {
+        this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
+      });
+      this.name_loading = true
+      await request({
+        url: `/Extend/basesysteminfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        if(!data) return;
+        this.nameOptions = data;
+        this.name_loading = false;
+      });
+    },
+    async initCompanyList() {
+      request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
       }).then(({data}) => {
-        this.sourceOptions = data;
+        this.companyOptions = data;
       })
     },
-    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.company = obj ? this.companyOptions.find(v => v.id == obj.companyId || v.companyName == obj.companyId).id : '';
+      this.dataForm.platformType = obj ? this.platformTypeOptions.find(v => v.Id == obj.systemType || v.FullName == obj.systemType).Id : '';
+      if(obj && obj.selfMediaPlatformType && this.dataForm.platformType == '580634746028033285') {
+        if(this.mediaPlatList.findIndex(j => j == obj.selfMediaPlatformType) == -1) {
+          this.dataForm.selfMediaPlatformType = '其他';
+          this.dataForm.selfMediaPlatformTypeOther = obj.selfMediaPlatformType;
+        } else {
+          this.dataForm.selfMediaPlatformType = obj.selfMediaPlatformType;
+        }
+      }
+    },
+    visibleNameChange(val) {
+      if (val) return
+      let input = this.$refs.select.$children[0].$refs.input;
+      input.blur();
+    },
+    async 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}) => {
+        if(!data) return;
+        this.nameOptions = data;
         this.name_loading = false;
-      });
+      })
     },
     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;
     },
-    getquestionTypeOptions() {
-      getDictionaryDataSelector("577006814432855301").then((res) => {
-        this.questionTypeOptions = res.data.list;
+    async getSourceOptions() {
+      let { data } = await request({
+        url: `/Extend/baseinspectionreport/GetReportSourceList`,
+        method: "GET",
       });
+      this.sourceOptions = data;
     },
-    questionTypeChange(v) {
-      this.showErrflag = Boolean(v == '错误表述');
-      this.otherQuestion = Boolean(v == '其他');
+    async getquestionTypeOptions() {
+      getDictionaryDataSelector("577006814432855301").then((res) => {
+        this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
+      });
     },
     goBack() {
       this.$emit("refresh");
     },
-    init(row, isDetail) {
+    async init(row) {
+      this.dataForm.id = '';
       this.visible = true;
-      this.isDetail = isDetail || false;
+      this.isDetail = false;
+      this.form_loading = true;
+      await this.initAllList();
       this.$nextTick(async () => {
         this.$refs["elForm"].resetFields();
-        this.dataForm.platformName = row.id;
-        this.dataForm.platformType = row.systemType;
-        this.dataForm.obtainEvidence = [];
-        this.dataForm.annex = [];
+        this.platformNameChange(row.id);
+        this.form_loading = false;
       });
     },
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
-          let res = !this.dataForm.id
-            ? await addForm(this.dataForm)
-            : await updataForm(this.dataForm);
+          console.log(this.dataForm);
+          let obj = {
+            ...this.dataForm,
+            questionType: this.dataForm.questionType == '其他' ? this.dataForm.otherQuestionType : this.dataForm.questionType,
+            selfMediaPlatformType: this.dataForm.selfMediaPlatformType == '其他' ? this.dataForm.selfMediaPlatformTypeOther : this.dataForm.selfMediaPlatformType,
+          }
+          this.btnLoading = true;
+          let res = !this.dataForm.id ? await addForm(obj) : await updataForm(obj);
+          if (res.code != 200) return this.btnLoading = false;
           this.$message({
             message: res.msg,
             type: "success",
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index ee2fcde..65213be 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -113,7 +113,7 @@
                   </infoForm>
                   <el-button size="mini" type="text" @click="toDetail(scope.row)">查看</el-button>
                   <el-button size="mini" type="text" @click="toChangeArea(scope.row)" >归属地变更</el-button>
-                  <el-button size="mini" type="text" @click="toInspection(scope.row)" >上报</el-button>
+                  <el-button size="mini" type="text" @click="toInspection(scope.row)" v-if="!isSHILevel">上报</el-button>
                   <!-- <el-button type="text" style="color: red;" @click="delNew(scope.row)" v-if="isSHILevel">删除</el-button> -->
                 </template>
               </el-table-column>
diff --git a/src/views/homePage/components/news/NewsDialog.vue b/src/views/homePage/components/news/NewsDialog.vue
index 3796a1c..bc01a78 100644
--- a/src/views/homePage/components/news/NewsDialog.vue
+++ b/src/views/homePage/components/news/NewsDialog.vue
@@ -3,7 +3,7 @@
     <div class="news-title">
       <div class="left">我的消息</div>
       <div class="right">
-        <el-button type="text" size="small" :disabled="!messageList.length" @click="toReadAll"
+        <el-button type="text" style="color: #fff;" size="small" :disabled="!messageList.length" @click="toReadAll"
           >标记全部已读</el-button
         >
       </div>
@@ -16,7 +16,10 @@
         infinite-scroll-immediate
       >
         <li class="list-item" v-for="(v, i) in messageList" :key="v.id">
-          <div class="item-title">{{ v.title }}</div>
+          <div class="item-title">
+            <div class="title-text">{{ v.title }}</div>
+            <div class="img_right"></div>
+          </div>
           <!-- <p>这个应用应该归属到青羊区，不在金牛区的管辖范围内。</p> -->
           <div class="item-info">
             <div class="left">发送人：{{ v.creatorUser }}</div>
@@ -134,19 +137,29 @@ export default {
         font-weight: 600;
         display: flex;
         flex-direction: row;
-        align-items: center;
+        align-items: flex-start;
         justify-content: space-between;
-        &::after {
-          content: "";
-          display: inline-block;
-          width: 25px;
-          text-align: center;
-          height: 15px;
+        .title-text {
+          flex: 1;
+        }
+        .img_right {
           background-image: url("@/assets/images/Group.png");
           background-size: 100% 100%; /* 确保图片覆盖整个元素 */
-          background-position: center; /* 将图片居中显示 */
+          width: 20px;
+          height: 20px;
           margin-left: 8px;
         }
+        // &::after {
+        //   content: "";
+        //   display: inline-block;
+        //   width: 25px;
+        //   text-align: center;
+        //   height: 15px;
+        //   background-image: url("@/assets/images/Group.png");
+        //   background-size: 100% 100%; /* 确保图片覆盖整个元素 */
+        //   background-position: center; /* 将图片居中显示 */
+        //   margin-left: 8px;
+        // }
       }
       p {
         margin: 5px 0;
diff --git a/src/views/overView/msgForm.vue b/src/views/overView/msgForm.vue
index ea68447..5b9936c 100644
--- a/src/views/overView/msgForm.vue
+++ b/src/views/overView/msgForm.vue
@@ -8,7 +8,7 @@
     width="50%"
   >
     <div class="NCC-dialog-content">
-      <div style="padding-top: 10px" v-if="!isDetail">
+      <div style="padding-top: 10px" v-show="!isDetail">
         <el-form
         ref="elForm"
         :model="dataForm"
@@ -85,7 +85,7 @@
       style="padding-top: 10px"
       class="msg-box"
       v-loading="loading"
-      v-else
+      v-show="!!isDetail"
     >
       <div class="msg-title">{{ dataForm.title }}</div>
       <div class="content" v-html="dataForm.bodyContent"></div>
@@ -193,7 +193,7 @@ export default {
       this.visible = true;
       this.isDetail = isDetail || false;
       this.$nextTick(() => {
-        !this.isDetail && this.$refs["elForm"].resetFields();
+        this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
           this.loading = true;
           request({
--
libgit2 0.21.4