diff --git a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
index 9a04adee12..dbdcb7d829 100644
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue
@@ -114,7 +114,7 @@
-
商品
+ 维修用料
diff --git a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
index 1b4d763ad8..76ffaebc2a 100644
--- a/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
+++ b/yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue
@@ -125,7 +125,7 @@
- 商品
+ 维修用料
diff --git a/yxt-as-ui/src/views/storage/adjustment/index.vue b/yxt-as-ui/src/views/storage/adjustment/index.vue
index afb849b122..a5a31a64b5 100644
--- a/yxt-as-ui/src/views/storage/adjustment/index.vue
+++ b/yxt-as-ui/src/views/storage/adjustment/index.vue
@@ -299,7 +299,7 @@
finishEndTime: '',
}
}
- this.init()
+ this.getList()
},
toAdd() {
this.viewState = 3
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
index b0832cb714..c1ab5c1cc9 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue
@@ -128,7 +128,7 @@
- 商品
+ 维修用料
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
index 2e7aff7b08..3bc137d870 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue
@@ -113,7 +113,7 @@
- 商品
+ 维修用料
diff --git a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
index 4e55da5cf2..912930fe71 100644
--- a/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
+++ b/yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue
@@ -125,7 +125,7 @@
- 商品
+ 维修用料
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java
index 152c4e3bd5..4901c95d3b 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDetailsVo.java
@@ -107,7 +107,7 @@ public class AsSaleinvoiceapplyDetailsVo implements Vo {
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("列表")
- private List saleinvoiceapplyDetailList;
+ private List saleOrderList;
@ApiModelProperty("附件")
private List files = new ArrayList<>();
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java
index 4ba24b9639..0bdd9856ce 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/assaleinvoiceapply/AsSaleinvoiceapplyDto.java
@@ -103,7 +103,7 @@ public class AsSaleinvoiceapplyDto implements Dto {
@ApiModelProperty("流程状态")
private String nodeState; // 流程状态
@ApiModelProperty("列表")
- private List saleinvoiceapplyDetailList;
+ private List saleOrderList;
@ApiModelProperty("附件")
private List files = new ArrayList<>();
}
\ No newline at end of file
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyService.java
index 88d2598645..c61ef522c4 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyService.java
@@ -177,6 +177,16 @@ public class AsSaleinvoiceapplyService extends MybatisBaseService page = PagerUtil.queryToPage(pq);
IPage pagging = baseMapper.selectPageVo(page, qw);
+ for (AsSaleinvoiceapplyVo record : pagging.getRecords()) {
+ List asAppendices = asAppendixService.fetchByLinkSid(record.getSid());
+ List files = new ArrayList<>();
+ for (AsAppendix asAppendix : asAppendices) {
+ AsSaleinvoiceapplyFile asSaleinvoiceapplyFile = new AsSaleinvoiceapplyFile();
+ String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
+ files.add(url);
+ }
+ record.setFiles(files);
+ }
PagerVo p = PagerUtil.pageToVo(pagging, null);
return p;
}
@@ -184,7 +194,7 @@ public class AsSaleinvoiceapplyService extends MybatisBaseService files = dto.getFiles();
- List saleinvoiceapplyDetailList = dto.getSaleinvoiceapplyDetailList();
+ List saleinvoiceapplyDetailList = dto.getSaleOrderList();
String deptSid = dto.getDeptSid();
SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(deptSid).getData();
String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(deptVo.getOrgSidPath()).getData();
@@ -268,7 +278,7 @@ public class AsSaleinvoiceapplyService extends MybatisBaseService asSaleinvoiceapplyDetailDetailsVos = asSaleinvoiceapplyDetailService.fetchByMainSid(sid);
- vo.setSaleinvoiceapplyDetailList(asSaleinvoiceapplyDetailDetailsVos);
+ vo.setSaleOrderList(asSaleinvoiceapplyDetailDetailsVos);
return vo;
}