Merge branch 'master' of http://182.92.169.222:3000/yu/CostumingPlatform
commit
5f38e6ef18
49 changed files with 2043 additions and 640 deletions
@ -0,0 +1,112 @@ |
||||
<template> |
||||
|
||||
<div> |
||||
<a-modal |
||||
title="模块管理-详情" |
||||
:visible="visible" |
||||
:confirm-loading="confirmLoading" |
||||
:width='1200' |
||||
@ok="handleOk" |
||||
@cancel="handleCancel" |
||||
style="display:flex;" |
||||
> |
||||
<div style="width: 96%;margin:0 auto 40px;padding-bottom: 30px"> |
||||
<h1 style="text-align: center;margin-bottom: 0px;padding-bottom: 20px">黄淮学院服装智能制造管理平台 - <span>模块管理</span></h1> |
||||
<div> |
||||
<el-descriptions class="margin-top" :column="4" border style="margin-top: 50px"> |
||||
<el-descriptions-item> |
||||
<template slot="label"><i class="el-icon-receiving"></i>产品名称</template> |
||||
{{model.productId}} |
||||
</el-descriptions-item> |
||||
<el-descriptions-item> |
||||
<template slot="label"><i class="el-icon-coin"></i>模块编号</template> |
||||
{{model.styleModuleId}} |
||||
</el-descriptions-item> |
||||
<el-descriptions-item> |
||||
<template slot="label"><i class="el-icon-postcard"></i>模块名称</template> |
||||
{{model.moduleId}} |
||||
</el-descriptions-item> |
||||
<!-- <el-descriptions-item>--> |
||||
<!-- <template slot="label"><i class="el-icon-copy-document"></i>颜色</template>--> |
||||
<!-- {{model.color}}--> |
||||
<!-- </el-descriptions-item>--> |
||||
<el-descriptions-item> |
||||
<template slot="label"><i class="el-icon-copy-document"></i>创建时间</template> |
||||
{{model.createTime}} |
||||
</el-descriptions-item> |
||||
</el-descriptions> |
||||
</div> |
||||
</div> |
||||
</a-modal> |
||||
</div> |
||||
|
||||
</template> |
||||
|
||||
<script> |
||||
|
||||
|
||||
export default { |
||||
name: "ProductModuleDetail.vue", |
||||
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, |
||||
|
||||
url: { |
||||
add: "/fabric/zyFabric/add", |
||||
edit: "/fabric/zyFabric/edit", |
||||
queryById: "/fabric/zyFabric/queryById" |
||||
}, |
||||
visible: false |
||||
} |
||||
}, |
||||
computed: { |
||||
formDisabled() { |
||||
return this.disabled |
||||
}, |
||||
}, |
||||
created() { |
||||
//备份model原始值 |
||||
this.modelDefault = JSON.parse(JSON.stringify(this.model)); |
||||
}, |
||||
methods: { |
||||
showModal(id) { |
||||
this.visible = true; |
||||
this.$http.get('/productModule/productModule/queryById?id=' + id).then( |
||||
res => { |
||||
this.model = res.result |
||||
console.log(this.model) |
||||
} |
||||
) |
||||
}, |
||||
handleOk() { |
||||
this.ModalText = 'The modal will be closed after two seconds'; |
||||
this.confirmLoading = true; |
||||
setTimeout(() => { |
||||
this.visible = false; |
||||
this.confirmLoading = false; |
||||
}, 1); |
||||
}, |
||||
handleCancel() { |
||||
this.visible = false; |
||||
}, |
||||
|
||||
} |
||||
} |
||||
</script> |
||||
|
||||
<style scoped> |
||||
|
||||
</style> |
||||
@ -0,0 +1,404 @@ |
||||
<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 :md="6" :sm="12"> |
||||
<a-form-item label="账号"> |
||||
<!--<a-input placeholder="请输入账号查询" v-model="queryParam.username"></a-input>--> |
||||
<j-input placeholder="输入账号模糊查询" v-model="queryParam.username"></j-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
<a-col :md="6" :sm="8"> |
||||
<a-form-item label="性别"> |
||||
<a-select v-model="queryParam.sex" placeholder="请选择性别"> |
||||
<a-select-option value="">请选择</a-select-option> |
||||
<a-select-option value="1">男</a-select-option> |
||||
<a-select-option value="2">女</a-select-option> |
||||
</a-select> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
|
||||
<a-col :md="6" :sm="8"> |
||||
<a-form-item label="真实名字"> |
||||
<a-input placeholder="请输入真实名字" v-model="queryParam.realname"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
<a-col :md="6" :sm="8"> |
||||
<a-form-item label="手机号码"> |
||||
<a-input placeholder="请输入手机号码查询" v-model="queryParam.phone"></a-input> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
<a-col :md="6" :sm="8"> |
||||
<a-form-item label="用户状态"> |
||||
<a-select v-model="queryParam.status" placeholder="请选择"> |
||||
<a-select-option value="">请选择</a-select-option> |
||||
<a-select-option value="1">正常</a-select-option> |
||||
<a-select-option value="2">冻结</a-select-option> |
||||
</a-select> |
||||
</a-form-item> |
||||
</a-col> |
||||
|
||||
<a-col :md="6" :sm="8"> |
||||
<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> |
||||
<!-- <a @click="handleToggleSearch" style="margin-left: 8px"> |
||||
{{ toggleSearchStatus ? '收起' : '展开' }} |
||||
<a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> |
||||
</a>--> |
||||
</span> |
||||
</a-col> |
||||
|
||||
</a-row> |
||||
</a-form> |
||||
</div> |
||||
|
||||
<!-- 操作按钮区域 --> |
||||
<div class="table-operator" style="border-top: 5px"> |
||||
<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-third-app-button biz-type="user" :selected-row-keys="selectedRowKeys" syncToApp syncToLocal @sync-finally="onSyncFinally"/> |
||||
<a-button type="primary" icon="hdd" @click="recycleBinVisible=true">回收站</a-button> |
||||
<a-dropdown v-if="selectedRowKeys.length > 0"> |
||||
<a-menu slot="overlay" @click="handleMenuClick"> |
||||
<a-menu-item key="1"> |
||||
<a-icon type="delete" @click="batchDel"/> |
||||
删除 |
||||
</a-menu-item> |
||||
<a-menu-item key="2"> |
||||
<a-icon type="lock" @click="batchFrozen('2')"/> |
||||
冻结 |
||||
</a-menu-item> |
||||
<a-menu-item key="3"> |
||||
<a-icon type="unlock" @click="batchFrozen('1')"/> |
||||
解冻 |
||||
</a-menu-item> |
||||
</a-menu> |
||||
<a-button style="margin-left: 8px"> |
||||
批量操作 |
||||
<a-icon type="down"/> |
||||
</a-button> |
||||
</a-dropdown> |
||||
<j-super-query :fieldList="superQueryFieldList" @handleSuperQuery="handleSuperQuery"/> |
||||
</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" |
||||
bordered |
||||
size="middle" |
||||
rowKey="id" |
||||
:columns="columns" |
||||
:dataSource="dataSource" |
||||
:pagination="ipagination" |
||||
:loading="loading" |
||||
:rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}" |
||||
@change="handleTableChange"> |
||||
|
||||
<template slot="avatarslot" slot-scope="text, record, index"> |
||||
<div class="anty-img-wrap"> |
||||
<a-avatar shape="square" :src="getAvatarView(record.avatar)" icon="user"/> |
||||
</div> |
||||
</template> |
||||
|
||||
<span slot="action" slot-scope="text, record"> |
||||
<a @click="handleEdit(record)" >编辑</a> |
||||
|
||||
<a-divider type="vertical" /> |
||||
|
||||
<a-dropdown> |
||||
<a class="ant-dropdown-link"> |
||||
更多 <a-icon type="down"/> |
||||
</a> |
||||
<a-menu slot="overlay"> |
||||
<a-menu-item> |
||||
<a @click="openDetail(record.id)">详情</a> |
||||
</a-menu-item> |
||||
|
||||
<a-menu-item> |
||||
<a href="javascript:;" @click="handleChangePassword(record.username)">密码</a> |
||||
</a-menu-item> |
||||
|
||||
<a-menu-item> |
||||
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)"> |
||||
<a>删除</a> |
||||
</a-popconfirm> |
||||
</a-menu-item> |
||||
|
||||
<a-menu-item v-if="record.status==1"> |
||||
<a-popconfirm title="确定冻结吗?" @confirm="() => handleFrozen(record.id,2,record.username)"> |
||||
<a>冻结</a> |
||||
</a-popconfirm> |
||||
</a-menu-item> |
||||
|
||||
<a-menu-item v-if="record.status==2"> |
||||
<a-popconfirm title="确定解冻吗?" @confirm="() => handleFrozen(record.id,1,record.username)"> |
||||
<a>解冻</a> |
||||
</a-popconfirm> |
||||
</a-menu-item> |
||||
|
||||
<a-menu-item> |
||||
<a href="javascript:;" @click="handleAgentSettings(record.username)">代理人</a> |
||||
</a-menu-item> |
||||
|
||||
</a-menu> |
||||
</a-dropdown> |
||||
</span> |
||||
|
||||
|
||||
</a-table> |
||||
</div> |
||||
<!-- table区域-end --> |
||||
|
||||
<user-modal ref="modalForm" @ok="modalFormOk"></user-modal> |
||||
|
||||
<password-modal ref="passwordmodal" @ok="passwordModalOk"></password-modal> |
||||
|
||||
<sys-user-agent-modal ref="sysUserAgentModal"></sys-user-agent-modal> |
||||
|
||||
<!-- 用户回收站 --> |
||||
<user-recycle-bin-modal :visible.sync="recycleBinVisible" @ok="modalFormOk"/> |
||||
<!-- 详情--> |
||||
<UserModalDetail ref="UserModalDetail"></UserModalDetail> |
||||
|
||||
</a-card> |
||||
</template> |
||||
|
||||
<script> |
||||
import UserModal from './modules/UserModal' |
||||
import PasswordModal from './modules/PasswordModal' |
||||
import {putAction,getFileAccessHttpUrl} from '@/api/manage'; |
||||
import {frozenBatch} from '@/api/api' |
||||
import {JeecgListMixin} from '@/mixins/JeecgListMixin' |
||||
import SysUserAgentModal from "./modules/SysUserAgentModal"; |
||||
import JInput from '@/components/jeecg/JInput' |
||||
import UserRecycleBinModal from './modules/UserRecycleBinModal' |
||||
import JSuperQuery from '@/components/jeecg/JSuperQuery' |
||||
import JThirdAppButton from '@/components/jeecgbiz/thirdApp/JThirdAppButton' |
||||
import UserModalDetail from './modules/UserModalDetail' |
||||
export default { |
||||
name: "User2List1", |
||||
mixins: [JeecgListMixin], |
||||
components: { |
||||
JThirdAppButton, |
||||
SysUserAgentModal, |
||||
UserModal, |
||||
PasswordModal, |
||||
JInput, |
||||
UserRecycleBinModal, |
||||
JSuperQuery, |
||||
UserModalDetail |
||||
}, |
||||
data() { |
||||
return { |
||||
description: '这是用户管理页面', |
||||
queryParam: {}, |
||||
recycleBinVisible: false, |
||||
columns: [ |
||||
/*{ |
||||
title: '#', |
||||
dataIndex: '', |
||||
key:'rowIndex', |
||||
width:60, |
||||
align:"center", |
||||
customRender:function (t,r,index) { |
||||
return parseInt(index)+1; |
||||
} |
||||
},*/ |
||||
{ |
||||
title: '用户账号', |
||||
align: "center", |
||||
dataIndex: 'userName', |
||||
width: 120, |
||||
sorter: true |
||||
}, |
||||
{ |
||||
title: '用户姓名', |
||||
align: "center", |
||||
width: 100, |
||||
dataIndex: 'realName', |
||||
}, |
||||
{ |
||||
title: '头像', |
||||
align: "center", |
||||
width: 120, |
||||
dataIndex: 'avatar', |
||||
scopedSlots: {customRender: "avatarslot"} |
||||
}, |
||||
|
||||
{ |
||||
title: '性别', |
||||
align: "center", |
||||
width: 80, |
||||
dataIndex: 'sex_dictText', |
||||
sorter: true |
||||
}, |
||||
/*{ |
||||
title: '生日', |
||||
align: "center", |
||||
width: 100, |
||||
dataIndex: 'birthday' |
||||
},*/ |
||||
{ |
||||
title: '手机号码', |
||||
align: "center", |
||||
width: 100, |
||||
dataIndex: 'phone' |
||||
}, |
||||
/*{ |
||||
title: '部门', |
||||
align: "center", |
||||
width: 180, |
||||
dataIndex: 'orgCodeTxt' |
||||
},*/ |
||||
/* { |
||||
title: '负责部门', |
||||
align: "center", |
||||
width: 180, |
||||
dataIndex: 'departIds_dictText' |
||||
},*/ |
||||
{ |
||||
title: '状态', |
||||
align: "center", |
||||
width: 80, |
||||
dataIndex: 'status_dictText' |
||||
}, |
||||
{ |
||||
title: '操作', |
||||
dataIndex: 'action', |
||||
scopedSlots: {customRender: 'action'}, |
||||
align: "center", |
||||
width: 170 |
||||
} |
||||
|
||||
], |
||||
superQueryFieldList: [ |
||||
{ type: 'input', value: 'username', text: '用户账号', }, |
||||
{ type: 'input', value: 'realname', text: '用户姓名', }, |
||||
{ type: 'select', value: 'sex', text: '性别', dictCode: 'sex' }, |
||||
], |
||||
url: { |
||||
syncUser: "/act/process/extActProcess/doSyncUser", |
||||
list: "/zyPerson/allgk", |
||||
delete: "/sys/user/delete", |
||||
deleteBatch: "/sys/user/deleteBatch", |
||||
exportXlsUrl: "/sys/user/exportXls", |
||||
importExcelUrl: "sys/user/importExcel", |
||||
}, |
||||
} |
||||
}, |
||||
computed: { |
||||
importExcelUrl: function(){ |
||||
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; |
||||
} |
||||
}, |
||||
methods: { |
||||
getAvatarView: function (avatar) { |
||||
return getFileAccessHttpUrl(avatar) |
||||
}, |
||||
|
||||
batchFrozen: function (status) { |
||||
if (this.selectedRowKeys.length <= 0) { |
||||
this.$message.warning('请选择一条记录！'); |
||||
return false; |
||||
} else { |
||||
let ids = ""; |
||||
let that = this; |
||||
let isAdmin = false; |
||||
that.selectionRows.forEach(function (row) { |
||||
if (row.username == 'admin') { |
||||
isAdmin = true; |
||||
} |
||||
}); |
||||
if (isAdmin) { |
||||
that.$message.warning('管理员账号不允许此操作,请重新选择！'); |
||||
return; |
||||
} |
||||
that.selectedRowKeys.forEach(function (val) { |
||||
ids += val + ","; |
||||
}); |
||||
that.$confirm({ |
||||
title: "确认操作", |
||||
content: "是否" + (status == 1 ? "解冻" : "冻结") + "选中账号?", |
||||
onOk: function () { |
||||
frozenBatch({ids: ids, status: status}).then((res) => { |
||||
if (res.success) { |
||||
that.$message.success(res.message); |
||||
that.loadData(); |
||||
that.onClearSelected(); |
||||
} else { |
||||
that.$message.warning(res.message); |
||||
} |
||||
}); |
||||
} |
||||
}); |
||||
} |
||||
}, |
||||
handleMenuClick(e) { |
||||
if (e.key == 1) { |
||||
this.batchDel(); |
||||
} else if (e.key == 2) { |
||||
this.batchFrozen(2); |
||||
} else if (e.key == 3) { |
||||
this.batchFrozen(1); |
||||
} |
||||
}, |
||||
handleFrozen: function (id, status, username) { |
||||
let that = this; |
||||
//TODO 后台校验管理员角色 |
||||
if ('admin' == username) { |
||||
that.$message.warning('管理员账号不允许此操作！'); |
||||
return; |
||||
} |
||||
frozenBatch({ids: id, status: status}).then((res) => { |
||||
if (res.success) { |
||||
that.$message.success(res.message); |
||||
that.loadData(); |
||||
} else { |
||||
that.$message.warning(res.message); |
||||
} |
||||
}); |
||||
}, |
||||
handleChangePassword(username) { |
||||
this.$refs.passwordmodal.show(username); |
||||
}, |
||||
handleAgentSettings(username){ |
||||
this.$refs.sysUserAgentModal.agentSettings(username); |
||||
this.$refs.sysUserAgentModal.title = "用户代理人设置"; |
||||
}, |
||||
passwordModalOk() { |
||||
//TODO 密码修改完成 不需要刷新页面，可以把datasource中的数据更新一下 |
||||
}, |
||||
onSyncFinally({isToLocal}) { |
||||
// 同步到本地时刷新下数据 |
||||
if (isToLocal) { |
||||
this.loadData() |
||||
} |
||||
}, |
||||
openDetail(id){ |
||||
this.$refs.UserModalDetail.showModal(id) |
||||
} |
||||
} |
||||
|
||||
} |
||||
</script> |
||||
<style scoped> |
||||
@import '~@assets/less/common.less' |
||||
</style> |
||||
@ -0,0 +1,55 @@ |
||||
package org.jeecg.modules.demo.zygoods.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: 2022-12-07 |
||||
* @Version: V1.0 |
||||
*/ |
||||
@Data |
||||
|
||||
public class FzlxSp implements Serializable { |
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/**主键*/ |
||||
@TableId(type = IdType.ASSIGN_ID) |
||||
@ApiModelProperty(value = "主键") |
||||
private java.lang.String id; |
||||
/**商品图片*/ |
||||
@Excel(name = "商品图片", width = 15) |
||||
@ApiModelProperty(value = "商品图片") |
||||
private java.lang.String imgUrl; |
||||
/**折扣价*/ |
||||
@Excel(name = "折扣价", width = 15) |
||||
@ApiModelProperty(value = "折扣价") |
||||
private java.lang.Double currentPrice; |
||||
/**单价*/ |
||||
@Excel(name = "单价", width = 15) |
||||
@ApiModelProperty(value = "单价") |
||||
private java.lang.Double historicalPrice; |
||||
/**商品名称*/ |
||||
@Excel(name = "商品名称", width = 15) |
||||
@ApiModelProperty(value = "商品名称") |
||||
private java.lang.String title; |
||||
/**热度*/ |
||||
@Excel(name = "热度", width = 15) |
||||
@ApiModelProperty(value = "热度") |
||||
private java.lang.String heat; |
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
package org.jeecg.modules.system.vo; |
||||
|
||||
|
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class Grzx1 { |
||||
//这个类主要适用于个人中心，主要目的是个人中心的全部订单页面，注意这里不是详情页，是列表的数据获取
|
||||
private String id; |
||||
//订单编号
|
||||
private String totalNum; |
||||
//商品名称
|
||||
private String goodsName; |
||||
//商品款式
|
||||
private String styleNames; |
||||
//商品尺码
|
||||
private String modelNumber; |
||||
//商品数量
|
||||
private String goodsNum; |
||||
//商品数量
|
||||
private String name; |
||||
//面料
|
||||
private String typeName; |
||||
//商品图片
|
||||
private String defaultPicture; |
||||
//总价
|
||||
private String payTotalPrice; |
||||
//单价
|
||||
private String unitPrice; |
||||
|
||||
|
||||
} |
||||
@ -0,0 +1,32 @@ |
||||
package org.jeecg.modules.system.vo; |
||||
|
||||
|
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class Grzx2 { |
||||
//这个类主要适用于个人中心，主要目的是个人中心的全部订单页面，注意这里不是详情页，是列表的数据展示
|
||||
private String id; |
||||
//订单编号
|
||||
private String orderNum; |
||||
//商品名称
|
||||
private String pay; |
||||
//商品款式
|
||||
private String receipt; |
||||
//商品尺码
|
||||
private String url; |
||||
//商品数量
|
||||
private String name; |
||||
//商品数量
|
||||
private String type; |
||||
//面料
|
||||
private String size; |
||||
//商品图片
|
||||
private String num; |
||||
//总价
|
||||
private String price; |
||||
private String material; |
||||
private String total; |
||||
|
||||
|
||||
} |
||||
Loading…
Reference in new issue