From 0c3cf8ae9f50b2595cc3ea3964beb61fcf9978ff Mon Sep 17 00:00:00 2001 From: cgx <2606784146@qq.com> Date: Sun, 20 Oct 2024 11:24:45 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TbProductOrderController.java | 156 +++++++++++ .../productOrder/entity/TbProductOrder.java | 136 ++++++++++ .../productOrder/mapper/TbProductOrderMapper.java | 14 + .../mapper/xml/TbProductOrderMapper.xml | 5 + .../service/ITbProductOrderService.java | 14 + .../service/impl/TbProductOrderServiceImpl.java | 19 ++ .../productOrder/vue/TbProductOrderList.vue | 292 +++++++++++++++++++++ .../vue/modules/TbProductOrderForm.vue | 170 ++++++++++++ .../modules/TbProductOrderModal.Style#Drawer.vue | 84 ++++++ .../vue/modules/TbProductOrderModal.vue | 60 +++++ .../productOrder/vue3/TbProductOrder.api.ts | 61 +++++ .../productOrder/vue3/TbProductOrder.data.ts | 213 +++++++++++++++ .../productOrder/vue3/TbProductOrderList.vue | 162 ++++++++++++ .../vue3/components/TbProductOrderModal.vue | 58 ++++ .../jeecg/modules/postBean/ProductOrderReq.java | 69 +++++ .../src/main/resources/application-dev.yml | 4 +- 16 files changed, 1515 insertions(+), 2 deletions(-) create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/TbProductOrderMapper.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/xml/TbProductOrderMapper.xml create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/ITbProductOrderService.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/impl/TbProductOrderServiceImpl.java create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/TbProductOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderForm.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.Style#Drawer.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.api.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.data.ts create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrderList.vue create mode 100644 jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/components/TbProductOrderModal.vue create mode 100644 jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ProductOrderReq.java diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java new file mode 100644 index 0000000..9b185dc --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/controller/TbProductOrderController.java @@ -0,0 +1,156 @@ +package org.jeecg.modules.productOrder.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.productOrder.entity.TbProductOrder; +import org.jeecg.modules.productOrder.service.ITbProductOrderService; + +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-20 + * @Version: V1.0 + */ +@Api(tags="订单表") +@RestController +@RequestMapping("/productOrder/tbProductOrder") +@Slf4j +public class TbProductOrderController extends JeecgController { + @Autowired + private ITbProductOrderService tbProductOrderService; + + /** + * 分页列表查询 + * + * @param tbProductOrder + * @param pageNo + * @param pageSize + * @param req + * @return + */ + //@AutoLog(value = "订单表-分页列表查询") + @ApiOperation(value="订单表-分页列表查询", notes="订单表-分页列表查询") + @GetMapping(value = "/list") + public Result> queryPageList(TbProductOrder tbProductOrder, + @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, + @RequestParam(name="pageSize", defaultValue="10") Integer pageSize, + HttpServletRequest req) { + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(tbProductOrder, req.getParameterMap()); + Page page = new Page(pageNo, pageSize); + IPage pageList = tbProductOrderService.page(page, queryWrapper); + return Result.OK(pageList); + } + + /** + * 添加 + * + * @param tbProductOrder + * @return + */ + @AutoLog(value = "订单表-添加") + @ApiOperation(value="订单表-添加", notes="订单表-添加") + @PostMapping(value = "/add") + public Result add(@RequestBody TbProductOrder tbProductOrder) { + tbProductOrderService.save(tbProductOrder); + return Result.OK("添加成功！"); + } + + /** + * 编辑 + * + * @param tbProductOrder + * @return + */ + @AutoLog(value = "订单表-编辑") + @ApiOperation(value="订单表-编辑", notes="订单表-编辑") + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST}) + public Result edit(@RequestBody TbProductOrder tbProductOrder) { + tbProductOrderService.updateById(tbProductOrder); + 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) { + tbProductOrderService.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.tbProductOrderService.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) { + TbProductOrder tbProductOrder = tbProductOrderService.getById(id); + if(tbProductOrder==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(tbProductOrder); + } + + /** + * 导出excel + * + * @param request + * @param tbProductOrder + */ + @RequestMapping(value = "/exportXls") + public ModelAndView exportXls(HttpServletRequest request, TbProductOrder tbProductOrder) { + return super.exportXls(request, tbProductOrder, TbProductOrder.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, TbProductOrder.class); + } + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java new file mode 100644 index 0000000..21da303 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/entity/TbProductOrder.java @@ -0,0 +1,136 @@ +package org.jeecg.modules.productOrder.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-20 + * @Version: V1.0 + */ +@Data +@TableName("tb_product_order") +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="tb_product_order对象", description="订单表") +public class TbProductOrder 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 productId; + /**采购用户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.math.BigDecimal deposit; + /**暂定数量、*/ + @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 现货 2 未选择*/ + @Excel(name = "期货现货 0期货 1 现货 2 未选择", width = 15, dicCode = "product_type") + @Dict(dicCode = "product_type") + @ApiModelProperty(value = "期货现货 0期货 1 现货 2 未选择") + 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; + /**提货时间*/ + @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 takeTime; + /**排序*/ + @Excel(name = "排序", width = 15) + @ApiModelProperty(value = "排序") + private java.lang.Integer sortNum; + /**创建人*/ + @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; +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/TbProductOrderMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/TbProductOrderMapper.java new file mode 100644 index 0000000..1e28938 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/TbProductOrderMapper.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.productOrder.mapper; + +import org.jeecg.modules.productOrder.entity.TbProductOrder; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; + +/** + * @Description: 订单表 + * @Author: jeecg-boot + * @Date: 2024-10-20 + * @Version: V1.0 + */ +public interface TbProductOrderMapper extends BaseMapper { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/xml/TbProductOrderMapper.xml b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/xml/TbProductOrderMapper.xml new file mode 100644 index 0000000..3e51423 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/mapper/xml/TbProductOrderMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/ITbProductOrderService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/ITbProductOrderService.java new file mode 100644 index 0000000..cde3472 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/ITbProductOrderService.java @@ -0,0 +1,14 @@ +package org.jeecg.modules.productOrder.service; + +import org.jeecg.modules.productOrder.entity.TbProductOrder; +import com.baomidou.mybatisplus.extension.service.IService; + +/** + * @Description: 订单表 + * @Author: jeecg-boot + * @Date: 2024-10-20 + * @Version: V1.0 + */ +public interface ITbProductOrderService extends IService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/impl/TbProductOrderServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/impl/TbProductOrderServiceImpl.java new file mode 100644 index 0000000..03e4daf --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/service/impl/TbProductOrderServiceImpl.java @@ -0,0 +1,19 @@ +package org.jeecg.modules.productOrder.service.impl; + +import org.jeecg.modules.productOrder.entity.TbProductOrder; +import org.jeecg.modules.productOrder.mapper.TbProductOrderMapper; +import org.jeecg.modules.productOrder.service.ITbProductOrderService; +import org.springframework.stereotype.Service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; + +/** + * @Description: 订单表 + * @Author: jeecg-boot + * @Date: 2024-10-20 + * @Version: V1.0 + */ +@Service +public class TbProductOrderServiceImpl extends ServiceImpl implements ITbProductOrderService { + +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/TbProductOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/TbProductOrderList.vue new file mode 100644 index 0000000..7dfd3d9 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/TbProductOrderList.vue @@ -0,0 +1,292 @@ + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderForm.vue new file mode 100644 index 0000000..76de308 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderForm.vue @@ -0,0 +1,170 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.Style#Drawer.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.Style#Drawer.vue new file mode 100644 index 0000000..6ab7406 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.Style#Drawer.vue @@ -0,0 +1,84 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.vue new file mode 100644 index 0000000..0f876ea --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue/modules/TbProductOrderModal.vue @@ -0,0 +1,60 @@ + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.api.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.api.ts new file mode 100644 index 0000000..a2749a4 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.api.ts @@ -0,0 +1,61 @@ +import {defHttp} from '/@/utils/http/axios'; +import {Modal} from 'ant-design-vue'; + +enum Api { + list = '/productOrder/tbProductOrder/list', + save='/productOrder/tbProductOrder/add', + edit='/productOrder/tbProductOrder/edit', + deleteOne = '/productOrder/tbProductOrder/delete', + deleteBatch = '/productOrder/tbProductOrder/deleteBatch', + importExcel = '/productOrder/tbProductOrder/importExcel', + exportXls = '/productOrder/tbProductOrder/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}); +} diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.data.ts new file mode 100644 index 0000000..3abc20b --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrder.data.ts @@ -0,0 +1,213 @@ +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: 'userName' + }, + { + title: '客户电话', + align:"center", + dataIndex: 'phone' + }, + { + title: '提货地址', + align:"center", + dataIndex: 'address' + }, + { + title: '单价', + align:"center", + dataIndex: 'price' + }, + { + title: '定金', + align:"center", + dataIndex: 'deposit' + }, + { + title: '暂定数量、', + align:"center", + dataIndex: 'num' + }, + { + title: '审核状态 0审核中 1 审核通过 2审核未通过', + align:"center", + dataIndex: 'auditStatus_dictText' + }, + { + title: '挂单状态 0挂单 1 已撤单 2未挂单', + align:"center", + dataIndex: 'showStatus_dictText' + }, + { + title: '期货现货 0期货 1 现货 2 未选择', + align:"center", + dataIndex: 'productType_dictText' + }, + { + title: '交货时间', + align:"center", + dataIndex: 'transactionTime', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, + { + title: '提货时间', + align:"center", + dataIndex: 'takeTime', + customRender:({text}) =>{ + return !text?"":(text.length>10?text.substr(0,10):text) + }, + }, + { + title: '排序', + align:"center", + dataIndex: 'sortNum' + }, +]; +//查询数据 +export const searchFormSchema: FormSchema[] = [ + { + label: "供应商名称", + field: "companyName", + component: 'Input', + colProps: {span: 6}, + }, + { + label: "客户姓名", + field: "userName", + 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 已撤单 2未挂单", + field: "showStatus", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"show_status" + }, + colProps: {span: 6}, + }, + { + label: "期货现货 0期货 1 现货 2 未选择", + field: "productType", + component: 'JDictSelectTag', + componentProps:{ + dictCode:"product_type" + }, + colProps: {span: 6}, + }, +]; +//表单数据 +export const formSchema: FormSchema[] = [ + { + label: '供应商名称', + field: 'companyName', + component: 'Input', + }, + { + label: '客户姓名', + field: 'userName', + component: 'Input', + }, + { + label: '客户电话', + field: 'phone', + component: 'Input', + }, + { + label: '提货地址', + field: 'address', + component: 'Input', + }, + { + label: '单价', + field: 'price', + component: 'InputNumber', + dynamicRules: ({model,schema}) => { + return [ + { required: true, message: '请输入单价!'}, + ]; + }, + }, + { + label: '定金', + field: 'deposit', + 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 已撤单 2未挂单', + field: 'showStatus', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"show_status" + }, + }, + { + label: '期货现货 0期货 1 现货 2 未选择', + field: 'productType', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"product_type" + }, + }, + { + label: '交货时间', + field: 'transactionTime', + component: 'DatePicker', + }, + { + label: '提货时间', + field: 'takeTime', + component: 'DatePicker', + }, + { + label: '排序', + field: 'sortNum', + component: 'InputNumber', + }, +]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrderList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrderList.vue new file mode 100644 index 0000000..5f565e7 --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/TbProductOrderList.vue @@ -0,0 +1,162 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/components/TbProductOrderModal.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/components/TbProductOrderModal.vue new file mode 100644 index 0000000..d33f11a --- /dev/null +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/productOrder/vue3/components/TbProductOrderModal.vue @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ProductOrderReq.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ProductOrderReq.java new file mode 100644 index 0000000..b6c38c4 --- /dev/null +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/postBean/ProductOrderReq.java @@ -0,0 +1,69 @@ +package org.jeecg.modules.postBean; + +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-20 + * @Version: V1.0 + */ +@Data +@Accessors(chain = true) +@EqualsAndHashCode(callSuper = false) +@ApiModel(value="订单", description="订单表") +public class ProductOrderReq implements Serializable { + private static final long serialVersionUID = 1L; + + /**id*/ + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty(value = "id") + private String id; + /**挂单id*/ + @Excel(name = "挂单id", width = 15) + @ApiModelProperty(value = "挂单id") + private String productId; + + /**提货地址*/ + @Excel(name = "提货地址", width = 15) + @ApiModelProperty(value = "提货地址") + private String address; + /**地址id*/ + @Excel(name = "地址id", width = 15) + @ApiModelProperty(value = "地址id") + private String addressId; + /**单价*/ + @Excel(name = "单价", width = 15) + @ApiModelProperty(value = "单价") + private BigDecimal price; + + /**暂定数量、*/ + @Excel(name = "暂定数量、", width = 15) + @ApiModelProperty(value = "暂定数量、") + private Integer num; + @Excel(name = "保证金", width = 15) + private java.math.BigDecimal deposit; + + /**提货时间*/ + @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 takeTime; + +} diff --git a/jeecg-boot-module-system/src/main/resources/application-dev.yml b/jeecg-boot-module-system/src/main/resources/application-dev.yml index 20e7637..40a3106 100644 --- a/jeecg-boot-module-system/src/main/resources/application-dev.yml +++ b/jeecg-boot-module-system/src/main/resources/application-dev.yml @@ -1,5 +1,5 @@ server: - port: 8081 + port: 8014 tomcat: max-swallow-size: -1 error: @@ -7,7 +7,7 @@ server: include-stacktrace: ALWAYS include-message: ALWAYS servlet: - context-path: /aluminium-api + context-path: /aluminium-prod compression: enabled: true min-response-size: 1024