Merge remote-tracking branch 'origin/master'

yxt-as-ui/src/views/operation/settleAccounts/settleAccountsAdd.vue

@@ -114,7 +114,7 @@
             <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />

yxt-as-ui/src/views/operation/settleAccounts/settleAccountsInfo.vue

@@ -125,7 +125,7 @@
             <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />

yxt-as-ui/src/views/storage/adjustment/index.vue

@@ -299,7 +299,7 @@
             finishEndTime: '',
           }
         }
-        this.init()
+        this.getList()
       },
       toAdd() {
         this.viewState = 3

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsDaiBan.vue

@@ -128,7 +128,7 @@
             <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsEdit.vue

@@ -113,7 +113,7 @@
             <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />

yxt-as-ui/src/views/workFlow/jiesuanFlow/settleAccountsYiBan.vue

@@ -125,7 +125,7 @@
             <el-table-column prop="repairerName" label="维修技师" align="center" width="200" />
             <el-table-column prop="remarks" label="备注" align="center" min-width="300" />
           </el-table>
-          <div class="title">商品</div>
+          <div class="title">维修用料</div>
           <el-table :key="tableKey" :data="formobj.goodsDetailsVos" :index="index" border style="width: 100%">
             <el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center" />
             <el-table-column prop="goodsID" label="商品ID" align="center" width="200" />

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<AsSaleinvoiceapplyDetailDetailsVo> saleinvoiceapplyDetailList;
+    private List<AsSaleinvoiceapplyDetailDetailsVo> saleOrderList;
     @ApiModelProperty("附件")
     private List<AsSaleinvoiceapplyFile> files = new ArrayList<>();
 }

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<AsSaleinvoiceapplyDetailDto> saleinvoiceapplyDetailList;
+    private List<AsSaleinvoiceapplyDetailDto> saleOrderList;
     @ApiModelProperty("附件")
     private List<AsSaleinvoiceapplyFile> files = new ArrayList<>();
 }

yxt-as/src/main/java/com/yxt/anrui/as/biz/assaleinvoiceapply/AsSaleinvoiceapplyService.java

@@ -177,6 +177,16 @@ public class AsSaleinvoiceapplyService extends MybatisBaseService<AsSaleinvoicea
 				);
 		IPage<AsSaleinvoiceapply> page = PagerUtil.queryToPage(pq);
 		IPage<AsSaleinvoiceapplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		for (AsSaleinvoiceapplyVo record : pagging.getRecords()) {
+			List<AsAppendix> asAppendices = asAppendixService.fetchByLinkSid(record.getSid());
+			List<String> files = new ArrayList<>();
+			for (AsAppendix asAppendix : asAppendices) {
+				AsSaleinvoiceapplyFile asSaleinvoiceapplyFile = new AsSaleinvoiceapplyFile();
+				String url = fileUploadComponent.getUrlPrefix() + asAppendix.getFilePath();
+				files.add(url);
+			}
+			record.setFiles(files);
+		}
 		PagerVo<AsSaleinvoiceapplyVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
@@ -184,7 +194,7 @@ public class AsSaleinvoiceapplyService extends MybatisBaseService<AsSaleinvoicea
 	public String saveOrUpdateDto(AsSaleinvoiceapplyDto dto){
 		String dtoSid = dto.getSid();
 		List<AsSaleinvoiceapplyFile> files = dto.getFiles();
-		List<AsSaleinvoiceapplyDetailDto> saleinvoiceapplyDetailList = dto.getSaleinvoiceapplyDetailList();
+		List<AsSaleinvoiceapplyDetailDto> 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<AsSaleinvoicea
 		}
 		vo.setFiles(asSaleinvoiceapplyFiles);
 		List<AsSaleinvoiceapplyDetailDetailsVo> asSaleinvoiceapplyDetailDetailsVos = asSaleinvoiceapplyDetailService.fetchByMainSid(sid);
-		vo.setSaleinvoiceapplyDetailList(asSaleinvoiceapplyDetailDetailsVos);
+		vo.setSaleOrderList(asSaleinvoiceapplyDetailDetailsVos);
 		return vo;
 	}