From fb44e1b479b9193e15c8d0668121035a98c1355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 28 Feb 2024 14:48:04 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=9A=E5=88=A0=E9=99=A4=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=92=8C=E6=B7=BB=E5=8A=A0=E5=BC=B9=E6=A1=86=E5=9B=BA?= =?UTF-8?q?=E5=AE=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jianshui-ui/src/views/platform/product_info/index.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/jianshui-ui/src/views/platform/product_info/index.vue b/jianshui-ui/src/views/platform/product_info/index.vue index 77a10fa..6aa8081 100644 --- a/jianshui-ui/src/views/platform/product_info/index.vue +++ b/jianshui-ui/src/views/platform/product_info/index.vue @@ -198,7 +198,7 @@ /> - + @@ -256,6 +256,8 @@ export default { loading: true, // 选中数组 ids: [], + //选中商品编码 + productCodes: [], // 非单个禁用 single: true, // 非多个禁用 @@ -351,6 +353,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.id) + this.productCodes = selection.map(item => item.productCode) this.single = selection.length!==1 this.multiple = !selection.length }, @@ -393,7 +396,8 @@ export default { /** 删除按钮操作 */ handleDelete(row) { const ids = row.id || this.ids; - this.$modal.confirm('是否确认删除商品信息编号为"' + ids + '"的数据项？').then(function() { + const codes = row.productCode || this.productCodes; + this.$modal.confirm('是否确认删除商品编码为"' + codes + '"的数据项？').then(function() { return delProduct_info(ids); }).then(() => { this.getList(); From 7a586109e901547b4ea9e67dd5328aad35c9b022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Wed, 28 Feb 2024 15:45:26 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=95=B0=E7=94=B5=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0=EF=BC=9A=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/InvoiceAllYhdjController.java | 105 +++++ jianshui-ui/src/api/digital/registered.js | 44 ++ .../src/views/digital/registered/index.vue | 411 ++++++++++++++++++ 3 files changed, 560 insertions(+) create mode 100644 jianshui-admin/src/main/java/com/jianshui/web/controller/system/InvoiceAllYhdjController.java create mode 100644 jianshui-ui/src/api/digital/registered.js create mode 100644 jianshui-ui/src/views/digital/registered/index.vue diff --git a/jianshui-admin/src/main/java/com/jianshui/web/controller/system/InvoiceAllYhdjController.java b/jianshui-admin/src/main/java/com/jianshui/web/controller/system/InvoiceAllYhdjController.java new file mode 100644 index 0000000..b0fa75c --- /dev/null +++ b/jianshui-admin/src/main/java/com/jianshui/web/controller/system/InvoiceAllYhdjController.java @@ -0,0 +1,105 @@ +package com.jianshui.web.controller.system; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.jianshui.system.domain.InvoiceAllYhdj; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.jianshui.common.annotation.Log; +import com.jianshui.common.core.controller.BaseController; +import com.jianshui.common.core.domain.AjaxResult; +import com.jianshui.common.enums.BusinessType; +import com.jianshui.common.utils.poi.ExcelUtil; +import com.jianshui.common.core.page.TableDataInfo; +import com.jianshui.system.service.IInvoiceAllYhdjService; + +/** + * 金四-用户登记Controller + * + * @author jianshui + * @date 2024-02-28 + */ +@RestController +@RequestMapping("/invoiceall/invoiceallyhdj") +public class InvoiceAllYhdjController extends BaseController +{ + @Autowired + private IInvoiceAllYhdjService invoiceAllYhdjService; + + /** + * 查询金四-用户登记列表 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:list')") + @GetMapping("/list") + public TableDataInfo list(InvoiceAllYhdj invoiceAllYhdj) + { + startPage(); + List list = invoiceAllYhdjService.selectInvoiceAllYhdjList(invoiceAllYhdj); + return getDataTable(list); + } + + /** + * 导出金四-用户登记列表 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:export')") + @Log(title = "金四-用户登记", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, InvoiceAllYhdj invoiceAllYhdj) + { + List list = invoiceAllYhdjService.selectInvoiceAllYhdjList(invoiceAllYhdj); + ExcelUtil util = new ExcelUtil(InvoiceAllYhdj.class); + util.exportExcel(response, list, "金四-用户登记数据"); + } + + /** + * 获取金四-用户登记详细信息 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:query')") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return AjaxResult.success(invoiceAllYhdjService.selectInvoiceAllYhdjById(id)); + } + + /** + * 新增金四-用户登记 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:add')") + @Log(title = "金四-用户登记", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody InvoiceAllYhdj invoiceAllYhdj) + { + return toAjax(invoiceAllYhdjService.insertInvoiceAllYhdj(invoiceAllYhdj)); + } + + /** + * 修改金四-用户登记 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:edit')") + @Log(title = "金四-用户登记", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody InvoiceAllYhdj invoiceAllYhdj) + { + return toAjax(invoiceAllYhdjService.updateInvoiceAllYhdj(invoiceAllYhdj)); + } + + /** + * 删除金四-用户登记 + */ + @PreAuthorize("@ss.hasPermi('invoiceall:invoiceallyhdj:remove')") + @Log(title = "金四-用户登记", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(invoiceAllYhdjService.deleteInvoiceAllYhdjByIds(ids)); + } +} diff --git a/jianshui-ui/src/api/digital/registered.js b/jianshui-ui/src/api/digital/registered.js new file mode 100644 index 0000000..16ecf1e --- /dev/null +++ b/jianshui-ui/src/api/digital/registered.js @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询金四-用户登记列表 +export function listInvoiceallyhdj(query) { + return request({ + url: '/invoiceall/invoiceallyhdj/list', + method: 'get', + params: query + }) +} + +// 查询金四-用户登记详细 +export function getInvoiceallyhdj(id) { + return request({ + url: '/invoiceall/invoiceallyhdj/' + id, + method: 'get' + }) +} + +// 新增金四-用户登记 +export function addInvoiceallyhdj(data) { + return request({ + url: '/invoiceall/invoiceallyhdj', + method: 'post', + data: data + }) +} + +// 修改金四-用户登记 +export function updateInvoiceallyhdj(data) { + return request({ + url: '/invoiceall/invoiceallyhdj', + method: 'put', + data: data + }) +} + +// 删除金四-用户登记 +export function delInvoiceallyhdj(id) { + return request({ + url: '/invoiceall/invoiceallyhdj/' + id, + method: 'delete' + }) +} diff --git a/jianshui-ui/src/views/digital/registered/index.vue b/jianshui-ui/src/views/digital/registered/index.vue new file mode 100644 index 0000000..5f95507 --- /dev/null +++ b/jianshui-ui/src/views/digital/registered/index.vue @@ -0,0 +1,411 @@ + + + From bade1784346976f7d71ae6f613354173e1ecb066 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 29 Feb 2024 15:49:24 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=95=B0=E7=94=B5=E9=85=8D=E7=BD=AE-?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=99=BB=E8=AE=B0=EF=BC=9A=E7=99=BB=E8=AE=B0?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=AE=9E=E7=8E=B0=E5=92=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E3=80=81=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E3=80=81=E6=9F=A5=E8=AF=A2=E3=80=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=90=8D=E7=A7=B0=E4=B8=BAinvoiceallyhdjMenu.sql?= =?UTF-8?q?=E7=9A=84sql=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/domain/InvoiceAllYhdj.java | 11 +- .../mapper/system/InvoiceAllYhdjMapper.xml | 2 +- jianshui-ui/src/api/digital/registered.js | 31 ++ .../src/views/digital/registered/index.vue | 459 +++++++++++++----- sql/invoiceallyhdjMenu.sql | 43 ++ 5 files changed, 409 insertions(+), 137 deletions(-) create mode 100644 sql/invoiceallyhdjMenu.sql diff --git a/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java index e6a7818..b28c112 100644 --- a/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java +++ b/jianshui-system/src/main/java/com/jianshui/system/domain/InvoiceAllYhdj.java @@ -25,11 +25,11 @@ public class InvoiceAllYhdj implements Serializable private Long id; /** 办税人员姓名(税局实名认证的人员) */ - @Excel(name = "办税人员姓名(税局实名认证的人员)") + @Excel(name = "办税人员姓名") private String bsryxm; /** 登录身份(1:财务负责人,2:法定代表人,3:办税人,4:购票员,5:普通管理员,99:其他) 备注:如果选择99|其他,则办税人员名称、手机号码、身份证件号码.可以不传 */ - @Excel(name = "登录身份(1:财务负责人,2:法定代表人,3:办税人,4:购票员,5:普通管理员,99:其他) 备注:如果选择99|其他,则办税人员名称、手机号码、身份证件号码.可以不传") + @Excel(name = "登录身份") private String dlsf; /** 办税人员登录密码 */ @@ -37,7 +37,7 @@ public class InvoiceAllYhdj implements Serializable private String dlsfmm; /** 登录方式(参考码表) */ - @Excel(name = "登录方式(参考码表)") + @Excel(name = "登录方式") private String dlfs; /** 登录密码 */ @@ -57,11 +57,11 @@ public class InvoiceAllYhdj implements Serializable private String nsrsbh; /** 办税人员身份证件号码(税局实名认证的人员) */ - @Excel(name = "办税人员身份证件号码(税局实名认证的人员)") + @Excel(name = "身份证件号") private String bsrysfzjhm; /** 办税人员手机号码(税局实名认证的人员) */ - @Excel(name = "办税人员手机号码(税局实名认证的人员)") + @Excel(name = "手机号码") private String bsrysjhm; /** 中间号码 */ @@ -83,6 +83,7 @@ public class InvoiceAllYhdj implements Serializable private Date updateTime; /** 备注 */ + @Excel(name = "备注") private String remark; diff --git a/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml index 62e4875..db4a50c 100644 --- a/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml +++ b/jianshui-system/src/main/resources/mapper/system/InvoiceAllYhdjMapper.xml @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,identity,dqbm from invoice_all_yhdj + select id, bsryxm, dlsf, dlsfmm, dlfs, dlmm, dlzh, nsrmc, nsrsbh, bsrysfzjhm, bsrysjhm, zjh, create_by, create_time, update_by, update_time, remark,`identity`,dqbm from invoice_all_yhdj