lenovo
2 years ago
parent
1b29a3edb5
commit
3be991fdfc
28 changed files with 1936 additions and 56 deletions
@ -0,0 +1,227 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="名称"> |
||||
<a-input placeholder="请输入名称" v-model="queryParam.brand"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="联系人"> |
||||
<a-input placeholder="请输入联系人" v-model="queryParam.contact"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="产地"> |
||||
<a-input placeholder="请输入产地" v-model="queryParam.place"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-model-item label="生产厂商" > |
||||
<j-select-depart v-model="queryParam.manufacturer" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-model-item label="供应商" > |
||||
<j-select-depart v-model="queryParam.supplier" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<div class="table-operator"> |
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</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-button type="primary" icon="import">导入</a-button>--> |
||||
<!-- </a-upload>--> |
||||
<!-- <!– 高级查询区域 –>--> |
||||
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
||||
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> |
||||
<!-- <a-menu slot="overlay">--> |
||||
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> |
||||
<!-- </a-menu>--> |
||||
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>--> |
||||
<!-- </a-dropdown>--> |
||||
</div> |
||||
|
||||
<!-- table区域-begin --> |
||||
<div> |
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
||||
</div> |
||||
|
||||
<a-table |
||||
ref="table" |
||||
size="middle" |
||||
:scroll="{x:true}" |
||||
bordered |
||||
rowKey="id" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
class="j-table-force-nowrap" |
||||
@change="handleTableChange"> |
||||
|
||||
<template slot="htmlSlot" slot-scope="text"> |
||||
<div v-html="text"></div> |
||||
</template> |
||||
<template slot="imgSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||
</template> |
||||
<template slot="fileSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
||||
<a-button |
||||
v-else |
||||
:ghost="true" |
||||
type="primary" |
||||
icon="download" |
||||
size="small" |
||||
@click="downloadFile(text)"> |
||||
下载 |
||||
</a-button> |
||||
</template> |
||||
|
||||
<span slot="action" slot-scope="text, record"> |
||||
<a @click="handleEdit(record)">编辑</a> |
||||
|
||||
<a-divider type="vertical" /> |
||||
|
||||
<a @click="handleDetail(record)">详情</a> |
||||
<a-divider type="vertical" /> |
||||
|
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
</span> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<zy-devicebrand-modal ref="modalForm" @ok="modalFormOk"></zy-devicebrand-modal> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import { mixinDevice } from '@/utils/mixin' |
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||
import ZyDevicebrandModal from './modules/ZyDevicebrandModal' |
||||
|
||||
export default { |
||||
name: 'ZyDevicebrandList', |
||||
mixins:[JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyDevicebrandModal |
||||
}, |
||||
data () { |
||||
return { |
||||
description: '设备品牌管理管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
{ |
||||
title: '#', |
||||
dataIndex: '', |
||||
key:'rowIndex', |
||||
width:60, |
||||
align:"center", |
||||
customRender:function (t,r,index) { |
||||
return parseInt(index)+1; |
||||
} |
||||
}, |
||||
{ |
||||
title:'品牌图片', |
||||
align:"center", |
||||
dataIndex: 'img', |
||||
scopedSlots: {customRender: 'imgSlot'} |
||||
}, |
||||
{ |
||||
title:'品牌名称', |
||||
align:"center", |
||||
dataIndex: 'brand' |
||||
}, |
||||
{ |
||||
title:'生产厂商', |
||||
align:"center", |
||||
dataIndex: 'manufacturer_dictText' |
||||
}, |
||||
{ |
||||
title:'供应商', |
||||
align:"center", |
||||
dataIndex: 'supplier_dictText' |
||||
}, |
||||
{ |
||||
title:'联系人', |
||||
align:"center", |
||||
dataIndex: 'contact' |
||||
}, |
||||
{ |
||||
title:'产地', |
||||
align:"center", |
||||
dataIndex: 'place' |
||||
}, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align:"center", |
||||
fixed:"right", |
||||
width:147, |
||||
scopedSlots: { customRender: 'action' } |
||||
} |
||||
], |
||||
url: { |
||||
list: "/devicebrand/zyDevicebrand/list", |
||||
delete: "/devicebrand/zyDevicebrand/delete", |
||||
deleteBatch: "/devicebrand/zyDevicebrand/deleteBatch", |
||||
exportXlsUrl: "/devicebrand/zyDevicebrand/exportXls", |
||||
importExcelUrl: "devicebrand/zyDevicebrand/importExcel", |
||||
|
||||
}, |
||||
dictOptions:{}, |
||||
superFieldList:[], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
initDictConfig(){ |
||||
}, |
||||
getSuperFieldList(){ |
||||
let fieldList=[]; |
||||
fieldList.push({type:'string',value:'img',text:'品牌图片',dictCode:''}) |
||||
fieldList.push({type:'string',value:'brand',text:'品牌名称',dictCode:''}) |
||||
fieldList.push({type:'sel_depart',value:'manufacturer',text:'生产厂商'}) |
||||
fieldList.push({type:'sel_depart',value:'supplier',text:'供应商'}) |
||||
fieldList.push({type:'string',value:'contact',text:'联系人',dictCode:''}) |
||||
fieldList.push({type:'string',value:'place',text:'产地',dictCode:''}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,129 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="品牌图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="img"> |
||||
<j-image-upload isMultiple v-model="model.img" ></j-image-upload> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="品牌名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brand"> |
||||
<a-input v-model="model.brand" placeholder="请输入品牌名称" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="生产厂商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="manufacturer"> |
||||
<j-select-depart v-model="model.manufacturer" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="supplier"> |
||||
<j-select-depart v-model="model.supplier" /> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contact"> |
||||
<a-input v-model="model.contact" placeholder="请输入联系人" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="产地" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="place"> |
||||
<a-input v-model="model.place" placeholder="请输入产地" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import { httpAction, getAction } from '@/api/manage' |
||||
import { validateDuplicateValue } from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyDevicebrandForm', |
||||
components: { |
||||
}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data () { |
||||
return { |
||||
model:{ |
||||
}, |
||||
labelCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 5 }, |
||||
}, |
||||
wrapperCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 16 }, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: { |
||||
}, |
||||
url: { |
||||
add: "/devicebrand/zyDevicebrand/add", |
||||
edit: "/devicebrand/zyDevicebrand/edit", |
||||
queryById: "/devicebrand/zyDevicebrand/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled(){ |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created () { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit (record) { |
||||
this.model = Object.assign({}, record); |
||||
this.visible = true; |
||||
}, |
||||
submitForm () { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if(!this.model.id){ |
||||
httpurl+=this.url.add; |
||||
method = 'post'; |
||||
}else{ |
||||
httpurl+=this.url.edit; |
||||
method = 'put'; |
||||
} |
||||
httpAction(httpurl,this.model,method).then((res)=>{ |
||||
if(res.success){ |
||||
that.$message.success(res.message); |
||||
that.$emit('ok'); |
||||
}else{ |
||||
that.$message.warning(res.message); |
||||
} |
||||
}).finally(() => { |
||||
that.confirmLoading = false; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-devicebrand-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-devicebrand-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyDevicebrandForm from './ZyDevicebrandForm' |
||||
export default { |
||||
name: 'ZyDevicebrandModal', |
||||
components: { |
||||
ZyDevicebrandForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,84 @@ |
||||
<template> |
||||
<a-drawer |
||||
:title="title" |
||||
:width="width" |
||||
placement="right" |
||||
:closable="false" |
||||
@close="close" |
||||
destroyOnClose |
||||
:visible="visible"> |
||||
<zy-devicebrand-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-devicebrand-form> |
||||
<div class="drawer-footer"> |
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> |
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> |
||||
</div> |
||||
</a-drawer> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyDevicebrandForm from './ZyDevicebrandForm' |
||||
|
||||
export default { |
||||
name: 'ZyDevicebrandModal', |
||||
components: { |
||||
ZyDevicebrandForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:"操作", |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}); |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
/** Button按钮间距 */ |
||||
.ant-btn { |
||||
margin-left: 30px; |
||||
margin-bottom: 30px; |
||||
float: right; |
||||
} |
||||
.drawer-footer{ |
||||
position: absolute; |
||||
bottom: -8px; |
||||
width: 100%; |
||||
border-top: 1px solid #e8e8e8; |
||||
padding: 10px 16px; |
||||
text-align: right; |
||||
left: 0; |
||||
background: #fff; |
||||
border-radius: 0 0 2px 2px; |
||||
} |
||||
</style> |
||||
@ -0,0 +1,233 @@ |
||||
<template> |
||||
<a-card :bordered="false"> |
||||
<!-- 查询区域 --> |
||||
<div class="table-page-search-wrapper"> |
||||
<a-form layout="inline" @keyup.enter.native="searchQuery"> |
||||
<a-row :gutter="24"> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="编号"> |
||||
<a-input placeholder="请输入编号" v-model="queryParam.devicetypeCode"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-item label="型号"> |
||||
<a-input placeholder="请输入名称" v-model="queryParam.model"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<a-form-model-item label="型号描述" > |
||||
<a-input v-model="queryParam.description" placeholder="请输入型号描述" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :xl="6" :lg="7" :md="8" :sm="24"> |
||||
<span style="float: left;overflow: hidden;" class="table-page-search-submitButtons"> |
||||
<a-button type="primary" @click="searchQuery" icon="search">查询</a-button> |
||||
<a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button> |
||||
</span> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
<!-- 查询区域-END --> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<div class="table-operator"> |
||||
<a-button @click="handleAdd" type="primary" icon="plus">新增</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-button type="primary" icon="import">导入</a-button>--> |
||||
<!-- </a-upload>--> |
||||
<!-- <!– 高级查询区域 –>--> |
||||
<!-- <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>--> |
||||
<!-- <a-dropdown v-if="selectedRowKeys.length > 0">--> |
||||
<!-- <a-menu slot="overlay">--> |
||||
<!-- <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>--> |
||||
<!-- </a-menu>--> |
||||
<!-- <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>--> |
||||
<!-- </a-dropdown>--> |
||||
</div> |
||||
|
||||
<!-- table区域-begin --> |
||||
<div> |
||||
<div class="ant-alert ant-alert-info" style="margin-bottom: 16px;"> |
||||
<i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项 |
||||
<a style="margin-left: 24px" @click="onClearSelected">清空</a> |
||||
</div> |
||||
|
||||
<a-table |
||||
ref="table" |
||||
size="middle" |
||||
:scroll="{x:true}" |
||||
bordered |
||||
rowKey="id" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
class="j-table-force-nowrap" |
||||
@change="handleTableChange"> |
||||
|
||||
<template slot="htmlSlot" slot-scope="text"> |
||||
<div v-html="text"></div> |
||||
</template> |
||||
<template slot="imgSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> |
||||
<img v-else :src="getImgView(text)" height="25px" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||
</template> |
||||
<template slot="imgeSlot" slot-scope="text"> |
||||
<img :src="text" height="" alt="" style="max-width:80px;font-size: 12px;font-style: italic;"/> |
||||
</template> |
||||
<template slot="fileSlot" slot-scope="text"> |
||||
<span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> |
||||
<a-button |
||||
v-else |
||||
:ghost="true" |
||||
type="primary" |
||||
icon="download" |
||||
size="small" |
||||
@click="downloadFile(text)"> |
||||
下载 |
||||
</a-button> |
||||
</template> |
||||
|
||||
<span slot="action" slot-scope="text, record"> |
||||
<a @click="handleEdit(record)">编辑</a> |
||||
|
||||
<a-divider type="vertical" /> |
||||
|
||||
<a @click="handleDetail(record)">详情</a> |
||||
<a-divider type="vertical" /> |
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
|
||||
</span> |
||||
|
||||
</a-table> |
||||
</div> |
||||
|
||||
<zy-devicemodel-modal ref="modalForm" @ok="modalFormOk"></zy-devicemodel-modal> |
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import '@/assets/less/TableExpand.less' |
||||
import { mixinDevice } from '@/utils/mixin' |
||||
import { JeecgListMixin } from '@/mixins/JeecgListMixin' |
||||
import ZyDevicemodelModal from './modules/ZyDevicemodelModal' |
||||
|
||||
export default { |
||||
name: 'ZyDevicemodelList', |
||||
mixins:[JeecgListMixin, mixinDevice], |
||||
components: { |
||||
ZyDevicemodelModal |
||||
}, |
||||
data () { |
||||
return { |
||||
description: '设备型号表管理页面', |
||||
// 表头 |
||||
columns: [ |
||||
{ |
||||
title: '#', |
||||
dataIndex: '', |
||||
key:'rowIndex', |
||||
width:60, |
||||
align:"center", |
||||
customRender:function (t,r,index) { |
||||
return parseInt(index)+1; |
||||
} |
||||
}, |
||||
{ |
||||
title:'品牌', |
||||
align:"center", |
||||
dataIndex: 'brandId_dictText' |
||||
}, |
||||
{ |
||||
title:'类型编号', |
||||
align:"center", |
||||
dataIndex: 'devicetypeCode' |
||||
}, |
||||
{ |
||||
title:'型号图片', |
||||
align:"center", |
||||
dataIndex: 'img', |
||||
scopedSlots: {customRender: 'imgSlot'} |
||||
}, |
||||
{ |
||||
title:'二维码', |
||||
align:"center", |
||||
dataIndex: 'qrcode', |
||||
scopedSlots: {customRender: 'imgeSlot'} |
||||
}, |
||||
{ |
||||
title:'型号', |
||||
align:"center", |
||||
dataIndex: 'model' |
||||
}, |
||||
{ |
||||
title:'型号参数', |
||||
align:"center", |
||||
dataIndex: 'parameters' |
||||
}, |
||||
{ |
||||
title:'型号描述', |
||||
align:"center", |
||||
dataIndex: 'description' |
||||
}, |
||||
{ |
||||
title:'联系人', |
||||
align:"center", |
||||
dataIndex: 'contact' |
||||
}, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
align:"center", |
||||
|
||||
width:147, |
||||
scopedSlots: { customRender: 'action' } |
||||
} |
||||
], |
||||
url: { |
||||
list: "/devicemodel/zyDevicemodel/list", |
||||
delete: "/devicemodel/zyDevicemodel/delete", |
||||
deleteBatch: "/devicemodel/zyDevicemodel/deleteBatch", |
||||
exportXlsUrl: "/devicemodel/zyDevicemodel/exportXls", |
||||
importExcelUrl: "devicemodel/zyDevicemodel/importExcel", |
||||
|
||||
}, |
||||
dictOptions:{}, |
||||
superFieldList:[], |
||||
} |
||||
}, |
||||
created() { |
||||
this.getSuperFieldList(); |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
}, |
||||
}, |
||||
methods: { |
||||
initDictConfig(){ |
||||
}, |
||||
getSuperFieldList(){ |
||||
let fieldList=[]; |
||||
fieldList.push({type:'popup',value:'brandId',text:'品牌id（名称）', popup:{code:'',field:'',orgFields:'',destFields:''}}) |
||||
fieldList.push({type:'popup',value:'devicetypeCode',text:'类型编号', popup:{code:'',field:'',orgFields:'',destFields:''}}) |
||||
fieldList.push({type:'string',value:'img',text:'型号图片',dictCode:''}) |
||||
fieldList.push({type:'string',value:'qrcode',text:'二维码',dictCode:''}) |
||||
fieldList.push({type:'string',value:'model',text:'型号',dictCode:''}) |
||||
fieldList.push({type:'string',value:'parameters',text:'型号参数',dictCode:''}) |
||||
fieldList.push({type:'string',value:'description',text:'型号描述',dictCode:''}) |
||||
fieldList.push({type:'string',value:'contact',text:'联系人',dictCode:''}) |
||||
this.superFieldList = fieldList |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less'; |
||||
</style> |
||||
@ -0,0 +1,188 @@ |
||||
<template> |
||||
<a-spin :spinning="confirmLoading"> |
||||
<j-form-container :disabled="formDisabled"> |
||||
<a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail"> |
||||
<a-row> |
||||
<!-- <a-col :span="24">--> |
||||
<!-- <a-form-model-item label="品牌id（名称）" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brandId">--> |
||||
<!-- <j-popup--> |
||||
<!-- v-model="model.brandId"--> |
||||
<!-- field="brandId"--> |
||||
<!-- org-fields=""--> |
||||
<!-- dest-fields=""--> |
||||
<!-- code=""--> |
||||
<!-- :multi="true"--> |
||||
<!-- @input="popupCallback"--> |
||||
<!-- />--> |
||||
<!-- </a-form-model-item>--> |
||||
<!-- </a-col>--> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="设备品牌" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="brandId "> |
||||
<j-popup |
||||
v-model="model.brand" |
||||
field="brand" |
||||
org-fields="brand,id" |
||||
dest-fields="brand,brandId" |
||||
code="zy_devicebrand" |
||||
:multi="false" |
||||
@input="popupCallback" |
||||
/> |
||||
</a-form-model-item> |
||||
<a-input v-model="model.brandId" hidden/> |
||||
</a-col> |
||||
<!-- <a-col :span="24">--> |
||||
<!-- <a-form-model-item label="类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="devicetypeCode">--> |
||||
<!-- <j-popup--> |
||||
<!-- v-model="model.devicetypeCode"--> |
||||
<!-- field="devicetypeCode"--> |
||||
<!-- org-fields=""--> |
||||
<!-- dest-fields=""--> |
||||
<!-- code=""--> |
||||
<!-- :multi="true"--> |
||||
<!-- @input="popupCallback"--> |
||||
<!-- />--> |
||||
<!-- </a-form-model-item>--> |
||||
<!-- </a-col>--> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="类型编号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="devicetypeCode "> |
||||
<j-popup |
||||
v-model="model.code" |
||||
field="code" |
||||
org-fields="code,code" |
||||
dest-fields="code,devicetypeCode" |
||||
code="zy_devicetype" |
||||
:multi="false" |
||||
@input="popupCallback" |
||||
/> |
||||
</a-form-model-item> |
||||
<a-input v-model="model.devicetypeCode" hidden/> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="型号图片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="img"> |
||||
<j-image-upload v-model="model.img" ></j-image-upload> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<!-- <a-col :span="24">--> |
||||
<!-- <a-form-model-item label="二维码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="qrcode">--> |
||||
<!-- <a-input v-model="model.qrcode" placeholder="请输入二维码" ></a-input>--> |
||||
<!-- </a-form-model-item>--> |
||||
<!-- </a-col>--> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="型号" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="model"> |
||||
<a-input v-model="model.model" placeholder="请输入型号" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="型号参数" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="parameters"> |
||||
<a-input v-model="model.parameters" placeholder="请输入型号参数" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="型号描述" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="description"> |
||||
<a-input v-model="model.description" placeholder="请输入型号描述" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
<a-col :span="24"> |
||||
<a-form-model-item label="联系人" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="contact"> |
||||
<a-input v-model="model.contact" placeholder="请输入联系人" ></a-input> |
||||
</a-form-model-item> |
||||
</a-col> |
||||
</a-row> |
||||
</a-form-model> |
||||
</j-form-container> |
||||
</a-spin> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import { httpAction, getAction } from '@/api/manage' |
||||
import { validateDuplicateValue } from '@/utils/util' |
||||
|
||||
export default { |
||||
name: 'ZyDevicemodelForm', |
||||
components: { |
||||
}, |
||||
props: { |
||||
//表单禁用 |
||||
disabled: { |
||||
type: Boolean, |
||||
default: false, |
||||
required: false |
||||
} |
||||
}, |
||||
data () { |
||||
return { |
||||
model:{ |
||||
}, |
||||
labelCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 5 }, |
||||
}, |
||||
wrapperCol: { |
||||
xs: { span: 24 }, |
||||
sm: { span: 16 }, |
||||
}, |
||||
confirmLoading: false, |
||||
validatorRules: { |
||||
}, |
||||
url: { |
||||
add: "/devicemodel/zyDevicemodel/add", |
||||
edit: "/devicemodel/zyDevicemodel/edit", |
||||
queryById: "/devicemodel/zyDevicemodel/queryById" |
||||
} |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled(){ |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created () { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.edit(this.modelDefault); |
||||
}, |
||||
edit (record) { |
||||
this.model = Object.assign({}, record); |
||||
this.model.brand=this.model.brandId_dictText |
||||
this.model.code=this.model.devicetypeCode |
||||
this.visible = true; |
||||
}, |
||||
submitForm () { |
||||
const that = this; |
||||
// 触发表单验证 |
||||
this.$refs.form.validate(valid => { |
||||
if (valid) { |
||||
that.confirmLoading = true; |
||||
let httpurl = ''; |
||||
let method = ''; |
||||
if(!this.model.id){ |
||||
httpurl+=this.url.add; |
||||
method = 'post'; |
||||
}else{ |
||||
httpurl+=this.url.edit; |
||||
method = 'put'; |
||||
} |
||||
httpAction(httpurl,this.model,method).then((res)=>{ |
||||
if(res.success){ |
||||
that.$message.success(res.message); |
||||
that.$emit('ok'); |
||||
}else{ |
||||
that.$message.warning(res.message); |
||||
} |
||||
}).finally(() => { |
||||
that.confirmLoading = false; |
||||
}) |
||||
} |
||||
|
||||
}) |
||||
}, |
||||
popupCallback(value,row){ |
||||
this.model = Object.assign(this.model, row); |
||||
}, |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,60 @@ |
||||
<template> |
||||
<j-modal |
||||
:title="title" |
||||
:width="width" |
||||
:visible="visible" |
||||
switchFullscreen |
||||
@ok="handleOk" |
||||
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" |
||||
@cancel="handleCancel" |
||||
cancelText="关闭"> |
||||
<zy-devicemodel-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></zy-devicemodel-form> |
||||
</j-modal> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyDevicemodelForm from './ZyDevicemodelForm' |
||||
export default { |
||||
name: 'ZyDevicemodelModal', |
||||
components: { |
||||
ZyDevicemodelForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:'', |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}) |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
@ -0,0 +1,84 @@ |
||||
<template> |
||||
<a-drawer |
||||
:title="title" |
||||
:width="width" |
||||
placement="right" |
||||
:closable="false" |
||||
@close="close" |
||||
destroyOnClose |
||||
:visible="visible"> |
||||
<zy-devicemodel-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></zy-devicemodel-form> |
||||
<div class="drawer-footer"> |
||||
<a-button @click="handleCancel" style="margin-bottom: 0;">关闭</a-button> |
||||
<a-button v-if="!disableSubmit" @click="handleOk" type="primary" style="margin-bottom: 0;">提交</a-button> |
||||
</div> |
||||
</a-drawer> |
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
import ZyDevicemodelForm from './ZyDevicemodelForm' |
||||
|
||||
export default { |
||||
name: 'ZyDevicemodelModal', |
||||
components: { |
||||
ZyDevicemodelForm |
||||
}, |
||||
data () { |
||||
return { |
||||
title:"操作", |
||||
width:800, |
||||
visible: false, |
||||
disableSubmit: false |
||||
} |
||||
}, |
||||
methods: { |
||||
add () { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.add(); |
||||
}) |
||||
}, |
||||
edit (record) { |
||||
this.visible=true |
||||
this.$nextTick(()=>{ |
||||
this.$refs.realForm.edit(record); |
||||
}); |
||||
}, |
||||
close () { |
||||
this.$emit('close'); |
||||
this.visible = false; |
||||
}, |
||||
submitCallback(){ |
||||
this.$emit('ok'); |
||||
this.visible = false; |
||||
}, |
||||
handleOk () { |
||||
this.$refs.realForm.submitForm(); |
||||
}, |
||||
handleCancel () { |
||||
this.close() |
||||
} |
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style lang="less" scoped> |
||||
/** Button按钮间距 */ |
||||
.ant-btn { |
||||
margin-left: 30px; |
||||
margin-bottom: 30px; |
||||
float: right; |
||||
} |
||||
.drawer-footer{ |
||||
position: absolute; |
||||
bottom: -8px; |
||||
width: 100%; |
||||
border-top: 1px solid #e8e8e8; |
||||
padding: 10px 16px; |
||||
text-align: right; |
||||
left: 0; |
||||
background: #fff; |
||||
border-radius: 0 0 2px 2px; |
||||
} |
||||
</style> |
||||
@ -0,0 +1,188 @@ |
||||
package org.jeecg.modules.zydevice.devicebrand.controller; |
||||
|
||||
|
||||
|
||||
import java.util.Arrays; |
||||
import java.util.List; |
||||
import java.util.Map; |
||||
import java.util.stream.Collectors; |
||||
import java.io.IOException; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.net.URLDecoder; |
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
import org.jeecg.common.api.vo.Result; |
||||
import org.jeecg.common.system.query.QueryGenerator; |
||||
import org.jeecg.common.util.oConvertUtils; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
|
||||
import org.jeecg.modules.zydevice.devicebrand.entity.ZyDevicebrand; |
||||
import org.jeecg.modules.zydevice.devicebrand.service.IZyDevicebrandService; |
||||
import org.jeecgframework.poi.excel.ExcelImportUtil; |
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
||||
import org.jeecgframework.poi.excel.entity.ExportParams; |
||||
import org.jeecgframework.poi.excel.entity.ImportParams; |
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
||||
import org.jeecg.common.system.base.controller.JeecgController; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.web.multipart.MultipartFile; |
||||
import org.springframework.web.multipart.MultipartHttpServletRequest; |
||||
import org.springframework.web.servlet.ModelAndView; |
||||
import com.alibaba.fastjson.JSON; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import org.jeecg.common.aspect.annotation.AutoLog; |
||||
|
||||
/** |
||||
* @Description: 设备品牌管理 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Api(tags="设备品牌管理") |
||||
@RestController |
||||
@RequestMapping("/devicebrand/zyDevicebrand") |
||||
@Slf4j |
||||
public class ZyDevicebrandController extends JeecgController<ZyDevicebrand, IZyDevicebrandService> { |
||||
@Autowired |
||||
private IZyDevicebrandService zyDevicebrandService; |
||||
|
||||
/** |
||||
* 分页列表查询 |
||||
* |
||||
* @param zyDevicebrand |
||||
* @param pageNo |
||||
* @param pageSize |
||||
* @param req |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-分页列表查询") |
||||
@ApiOperation(value="设备品牌管理-分页列表查询", notes="设备品牌管理-分页列表查询") |
||||
@GetMapping(value = "/list") |
||||
public Result<?> queryPageList(ZyDevicebrand zyDevicebrand, |
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
||||
HttpServletRequest req) { |
||||
QueryWrapper<ZyDevicebrand> queryWrapper = QueryGenerator.initQueryWrapper(zyDevicebrand, req.getParameterMap()); |
||||
Page<ZyDevicebrand> page = new Page<ZyDevicebrand>(pageNo, pageSize); |
||||
IPage<ZyDevicebrand> pageList = zyDevicebrandService.page(page, queryWrapper); |
||||
return Result.OK(pageList); |
||||
} |
||||
|
||||
/** |
||||
* 添加 |
||||
* |
||||
* @param zyDevicebrand |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-添加") |
||||
@ApiOperation(value="设备品牌管理-添加", notes="设备品牌管理-添加") |
||||
@PostMapping(value = "/add") |
||||
public Result<?> add(@RequestBody ZyDevicebrand zyDevicebrand) { |
||||
QueryWrapper queryWrapper=new QueryWrapper(); |
||||
queryWrapper.eq("brand",zyDevicebrand.getBrand()); |
||||
int a=zyDevicebrandService.count(queryWrapper); |
||||
if(a==0){ |
||||
zyDevicebrandService.save(zyDevicebrand); |
||||
return Result.OK("添加成功！"); |
||||
}else{ |
||||
return Result.error("添加失败，品牌名重复！！！"); |
||||
} |
||||
|
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* |
||||
* @param zyDevicebrand |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-编辑") |
||||
@ApiOperation(value="设备品牌管理-编辑", notes="设备品牌管理-编辑") |
||||
@PutMapping(value = "/edit") |
||||
public Result<?> edit(@RequestBody ZyDevicebrand zyDevicebrand) { |
||||
QueryWrapper queryWrapper=new QueryWrapper(); |
||||
queryWrapper.eq("brand",zyDevicebrand.getBrand()); |
||||
int a=zyDevicebrandService.count(queryWrapper); |
||||
if(a==0){ |
||||
zyDevicebrandService.updateById(zyDevicebrand); |
||||
return Result.OK("编辑成功！"); |
||||
}else{ |
||||
return Result.error("编辑失败，品牌名重复！！！"); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 通过id删除 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-通过id删除") |
||||
@ApiOperation(value="设备品牌管理-通过id删除", notes="设备品牌管理-通过id删除") |
||||
@DeleteMapping(value = "/delete") |
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) { |
||||
zyDevicebrandService.removeById(id); |
||||
return Result.OK("删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除 |
||||
* |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-批量删除") |
||||
@ApiOperation(value="设备品牌管理-批量删除", notes="设备品牌管理-批量删除") |
||||
@DeleteMapping(value = "/deleteBatch") |
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
||||
this.zyDevicebrandService.removeByIds(Arrays.asList(ids.split(","))); |
||||
return Result.OK("批量删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id查询 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备品牌管理-通过id查询") |
||||
@ApiOperation(value="设备品牌管理-通过id查询", notes="设备品牌管理-通过id查询") |
||||
@GetMapping(value = "/queryById") |
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { |
||||
ZyDevicebrand zyDevicebrand = zyDevicebrandService.getById(id); |
||||
if(zyDevicebrand==null) { |
||||
return Result.error("未找到对应数据"); |
||||
} |
||||
return Result.OK(zyDevicebrand); |
||||
} |
||||
|
||||
/** |
||||
* 导出excel |
||||
* |
||||
* @param request |
||||
* @param zyDevicebrand |
||||
*/ |
||||
@RequestMapping(value = "/exportXls") |
||||
public ModelAndView exportXls(HttpServletRequest request, ZyDevicebrand zyDevicebrand) { |
||||
return super.exportXls(request, zyDevicebrand, ZyDevicebrand.class, "设备品牌管理"); |
||||
} |
||||
|
||||
/** |
||||
* 通过excel导入数据 |
||||
* |
||||
* @param request |
||||
* @param response |
||||
* @return |
||||
*/ |
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
||||
return super.importExcel(request, response, ZyDevicebrand.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,80 @@ |
||||
package org.jeecg.modules.zydevice.devicebrand.entity; |
||||
|
||||
import java.io.Serializable; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.util.Date; |
||||
import java.math.BigDecimal; |
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import lombok.Data; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
|
||||
/** |
||||
* @Description: 设备品牌管理 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_devicebrand") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value="zy_devicebrand对象", description="设备品牌管理") |
||||
public class ZyDevicebrand implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private String id; |
||||
/**创建人*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private String createBy; |
||||
/**创建日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private Date createTime; |
||||
/**更新人*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private String updateBy; |
||||
/**更新日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private Date updateTime; |
||||
/**品牌图片*/ |
||||
@Excel(name = "品牌图片", width = 15) |
||||
@ApiModelProperty(value = "品牌图片") |
||||
private String img; |
||||
/**品牌名称*/ |
||||
@Excel(name = "品牌名称", width = 15) |
||||
@ApiModelProperty(value = "品牌名称") |
||||
private String brand; |
||||
/**生产厂商*/ |
||||
@Excel(name = "生产厂商", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||
@ApiModelProperty(value = "生产厂商") |
||||
private String manufacturer; |
||||
/**供应商*/ |
||||
@Excel(name = "供应商", width = 15, dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||
@Dict(dictTable = "sys_depart", dicText = "depart_name", dicCode = "id") |
||||
@ApiModelProperty(value = "供应商") |
||||
private String supplier; |
||||
/**联系人*/ |
||||
@Excel(name = "联系人", width = 15) |
||||
@ApiModelProperty(value = "联系人") |
||||
private String contact; |
||||
/**产地*/ |
||||
@Excel(name = "产地", width = 15) |
||||
@ApiModelProperty(value = "产地") |
||||
private String place; |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package org.jeecg.modules.zydevice.devicebrand.mapper; |
||||
|
||||
|
||||
|
||||
import java.util.List; |
||||
|
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.zydevice.devicebrand.entity.ZyDevicebrand; |
||||
|
||||
/** |
||||
* @Description: 设备品牌管理 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface ZyDevicebrandMapper extends BaseMapper<ZyDevicebrand> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.zydevice.devicebrand.mapper.ZyDevicebrandMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,14 @@ |
||||
package org.jeecg.modules.zydevice.devicebrand.service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import org.jeecg.modules.zydevice.devicebrand.entity.ZyDevicebrand; |
||||
|
||||
/** |
||||
* @Description: 设备品牌管理 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface IZyDevicebrandService extends IService<ZyDevicebrand> { |
||||
|
||||
} |
||||
@ -0,0 +1,19 @@ |
||||
package org.jeecg.modules.zydevice.devicebrand.service.impl; |
||||
|
||||
import org.jeecg.modules.zydevice.devicebrand.entity.ZyDevicebrand; |
||||
import org.jeecg.modules.zydevice.devicebrand.mapper.ZyDevicebrandMapper; |
||||
import org.jeecg.modules.zydevice.devicebrand.service.IZyDevicebrandService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
|
||||
/** |
||||
* @Description: 设备品牌管理 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyDevicebrandServiceImpl extends ServiceImpl<ZyDevicebrandMapper, ZyDevicebrand> implements IZyDevicebrandService { |
||||
|
||||
} |
||||
@ -0,0 +1,223 @@ |
||||
package org.jeecg.modules.zydevice.devicemodel.controller; |
||||
|
||||
|
||||
|
||||
import java.io.ByteArrayOutputStream; |
||||
import java.util.*; |
||||
import java.util.stream.Collectors; |
||||
import java.io.IOException; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.net.URLDecoder; |
||||
import javax.servlet.http.HttpServletRequest; |
||||
import javax.servlet.http.HttpServletResponse; |
||||
|
||||
import com.google.zxing.BarcodeFormat; |
||||
import com.google.zxing.EncodeHintType; |
||||
import com.google.zxing.MultiFormatWriter; |
||||
import com.google.zxing.WriterException; |
||||
import com.google.zxing.client.j2se.MatrixToImageWriter; |
||||
import com.google.zxing.common.BitMatrix; |
||||
import com.google.zxing.qrcode.QRCodeWriter; |
||||
import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; |
||||
import org.jeecg.common.api.vo.Result; |
||||
import org.jeecg.common.system.query.QueryGenerator; |
||||
import org.jeecg.common.util.oConvertUtils; |
||||
|
||||
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
||||
import com.baomidou.mybatisplus.core.metadata.IPage; |
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; |
||||
import lombok.extern.slf4j.Slf4j; |
||||
|
||||
import org.jeecg.modules.zydevice.devicemodel.entity.ZyDevicemodel; |
||||
import org.jeecg.modules.zydevice.devicemodel.service.IZyDevicemodelService; |
||||
import org.jeecgframework.poi.excel.ExcelImportUtil; |
||||
import org.jeecgframework.poi.excel.def.NormalExcelConstants; |
||||
import org.jeecgframework.poi.excel.entity.ExportParams; |
||||
import org.jeecgframework.poi.excel.entity.ImportParams; |
||||
import org.jeecgframework.poi.excel.view.JeecgEntityExcelView; |
||||
import org.jeecg.common.system.base.controller.JeecgController; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.web.bind.annotation.*; |
||||
import org.springframework.web.multipart.MultipartFile; |
||||
import org.springframework.web.multipart.MultipartHttpServletRequest; |
||||
import org.springframework.web.servlet.ModelAndView; |
||||
import com.alibaba.fastjson.JSON; |
||||
import io.swagger.annotations.Api; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import org.jeecg.common.aspect.annotation.AutoLog; |
||||
|
||||
/** |
||||
* @Description: 设备型号表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Api(tags="设备型号表") |
||||
@RestController |
||||
@RequestMapping("/devicemodel/zyDevicemodel") |
||||
@Slf4j |
||||
public class ZyDevicemodelController extends JeecgController<ZyDevicemodel, IZyDevicemodelService> { |
||||
@Autowired |
||||
private IZyDevicemodelService zyDevicemodelService; |
||||
|
||||
/** |
||||
* 分页列表查询 |
||||
* |
||||
* @param zyDevicemodel |
||||
* @param pageNo |
||||
* @param pageSize |
||||
* @param req |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-分页列表查询") |
||||
@ApiOperation(value="设备型号表-分页列表查询", notes="设备型号表-分页列表查询") |
||||
@GetMapping(value = "/list") |
||||
public Result<?> queryPageList(ZyDevicemodel zyDevicemodel, |
||||
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo, |
||||
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, |
||||
HttpServletRequest req) throws WriterException, IOException { |
||||
QueryWrapper<ZyDevicemodel> queryWrapper = QueryGenerator.initQueryWrapper(zyDevicemodel, req.getParameterMap()); |
||||
Page<ZyDevicemodel> page = new Page<ZyDevicemodel>(pageNo, pageSize); |
||||
IPage<ZyDevicemodel> pageList = zyDevicemodelService.page(page, queryWrapper); |
||||
MultiFormatWriter multiFormatWriter = new MultiFormatWriter(); |
||||
@SuppressWarnings("rawtypes") |
||||
Map hints = new HashMap(); |
||||
//设置UTF-8， 防止中文乱码
|
||||
hints.put(EncodeHintType.CHARACTER_SET, "UTF-8"); |
||||
//设置二维码四周白色区域的大小
|
||||
hints.put(EncodeHintType.MARGIN, 1); |
||||
//设置二维码的容错性
|
||||
hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.H); |
||||
//width:图片完整的宽;height:图片完整的高
|
||||
//因为要在二维码下方附上文字，所以把图片设置为长方形（高大于宽）
|
||||
int width = 150; |
||||
int height = 150; |
||||
//画二维码，记得调用multiFormatWriter.encode()时最后要带上hints参数，不然上面设置无效
|
||||
QRCodeWriter qrCodeWriter = new QRCodeWriter(); |
||||
List<Object> img= new ArrayList<>(); |
||||
String content=""; |
||||
//批量生成二维码
|
||||
for (int i=0;i<pageList.getRecords().size();i++){ |
||||
ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); |
||||
content = pageList.getRecords().get(i).getDevicetypeCode(); |
||||
BitMatrix bitMatrix = qrCodeWriter.encode(content, BarcodeFormat.QR_CODE, width, height, hints); |
||||
MatrixToImageWriter.writeToStream(bitMatrix, "PNG", outputStream); |
||||
Base64.Encoder encoder = Base64.getEncoder(); |
||||
String text = encoder.encodeToString(outputStream.toByteArray()); |
||||
pageList.getRecords().get(i).setQrcode("data:image/png;base64,"+text); |
||||
} |
||||
return Result.OK(pageList); |
||||
} |
||||
|
||||
/** |
||||
* 添加 |
||||
* |
||||
* @param zyDevicemodel |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-添加") |
||||
@ApiOperation(value="设备型号表-添加", notes="设备型号表-添加") |
||||
@PostMapping(value = "/add") |
||||
public Result<?> add(@RequestBody ZyDevicemodel zyDevicemodel) { |
||||
QueryWrapper queryWrapper=new QueryWrapper(); |
||||
queryWrapper.eq("model",zyDevicemodel.getModel()); |
||||
int a=zyDevicemodelService.count(queryWrapper); |
||||
if(a==0){ |
||||
zyDevicemodelService.save(zyDevicemodel); |
||||
return Result.OK("添加成功！"); |
||||
}else{ |
||||
return Result.error("添加失败，型号重复！！！"); |
||||
} |
||||
|
||||
} |
||||
|
||||
/** |
||||
* 编辑 |
||||
* |
||||
* @param zyDevicemodel |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-编辑") |
||||
@ApiOperation(value="设备型号表-编辑", notes="设备型号表-编辑") |
||||
@PutMapping(value = "/edit") |
||||
public Result<?> edit(@RequestBody ZyDevicemodel zyDevicemodel) { |
||||
QueryWrapper queryWrapper=new QueryWrapper(); |
||||
queryWrapper.eq("model",zyDevicemodel.getModel()); |
||||
int a=zyDevicemodelService.count(queryWrapper); |
||||
if(a==0){ |
||||
zyDevicemodelService.updateById(zyDevicemodel); |
||||
return Result.OK("编辑成功!"); |
||||
}else{ |
||||
return Result.error("编辑失败，型号重复！！！"); |
||||
} |
||||
} |
||||
|
||||
/** |
||||
* 通过id删除 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-通过id删除") |
||||
@ApiOperation(value="设备型号表-通过id删除", notes="设备型号表-通过id删除") |
||||
@DeleteMapping(value = "/delete") |
||||
public Result<?> delete(@RequestParam(name="id",required=true) String id) { |
||||
zyDevicemodelService.removeById(id); |
||||
return Result.OK("删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 批量删除 |
||||
* |
||||
* @param ids |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-批量删除") |
||||
@ApiOperation(value="设备型号表-批量删除", notes="设备型号表-批量删除") |
||||
@DeleteMapping(value = "/deleteBatch") |
||||
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) { |
||||
this.zyDevicemodelService.removeByIds(Arrays.asList(ids.split(","))); |
||||
return Result.OK("批量删除成功!"); |
||||
} |
||||
|
||||
/** |
||||
* 通过id查询 |
||||
* |
||||
* @param id |
||||
* @return |
||||
*/ |
||||
@AutoLog(value = "设备型号表-通过id查询") |
||||
@ApiOperation(value="设备型号表-通过id查询", notes="设备型号表-通过id查询") |
||||
@GetMapping(value = "/queryById") |
||||
public Result<?> queryById(@RequestParam(name="id",required=true) String id) { |
||||
ZyDevicemodel zyDevicemodel = zyDevicemodelService.getById(id); |
||||
if(zyDevicemodel==null) { |
||||
return Result.error("未找到对应数据"); |
||||
} |
||||
return Result.OK(zyDevicemodel); |
||||
} |
||||
|
||||
/** |
||||
* 导出excel |
||||
* |
||||
* @param request |
||||
* @param zyDevicemodel |
||||
*/ |
||||
@RequestMapping(value = "/exportXls") |
||||
public ModelAndView exportXls(HttpServletRequest request, ZyDevicemodel zyDevicemodel) { |
||||
return super.exportXls(request, zyDevicemodel, ZyDevicemodel.class, "设备型号表"); |
||||
} |
||||
|
||||
/** |
||||
* 通过excel导入数据 |
||||
* |
||||
* @param request |
||||
* @param response |
||||
* @return |
||||
*/ |
||||
@RequestMapping(value = "/importExcel", method = RequestMethod.POST) |
||||
public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) { |
||||
return super.importExcel(request, response, ZyDevicemodel.class); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,90 @@ |
||||
package org.jeecg.modules.zydevice.devicemodel.entity; |
||||
|
||||
|
||||
|
||||
import java.io.Serializable; |
||||
import java.io.UnsupportedEncodingException; |
||||
import java.util.Date; |
||||
import java.math.BigDecimal; |
||||
import com.baomidou.mybatisplus.annotation.IdType; |
||||
import com.baomidou.mybatisplus.annotation.TableId; |
||||
import com.baomidou.mybatisplus.annotation.TableName; |
||||
import lombok.Data; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import org.springframework.format.annotation.DateTimeFormat; |
||||
import org.jeecgframework.poi.excel.annotation.Excel; |
||||
import org.jeecg.common.aspect.annotation.Dict; |
||||
import io.swagger.annotations.ApiModel; |
||||
import io.swagger.annotations.ApiModelProperty; |
||||
import lombok.EqualsAndHashCode; |
||||
import lombok.experimental.Accessors; |
||||
|
||||
/** |
||||
* @Description: 设备型号表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
@TableName("zy_devicemodel") |
||||
@Accessors(chain = true) |
||||
@EqualsAndHashCode(callSuper = false) |
||||
@ApiModel(value="zy_devicemodel对象", description="设备型号表") |
||||
public class ZyDevicemodel implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private String id; |
||||
/**创建人*/ |
||||
@ApiModelProperty(value = "创建人") |
||||
private String createBy; |
||||
/**创建日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "创建日期") |
||||
private Date createTime; |
||||
/**更新人*/ |
||||
@ApiModelProperty(value = "更新人") |
||||
private String updateBy; |
||||
/**更新日期*/ |
||||
@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") |
||||
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") |
||||
@ApiModelProperty(value = "更新日期") |
||||
private Date updateTime; |
||||
/**品牌id（名称）*/ |
||||
@Excel(name = "品牌id（名称）", width = 15) |
||||
@ApiModelProperty(value = "品牌id（名称）") |
||||
@Dict(dictTable = "zy_devicebrand" ,dicCode = "id",dicText = "brand") |
||||
private String brandId; |
||||
/**类型编号*/ |
||||
@Excel(name = "类型编号", width = 15) |
||||
@ApiModelProperty(value = "类型编号") |
||||
// @Dict(dictTable = "zy_devicetype" ,dicCode = "id",dicText = "code")
|
||||
private String devicetypeCode; |
||||
/**型号图片*/ |
||||
@Excel(name = "型号图片", width = 15) |
||||
@ApiModelProperty(value = "型号图片") |
||||
private String img; |
||||
/**二维码*/ |
||||
@Excel(name = "二维码", width = 15) |
||||
@ApiModelProperty(value = "二维码") |
||||
private String qrcode; |
||||
/**型号*/ |
||||
@Excel(name = "型号", width = 15) |
||||
@ApiModelProperty(value = "型号") |
||||
private String model; |
||||
/**型号参数*/ |
||||
@Excel(name = "型号参数", width = 15) |
||||
@ApiModelProperty(value = "型号参数") |
||||
private String parameters; |
||||
/**型号描述*/ |
||||
@Excel(name = "型号描述", width = 15) |
||||
@ApiModelProperty(value = "型号描述") |
||||
private String description; |
||||
/**联系人*/ |
||||
@Excel(name = "联系人", width = 15) |
||||
@ApiModelProperty(value = "联系人") |
||||
private String contact; |
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package org.jeecg.modules.zydevice.devicemodel.mapper; |
||||
|
||||
|
||||
|
||||
import java.util.List; |
||||
|
||||
import org.apache.ibatis.annotations.Param; |
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper; |
||||
import org.jeecg.modules.zydevice.devicemodel.entity.ZyDevicemodel; |
||||
|
||||
/** |
||||
* @Description: 设备型号表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface ZyDevicemodelMapper extends BaseMapper<ZyDevicemodel> { |
||||
|
||||
} |
||||
@ -0,0 +1,5 @@ |
||||
<?xml version="1.0" encoding="UTF-8"?> |
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> |
||||
<mapper namespace="org.jeecg.modules.zydevice.devicemodel.mapper.ZyDevicemodelMapper"> |
||||
|
||||
</mapper> |
||||
@ -0,0 +1,15 @@ |
||||
package org.jeecg.modules.zydevice.devicemodel.service; |
||||
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService; |
||||
import org.jeecg.modules.zydevice.devicemodel.entity.ZyDevicemodel; |
||||
|
||||
/** |
||||
* @Description: 设备型号表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
public interface IZyDevicemodelService extends IService<ZyDevicemodel> { |
||||
|
||||
} |
||||
@ -0,0 +1,20 @@ |
||||
package org.jeecg.modules.zydevice.devicemodel.service.impl; |
||||
|
||||
|
||||
import org.jeecg.modules.zydevice.devicemodel.entity.ZyDevicemodel; |
||||
import org.jeecg.modules.zydevice.devicemodel.mapper.ZyDevicemodelMapper; |
||||
import org.jeecg.modules.zydevice.devicemodel.service.IZyDevicemodelService; |
||||
import org.springframework.stereotype.Service; |
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; |
||||
|
||||
/** |
||||
* @Description: 设备型号表 |
||||
* @Author: jeecg-boot |
||||
* @Date: 2023-01-05 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Service |
||||
public class ZyDevicemodelServiceImpl extends ServiceImpl<ZyDevicemodelMapper, ZyDevicemodel> implements IZyDevicemodelService { |
||||
|
||||
} |
||||
Loading…
Reference in new issue