From bc4f2fcb0ef909204e0735516a93e7a51c00ce6b Mon Sep 17 00:00:00 2001
From: monkeyhouyi <m19382021374@163.com>
Date: Wed, 20 Nov 2024 16:53:46 +0800
Subject: [PATCH] 1

---
 src/components/CompanyForm/index.vue             |  10 +++++-----
 src/components/InfoForm/index.vue                |  16 ++++++++--------
 src/views/DisposalSuggestions/index.vue          |   4 ++--
 src/views/baseComapnyInfo/Form.vue               |  10 +++++-----
 src/views/baseComapnyInfo/index.vue              |   8 ++++----
 src/views/basePrincipalResponsibility/Detail.vue | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/views/basePrincipalResponsibility/Form.vue   |   7 +++++--
 src/views/basePrincipalResponsibility/index.vue  |  14 ++++++++++++--
 src/views/baseSystemInfo/DetailForm.vue          |  22 +++++++++++-----------
 src/views/baseSystemInfo/index.vue               |   2 +-
 src/views/homePage/homePage.scss                 |   2 +-
 src/views/overView/Overview.vue                  |  18 ++++++++++++------
 12 files changed, 322 insertions(+), 47 deletions(-)
 create mode 100644 src/views/basePrincipalResponsibility/Detail.vue

diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue
index 0ea566b..d48b38c 100644
--- a/src/components/CompanyForm/index.vue
+++ b/src/components/CompanyForm/index.vue
@@ -17,7 +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="150px" label-position="right" :rules="rules">
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="9rem" 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%" }'>
@@ -31,13 +31,13 @@
 						</el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
+				<!-- <el-col :span="24">
 					<el-form-item label="社会信用代码" prop="socialCreditAgency">
 						<el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代码" clearable
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="24">
 					<el-form-item label="运营主体法人" prop="legalPerson">
 						<el-input v-model="dataForm.legalPerson" placeholder="请输入运营主体法人" clearable :style='{ "width": "100%" }'>
@@ -57,11 +57,11 @@
 						</el-input>
 					</el-form-item>
 				</el-col> -->
-				<el-col :span="24">
+				<!-- <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> -->
 				<el-col :span="24">
 					<el-form-item label="联系人" prop="contactUser">
 						<el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable
diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue
index b121fb3..40fbe2d 100644
--- a/src/components/InfoForm/index.vue
+++ b/src/components/InfoForm/index.vue
@@ -68,9 +68,9 @@
                 </div>
               </div>
               <div class="company-info-items">
-                <div :span="12">
+                <!-- <div :span="12">
                   社会信用代码：{{ companyInfo.socialCreditAgency || "--" }}
-                </div>
+                </div> -->
                 <div :span="12">
                   联系电话：{{ companyInfo.contactPhone || "--" }}
                 </div>
@@ -162,7 +162,7 @@
                 ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" v-show="isFilings">
+          <!-- <el-col :span="12" v-show="isFilings">
               <el-form-item label="特殊备案时间" prop="specialRecordTime">
                 <el-date-picker
                   v-model="infoForm.specialRecordTime"
@@ -171,7 +171,7 @@
                   style="width: 100%;">
                 </el-date-picker>
               </el-form-item>
-          </el-col>
+          </el-col> -->
           <!-- APP增加字段“安装次数” -->
           <el-col :span="12" v-show="infoForm.systemType == '576280004254500101'">
             <el-form-item label="安装次数" prop="systemDownloadVolume">
@@ -209,7 +209,7 @@
               ></el-input-number>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="备案许可证" prop="recordLicense">
               <el-input
                 v-model="infoForm.recordLicense"
@@ -217,7 +217,7 @@
                 maxlength="200"
               ></el-input>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="归属平台" prop="platform">
               <el-input
@@ -281,7 +281,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="24" class="icom-box">
+          <!-- <el-col :span="24" class="icom-box">
             <el-form-item label="应用图标" prop="systemIcon">
               <el-upload
                 class="avatar-uploader"
