From 11aef851d94b50d524d7c62d2ba00bc289ee0d4e Mon Sep 17 00:00:00 2001 From: sliang <1589399930@qq.com> Date: Sat, 23 Dec 2023 21:49:43 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E6=9C=BA=E5=85=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86-=E5=BA=93=E7=AE=A1=E5=91=98=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=EF=BC=9B=E7=BB=B4=E4=BF=AE=E7=8F=AD=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sgzb/base/api/domain/LeaseApplyInfo.java | 3 ++ .../sgzb/app/controller/TmTaskController.java | 39 +++++++------------ .../app/service/impl/TmTaskServiceImpl.java | 1 + .../resources/mapper/app/TmTaskMapper.xml | 11 +++--- 4 files changed, 25 insertions(+), 29 deletions(-) diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java index 137f5c30..54b0c615 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/LeaseApplyInfo.java @@ -148,4 +148,7 @@ public class LeaseApplyInfo implements Serializable { @ApiModelProperty(value = "设备数据所属组织类型") private Integer companyId; + @ApiModelProperty(value="审批状态id") + private String examineStatusId; + } \ No newline at end of file diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java index 38bc8b81..c80e51ce 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/controller/TmTaskController.java @@ -289,34 +289,21 @@ public class TmTaskController extends BaseController { LeaseApplyInfo infoAdd = new LeaseApplyInfo(); if(list.size()<2){ List> deviceByCompanyList = CollUtil.groupByField(task.getLeaseApplyDetails(), "companyId"); - String companyId=""; - for (List leaseApplyDetailsList : deviceByCompanyList) { - companyId = leaseApplyDetailsList.get(0).getCompanyId() + "@" ; - } - - LeaseApplyInfo info = new LeaseApplyInfo(); infoAdd.setTaskId(task.getTaskId().intValue()); infoAdd.setCode(task.getLeaseApplyInfoList().get(0).getCode()); infoAdd.setLeasePerson(task.getLeaseApplyInfoList().get(0).getLeasePerson()); infoAdd.setPhone(task.getLeaseApplyInfoList().get(0).getPhone()); infoAdd.setRemark(task.getLeaseApplyInfoList().get(0).getRemark()); infoAdd.setType(task.getLeaseApplyInfoList().get(0).getType()); - - if(companyId.contains("101")){ - info.setId(101); - info.setTaskId(task.getTaskId().intValue()); - LeaseApplyInfo bean = tmTaskService.getListSomeol(info); - if(bean==null){ - infoAdd.setCompanyId(101); - leaseApplyInfoService.genderLeaseCode(infoAdd); - } - }else if(companyId.contains("102")){ - info.setId(102); - info.setTaskId(task.getTaskId().intValue()); - LeaseApplyInfo bean = tmTaskService.getListSomeol(info); - if(bean==null){ - infoAdd.setCompanyId(102); - leaseApplyInfoService.genderLeaseCode(infoAdd); + for (List leaseApplyDetailsList : deviceByCompanyList) { + if(leaseApplyDetailsList.get(0).getParenntId() == null ){ + if(leaseApplyDetailsList.get(0).getCompanyId()==101){ + infoAdd.setCompanyId(101); + leaseApplyInfoService.genderLeaseCode(infoAdd); + }else if(leaseApplyDetailsList.get(0).getCompanyId()==102){ + infoAdd.setCompanyId(102); + leaseApplyInfoService.genderLeaseCode(infoAdd); + } } } } @@ -328,7 +315,6 @@ public class TmTaskController extends BaseController { tmTaskService.updateLeaseInfo(bean); for (LeaseApplyInfo leaseApplyInfo : task.getLeaseApplyInfoList()) { - if (leaseApplyInfo == null || leaseApplyInfo.getId() == null) { continue; } @@ -340,7 +326,12 @@ public class TmTaskController extends BaseController { // 删除后,插入新地领料任务明细 if (StringUtils.isNotNull(leaseApplyInfo.getId())) { for (LeaseApplyDetails leaseApplyDetails : leaseApplyInfo.getLeaseApplyDetails()) { - leaseApplyDetails.setParenntId(leaseApplyInfo.getId()); // 设置领料任务ID + if(leaseApplyDetails.getParenntId() == null){ + leaseApplyDetails.setParenntId(infoAdd.getId()); + }else{ + leaseApplyDetails.setParenntId(leaseApplyInfo.getId()); // 设置领料任务ID + } + } // 插入领料任务明细 boolean addLeaseTaskDetailsResult = leaseApplyDetailsService.batchInsert(leaseApplyInfo.getLeaseApplyDetails()) > 0; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java index 4677378c..b7c04157 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/TmTaskServiceImpl.java @@ -84,6 +84,7 @@ public class TmTaskServiceImpl implements TmTaskService{ if (CollUtil.isNotEmpty(record.getLeaseApplyInfoList())) { for (LeaseApplyInfo leaseApplyInfo : record.getLeaseApplyInfoList()) { if (leaseApplyInfo != null) { + leaseApplyInfo.setExamineStatusId(record.getExamineStatusId()); result += tmTaskMapper.updateLeaseApplyInfoAuditInfo(leaseApplyInfo); // 再审核领料任务详情表 if (CollUtil.isNotEmpty(leaseApplyInfo.getLeaseApplyDetails())) { diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml index c0dad1f4..6662bc61 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/TmTaskMapper.xml @@ -585,19 +585,20 @@ lease_apply_info set - + company_audit_by = #{record.companyAuditBy}, company_audit_time = now(), company_audit_remark = #{record.companyAuditRemark}, - + dept_audit_by = #{record.companyAuditBy}, dept_audit_time = now(), dept_audit_remark = #{record.companyAuditRemark}, - - direct_audit_by = #{record.directAuditBy}, - direct_audit_time = now() + + direct_audit_by = #{record.companyAuditBy}, + direct_audit_time = now(), + direct_audit_remark = #{record.companyAuditRemark}, WHERE From 5ae2f1679f9598b5e8ac5b37ab92c40210d708c8 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Sat, 23 Dec 2023 23:17:12 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../largeScreen/domain/CommonConstants.java | 2 +- .../service/impl/LargeScreenServiceImpl.java | 18 +- .../mapper/largeScreen/LargeScreenMapper.xml | 216 ++++++------------ 3 files changed, 78 insertions(+), 158 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java index 1bb127a8..3bceb1dd 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/domain/CommonConstants.java @@ -11,7 +11,7 @@ public class CommonConstants { public static final String SGJJ = "施工机具"; /** 安全工器具*/ public static final String AQGQJ = "安全工器具"; - /** 机具分公司*/ + /** 机具设备分公司*/ public static final String JJ = "机具设备分公司"; /** 调试分公司*/ public static final String TS = "调试分公司"; diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java index d836756c..9d9c0818 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -30,7 +30,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { @Override public AjaxResult getMaterialReqData() { HashMap map = new HashMap<>(2); - // 施工工具、安全工器具数量 + // 施工机具、安全工器具数量 int num = 0, num2 = 0; try { List list = mapper.getMaterialReqData(DateTimeHelper.getNowDate()); @@ -48,7 +48,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { @Override public AjaxResult getMaterialReturnData() { HashMap map = new HashMap<>(2); - // 施工工具、安全工器具数量 + // 施工机具、安全工器具数量 int num = 0, num2 = 0; try { List list = mapper.getMaterialReturnData(DateTimeHelper.getNowDate()); @@ -80,9 +80,9 @@ public class LargeScreenServiceImpl implements ILargeScreenService { ParamsDto dto = new ParamsDto(); try { // 施工机具 - TotalOwnershipVo vo = countNum("1", CommonConstants.SGJJ); + TotalOwnershipVo vo = countNum("1", CommonConstants.JJ); // 安全工器具 - TotalOwnershipVo vo2 = countNum("2", CommonConstants.AQGQJ); + TotalOwnershipVo vo2 = countNum("2", CommonConstants.TS); list.add(vo); list.add(vo2); } catch (Exception e) { @@ -146,7 +146,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { HashMap map = new HashMap<>(3); try { dto.setType("1"); - dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null); + dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null); List lyList = mapper.getScrapAnalysisByMonth(dto); dto.setType("2"); List bfList = mapper.getScrapAnalysisByMonth(dto); @@ -169,7 +169,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { List yearMonthList = DateTimeHelper.getYearMonth(); List valueList = new ArrayList<>(); List valueList2 = new ArrayList<>(); - dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null); + dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null); try { for (String date : yearMonthList) { String year = date.substring(0, 4); @@ -208,7 +208,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { int num = 0, num2 = 0; String rate = "0%", rate2 = "0%"; try { - dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null); + dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null); dto.setStartDate(monthDayMap.get("beginDate")); dto.setEndDate(monthDayMap.get("endDate")); List list = mapper.getPickingAnalysisByMonth(dto); @@ -235,7 +235,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { Map monthDayMap = DateTimeHelper.getNowOneMonthDay(); dto.setStartDate(monthDayMap.get("beginDate")); dto.setEndDate(monthDayMap.get("endDate")); - dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null); + dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null); try { List list = mapper.getMaterialReturnByMonth(dto); List valueList = commonUtil.setMaterialReturnData(list); @@ -259,7 +259,7 @@ public class LargeScreenServiceImpl implements ILargeScreenService { Map monthDayMap = DateTimeHelper.getNowOneMonthDay(); dto.setStartDate(monthDayMap.get("beginDate")); dto.setEndDate(monthDayMap.get("endDate")); - dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.SGJJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.AQGQJ : null); + dto.setMaTypeName(Objects.equals("1", dto.getMaType()) ? CommonConstants.JJ : Objects.equals("2", dto.getMaType()) ? CommonConstants.TS : null); try { List list = mapper.getMaintenanceByMonth(dto); List valueList = commonUtil.setMaintenanceData(list); diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml index aa12ab69..50a70919 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml @@ -27,23 +27,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -53,44 +47,32 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" /*验收*/ SELECT pcd.check_num AS num, - a.typeName + mt.type_name AS typeName FROM purchase_check_info pci LEFT JOIN purchase_check_details pcd ON pci.task_id = pcd.task_id - LEFT JOIN ( - SELECT mt.type_id,mt4.type_name AS typeName - FROM ma_type mt - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' - WHERE mt.`level` = '4' - )a ON pcd.type_id = a.type_id + LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id AND mt.`level` = '4' + LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id WHERE pci.arrival_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} /*入库*/ SELECT iad.input_num, - a.typeName + mt.type_name AS typeName FROM input_apply_details iad - LEFT JOIN ( - SELECT mt.type_id,mt4.type_name AS typeName - FROM ma_type mt - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' - WHERE mt.`level` = '4' - )a ON iad.type_id = a.type_id + LEFT JOIN ma_type mt ON iad.type_id = mt.type_id AND mt.`level` = '4' + LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id WHERE iad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') AND iad.input_type = '1' - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} @@ -101,24 +83,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT SUM(lod.out_num) AS num, bui.unit_name AS unitName FROM lease_out_details lod - LEFT JOIN ( - SELECT mt.type_id,mt4.type_name AS typeName - FROM ma_type mt - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' - WHERE mt.`level` = '4' - )a ON lod.type_id = a.type_id + LEFT JOIN ma_type mt ON lod.type_id = mt.type_id AND mt.`level` = '4' + LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN lease_apply_info lai ON lod.parent_id = lai.id LEFT JOIN tm_task_agreement tta ON lai.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id - a.typeName = #{maTypeName} + sd.dept_name = #{maTypeName} - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} GROUP BY bai.unit_id @@ -129,23 +105,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT SUM(scrap_num) AS num, bui.unit_name AS unitName FROM scrap_apply_details sad - LEFT JOIN ( - SELECT mt.type_id,mt4.type_name AS typeName - FROM ma_type mt - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' - WHERE mt.`level` = '4' - )a ON sad.type_id = a.type_id + LEFT JOIN ma_type mt ON sad.type_id = mt.type_id AND mt.`level` = '4' + LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id LEFT JOIN tm_task_agreement tta ON sad.task_id = tta.task_id LEFT JOIN bm_agreement_info bai ON tta.agreement_id = bai.agreement_id LEFT JOIN bm_unit_info bui ON bai.unit_id = bui.unit_id WHERE sad.status = '1' - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} GROUP BY bai.unit_id ORDER BY num DESC @@ -155,22 +125,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" @@ -178,82 +142,62 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT rad.repair_num AS repairNum, rad.repaired_num AS repairedNum, rad.scrap_num AS scrapNum, - a.typeName + mt.type_name AS typeName FROM repair_apply_details rad - LEFT JOIN ( - SELECT mt.type_id,mt4.type_name AS typeName - FROM ma_type mt - LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id AND mt2.`level` = '3' - LEFT JOIN ma_type mt3 ON mt2.parent_id = mt3.type_id AND mt3.`level` = '2' - LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id AND mt4.`level` = '1' - WHERE mt.`level` = '4' - )a ON rad.type_id = a.type_id + LEFT JOIN ma_type mt ON rad.type_id = mt.type_id AND mt.`level` = '4' + LEFT JOIN sys_dept sd ON sd.dept_id = mt.company_id WHERE rad.create_time BETWEEN CONCAT(#{startDate}, ' 00:00:00') AND CONCAT(#{endDate}, ' 23:59:59') - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} - AND a.typeName = #{maTypeName} + AND sd.dept_name = #{maTypeName} From 922f2463628172252018bf3a3165189113caa2f3 Mon Sep 17 00:00:00 2001 From: zhouxain01 Date: Sat, 23 Dec 2023 23:24:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=80=E5=BA=93?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sgzb-ui/src/api/claimAndRefund/return.js | 34 +- .../claimAndRefund/return/dialogForm.vue | 70 +- .../claimAndRefund/return/returnApply.vue | 669 ++++++-- .../claimAndRefund/return/returnApplyAdd.vue | 1342 ++++++++++------- .../claimAndRefund/return/returnExamine.vue | 634 ++++++-- .../src/views/store/label/labelBinding.vue | 88 +- 6 files changed, 1892 insertions(+), 945 deletions(-) diff --git a/sgzb-ui/src/api/claimAndRefund/return.js b/sgzb-ui/src/api/claimAndRefund/return.js index d7642975..4485e92c 100644 --- a/sgzb-ui/src/api/claimAndRefund/return.js +++ b/sgzb-ui/src/api/claimAndRefund/return.js @@ -47,17 +47,35 @@ export function ApiGetMaterialList(query) { }) } - - - - - -//审核 -export function ApiBackApplyAudit(query) { +// 删除 +export function backApplyDelApi(query) { + console.log('query====', query); return request({ - url: '/material/backApply/audit', + url: '/material/backApply/del', method: 'get', params: query }) } + + + + + +//审核 +export function ApiBackApplyAudit(data) { + return request({ + url: '/material/backApply/audit', + method: 'post', + data: data + }) +} +// 退料审核新增 +export function submitBackApplyApi(data) { + return request({ + url: '/material/backApply/submitBackApply', + method: 'post', + data: data + }) +} + diff --git a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue index a032f055..0084c7fa 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/dialogForm.vue @@ -13,32 +13,44 @@
- 工程名称：(送电一公司)vue百度地图获取天气 + 工程名称：{{ rowObj.lotName }} +
+
+ {{ rowObj.backTime }}
-
2023年10月06日
- 退料单位：(送电一公司)vue百度地图获取天气 + 退料单位：{{ rowObj.unitName }} +
+
+ 编号：{{ rowObj.code }}
-
编号：2023年10月06日
- - + + + + - - - - - - - - - +
审核：
@@ -83,6 +95,7 @@ \ No newline at end of file diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue index d3b4efef..f08e4ebd 100644 --- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue +++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue @@ -1,89 +1,244 @@