From 7aae72905d1817c87b2ac3cbf2bb767ec07a466a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 27 Nov 2024 13:37:57 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
=?UTF-8?q?=E5=8D=95=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../settleAccounts/settleAccountsAdd.vue | 68 -------------------
.../settleAccounts/settleAccountsInfo.vue | 18 +++--
.../jiesuanFlow/settleAccountsDaiBan.vue | 18 +++--
.../jiesuanFlow/settleAccountsEdit.vue | 68 -------------------
.../jiesuanFlow/settleAccountsYiBan.vue | 18 +++--
5 files changed, 33 insertions(+), 157 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
index 8f59093edd..9a04adee12 100644
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
@@ -99,16 +99,6 @@
{{ formobj.settleAmount }} = 合计金额：{{ formobj.receivableAmount }} - 优惠：{{ formobj.discountAmount }}
-
-
- 成本合计
- {{ totalCost }}
-
-
- 利润额
- {{ amountOfProfit }}
-
-
维修项目
@@ -121,8 +111,6 @@
-
-
@@ -138,8 +126,6 @@
-
-
@@ -227,8 +213,6 @@
-
-
@@ -312,56 +296,6 @@ export default {
rules: {}
}
},
- computed: {
- // 单据信息模块 -- 成本合计 = 维修项目列表成本合计 + 维修用料列表成本合计 + 其他附加项目成本合计(附加项目列表成本合计 + 外出费成本 + 厂家补助成本 + 施救费成本)
- totalCost() {
- let cost = '0'
- // 维修项目列表成本合计
- if (this.formobj.sitemVos.length > 0) {
- this.formobj.sitemVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.sitemCost !== '' ? e.sitemCost : 0)) * 100) / 100
- })
- }
- // 维修用料列表成本合计
- if (this.formobj.goodsDetailsVos.length > 0) {
- this.formobj.goodsDetailsVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.goodsCost !== '' ? e.goodsCost : 0)) * 100) / 100
- })
- }
- // 其他附加项目列表成本合计
- if (this.formobj.aitemVos.length > 0) {
- this.formobj.aitemVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.aitemCost !== '' ? e.aitemCost : 0)) * 100) / 100
- })
- }
- cost = Math.round((parseFloat(cost) + parseFloat(this.formobj.outCost !== '' ? this.formobj.outCost : 0) + parseFloat(this.formobj.subsidyCost !== '' ? this.formobj.subsidyCost : 0) + parseFloat(this.formobj.rescueCost !== '' ? this.formobj.rescueCost : 0)) * 100) / 100
- return cost
- },
- // 单据信息模块 -- 利润额 = 维修项目列表利润额合计 + 维修用料列表利润额合计 + 其他附加项目利润额合计(附加项目列表利润额合计 + 外出费利润额 + 厂家补助利润额 + 施救费利润额)
- amountOfProfit() {
- let print = '0'
- // 维修项目列表成本合计
- if (this.formobj.sitemVos.length > 0) {
- this.formobj.sitemVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.sitemPrint !== '' ? e.sitemPrint : 0)) * 100) / 100
- })
- }
- // 维修用料列表成本合计
- if (this.formobj.goodsDetailsVos.length > 0) {
- this.formobj.goodsDetailsVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.goodsPrint !== '' ? e.goodsPrint : 0)) * 100) / 100
- })
- }
- // 其他附加项目列表成本合计
- if (this.formobj.aitemVos.length > 0) {
- this.formobj.aitemVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.aitemPrint !== '' ? e.aitemPrint : 0)) * 100) / 100
- })
- }
- print = Math.round((parseFloat(print) + parseFloat(this.formobj.outPrint !== '' ? this.formobj.outPrint : 0) + parseFloat(this.formobj.subsidyPrint !== '' ? this.formobj.subsidyPrint : 0) + parseFloat(this.formobj.rescuePrint !== '' ? this.formobj.rescuePrint : 0)) * 100) / 100
- return print
- }
- },
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -421,8 +355,6 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
- this.formobj.costAmount = this.totalCost
- this.formobj.profit = this.amountOfProfit
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
diff --git a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
index 381b683098..1b4d763ad8 100644
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
@@ -98,7 +98,7 @@
{{ formobj.settleAmount }} = 合计金额：{{ formobj.receivableAmount }} - 优惠：{{ formobj.discountAmount }}
-
+
成本合计
{{ formobj.costAmount }}
@@ -120,8 +120,8 @@
-
-
+
+
@@ -137,8 +137,8 @@
-
-
+
+
@@ -226,8 +226,8 @@
-
-
+
+
@@ -246,6 +246,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
+ conceal: false, // 当前登录人 = 申请人时，隐藏成本、利润额
tableKey: 0,
index: 0,
// service服务
@@ -320,6 +321,9 @@ export default {
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
+ this.conceal = true
+ }
}
})
},
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
index 624aa6f8b9..b0832cb714 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
@@ -101,7 +101,7 @@
{{ formobj.settleAmount }} = 合计金额：{{ formobj.receivableAmount }} - 优惠：{{ formobj.discountAmount }}
-
+
成本合计
{{ formobj.costAmount }}
@@ -123,8 +123,8 @@
-
-
+
+
@@ -140,8 +140,8 @@
-
-
+
+
@@ -229,8 +229,8 @@
-
-
+
+
@@ -288,6 +288,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
+ conceal: false,
tableKey: 0,
index: 0,
// service服务
@@ -426,6 +427,9 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
+ this.conceal = true
+ }
}
})
selectStaffListss().then((res) => {
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
index 133cb6f30a..2e7aff7b08 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
@@ -98,16 +98,6 @@
{{ formobj.settleAmount }} = 合计金额：{{ formobj.receivableAmount }} - 优惠：{{ formobj.discountAmount }}
-
-
- 成本合计
- {{ totalCost }}
-
-
- 利润额
- {{ amountOfProfit }}
-
-
维修项目
@@ -120,8 +110,6 @@
-
-
@@ -137,8 +125,6 @@
-
-
@@ -226,8 +212,6 @@
-
-
@@ -328,56 +312,6 @@ export default {
}
}, '*')
},
- computed: {
- // 单据信息模块 -- 成本合计 = 维修项目列表成本合计 + 维修用料列表成本合计 + 其他附加项目成本合计(附加项目列表成本合计 + 外出费成本 + 厂家补助成本 + 施救费成本)
- totalCost() {
- let cost = '0'
- // 维修项目列表成本合计
- if (this.formobj.sitemVos.length > 0) {
- this.formobj.sitemVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.sitemCost !== '' ? e.sitemCost : 0)) * 100) / 100
- })
- }
- // 维修用料列表成本合计
- if (this.formobj.goodsDetailsVos.length > 0) {
- this.formobj.goodsDetailsVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.goodsCost !== '' ? e.goodsCost : 0)) * 100) / 100
- })
- }
- // 其他附加项目列表成本合计
- if (this.formobj.aitemVos.length > 0) {
- this.formobj.aitemVos.forEach((e) => {
- cost = Math.round((parseFloat(cost) + parseFloat(e.aitemCost !== '' ? e.aitemCost : 0)) * 100) / 100
- })
- }
- cost = Math.round((parseFloat(cost) + parseFloat(this.formobj.outCost !== '' ? this.formobj.outCost : 0) + parseFloat(this.formobj.subsidyCost !== '' ? this.formobj.subsidyCost : 0) + parseFloat(this.formobj.rescueCost !== '' ? this.formobj.rescueCost : 0)) * 100) / 100
- return cost
- },
- // 单据信息模块 -- 利润额 = 维修项目列表利润额合计 + 维修用料列表利润额合计 + 其他附加项目利润额合计(附加项目列表利润额合计 + 外出费利润额 + 厂家补助利润额 + 施救费利润额)
- amountOfProfit() {
- let print = '0'
- // 维修项目列表成本合计
- if (this.formobj.sitemVos.length > 0) {
- this.formobj.sitemVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.sitemPrint !== '' ? e.sitemPrint : 0)) * 100) / 100
- })
- }
- // 维修用料列表成本合计
- if (this.formobj.goodsDetailsVos.length > 0) {
- this.formobj.goodsDetailsVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.goodsPrint !== '' ? e.goodsPrint : 0)) * 100) / 100
- })
- }
- // 其他附加项目列表成本合计
- if (this.formobj.aitemVos.length > 0) {
- this.formobj.aitemVos.forEach((e) => {
- print = Math.round((parseFloat(print) + parseFloat(e.aitemPrint !== '' ? e.aitemPrint : 0)) * 100) / 100
- })
- }
- print = Math.round((parseFloat(print) + parseFloat(this.formobj.outPrint !== '' ? this.formobj.outPrint : 0) + parseFloat(this.formobj.subsidyPrint !== '' ? this.formobj.subsidyPrint : 0) + parseFloat(this.formobj.rescuePrint !== '' ? this.formobj.rescuePrint : 0)) * 100) / 100
- return print
- }
- },
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') // 保留数字
@@ -426,8 +360,6 @@ export default {
submit() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
- this.formobj.costAmount = this.totalCost
- this.formobj.profit = this.amountOfProfit
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
index a8ba2b38bb..4e55da5cf2 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
@@ -98,7 +98,7 @@
{{ formobj.settleAmount }} = 合计金额：{{ formobj.receivableAmount }} - 优惠：{{ formobj.discountAmount }}
-
+
成本合计
{{ formobj.costAmount }}
@@ -120,8 +120,8 @@
-
-
+
+
@@ -137,8 +137,8 @@
-
-
+
+
@@ -226,8 +226,8 @@
-
-
+
+
@@ -246,6 +246,7 @@ export default {
viewTitle: '',
viewState: 1,
submitdisabled: false,
+ conceal: false,
tableKey: 0,
index: 0,
// service服务
@@ -355,6 +356,9 @@ export default {
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
+ if (this.formobj.createBySid !== window.sessionStorage.getItem('userSid')) {
+ this.conceal = true
+ }
}
})
},
From 3c7d5557925b5cec849b909bf2de8ed844fc1d84 Mon Sep 17 00:00:00 2001
From: ligaode
Date: Wed, 27 Nov 2024 14:08:41 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java
index d7d2c5dfc8..49ddf1c495 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyRest.java
@@ -48,7 +48,7 @@ import java.util.List;
@Api(tags = "销售单开票申请")
@RestController
-@RequestMapping("v1/assaleinvoiceapply")
+@RequestMapping("v1/salesInvoice")
public class AsSaleinvoiceapplyRest {
@Autowired
@@ -63,7 +63,7 @@ public class AsSaleinvoiceapplyRest {
}
@ApiOperation("新增或修改")
- @PostMapping("/save")
+ @PostMapping("/saveOrUpdate")
public ResultBean save(@RequestBody AsSaleinvoiceapplyDto dto){
ResultBean rb = ResultBean.fireFail();
asSaleinvoiceapplyService.saveOrUpdateDto(dto);
@@ -85,7 +85,7 @@ public class AsSaleinvoiceapplyRest {
}
@ApiOperation("提交")
- @PostMapping("/submitApply")
+ @PostMapping("/submit")
public ResultBean submitApply(@Valid @RequestBody SubmitSaleinvoiceapplyDto dto) {
return asSaleinvoiceapplyService.submitApply(dto);
}
From b8facbb0d0c63285026708232bdc0982a86b4ba5 Mon Sep 17 00:00:00 2001
From: myTest383
Date: Wed, 27 Nov 2024 14:13:04 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95=E7=94=B3?=
=?UTF-8?q?=E8=AF=B7=E5=BC=80=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/api/operation/salesInvoice.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/yxt-as-ui/src/api/operation/salesInvoice.js b/yxt-as-ui/src/api/operation/salesInvoice.js
index e742a696f1..dcd49afef8 100644
--- a/yxt-as-ui/src/api/operation/salesInvoice.js
+++ b/yxt-as-ui/src/api/operation/salesInvoice.js
@@ -4,7 +4,7 @@ export default {
// 查询分页列表
listPage: function(params) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/listPage',
method: 'post',
data: params,
@@ -15,7 +15,7 @@ export default {
},
saveOrUpdate: function(data) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/saveOrUpdate',
method: 'post',
data: data,
@@ -26,14 +26,14 @@ export default {
},
fetchBySid: function(data) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/fetchDetailsBySid/' + data,
method: 'get'
})
},
deleteBySids: function(data) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/delBySids',
method: 'DELETE',
data: data,
@@ -44,7 +44,7 @@ export default {
},
submit: function(data) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/submit',
method: 'post',
data: data,
@@ -56,7 +56,7 @@ export default {
salesOrderListPage: function(params) {
return request({
- baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+ // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
url: '/as/v1/salesInvoice/salesOrderListPage',
method: 'post',
data: params,
From 1e96f9fdfcc9c8ddf36976cfe137a755b73a5f26 Mon Sep 17 00:00:00 2001
From: myTest383
Date: Wed, 27 Nov 2024 14:29:15 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A2=E6=88=B7?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../operation/salesInvoice/relation/selectSalesOrder.vue | 8 ++++----
.../src/views/operation/salesInvoice/salesInvoiceAdd.vue | 2 +-
.../src/views/operation/salesInvoice/salesInvoiceInfo.vue | 2 +-
.../salesInvoiceFlow/relation/selectSalesOrder.vue | 8 ++++----
.../workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue | 2 +-
.../views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue | 2 +-
.../views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue b/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
index 934e926c12..664b3441fb 100644
--- a/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/relation/selectSalesOrder.vue
@@ -20,7 +20,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
@@ -104,7 +104,7 @@
"deptSid": "",
"billNo": "",
"salePerson": "",
- "cusmoterName": "",
+ "customerName": "",
"vehMark": "",
"settleDateStart": "",
"settleDateEnd": "",
@@ -156,7 +156,7 @@
this.listQuery.total = 0
this.listQuery.params.billNo = ''
this.listQuery.params.salePerson = ''
- this.listQuery.params.cusmoterName = ''
+ this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.settleDateStart = ''
this.listQuery.params.settleDateEnd = ''
diff --git a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
index 85d9dc3cf2..0ea42f6711 100644
--- a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceAdd.vue
@@ -89,7 +89,7 @@
-
+
diff --git a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
index 11c8a0bcb8..084829c06f 100644
--- a/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
+++ b/yxt-as-ui/src/views/operation/salesInvoice/salesInvoiceInfo.vue
@@ -64,7 +64,7 @@
-
+
diff --git a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
index 934e926c12..664b3441fb 100644
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/relation/selectSalesOrder.vue
@@ -20,7 +20,7 @@
-
+
@@ -56,7 +56,7 @@
-
+
@@ -104,7 +104,7 @@
"deptSid": "",
"billNo": "",
"salePerson": "",
- "cusmoterName": "",
+ "customerName": "",
"vehMark": "",
"settleDateStart": "",
"settleDateEnd": "",
@@ -156,7 +156,7 @@
this.listQuery.total = 0
this.listQuery.params.billNo = ''
this.listQuery.params.salePerson = ''
- this.listQuery.params.cusmoterName = ''
+ this.listQuery.params.customerName = ''
this.listQuery.params.vehMark = ''
this.listQuery.params.settleDateStart = ''
this.listQuery.params.settleDateEnd = ''
diff --git a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
index 7d94b56cd6..eba07ed3a4 100644
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceDaiBan.vue
@@ -67,7 +67,7 @@
-
+
diff --git a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
index dafb24c19d..1849b86665 100644
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceEdit.vue
@@ -88,7 +88,7 @@
-
+
diff --git a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
index 0b3356488e..a3aa51fe8d 100644
--- a/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/salesInvoiceFlow/salesInvoiceYiBan.vue
@@ -64,7 +64,7 @@
-
+
From 16c3627b10335074589afe5c63149634118a3535 Mon Sep 17 00:00:00 2001
From: ligaode
Date: Wed, 27 Nov 2024 14:58:32 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yxt/sms/apiadmin/SmsSalesBillRest.java | 8 ++++
.../smssalesbill/SalesInvChoiceBillQuery.java | 24 +++++++++++
.../smssalesbill/SalesInvChoiceBillVo.java | 40 +++++++++++++++++++
.../biz/smssalesbill/SmsSalesBillMapper.java | 30 +++++++-------
.../biz/smssalesbill/SmsSalesBillMapper.xml | 19 +++++++++
.../biz/smssalesbill/SmsSalesBillService.java | 36 ++++++++++++++++-
6 files changed, 142 insertions(+), 15 deletions(-)
create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java
create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
index eedfe24d1f..7500ba93e5 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/apiadmin/SmsSalesBillRest.java
@@ -83,6 +83,14 @@ public class SmsSalesBillRest {
return rb.success().setData(pv);
}
+ @ApiOperation("销售单开票选择销售单")
+ @PostMapping("/salesInvChoiceBill")
+ public ResultBean> salesInvChoiceBill(@RequestBody PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = smsSalesBillService.salesInvChoiceBill(pq);
+ return rb.success().setData(pv);
+ }
+
@ApiOperation("销售价趋势报表")
@PostMapping("/goodsTrendReport")
public ResultBean> goodsTrendReport(@RequestBody PagerQuery pq) {
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java
new file mode 100644
index 0000000000..fc33b16090
--- /dev/null
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.sms.biz.smssalesbill;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/21 14:02
+ */
+@Data
+public class SalesInvChoiceBillQuery implements Query {
+
+
+ private String deptSid; //部门sid
+ private String salePerson; //配件销售人
+ private String billNo;//工单编号
+ private String customerName;//客户
+ private String vehMark;//车牌号
+ private String settleDateStart; //结算日期
+ private String settleDateEnd;
+ private String createDateStart; // 制单日期
+ private String createDateEnd;
+}
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java
new file mode 100644
index 0000000000..ce683e8d37
--- /dev/null
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SalesInvChoiceBillVo.java
@@ -0,0 +1,40 @@
+package com.yxt.sms.biz.smssalesbill;
+
+import com.yxt.common.core.query.Query;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/6/21 14:02
+ */
+@Data
+public class SalesInvChoiceBillVo implements Vo {
+
+ private String saleOrderSid;
+ private String saleOrderNo;//工单编号
+ @ApiModelProperty("销售姓名")
+ private String salePerson;
+ @ApiModelProperty("客户名称")
+ private String customerName;
+ @ApiModelProperty("车牌号")
+ private String vehMark;
+ @ApiModelProperty("车架号")
+ private String vinNo;
+ @ApiModelProperty("材料费")
+ private String goodsAmount;
+ @ApiModelProperty("附加费")
+ private String addAmount;
+ @ApiModelProperty("优惠")
+ private String discountAmount;
+ @ApiModelProperty("结算日期")
+ private String settleDate;
+ @ApiModelProperty("结算金额合计")
+ private String settleAmount;
+ @ApiModelProperty("制单人")
+ private String createByName;
+ @ApiModelProperty("制单日期")
+ private String createDate;
+}
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java
index 94c9a4e96d..09606a96ed 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.java
@@ -57,29 +57,31 @@ import java.util.List;
@Mapper
public interface SmsSalesBillMapper extends BaseMapper {
- //@Update("update sms_sales_bill set name=#{msg} where id=#{id}")
- //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+ //@Update("update sms_sales_bill set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
- List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
- @Select("select * from sms_sales_bill")
- List selectListVo();
+ @Select("select * from sms_sales_bill")
+ List selectListVo();
- List listExcel(@Param(Constants.WRAPPER)QueryWrapper qw);
+ List listExcel(@Param(Constants.WRAPPER) QueryWrapper qw);
- IPage goodsDetailsReport(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
+ IPage goodsDetailsReport(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- IPage goodsTotalsReport(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
+ IPage goodsTotalsReport(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- IPage goodsTrendReport(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
+ IPage goodsTrendReport(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- int selectNum(String bill);
+ int selectNum(String bill);
- IPage listPageSalesGoods(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw);
+ IPage listPageSalesGoods(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
- int selectBySid(String join);
+ int selectBySid(String join);
- IPage listReturnGoods(IPage page, @Param(Constants.WRAPPER)QueryWrapper qw);
+ IPage listReturnGoods(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage salesInvChoiceBill(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
}
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
index 7e76689ab7..249a7b0bda 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
@@ -148,4 +148,23 @@
sms_sales_bill AS s
${ew.sqlSegment}
+
+
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
index f8bcb9c90e..0203eb4838 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillService.java
@@ -110,6 +110,7 @@ public class SmsSalesBillService extends MybatisBaseService createQueryWrapper(SmsSalesBillQuery query) {
// todo: 这里根据具体业务调整查询条件
// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@@ -654,6 +655,40 @@ public class SmsSalesBillService extends MybatisBaseService salesInvChoiceBill(PagerQuery pq) {
+ SalesInvChoiceBillQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("s.deptSid", query.getDeptSid());
+ if (StringUtils.isNotBlank(query.getSalePerson())) {
+ qw.like("s.salesName", query.getSalePerson());
+ }
+ if (StringUtils.isNotBlank(query.getBillNo())) {
+ qw.like("s.billNo", query.getBillNo());
+ }
+ if (StringUtils.isNotBlank(query.getCustomerName())) {
+ qw.like("s.customerName", query.getCustomerName());
+ }
+ if (StringUtils.isNotBlank(query.getVehMark())) {
+ qw.like("s.vehMark", query.getVehMark());
+ }
+ String settleDateStart = query.getSettleDateStart();
+ String settleDateEnd = query.getSettleDateEnd();
+ qw.apply(StringUtils.isNotEmpty(settleDateStart), "date_format (s.settleTime,'%Y-%m-%d') >= date_format('" + settleDateStart + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(settleDateEnd), "date_format (s.settleTime,'%Y-%m-%d') <= date_format('" + settleDateEnd + "','%Y-%m-%d')"
+ );
+ String startDate = query.getCreateDateStart();
+ String endDate = query.getCreateDateEnd();
+ qw.apply(StringUtils.isNotEmpty(startDate), "date_format (s.createTime,'%Y-%m-%d') >= date_format('" + startDate + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(endDate), "date_format (s.createTime,'%Y-%m-%d') <= date_format('" + endDate + "','%Y-%m-%d')"
+ );
+ qw.eq("s.state", "0");
+ qw.orderByDesc("s.id");
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.salesInvChoiceBill(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
public ResultBean printSmsBill(PrintPdfQuery query) {
ResultBean rb = ResultBean.fireFail();
PrintPdfVo vo = new PrintPdfVo();
@@ -828,5 +863,4 @@ public class SmsSalesBillService extends MybatisBaseService
Date: Wed, 27 Nov 2024 14:58:41 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E9=94=80=E5=94=AE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/api/operation/salesInvoice.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yxt-as-ui/src/api/operation/salesInvoice.js b/yxt-as-ui/src/api/operation/salesInvoice.js
index dcd49afef8..be47830742 100644
--- a/yxt-as-ui/src/api/operation/salesInvoice.js
+++ b/yxt-as-ui/src/api/operation/salesInvoice.js
@@ -57,7 +57,7 @@ export default {
salesOrderListPage: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
- url: '/as/v1/salesInvoice/salesOrderListPage',
+ url: '/apiadmin/v1/smssalesbill/salesInvChoiceBill',
method: 'post',
data: params,
headers: {
From bdb7ed60705358fe447873e727b2e34116033f1c Mon Sep 17 00:00:00 2001
From: myTest383
Date: Wed, 27 Nov 2024 15:21:05 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=93=E5=BA=93bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
yxt-as-ui/src/api/operation/salesInvoice.js | 2 +-
.../goodsShelves/goodsShelvesAdd.vue | 6 +++---
.../views/warehouse/goodsShelves/index.vue | 19 ++++++++++---------
.../warehouse/warehouse/warehouseAdd.vue | 4 ++--
.../views/warehouse/warehouseArea/index.vue | 16 +++++++---------
.../warehouseArea/warehouseAreaAdd.vue | 9 +++++----
.../warehouseZone/warehouseZoneAdd.vue | 6 +++---
7 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/yxt-as-ui/src/api/operation/salesInvoice.js b/yxt-as-ui/src/api/operation/salesInvoice.js
index be47830742..e9d4207dab 100644
--- a/yxt-as-ui/src/api/operation/salesInvoice.js
+++ b/yxt-as-ui/src/api/operation/salesInvoice.js
@@ -57,7 +57,7 @@ export default {
salesOrderListPage: function(params) {
return request({
// baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
- url: '/apiadmin/v1/smssalesbill/salesInvChoiceBill',
+ url: '/sms/apiadmin/v1/smssalesbill/salesInvChoiceBill',
method: 'post',
data: params,
headers: {
diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
index a2ca43ec29..3f3168d06c 100644
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue
@@ -329,9 +329,9 @@
type: 'success',
message: resp.msg
})
- this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm('是否继续添加库位信息?', '温馨提示', {
+ confirmButtonText: '是',
+ cancelButtonText: '否',
type: 'warning'
}).then(() => {
// 点击确定进行的操作
diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
index 446e83e7fb..22d20d612d 100644
--- a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
+++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue
@@ -15,27 +15,28 @@
-
-
-
+
+
+
-
-
-
+
+
-
{
// 点击确定进行的操作
diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
index 466be67b95..e0c1160923 100644
--- a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue
@@ -22,7 +22,13 @@
-
+
+
+
+
+
@@ -31,14 +37,6 @@
-
-
-
-
-
-
* 库区名称
-
+
@@ -231,9 +232,9 @@
type: 'success',
message: resp.msg
})
- this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm('是否继续添加库区信息?', '温馨提示', {
+ confirmButtonText: '是',
+ cancelButtonText: '否',
type: 'warning'
}).then(() => {
// 点击确定进行的操作
diff --git a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue
index fc91c6eb9a..0253313c66 100644
--- a/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue
+++ b/yxt-as-ui/src/views/warehouse/warehouseZone/warehouseZoneAdd.vue
@@ -181,9 +181,9 @@
type: 'success',
message: resp.msg
})
- this.$confirm('是否继续添加仓库区域信息?', '温馨提示', {
- confirmButtonText: '确定',
- cancelButtonText: '取消',
+ this.$confirm('是否继续添加区域信息?', '温馨提示', {
+ confirmButtonText: '是',
+ cancelButtonText: '否',
type: 'warning'
}).then(() => {
// 点击确定进行的操作
From 7909530c50ea693cf2b6facfd036555361cf2849 Mon Sep 17 00:00:00 2001
From: ligaode
Date: Wed, 27 Nov 2024 15:26:25 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
index 249a7b0bda..da82e811bb 100644
--- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
+++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesbill/SmsSalesBillMapper.xml
@@ -162,7 +162,7 @@
s.goodsAmount,
s.addAmount,
s.discountAmount,
- date_format(s.settleTime, '%Y-%m-%d') as settleDate,
+ date_format(s.settleTime, '%Y-%m-%d') as settleDate
from
sms_sales_bill AS s
${ew.sqlSegment}