@@ -295,7 +295,7 @@
                 <i v-else class="el-icon-plus avatar-uploader-icon"></i>
               </el-upload>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="24">
             <el-form-item label="所属区（市）县" prop="areaId">
               <el-radio-group
diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue
index c173cb0..dca4cbb 100644
--- a/src/views/DisposalSuggestions/index.vue
+++ b/src/views/DisposalSuggestions/index.vue
@@ -67,7 +67,7 @@
                 name="excelfile"
               >
                 <div class="avatar-box">
-                  <el-button type="info" icon="el-icon-upload" size="mini">线索上报导入</el-button>
+                  <el-button type="warning" 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>
@@ -83,7 +83,7 @@
                 name="excelfile"
               >
                 <div class="avatar-box">
-                  <el-button type="info" icon="el-icon-upload" size="mini">处置结果导入</el-button>
+                  <el-button type="warning" icon="el-icon-upload" size="mini">处置结果导入</el-button>
                 </div>
               </el-upload>
           </div>
diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue
index 4b21dad..c899df6 100644
--- a/src/views/baseComapnyInfo/Form.vue
+++ b/src/views/baseComapnyInfo/Form.vue
@@ -2,7 +2,7 @@
 	<el-dialog :title="!dataForm.id ? '新增' : isDetail ? '详情' : '编辑'" :close-on-click-modal="false"
 		:visible.sync="visible" class="NCC-dialog NCC-dialog_center" lock-scroll width="70%" v-loading="loading">
 		<el-row :gutter="15" class="NCC-dialog-content">
-			<el-form ref="elForm" :model="dataForm" size="small" label-width="120px" label-position="right"
+			<el-form ref="elForm" :model="dataForm" size="small" label-width="9rem" label-position="right"
 				:disabled="!!isDetail" :rules="rules">
 				<el-col :span="24" v-if="false">
 					<el-form-item label="主键" prop="id">
@@ -17,13 +17,13 @@
 						</el-input>
 					</el-form-item>
 				</el-col>
-				<el-col :span="24">
+				<!-- <el-col :span="24">
 					<el-form-item label="社会信用代码" prop="socialCreditAgency">
 						<el-input v-model="dataForm.socialCreditAgency" placeholder="请输入社会信用代码" clearable
 							:style='{ "width": "100%" }'>
 						</el-input>
 					</el-form-item>
-				</el-col>
+				</el-col> -->
 				<el-col :span="24">
 					<el-form-item label="运营主体法人" prop="legalPerson">
 						<el-input v-model="dataForm.legalPerson" placeholder="请输入运营主体法人" clearable :style='{ "width": "100%" }'>
@@ -43,11 +43,11 @@
 						</el-input>
 					</el-form-item>
 				</el-col> -->
-				<el-col :span="24">
+				<!-- <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> -->
 				<el-col :span="24">
 					<el-form-item label="联系人" prop="contactUser">
 						<el-input v-model="dataForm.contactUser" placeholder="请输入联系人" clearable
diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue
index 22c2ab2..770349c 100644
--- a/src/views/baseComapnyInfo/index.vue
+++ b/src/views/baseComapnyInfo/index.vue
@@ -23,11 +23,11 @@
                   <el-input v-model="query.legalPerson" placeholder="运营主体法人" clearable/>
                 </el-form-item>
               </el-col>
-              <el-col :span="3">
+              <!-- <el-col :span="3">
                 <el-form-item label="">
                   <el-input v-model="query.socialCreditAgency" placeholder="社会信用代码" clearable/>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="4">
                 <el-form-item>
                   <el-button type="primary" icon="el-icon-search" @click="search()">搜索</el-button>
@@ -47,7 +47,7 @@
                 name="excelfile"
               >
                 <div class="avatar-box">
