瀏覽代碼

fix 框架

master
张泽亮 2 週之前
父節點
當前提交
1a2df9ea7e
共有 4 個文件被更改,包括 22 次插入26 次删除
  1. +2
    -2
      src/components/FileUpload/index.vue
  2. +3
    -11
      src/components/ImageUpload/index.vue
  3. +13
    -11
      src/views/system/dept/index.vue
  4. +4
    -2
      src/views/system/dict/index.vue

+ 2
- 2
src/components/FileUpload/index.vue 查看文件

@@ -67,12 +67,12 @@ export default {
// 大小限制(MB)
fileSize: {
type: Number,
default: 5
default: 50
},
// 文件类型, 例如['png', 'jpg', 'jpeg']
fileType: {
type: Array,
default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf", "zip", "rar", "mp4"]
},
// 是否显示提示
isShowTip: {


+ 3
- 11
src/components/ImageUpload/index.vue 查看文件

@@ -30,16 +30,8 @@
的文件
</div>

<el-dialog
:visible.sync="dialogVisible"
title="预览"
width="800"
append-to-body
>
<img
:src="dialogImageUrl"
style="display: block; max-width: 100%; margin: 0 auto"
/>
<el-dialog :visible.sync="dialogVisible" title="预览" width="800" append-to-body>
<img :src="dialogImageUrl" style="display: block; max-width: 100%; margin: 0 auto"/>
</el-dialog>
</div>
</template>
@@ -256,7 +248,7 @@ export default {

::v-deep .el-upload-list--picture-card.is-disabled + .el-upload--picture-card {
display: none !important;
}
}

// 去掉动画效果
::v-deep .el-list-enter-active,


+ 13
- 11
src/views/system/dept/index.vue 查看文件

@@ -4,10 +4,10 @@
<el-form-item label="区划名称" prop="deptName">
<el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="导入代码" prop="importCode">
<el-form-item label="级联代码" prop="importCode">
<el-input v-model="queryParams.importCode" placeholder="请输入导入代码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="行政代码" prop="orgCode">
<el-form-item label="区划代码" prop="orgCode">
<el-input v-model="queryParams.orgCode" placeholder="请输入行政代码" clearable @keyup.enter.native="handleQuery"/>
</el-form-item>
<el-form-item label="状态" prop="status">
@@ -37,7 +37,7 @@
<el-table v-loading="loading" :data="deptList" >
<el-table-column prop="orgCode" label="行政区划代码" width="150"></el-table-column>
<el-table-column prop="deptName" label="行政区划名称" width="260"></el-table-column>
<el-table-column prop="importCode" label="导入代码" width="150"></el-table-column>
<el-table-column prop="importCode" label="导入级联代码" width="150"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="100"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<template slot-scope="scope">
@@ -125,7 +125,7 @@
<el-descriptions-item label="邮箱">{{ form.email }}</el-descriptions-item>
<el-descriptions-item label="部门状态"><el-tooltip effect="light" :content="form.status" placement="right"><dict-tag :options="dict.type.sys_normal_disable" :value="form.status"/></el-tooltip></el-descriptions-item>
<el-descriptions-item label="删除标志">{{ form.delFlag }}</el-descriptions-item>
<el-descriptions-item label="部门导入代码">{{ form.importCode }}</el-descriptions-item>
<el-descriptions-item label="导入级联代码">{{ form.importCode }}</el-descriptions-item>
<el-descriptions-item label="行政区划代码">{{ form.orgCode }}</el-descriptions-item>
<el-descriptions-item label="经度">{{ form.longitude }}</el-descriptions-item>
<el-descriptions-item label="纬度">{{ form.latitude }}</el-descriptions-item>
@@ -143,11 +143,13 @@
<el-upload ref="upload" :limit="1" accept=".xlsx, .xls" :headers="upload.headers" :action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading" :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
<i class="el-icon-upload"></i>
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
<div class="el-upload__tip text-center" slot="tip">
<div class="el-upload__tip text-left" slot="tip">
<div class="el-upload__tip" slot="tip">
<el-checkbox v-model="upload.updateSupport" />先清空当前系统中的行政区划
<el-checkbox v-model="upload.updateSupport" /> 先清空当前系统中的行政区划
</div>
<span>仅允许导入xls、xlsx格式文件。</span>
<p style="color: red">1、仅允许导入xls、xlsx格式文件;</p>
<p style="color: red">2、“导入级联代码”是行政单位上下级联关系的标识;</p>
<p style="color: red">3、“行政区划代码”是国标代码。</p>
<el-link type="primary" :underline="false" style="font-size: 12px; vertical-align: baseline" @click="importTemplate">下载模板</el-link>
</div>
</el-upload>
@@ -216,13 +218,13 @@ export default {
// 表单校验
rules: {
parentId: [
{ required: true, message: "上级部门不能为空", trigger: "blur" }
{ required: true, message: "不能为空", trigger: "blur" }
],
deptName: [
{ required: true, message: "部门名称不能为空", trigger: "blur" }
{ required: true, message: "不能为空", trigger: "blur" }
],
orderNum: [
{ required: true, message: "显示排序不能为空", trigger: "blur" }
{ required: true, message: "不能为空", trigger: "blur" }
],
email: [
{
@@ -389,7 +391,7 @@ export default {
},
/* 导入EXCEL组件 */
handleImport() {
this.upload.title = "部门导入"
this.upload.title = "行政区划导入"
this.upload.open = true
},
/** 下载模板操作 */


+ 4
- 2
src/views/system/dict/index.vue 查看文件

@@ -221,7 +221,9 @@ export default {
pageSize: 10,
dictName: undefined,
dictType: undefined,
status: undefined
status: undefined,
orderByColumn: "dictId",
isAsc: "desc",
},
// 表单参数
form: {},
@@ -344,4 +346,4 @@ export default {
}
}
}
</script>
</script>

Loading…
取消
儲存