diff --git a/src/components/Generator/components/Upload/UploadFz.vue b/src/components/Generator/components/Upload/UploadFz.vue
index d21cf5b..27f68fe 100644
--- a/src/components/Generator/components/Upload/UploadFz.vue
+++ b/src/components/Generator/components/Upload/UploadFz.vue
@@ -2,7 +2,7 @@
   <div class="UploadFile-container">
     <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">
+      :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>
       <div slot="tip" class="el-upload__tip" v-show="showTip">
         只能上传不超过{{fileSize}}{{sizeUnit}}的{{accept}}文件
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index 5e68982..3f68328 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="infoForm">
+  <div class="infoFormDialog">
     <div class="userSelect-input" @click="openDialog">
       <slot></slot>
     </div>
@@ -230,17 +230,13 @@
             <el-form-item label="应用图标" prop="systemIcon">
               <el-upload
                 class="avatar-uploader"
-                action="#"
+                :action="define.APIURl + '/api/file/Uploader/annex'"
+                :headers="uploadHeaders"
                 :show-file-list="false"
-                :limit="1"
-                :multiple="false"
-                :http-request="httpRequest"
-              >
-                <img
-                  v-if="infoForm.systemIcon"
-                  :src="infoForm.systemIcon"
-                  class="avatar"
-                />
+                :on-success="handleAvatarSuccess"
+                accept="image/*"
+                >
+                <img v-if="infoForm.systemIcon" :src="define.comUrl + infoForm.systemIcon" class="avatar">
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
@@ -292,6 +288,7 @@ export default {
   },
   data() {
     return {
+      uploadHeaders: { Authorization: this.$store.getters.token },
       visible: false,
       infoForm_loading: false,
       infoForm: {
@@ -368,6 +365,16 @@ export default {
   mounted() {},
   created() {},
   methods: {
+    handleAvatarSuccess(response, file, fileList) {
+      if(response.code != 200) return;
+      this.infoForm.systemIcon = response.data.url;
+      this.$forceUpdate();
+      this.$message({
+        showClose: true,
+        message: response.code == 200 ? '文件上传成功' : '文件上传失败',
+        type: response.code == 200 ? 'success' : 'error',
+      });
+    },
     // 请求公司列表
     async initCompanyList() {
       let { data } = await getCompanyInfoList(this.listQuery_company);
@@ -431,7 +438,7 @@ export default {
       let { data } = await getSystemDetail(this.systemId);
       this.infoForm = data;
       this.handleSystemTypeChange(data.systemType);
-      await this.companyChange(data.companyId);
+      data.companyId && await this.companyChange(data.companyId);
       this.$forceUpdate();
     },
     handleSystemTypeChange(val) {
@@ -440,6 +447,7 @@ export default {
       this.initSystemClassList(val);
     },
     async confirm() {
+      console.log(this.infoForm);
       this.$refs["infoForm"].validate((valid) => {
         if (valid) {
           this.btnLoading = true;
diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue
index c5c2513..a2802a4 100644
--- a/src/views/DisposalSuggestions/Form.vue
+++ b/src/views/DisposalSuggestions/Form.vue
@@ -136,7 +136,7 @@
     </el-row>
     <span slot="footer" class="dialog-footer">
       <el-button @click="visible = false">取 消</el-button>
-      <el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
+      <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">确 定</el-button>
     </span>
   </el-dialog>
 </template>
@@ -203,6 +203,7 @@ export default {
       showarea: false,
       judgmentClassOption: [],
       areaOptions: [],
+      btnLoading: false,
     };
   },
   computed: {
@@ -271,7 +272,9 @@ export default {
             ...this.suggestionForm,
             id: this.dataForm.id,
           };
+          this.btnLoading = true;
           let res = await disposalSuggestions(obj);
+          if(res.code != 200) return this.btnLoading = false;
           this.$message({
             message: res.msg,
             type: "success",
diff --git a/src/views/DisposalSuggestions/HandleForm.vue b/src/views/DisposalSuggestions/HandleForm.vue
index a2850c1..0dbd30f 100644
--- a/src/views/DisposalSuggestions/HandleForm.vue
+++ b/src/views/DisposalSuggestions/HandleForm.vue
@@ -112,7 +112,7 @@
       </el-row>
       <span slot="footer" class="dialog-footer">
         <el-button @click="visible = false">取 消</el-button>
-        <el-button type="primary" @click="dataFormSubmit()">确 定</el-button>
+        <el-button type="primary" @click="dataFormSubmit()" :loading="btnLoading">确 定</el-button>
       </span>
     </el-dialog>
   </template>
@@ -174,6 +174,7 @@
         showarea: false,
         judgmentClassOption: [],
         areaOptions: [],
+        btnLoading: false,
       };
     },
     computed: {
@@ -242,7 +243,9 @@
               ...this.suggestionForm,
               id: this.dataForm.id,
             };
+            this.btnLoading = true;
             let res = await disposalSuggestions(obj);
+            if(res.code != 200) return this.btnLoading = false;
             this.$message({
               message: res.msg,
               type: "success",
diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue
index e349cf3..6e71ff3 100644
--- a/src/views/baseComapnyInfo/index.vue
+++ b/src/views/baseComapnyInfo/index.vue
@@ -29,7 +29,7 @@
             </el-form>
             <div class="NCC-common-search-box-right">
               <el-button type="success" icon="el-icon-plus" @click="addOrUpdateHandle()" size="mini" >新增</el-button>
-              <!-- <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button>
+              <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button>
               <el-upload
                 class="uploadXlax"
                 :action="define.APIURl + '/api/Extend/basecomapnyinfo/Actions/ImportByExcel'"
@@ -37,13 +37,12 @@
                 :on-success="toUpload"
                 :show-file-list="false"
                 name="excelfile"
-                accept="image/*"
               >
                 <div class="avatar-box">
-                  <el-button type="primary" icon="el-icon-download" size="mini">导入</el-button>
+                  <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
                 </div>
               </el-upload>
-              <el-button type="primary" icon="el-icon-download" :loading="exportBtnLoading" size="mini" @click="exportData()">导出</el-button> -->
+              <el-button type="primary" icon="el-icon-download" :loading="exportBtnLoading" size="mini" @click="exportData()">导出</el-button>
             </div>
           </el-row>
           <div class="NCC-common-layout-main NCC-flex-main">
@@ -162,41 +161,48 @@ export default {
       });
     },
     toUpload(response, file, fileList) {
-      console.log(response, file, fileList);
+      this.$message({
+        showClose: true,
+        message: response.msg,
+        type: response.code == 200 ? 'success' : 'error',
+        close: () => {
+          response.code == 200 && this.initData();
+        }
+      });
     },
     exportData(type) {
       let obj = {};
       if(type) {
         obj = {
           url: '/Extend/basecomapnyinfo/Actions/GenerateImportTemplate',
+          responseType: 'blob',
           method: "GET",
         }
       } else {
-        let _query = {
-          ...this.query,
-        };
-        let query = {};
-        for (let key in _query) {
-          if (Array.isArray(_query[key])) {
-            query[key] = _query[key].join();
-          } else {
-            query[key] = _query[key];
-          }
-        }
-        obj ={
-          url: '/Extend/basecomapnyinfo/Actions/ImportByExcel',
+        obj = {
+          url: '/Extend/basecomapnyinfo/Actions/Export',
           method: "POST",
-          data: query,
+          data: this.query,
         }
       };
       request(obj).then((res) => {
-        console.log(res);
-        const url = define.APIURl + res.data.url;
-        const link = document.createElement("a");
-        link.href = url;
-        link.download = res.data.name;
-        link.click();
-      }).catch(() => this.exportBtnLoading = false);
+        if(type) {
+          const blob = new Blob([res], {type: 'application/json'});
+          const url = window.URL.createObjectURL(blob);
+          let link = document.createElement('a');
+          link.style.display = 'none';
+          link.href = url;
+          link.download = '公司录入模板.xlsx';
+          link.click();
+        } else {
+          if(res.code != 200) return;
+          const url = define.APIURl + res.data.url;
+          const link = document.createElement("a");
+          link.href = url;
+          link.download = res.data.name;
+          link.click();
+        }
+      })
     },
     exportForm(url) {
       const link = document.createElement("a");
diff --git a/src/views/baseInspectionReport/Form.vue b/src/views/baseInspectionReport/Form.vue
index f5236b8..b64d594 100644
--- a/src/views/baseInspectionReport/Form.vue
+++ b/src/views/baseInspectionReport/Form.vue
@@ -134,21 +134,21 @@
     <el-row v-else>
       <el-col class="form-item">
         <div class="label">问题来源：</div>
-        <div class="text">{{ dataForm.reportSource || '--' }}</div>
+        <div class="text">{{ sourceOptions.find(v => v.Id == dataForm.reportSource).FullName || '--' }}</div>
       </el-col>
       <el-col class="form-item">
         <div class="label">应用名称：</div>
-        <div class="text">{{ dataForm.platformName || '--' }}</div>
+        <div class="text">{{ dataForm.platformNameStr || '--' }}</div>
       </el-col>
       <el-col class="form-item">
         <div class="label">运营主体：</div>
-        <div class="text">{{ dataForm.company || '--' }}</div>
+        <div class="text">{{ dataForm.companyStr || '--' }}</div>
       </el-col>
       <el-col class="form-item">
         <div class="label">应用类型：</div>
-        <div class="text">{{ dataForm.platformType || '--' }}</div>
+        <div class="text">{{ dataForm.platformTypeStr || '--' }}</div>
       </el-col>
-      <el-col class="form-item">
+      <el-col class="form-item" v-if="dataForm.platformType == '580634746028033285'">
         <div class="label">归属平台：</div>
         <div class="text">{{ dataForm.selfMediaPlatformType || '--' }}</div>
       </el-col>
@@ -174,7 +174,7 @@
       </el-col>
       <el-col class="form-item">
         <div class="label">附件：</div>
-        <!-- <div class="text">{{ dataForm.questionContent || '--' }}</div> -->
+        <NCC-UploadFz v-model="dataForm.annex" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
       </el-col>
     </el-row>
     <span slot="footer" class="dialog-footer">
@@ -201,6 +201,9 @@ export default {
       dataForm: {
         id: undefined,
         reportSource: undefined,
+        platformNameStr: undefined,
+        platformTypeStr: undefined,
+        companyStr: undefined,
         platformName: '',
         selfMediaPlatformType: '',
         platformType: undefined,
@@ -277,6 +280,7 @@ export default {
       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 : '';
     },
@@ -331,7 +335,6 @@ export default {
             this.dataForm.questionType = '其他';
           }
           this.dataForm.selfMediaPlatformType = res.data.selfMediaPlatformType || '--';
-          if (!this.dataForm.annex) this.dataForm.annex = [];
         }
       });
     },
diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue
index 3335405..6f636e2 100644
--- a/src/views/baseInspectionReport/index.vue
+++ b/src/views/baseInspectionReport/index.vue
@@ -39,7 +39,6 @@
                           :on-error="uploadError"
                           :show-file-list="false"
                           name="excelfile"
-                          accept="image/*"
                         >
                           <div class="avatar-box">
                             <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
@@ -89,7 +88,7 @@
     import infoMixin from "@/mixins/info";
     import ExportBox from './ExportBox'
     import { getList, previewDataInterface } from '@/api/systemData/dataInterface'
-import { message } from '@/utils/message';
+    import define from '@/utils/define'
 	export default {
         mixins: [infoMixin],
         components: { NCCForm, ExportBox },
@@ -196,6 +195,9 @@ import { message } from '@/utils/message';
                   showClose: true,
                   message: response.msg,
                   type: response.code == 200 ? 'success' : 'error',
+                  close: () => {
+                    response.code == 200 && this.initData();
+                  }
                 });
             },
             uploadError() { 
@@ -203,7 +205,6 @@ import { message } from '@/utils/message';
             },
             exportData(type) {
                 let obj = {}
-                this.listLoading = true;
                 if(type) {
                     obj = {
                         url: '/Extend/BaseInspectionReport/Actions/GenerateImportTemplate',
@@ -211,23 +212,10 @@ import { message } from '@/utils/message';
                         responseType: 'blob',
                     }
                 } else {
-                    let _query = {
-                        ...this.listQuery,
-                        ...this.query
-                    };
-                    let query = {}
-                    for (let key in _query) {
-                        if (Array.isArray(_query[key])) {
-                            query[key] = _query[key].join()
-                        } else {
-                            query[key] = _query[key]
-                        }
-                    }
                     obj = {
                         url: '/Extend/BaseInspectionReport/Actions/Export',
                         method: "POST",
-                        data: query,
-                        responseType: 'blob',
+                        data: this.query,
                     }
                 }
                 request(obj).then((res) => {
@@ -248,7 +236,6 @@ import { message } from '@/utils/message';
                     link.click();
                   }
                 });
-                this.listLoading = false;
             },
 			search() {
                 this.listQuery = {
diff --git a/src/views/baseListHazardousSamples/index.vue b/src/views/baseListHazardousSamples/index.vue
index 3a20966..49efccc 100644
--- a/src/views/baseListHazardousSamples/index.vue
+++ b/src/views/baseListHazardousSamples/index.vue
@@ -40,7 +40,7 @@
                 <el-form-item label="">
                   <el-select
                     v-model="query.company"
-                    placeholder="请选择主体企业"
+                    placeholder="请选择运营主体"
                     clearable
                   >
                     <el-option
@@ -54,18 +54,7 @@
               </el-col>
               <el-col :span="5">
                 <el-form-item label="">
-                  <el-select
-                    v-model="query.websitePlatform"
-                    placeholder="请选择网站平台"
-                    clearable
-                  >
-                    <el-option
-                      v-for="(item, index) in websitePlatformOptions"
-                      :key="index"
-                      :label="item.systemName"
-                      :value="item.id"
-                    />
-                  </el-select>
+                  <el-input v-model="query.questionType" clearable placeholder="请输入问题类型" />
                 </el-form-item>
               </el-col>
               <el-col :span="3">
@@ -129,7 +118,7 @@ export default {
         content: undefined,
         harmfulInformationTypes: undefined, // 有害类型
         company: undefined,
-        websitePlatform: undefined,
+        questionType: undefined,
       },
       list: [],
       listLoading: false,
@@ -157,13 +146,11 @@ export default {
         { prop: "lastModifyUserId", label: "修改用户" },
         { prop: "lastModifyTime", label: "修改时间" },
       ],
-      harmfulInformationTypesOptions: [],
       levelOptions: [
-        { fullName: "巡查上报", id: "巡查上报" },
-        { fullName: "案件处理", id: "案件处理" },
+        { fullName: "核查处置", id: "核查处置" },
+        { fullName: "网信执法", id: "网信执法" },
       ],
       companyOptions: [],
-      websitePlatformOptions: [],
 
       // 导出
       exportBtnLoading: false,
@@ -174,25 +161,16 @@ export default {
   computed: {},
   created() {
     this.initData();
-    this.getharmfulInformationTypesOptions();
     this.getcompanyOptions();
-    // this.getwebsitePlatformOptions();
   },
   methods: {
-    getharmfulInformationTypesOptions() {
-      getDictionaryDataSelector("577006896326640901").then((res) => {
-        this.harmfulInformationTypesOptions = res.data.list;
-      });
-    },
     getcompanyOptions() {
-      previewDataInterface("576296400682222853").then((res) => {
-        this.companyOptions = res.data;
-      });
-    },
-    getwebsitePlatformOptions() {
-      previewDataInterface("576295179435115781").then((res) => {
-        this.websitePlatformOptions = res.data;
-      });
+      request({
+        url: `/Extend/basecomapnyinfo/GetNoPagingList`,
+        method: "GET",
+      }).then(({data}) => {
+        this.companyOptions = data;
+      })
     },
     initData() {
       this.listLoading = true;
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index 61e16ab..a8f573f 100644
--- a/src/views/basePrincipalResponsibility/Form.vue
+++ b/src/views/basePrincipalResponsibility/Form.vue
@@ -148,7 +148,6 @@
 						}).then(res =>{
 							this.dataForm = res.data;
                             this.setTileType(res.data.fileType);
-							if(!this.dataForm.fileUrl)this.dataForm.fileUrl=[];
                             this.dialogLoading = false;
 						}).catch(() => this.dialogLoading = false)
 					}
@@ -166,7 +165,6 @@
             },
 			dataFormSubmit() {
 				this.$refs['elForm'].validate((valid) => {
-					console.log(valid);
                     if (valid) {
 						this.dataForm.fileType = this.dataForm.fileType == '0' ? this.dataForm.otherFileType : this.dataForm.fileType;
 						this.btnLoading = true;
@@ -176,6 +174,7 @@
                                 method: 'post',
                                 data: this.dataForm,
                             }).then((res) => {
+								if(res.code != 200) return this.btnLoading = false;
                                 this.$message({
                                     message: res.msg,
                                     type: 'success',
@@ -190,6 +189,7 @@
                                 method: 'PUT',
                                 data: this.dataForm
                             }).then((res) => {
+								if(res.code != 200) return this.btnLoading = false;
                                 this.$message({
                                     message: res.msg,
                                     type: 'success',
diff --git a/src/views/baseSpecialAction/Form.vue b/src/views/baseSpecialAction/Form.vue
index 7545092..8244fa9 100644
--- a/src/views/baseSpecialAction/Form.vue
+++ b/src/views/baseSpecialAction/Form.vue
@@ -293,6 +293,7 @@ export default {
           ...this.dataForm,
           state: type
         }
+        console.log(obj);
         let url = !this.dataForm.id ? '/Extend/BaseSpecialAction/Release' : '/Extend/BaseSpecialAction/Update';
         let method = !this.dataForm.id ? 'PUT' : 'POST';
         this.toPostForm(url, method, obj);
diff --git a/src/views/baseSpecialAction/FormPage.vue b/src/views/baseSpecialAction/FormPage.vue
index 7b87d48..195c815 100644
--- a/src/views/baseSpecialAction/FormPage.vue
+++ b/src/views/baseSpecialAction/FormPage.vue
@@ -23,6 +23,18 @@
           {{ v }}
         </el-tag>
       </div>
+      <div class="tag-group">
+        <span class="tag-group__title title-tag">附件:</span>
+        <NCC-UploadFz
+          v-model="dataForm.annex"
+          :fileSize="5"
+          sizeUnit="MB"
+          :limit="9"
+          buttonText="点击上传"
+          disabled
+        >
+        </NCC-UploadFz>
+      </div>
       <div class="tag-group" v-if="dataForm.deadline">
         <span class="tag-group__title title-tag">截止时间:</span>
         {{ ncc.dateFormat(dataForm.deadline) || '--' }}
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index ab4721f..86a8153 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -117,7 +117,8 @@
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-100">应用图标:</div>
-                    {{ dataForm.systemIcon || "--" }}
+                    <img v-if="dataForm.systemIcon" class="avatar" :src="define.comUrl + dataForm.systemIcon">
+                    <span v-else>无</span>
                 </div>
             </el-col>
           </div>
@@ -275,6 +276,7 @@ export default {
         link: undefined,
         obtainEvidence: [],
         annex: [],
+        systemIcon: '',
       },
       systemTypeOptions: [],
       systemClassOptions: [],
@@ -485,4 +487,12 @@ export default {
 //     }
 //   }
 // }
+.avatar {
+  width: 100px;
+  height: 100px;
+  display: block;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  margin-left: 10px;
+}
 </style>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 051f001..a348176 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -50,7 +50,7 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <el-form-item label="">
                   <el-input
                     v-model="query.principalName"
@@ -58,7 +58,7 @@
                   />
                 </el-form-item>
               </el-col>
-              <el-col :span="4">
+              <el-col :span="3">
                 <el-form-item label="">
                   <el-input
                     v-model="query.principalPhone"
@@ -79,7 +79,18 @@
             </el-form>
             <div class="NCC-common-search-box-right">
               <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</el-button>
-              <!-- <el-button type="success" icon="el-icon-upload2" size="mini">导入</el-button> -->
+              <el-upload
+                class="uploadXlax"
+                :action="define.APIURl + '/api/Extend/basesysteminfo/Actions/ImportByExcel'"
+                :headers="uploadHeaders"
+                :on-success="uploadSuccess"
+                :show-file-list="false"
+                name="excelfile"
+              >
+                <div class="avatar-box">
+                  <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
+                </div>
+              </el-upload>
               <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData()">导出</el-button>
             </div>
           </el-row>
@@ -216,6 +227,7 @@ export default {
   data() {
     return {
       loading: false,
+      uploadHeaders: { Authorization: this.$store.getters.token },
       query: {
         keyword: "",
         systemType: "",
@@ -294,6 +306,16 @@ export default {
     },
   },
   methods: {
+    uploadSuccess(response, file, fileList) {
+        this.$message({
+          showClose: true,
+          message: response.msg,
+          type: response.code == 200 ? 'success' : 'error',
+          close: () => {
+            response.code == 200 && this.initData();
+          }
+        });
+    },
     handleSystemTypeChange(val) {
       this.query.systemClass = "";
       this.initSystemClassList(val);
@@ -398,6 +420,7 @@ export default {
         obj = {
           url: '/Extend/basesysteminfo/Actions/GenerateImportTemplate',
           method: "GET",
+          responseType: 'blob',
         }
       } else {
         obj ={
@@ -466,4 +489,8 @@ export default {
     overflow-y: scroll;
   }
 }
+.uploadXlax {
+  display: inline-block;
+  margin: 0 8px;
+}
 </style>