21 changed files with 1544 additions and 3 deletions
Unified View
Diff Options
-
+0 -1jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
-
+1 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
-
+157 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
-
+125 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java
-
+14 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/mapper/TbProductMapper.java
-
+5 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/mapper/xml/TbProductMapper.xml
-
+14 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/service/ITbProductService.java
-
+19 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/service/impl/TbProductServiceImpl.java
-
+262 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/TbProductList.vue
-
+147 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductForm.vue
-
+84 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductModal.Style#Drawer.vue
-
+60 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductModal.vue
-
+61 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProduct.api.ts
-
+162 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProduct.data.ts
-
+162 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProductList.vue
-
+58 -0jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/components/TbProductModal.vue
-
+72 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java
-
+2 -2jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/UserServiceImpl.java
-
+67 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java
-
+16 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java
-
+56 -0jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java
+ 0
- 1
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/Swagger2Config.java
View File
+ 1
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java
View File
+ 157
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/controller/TbProductController.java
View File
| @ -0,0 +1,157 @@ | |||||
| package org.jeecg.modules.product.controller; | |||||
| import java.util.Arrays; | |||||
| 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.modules.product.entity.TbProduct; | |||||
| import org.jeecg.modules.product.service.ITbProductService; | |||||
| 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.common.system.base.controller.JeecgController; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.web.bind.annotation.*; | |||||
| import org.springframework.web.servlet.ModelAndView; | |||||
| import io.swagger.annotations.Api; | |||||
| import io.swagger.annotations.ApiOperation; | |||||
| import org.jeecg.common.aspect.annotation.AutoLog; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Api(tags="产品报价表") | |||||
| @RestController | |||||
| @RequestMapping("/product/tbProduct") | |||||
| @Slf4j | |||||
| public class TbProductController extends JeecgController<TbProduct, ITbProductService> { | |||||
| @Autowired | |||||
| private ITbProductService tbProductService; | |||||
| /** | |||||
| * 分页列表查询 | |||||
| * | |||||
| * @param tbProduct | |||||
| * @param pageNo | |||||
| * @param pageSize | |||||
| * @param req | |||||
| * @return | |||||
| */ | |||||
| //@AutoLog(value = "产品报价表-分页列表查询") | |||||
| @ApiOperation(value="产品报价表-分页列表查询", notes="产品报价表-分页列表查询") | |||||
| @GetMapping(value = "/list") | |||||
| public Result<IPage<TbProduct>> queryPageList(TbProduct tbProduct, | |||||
| @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, | |||||
| @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, | |||||
| HttpServletRequest req) { | |||||
| QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(tbProduct, req.getParameterMap()); | |||||
| Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize); | |||||
| IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper); | |||||
| return Result.OK(pageList); | |||||
| } | |||||
| /** | |||||
| * 添加 | |||||
| * | |||||
| * @param tbProduct | |||||
| * @return | |||||
| */ | |||||
| @AutoLog(value = "产品报价表-添加") | |||||
| @ApiOperation(value="产品报价表-添加", notes="产品报价表-添加") | |||||
| @PostMapping(value = "/add") | |||||
| public Result<String> add(@RequestBody TbProduct tbProduct) { | |||||
| tbProduct.setDelFlag(0); | |||||
| tbProductService.save(tbProduct); | |||||
| return Result.OK("添加成功！"); | |||||
| } | |||||
| /** | |||||
| * 编辑 | |||||
| * | |||||
| * @param tbProduct | |||||
| * @return | |||||
| */ | |||||
| @AutoLog(value = "产品报价表-编辑") | |||||
| @ApiOperation(value="产品报价表-编辑", notes="产品报价表-编辑") | |||||
| @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) | |||||
| public Result<String> edit(@RequestBody TbProduct tbProduct) { | |||||
| tbProductService.updateById(tbProduct); | |||||
| return Result.OK("编辑成功!"); | |||||
| } | |||||
| /** | |||||
| * 通过id删除 | |||||
| * | |||||
| * @param id | |||||
| * @return | |||||
| */ | |||||
| @AutoLog(value = "产品报价表-通过id删除") | |||||
| @ApiOperation(value="产品报价表-通过id删除", notes="产品报价表-通过id删除") | |||||
| @DeleteMapping(value = "/delete") | |||||
| public Result<String> delete(@RequestParam(name="id",required=true) String id) { | |||||
| tbProductService.removeById(id); | |||||
| return Result.OK("删除成功!"); | |||||
| } | |||||
| /** | |||||
| * 批量删除 | |||||
| * | |||||
| * @param ids | |||||
| * @return | |||||
| */ | |||||
| @AutoLog(value = "产品报价表-批量删除") | |||||
| @ApiOperation(value="产品报价表-批量删除", notes="产品报价表-批量删除") | |||||
| @DeleteMapping(value = "/deleteBatch") | |||||
| public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) { | |||||
| this.tbProductService.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<TbProduct> queryById(@RequestParam(name="id",required=true) String id) { | |||||
| TbProduct tbProduct = tbProductService.getById(id); | |||||
| if(tbProduct==null) { | |||||
| return Result.error("未找到对应数据"); | |||||
| } | |||||
| return Result.OK(tbProduct); | |||||
| } | |||||
| /** | |||||
| * 导出excel | |||||
| * | |||||
| * @param request | |||||
| * @param tbProduct | |||||
| */ | |||||
| @RequestMapping(value = "/exportXls") | |||||
| public ModelAndView exportXls(HttpServletRequest request, TbProduct tbProduct) { | |||||
| return super.exportXls(request, tbProduct, TbProduct.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, TbProduct.class); | |||||
| } | |||||
| } | |||||
+ 125
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/entity/TbProduct.java
View File
| @ -0,0 +1,125 @@ | |||||
| package org.jeecg.modules.product.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: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Data | |||||
| @TableName("tb_product") | |||||
| @Accessors(chain = true) | |||||
| @EqualsAndHashCode(callSuper = false) | |||||
| @ApiModel(value="tb_product对象", description="产品报价表") | |||||
| public class TbProduct implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| /**id*/ | |||||
| @TableId(type = IdType.ASSIGN_ID) | |||||
| @ApiModelProperty(value = "id") | |||||
| private java.lang.String id; | |||||
| /**用户id*/ | |||||
| @Excel(name = "用户id", width = 15) | |||||
| @ApiModelProperty(value = "用户id") | |||||
| private java.lang.String userId; | |||||
| /**采购用户id*/ | |||||
| @Excel(name = "采购用户id", width = 15) | |||||
| @ApiModelProperty(value = "采购用户id") | |||||
| private java.lang.String buyUserId; | |||||
| /**供应商名称*/ | |||||
| @Excel(name = "供应商名称", width = 15) | |||||
| @ApiModelProperty(value = "供应商名称") | |||||
| private java.lang.String companyName; | |||||
| /**客户姓名*/ | |||||
| @Excel(name = "客户姓名", width = 15) | |||||
| @ApiModelProperty(value = "客户姓名") | |||||
| private java.lang.String userName; | |||||
| /**客户电话*/ | |||||
| @Excel(name = "客户电话", width = 15) | |||||
| @ApiModelProperty(value = "客户电话") | |||||
| private java.lang.String phone; | |||||
| /**提货地址*/ | |||||
| @Excel(name = "提货地址", width = 15) | |||||
| @ApiModelProperty(value = "提货地址") | |||||
| private java.lang.String address; | |||||
| /**地址id*/ | |||||
| @Excel(name = "地址id", width = 15) | |||||
| @ApiModelProperty(value = "地址id") | |||||
| private java.lang.String addressId; | |||||
| /**报价照片*/ | |||||
| @Excel(name = "报价照片", width = 15) | |||||
| @ApiModelProperty(value = "报价照片") | |||||
| private java.lang.String pic; | |||||
| /**单价*/ | |||||
| @Excel(name = "单价", width = 15) | |||||
| @ApiModelProperty(value = "单价") | |||||
| private java.math.BigDecimal price; | |||||
| /**暂定数量、*/ | |||||
| @Excel(name = "暂定数量、", width = 15) | |||||
| @ApiModelProperty(value = "暂定数量、") | |||||
| private java.lang.Integer num; | |||||
| /**审核状态 0审核中 1 审核通过 2审核未通过*/ | |||||
| @Excel(name = "审核状态 0审核中 1 审核通过 2审核未通过", width = 15, dicCode = "audit_status") | |||||
| @Dict(dicCode = "audit_status") | |||||
| @ApiModelProperty(value = "审核状态 0审核中 1 审核通过 2审核未通过") | |||||
| private java.lang.Integer auditStatus; | |||||
| /**挂单状态 0挂单 1 已撤单 2未挂单*/ | |||||
| @Excel(name = "挂单状态 0挂单 1 已撤单 2未挂单", width = 15, dicCode = "show_status") | |||||
| @Dict(dicCode = "show_status") | |||||
| @ApiModelProperty(value = "挂单状态 0挂单 1 已撤单 2未挂单") | |||||
| private java.lang.Integer showStatus; | |||||
| /**期货现货 0期货 1 现货*/ | |||||
| @Excel(name = "期货现货 0期货 1 现货", width = 15, dicCode = "product_type") | |||||
| @Dict(dicCode = "product_type") | |||||
| @ApiModelProperty(value = "期货现货 0期货 1 现货") | |||||
| private java.lang.Integer productType; | |||||
| /**交货时间*/ | |||||
| @Excel(name = "交货时间", width = 15, format = "yyyy-MM-dd") | |||||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") | |||||
| @DateTimeFormat(pattern="yyyy-MM-dd") | |||||
| @ApiModelProperty(value = "交货时间") | |||||
| private java.util.Date transactionTime; | |||||
| /**创建人*/ | |||||
| @ApiModelProperty(value = "创建人") | |||||
| private java.lang.String createBy; | |||||
| /**创建日期*/ | |||||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") | |||||
| @DateTimeFormat(pattern="yyyy-MM-dd") | |||||
| @ApiModelProperty(value = "创建日期") | |||||
| private java.util.Date createTime; | |||||
| /**更新人*/ | |||||
| @ApiModelProperty(value = "更新人") | |||||
| private java.lang.String updateBy; | |||||
| /**更新日期*/ | |||||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") | |||||
| @DateTimeFormat(pattern="yyyy-MM-dd") | |||||
| @ApiModelProperty(value = "更新日期") | |||||
| private java.util.Date updateTime; | |||||
| /**所属部门*/ | |||||
| @ApiModelProperty(value = "所属部门") | |||||
| private java.lang.String sysOrgCode; | |||||
| /**删除标识0-正常,1-已删除*/ | |||||
| @Excel(name = "删除标识0-正常,1-已删除", width = 15) | |||||
| @ApiModelProperty(value = "删除标识0-正常,1-已删除") | |||||
| private java.lang.Integer delFlag; | |||||
| @ApiModelProperty(value = "后台排序字段") | |||||
| private java.lang.Integer sortNum; | |||||
| } | |||||
+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/mapper/TbProductMapper.java
View File
| @ -0,0 +1,14 @@ | |||||
| package org.jeecg.modules.product.mapper; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| import com.baomidou.mybatisplus.core.mapper.BaseMapper; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| public interface TbProductMapper extends BaseMapper<TbProduct> { | |||||
| } | |||||
+ 5
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/mapper/xml/TbProductMapper.xml
View File
| @ -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.mapper.TbProductMapper"> | |||||
| </mapper> | |||||
+ 14
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/service/ITbProductService.java
View File
| @ -0,0 +1,14 @@ | |||||
| package org.jeecg.modules.product.service; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| import com.baomidou.mybatisplus.extension.service.IService; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| public interface ITbProductService extends IService<TbProduct> { | |||||
| } | |||||
+ 19
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/service/impl/TbProductServiceImpl.java
View File
| @ -0,0 +1,19 @@ | |||||
| package org.jeecg.modules.product.service.impl; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| import org.jeecg.modules.product.mapper.TbProductMapper; | |||||
| import org.jeecg.modules.product.service.ITbProductService; | |||||
| import org.springframework.stereotype.Service; | |||||
| import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Service | |||||
| public class TbProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct> implements ITbProductService { | |||||
| } | |||||
+ 262
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/TbProductList.vue
View File
| @ -0,0 +1,262 @@ | |||||
| <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.companyName"></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.phone"></a-input> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <template v-if="toggleSearchStatus"> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="审核状态 0审核中 1 审核通过 2审核未通过"> | |||||
| <j-dict-select-tag placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" v-model="queryParam.auditStatus" dictCode="audit_status"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="挂单状态 0挂单 1 已撤单"> | |||||
| <j-dict-select-tag placeholder="请选择挂单状态 0挂单 1 已撤单" v-model="queryParam.showStatus" dictCode="show_status"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| <a-col :xl="6" :lg="7" :md="8" :sm="24"> | |||||
| <a-form-item label="期货现货 0期货 1 现货"> | |||||
| <j-dict-select-tag placeholder="请选择期货现货 0期货 1 现货" v-model="queryParam.productType" dictCode="product_type"/> | |||||
| </a-form-item> | |||||
| </a-col> | |||||
| </template> | |||||
| <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> | |||||
| <a @click="handleToggleSearch" style="margin-left: 8px"> | |||||
| {{ toggleSearchStatus ? '收起' : '展开' }} | |||||
| <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/> | |||||
| </a> | |||||
| </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,record"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无图片</span> | |||||
| <img v-else :src="getImgView(text)" :preview="record.id" 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> | |||||
| <tb-product-modal ref="modalForm" @ok="modalFormOk"></tb-product-modal> | |||||
| </a-card> | |||||
| </template> | |||||
| <script> | |||||
| import '@/assets/less/TableExpand.less' | |||||
| import { mixinDevice } from '@/utils/mixin' | |||||
| import { JeecgListMixin } from '@/mixins/JeecgListMixin' | |||||
| import TbProductModal from './modules/TbProductModal' | |||||
| import {filterMultiDictText} from '@/components/dict/JDictSelectUtil' | |||||
| export default { | |||||
| name: 'TbProductList', | |||||
| mixins:[JeecgListMixin, mixinDevice], | |||||
| components: { | |||||
| TbProductModal | |||||
| }, | |||||
| 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: 'companyName' | |||||
| }, | |||||
| { | |||||
| title:'提货地址', | |||||
| align:"center", | |||||
| dataIndex: 'address' | |||||
| }, | |||||
| { | |||||
| title:'报价照片', | |||||
| align:"center", | |||||
| dataIndex: 'pic', | |||||
| scopedSlots: {customRender: 'imgSlot'} | |||||
| }, | |||||
| { | |||||
| title:'单价', | |||||
| align:"center", | |||||
| dataIndex: 'price' | |||||
| }, | |||||
| { | |||||
| title:'暂定数量、', | |||||
| align:"center", | |||||
| dataIndex: 'num' | |||||
| }, | |||||
| { | |||||
| title:'审核状态 0审核中 1 审核通过 2审核未通过', | |||||
| align:"center", | |||||
| dataIndex: 'auditStatus_dictText' | |||||
| }, | |||||
| { | |||||
| title:'挂单状态 0挂单 1 已撤单', | |||||
| align:"center", | |||||
| dataIndex: 'showStatus_dictText' | |||||
| }, | |||||
| { | |||||
| title:'期货现货 0期货 1 现货', | |||||
| align:"center", | |||||
| dataIndex: 'productType_dictText' | |||||
| }, | |||||
| { | |||||
| title:'交货时间', | |||||
| align:"center", | |||||
| dataIndex: 'transactionTime', | |||||
| customRender:function (text) { | |||||
| return !text?"":(text.length>10?text.substr(0,10):text) | |||||
| } | |||||
| }, | |||||
| { | |||||
| title: '操作', | |||||
| dataIndex: 'action', | |||||
| align:"center", | |||||
| fixed:"right", | |||||
| width:147, | |||||
| scopedSlots: { customRender: 'action' } | |||||
| } | |||||
| ], | |||||
| url: { | |||||
| list: "/product/tbProduct/list", | |||||
| delete: "/product/tbProduct/delete", | |||||
| deleteBatch: "/product/tbProduct/deleteBatch", | |||||
| exportXlsUrl: "/product/tbProduct/exportXls", | |||||
| importExcelUrl: "product/tbProduct/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:'companyName',text:'供应商名称',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'phone',text:'客户电话',dictCode:''}) | |||||
| fieldList.push({type:'string',value:'address',text:'提货地址',dictCode:''}) | |||||
| fieldList.push({type:'Text',value:'pic',text:'报价照片',dictCode:''}) | |||||
| fieldList.push({type:'BigDecimal',value:'price',text:'单价',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'num',text:'暂定数量、',dictCode:''}) | |||||
| fieldList.push({type:'int',value:'auditStatus',text:'审核状态 0审核中 1 审核通过 2审核未通过',dictCode:'audit_status'}) | |||||
| fieldList.push({type:'int',value:'showStatus',text:'挂单状态 0挂单 1 已撤单',dictCode:'show_status'}) | |||||
| fieldList.push({type:'int',value:'productType',text:'期货现货 0期货 1 现货',dictCode:'product_type'}) | |||||
| fieldList.push({type:'date',value:'transactionTime',text:'交货时间'}) | |||||
| this.superFieldList = fieldList | |||||
| } | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| @import '~@assets/less/common.less'; | |||||
| </style> | |||||
+ 147
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductForm.vue
View File
| @ -0,0 +1,147 @@ | |||||
| <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="companyName"> | |||||
| <a-input v-model="model.companyName" placeholder="请输入供应商名称" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="提货地址" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="address"> | |||||
| <a-input v-model="model.address" placeholder="请输入提货地址" ></a-input> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="报价照片" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="pic"> | |||||
| <j-image-upload isMultiple v-model="model.pic" ></j-image-upload> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="单价" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="price"> | |||||
| <a-input-number v-model="model.price" placeholder="请输入单价" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="暂定数量、" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="num"> | |||||
| <a-input-number v-model="model.num" placeholder="请输入暂定数量、" style="width: 100%" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="审核状态 0审核中 1 审核通过 2审核未通过" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="auditStatus"> | |||||
| <j-dict-select-tag type="list" v-model="model.auditStatus" dictCode="audit_status" placeholder="请选择审核状态 0审核中 1 审核通过 2审核未通过" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="挂单状态 0挂单 1 已撤单" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="showStatus"> | |||||
| <j-dict-select-tag type="list" v-model="model.showStatus" dictCode="show_status" placeholder="请选择挂单状态 0挂单 1 已撤单" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="期货现货 0期货 1 现货" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="productType"> | |||||
| <j-dict-select-tag type="list" v-model="model.productType" dictCode="product_type" placeholder="请选择期货现货 0期货 1 现货" /> | |||||
| </a-form-model-item> | |||||
| </a-col> | |||||
| <a-col :span="24"> | |||||
| <a-form-model-item label="交货时间" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="transactionTime"> | |||||
| <j-date placeholder="请选择交货时间" v-model="model.transactionTime" style="width: 100%" /> | |||||
| </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: 'TbProductForm', | |||||
| 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: { | |||||
| price: [ | |||||
| { required: true, message: '请输入单价!'}, | |||||
| ], | |||||
| }, | |||||
| url: { | |||||
| add: "/product/tbProduct/add", | |||||
| edit: "/product/tbProduct/edit", | |||||
| queryById: "/product/tbProduct/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> | |||||
+ 84
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductModal.Style#Drawer.vue
View File
| @ -0,0 +1,84 @@ | |||||
| <template> | |||||
| <a-drawer | |||||
| :title="title" | |||||
| :width="width" | |||||
| placement="right" | |||||
| :closable="false" | |||||
| @close="close" | |||||
| destroyOnClose | |||||
| :visible="visible"> | |||||
| <tb-product-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></tb-product-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 TbProductForm from './TbProductForm' | |||||
| export default { | |||||
| name: 'TbProductModal', | |||||
| components: { | |||||
| TbProductForm | |||||
| }, | |||||
| 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> | |||||
+ 60
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue/modules/TbProductModal.vue
View File
| @ -0,0 +1,60 @@ | |||||
| <template> | |||||
| <j-modal | |||||
| :title="title" | |||||
| :width="width" | |||||
| :visible="visible" | |||||
| switchFullscreen | |||||
| @ok="handleOk" | |||||
| :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" | |||||
| @cancel="handleCancel" | |||||
| cancelText="关闭"> | |||||
| <tb-product-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"></tb-product-form> | |||||
| </j-modal> | |||||
| </template> | |||||
| <script> | |||||
| import TbProductForm from './TbProductForm' | |||||
| export default { | |||||
| name: 'TbProductModal', | |||||
| components: { | |||||
| TbProductForm | |||||
| }, | |||||
| 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> | |||||
+ 61
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProduct.api.ts
View File
| @ -0,0 +1,61 @@ | |||||
| import {defHttp} from '/@/utils/http/axios'; | |||||
| import {Modal} from 'ant-design-vue'; | |||||
| enum Api { | |||||
| list = '/product/tbProduct/list', | |||||
| save='/product/tbProduct/add', | |||||
| edit='/product/tbProduct/edit', | |||||
| deleteOne = '/product/tbProduct/delete', | |||||
| deleteBatch = '/product/tbProduct/deleteBatch', | |||||
| importExcel = '/product/tbProduct/importExcel', | |||||
| exportXls = '/product/tbProduct/exportXls', | |||||
| } | |||||
| /** | |||||
| * 导出api | |||||
| * @param params | |||||
| */ | |||||
| export const getExportUrl = Api.exportXls; | |||||
| /** | |||||
| * 导入api | |||||
| */ | |||||
| export const getImportUrl = Api.importExcel; | |||||
| /** | |||||
| * 列表接口 | |||||
| * @param params | |||||
| */ | |||||
| export const list = (params) => | |||||
| defHttp.get({url: Api.list, params}); | |||||
| /** | |||||
| * 删除单个 | |||||
| */ | |||||
| export const deleteOne = (params,handleSuccess) => { | |||||
| return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { | |||||
| handleSuccess(); | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 批量删除 | |||||
| * @param params | |||||
| */ | |||||
| export const batchDelete = (params, handleSuccess) => { | |||||
| Modal.confirm({ | |||||
| title: '确认删除', | |||||
| content: '是否删除选中数据', | |||||
| okText: '确认', | |||||
| cancelText: '取消', | |||||
| onOk: () => { | |||||
| return defHttp.delete({url: Api.deleteBatch, data: params}, {joinParamsToUrl: true}).then(() => { | |||||
| handleSuccess(); | |||||
| }); | |||||
| } | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 保存或者更新 | |||||
| * @param params | |||||
| */ | |||||
| export const saveOrUpdate = (params, isUpdate) => { | |||||
| let url = isUpdate ? Api.edit : Api.save; | |||||
| return defHttp.post({url: url, params}); | |||||
| } | |||||
+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProduct.data.ts
View File
| @ -0,0 +1,162 @@ | |||||
| import {BasicColumn} from '/@/components/Table'; | |||||
| import {FormSchema} from '/@/components/Table'; | |||||
| import { rules} from '/@/utils/helper/validator'; | |||||
| import { render } from '/@/utils/common/renderUtils'; | |||||
| //列表数据 | |||||
| export const columns: BasicColumn[] = [ | |||||
| { | |||||
| title: '供应商名称', | |||||
| align:"center", | |||||
| dataIndex: 'companyName' | |||||
| }, | |||||
| { | |||||
| title: '提货地址', | |||||
| align:"center", | |||||
| dataIndex: 'address' | |||||
| }, | |||||
| { | |||||
| title: '报价照片', | |||||
| align:"center", | |||||
| dataIndex: 'pic', | |||||
| customRender:render.renderAvatar, | |||||
| }, | |||||
| { | |||||
| title: '单价', | |||||
| align:"center", | |||||
| dataIndex: 'price' | |||||
| }, | |||||
| { | |||||
| title: '暂定数量、', | |||||
| align:"center", | |||||
| dataIndex: 'num' | |||||
| }, | |||||
| { | |||||
| title: '审核状态 0审核中 1 审核通过 2审核未通过', | |||||
| align:"center", | |||||
| dataIndex: 'auditStatus_dictText' | |||||
| }, | |||||
| { | |||||
| title: '挂单状态 0挂单 1 已撤单', | |||||
| align:"center", | |||||
| dataIndex: 'showStatus_dictText' | |||||
| }, | |||||
| { | |||||
| title: '期货现货 0期货 1 现货', | |||||
| align:"center", | |||||
| dataIndex: 'productType_dictText' | |||||
| }, | |||||
| { | |||||
| title: '交货时间', | |||||
| align:"center", | |||||
| dataIndex: 'transactionTime', | |||||
| customRender:({text}) =>{ | |||||
| return !text?"":(text.length>10?text.substr(0,10):text) | |||||
| }, | |||||
| }, | |||||
| ]; | |||||
| //查询数据 | |||||
| export const searchFormSchema: FormSchema[] = [ | |||||
| { | |||||
| label: "供应商名称", | |||||
| field: "companyName", | |||||
| component: 'Input', | |||||
| colProps: {span: 6}, | |||||
| }, | |||||
| { | |||||
| label: "客户电话", | |||||
| field: "phone", | |||||
| component: 'Input', | |||||
| colProps: {span: 6}, | |||||
| }, | |||||
| { | |||||
| label: "审核状态 0审核中 1 审核通过 2审核未通过", | |||||
| field: "auditStatus", | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"audit_status" | |||||
| }, | |||||
| colProps: {span: 6}, | |||||
| }, | |||||
| { | |||||
| label: "挂单状态 0挂单 1 已撤单", | |||||
| field: "showStatus", | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"show_status" | |||||
| }, | |||||
| colProps: {span: 6}, | |||||
| }, | |||||
| { | |||||
| label: "期货现货 0期货 1 现货", | |||||
| field: "productType", | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"product_type" | |||||
| }, | |||||
| colProps: {span: 6}, | |||||
| }, | |||||
| ]; | |||||
| //表单数据 | |||||
| export const formSchema: FormSchema[] = [ | |||||
| { | |||||
| label: '供应商名称', | |||||
| field: 'companyName', | |||||
| component: 'Input', | |||||
| }, | |||||
| { | |||||
| label: '提货地址', | |||||
| field: 'address', | |||||
| component: 'Input', | |||||
| }, | |||||
| { | |||||
| label: '报价照片', | |||||
| field: 'pic', | |||||
| component: 'JImageUpload', | |||||
| componentProps:{ | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '单价', | |||||
| field: 'price', | |||||
| component: 'InputNumber', | |||||
| dynamicRules: ({model,schema}) => { | |||||
| return [ | |||||
| { required: true, message: '请输入单价!'}, | |||||
| ]; | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '暂定数量、', | |||||
| field: 'num', | |||||
| component: 'InputNumber', | |||||
| }, | |||||
| { | |||||
| label: '审核状态 0审核中 1 审核通过 2审核未通过', | |||||
| field: 'auditStatus', | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"audit_status" | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '挂单状态 0挂单 1 已撤单', | |||||
| field: 'showStatus', | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"show_status" | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '期货现货 0期货 1 现货', | |||||
| field: 'productType', | |||||
| component: 'JDictSelectTag', | |||||
| componentProps:{ | |||||
| dictCode:"product_type" | |||||
| }, | |||||
| }, | |||||
| { | |||||
| label: '交货时间', | |||||
| field: 'transactionTime', | |||||
| component: 'DatePicker', | |||||
| }, | |||||
| ]; | |||||
+ 162
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/TbProductList.vue
View File
| @ -0,0 +1,162 @@ | |||||
| <template> | |||||
| <div> | |||||
| <!--引用表格--> | |||||
| <BasicTable @register="registerTable" :rowSelection="rowSelection"> | |||||
| <!--插槽:table标题--> | |||||
| <template #tableTitle> | |||||
| <a-button type="primary" @click="handleAdd" preIcon="ant-design:plus-outlined"> 新增</a-button> | |||||
| <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls"> 导出</a-button> | |||||
| <j-upload-button type="primary" preIcon="ant-design:import-outlined" @click="onImportXls">导入</j-upload-button> | |||||
| <a-dropdown v-if="checkedKeys.length > 0"> | |||||
| <template #overlay> | |||||
| <a-menu> | |||||
| <a-menu-item key="1" @click="batchHandleDelete"> | |||||
| <Icon icon="ant-design:delete-outlined"></Icon> | |||||
| 删除 | |||||
| </a-menu-item> | |||||
| </a-menu> | |||||
| </template> | |||||
| <a-button>批量操作 | |||||
| <Icon icon="mdi:chevron-down"></Icon> | |||||
| </a-button> | |||||
| </a-dropdown> | |||||
| </template> | |||||
| <!--操作栏--> | |||||
| <template #action="{ record }"> | |||||
| <TableAction :actions="getTableAction(record)" :dropDownActions="getDropDownAction(record)"/> | |||||
| </template> | |||||
| <!--字段回显插槽--> | |||||
| <template #htmlSlot="{text}"> | |||||
| <div v-html="text"></div> | |||||
| </template> | |||||
| <template #fileSlot="{text}"> | |||||
| <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span> | |||||
| <a-button v-else :ghost="true" type="primary" preIcon="ant-design:download-outlined" size="small" @click="downloadFile(text)">下载</a-button> | |||||
| </template> | |||||
| </BasicTable> | |||||
| <!-- 表单区域 --> | |||||
| <TbProductModal @register="registerModal" @success="handleSuccess"></TbProductModal> | |||||
| </div> | |||||
| </template> | |||||
| <script lang="ts" name="product-tbProduct" setup> | |||||
| import {ref, computed, unref} from 'vue'; | |||||
| import {BasicTable, useTable, TableAction} from '/@/components/Table'; | |||||
| import {useModal} from '/@/components/Modal'; | |||||
| import { useListPage } from '/@/hooks/system/useListPage' | |||||
| import TbProductModal from './components/TbProductModal.vue' | |||||
| import {columns, searchFormSchema} from './tbProduct.data'; | |||||
| import {list, deleteOne, batchDelete, getImportUrl,getExportUrl} from './tbProduct.api'; | |||||
| const checkedKeys = ref<Array<string | number>>([]); | |||||
| //注册model | |||||
| const [registerModal, {openModal}] = useModal(); | |||||
| //注册table数据 | |||||
| const { prefixCls,tableContext,onExportXls,onImportXls } = useListPage({ | |||||
| tableProps:{ | |||||
| title: '产品报价表', | |||||
| api: list, | |||||
| columns, | |||||
| canResize:false, | |||||
| formConfig: { | |||||
| labelWidth: 120, | |||||
| schemas: searchFormSchema, | |||||
| autoSubmitOnEnter:true, | |||||
| showAdvancedButton:true, | |||||
| fieldMapToTime: [ | |||||
| ], | |||||
| }, | |||||
| actionColumn: { | |||||
| width: 120, | |||||
| }, | |||||
| }, | |||||
| exportConfig: { | |||||
| name:"产品报价表", | |||||
| url: getExportUrl, | |||||
| }, | |||||
| importConfig: { | |||||
| url: getImportUrl | |||||
| }, | |||||
| }) | |||||
| const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext | |||||
| /** | |||||
| * 新增事件 | |||||
| */ | |||||
| function handleAdd() { | |||||
| openModal(true, { | |||||
| isUpdate: false, | |||||
| showFooter: true, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 编辑事件 | |||||
| */ | |||||
| function handleEdit(record: Recordable) { | |||||
| openModal(true, { | |||||
| record, | |||||
| isUpdate: true, | |||||
| showFooter: true, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 详情 | |||||
| */ | |||||
| function handleDetail(record: Recordable) { | |||||
| openModal(true, { | |||||
| record, | |||||
| isUpdate: true, | |||||
| showFooter: false, | |||||
| }); | |||||
| } | |||||
| /** | |||||
| * 删除事件 | |||||
| */ | |||||
| async function handleDelete(record) { | |||||
| await deleteOne({id: record.id}, reload); | |||||
| } | |||||
| /** | |||||
| * 批量删除事件 | |||||
| */ | |||||
| async function batchHandleDelete() { | |||||
| await batchDelete({ids: checkedKeys.value}, reload); | |||||
| } | |||||
| /** | |||||
| * 成功回调 | |||||
| */ | |||||
| function handleSuccess() { | |||||
| reload(); | |||||
| } | |||||
| /** | |||||
| * 操作栏 | |||||
| */ | |||||
| function getTableAction(record){ | |||||
| return [ | |||||
| { | |||||
| label: '编辑', | |||||
| onClick: handleEdit.bind(null, record), | |||||
| } | |||||
| ] | |||||
| } | |||||
| /** | |||||
| * 下拉操作栏 | |||||
| */ | |||||
| function getDropDownAction(record){ | |||||
| return [ | |||||
| { | |||||
| label: '详情', | |||||
| onClick: handleDetail.bind(null, record), | |||||
| }, { | |||||
| label: '删除', | |||||
| popConfirm: { | |||||
| title: '是否确认删除', | |||||
| confirm: handleDelete.bind(null, record), | |||||
| } | |||||
| } | |||||
| ] | |||||
| } | |||||
| </script> | |||||
| <style scoped> | |||||
| </style> | |||||
+ 58
- 0
jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/product/vue3/components/TbProductModal.vue
View File
| @ -0,0 +1,58 @@ | |||||
| <template> | |||||
| <BasicModal v-bind="$attrs" @register="registerModal" :title="title" @ok="handleSubmit"> | |||||
| <BasicForm @register="registerForm"/> | |||||
| </BasicModal> | |||||
| </template> | |||||
| <script lang="ts" setup> | |||||
| import {ref, computed, unref} from 'vue'; | |||||
| import {BasicModal, useModalInner} from '/@/components/Modal'; | |||||
| import {BasicForm, useForm} from '/@/components/Form/index'; | |||||
| import {formSchema} from '../tbProduct.data'; | |||||
| import {saveOrUpdate} from '../tbProduct.api'; | |||||
| // Emits声明 | |||||
| const emit = defineEmits(['register','success']); | |||||
| const isUpdate = ref(true); | |||||
| //表单配置 | |||||
| const [registerForm, {setProps,resetFields, setFieldsValue, validate}] = useForm({ | |||||
| labelWidth: 150, | |||||
| schemas: formSchema, | |||||
| showActionButtonGroup: false, | |||||
| }); | |||||
| //表单赋值 | |||||
| const [registerModal, {setModalProps, closeModal}] = useModalInner(async (data) => { | |||||
| //重置表单 | |||||
| await resetFields(); | |||||
| setModalProps({confirmLoading: false,showCancelBtn:!!data?.showFooter,showOkBtn:!!data?.showFooter}); | |||||
| isUpdate.value = !!data?.isUpdate; | |||||
| if (unref(isUpdate)) { | |||||
| //表单赋值 | |||||
| await setFieldsValue({ | |||||
| ...data.record, | |||||
| }); | |||||
| } | |||||
| // 隐藏底部时禁用整个表单 | |||||
| setProps({ disabled: !data?.showFooter }) | |||||
| }); | |||||
| //设置标题 | |||||
| const title = computed(() => (!unref(isUpdate) ? '新增' : '编辑')); | |||||
| //表单提交事件 | |||||
| async function handleSubmit(v) { | |||||
| try { | |||||
| let values = await validate(); | |||||
| setModalProps({confirmLoading: true}); | |||||
| //提交表单 | |||||
| await saveOrUpdate(values, isUpdate.value); | |||||
| //关闭弹窗 | |||||
| closeModal(); | |||||
| //刷新列表 | |||||
| emit('success'); | |||||
| } finally { | |||||
| setModalProps({confirmLoading: false}); | |||||
| } | |||||
| } | |||||
| </script> | |||||
| <style lang="less" scoped> | |||||
| </style> | |||||
+ 72
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/controller/ProductController.java
View File
| @ -0,0 +1,72 @@ | |||||
| package org.jeecg.modules.alUser.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.system.base.controller.JeecgController; | |||||
| import org.jeecg.common.system.query.QueryGenerator; | |||||
| import org.jeecg.modules.product.entity.ProductReq; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| import org.jeecg.modules.product.service.ProductService; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | |||||
| import org.springframework.web.bind.annotation.*; | |||||
| import javax.servlet.http.HttpServletRequest; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Api(tags="产品报价") | |||||
| @RestController | |||||
| @RequestMapping("/product") | |||||
| @Slf4j | |||||
| public class ProductController extends JeecgController<TbProduct, ProductService> { | |||||
| @Autowired | |||||
| private ProductService tbProductService; | |||||
| /** | |||||
| * 分页列表查询 | |||||
| * | |||||
| * @param tbProduct | |||||
| * @param pageNo | |||||
| * @param pageSize | |||||
| * @param req | |||||
| * @return | |||||
| */ | |||||
| @ApiOperation(value="产品报价分页列表", notes="产品报价分页列表") | |||||
| @GetMapping(value = "/productList") | |||||
| public Result<IPage<TbProduct>> queryPageList( | |||||
| @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, | |||||
| @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, | |||||
| HttpServletRequest req) { | |||||
| QueryWrapper<TbProduct> queryWrapper = QueryGenerator.initQueryWrapper(new TbProduct(), req.getParameterMap()); | |||||
| queryWrapper.eq("show_status",0).eq("audit_status",1) | |||||
| .orderByDesc("sort_num","create_time"); | |||||
| Page<TbProduct> page = new Page<TbProduct>(pageNo, pageSize); | |||||
| IPage<TbProduct> pageList = tbProductService.page(page, queryWrapper); | |||||
| return Result.OK(pageList); | |||||
| } | |||||
| /** | |||||
| * 添加 | |||||
| * | |||||
| * @param | |||||
| * @return | |||||
| */ | |||||
| @ApiOperation(value="产品报价", notes="产品报价") | |||||
| @PostMapping(value = "/addProduct") | |||||
| public Result<String> addProduct(@RequestBody ProductReq productReq, @RequestHeader("X-Access-Token") String token) { | |||||
| tbProductService.addProduct(productReq,token); | |||||
| return Result.OK("添加成功！"); | |||||
| } | |||||
| } | |||||
+ 2
- 2
jeecg-boot-module-system/src/main/java/org/jeecg/modules/alUser/service/impl/UserServiceImpl.java
View File
+ 67
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/entity/ProductReq.java
View File
| @ -0,0 +1,67 @@ | |||||
| package org.jeecg.modules.product.entity; | |||||
| import com.baomidou.mybatisplus.annotation.IdType; | |||||
| import com.baomidou.mybatisplus.annotation.TableId; | |||||
| import com.baomidou.mybatisplus.annotation.TableName; | |||||
| import com.fasterxml.jackson.annotation.JsonFormat; | |||||
| import io.swagger.annotations.ApiModel; | |||||
| import io.swagger.annotations.ApiModelProperty; | |||||
| import lombok.Data; | |||||
| import lombok.EqualsAndHashCode; | |||||
| import lombok.experimental.Accessors; | |||||
| import org.jeecg.common.aspect.annotation.Dict; | |||||
| import org.jeecgframework.poi.excel.annotation.Excel; | |||||
| import org.springframework.format.annotation.DateTimeFormat; | |||||
| import java.io.Serializable; | |||||
| import java.math.BigDecimal; | |||||
| import java.util.Date; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Data | |||||
| @Accessors(chain = true) | |||||
| @ApiModel(value="tb_product对象", description="产品报价表") | |||||
| public class ProductReq implements Serializable { | |||||
| private static final long serialVersionUID = 1L; | |||||
| /**供应商名称*/ | |||||
| @Excel(name = "供应商名称", width = 15) | |||||
| @ApiModelProperty(value = "供应商名称") | |||||
| private String companyName; | |||||
| /**客户姓名*/ | |||||
| @Excel(name = "客户姓名", width = 15) | |||||
| @ApiModelProperty(value = "客户姓名") | |||||
| private String userName; | |||||
| /**客户电话*/ | |||||
| @Excel(name = "客户电话", width = 15) | |||||
| @ApiModelProperty(value = "客户电话") | |||||
| private String phone; | |||||
| /**地址id*/ | |||||
| @Excel(name = "地址id", width = 15) | |||||
| @ApiModelProperty(value = "地址id") | |||||
| private String addressId; | |||||
| /**报价照片*/ | |||||
| @Excel(name = "报价照片", width = 15) | |||||
| @ApiModelProperty(value = "报价照片") | |||||
| private String pic; | |||||
| /**单价*/ | |||||
| @Excel(name = "单价", width = 15) | |||||
| @ApiModelProperty(value = "单价") | |||||
| private BigDecimal price; | |||||
| /**暂定数量、*/ | |||||
| @Excel(name = "暂定数量、", width = 15) | |||||
| @ApiModelProperty(value = "暂定数量、") | |||||
| private Integer num; | |||||
| /**交货时间*/ | |||||
| @Excel(name = "交货时间", width = 15, format = "yyyy-MM-dd") | |||||
| @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") | |||||
| @DateTimeFormat(pattern="yyyy-MM-dd") | |||||
| @ApiModelProperty(value = "交货时间") | |||||
| private Date transactionTime; | |||||
| } | |||||
+ 16
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/ProductService.java
View File
| @ -0,0 +1,16 @@ | |||||
| package org.jeecg.modules.product.service; | |||||
| import com.baomidou.mybatisplus.extension.service.IService; | |||||
| import org.jeecg.modules.product.entity.ProductReq; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| public interface ProductService extends IService<TbProduct> { | |||||
| void addProduct(ProductReq productReq,String token); | |||||
| } | |||||
+ 56
- 0
jeecg-boot-module-system/src/main/java/org/jeecg/modules/product/service/impl/ProductServiceImpl.java
View File
| @ -0,0 +1,56 @@ | |||||
| package org.jeecg.modules.product.service.impl; | |||||
| import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; | |||||
| import org.jeecg.config.shiro.ShiroRealm; | |||||
| import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; | |||||
| import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; | |||||
| import org.jeecg.modules.product.entity.ProductReq; | |||||
| import org.jeecg.modules.product.entity.TbProduct; | |||||
| import org.jeecg.modules.product.mapper.TbProductMapper; | |||||
| import org.jeecg.modules.product.service.ProductService; | |||||
| import org.jeecg.modules.userRole.entity.TbUserRole; | |||||
| import org.jeecg.modules.userRole.service.ITbUserRoleService; | |||||
| import org.springframework.beans.BeanUtils; | |||||
| import org.springframework.stereotype.Service; | |||||
| import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; | |||||
| import org.springframework.transaction.annotation.Transactional; | |||||
| import javax.annotation.Resource; | |||||
| /** | |||||
| * @Description: 产品报价表 | |||||
| * @Author: jeecg-boot | |||||
| * @Date: 2024-10-19 | |||||
| * @Version: V1.0 | |||||
| */ | |||||
| @Service | |||||
| public class ProductServiceImpl extends ServiceImpl<TbProductMapper, TbProduct> implements ProductService { | |||||
| @Resource | |||||
| private ShiroRealm shiroRealm; | |||||
| @Resource | |||||
| private IHanHaiMemberService hanHaiMemberService; | |||||
| @Resource | |||||
| private ITbUserRoleService tbUserRoleService; | |||||
| @Resource | |||||
| private TbProductMapper tbProductMapper; | |||||
| @Transactional(rollbackFor = Exception.class) | |||||
| @Override | |||||
| public void addProduct(ProductReq productReq,String token) { | |||||
| HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiAccount(token); | |||||
| LambdaQueryWrapper<TbUserRole> objectLambdaQueryWrapper = new LambdaQueryWrapper<>(); | |||||
| objectLambdaQueryWrapper.eq(TbUserRole::getUserId,hanHaiMember.getId()). | |||||
| eq(TbUserRole::getRole,1).eq(TbUserRole::getAuditStatus,1); | |||||
| TbUserRole one1 = tbUserRoleService.getOne(objectLambdaQueryWrapper); | |||||
| TbProduct product = new TbProduct(); | |||||
| BeanUtils.copyProperties(productReq, product); | |||||
| product.setUserId(hanHaiMember.getId()); | |||||
| product.setCompanyName(one1.getCompanyName()); | |||||
| product.setAuditStatus(0); | |||||
| product.setShowStatus(2); | |||||
| product.setProductType(2); | |||||
| tbProductMapper.insert(product); | |||||
| } | |||||
| } | |||||