-                  <el-button type="info" icon="el-icon-upload" size="mini">导入</el-button>
+                  <el-button type="warning" 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>
@@ -57,7 +57,7 @@
             <NCC-table v-loading="listLoading" :data="list">
               <!-- <el-table-column prop="id" label="主键" align="left" /> -->
               <el-table-column prop="companyName" label="运营主体名称" show-overflow-tooltip align="left"/>
-              <el-table-column prop="socialCreditAgency" label="社会信用代码" show-overflow-tooltip align="left"/>
+              <!-- <el-table-column prop="socialCreditAgency" label="社会信用代码" show-overflow-tooltip align="left"/> -->
               <el-table-column prop="legalPerson" label="运营主体法人" show-overflow-tooltip align="left"/>
               <el-table-column prop="address" label="运营主体地址" align="left" />
               <el-table-column prop="contactPhone" show-overflow-tooltip label="联系电话" align="left"/>
diff --git a/src/views/basePrincipalResponsibility/Detail.vue b/src/views/basePrincipalResponsibility/Detail.vue
new file mode 100644
index 0000000..9adcd3c
--- /dev/null
+++ b/src/views/basePrincipalResponsibility/Detail.vue
@@ -0,0 +1,256 @@
+<template>
+	<el-dialog :title="!dataForm.id ? '新增' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="80%">
+		<el-row :gutter="15" class="NCC-dialog-content" v-loading="dialogLoading">
+            <h3 class="title-name">{{ dataForm.fileName }}</h3>
+            <div class="info-top">
+                <div>{{ ncc.dateFormat(dataForm.timeTakingEffect, 'YYYY-MM-DD') }}</div>
+                <div>{{ dataForm.fileType | dynamicText(fileTypeOptions) }}</div>
+            </div>
+            <div>
+                <el-input style="color: #000;" v-model="dataForm.content" placeholder="请输入具体内容" disabled show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":10,"maxRows":28}' >
+                </el-input>
+            </div>
+            <div class="info-file" v-if="dataForm.fileUrl && dataForm.fileUrl.length">
+                文件地址：
+                <NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" :disabled="!!isDetail"></NCC-UploadFz>
+            </div>
+				<!-- <el-form ref="elForm" :model="dataForm" size="small" label-width="110px" label-position="right" :disabled="!!isDetail" :rules="rules">
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="主键" prop="id">
+							<el-input v-model="dataForm.id" placeholder="请输入" clearable :style='{"width":"100%"}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('fileName')">
+						<el-form-item label="文件名" prop="fileName">
+							<el-input v-model="dataForm.fileName" placeholder="请输入文件名" clearable :style='{"width":"100%"}' />
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('fileType')">
+						<el-form-item label="文件类型" prop="fileType">
+							<el-radio-group v-model="dataForm.fileType">
+								<el-radio v-for="(item, index) in fileTypeOptions" :key="index" :label="item.id"  >{{item.fullName}}</el-radio>
+							</el-radio-group>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('otherFileType')" v-show="dataForm.fileType == '0'">
+						<el-form-item label="其他文件类型" prop="otherFileType">
+							<el-input v-model="dataForm.otherFileType" placeholder="请输入其他文件类型" clearable :style='{"width":"100%"}' />
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('timeTakingEffect')">
+						<el-form-item label="生效时间" prop="timeTakingEffect">
+							<el-date-picker v-model="dataForm.timeTakingEffect" placeholder="请选择生效日期" clearable :style='{"width":"100%"}' type='date' format="yyyy-MM-dd" value-format="timestamp" >
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('content')">
+						<el-form-item label="具体内容" prop="content">
+							<el-input v-model="dataForm.content" placeholder="请输入具体内容" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":10,"maxRows":25}' >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="ncc.hasFormP('fileUrl')">
+						<el-form-item label="文件地址" prop="fileUrl">
+							<NCC-UploadFz v-model="dataForm.fileUrl" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" :disabled="!!isDetail">
+							</NCC-UploadFz>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建用户" prop="creatorUserId">
+							<el-input v-model="dataForm.creatorUserId" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="创建时间" prop="creatorTime">
+							<el-input v-model="dataForm.creatorTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改用户" prop="lastModifyUserId">
+							<el-input v-model="dataForm.lastModifyUserId" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+					<el-col :span="24" v-if="false" >
+						<el-form-item label="修改时间" prop="lastModifyTime">
+							<el-input v-model="dataForm.lastModifyTime" placeholder="系统自动生成" readonly >
+							</el-input>
+						</el-form-item>
+					</el-col>
+				</el-form> -->
+		</el-row>
+		<span slot="footer" class="dialog-footer">
+			<el-button @click="visible = false">取 消</el-button>
+			<el-button type="primary" @click="dataFormSubmit()" v-if="!isDetail" :loading="btnLoading">确 定</el-button>
+		</span>
+	</el-dialog>
+</template>
+<script>
+    import ncc from '@/utils/ncc.js'
+	import request from '@/utils/request'
+	import { getDictionaryDataSelector } from '@/api/systemData/dictionary'
+	import { previewDataInterface } from '@/api/systemData/dataInterface'
+	export default {
+		components: {},
+		props: [],
+		data() {
+			var validateOtherFileType = (rule, value, callback) => {
+				if (this.dataForm.fileType == '0' &&  !value) {
+        		  callback(new Error('请输入其他文件类型'));
+        		} else {
+				  callback();
+				}
+			}
+			return {
+				loading: false,
+				visible: false,
+				isDetail: false,
+                dialogLoading: true,
+				dataForm: {
+					id:'',
+					id:undefined,
+					fileName:undefined,
+					fileType:undefined,
+					timeTakingEffect:undefined,
+					content:undefined,
+					fileUrl:[],
+					creatorUserId:undefined,
+					creatorTime:undefined,
+					lastModifyUserId:undefined,
+					lastModifyTime:undefined,
+					otherFileType: undefined,
+				},
+				rules: {
+					fileName: [{ required: true, message: '请输入文件名称', trigger: 'blur' }],
+					fileType: [{ required: true, message: '请选择文件类型', trigger: 'blur' }],
+					otherFileType: [{ validator: validateOtherFileType, trigger: 'blur' }],
+				},
+				fileTypeOptions : [],
+				btnLoading: false,
+			}
+		},
+		computed: {},
+        watch: {},
+        created() {
+		},
+		mounted() {
+        },
+		methods: {
+			async getfileTypeOptions(){
+				let res = await getDictionaryDataSelector('577087166203561221');
+				this.fileTypeOptions = [...res.data.list, { fullName: '其他', id: '0' }];
+			},
+			goBack() {
+                this.$emit('refresh')
+            },
+			async init(id, isDetail) {
+				this.dataForm.id = id || 0;
+                this.visible = true;
+                this.isDetail = isDetail || false;
+				this.dialogLoading = true;
+				await this.getfileTypeOptions();
+				this.$nextTick(() => {
+					// this.$refs['elForm'].resetFields();
+					if (this.dataForm.id) {
+						request({
+							url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
+							method: 'get'
+						}).then(res =>{
+							if(res.code != 200) return this.dialogLoading = false;
+							this.dataForm = res.data;
+							this.dataForm.fileUrl = res.data.fileUrlModel;
+                            this.setTileType(res.data.fileType);
+                            this.dialogLoading = false;
+						}).catch(() => this.dialogLoading = false)
+					} else {
+						this.dialogLoading = false;
+					}
+				})
+			},
+            setTileType(val) {
+                let index = this.fileTypeOptions.findIndex(v => v.id == val);
+                if(index == -1 || index == (this.fileTypeOptions.length - 1)) {
+                    this.dataForm.fileType = '0';
+                    this.dataForm.otherFileType = val;
+                } else {
+                    this.dataForm.fileType = val;
+                    this.dataForm.otherFileType = '';
+                }
+            },
+			dataFormSubmit() {
+				this.$refs['elForm'].validate((valid) => {
+                    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({
+                                url: `/Extend/BasePrincipalResponsibility`,
+                                method: 'post',
+                                data: this.dataForm,
+                            }).then((res) => {
+								if(res.code != 200) return this.btnLoading = false;
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                })
+                                this.visible = false;
+                                this.$emit('refresh', true);
+                            }).catch(() => this.btnLoading = false);
+                        } else {
+                            request({
+                                url: '/Extend/BasePrincipalResponsibility/' + this.dataForm.id,
+                                method: 'PUT',
+                                data: this.dataForm
+                            }).then((res) => {
+								if(res.code != 200) return this.btnLoading = false;
+                                this.$message({
+                                    message: res.msg,
+                                    type: 'success',
+                                    duration: 1000,
+                                })
+                                this.visible = false;
+                                this.$emit('refresh', true);
+                            }).catch(() => this.btnLoading = false);
+                        }
+                    }
+                })
+			},
+		}
+	}
+</script>
+<style lang="scss" scoped>
+.basePrincipalResponsibilityForm.NCC-dialog.NCC-dialog_center .el-dialog .el-dialog__body {
+	max-height: 80vh;
+}
+
+.basePrincipalResponsibilityForm {
+    .title-name {
+        text-align: center;
+    }
+    .info-top {
+        display: flex;
+        align-items: center;
+        justify-content: flex-end;
+        div {
+            margin: 0 10px;
+        }
+        border-bottom: #ccc solid 2px;
+        margin-bottom: 8px;
+    }
+    .info-file {
+        margin-top: 10px;
+    }
+	:deep(.el-radio) {
+		margin: 0 30px 8px 0;
+	}
+    :deep(.el-textarea.is-disabled .el-textarea__inner) {
+        color: #000;
+        cursor: unset;
+    }
+}
+</style>
diff --git a/src/views/basePrincipalResponsibility/Form.vue b/src/views/basePrincipalResponsibility/Form.vue
index 6d56c45..2446419 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 basePrincipalResponsibilityForm" lock-scroll width="40%">
+	<el-dialog :title="!dataForm.id ? '新增' :  isDetail ? '详情':'编辑'" :close-on-click-modal="false" :visible.sync="visible" class="NCC-dialog NCC-dialog_center basePrincipalResponsibilityForm" lock-scroll width="80%">
 		<el-row :gutter="15" class="NCC-dialog-content" v-loading="dialogLoading">
 				<el-form ref="elForm" :model="dataForm" size="small" label-width="110px" label-position="right" :disabled="!!isDetail" :rules="rules">
 					<el-col :span="24" v-if="false" >
