From d7dc3c247b641845642cc6250d4aa316858a3e49 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 17 Apr 2025 13:46:32 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../arrearsoutapply/AppArrearsoutApplyService.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/arrearsoutapply/AppArrearsoutApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/arrearsoutapply/AppArrearsoutApplyService.java index 05ae34fa4a..35914590b1 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/arrearsoutapply/AppArrearsoutApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/as/arrearsoutapply/AppArrearsoutApplyService.java @@ -18,6 +18,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.text.SimpleDateFormat; import java.util.Collections; import java.util.List; import java.util.stream.Collectors; @@ -42,11 +43,22 @@ public class AppArrearsoutApplyService { ApplyDetailsVo applyDetailsVo = new ApplyDetailsVo(); AsArrearsoutApplyDetailsVo asArrearsoutApplyDetailsVo = resultBean.getData(); BeanUtil.copyProperties(asArrearsoutApplyDetailsVo, applyDetailsVo); + // 使用SimpleDateFormat + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + if (asArrearsoutApplyDetailsVo.getBalanceDate() != null) { + String dateString = sdf.format(asArrearsoutApplyDetailsVo.getBalanceDate()); + applyDetailsVo.setBalanceDate(dateString); + } + if (asArrearsoutApplyDetailsVo.getCreateTime() != null) { + String dateString = sdf.format(asArrearsoutApplyDetailsVo.getCreateTime()); + applyDetailsVo.setCreateTime(dateString); + } List filePaths = asArrearsoutApplyDetailsVo.getFilePaths(); if (!filePaths.isEmpty()) { List stringList = filePaths.stream().map(v -> v.getUrl()).collect(Collectors.toList()); applyDetailsVo.setFiles(stringList); } + applyDetailsVo.setProcInsId(asArrearsoutApplyDetailsVo.getProcInstId()); return rb.success().setData(applyDetailsVo); } From 00d1ea9ed1b95255569b97ef7d0e236fa8b7cf0a Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 13:47:53 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E5=8D=95=E5=BA=94=E6=94=B6=E8=B0=83=E5=B7=AE=E3=80=81=E7=BB=B4?= =?UTF-8?q?=E4=BF=AE=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../relation/chooseRepairbill.vue | 2 +- .../workorderinvoicing/workorderinvoicingAdd.vue | 2 +- .../workorderreceivableAdd.vue | 13 ++++++++++--- .../relation/chooseRepairbill.vue | 2 +- .../gongdankaipiaoFlow/workorderinvoicingEdit.vue | 2 +- .../workorderreceivableEdit.vue | 15 +++++++++++---- 6 files changed, 25 insertions(+), 11 deletions(-) diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue index b1015c8b8d..e1a556392c 100644 --- a/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue +++ b/yxt-as-ui/src/views/operation/workorderinvoicing/relation/chooseRepairbill.vue @@ -59,7 +59,7 @@ - +
diff --git a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue index 5aac017244..a94f162ee5 100644 --- a/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue +++ b/yxt-as-ui/src/views/operation/workorderinvoicing/workorderinvoicingAdd.vue @@ -277,7 +277,7 @@ export default { outAmount: e.outAmount, rescueAmount: e.rescueAmount, otherAmount: e.otherAmount, - totalAmount: e.totalAmount + totalAmount: e.settleAmount }) }) } diff --git a/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue b/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue index 2e6a862416..c15e0a4139 100644 --- a/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue +++ b/yxt-as-ui/src/views/operation/workorderreceivable/workorderreceivableAdd.vue @@ -43,6 +43,11 @@
维修单列表
+ + + @@ -222,8 +227,7 @@ export default { }, chooseGd() { this.viewState = 2 - const aa = [] - this.$refs['divGD'].showData(aa, this.formobj.deptSid) + this.$refs['divGD'].showData(this.formobj.asBwdiffapplyDetailList, this.formobj.deptSid) }, backData(value) { this.viewState = 1 @@ -244,7 +248,7 @@ export default { outAmount: e.outAmount, rescueAmount: e.rescueAmount, otherAmount: e.otherAmount, - totalAmount: e.totalAmount, + totalAmount: e.settleAmount, diffHourAmount: '', diffGoodsAmount: '', diffOutAomunt: '', @@ -260,6 +264,9 @@ export default { resetState() { this.viewState = 1 }, + handleDelete(index) { + this.formobj.asBwdiffapplyDetailList.splice(index, 1) + }, // 计算列表中差异调整的合计金额 jeTotal(row) { row.diffTotalAmount = Math.round((parseFloat(row.diffHourAmount === '' ? '0' : row.diffHourAmount) + parseFloat(row.diffGoodsAmount === '' ? '0' : row.diffGoodsAmount) + parseFloat(row.diffOutAomunt === '' ? '0' : row.diffOutAomunt) + parseFloat(row.diffRescueAmount === '' ? '0' : row.diffRescueAmount) + parseFloat(row.diffOtherAmount === '' ? '0' : row.diffOtherAmount)) * 100) / 100 diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue index 93f9bec721..bc90412a3d 100644 --- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue +++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/relation/chooseRepairbill.vue @@ -59,7 +59,7 @@ - +
diff --git a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue index b44245a462..cafa7a0d79 100644 --- a/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/gongdankaipiaoFlow/workorderinvoicingEdit.vue @@ -272,7 +272,7 @@ export default { outAmount: e.outAmount, rescueAmount: e.rescueAmount, otherAmount: e.otherAmount, - totalAmount: e.totalAmount + totalAmount: e.settleAmount }) }) } diff --git a/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue b/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue index e6a7bdd364..c1608c0d08 100644 --- a/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue +++ b/yxt-as-ui/src/views/workFlow/gongdanyingshouFlow/workorderreceivableEdit.vue @@ -4,7 +4,7 @@
{{ viewTitle }}
- 选择工单 + 选择维修单 保存 提交
@@ -42,6 +42,11 @@
维修单列表
+ + + @@ -221,8 +226,7 @@ export default { }, chooseGd() { this.viewState = 2 - const aa = [] - this.$refs['divGD'].showData(aa, this.formobj.deptSid) + this.$refs['divGD'].showData(this.formobj.asBwdiffapplyDetailList, this.formobj.deptSid) }, backData(value) { this.viewState = 1 @@ -243,7 +247,7 @@ export default { outAmount: e.outAmount, rescueAmount: e.rescueAmount, otherAmount: e.otherAmount, - totalAmount: e.totalAmount, + totalAmount: e.settleAmount, diffHourAmount: '', diffGoodsAmount: '', diffOutAomunt: '', @@ -259,6 +263,9 @@ export default { resetState() { this.viewState = 1 }, + handleDelete(index) { + this.formobj.asBwdiffapplyDetailList.splice(index, 1) + }, // 计算列表中差异调整的合计金额 jeTotal(row) { row.diffTotalAmount = Math.round((parseFloat(row.diffHourAmount === '' ? '0' : row.diffHourAmount) + parseFloat(row.diffGoodsAmount === '' ? '0' : row.diffGoodsAmount) + parseFloat(row.diffOutAomunt === '' ? '0' : row.diffOutAomunt) + parseFloat(row.diffRescueAmount === '' ? '0' : row.diffRescueAmount) + parseFloat(row.diffOtherAmount === '' ? '0' : row.diffOtherAmount)) * 100) / 100 From 53b45a5648426a973574671543eb27113959eb43 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 15:10:56 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7(=E4=B8=80=E7=BA=A7=E7=AB=99=E5=86=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/allocation/allocationAdd.vue | 989 +++++++----------- .../storage/allocation/allocationInfo.vue | 282 ++--- .../src/views/storage/allocation/index.vue | 814 +++++++------- .../allocation/relation/chooseproducts.vue | 235 +++-- .../allocationFlow/allocationDaiBan.vue | 672 ++++++------ .../allocationFlow/allocationEdit.vue | 849 ++++++--------- .../allocationFlow/allocationYiBan.vue | 304 +++--- .../relation/chooseproducts.vue | 236 +++-- 8 files changed, 1927 insertions(+), 2454 deletions(-) diff --git a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue index 9d823ef5d4..2cb00f1ce9 100644 --- a/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue +++ b/yxt-as-ui/src/views/storage/allocation/allocationAdd.vue @@ -10,29 +10,8 @@
- - - -
申请人
{{ formobj.createByName }} @@ -43,31 +22,18 @@
申请日期
- {{ formobj.createTime }} - + {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} -
* 调入站点
- + @@ -75,651 +41,432 @@
* 经办人
- + + -
备注
- + + + - -
调拨商品列表
添加
- - - - + + - - - - - - - - - + + + + + + + + + + - - - + - +
- + diff --git a/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue b/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue index 82da4975ec..7108018587 100644 --- a/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue +++ b/yxt-as-ui/src/views/storage/allocation/allocationInfo.vue @@ -7,11 +7,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -25,9 +22,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -44,35 +39,29 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
@@ -80,119 +69,144 @@ diff --git a/yxt-as-ui/src/views/storage/allocation/index.vue b/yxt-as-ui/src/views/storage/allocation/index.vue index 408dde9d32..82174d5fec 100644 --- a/yxt-as-ui/src/views/storage/allocation/index.vue +++ b/yxt-as-ui/src/views/storage/allocation/index.vue @@ -1,7 +1,7 @@ diff --git a/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue index a56f465ffa..988b32bc54 100644 --- a/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/storage/allocation/relation/chooseproducts.vue @@ -14,13 +14,13 @@
- + - + - + @@ -32,29 +32,27 @@
商品列表
-
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +60,112 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue index 12bd0759df..82ddef49be 100644 --- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationDaiBan.vue @@ -10,11 +10,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -28,9 +25,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -47,39 +42,32 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
- @@ -109,8 +97,9 @@ 意见: - + + +
@@ -119,354 +108,339 @@
- diff --git a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue index 954b5881b5..416ee61e3b 100644 --- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue +++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationEdit.vue @@ -9,11 +9,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -24,13 +21,10 @@
申请日期
- {{ formobj.createTime }} - + {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -38,8 +32,7 @@
* 调入站点
- + @@ -47,571 +40,395 @@
* 经办人
- + + -
备注
- + + + - -
调拨商品列表
添加
- - - + + - - - - - - - - - + + + + + + + + + - + - +
- + diff --git a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue index 5d6dff2e67..0dbe38181c 100644 --- a/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationFlow/allocationYiBan.vue @@ -7,11 +7,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -25,9 +22,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -44,35 +39,29 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
@@ -80,146 +69,145 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue b/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue index a56f465ffa..d473de9213 100644 --- a/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/workFlow/allocationFlow/relation/chooseproducts.vue @@ -14,15 +14,14 @@
- + - + - + -
查询 @@ -32,29 +31,27 @@
商品列表
-
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +59,112 @@ From 5caa9a776bff8c06cbfb16d60b36daab491c5b33 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 17 Apr 2025 15:40:59 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=87=BA=E5=8E=82?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BF=9D=E5=AD=98=E6=B7=BB=E5=8A=A0=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AsArrearsoutApplyMapper.java | 2 ++ .../AsArrearsoutApplyMapper.xml | 4 ++++ .../AsArrearsoutApplyService.java | 18 ++++++++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java index 0da9b79f82..f76b77e05d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.java @@ -72,4 +72,6 @@ public interface AsArrearsoutApplyMapper extends BaseMapper { @Select("select nodeState from as_arrearsout_apply where pairBillSid = #{pairBillSid}") String selByPairBillSid(String pairBillSid); + + AsArrearsoutApply selectBill(String pairBillNo); } \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml index 089c1b77c0..f607aab0a6 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyMapper.xml @@ -43,4 +43,8 @@ WHERE nodeState != '待提交' and find_in_set(sid, #{list}) + + \ No newline at end of file diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java index 9e1b6f09e4..1c204c731a 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java @@ -155,7 +155,8 @@ public class AsArrearsoutApplyService extends MybatisBaseService saveOrUpdateDto(AsArrearsoutApplyDto dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); String deptSid = dto.getDeptSid(); SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData(); @@ -164,6 +165,11 @@ public class AsArrearsoutApplyService extends MybatisBaseService resultBean = saveOrUpdateDto(dto); + if(!resultBean.getSuccess()){ + return rb.setMsg(resultBean.getMsg()); + } + String businessSid = resultBean.getData(); asArrearsoutApply = fetchBySid(businessSid); //创建BusinessVariables实体对象 BusinessVariables bv = new BusinessVariables(); From 17561f6ad12443cf5f28b6c3850382a4b3049b43 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 16:01:42 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7(=E5=88=86=E5=85=AC=E5=8F=B8=E5=86=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allocationByBranchesAdd.vue | 66 +- .../allocationByBranchesInfo.vue | 222 +++--- .../relation/chooseproducts.vue | 234 +++--- .../allocationByBranchesDaiBan.vue | 685 +++++++++--------- .../allocationByBranchesEdit.vue | 66 +- .../allocationByBranchesYiBan.vue | 305 ++++---- .../relation/chooseproducts.vue | 234 +++--- 7 files changed, 870 insertions(+), 942 deletions(-) diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue index 6e33a090ce..8f622acf1c 100644 --- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue +++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesAdd.vue @@ -139,9 +139,10 @@ - - - + + + + @@ -447,36 +448,37 @@ this.viewState = 1 if (value.length > 0) { value.forEach((e) => { - this.formobj.wmsInventoryAllocateBillDetailNewList.push({ - "goodsSpuSid": e.goodsSpuSid, - "goodsSpuName": e.goodsSpuName, - "goodsSkuCode": e.goodsSkuCode, - "goodsSkuOwnSpec": e.goodsSkuOwnSpec, - "goodsSkuSid": e.goodsSkuSid, - "goodsSkuTitle": e.goodsSkuTitle, - "billSid": this.formobj.sid, - "inventorySid": e.inventorySid, - "warehouseSid": e.warehouseSid, - "warehouseName": e.warehouseName, - "warehouseAreaSid": e.warehouseAreaSid, - "warehouseArea": e.warehouseArea, - "warehouseRackSid": e.warehouseRackSid, - "warehouseRackCode": e.warehouseRackCode, - "taxPrice": e.taxPrice, - "stockCount": e.count, - "inWarehouseSid": '', - "inWarehouseName": '', - "inWarehouseRackSid": '', - "inWarehouseRackCode": '', - "count": 0, - "amount": 0, - "requAmount": e.taxPrice, - "markUpRatio": 0, - "unit": e.unit, - "goodsID": e.goodsID, - "manufacturerSid": e.manufacturerSid, - "manufacturerName": e.manufacturerName, + goodsSpuSid: e.goodsSpuSid, + goodsSpuName: e.goodsSpuName, + goodsSkuCode: e.goodsSkuCode, + goodsSkuOwnSpec: e.goodsSkuOwnSpec, + goodsSkuSid: e.goodsSkuSid, + goodsSkuTitle: e.goodsSkuTitle, + billSid: this.formobj.sid, + inventorySid: e.inventorySid, + warehouseSid: e.warehouseSid, + warehouseName: e.warehouseName, + warehouseZoneSid: e.warehouseZoneSid, + warehouseZoneName: e.warehouseZoneName, + warehouseAreaSid: e.warehouseAreaSid, + warehouseArea: e.warehouseArea, + warehouseRackSid: e.warehouseRackSid, + warehouseRackCode: e.warehouseRackCode, + taxPrice: e.taxPrice, + stockCount: e.count, + inWarehouseSid: '', + inWarehouseName: '', + inWarehouseRackSid: '', + inWarehouseRackCode: '', + count: 0, + amount: 0, + requAmount: e.taxPrice, + markUpRatio: 0, + unit: e.unit, + goodsID: e.goodsID, + manufacturerSid: e.manufacturerSid, + manufacturerName: e.manufacturerName }) }) } diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue index 82da4975ec..03875b1240 100644 --- a/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue +++ b/yxt-as-ui/src/views/storage/allocationByBranches/allocationByBranchesInfo.vue @@ -7,11 +7,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -25,9 +22,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -44,35 +39,29 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
@@ -80,119 +69,80 @@ diff --git a/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue index a56f465ffa..597fd95465 100644 --- a/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/storage/allocationByBranches/relation/chooseproducts.vue @@ -14,13 +14,13 @@
- + - + - + @@ -35,26 +35,25 @@
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +61,112 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue index bea3ddfd9c..4a57e5e01f 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesDaiBan.vue @@ -10,11 +10,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -28,9 +25,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -47,40 +42,32 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
- - @@ -110,8 +97,9 @@ 意见: - + + +
@@ -125,349 +113,348 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue index 2f945142c6..8e4f759bac 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/allocationByBranchesEdit.vue @@ -82,9 +82,10 @@ - - - + + + + diff --git a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue index a56f465ffa..597fd95465 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByBranchesFlow/relation/chooseproducts.vue @@ -14,13 +14,13 @@
- + - + - + @@ -35,26 +35,25 @@
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +61,112 @@ From 244958720d5e6d317a2890be6ea41d1799556006 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 16:02:41 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B0=83=E6=8B=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7(=E9=9B=86=E5=9B=A2=E5=86=85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allocationByGroupAdd.vue | 66 +- .../allocationByGroupInfo.vue | 223 +++--- .../relation/chooseproducts.vue | 234 +++--- .../allocationByGroupDaiBan.vue | 687 +++++++++--------- .../allocationByGroupEdit.vue | 66 +- .../allocationByGroupYiBan.vue | 308 ++++---- .../relation/chooseproducts.vue | 234 +++--- 7 files changed, 871 insertions(+), 947 deletions(-) diff --git a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue index 40f49d61db..25b226448e 100644 --- a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue +++ b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupAdd.vue @@ -139,9 +139,10 @@ - - - + + + + @@ -449,36 +450,37 @@ this.viewState = 1 if (value.length > 0) { value.forEach((e) => { - this.formobj.wmsInventoryAllocateBillDetailNewList.push({ - "goodsSpuSid": e.goodsSpuSid, - "goodsSpuName": e.goodsSpuName, - "goodsSkuCode": e.goodsSkuCode, - "goodsSkuOwnSpec": e.goodsSkuOwnSpec, - "goodsSkuSid": e.goodsSkuSid, - "goodsSkuTitle": e.goodsSkuTitle, - "billSid": this.formobj.sid, - "inventorySid": e.inventorySid, - "warehouseSid": e.warehouseSid, - "warehouseName": e.warehouseName, - "warehouseAreaSid": e.warehouseAreaSid, - "warehouseArea": e.warehouseArea, - "warehouseRackSid": e.warehouseRackSid, - "warehouseRackCode": e.warehouseRackCode, - "taxPrice": e.taxPrice, - "stockCount": e.count, - "inWarehouseSid": '', - "inWarehouseName": '', - "inWarehouseRackSid": '', - "inWarehouseRackCode": '', - "count": 0, - "amount": 0, - "requAmount": e.taxPrice, - "markUpRatio": 0, - "unit": e.unit, - "goodsID": e.goodsID, - "manufacturerSid": e.manufacturerSid, - "manufacturerName": e.manufacturerName, + goodsSpuSid: e.goodsSpuSid, + goodsSpuName: e.goodsSpuName, + goodsSkuCode: e.goodsSkuCode, + goodsSkuOwnSpec: e.goodsSkuOwnSpec, + goodsSkuSid: e.goodsSkuSid, + goodsSkuTitle: e.goodsSkuTitle, + billSid: this.formobj.sid, + inventorySid: e.inventorySid, + warehouseSid: e.warehouseSid, + warehouseName: e.warehouseName, + warehouseZoneSid: e.warehouseZoneSid, + warehouseZoneName: e.warehouseZoneName, + warehouseAreaSid: e.warehouseAreaSid, + warehouseArea: e.warehouseArea, + warehouseRackSid: e.warehouseRackSid, + warehouseRackCode: e.warehouseRackCode, + taxPrice: e.taxPrice, + stockCount: e.count, + inWarehouseSid: '', + inWarehouseName: '', + inWarehouseRackSid: '', + inWarehouseRackCode: '', + count: 0, + amount: 0, + requAmount: e.taxPrice, + markUpRatio: 0, + unit: e.unit, + goodsID: e.goodsID, + manufacturerSid: e.manufacturerSid, + manufacturerName: e.manufacturerName }) }) } diff --git a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue index 82da4975ec..3ca37ad717 100644 --- a/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue +++ b/yxt-as-ui/src/views/storage/allocationByGroup/allocationByGroupInfo.vue @@ -7,11 +7,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -25,9 +22,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -44,35 +39,29 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
@@ -80,119 +69,81 @@ diff --git a/yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue b/yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue index a56f465ffa..597fd95465 100644 --- a/yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/storage/allocationByGroup/relation/chooseproducts.vue @@ -14,13 +14,13 @@
- + - + - + @@ -35,26 +35,25 @@
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +61,112 @@ diff --git a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue index 16b3b7c910..10e6f66f44 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupDaiBan.vue @@ -10,11 +10,8 @@
- - -
申请人
{{ formobj.createByName }} @@ -28,9 +25,7 @@ {{ formobj.createTime }} - -
调出站
{{ formobj.outPlatName }} @@ -47,39 +42,32 @@ {{ formobj.confirmName }} -
备注
{{ formobj.remarks }} - - -
-
调拨商品列表
-
- - - - - - - - - - - - - - - - +
调拨商品列表
+ + + + + + + + + + + + + + + +
- @@ -109,8 +97,9 @@ 意见: - + + +
@@ -119,356 +108,348 @@
- diff --git a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue index e6b8c70284..6d58535884 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/allocationByGroupEdit.vue @@ -92,9 +92,10 @@ - - - + + + + diff --git a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue index a56f465ffa..597fd95465 100644 --- a/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/workFlow/allocationByGroupFlow/relation/chooseproducts.vue @@ -14,13 +14,13 @@
- + - + - + @@ -35,26 +35,25 @@
- - - - - - - - - - - - + + + + + + + + + + + + +
-
+
- +
@@ -62,111 +61,112 @@ From ad025d0c618767d5dbedcb2fd12d16518cc1d5fa Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 16:04:26 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=80=80=E8=BD=A6=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/salesManagement/salesorderbycar.js | 7 +++++ .../xiaoshoudingdantuiche/salesorderbycar.vue | 29 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/salesorderbycar.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/salesorderbycar.js index dfa1705626..fac1179cce 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/salesorderbycar.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/salesorderbycar.js @@ -19,6 +19,13 @@ export default { headers: { 'Content-Type': 'application/json' } }) }, + createPdf: function(data) { + return request({ + url: '/buscenter/v1/bussalesorderreturnvehapply/createPdf', + method: 'post', + params: data + }) + }, // 保存修改记录 saveOrUpdate: function(params) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue index fb15fa647a..efb0e94b19 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdantuiche/salesorderbycar.vue @@ -37,6 +37,7 @@ @@ -204,7 +205,7 @@ export default { procInsId: row.procInsId, token: getStorage() } - this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + this.url = 'http://192.168.0.107:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) }, init() { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { @@ -320,6 +321,32 @@ export default { }).catch(() => { }) }, + toDownload(row) { + req.createPdf({ sid: row.sid, userName: window.sessionStorage.getItem('name') }).then((res) => { + if (res.success) { + var xhr = new XMLHttpRequest() + xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '销售订单退车申请单', true) + xhr.setRequestHeader('token', getStorage()) + xhr.responseType = 'blob' + xhr.onload = function(e) { + // 如果请求执行成功 + var blob = this.response + var filename = '销售订单退车申请单.pdf' + var a = document.createElement('a') + // blob.type="application/octet-stream"; + // 创键临时url对象 + var url = URL.createObjectURL(blob) + a.href = url + a.download = filename + a.click() + // 释放之前创建的URL对象 + window.URL.revokeObjectURL(url) + } + // 发送请求 + xhr.send() + } + }).catch(() => {}) + }, toInfo(row) { this.viewState = 4 this.$refs['divInfo'].showInfo(row) From 04e1dfc78439a8da457a753904839c5a6006efeb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 17 Apr 2025 16:05:17 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BB=B7=E5=80=BC?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=A4=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/valuablecustomer/valuablecustomer.js | 8 +++++ .../valuablecustomer/valuablecustomer.vue | 34 ++++++++++++++++--- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/valuablecustomer/valuablecustomer.js b/anrui-buscenter/anrui-buscenter-ui/src/api/valuablecustomer/valuablecustomer.js index 005e17d10b..18269a9203 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/valuablecustomer/valuablecustomer.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/valuablecustomer/valuablecustomer.js @@ -24,6 +24,14 @@ export function save(data) { }) } +export function createPdf(data) { + return request({ + url: '/buscenter/v1/busvalcustfiling/createPdf', + method: 'post', + params: data + }) +} + // 根据Sid获取一条记录 export function fetchDetailsBySid(data) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomer.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomer.vue index 46eba146c6..a417b91987 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomer.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/valuablecustomer/valuablecustomer.vue @@ -38,9 +38,9 @@ @@ -85,7 +85,7 @@