java_project
/
hy-vue
4
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

用户排序,文档

dev
0.0 2 years ago
parent
3bcc0323a8
commit
9e72ff9406
9 changed files with 146 additions and 57 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/mixins/JeecgListMixin.js
  2. 138
      src/views/modules/oss/OSSFileList.vue
  3. 8
      src/views/system/DepartList.vue
  4. 8
      src/views/system/RoleUserList.vue
  5. 11
      src/views/system/SysPositionList.vue
  6. 1
      src/views/system/UserList.vue
  7. 11
      src/views/system/modules/SysPositionModal.vue
  8. 2
      src/views/waste/ProcessWasteList.vue
  9. 4
      src/views/waste/ProcessWasteListCable.vue

20
src/mixins/JeecgListMixin.js
Unescape View File

@ -101,7 +101,7 @@ export const JeecgListMixin = {
} }
var params = this.getQueryParams();//查询条件 var params = this.getQueryParams();//查询条件
this.loading = true; this.loading = true;
// console.log(params) console.log("params>>>>>>",params)
getAction(this.url.list, params).then((res) => { getAction(this.url.list, params).then((res) => {
if (res.success) { if (res.success) {
//update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------ //update-begin---author:zhangyafei Date:20201118 for：适配不分页的数据列表------------
@ -140,7 +140,6 @@ export const JeecgListMixin = {
sqp['superQueryParams']=encodeURI(this.superQueryParams) sqp['superQueryParams']=encodeURI(this.superQueryParams)
sqp['superQueryMatchType'] = this.superQueryMatchType sqp['superQueryMatchType'] = this.superQueryMatchType
} }
console.log("sqp>>>>>>>>",sqp)
var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters); var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
param.field = this.getQueryField(); param.field = this.getQueryField();
param.pageNo = this.ipagination.current; param.pageNo = this.ipagination.current;
@ -270,10 +269,25 @@ export const JeecgListMixin = {
fileName = "导出文件" fileName = "导出文件"
} }
let param = this.getQueryParams(); let param = this.getQueryParams();
if (fileName ==="电缆"){
param.materialName = "电缆"
}
if (fileName ==="废旧物资库表"){
param.materialName = "废旧物资库表"
}
// if (fileName ==="电缆模板"){
// param.materialName = "电缆模板"
// }
// if (fileName ==="废旧物资库表导入模板"){
// param.materialName = "废旧物资库表导入模板"
// }
if (fileName ==="用户信息导入模板"){
param.realname = "用户信息导入模板"
}
if(this.selectedRowKeys && this.selectedRowKeys.length>0){ if(this.selectedRowKeys && this.selectedRowKeys.length>0){
param['selections'] = this.selectedRowKeys.join(",") param['selections'] = this.selectedRowKeys.join(",")
} }
console.log("导出参数",param) console.log("导出参数>>>>>>>>>>",param)
downFile(this.url.exportXlsUrl,param).then((data)=>{ downFile(this.url.exportXlsUrl,param).then((data)=>{
if (!data) { if (!data) {
this.$message.warning("文件下载失败") this.$message.warning("文件下载失败")

138
src/views/modules/oss/OSSFileList.vue
Unescape View File

@ -6,12 +6,19 @@
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="文件名称"> <a-form-item label="文件名称">
<a-input placeholder="请输入文件名称" v-model="queryParam.fileName"></a-input> <a-input placeholder="请输入文件名称" v-model="queryParam.name"></a-input>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
<a-form-item label="文件地址"> <a-form-item label="上传人">
<a-input placeholder="请输入文件地址" v-model="queryParam.url"></a-input> <a-input placeholder="上传人" v-model="queryParam.createBy"></a-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="类型">
<a-select v-model="queryParam.fileType" placeholder="请选择文件类型" >
<a-select-option v-for="(item,index) in typeId" :key="item.value" :value="item.value">{{item.label}}</a-select-option>
</a-select>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="8"> <a-col :md="6" :sm="8">
@ -25,36 +32,36 @@
</div> </div>
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <!-- <div class="table-operator">-->
<!-- <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>--> <!-- &lt;!&ndash; <a-button type="primary" icon="download" @click="handleExportXls('文件列表')">导出</a-button>&ndash;&gt;-->
<a-upload <!-- <a-upload-->
name="file" <!-- name="file"-->
:multiple="false" <!-- :multiple="false"-->
:action="uploadAction" <!-- :action="uploadAction"-->
:headers="tokenHeader" <!-- :headers="tokenHeader"-->
:showUploadList="false" <!-- :showUploadList="false"-->
:beforeUpload="beforeUpload" <!-- :beforeUpload="beforeUpload"-->
@change="handleChange"> <!-- @change="handleChange">-->
<a-button> <!-- <a-button>-->
<a-icon type="upload"/> <!-- <a-icon type="upload"/>-->
OSS文件上传 <!-- OSS文件上传-->
</a-button> <!-- </a-button>-->
</a-upload> <!-- </a-upload>-->
<a-upload <!-- <a-upload-->
name="file" <!-- name="file"-->
:multiple="false" <!-- :multiple="false"-->
:action="minioUploadAction" <!-- :action="minioUploadAction"-->
:headers="tokenHeader" <!-- :headers="tokenHeader"-->
:showUploadList="false" <!-- :showUploadList="false"-->
:beforeUpload="beforeUpload" <!-- :beforeUpload="beforeUpload"-->
@change="handleChange"> <!-- @change="handleChange">-->
<a-button> <!-- <a-button>-->
<a-icon type="upload"/> <!-- <a-icon type="upload"/>-->
MINIO文件上传 <!-- MINIO文件上传-->
</a-button> <!-- </a-button>-->
</a-upload> <!-- </a-upload>-->
</div> <!-- </div>-->
<!-- table区域-begin --> <!-- table区域-begin -->
<div> <div>
@ -74,13 +81,14 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">
<a @click="handlePreview(record)">预览</a> <a @click="handlePreview(record)">预览</a>
<a-divider type="vertical"/> <a-divider type="vertical"/>
<a @click="ossDelete(record.id)">删除</a> <a @click="downloadFile(record.url)">下载</a>
<!-- <a @click="ossDelete(record.id)">删除</a>-->
</span> </span>
</a-table> </a-table>
@ -91,13 +99,23 @@
<script> <script>
import {JeecgListMixin} from '@/mixins/JeecgListMixin' import {JeecgListMixin} from '@/mixins/JeecgListMixin'
import { getAction } from '@api/manage'
export default { export default {
name: "OSSFileList", name: "OSSFileList",
mixins: [JeecgListMixin], mixins: [JeecgListMixin],
data() { data() {
return { return {
typeId :[{
value: 'image',
label: '图片'
},
{
value: 'application',
label: '文档'
}],
description: '文件列表', description: '文件列表',
superFieldList:[],
// 表头 // 表头
columns: [ columns: [
{ {
@ -113,16 +131,45 @@
{ {
title: '文件名称', title: '文件名称',
align: "center", align: "center",
dataIndex: 'fileName' width:400,
dataIndex: 'name'
},
{
title: '上传人',
align: "center",
dataIndex: 'createBy'
},
{
title:'上传时间',
align:"center",
default:'--',
width:150,
dataIndex: 'createTime'
},
// {
// title: '文件格式',
// align: "center",
// width:150,
// default:'--',
// dataIndex: 'fileType'
// },
{
title: '文件大小(kb)',
align: "center",
default:'--',
width:100,
dataIndex: 'size'
}, },
{ {
title: '文件地址', title: '文件地址',
align: "center", align: "center",
width:600,
dataIndex: 'url' dataIndex: 'url'
}, },
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',
width:100,
align: "center", align: "center",
scopedSlots: {customRender: 'action'}, scopedSlots: {customRender: 'action'},
} }
@ -134,6 +181,10 @@
minioUpload: "/sys/upload/uploadMinio" minioUpload: "/sys/upload/uploadMinio"
} }
} }
},
created() {
this.getSuperFieldList();
}, },
computed: { computed: {
uploadAction() { uploadAction() {
@ -186,7 +237,20 @@
let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(record.url) let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(record.url)
window.open(url, '_blank') window.open(url, '_blank')
} }
} },
getSuperFieldList(){
let fieldList=[];
fieldList.push({type:'string',value:'name',text:'文件名称',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'fileType',text:'文件格式',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'size',text:'文件大小',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'url',text:'文件地址',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'string',value:'createBy',text:'上传人',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'date',value:'createTime',text:'上传时间',dictTable:'', dictText:'', dictCode:''})
this.superFieldList = fieldList
},
getRake(){
this.typeId = [];
},
} }
} }
</script> </script>

8
src/views/system/DepartList.vue
Unescape View File

@ -8,10 +8,10 @@
<a-row style="margin-left: 14px"> <a-row style="margin-left: 14px">
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button> <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button> <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button> <!-- <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<a-button type="primary" icon="import">导入</a-button> <!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload> <!-- </a-upload>-->
<a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button> <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
<!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>--> <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
</a-row> </a-row>

8
src/views/system/RoleUserList.vue
Unescape View File

@ -33,10 +33,10 @@
<div class="table-operator" style="margin: 5px 0 10px 2px"> <div class="table-operator" style="margin: 5px 0 10px 2px">
<a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
<!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>--> <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
<a-button type="primary" icon="import">导入</a-button> <!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload> <!-- </a-upload>-->
<a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button> <!-- <a-button type="primary" icon="download" @click="handleExportXls('角色管理')">导出</a-button>-->
</div> </div>
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">

11
src/views/system/SysPositionList.vue
Unescape View File

@ -39,11 +39,11 @@
<!-- 操作按钮区域 --> <!-- 操作按钮区域 -->
<div class="table-operator"> <div class="table-operator">
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button> <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button> <!-- <a-button type="primary" icon="download" @click="handleExportXls('职务表')">导出</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"-->
@change="handleImportExcel"> <!-- @change="handleImportExcel">-->
<a-button type="primary" icon="import">导入</a-button> <!-- <a-button type="primary" icon="import">导入</a-button>-->
</a-upload> <!-- </a-upload>-->
<a-dropdown v-if="selectedRowKeys.length > 0"> <a-dropdown v-if="selectedRowKeys.length > 0">
<a-menu slot="overlay"> <a-menu slot="overlay">
<a-menu-item key="1" @click="batchDel"> <a-menu-item key="1" @click="batchDel">
@ -75,7 +75,6 @@
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:scroll="{x: false, y: 460 }" :scroll="{x: false, y: 460 }"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
<span slot="action" slot-scope="text, record"> <span slot="action" slot-scope="text, record">

1
src/views/system/UserList.vue
Unescape View File

@ -93,6 +93,7 @@
<div class="table-operator" style="border-top: 5px"> <div class="table-operator" style="border-top: 5px">
<a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button> <a-button @click="handleAdd" type="primary" icon="plus">添加用户</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('用户信息导入模板')">导入模板</a-button>
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>

11
src/views/system/modules/SysPositionModal.vue
Unescape View File

@ -103,7 +103,7 @@
} }
] ]
}, },
name: { rules: [{ required: true, message: '请输入职务名称' }] }, name: { rules: [{ required: true, message: '请输入职务名称' },{validator: this.titleTest}] },
postRank: { rules: [{ required: true, message: '请选择职级' }] }, postRank: { rules: [{ required: true, message: '请选择职级' }] },
}, },
url: { url: {
@ -116,6 +116,15 @@
created() { created() {
}, },
methods: { methods: {
titleTest (rule, value, callback) {
// const title= /^[\u0391-\uFFE5A-Za-z]+$/
const title= /^[\a-\z\A-\Z0-9\u4e00-\u9fe5]+$/
if (!title.test(value)) {
callback(new Error('标题只能输入中文、数字和英文'))
}else{
callback()
}
},
add() { add() {
this.edit({}) this.edit({})
}, },

2
src/views/waste/ProcessWasteList.vue
Unescape View File

@ -50,6 +50,7 @@
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('废旧物资库表导入模板')">导入模板</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
@ -79,7 +80,6 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text">

4
src/views/waste/ProcessWasteListCable.vue
Unescape View File

@ -52,6 +52,7 @@
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
<a-button type="primary" icon="download" @click="handleExportXls('电缆')">导出</a-button> <a-button type="primary" icon="download" @click="handleExportXls('电缆')">导出</a-button>
<!-- <a-button type="primary" icon="download" @click="handleExportXls('电缆模板')">导入模板</a-button>-->
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel"> <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
<a-button type="primary" icon="import">导入</a-button> <a-button type="primary" icon="import">导入</a-button>
</a-upload> </a-upload>
@ -79,7 +80,6 @@
:dataSource="dataSource" :dataSource="dataSource"
:pagination="ipagination" :pagination="ipagination"
:loading="loading" :loading="loading"
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
@change="handleTableChange"> @change="handleTableChange">
<template slot="htmlSlot" slot-scope="text"> <template slot="htmlSlot" slot-scope="text">
@ -274,6 +274,8 @@
fieldList.push({type:'string',value:'scrappedBecause',text:'报废原因',dictCode:''}) fieldList.push({type:'string',value:'scrappedBecause',text:'报废原因',dictCode:''})
fieldList.push({type:'sel_search',value:'affiliation',text:'所属单位',dictTable:'', dictText:'', dictCode:''}) fieldList.push({type:'sel_search',value:'affiliation',text:'所属单位',dictTable:'', dictText:'', dictCode:''})
fieldList.push({type:'date',value:'scrapDate',text:'报废日期'}) fieldList.push({type:'date',value:'scrapDate',text:'报废日期'})
fieldList.push({type:'String',value:'nowLength',text:'现长度(米)'})
fieldList.push({type:'String',value:'originalLength',text:'原长度(米)'})
this.superFieldList = fieldList this.superFieldList = fieldList
} }
} }

Write Preview
Loading…
Cancel
Save