@@ -33,7 +33,7 @@
 					</el-col>
 					<el-col :span="24" v-if="ncc.hasFormP('content')">
 						<el-form-item label="具体内容" prop="content">
-							<el-input v-model="dataForm.content" placeholder="请输入具体内容" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":4,"maxRows":4}' >
+							<el-input v-model="dataForm.content" placeholder="请输入具体内容" show-word-limit :style='{"width":"100%"}' type='textarea' :autosize='{"minRows":10,"maxRows":25}' >
 							</el-input>
 						</el-form-item>
 					</el-col>
@@ -210,6 +210,9 @@
 	}
 </script>
 <style lang="scss" scoped>
+.NCC-dialog.NCC-dialog_center .el-dialog .el-dialog__body {
+	max-height: 80vh;
+}
 .basePrincipalResponsibilityForm {
 	:deep(.el-radio) {
 		margin: 0 30px 8px 0;
diff --git a/src/views/basePrincipalResponsibility/index.vue b/src/views/basePrincipalResponsibility/index.vue
index 4564682..5fc13d8 100644
--- a/src/views/basePrincipalResponsibility/index.vue
+++ b/src/views/basePrincipalResponsibility/index.vue
@@ -46,7 +46,8 @@
               <!-- <el-table-column prop="lastModifyTime" :formatter="ncc.tableDateFormat" label="修改时间" align="left" show-overflow-tooltip/> -->
               <el-table-column label="操作" fixed="right" width="150">
                 <template slot-scope="scope">
-                  <el-button type="text" @click="addOrUpdateHandle(scope.row.id, true)" >详情</el-button>
+                  <!-- <el-button type="text" @click="addOrUpdateHandle(scope.row.id, true)" >详情</el-button> -->
+                  <el-button type="text" @click="toDetail(scope.row.id, true)" >详情</el-button>
                   <el-button type="text" @click="addOrUpdateHandle(scope.row.id)" >编辑</el-button>
                   <el-button type="text" @click="handleDel(scope.row.id)" class="NCC-table-delBtn" >删除</el-button>
                 </template>
@@ -61,6 +62,7 @@
           </div>
         </div>
         <NCC-Form v-if="formVisible" ref="NCCForm" @refresh="refresh" />
+        <Detail v-if="DetailVisible" ref="Detail"  />
         <ExportBox
           v-if="exportBoxVisible"
           ref="ExportBox"
@@ -74,10 +76,11 @@
 import request from "@/utils/request";
 import { getDictionaryDataSelector } from "@/api/systemData/dictionary";
 import NCCForm from "./Form";
+import Detail from "./Detail.vue";
 import ExportBox from "./ExportBox";
 import { previewDataInterface } from "@/api/systemData/dataInterface";
 export default {
-  components: { NCCForm, ExportBox },
+  components: { NCCForm, ExportBox, Detail },
   data() {
     return {
       query: {
@@ -108,6 +111,7 @@ export default {
         { prop: "lastModifyTime", label: "修改时间" },
       ],
       fileTypeOptions: [],
+      DetailVisible: false,
     };
   },
   computed: {},
@@ -144,6 +148,12 @@ export default {
         this.listLoading = false;
       });
     },
+    toDetail(id, isDetail) {
+      this.DetailVisible = true;
+      this.$nextTick(() => {
+        this.$refs.Detail.init(id, isDetail);
+      });
+    },
     handleDel(id) {
       this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
         type: "warning",
diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue
index d96f52c..9c7f6c0 100644
--- a/src/views/baseSystemInfo/DetailForm.vue
+++ b/src/views/baseSystemInfo/DetailForm.vue
@@ -71,12 +71,12 @@
                     <p class="text">{{ dataForm.specialRecordNumber || "--" }}</p>
                 </div>
               </el-col>
-              <el-col :span="24">
+              <!-- <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">特殊备案时间:</div>
                     <p class="text">{{ ncc.dateFormat(dataForm.specialRecordTime, 'YYYY-MM-DD HH:mm:ss') || "--" }}</p>
                 </div>
-              </el-col>
+              </el-col> -->
             </template>
             <el-col :span="24" v-if="dataForm.systemType == '576280004254500101'">
               <div class="form-item">
@@ -96,12 +96,12 @@
                   <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">
+            <!-- <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">备案许可证:</div>
                     <p class="text">{{ dataForm.recordLicense || "--" }}</p>
                 </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">归属平台:</div>
@@ -139,13 +139,13 @@
                     <p class="text">{{ dataForm.officeAddress || "--" }}</p>
                 </div>
             </el-col>
-            <el-col :span="24">
+            <!-- <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">应用图标:</div>
                     <img v-if="dataForm.systemIconModel" class="avatar" :src="define.comUrl + dataForm.systemIconModel.url">
                     <span v-else>无</span>
                 </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">所属区域:</div>
@@ -164,16 +164,16 @@
           <div class="company-info">
             <el-col :span="24">
                 <div class="form-item">
-                    <div class="label w-120">运营主体/个人名称:</div>
+                    <div class="label w-120">运营主体/个人:</div>
                     <p class="text">{{ companyForm.companyName || "--" }}</p>
                 </div>
             </el-col>
-            <el-col :span="24">
+            <!-- <el-col :span="24">
                 <div class="form-item">
                   <div class="label w-120">社会信用代码:</div>
                   <p class="text">{{ companyForm.socialCreditAgency || "--" }}</p>
                 </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">运营主体法人:</div>
@@ -186,14 +186,14 @@
                     <p class="text">{{ companyForm.address || "--" }}</p>
                 </div>
             </el-col>
-            <el-col :span="24">
+            <!-- <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">资质证明:</div>
                   <div class="text" style="width: calc(120% - 120px);">
                     <NCC-UploadFz v-model="companyForm.qualificationCertificate" :fileSize="5" sizeUnit="MB" :limit="9" buttonText="点击上传" disabled/>
                   </div>
                 </div>
-            </el-col>
+            </el-col> -->
             <el-col :span="24">
                 <div class="form-item">
                     <div class="label w-120">联系人:</div>
diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue
index 6667f11..b90dfe6 100644
--- a/src/views/baseSystemInfo/index.vue
+++ b/src/views/baseSystemInfo/index.vue
@@ -61,7 +61,7 @@
               <el-button type="primary" icon="el-icon-download" size="mini" @click="exportData('demo')">导出模板</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>
+                  <el-button type="warning" 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>
diff --git a/src/views/homePage/homePage.scss b/src/views/homePage/homePage.scss
index 2d2cccf..9123632 100644
--- a/src/views/homePage/homePage.scss
+++ b/src/views/homePage/homePage.scss
@@ -45,7 +45,7 @@
           }
           .el-button {
             height: 40px;
-            background: rgb(164, 173, 179);
+            // background: rgb(164, 173, 179);
             color: #fff;
             border-radius: 0 4px 4px 0;
             margin-right: 10px;
diff --git a/src/views/overView/Overview.vue b/src/views/overView/Overview.vue
index 9c896e5..86ebe35 100644
--- a/src/views/overView/Overview.vue
+++ b/src/views/overView/Overview.vue
@@ -263,7 +263,7 @@ export default {
       if(!isDetail && (type1 || type2)) {
         this.$message({
           message: '该消息已有区县/外协阅读无法编辑！',
-          type: 'warning'
+          type: 'error'
         });
       } else {
         this.MsgFormVisible = true;
@@ -277,8 +277,8 @@ export default {
       let type2 = row.communicationOutList.some((v) => v.IsRead)
       if(type1 || type2) {
         this.$message({
-          message: '该消息已有区县阅读无法编辑！',
-          type: 'warning'
+          message: '该消息已有区县阅读无法删除！',
+          type: 'error'
         });
       } else {
         this.$confirm('此操作将永久删除该消息, 是否继续?', '提示', {
@@ -419,6 +419,8 @@ export default {
       });
     },
     getDialog(type) {
+      console.log(type);
+      
       switch (type) {
         case '归属地变更':
           return { visible: 'HandleInspectFormVisible', node: 'HandleInspectForm', isDetail: true }
@@ -431,11 +433,15 @@ export default {
           return { visible: 'HandFormVisible', node: 'HandForm', isDetail: false, type: 2}
           break;
         case '研判':
-          return { visible: 'DisposalFormVisible', node: 'DisposalForm', isDetail: false}
-          break;
         case '进一步处置':
-          return { visible: 'DisposalHandleFormVisible', node: 'DisposalHandleForm', isDetail: false}
+          if(this.isSHILevel) {
+            return { visible: 'DisposalFormVisible', node: 'DisposalForm', isDetail: false}
+          } else {
+            return { visible: 'DisposalHandleFormVisible', node: 'DisposalHandleForm', isDetail: false}
+          }
           break;
+        // case '进一步处置':
+        //   break;
         default:
           break;
       }
--
libgit2 0.21.4