diff --git a/src/api/baseData/company.js b/src/api/baseData/company.js
index e0b7c0c..92ba9b1 100644
--- a/src/api/baseData/company.js
+++ b/src/api/baseData/company.js
@@ -2,10 +2,11 @@
 import request from "@/utils/request";
 
 // 获取公司信息列表
-export async function getCompanyInfoList() {
+export async function getCompanyInfoList(data) {
     return await request({
         url: '/Extend/basecomapnyinfo',
         method: 'get',
+        params: data,
     });
 }
 // 获取公司信息
diff --git a/src/api/systemData/dataInterface.js b/src/api/systemData/dataInterface.js
index 68cef67..a4d6501 100644
--- a/src/api/systemData/dataInterface.js
+++ b/src/api/systemData/dataInterface.js
@@ -5,7 +5,7 @@ export function getListForJudge(data) {
   return request({
       url: `/Extend/BaseInspectionReport/GetListForJudge`,
       method: 'GET',
-      data
+      params: data
   })
 }
 // 查询当前登陆人发起的列表
@@ -13,7 +13,7 @@ export function getList(data) {
   return request({
       url: `/Extend/BaseInspectionReport/GetListForCurrentUser`,
       method: 'GET',
-      data
+      params: data
   })
 }
 // 获取单个巡查上报
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 39d66dc..3db01e6 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -14,7 +14,7 @@
                    <el-col :span="4">
                        <el-form-item label="">
                            <el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
-                               <el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+                               <el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
                            </el-select>
                        </el-form-item>
                    </el-col>
@@ -25,16 +25,7 @@
                    </el-col> -->
                    <el-col :span="4">
                        <el-form-item label="">
-                           <el-select v-model="query.questionType" placeholder="请选择问题类型" >
-                               <el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
-                           </el-select>
-                       </el-form-item>
-                   </el-col>
-                   <el-col :span="4">
-                       <el-form-item label="">
-                           <el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
-                               <el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id"  />
-                           </el-select>
+                           <el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />	
                        </el-form-item>
                    </el-col>
                    <el-col :span="4">
@@ -48,7 +39,7 @@
                <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">
-                           <template slot-scope="scope">{{ scope.row.platformType | dynamicText(platformTypeOptions) }}</template>
+                           <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>
@@ -81,12 +72,13 @@
 </template>
 <script>
    import request from '@/utils/request'
-   import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+    import infoMixin from "@/mixins/info";
    import NCCForm from './Form'
    import { getListForJudge, previewDataInterface } from '@/api/systemData/dataInterface'
    export default {
-       components: { NCCForm },
-       data() {
+        components: { NCCForm },
+        mixins: [infoMixin], 
+        data() {
            return {
                showAll: false,
                query: {
@@ -119,7 +111,7 @@
                    { prop: 'stage', label: '阶段' },
                ],
                sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
-               platformTypeOptions : [],
+               systemTypeOptions : [],
                questionTypeOptions : [],
                questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
                stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
@@ -127,21 +119,10 @@
        },
        computed: {},
        created() {
+            this.initSystemTypeList();
            this.initData()
-           this.getplatformTypeOptions();
-           this.getquestionTypeOptions();
        },
        methods: {
-           getplatformTypeOptions(){
-               getDictionaryDataSelector('576279943168656645').then(res => {
-                   this.platformTypeOptions = res.data.list
-               });
-           },
-           getquestionTypeOptions(){
-               getDictionaryDataSelector('577006814432855301').then(res => {
-                   this.questionTypeOptions = res.data.list
-               });
-           },
            initData() {
                this.listLoading = true;
                let _query = {
diff --git a/src/views/baseCaseHandling/Form.vue b/src/views/baseCaseHandling/Form.vue
index 1a61eaa..5e2da4a 100644
--- a/src/views/baseCaseHandling/Form.vue
+++ b/src/views/baseCaseHandling/Form.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
+    :title="!dataForm.id ? '新建' : isDetail ? '详情' : formType ? '案件处理' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible"
     class="NCC-dialog NCC-dialog_center"
@@ -88,15 +88,15 @@
             <el-input type="textarea" v-model="dataForm.punishmentContent" placeholder="请输入处罚内容" clearable maxlength="200" :disabled="formType"/>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if='isSHILevel'>
+        <el-col :span="24" v-if="isSHILevel && (formType || dataForm.state == '592592999649641733')">
           <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="'1'">柔性执法</el-radio>
+              <el-radio :label="'2'">行政执法</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="24" v-if='formType'>
+        <el-col :span="24" v-if="formType || dataForm.state == '592592999649641733'">
           <el-form-item label="执法说明" prop="enforcecontent">
             <el-input type="textarea" v-model="dataForm.enforcecontent" placeholder="请输入处罚内容" clearable maxlength="200"/>
           </el-form-item>
@@ -228,6 +228,9 @@ export default {
           }).then((res) => {
             this.dataForm = res.data;
             this.loading = false;
+            this.$nextTick(() => {
+              this.$refs["elForm"].clearValidate();
+            })
           }).catch(() => {
             this.loading = false;
           });
@@ -258,8 +261,11 @@ export default {
             method: "POST",
             data: { enforceType, enforcecontent },
           }).then((res) => {
+            this.visible = false;
+            this.$emit("refresh", true);
             this.$message({
               type: "success",
+              message: res.msg,
             })
           }).catch(() => {
             this.btnLoading = false;
diff --git a/src/views/baseCaseHandling/index.vue b/src/views/baseCaseHandling/index.vue
index 0c5c506..6479781 100644
--- a/src/views/baseCaseHandling/index.vue
+++ b/src/views/baseCaseHandling/index.vue
@@ -45,10 +45,10 @@
                     clearable
                   >
                     <el-option
-                      v-for="(item, index) in categoryOptions"
+                      v-for="(item, index) in systemTypeOptions"
                       :key="index"
-                      :label="item.fullName"
-                      :value="item.id"
+                      :label="item.FullName"
+                      :value="item.Id"
                     />
                   </el-select>
                 </el-form-item>
@@ -88,7 +88,7 @@
               <el-table-column prop="systemName" label="网站/APP名称" align="left" width="150" show-overflow-tooltip/>
               <el-table-column prop="registeredEntity" label="注册主体" align="left" show-overflow-tooltip/>
               <el-table-column label="类别" prop="category" align="left">
-                <template slot-scope="scope">{{ scope.row.category | dynamicText(categoryOptions) }}</template>
+                <template slot-scope="scope">{{ scope.row.category | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
               <el-table-column prop="recordNumber" label="备案号" align="left" show-overflow-tooltip/>
               <el-table-column prop="districtCounty" label="所属区（市）县" align="left" width="150">
@@ -103,7 +103,7 @@
               <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'" @click="addOrUpdateHandle(scope.row.id, false, 1)" >处理</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 == '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>
@@ -168,7 +168,7 @@ export default {
         { prop: "punishmentContent", label: "处罚内容" },
         { prop: "state", label: "状态" },
       ],
-      categoryOptions: [
+      systemTypeOptions: [
         { fullName: "选项一", id: "选项一" },
         { fullName: "", id: "选项二" },
       ],
@@ -186,6 +186,7 @@ export default {
     },
   },
   created() {
+    this.initSystemTypeList();
     this.initAreaTypeList();
     this.initStateTypeOption();
     this.initData();
@@ -213,7 +214,7 @@ export default {
       request({
         url: `/Extend/BaseCaseHandling`,
         method: "GET",
-        data: query,
+        params: query,
       }).then((res) => {
         this.list = res.data.list;
         this.total = res.data.pagination.total;
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 3fb556d..6f7f5e1 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -14,27 +14,13 @@
 					<el-col :span="4">
 						<el-form-item label="">
 							<el-select v-model="query.platformType" placeholder="请选择平台类型" clearable >
-								<el-option v-for="(item, index) in platformTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
-						</el-form-item>
-					</el-col>
-					<!-- <el-col :span="4">
-						<el-form-item label="">
-							<depSelect v-model="query.department" placeholder="请选择部门" />
-						</el-form-item>
-					</el-col> -->
-					<el-col :span="4">
-						<el-form-item label="">
-							<el-select v-model="query.questionType" placeholder="请选择问题类型" >
-								<el-option v-for="(item, index) in questionTypeOptions" :key="index" :label="item.fullName" :value="item.id"  />
+								<el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
 							</el-select>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-select v-model="query.questionClass" placeholder="请选择问题分类" clearable >
-								<el-option v-for="(item, index) in questionClassOptions" :key="index" :label="item.fullName" :value="item.id"  />
-							</el-select>
+							<el-input v-model="query.questionType" placeholder="请选择问题类型" clearable />	
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
@@ -53,13 +39,13 @@
                 <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">
-							<template slot-scope="scope">{{ scope.row.platformType | dynamicText(platformTypeOptions) }}</template>
+							<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="disposalSuggestions" 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">
 							<template slot-scope="scope">{{ scope.row.questionClass | dynamicText(questionClassOptions) }}</template>
@@ -86,11 +72,12 @@
 </template>
 <script>
     import request from '@/utils/request'
-    import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
     import NCCForm from './Form'
+    import infoMixin from "@/mixins/info";
     import ExportBox from './ExportBox'
     import { getList, previewDataInterface } from '@/api/systemData/dataInterface'
 	export default {
+        mixins: [infoMixin],
         components: { NCCForm, ExportBox },
         data() {
             return {
@@ -125,7 +112,7 @@
                     { prop: 'stage', label: '阶段' },
 				],
 				sourceOptions:[{"fullName":"市网信办线索","id":"市网信办线索"},{"fullName":"自主巡查发现","id":"自主巡查发现"}],
-				platformTypeOptions : [],
+				systemTypeOptions : [],
 				questionTypeOptions : [],
 				questionClassOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
 				stageOptions:[{"fullName":"选项一","id":"1"},{"fullName":"选项二","id":"2"}],
@@ -138,21 +125,10 @@
             },
         },
 		created() {
+			this.initSystemTypeList();
 			this.initData()
-			this.getplatformTypeOptions();
-			this.getquestionTypeOptions();
 		},
 		methods: {
-			getplatformTypeOptions(){
-				getDictionaryDataSelector('576279943168656645').then(res => {
-					this.platformTypeOptions = res.data.list
-				});
-			},
-			getquestionTypeOptions(){
-				getDictionaryDataSelector('577006814432855301').then(res => {
-					this.questionTypeOptions = res.data.list
-				});
-			},
 			initData() {
                 this.listLoading = true;
                 let _query = {
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index 39f03b3..5f86032 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -1,5 +1,5 @@
 <template>
-	<el-dialog :title="!dataForm.id ? '新建' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%">
+	<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-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" v-if="false" >
@@ -67,7 +67,7 @@
 		</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" :loading="btnLoading">确 定</el-button>
 		</span>
 	</el-dialog>
 </template>
@@ -99,6 +99,7 @@
 				rules: {
 				},
 				fileTypeOptions : [],
+				btnLoading: false,
 			}
 		},
 		computed: {},
@@ -137,6 +138,7 @@
 			dataFormSubmit() {
 				this.$refs['elForm'].validate((valid) => {
                     if (valid) {
+						this.btnLoading = true;
                         if (!this.dataForm.id) {
                             request({
                                 url: `/Extend/BasePrincipalResponsibility`,
@@ -148,11 +150,12 @@
                                     type: 'success',
                                     duration: 1000,
                                     onClose: () => {
+										this.btnLoading = false,
                                         this.visible = false,
                                             this.$emit('refresh', true)
                                     }
                                 })
-                            })
+                            }).catch(() => this.btnLoading = false);
                         } else {
                             request({
                                 url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
@@ -164,11 +167,12 @@
                                     type: 'success',
                                     duration: 1000,
                                     onClose: () => {
+										this.btnLoading = false,
                                         this.visible = false
                                         this.$emit('refresh', true)
                                     }
                                 })
-                            })
+                            }).catch(() => this.btnLoading = false);
                         }
                     }
                 })
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 1bc0d64..9df59ea 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -55,9 +55,9 @@
               </div>
             </div>
             <NCC-table v-loading="listLoading" :data="list">
-              <el-table-column prop="id" label="主键" align="left" />
-              <el-table-column prop="fileName" label="文件名" align="left" />
-              <el-table-column label="文件类型" prop="fileType" align="left">
+              <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>
@@ -66,27 +66,32 @@
                 prop="timeTakingEffect"
                 label="生效时间"
                 align="left"
+                show-overflow-tooltip
               />
               <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="创建时间"
                 align="left"
+                show-overflow-tooltip
               />
               <el-table-column
                 prop="lastModifyUserId"
                 label="修改用户"
+                show-overflow-tooltip
                 align="left"
               />
               <el-table-column
                 prop="lastModifyTime"
                 label="修改时间"
                 align="left"
+                show-overflow-tooltip
               />
               <el-table-column label="操作" fixed="right" width="100">
                 <template slot-scope="scope">
@@ -164,8 +169,8 @@ export default {
   },
   computed: {},
   created() {
-    // this.initData();
-    // this.getfileTypeOptions();
+    this.initData();
+    this.getfileTypeOptions();
   },
   methods: {
     getfileTypeOptions() {
@@ -276,8 +281,5 @@ export default {
     height: calc(100% - 47px);
     overflow-y: scroll;
   }
-  .item-body {
-    height: calc(100% - 35px);
-  }
 }
 </style>
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 99471e8..0834f78 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -51,11 +51,11 @@
               <el-table-column label="传达外协" prop="communicationOut" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ JSON.parse(scope.row.communicationOut) | dynamicText(communicationOutOptions) }}</template>
               </el-table-column>
-              <el-table-column prop="deadline" label="截止日期" align="left" :formatter="ncc.tableDateFormat" show-overflow-tooltip>
-                <template slot-scope="scope">
-                    <el-tag v-if="scope.row.deadline" :type="ncc.timeDeadLine(scope.row.deadline)">{{ ncc.tableDateFormat(scope.row, 'deadline', scope.row.deadline) }}</el-tag>
-                </template>
-              </el-table-column>
+              <el-table-column prop="deadline" label="截止日期" show-overflow-tooltip :formatter="ncc.tableDateFormat" width="175">
+                  <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">
                 <template slot-scope="scope">
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index f27ef7c..d987cbb 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -36,7 +36,7 @@
                 <el-form-item label="">
                   <el-select
                     v-model="query.proId"
-                    placeholder="请选择应用分类"
+                    placeholder="请先选择应用类型再选择类别"
                     :disabled="!query.systemType"
                     clearable
                   >
@@ -52,7 +52,7 @@
               <el-col :span="4">
                 <el-form-item label="">
                   <el-input
-                    v-model="query.contactUser"
+                    v-model="query.principalName"
                     placeholder="请输入联系人"
                   />
                 </el-form-item>
@@ -60,7 +60,7 @@
               <el-col :span="4">
                 <el-form-item label="">
                   <el-input
-                    v-model="query.contactPhone"
+                    v-model="query.principalPhone"
                     placeholder="请输入联系电话"
                   />
                 </el-form-item>
@@ -238,8 +238,8 @@ export default {
         keyword: "",
         systemType: "",
         systemClass: "",
-        contactUser: "",
-        contactPhone: "",
+        principalName: "",
+        principalPhone: "",
       },
       listQuery: {
         pageIndex: 1,
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index ae47d1a..6e19848 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -316,7 +316,7 @@ export default {
           formData = res.data.formData;
           this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
         });
-      } else if(row.taskType == '执法') {
+      } else if(row.taskType == '案件处理') {
         this.HandFormVisible = true;
         this.$nextTick(() => {
           this.$refs.HandForm.init(row.taskCorrelationId, false, 1);