diff --git a/src/assets/style/common.scss b/src/assets/style/common.scss
index ad6b0dd..53ca7e2 100644
--- a/src/assets/style/common.scss
+++ b/src/assets/style/common.scss
@@ -83,6 +83,7 @@ a {
   }
   .text {
     flex: 1;
+    height: 30px;
   }
 }
 
diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index a92f476..6d21199 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -17,8 +17,7 @@
       class="NCC-dialog NCC-dialog_center company-dialog"
     >
 		<el-row :gutter="15" class="NCC-dialog-content">
-			<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right"
-				:disabled="!!isDetail" :rules="rules">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right" :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%" }'>
@@ -59,6 +58,25 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
+					<el-form-item label="资质证明" prop="qualificationCertificate">
+						<NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="联系人" prop="contactUser">
+						<el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="联系电话" prop="contactPhone">
+						<el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
          		  <el-form-item label="所属区县" prop="areaId">
          		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
          		      <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
@@ -103,6 +121,8 @@ export default {
 			contactInformation: undefined,
 			qualificationCertificate: [],
 			otherInfo: undefined,
+			contactUser: undefined,
+			contactPhone: undefined
 		},
 		rules: {
 			companyName: [
@@ -112,10 +132,10 @@ export default {
 					trigger: 'blur'
 				},
 			],
-			contactInformation: [
+			contactPhone: [
 				{
 					pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-					message: '请输入正确的联系方式',
+					message: '请输入正确的联系电话',
 					trigger: 'blur'
 				},
 			],
@@ -126,15 +146,15 @@ export default {
   watch: {},
   mounted() {},
   created() {
-	this.initAreaTypeList();
   },
   methods: {
     close() {
       this.visible = false;
     },
-    openDialog() {
-      this.visible = true;
-			this.$refs['elForm'].resetFields();
+    async openDialog() {
+      	this.visible = true;
+		await this.initAreaTypeList();
+		this.$refs['elForm'].resetFields();
     },
     async dataFormSubmit() {
       	this.$refs['elForm'].validate((valid) => {
diff --git a/src/components/Generator/components/Upload/UploadFz.vue b/src/components/Generator/components/Upload/UploadFz.vue
index 27f68fe..59c30b6 100644
--- a/src/components/Generator/components/Upload/UploadFz.vue
+++ b/src/components/Generator/components/Upload/UploadFz.vue
@@ -3,7 +3,7 @@
     <el-upload :action="define.comUploadUrl+'/'+type" :headers="uploadHeaders" ref="elUpload"
       :on-success="handleSuccess" :multiple="limit!==1" :show-file-list="false" :accept="accept"
       :before-upload="beforeUpload" :on-exceed="handleExceed" :disabled="disabled" :limit="limit" v-if="!disabled">
-      <el-button size="small" icon="el-icon-upload" :disabled="disabled">{{buttonText}}</el-button>
+      <el-button size="small" icon="el-icon-upload" :disabled="disabled" :on-preview="handlePreview">{{buttonText}}</el-button>
       <div slot="tip" class="el-upload__tip" v-show="showTip">
         只能上传不超过{{fileSize}}{{sizeUnit}}的{{accept}}文件
       </div>
@@ -117,6 +117,9 @@ export default {
     handleExceed(files, fileList) {
       this.$message.warning(`当前限制最多可以上传${this.limit}个文件`);
     },
+    handlePreview(file) {
+        // console.log(file);
+    },
     handleRemove(file, index) {
       this.fileList.splice(index, 1)
       this.$refs.elUpload.uploadFiles.splice(index, 1)
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 8f00997..b281107 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -32,7 +32,6 @@
                   v-model="infoForm.companyId"
                   placeholder="请选择运营主体"
                   clearable
-                  v-loadMore="nextCompanyList"
                   style="width: 100%"
                   @change="companyChange"
                 >
@@ -47,7 +46,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="4">
-              <companyForm />
+              <companyForm @refresh="initCompanyList"/>
             </el-col>
           </el-col>
           <el-col :span="24" v-if="isShowCompanyInfo">
@@ -73,7 +72,16 @@
               </div>
             </div>
           </el-col>
-          <el-col :span="24">
+          <el-col :span="12">
+            <el-form-item label="应用名称" prop="systemName">
+              <el-input
+                v-model="infoForm.systemName"
+                placeholder="请输入应用名称"
+                maxlength="50"
+              ></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
             <el-form-item label="应用类型" prop="systemType">
               <el-radio-group v-model="infoForm.systemType">
                 <el-radio
@@ -86,17 +94,34 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-show="isFilings">
-            <el-col :span="12">
-               <el-form-item label="特殊备案类型" prop="specialRecordType">
+          <el-col :span="12">
+            <el-form-item label="应用分类" prop="systemClass">
+              <el-select
+                v-model="infoForm.systemClass"
+                placeholder="请选择应用分类"
+                :disabled="!infoForm.systemType"
+                style="width: 100%"
+              >
+                <el-option
+                  v-for="item in systemClassOptions"
+                  :key="item.Id"
+                  :label="item.ClassName"
+                  :value="item.Id"
+                >
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isFilings">
+             <el-form-item label="特殊备案类型" prop="specialRecordType">
                 <el-select v-model="infoForm.specialRecordType" placeholder="请选择特殊备案类型" style="width: 100%;">
                   <el-option v-for="v in specialRecordTypeOption" :key="v.id" :label="v.fullName" :value="v.id" />
                 </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="24">
-              <el-form-item label="特殊备案内容" prop="specialRecordContent">
-                <el-input
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" v-show="isFilings">
+            <el-form-item label="特殊备案内容" prop="specialRecordContent">
+              <el-input
                   v-model="infoForm.specialRecordContent"
                   placeholder="请输入"
                   show-word-limit
@@ -104,19 +129,19 @@
                   type="textarea"
                   :autosize="{ minRows: 4, maxRows: 4 }"
                 >
-                </el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="特殊备案号" prop="specialRecordNumber">
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isFilings">
+            <el-form-item label="特殊备案号" prop="specialRecordNumber">
                 <el-input
                   v-model="infoForm.specialRecordNumber"
                   placeholder="请输入特殊备案号"
                   maxlength="200"
                 ></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="isFilings">
               <el-form-item label="特殊备案时间" prop="specialRecordTime">
                 <el-date-picker
                   v-model="infoForm.specialRecordTime"
@@ -125,33 +150,42 @@
                   style="width: 100%;">
                 </el-date-picker>
               </el-form-item>
-            </el-col>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="应用名称" prop="systemName">
-              <el-input
-                v-model="infoForm.systemName"
-                placeholder="请输入系统名称"
-                maxlength="50"
-              ></el-input>
+          <!-- APP增加字段“安装次数” -->
+          <el-col :span="12" v-show="infoForm.systemType == '576280004254500101'">
+            <el-form-item label="安装次数" prop="systemDownloadVolume">
+              <el-input-number
+                v-model="infoForm.systemDownloadVolume"
+                placeholder="请输入安装次数"
+                :min="0"
+                :precision="0"
+                controls-position="right"
+                style="width: 100%;"
+              ></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="应用分类" prop="systemClass">
-              <el-select
-                v-model="infoForm.systemClass"
-                placeholder="请选择系统分类"
-                :disabled="!infoForm.systemType"
-                style="width: 100%"
-              >
-                <el-option
-                  v-for="item in systemClassOptions"
-                  :key="item.Id"
-                  :label="item.ClassName"
-                  :value="item.Id"
-                >
-                </el-option>
-              </el-select>
+          <el-col :span="12" v-show="infoForm.systemType == '576280043370579205' || infoForm.systemType == '576280085330396421'">
+            <el-form-item label="月活" prop="MAU">
+              <el-input-number
+                v-model="infoForm.MAU"
+                placeholder="请输入月活"
+                :min="0"
+                :precision="0"
+                controls-position="right"
+                style="width: 100%;"
+              ></el-input-number>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" v-show="infoForm.systemType == '580634746028033285'">
+            <el-form-item label="粉丝量" prop="followerCount">
+              <el-input-number
+                v-model="infoForm.followerCount"
+                placeholder="请输入粉丝量"
+                :min="0"
+                :precision="0"
+                controls-position="right"
+                style="width: 100%;"
+              ></el-input-number>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -181,7 +215,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="下载量" prop="systemDownloadVolume">
               <el-input
                 v-model.number="infoForm.systemDownloadVolume"
@@ -189,7 +223,7 @@
                 placeholder="请输入下载量"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="版本" prop="version">
               <el-input
@@ -258,7 +292,7 @@
         </el-form>
       </div>
       <span slot="footer" class="dialog-footer">
-        <el-button @click="close">取消</el-button>
+        <el-button @click="visible = false">取消</el-button>
         <el-button type="primary" @click="confirm" :loading="btnLoading">确认</el-button>
       </span>
     </el-dialog>
@@ -266,11 +300,10 @@
 </template>
 
 <script>
-import { getCompanyInfoList, getCompanyInfoById } from "@/api/baseData/company";
-import { getSystemTypeList, uploader } from "@/api/common";
-import { getSystemClassSelect } from "@/api/baseData/systemClass";
-import { getAreaSelect } from "@/api/baseData/area";
+import { getCompanyInfoById } from "@/api/baseData/company";
+import { uploader } from "@/api/common";
 import { addSystem, updataSystem, getSystemDetail } from "@/api/baseData/info";
+import request from "@/utils/request";
 import infoMixin from "@/mixins/info";
 
 export default {
@@ -290,6 +323,7 @@ export default {
     return {
       uploadHeaders: { Authorization: this.$store.getters.token },
       visible: false,
+      isDetail: false,
       infoForm_loading: false,
       infoForm: {
         companyId: "", // 主体企业
@@ -311,21 +345,23 @@ export default {
         specialRecordNumber: '',
         specialRecordTime: '',
         systemIconModel: '',
+        MAU: '',
+        followerCount: 0,
       },
       infoRules: {
         systemName: {
           required: true,
-          message: "请输入系统名称",
+          message: "请输入应用名称",
           trigger: "blur",
         },
         systemClass: {
           required: true,
-          message: "请输入系统分类",
+          message: "请输入应用分类",
           trigger: "blur",
         },
         systemType: {
           required: true,
-          message: "请输入系统类型",
+          message: "请输入应用类型",
           trigger: "blur",
         },
         companyId: {
@@ -367,7 +403,11 @@ export default {
   methods: {
     handleAvatarSuccess(response, file, fileList) {
       if(response.code != 200) return;
-      this.infoForm.systemIconModel = response.data;
+      this.infoForm.systemIconModel = {
+        fileId: response.data.name,
+        name: file.name,
+        url: response.data.url,
+      };
       this.$forceUpdate();
       this.$message({
         showClose: true,
@@ -377,15 +417,12 @@ export default {
     },
     // 请求公司列表
     async initCompanyList() {
-      let { data } = await getCompanyInfoList(this.listQuery_company);
-      this.companyOptions = [...this.companyOptions, ...data.list];
-      this.total_company = data.pagination.total;
-    },
-    // 无限下拉
-    nextCompanyList() {
-      if (this.total_company != 0 && this.total_company == this.companyOptions.length) return;
-      this.listQuery_company.pageIndex++;
-      this.initCompanyList();
+      request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.companyOptions = data;
+      })
     },
     async companyChange(val) {
       // 公司信息
@@ -437,13 +474,16 @@ export default {
     async initForm() {
       let { data } = await getSystemDetail(this.systemId);
       this.infoForm = data;
-      this.handleSystemTypeChange(data.systemType);
+      this.handleSystemTypeChange(data.systemType, data.systemClass);
       data.companyId && await this.companyChange(data.companyId);
       this.$forceUpdate();
     },
     handleSystemTypeChange(val) {
       this.isFilings = Boolean(val != '580634746028033285');
-      this.infoForm.systemClass = "";
+      this.infoForm.systemClass = this.infoForm.systemClass || '';
+      this.infoForm.systemDownloadVolume = this.infoForm.systemDownloadVolume || '';
+      this.infoForm.MAU = this.infoForm.MAU || '';
+      this.infoForm.followerCount = this.infoForm.followerCount || '';
       this.initSystemClassList(val);
     },
     async confirm() {
diff --git a/src/main.js b/src/main.js
index 3973367..980ed2c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -58,6 +58,14 @@ Vue.directive('loadMore', {
     })
   }
 })
+Vue.directive('removeAriaHidden', {
+  bind(el, binding) {
+    let ariaEls = el.querySelectorAll('.el-radio__original');
+    ariaEls.forEach((item) => {
+      item.removeAttribute('aria-hidden');
+    });
+  }
+});
 export default new Vue({
   router,
   store,
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index a2802a4..5b9b7dd 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -6,28 +6,39 @@
     class="NCC-dialog NCC-dialog_center"
     lock-scroll
     width="60%"
-    v-loading="loading"
   >
-    <el-row :gutter="15" class="NCC-dialog-content">
+    <el-row :gutter="15" class="NCC-dialog-content" v-loading="loading">
       <el-col :span="10" style="border-right: 1px solid #e6e6e6; height: 400px;">
         <el-row>
             <el-col :span="24" class="form_title"> 巡查上报详情 </el-col>
             <el-col :span="24">
               <div class="form-item">
                 <div class="label w-100">问题来源：</div>
-                {{ dataForm.source || "--" }}
+                {{ dataForm.reportSourceName || '--' }}
               </div>
             </el-col>
             <el-col :span="24">
               <div class="form-item">
-                <div class="label w-100">系统名称：</div>
-                {{ dataForm.platformName || "--" }}
+                <div class="label w-100">应用名称：</div>
+                {{ dataForm.platformNameStr || "--" }}
               </div>
             </el-col>
             <el-col :span="24">
               <div class="form-item">
-                <div class="label w-100">系统类型：</div>
-                {{ dataForm.platformType || "--" }}
+                <div class="label w-100">运营主体：</div>
+                {{ dataForm.companyStr || "--" }}
+              </div>
+            </el-col>
+            <el-col :span="24">
+              <div class="form-item">
+                <div class="label w-100">应用类型：</div>
+                {{ dataForm.platformTypeStr || "--" }}
+              </div>
+            </el-col>
+            <el-col :span="24" v-if="dataForm.platformType == '580634746028033285'">
+              <div class="form-item">
+                <div class="label w-100">归属平台：</div>
+                {{ dataForm.selfMediaPlatformType || "--" }}
               </div>
             </el-col>
             <el-col :span="24">
@@ -52,25 +63,14 @@
             </template>
             <el-col :span="24">
               <div class="form-item">
-                <div class="label w-100">关键词：</div>
-                {{ dataForm.questionClass || "--" }}
-              </div>
-            </el-col>
-            <el-col :span="24">
-              <div class="form-item">
                 <div class="label w-100">问题内容：</div>
                 {{ dataForm.questionContent || "--" }}
               </div>
             </el-col>
             <el-col :span="24">
               <div class="form-item">
-                <div class="label w-100">有害链接：</div>
-                {{ dataForm.link || "--" }}
-              </div>
-            </el-col>
-            <el-col :span="24">
-              <div class="form-item">
-                <div class="label w-100">取证内容：</div>
+                <div class="label w-100">关键词：</div>
+                {{ dataForm.questionClass || "--" }}
               </div>
             </el-col>
             <el-col :span="24">
@@ -109,10 +109,10 @@
                 </el-radio-group>
               </el-form-item>
             </el-col>
-            <el-col :span="24" v-if="!dataForm.areaId && showarea">
+            <el-col :span="24" v-show="(!dataForm.areaId || dataForm.areaId == '580548871316383493') && showarea">
               <el-form-item label="所属区县" prop="area">
-                <el-radio-group v-model="suggestionForm.area" placeholder="请选择所属区县" style="line-height: 22px">
-                  <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
+                <el-radio-group v-removeAriaHidden v-model="suggestionForm.area" placeholder="请选择所属区县" style="line-height: 22px" @change="suggestionFormAreaChange">
+                  <el-radio v-for="v in areaOptions.filter(j => j.id != '580548871316383493')" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
                 </el-radio-group>
               </el-form-item>
             </el-col>
@@ -158,6 +158,8 @@ export default {
       dataForm: {
         id: undefined,
         platformName: undefined,
+        platformNameStr: undefined,
+        platformTypeStr: undefined,
         platformType: undefined,
         questionType: undefined,
         questionClass: undefined,
@@ -166,10 +168,7 @@ export default {
         obtainEvidence: [],
         annex: [],
       },
-      sourceOptions: [
-        { fullName: "市网信办线索", id: "市网信办线索" },
-        { fullName: "自主巡查发现", id: "自主巡查发现" },
-      ],
+      sourceOptions: [],
       platformTypeOptions: [],
       questionTypeOptions: [],
       questionClassOptions: [
@@ -214,13 +213,19 @@ export default {
   },
   watch: {},
   created() {
+    this.getSourceOptions();
     this.initAreaTypeList();
-    this.getplatformTypeOptions();
-    this.getquestionTypeOptions();
     this.getjudgmentClassOptions();
   },
   mounted() {},
   methods: {
+    async getSourceOptions() {
+      let { data } = await request({
+        url: `/Extend/baseinspectionreport/GetReportSourceList`,
+        method: "GET",
+      });
+      this.sourceOptions = data;
+    },
     getplatformTypeOptions() {
       getDictionaryDataSelector("576279943168656645").then((res) => {
         this.platformTypeOptions = res.data.list;
@@ -246,20 +251,27 @@ export default {
       this.dataForm.id = id || 0;
       this.visible = true;
       this.showSuggsetion = false;
+      this.showarea = false;
       this.$nextTick(async () => {
         this.$refs["suggestionForm"].resetFields();
         if (this.dataForm.id) {
           this.loading = true;
           let res = await getDetail(this.dataForm.id);
           this.dataForm = res.data;
-          this.loading = false;
           this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
-          this.suggestionForm.area = res.data.areaId
+          this.suggestionFormAreaChange(res.data.areaId)
+          this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName;
           if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
           if (!this.dataForm.annex) this.dataForm.annex = [];
+          this.loading = false;
         }
       });
     },
+    suggestionFormAreaChange(val) {
+      if(val == '580548871316383493') return;
+      this.suggestionForm.area = val;
+      this.$forceUpdate();
+    },
     judgmentClassChange(v) {
       this.suggestionForm.judgmentOpinions = '';
       this.showSuggsetion = Boolean(v == "590769458901943557" || v == "590769521820697861"); // 进一步处置，不采纳
diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue
index 0dbd30f..5df07e9 100644
--- a/src/views/DisposalSuggestions/HandleForm.vue
+++ b/src/views/DisposalSuggestions/HandleForm.vue
@@ -15,19 +15,19 @@
               <el-col :span="24">
                 <div class="form-item">
                   <div class="label w-100">问题来源：</div>
-                  {{ dataForm.source || "--" }}
+                  {{ dataForm.reportSourceName || "--" }}
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
                   <div class="label w-100">应用名称：</div>
-                  {{ dataForm.platformName || "--" }}
+                  {{ dataForm.platformNameStr || "--" }}
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
                   <div class="label w-100">应用类型：</div>
-                  {{ dataForm.platformType || "--" }}
+                  {{ dataForm.platformTypeStr || "--" }}
                 </div>
               </el-col>
               <el-col :span="24">
@@ -52,25 +52,14 @@
               </template>
               <el-col :span="24">
                 <div class="form-item">
-                  <div class="label w-100">关键词</div>
-                  {{ dataForm.questionClass || "--" }}
-                </div>
-              </el-col>
-              <el-col :span="24">
-                <div class="form-item">
                   <div class="label w-100">问题内容：</div>
                   {{ dataForm.questionContent || "--" }}
                 </div>
               </el-col>
               <el-col :span="24">
                 <div class="form-item">
-                  <div class="label w-100">有害链接：</div>
-                  {{ dataForm.link || "--" }}
-                </div>
-              </el-col>
-              <el-col :span="24">
-                <div class="form-item">
-                  <div class="label w-100">取证内容</div>
+                  <div class="label w-100">关键词</div>
+                  {{ dataForm.questionClass || "--" }}
                 </div>
               </el-col>
               <el-col :span="24">
@@ -185,13 +174,20 @@
     },
     watch: {},
     created() {
-      this.initAreaTypeList();
-      this.getplatformTypeOptions();
-      this.getquestionTypeOptions();
-      this.getjudgmentClassOptions();
+      this.getSourceOptions();
+      // this.getplatformTypeOptions();
+      // this.getquestionTypeOptions();
+      // this.getjudgmentClassOptions();
     },
     mounted() {},
     methods: {
+      async getSourceOptions() {
+        let { data } = await request({
+          url: `/Extend/baseinspectionreport/GetReportSourceList`,
+          method: "GET",
+        });
+        this.sourceOptions = data;
+      },
       getplatformTypeOptions() {
         getDictionaryDataSelector("576279943168656645").then((res) => {
           this.platformTypeOptions = res.data.list;
@@ -224,6 +220,7 @@
             let res = await getDetail(this.dataForm.id);
             this.dataForm = res.data;
             this.loading = false;
+            this.dataForm.reportSourceName = this.sourceOptions.find(v => v.Id == this.dataForm.reportSource).FullName;
             this.dataForm.areaName = dynamicText(res.data.areaId, this.areaOptions);
             this.suggestionForm.area = res.data.areaId
             if (!this.dataForm.obtainEvidence) this.dataForm.obtainEvidence = [];
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index 4f22aaa..b39f27e 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">上报线索研判</div>
+   <div class="item-title">{{isSHILevel ? '上报线索研判' : '巡查处理'}}上报线索研判</div>
    <div class="item-body">
        <div class="NCC-common-layout">
        <div class="NCC-common-layout-center">
@@ -44,7 +44,7 @@
                    <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="creatorTime" label="录入时间" align="left" :formatter="ncc.tableDateFormat"/>
                    <!-- <el-table-column show-overflow-tooltip prop="disposalSuggestions" label="处置建议" align="left" />
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index 9ab65fb..eb743a3 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -44,6 +44,25 @@
 					</el-form-item>
 				</el-col>
 				<el-col :span="24">
+					<el-form-item label="资质证明" prop="qualificationCertificate">
+						<NCC-UploadFz v-model="dataForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" />
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="联系人" prop="contactUser">
+						<el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
+					<el-form-item label="联系电话" prop="contactPhone">
+						<el-input v-model="dataForm.contactPhone" placeholder="请输入联系电话" clearable
+							:style='{ "width": "100%" }'>
+						</el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="24">
          		  <el-form-item label="所属区县" prop="areaId">
          		    <el-radio-group v-model="dataForm.areaId" placeholder="请选择所属区县" style="line-height: 22px">
          		      <el-radio v-for="v in areaOptions" :key="v.id" :label="v.id">{{ v.fullName }}</el-radio>
@@ -91,6 +110,8 @@ export default {
 				qualificationCertificate: [],
 				otherInfo: undefined,
 				areaId: undefined,
+				contactUser: undefined,
+				contactPhone: undefined
 			},
 			rules: {
 				companyName: [
@@ -100,10 +121,10 @@ export default {
 						trigger: 'blur'
 					},
 				],
-				contactInformation: [
+				contactPhone: [
 					{
 						pattern: /^1[3456789]\d{9}$|^0\d{2,3}-?\d{7,8}$/,
-						message: '请输入正确的联系方式',
+						message: '请输入正确的联系段话',
 						trigger: 'blur'
 					},
 				],
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index 2a883e3..4f4355b 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -3,12 +3,12 @@
     :title="!dataForm.id ? '新建' : isDetail ? '详情' : '编辑'"
     :close-on-click-modal="false"
     :visible.sync="visible"
-    class="NCC-dialog NCC-dialog_center baseInspectionReportForm"
+    class="NCC-dialog NCC-dialog_center dialog-box baseInspectionReportForm"
     lock-scroll
     width="50%"
     :modal="false"
   >
-    <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail">
+    <el-row :gutter="15" class="NCC-dialog-content" v-if="!isDetail" v-loading="form_loading">
       <el-form
         ref="elForm"
         :model="dataForm"
@@ -75,7 +75,7 @@
             </el-radio-group>
           </el-form-item>
         </el-col>
-        <el-col :span="23" v-show="dataForm.platformType == '580634746028033285' && !isDisabledTypeByName">
+        <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>
@@ -198,6 +198,7 @@ export default {
       visible: false,
       name_loading: false,
       isDetail: false,
+      form_loading: true,
       dataForm: {
         id: undefined,
         reportSource: undefined,
@@ -252,13 +253,7 @@ export default {
     }
   },
   watch: {},
-  created() {
-    this.initCompanyList();
-    this.loadList();
-    this.getSourceOptions();
-    this.getplatformTypeOptions();
-    this.getquestionTypeOptions();
-  },
+  created() {},
   mounted() {},
   methods: {
     async initCompanyList() {
@@ -305,14 +300,13 @@ export default {
       this.platformTypeOptions = list;
     },
     async getSourceOptions() {
-      request({
+      let { data } = await request({
         url: `/Extend/baseinspectionreport/GetReportSourceList`,
         method: "GET",
-      }).then(({data}) => {
-        this.sourceOptions = data;
-      })
+      });
+      this.sourceOptions = data;
     },
-    getquestionTypeOptions() {
+    async getquestionTypeOptions() {
       getDictionaryDataSelector("577006814432855301").then((res) => {
         this.questionTypeOptions = [...res.data.list, {Id: '0', fullName: '其他'}];
       });
@@ -320,14 +314,22 @@ export default {
     goBack() {
       this.$emit("refresh");
     },
-    init(id, isDetail) {
+    async init(id, isDetail) {
       this.dataForm.id = id || '';
       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();
       this.$nextTick(async () => {
         !isDetail && this.$refs["elForm"].resetFields();
         if (this.dataForm.id) {
+          this.form_loading = true;
           let res = await getDetail(this.dataForm.id);
+          if(res.code != 200) return this.form_loading = false;
           if(!res.data) return;
           this.dataForm = res.data;
           if(this.questionTypeOptions.findIndex(v => v.fullName == this.dataForm.questionType) == -1) {
@@ -335,16 +337,20 @@ export default {
             this.dataForm.questionType = '其他';
           }
           this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--';
+          this.form_loading = false;
+        } else {
+          this.form_loading = false;
         }
       });
     },
     dataFormSubmit() {
       this.$refs["elForm"].validate(async (valid) => {
         if (valid) {
+          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.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);
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 6f636e2..59148af 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -13,7 +13,7 @@
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="">
-							<el-select v-model="query.platformType" placeholder="请选择应用类型" clearable >
+							<el-select v-model="query.platformType" placeholder="请选择系统类型" clearable >
 								<el-option v-for="(item, index) in systemTypeOptions" :key="index" :label="item.FullName" :value="item.Id"  />
 							</el-select>
 						</el-form-item>
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index a8f573f..f415b4f 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -94,7 +94,7 @@
 				loading: false,
 				visible: false,
 				isDetail: false,
-                dialogLoading: false,
+                dialogLoading: true,
 				dataForm: {
 					id:'',
 					id:undefined,
@@ -128,7 +128,7 @@
 		methods: {
 			getfileTypeOptions(){
 				getDictionaryDataSelector('577087166203561221').then(res => {
-					this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }]
+					this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }];
 				});
 			},
 			goBack() {
@@ -147,6 +147,7 @@
 							method: 'get'
 						}).then(res =>{
 							this.dataForm = res.data;
+							this.dataForm.fileUrl = res.data.fileUrlModel;
                             this.setTileType(res.data.fileType);
                             this.dialogLoading = false;
 						}).catch(() => this.dialogLoading = false)
@@ -167,6 +168,7 @@
 				this.$refs['elForm'].validate((valid) => {
                     if (valid) {
 						this.dataForm.fileType = this.dataForm.fileType == '0' ? this.dataForm.otherFileType : this.dataForm.fileType;
+						delete this.dataForm.fileUrlModel;
 						this.btnLoading = true;
                         if (!this.dataForm.id) {
                             request({
diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue
index 8917b21..4581527 100644
--- a/src/views/baseSpecialAction/index.vue
+++ b/src/views/baseSpecialAction/index.vue
@@ -14,7 +14,9 @@
               <el-col :span="6">
                 <el-form-item label="">
                   <el-select v-model="query.state" placeholder="请选择状态" clearable>
+                    <el-option label="已存档" value="已存档"></el-option>
                     <el-option label="已发布" value="已发布"></el-option>
+                    <el-option label="已发布并部署" value="已发布并部署"></el-option>
                     <el-option label="未发布" value="未发布"></el-option>
                   </el-select>
                 </el-form-item>
diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue
index 150ed56..c642cee 100644
--- a/src/views/baseSpecialhandle/index.vue
+++ b/src/views/baseSpecialhandle/index.vue
@@ -50,7 +50,7 @@
                 <template slot-scope="scope">
                   <el-button type="text" @click="toDetail(scope.row)">行动详情</el-button>
                   <el-button type="text" @click="toFillForm(scope.row)" :disabled="ncc.timeDeadLine(scope.row.deadline) == 'danger' && scope.row.state == '已填写'">{{scope.row.state == '已填写' ? '修改' : '处理'}}</el-button>
-                  <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'" v-if="isSHILevel">处理情况</el-button>
+                  <el-button type="text" @click="toFillForm(scope.row, true)" :disabled="scope.row.state != '已填写'">详情</el-button>
                 </template>
               </el-table-column>
             </NCC-table>
@@ -77,6 +77,7 @@
 import NCCForm from '@/views/baseSpecialAction/dynamicModel/list/Form'
 import request from "@/utils/request";
 import FormPage from "@/views/baseSpecialAction/FormPage.vue";
+import { Loading } from 'element-ui';
 
 export default {
   components: { NCCForm, FormPage },
@@ -157,6 +158,12 @@ export default {
       });
     },
     toFillForm(row, isDetail) {
+      let loadingInstance = Loading.service({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(255, 255, 255, 0.7)'
+      });
       this.dialogVisible = true;
       var  Itemid = row.itemId || '';//数据id，没有的话就是新增 ，有的话就是修改
       var  modelId = row.formId;//关联的表单id
@@ -172,7 +179,8 @@ export default {
         formData = JSON.parse(res.data.formData);
         formData.disabled = isDetail || false;
         let form = JSON.stringify(formData);
-        this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail)
+        this.$refs.NCCForm.init(form, modelId, Itemid, isPreview, useFormPermission, taskId, isDetail);
+        loadingInstance.close();
       });
     
       // this.nestedPageUrl = `http://8.130.38.56:8043/old/#/previewModel?isPreview=1&id=${row.originId}`;
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index 940d5d1..d8f1b1a 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -23,6 +23,18 @@
                     <p class="text">{{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}</p>
                 </div>
             </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">应用名称:</div>
+                    <p class="text">{{ dataForm.systemName || "--" }}</p>
+                </div>
+            </el-col>
+            <el-col :span="24">
+                <div class="form-item">
+                    <div class="label w-100">应用分类:</div>
+                    <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p>
+                </div>
+            </el-col>
             <template
               v-if="
                 dataForm.systemType &&
@@ -54,17 +66,23 @@
                 </div>
               </el-col>
             </template>
-            <el-col :span="24">
-                <div class="form-item">
-                    <div class="label w-100">应用名称:</div>
-                    <p class="text">{{ dataForm.systemName || "--" }}</p>
-                </div>
+            <el-col :span="24" v-if="dataForm.systemType == '576280004254500101'">
+              <div class="form-item">
+                  <div class="label w-100">安装次数:</div>
+                  <p class="text">{{ dataForm.systemDownloadVolume || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
+              </div>
             </el-col>
-            <el-col :span="24">
-                <div class="form-item">
-                    <div class="label w-100">应用分类:</div>
-                    <p class="text">{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}</p>
-                </div>
+            <el-col :span="24" v-if="dataForm.systemType == '576280043370579205' || dataForm.systemType == '576280085330396421'">
+              <div class="form-item">
+                  <div class="label w-100">月活:</div>
+                  <p class="text">{{ dataForm.MAU || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
+              </div>
+            </el-col>
+            <el-col :span="24" v-if="dataForm.systemType == '580634746028033285'">
+              <div class="form-item">
+                  <div class="label w-100">粉丝量:</div>
+                  <p class="text">{{ dataForm.followerCount || "--" }}<span class="start-span">更新时间：{{ ncc.dateFormat(dataForm.lastModifyTime) || ncc.dateFormat(dataForm.creatorTime) }}</span></p>
+              </div>
             </el-col>
             <el-col :span="24">
                 <div class="form-item">
@@ -84,12 +102,12 @@
                     <p class="text">{{ dataForm.domain || "--" }}</p>
                 </div>
             </el-col>
-            <el-col :span="24">
+            <!-- <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-100">下载量:</div>
                     <p class="text">{{ dataForm.systemDownloadVolume || "--" }}</p>
                 </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-100">版本:</div>
@@ -158,7 +176,7 @@
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-100">联系方式:</div>
-                    <p class="text">{{ companyForm.contactPhone || "--" }}</p>
+                    <p class="text">{{ companyForm.contactInformation || "--" }}</p>
                 </div>
             </el-col>
             <el-col :span="24">
@@ -432,7 +450,7 @@ export default {
       });
     },
 
-    addOrUpdateHandle(row, isDetail) {
+    addOrUpdateHandle(row) {
       switch (this.activeName) {
         case "3":
         this.ReportFormVisible = true;
@@ -495,4 +513,10 @@ export default {
   border-radius: 6px;
   margin-left: 10px;
 }
+.start-span {
+  margin-left: 10px;
+  color: red;
+  font-size: 12px;
+  line-height: 30px;
+}
 </style>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index a348176..ee2fcde 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -7,7 +7,7 @@
         <div class="NCC-common-layout-center">
           <el-row class="NCC-common-search-box" :gutter="5">
             <el-form @submit.native.prevent size="mini">
-              <el-col :span="5">
+              <el-col :span="4">
                 <el-form-item label="">
                   <el-input
                     clearable
@@ -36,7 +36,7 @@
               <el-col :span="3">
                 <el-form-item label="">
                   <el-select
-                    v-model="query.proId"
+                    v-model="query.systemClass"
                     placeholder="请选择应用分类"
                     :disabled="!query.systemType"
                     clearable
@@ -66,14 +66,10 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="2">
+              <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-button icon="el-icon-refresh-right" @click="reset()">重置</el-button>
                 </el-form-item>
               </el-col>
             </el-form>
@@ -96,36 +92,16 @@
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
             <NCC-table v-loading="loading" :data="infoDataList">
-              <el-table-column
-                show-overflow-tooltip
-                prop="companyName"
-                label="运营主体名称"
-                align="center"
-              />
-              <el-table-column
-                show-overflow-tooltip
-                prop="systemName"
-                label="应用名称"
-                align="center"
-              />
+              <el-table-column show-overflow-tooltip prop="companyName" label="运营主体名称" align="center"/>
+              <el-table-column show-overflow-tooltip prop="systemName" label="应用名称" align="center"/>
               <el-table-column label="应用类型" prop="systemType" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.systemType | dynamicTextUP(systemTypeOptions) }}</template>
               </el-table-column>
-              <el-table-column label="应用分类" prop="systemClass" align="left" show-overflow-tooltip>
+              <el-table-column label="应用分类" prop="systemClassStr" align="left" show-overflow-tooltip>
                 <!-- <template slot-scope="scope">{{ scope.row.systemClass | dynamicTextUP(systemTypeOptions) }}</template> -->
               </el-table-column>
-              <el-table-column
-                show-overflow-tooltip
-                prop="contactUser"
-                label="联系人"
-                align="center"
-              />
-              <el-table-column
-                show-overflow-tooltip
-                prop="contactPhone"
-                label="联系电话"
-                align="center"
-              />
+              <el-table-column show-overflow-tooltip prop="contactUser" label="联系人" align="center"/>
+              <el-table-column show-overflow-tooltip prop="contactPhone" label="联系电话" align="center"/>
               <el-table-column label="所属区域" prop="areaId" align="left" show-overflow-tooltip>
                 <template slot-scope="scope">{{ scope.row.areaId | dynamicText(areaOptions) }}</template>
               </el-table-column>
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 5d767b8..1fe30ad 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -151,6 +151,7 @@ import HandForm from '@/views/baseCaseHandling/Form.vue'
 import DisposalForm from "@/views/DisposalSuggestions/Form.vue";
 // 巡查处理
 import DisposalHandleForm from "@/views/DisposalSuggestions/HandleForm.vue";
+import { Loading } from 'element-ui';
 export default {
   name: "Overview",
   components: { MsgForm, HandleInspectForm, NCCForm, HandForm, DisposalForm, DisposalHandleForm },
@@ -308,6 +309,12 @@ export default {
     },
     async handleTask(row) {
       if(row.taskType == '专项行动') {
+        let loadingInstance = Loading.service({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255, 255, 255, 0.7)'
+        });
         this.formVisible = true;
         // let data = await this.getBaseSpecialActionInfo('588008032122701061');
         let data = await this.getBaseSpecialActionInfo(row.taskCorrelationId);
@@ -323,7 +330,8 @@ export default {
           params:null
         }).then(res => {
           formData = res.data.formData;
-          this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId)
+          this.$refs.NCCForm.init(formData, modelId, Itemid, isPreview, useFormPermission, taskId);
+          loadingInstance.close();
         });
       } else {
         let type = row.taskType;