添加产品模块

zhc4dev
赵玉瑞 2 years ago
parent 8b1d7c96cb
commit 088edadbf0
  1. 5
      ant-design-vue-jeecg/src/views/maker/ZyMakerList.vue
  2. 189
      ant-design-vue-jeecg/src/views/product/productModule/ProductModuleList.vue
  3. 119
      ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleForm.vue
  4. 60
      ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleModal.vue
  5. 84
      ant-design-vue-jeecg/src/views/product/productModule/modules/ProductModuleModal__Style#Drawer.vue
  6. 156
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/controller/ProductModuleController.java
  7. 74
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/entity/ProductModule.java
  8. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/mapper/ProductModuleMapper.java
  9. 5
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/mapper/xml/ProductModuleMapper.xml
  10. 15
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/service/IProductModuleService.java
  11. 20
      jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/productModule/service/impl/ProductModuleServiceImpl.java

@ -143,6 +143,11 @@
align:"center", align:"center",
dataIndex: 'modelName' dataIndex: 'modelName'
}, },
{
title: '创建时间',
align: "center",
dataIndex: 'createTime'
},
{ {
title: '操作', title: '操作',
dataIndex: 'action', dataIndex: 'action',

@ -0,0 +1,189 @@
<template>
<a-card :bordered="false">
<!-- 查询区域 -->
<div class="table-page-search-wrapper">
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
</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-dropdown>
<a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
<a-menu slot="overlay">
<a-menu-item>
<a @click="handleDetail(record)">详情</a>
</a-menu-item>
<a-menu-item>
<a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
<a>删除</a>
</a-popconfirm>
</a-menu-item>
</a-menu>
</a-dropdown>
</span>
</a-table>
</div>
<product-module-modal ref="modalForm" @ok="modalFormOk"></product-module-modal>
</a-card>
</template>
<script>
import '@/assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import ProductModuleModal from './modules/ProductModuleModal'
export default {
name: 'ProductModuleList',
mixins:[JeecgListMixin, mixinDevice],
components: {
ProductModuleModal
},
data () {
return {
description: '工单管理下面的产品模块管理页面',
//
columns: [
{
title: '#',
dataIndex: '',
key:'rowIndex',
width:60,
align:"center",
customRender:function (t,r,index) {
return parseInt(index)+1;
}
},
{
title:'产品id',
align:"center",
dataIndex: 'productId'
},
{
title:'款式模块id',
align:"center",
dataIndex: 'styleModuleId'
},
{
title:'模块id',
align:"center",
dataIndex: 'moduleId'
},
{
title:'部位',
align:"center",
dataIndex: 'place'
},
{
title: '操作',
dataIndex: 'action',
align:"center",
fixed:"right",
width:147,
scopedSlots: { customRender: 'action' }
}
],
url: {
list: "/productModule/productModule/list",
delete: "/productModule/productModule/delete",
deleteBatch: "/productModule/productModule/deleteBatch",
exportXlsUrl: "/productModule/productModule/exportXls",
importExcelUrl: "productModule/productModule/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:'productId',text:'产品id',dictCode:''})
fieldList.push({type:'string',value:'styleModuleId',text:'款式模块id',dictCode:''})
fieldList.push({type:'string',value:'moduleId',text:'模块id',dictCode:''})
fieldList.push({type:'string',value:'place',text:'部位',dictCode:''})
this.superFieldList = fieldList
}
}
}
</script>
<style scoped>
@import '~@assets/less/common.less';
</style>

@ -0,0 +1,119 @@
<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="productId">
<a-input v-model="model.productId" placeholder="请输入产品id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="款式模块id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="styleModuleId">
<a-input v-model="model.styleModuleId" placeholder="请输入款式模块id" ></a-input>
</a-form-model-item>
</a-col>
<a-col :span="24">
<a-form-model-item label="模块id" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="moduleId">
<a-input v-model="model.moduleId" placeholder="请输入模块id" ></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: 'ProductModuleForm',
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: "/productModule/productModule/add",
edit: "/productModule/productModule/edit",
queryById: "/productModule/productModule/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="关闭">
<product-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></product-module-form>
</j-modal>
</template>
<script>
import ProductModuleForm from './ProductModuleForm'
export default {
name: 'ProductModuleModal',
components: {
ProductModuleForm
},
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">
<product-module-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></product-module-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 ProductModuleForm from './ProductModuleForm'
export default {
name: 'ProductModuleModal',
components: {
ProductModuleForm
},
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,156 @@
package org.jeecg.modules.product.productModule.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.modules.product.productModule.entity.ProductModule;
import org.jeecg.modules.product.productModule.service.IProductModuleService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
/**
* @Description: 工单管理下面的产品模块
* @Author: jeecg-boot
* @Date: 2023-01-05
* @Version: V1.0
*/
@Api(tags="工单管理下面的产品模块")
@RestController
@RequestMapping("/productModule/productModule")
@Slf4j
public class ProductModuleController extends JeecgController<ProductModule, IProductModuleService> {
@Autowired
private IProductModuleService productModuleService;
/**
* 分页列表查询
*
* @param productModule
* @param pageNo
* @param pageSize
* @param req
* @return
*/
@AutoLog(value = "工单管理下面的产品模块-分页列表查询")
@ApiOperation(value="工单管理下面的产品模块-分页列表查询", notes="工单管理下面的产品模块-分页列表查询")
@GetMapping(value = "/list")
public Result<?> queryPageList(ProductModule productModule,
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<ProductModule> queryWrapper = QueryGenerator.initQueryWrapper(productModule, req.getParameterMap());
Page<ProductModule> page = new Page<ProductModule>(pageNo, pageSize);
IPage<ProductModule> pageList = productModuleService.page(page, queryWrapper);
return Result.OK(pageList);
}
/**
* 添加
*
* @param productModule
* @return
*/
@AutoLog(value = "工单管理下面的产品模块-添加")
@ApiOperation(value="工单管理下面的产品模块-添加", notes="工单管理下面的产品模块-添加")
@PostMapping(value = "/add")
public Result<?> add(@RequestBody ProductModule productModule) {
productModuleService.save(productModule);
return Result.OK("添加成功!");
}
/**
* 编辑
*
* @param productModule
* @return
*/
@AutoLog(value = "工单管理下面的产品模块-编辑")
@ApiOperation(value="工单管理下面的产品模块-编辑", notes="工单管理下面的产品模块-编辑")
@PutMapping(value = "/edit")
public Result<?> edit(@RequestBody ProductModule productModule) {
productModuleService.updateById(productModule);
return Result.OK("编辑成功!");
}
/**
* 通过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) {
productModuleService.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.productModuleService.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) {
ProductModule productModule = productModuleService.getById(id);
if(productModule==null) {
return Result.error("未找到对应数据");
}
return Result.OK(productModule);
}
/**
* 导出excel
*
* @param request
* @param productModule
*/
@RequestMapping(value = "/exportXls")
public ModelAndView exportXls(HttpServletRequest request, ProductModule productModule) {
return super.exportXls(request, productModule, ProductModule.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, ProductModule.class);
}
}

@ -0,0 +1,74 @@
package org.jeecg.modules.product.productModule.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("product_module")
@Accessors(chain = true)
@EqualsAndHashCode(callSuper = false)
@ApiModel(value="product_module对象", description="工单管理下面的产品模块")
public class ProductModule 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;
/**所属部门*/
@ApiModelProperty(value = "所属部门")
private String sysOrgCode;
/**产品id*/
@Excel(name = "产品id", width = 15)
@ApiModelProperty(value = "产品id")
private String productId;
/**款式模块id*/
@Excel(name = "款式模块id", width = 15)
@ApiModelProperty(value = "款式模块id")
private String styleModuleId;
/**模块id*/
@Excel(name = "模块id", width = 15)
@ApiModelProperty(value = "模块id")
private String moduleId;
/**部位*/
@Excel(name = "部位", width = 15)
@ApiModelProperty(value = "部位")
private String place;
}

@ -0,0 +1,15 @@
package org.jeecg.modules.product.productModule.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.jeecg.modules.product.productModule.entity.ProductModule;
/**
* @Description: 工单管理下面的产品模块
* @Author: jeecg-boot
* @Date: 2023-01-05
* @Version: V1.0
*/
public interface ProductModuleMapper extends BaseMapper<ProductModule> {
}

@ -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.product.productModule.mapper.ProductModuleMapper">
</mapper>

@ -0,0 +1,15 @@
package org.jeecg.modules.product.productModule.service;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.product.productModule.entity.ProductModule;
/**
* @Description: 工单管理下面的产品模块
* @Author: jeecg-boot
* @Date: 2023-01-05
* @Version: V1.0
*/
public interface IProductModuleService extends IService<ProductModule> {
}

@ -0,0 +1,20 @@
package org.jeecg.modules.product.productModule.service.impl;
import org.jeecg.modules.product.productModule.entity.ProductModule;
import org.jeecg.modules.product.productModule.mapper.ProductModuleMapper;
import org.jeecg.modules.product.productModule.service.IProductModuleService;
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 ProductModuleServiceImpl extends ServiceImpl<ProductModuleMapper, ProductModule> implements IProductModuleService {
}
Loading…
Cancel
Save