From 68cd99a5daeeb280a4c91ea80ffd1fc58715cd5a Mon Sep 17 00:00:00 2001
From: wangjiadong <1654135867@qq.com>
Date: Fri, 30 Dec 2022 15:09:21 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BE=E5=AE=A2=E5=8F=91=E7=A5=A8=E7=AE=A1?=
=?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../admin/CustomerInvoiceList.vue | 22 ++++--
.../admin/modules/CustomerInvoiceForm.vue | 46 +++++++++--
.../controller/CustomerInvoiceController.java | 76 ++++++++++---------
.../entity/CustomerInvoice.java | 73 +++++++++---------
4 files changed, 134 insertions(+), 83 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
index 1ffb21d9..350151d8 100644
--- a/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/CustomerInvoiceList.vue
@@ -25,6 +25,11 @@
+
+
+
+
+
@@ -103,19 +108,20 @@
编辑
-
+
详情
-
-
+
+
删除
-
+
@@ -198,7 +204,7 @@
{
title:'开户行',
align:"center",
- dataIndex: 'bankDeposit'
+ dataIndex: 'bankDeposit_dictText'
},
{
@@ -227,7 +233,7 @@
deleteBatch: "/customerinvoice/customerInvoice/deleteBatch",
exportXlsUrl: "/customerinvoice/customerInvoice/exportXls",
importExcelUrl: "customerinvoice/customerInvoice/importExcel",
-
+
},
dictOptions:{},
superFieldList:[],
diff --git a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue
index a26b9043..b46603da 100644
--- a/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue
+++ b/ant-design-vue-jeecg/src/views/customerinvoice/admin/modules/CustomerInvoiceForm.vue
@@ -7,7 +7,7 @@
-
+
-
+
@@ -63,7 +63,7 @@
-
+
@@ -71,12 +71,28 @@
-
+
+
+
+
+
+
+
+
@@ -103,6 +119,7 @@
import { httpAction, getAction } from '@/api/manage'
import { validateDuplicateValue } from '@/utils/util'
+ import store from '@/store'
export default {
name: 'CustomerInvoiceForm',
@@ -119,6 +136,10 @@
data () {
return {
model:{
+ invoiceType : 2,
+ customerType : 1,
+ name : store.getters.userInfo.realname
+
},
labelCol: {
xs: { span: 24 },
@@ -130,6 +151,9 @@
},
confirmLoading: false,
validatorRules: {
+ accountNumber: [
+ { required: true, message: '请输入账号!'},
+ ],
username: [
{ required: true, message: '请输入用户!'},
],
@@ -146,6 +170,16 @@
{ required: false},
{ pattern: /^1[3456789]\d{9}$/, message: '请输入正确的手机号码!'},
],
+ /* sort: [
+ /!* { required: true, message: '请输入胸围!'},*!/
+ {pattern: /^\d*\.?\d$/,message:'请输入大于0的数,保留一位小数'}
+ ],*/
+
+
+ sort: [
+ { required: false},
+ { validator: (rule, value, callback) => validateDuplicateValue('customer_invoice', 'sort', value, this.model.id, callback)},
+ ],
},
url: {
add: "/customerinvoice/customerInvoice/add",
@@ -197,7 +231,7 @@
that.confirmLoading = false;
})
}
-
+
})
},
popupCallback(value,row){
diff --git a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
index bade71cc..4d479e21 100644
--- a/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
+++ b/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/demo/customerinvoice/controller/CustomerInvoiceController.java
@@ -51,7 +51,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
public class CustomerInvoiceController extends JeecgController {
@Autowired
private ICustomerInvoiceService customerInvoiceService;
-
+
/**
* 分页列表查询
*
@@ -73,7 +73,7 @@ public class CustomerInvoiceController extends JeecgController pageList = customerInvoiceService.page(page, queryWrapper);
return Result.OK(pageList);
}
-
+
/**
* 添加
*
@@ -87,27 +87,30 @@ public class CustomerInvoiceController extends JeecgController 0) {
- if (bankUtil.checkBankCard(customerInvoice.getAccountNumber())){
- customerInvoice.setBankDeposit(bankUtil.getNameOfBank(customerInvoice.getAccountNumber()));
- }else{
- flag=1;
- return Result.error("请输入正确银行卡号码");
- }
+ } else {
+ flag = 1;
+ return Result.error("排序必须大于0");
+ }
+ }*/
- if(customerInvoice.getSort()>0){
-
- }else{
- flag=1;
- return Result.error("排序必须大于0");
- }
if(flag==0){
customerInvoiceService.save(customerInvoice);
@@ -120,7 +123,7 @@ public class CustomerInvoiceController extends JeecgController0){
+ /*if(customerInvoice.getSort()>0){
}else{
flag=1;
return Result.error("排序必须大于0");
}
-
+*/
if(flag==0){
customerInvoiceService.updateById(customerInvoice);
return Result.OK("编辑成功!");
@@ -167,7 +173,7 @@ public class CustomerInvoiceController extends JeecgController