From e16f324071864d16b161033c8fa811444bbc015e Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Fri, 28 Jun 2024 17:56:22 +0800 Subject: [PATCH 01/22] =?UTF-8?q?=E8=B4=B7=E5=90=8E=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentScheduleFeign.java | 11 + .../LoanRepaymentScheduleFeignFallback.java | 9 + .../historyData/HistoryDataImportVo.java | 46 +-- .../historyData/ReturnMsg.java | 16 ++ .../LoanRepaymentScheduleRest.java | 8 + .../LoanRepaymentScheduleService.java | 262 ++++++++++++++++++ 6 files changed, 336 insertions(+), 16 deletions(-) create mode 100644 anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnMsg.java diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index ea19f8602d..8b40e45119 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -10,7 +10,11 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; @@ -80,6 +84,13 @@ public interface LoanRepaymentScheduleFeign { @ResponseBody ResultBean> selHistoryBySid(@RequestParam("sid") String sid); + @ApiOperation(value = "导入贷后历史数据") + @PostMapping("/importHistoryData") + public ResultBean importHistoryData( + @RequestParam(value = "file") MultipartFile file, + HttpServletRequest request, + HttpServletResponse response) throws IOException; + //-------------------------app接口-------------------- /** diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java index 2caa227850..c73fe84cd6 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeignFallback.java @@ -7,7 +7,11 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; /** @@ -69,6 +73,11 @@ public class LoanRepaymentScheduleFeignFallback implements LoanRepaymentSchedule return null; } + @Override + public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException { + return null; + } + @Override public ResultBean> getRepaymentPlanList(PagerQuery pq) { return null; diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/HistoryDataImportVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/HistoryDataImportVo.java index 6805747aa2..1519893394 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/HistoryDataImportVo.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/HistoryDataImportVo.java @@ -26,45 +26,59 @@ public class HistoryDataImportVo { private String vinNo; @ApiModelProperty("消贷合同编号") private String loanContractNo; - @ApiModelProperty("资方合同号") + @ApiModelProperty("是否存在休眠或展期") + private String sleep; + @ApiModelProperty("主产品资方合同号") private String bankContractNo; - @ApiModelProperty("资方名称") + @ApiModelProperty("主产品资方名称") private String bankName; @ApiModelProperty("主产品期数") private String mainPeriod; - @ApiModelProperty("金融产品政策") + @ApiModelProperty("金融产品首付比例") + private String paymentRatio; + @ApiModelProperty("金融产品保证金比例") private String depositRatio; + @ApiModelProperty("实收保证金金额") + private String depositMoney; @ApiModelProperty("其他融资方合同号") private String otherBankNo; - @ApiModelProperty("其他融资方") + @ApiModelProperty("其他融资方名称") private String otherBankName; @ApiModelProperty("其他融期数") private String otherPeriod; - @ApiModelProperty("主产品首期还款日") + @ApiModelProperty("主产品首期应还日期") private String mainRepayDate; - @ApiModelProperty("主产品首期月还") + @ApiModelProperty("主产品第一期应还金额") private String mainFirstRepay; - @ApiModelProperty("主产品期间月还") + @ApiModelProperty("主产品中间期") private String mainMidRepay; - @ApiModelProperty("主产品期末月还") + @ApiModelProperty("主产品最后一期应还金额") private String mainLastRepay; - @ApiModelProperty("其他融首期还款日") + @ApiModelProperty("其他融首期应还日期") private String otherRepayDate; - @ApiModelProperty("其他融首期月还") + @ApiModelProperty("其他融第一期应还金额") private String otherFirstRepay; - @ApiModelProperty("其他融期间月还") + @ApiModelProperty("其他融中间期") private String otherMidRepay; - @ApiModelProperty("其他融期末月还") + @ApiModelProperty("其他融最后一期应还金额") private String otherLastRepay; - @ApiModelProperty("推送财务凭证部门编码") - private String cwDeptNo; + @ApiModelProperty("首期总月还") + private String mainAmount; @ApiModelProperty("销售部门编码") private String salesDeptNo; + @ApiModelProperty("销售部门") + private String salesDept; @ApiModelProperty("分公司编码") private String useOrgNo; - @ApiModelProperty("分公司垫款金额") + @ApiModelProperty("分公司") + private String useOrgName; + @ApiModelProperty("累欠本金（逾期月还）") + private String tiredMoney; + @ApiModelProperty("其中公司垫还资方金额") private String paymentMoney; - @ApiModelProperty("资金占用费") + @ApiModelProperty("垫还资方逾期利息") + private String interest; + @ApiModelProperty("资金占用费（逾期利息）") private String fund; } diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnMsg.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnMsg.java new file mode 100644 index 0000000000..12fcd4d503 --- /dev/null +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/historyData/ReturnMsg.java @@ -0,0 +1,16 @@ +package com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData; + +import lombok.Data; + +import java.util.*; + +/** + * @author Fan + * @description + * @date 2024/6/28 14:13 + */ +@Data +public class ReturnMsg { + private Set setMsg; + private List list; +} diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java index d109a4ac50..855cc4ee9c 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleRest.java @@ -13,8 +13,11 @@ import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; import java.util.List; @@ -85,6 +88,11 @@ public class LoanRepaymentScheduleRest implements LoanRepaymentScheduleFeign { return loanRepaymentScheduleService.selHistoryBySid(sid); } + @Override + public ResultBean importHistoryData(MultipartFile file, HttpServletRequest request, HttpServletResponse response) throws IOException { + return loanRepaymentScheduleService.importHistoryData(file,request,response); + } + @Override public ResultBean> getRepaymentPlanList(PagerQuery pq) { ResultBean> rb = ResultBean.fireFail(); diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index f02e9d9e45..180ab062ef 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -1,6 +1,7 @@ package com.yxt.anrui.riskcenter.biz.loanrepaymentschedule; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -39,6 +40,7 @@ import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDe import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetailsDto; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.*; import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.HistoryDataImportVo; +import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.historyData.ReturnMsg; import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions; import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo; import com.yxt.anrui.riskcenter.api.loansolutionsotherpolicy.LoanSolutionsOtherpolicy; @@ -62,11 +64,20 @@ import com.yxt.common.core.vo.PagerVo; import com.yxt.messagecenter.api.message.MessageFeign; import com.yxt.messagecenter.api.message.PushMessageQuery; import com.yxt.messagecenter.api.message.PushSmsDto; +import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Sheet; +import org.apache.poi.ss.usermodel.Workbook; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.MultipartFile; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; @@ -75,6 +86,8 @@ import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; import java.util.function.Function; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; @@ -4986,4 +4999,253 @@ public class LoanRepaymentScheduleService extends MybatisBaseService setMsg = returnMsg.getSetMsg(); + StringBuffer sbMsg = new StringBuffer(); + if (null != setMsg && setMsg.size() > 0) { + for (String s : setMsg) { + sbMsg.append(s).append("，"); + } + sbMsg.delete(sbMsg.length() - 1, sbMsg.length()); + if (StringUtils.isNotBlank(sbMsg.toString())) { + return rb.setMsg(sbMsg.toString()); + } + } + } catch (Exception e) { + e.printStackTrace(); + } + return rb.success(); + } + + private ReturnMsg getSheetVal(Sheet sheet) { + ReturnMsg returnMsg = new ReturnMsg(); + List voList = new ArrayList<>(); + Set setMsg = new HashSet<>(); + Row row1 = sheet.getRow(0); + Map header = new HashMap<>(); + Map map = new HashMap<>(); + for (int i = 0; i < row1.getPhysicalNumberOfCells(); i++) { + String trim = new String(); + try { + trim = getCellVal(row1.getCell(i)).toString().trim(); + String temp = getCellVal(row1.getCell(i)).toString().trim(); + if (StringUtils.isNotBlank(temp)) { + header.put(i, temp); + } + } catch (Exception e) { + e.printStackTrace(); + } + } + for (int r = 1; r <= sheet.getLastRowNum(); r++) { + HistoryDataImportVo info = new HistoryDataImportVo(); + Row row = sheet.getRow(r); + if (row == null) { + continue; + } + for (int i = 0; i < header.size(); i++) { +// String trim = new String(); + try { +// trim = getCellVal(row.getCell(i)).toString().trim(); + String temp = ""; + if (null != getCellVal(row.getCell(i))) { + temp = getCellVal(row.getCell(i)).toString().trim(); + } + String head = header.get(i); + String field = ""; + if (StringUtils.isNotBlank(temp)) { + field = temp; + } + if (head.equals("实际购车人名称")) { + info.setActualName(field); + } + if (head.equals("实际购车人电话")) { + info.setActualPhone(field); + } + if (head.equals("借款人（财务的客户）编码")) { + info.setBorrowerNo(field); + } + if (head.equals("借款人（财务的客户）名称")) { + info.setBorrowerName(field); + } + if (head.equals("车架号")) { + info.setVinNo(field); + } + if (head.equals("消贷合同编号")) { + info.setLoanContractNo(field); + } + if (head.equals("是否存在休眠或展期")) { + info.setSleep(field); + } + if (head.equals("主产品资方合同号")) { + info.setBankContractNo(field); + } + if (head.equals("主产品资方名称")) { + info.setBankName(field); + } + if (head.equals("主产品期数")) { + info.setMainPeriod(field); + } + if (head.equals("金融产品首付比例")) { + info.setPaymentRatio(field); + } + if (head.equals("金融产品保证金比例")) { + info.setDepositRatio(field); + } + if (head.equals("实收保证金金额")) { + info.setDepositMoney(field); + } + if (head.equals("其他融资方合同号")) { + info.setOtherBankNo(field); + } + if (head.equals("其他融资方名称")) { + info.setOtherBankName(field); + } + if (head.equals("其他融期数")) { + info.setOtherPeriod(field); + } + if (head.equals("主产品首期应还日期")) { + info.setMainRepayDate(field); + } + if (head.equals("主产品第一期应还金额")) { + info.setMainFirstRepay(field); + } + if (head.equals("主产品中间期")) { + info.setMainMidRepay(field); + } + if (head.equals("主产品最后一期应还金额")) { + info.setMainLastRepay(field); + } + if (head.equals("其他融首期应还日期")) { + info.setOtherRepayDate(field); + } + if (head.equals("其他融第一期应还金额")) { + info.setOtherFirstRepay(field); + } + if (head.equals("其他融中间期")) { + info.setOtherMidRepay(field); + } + if (head.equals("其他融最后一期应还金额")) { + info.setOtherLastRepay(field); + } + if (head.equals("首期总月还")) { + info.setMainAmount(field); + } + if (head.equals("销售部门编码")) { + info.setSalesDeptNo(field); + } + if (head.equals("销售部门")) { + info.setSalesDept(field); + } + if (head.equals("分公司编码")) { + info.setUseOrgNo(field); + } + if (head.equals("分公司")) { + info.setUseOrgName(field); + } + if (head.equals("累欠本金（逾期月还）")) { + info.setTiredMoney(field); + } + if (head.equals("其中公司垫还资方金额")) { + info.setPaymentMoney(field); + } + if (head.equals("垫还资方逾期利息")) { + info.setInterest(field); + } + if (head.equals("资金占用费（逾期利息）")) { + info.setFund(field); + } + } catch (Exception e) { + e.printStackTrace(); + continue; + } + } + voList.add(info); + } + returnMsg.setList(voList); + return returnMsg; + } + + public Object getCellVal(Cell cell) { + Object obj = null; + if (cell != null) { + switch (cell.getCellTypeEnum()) { + case BOOLEAN: + obj = cell.getBooleanCellValue(); + break; + case ERROR: + obj = cell.getErrorCellValue(); + break; + case NUMERIC: + obj = cell.getNumericCellValue(); + break; + case STRING: + obj = cell.getStringCellValue(); + break; + default: + break; + } + } + return obj; + } + + public boolean isNum(String s) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(s)) { + if (s.contains(".")) { + return isNumeric(s); + } else { + return isNumericFirst(s); + } + } + return false; + } + + public boolean isNumeric(String s) { + String substring = s.substring(0, s.lastIndexOf(".")); + String substringLast = s.substring(s.lastIndexOf(".") + 1, s.length()); + if (substring != null && !"".equals(substring.trim()) || substringLast != null && !"".equals(substringLast.trim())) { + boolean matches = substring.matches("^[0-9]*$"); + boolean b = substringLast.matches("^[0-9]*$"); + if (matches && b) { + return true; + } else { + return false; + } + } else + return false; + } + + public boolean isNumericFirst(String str) { + Pattern pattern = Pattern.compile("[0-9]*"); + System.out.println(str); + Matcher isNum = pattern.matcher(str); + if (!isNum.matches()) { + return false; + } + return true; + } + } From fa2b70340b21e60444dbb83917a0358787b77aa8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 08:56:20 +0800 Subject: [PATCH 02/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/procurement/procurement.vue | 6 +- .../purchase/procurement/procurementAdd.vue | 98 +++++++++++++++---- .../purchase/procurement/procurementInfo.vue | 16 ++- .../workFlow/caigouFlow/procurementDaiBan.vue | 12 ++- .../workFlow/caigouFlow/procurementEdit.vue | 94 ++++++++++++++---- .../workFlow/caigouFlow/procurementYiBan.vue | 12 ++- 6 files changed, 183 insertions(+), 55 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue index 3d93269a3a..7afe53f3a3 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue @@ -31,7 +31,7 @@ 至 - + @@ -88,11 +88,11 @@ - + - + diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index 568e173b31..900f076608 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -27,11 +27,16 @@ -
*采购类型
+
*采购方式
- - - +
+ + + + + + +
@@ -55,13 +60,18 @@
*供应商
- - - +
+ + + + + + +
-
*是否需要发票
+
*是否开发票
是 @@ -117,16 +127,12 @@ -
*验货后付货款
- - - +
验货后付货款
+ {{ calculateGoodsMoney }} -
*审批通过后付货款
- - - +
审批通过后付货款
+ {{ calculateGoodsMoney }} @@ -245,9 +251,11 @@ export default { index: 0, accept: '.jpg,.jpeg,.png', procurementType_list: [], + operateBrand_list: [], procurementReason_list: [], paymentMethod_list: [], supplier_list: [], + warehouseType_list: [], account_list: [], formobj: { sid: '', @@ -288,6 +296,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', @@ -312,14 +324,13 @@ export default { pmsPurchaseBillDetailList: [] }, rules: { - purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }], + purchaseTypeValue: [{ required: true, message: '采购方式不能为空', trigger: 'change' }], purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }], payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }], supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }], - 'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }], + 'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否开发票不能为空', trigger: 'change' }], 'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }], - 'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }], - 'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }] + 'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }] } } }, @@ -348,10 +359,25 @@ export default { } return cg }, + // 应付金额 yfTotal() { let yf = '0' yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100 return yf + }, + // 付货款 + calculateGoodsMoney() { + let goodsMoney = '0' + if (this.formobj.payTypeValue === '单笔付款') { + if (this.formobj.purchasePay.isFirstPay === '1') { + // 是否先付货款为是，计算审批通过后付货款 = 应付金额 + goodsMoney = this.yfTotal + } else if (this.formobj.purchasePay.isFirstPay === '0') { + // 是否先付货款为否，计算验货后付货款 = 应付金额 - 审批通过后付订金 + goodsMoney = parseFloat(this.yfTotal) - parseFloat(this.formobj.purchasePay.deposit !== '' ? this.formobj.purchasePay.deposit : '0') + } + } + return goodsMoney } }, methods: { @@ -361,6 +387,16 @@ export default { this.procurementType_list = res.data } }) + typeValues({ type: 'operateBrand' }).then((res) => { + if (res.success) { + this.operateBrand_list = res.data + } + }) + typeValues({ type: 'warehouseType' }).then((res) => { + if (res.success) { + this.warehouseType_list = res.data + } + }) typeValues({ type: 'procurementReason' }).then((res) => { if (res.success) { this.procurementReason_list = res.data @@ -441,6 +477,14 @@ export default { this.formobj.purchaseTypeKey = '' } }, + operateBrandChange(value) { + const choose = this.operateBrand_list.filter((item) => item.dictValue === value) + if (choose !== null && choose.length > 0) { + this.formobj.operateBrandKey = choose[0].dictKey + } else { + this.formobj.operateBrandKey = '' + } + }, purchaseReasonChange(value) { const choose = this.procurementReason_list.filter((item) => item.dictValue === value) if (choose !== null && choose.length > 0) { @@ -467,6 +511,14 @@ export default { this.account_list = [] } }, + warehouseTypeChange(value) { + const choose = this.warehouseType_list.filter((item) => item.dictValue === value) + if (choose !== null && choose.length > 0) { + this.formobj.warehouseTypeKey = choose[0].dictKey + } else { + this.formobj.warehouseTypeKey = '' + } + }, isInvoicingChange(val) { if (val === '1') { const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid) @@ -538,6 +590,7 @@ export default { if (valid) { this.submitdisabled = true this.formobj.payableAmount = this.yfTotal + this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney req.saveOrUpdate(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '保存成功' }) @@ -556,6 +609,7 @@ export default { if (valid) { this.submitdisabled = true this.formobj.payableAmount = this.yfTotal + this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney req.submit(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '提交成功' }) @@ -610,6 +664,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue index 46982e5da4..86c3e088ff 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue @@ -25,8 +25,8 @@ -
采购类型
- {{ formobj.purchaseTypeValue }} +
采购方式
+ {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -40,10 +40,10 @@
供应商
- {{ formobj.supplierName }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} -
是否需要发票
+
是否开发票
{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }} @@ -212,6 +212,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', @@ -328,6 +332,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue index 232f8ffa7e..3c0a7df9bb 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue @@ -28,8 +28,8 @@ -
采购类型
- {{ formobj.purchaseTypeValue }} +
采购方式
+ {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -43,10 +43,10 @@
供应商
- {{ formobj.supplierName }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} -
是否需要发票
+
是否开发票
{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }} @@ -254,6 +254,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue index 30cb4aec3b..a6ec9e20a4 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue @@ -26,11 +26,16 @@ -
*采购类型
+
*采购方式
- - - +
+ + + + + + +
@@ -54,13 +59,18 @@
*供应商
- - - +
+ + + + + + +
-
*是否需要发票
+
*是否开发票
是 @@ -116,16 +126,12 @@ -
*验货后付货款
- - - +
验货后付货款
+ {{ calculateGoodsMoney }} -
*审批通过后付货款
- - - +
审批通过后付货款
+ {{ calculateGoodsMoney }} @@ -244,9 +250,11 @@ export default { index: 0, accept: '.jpg,.jpeg,.png', procurementType_list: [], + operateBrand_list: [], procurementReason_list: [], paymentMethod_list: [], supplier_list: [], + warehouseType_list: [], account_list: [], formobj: { sid: '', @@ -287,6 +295,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', @@ -311,14 +323,13 @@ export default { pmsPurchaseBillDetailList: [] }, rules: { - purchaseTypeValue: [{ required: true, message: '采购类型不能为空', trigger: 'change' }], + purchaseTypeValue: [{ required: true, message: '采购方式不能为空', trigger: 'change' }], purchaseReasonValue: [{ required: true, message: '采购原因不能为空', trigger: 'change' }], payTypeValue: [{ required: true, message: '付款方式不能为空', trigger: 'change' }], supplierSid: [{ required: true, message: '供应商不能为空', trigger: 'change' }], - 'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否需要发票不能为空', trigger: 'change' }], + 'purchaseBillInvoice.isInvoicing': [{ required: true, message: '是否开发票不能为空', trigger: 'change' }], 'purchasePay.isFirstPay': [{ required: true, message: '是否先付货款不能为空', trigger: 'change' }], - 'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }], - 'purchasePay.goodsMoney': [{ required: true, message: '付货款不能为空', trigger: 'blur' }] + 'purchasePay.deposit': [{ required: true, message: '审批通过后付订金不能为空', trigger: 'blur' }] } } }, @@ -364,10 +375,25 @@ export default { } return cg }, + // 应付金额 yfTotal() { let yf = '0' yf = Math.round((parseFloat(yf) + parseFloat(this.cgTotal) + parseFloat(this.formobj.freight !== '' ? this.formobj.freight : '0') - parseFloat(this.formobj.discountAmount !== '' ? this.formobj.discountAmount : '0') + parseFloat(this.formobj.errorAmount !== '' ? this.formobj.errorAmount : '0')) * 100) / 100 return yf + }, + // 付货款 + calculateGoodsMoney() { + let goodsMoney = '0' + if (this.formobj.payTypeValue === '单笔付款') { + if (this.formobj.purchasePay.isFirstPay === '1') { + // 是否先付货款为是，计算审批通过后付货款 = 应付金额 + goodsMoney = this.yfTotal + } else if (this.formobj.purchasePay.isFirstPay === '0') { + // 是否先付货款为否，计算验货后付货款 = 应付金额 - 审批通过后付订金 + goodsMoney = parseFloat(this.yfTotal) - parseFloat(this.formobj.purchasePay.deposit !== '' ? this.formobj.purchasePay.deposit : '0') + } + } + return goodsMoney } }, methods: { @@ -377,6 +403,16 @@ export default { this.procurementType_list = res.data } }) + typeValues({ type: 'operateBrand' }).then((res) => { + if (res.success) { + this.operateBrand_list = res.data + } + }) + typeValues({ type: 'warehouseType' }).then((res) => { + if (res.success) { + this.warehouseType_list = res.data + } + }) typeValues({ type: 'procurementReason' }).then((res) => { if (res.success) { this.procurementReason_list = res.data @@ -432,6 +468,14 @@ export default { this.formobj.purchaseTypeKey = '' } }, + operateBrandChange(value) { + const choose = this.operateBrand_list.filter((item) => item.dictValue === value) + if (choose !== null && choose.length > 0) { + this.formobj.operateBrandKey = choose[0].dictKey + } else { + this.formobj.operateBrandKey = '' + } + }, purchaseReasonChange(value) { const choose = this.procurementReason_list.filter((item) => item.dictValue === value) if (choose !== null && choose.length > 0) { @@ -458,6 +502,14 @@ export default { this.account_list = [] } }, + warehouseTypeChange(value) { + const choose = this.warehouseType_list.filter((item) => item.dictValue === value) + if (choose !== null && choose.length > 0) { + this.formobj.warehouseTypeKey = choose[0].dictKey + } else { + this.formobj.warehouseTypeKey = '' + } + }, isInvoicingChange(val) { if (val === '1') { const choose = this.supplier_list.filter((item) => item.sid === this.formobj.supplierSid) @@ -529,6 +581,7 @@ export default { if (valid) { this.submitdisabled = true this.formobj.payableAmount = this.yfTotal + this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney req.saveOrUpdate(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '保存成功' }) @@ -554,6 +607,7 @@ export default { if (valid) { this.submitdisabled = true this.formobj.payableAmount = this.yfTotal + this.formobj.purchasePay.goodsMoney = this.calculateGoodsMoney req.submit(this.formobj).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '提交成功' }) diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue index c17671ae72..72cf88d284 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue @@ -25,8 +25,8 @@ -
采购类型
- {{ formobj.purchaseTypeValue }} +
采购方式
+ {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -40,10 +40,10 @@
供应商
- {{ formobj.supplierName }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} -
是否需要发票
+
是否开发票
{{ formobj.purchaseBillInvoice.isInvoicing == '1' ? '是' : '否' }} @@ -212,6 +212,10 @@ export default { useOrgName: '', createOrgSid: '', createOrgName: '', + operateBrandKey: '', + operateBrandValue: '', + warehouseTypeKey: '', + warehouseTypeValue: '', purchasePay: { sid: '', billSid: '', From e68d974619cf8b5e20b7e290b197cc05fda4e75c Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 09:13:28 +0800 Subject: [PATCH 03/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue | 4 ++-- yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index 900f076608..8204f452ce 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -29,7 +29,7 @@
*采购方式
-
+
@@ -60,7 +60,7 @@
*供应商
-
+
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue index a6ec9e20a4..ceb788c6f4 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementEdit.vue @@ -28,7 +28,7 @@
*采购方式
-
+
@@ -59,7 +59,7 @@
*供应商
-
+
From e45d3444dca3c921b12811eeba4e847066de9c8e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 09:20:20 +0800 Subject: [PATCH 04/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue | 4 ++-- yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue | 4 ++-- yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue index 86c3e088ff..05d21b6121 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue @@ -26,7 +26,7 @@
采购方式
- {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }} + {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -40,7 +40,7 @@
供应商
- {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }}
是否开发票
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue index 3c0a7df9bb..f7dc1096db 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue @@ -29,7 +29,7 @@
采购方式
- {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }} + {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -43,7 +43,7 @@
供应商
- {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }}
是否开发票
diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue index 72cf88d284..5a3557b170 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementYiBan.vue @@ -26,7 +26,7 @@
采购方式
- {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }} + {{ formobj.purchaseTypeValue }}{{ formobj.operateBrandValue }}
采购原因
@@ -40,7 +40,7 @@
供应商
- {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }} + {{ formobj.supplierName }}{{ formobj.warehouseTypeValue }}
是否开发票
From 9201388a56760670467d8370d522bc8b737a48bb Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 1 Jul 2024 10:07:27 +0800 Subject: [PATCH 05/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=95=86=E5=93=81=E6=9C=89=E5=85=B3=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/base/BaseGoodsBrandRest.java | 4 +- .../base/apiadmin/base/BaseGoodsTypeRest.java | 4 +- .../base/apiadmin/base/BaseGoodsUnitRest.java | 4 +- .../apiadmin/base/BaseManufacturerRest.java | 4 +- .../basebrandinfo/BaseBrandInfoService.java | 83 ++++--------------- .../basegoodstype/BaseGoodsTypeService.java | 64 ++------------ .../basegoodsunit/BaseGoodsUnitService.java | 16 +--- .../BaseManufacturerService.java | 62 ++------------ 8 files changed, 40 insertions(+), 201 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java index 0635d1b9af..08cee985a4 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java @@ -31,8 +31,8 @@ public class BaseGoodsBrandRest { } @ApiOperation("查询所有的品牌") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody OrgPathQuery query) { - return baseBrandInfoService.listAll(query); + public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { + return baseBrandInfoService.listAll(useOrgSid); } @ApiOperation("保存修改") @PostMapping("/saveOrUpdate") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java index dcd6bb5b52..4f1793c353 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java @@ -31,8 +31,8 @@ public class BaseGoodsTypeRest { } @ApiOperation("查询所有的类别") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody OrgPathQuery query) { - return baseGoodsTypeService.listAll(query); + public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { + return baseGoodsTypeService.listAll(useOrgSid); } @ApiOperation("根据数据权限查询类别") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java index 44324b2dbf..ee383a9798 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java @@ -31,8 +31,8 @@ public class BaseGoodsUnitRest { } @ApiOperation("查询所有的类别") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody OrgPathQuery query) { - return baseGoodsUnitService.listAll(query); + public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { + return baseGoodsUnitService.listAll(useOrgSid); } @ApiOperation("保存修改") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java index b52f73ab75..93ad2a13ea 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java @@ -32,8 +32,8 @@ public class BaseManufacturerRest { @ApiOperation("查询所有的厂家") @PostMapping("/listAll") - public ResultBean> listAll(@RequestBody OrgPathQuery query) { - return baseManufacturerService.listAll(query); + public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { + return baseManufacturerService.listAll(useOrgSid); } @ApiOperation("保存修改") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java index 419bac1e0d..4df9ab5ea2 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basebrandinfo/BaseBrandInfoService.java @@ -40,6 +40,7 @@ public class BaseBrandInfoService extends MybatisBaseService> listPage(PagerQuery pq) { ResultBean rb = ResultBean.fireFail(); BaseBrandInfoQuery query = pq.getParams(); @@ -80,10 +81,10 @@ public class BaseBrandInfoService extends MybatisBaseService p = new PagerVo<>(); return rb.success().setData(p); } - if(StringUtils.isNotBlank(query.getName())){ - qw.like("b.brandName",query.getName()); + if (StringUtils.isNotBlank(query.getName())) { + qw.like("b.brandName", query.getName()); } - qw.ne("b.isDelete","1"); + qw.ne("b.isDelete", "1"); IPage page = PagerUtil.queryToPage(pq); IPage pagging = baseMapper.listPage(page, qw); PagerVo p = PagerUtil.pageToVo(pagging, null); @@ -98,62 +99,13 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll(@RequestBody OrgPathQuery query) { - ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = new QueryWrapper<>(); - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("s.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("s.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("s.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("s.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("b.createBySid", query.getUserSid()); - } else { - return rb.success().setData(new ArrayList<>()); - } - } else { - return rb.success().setData(new ArrayList<>()); - } - qw.eq("b.isEnable",1); - qw.ne("b.isDelete",1); - List pagging = baseMapper.selListAll(qw); -// String useOrgSid = ""; -// String orgPath = query.getOrgPath(); -// if (StringUtils.isNotBlank(orgPath)) { -// List split = Arrays.asList(orgPath.split("/")); -// if (split.size() > 1) { -// //获取本级sid获取本级部门信息 -// SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); -// useOrgSid = sysOrganization1.getSid(); -// } else { -// SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); -// useOrgSid = sysOrganization.getSid(); -// } -// } -// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1).ne("isDelete","1").eq("useOrgSid",useOrgSid)); - return rb.success().setData(pagging); -} + + public ResultBean> listAll(String useOrgSid) { + ResultBean rb = ResultBean.fireFail(); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable", 1).ne("isDelete", "1").eq("useOrgSid", useOrgSid)); + return rb.success().setData(pagging); + } + public ResultBean saveOrUpdate(BaseBrandInfoDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; @@ -168,8 +120,8 @@ public class BaseBrandInfoService extends MybatisBaseService> listAll(OrgPathQuery query) { + public ResultBean> listAll(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = new QueryWrapper<>(); - if (StringUtils.isNotBlank(query.getMenuUrl())) { - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("u.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("u.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("u.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("u.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("p.createBySid", query.getUserSid()); - } else { - return rb.success().setData(new ArrayList<>()); - } - } else { - return rb.success().setData(new ArrayList<>()); - } - } - qw.eq("p.isEnable", 1); - qw.ne("p.isDelete", 1); - List pagging = baseMapper.selListAll(qw); -// String useOrgSid = ""; -// String orgPath = query.getOrgPath(); -// if (StringUtils.isNotBlank(orgPath)) { -// List split = Arrays.asList(orgPath.split("/")); -// if (split.size() > 1) { -// //获取本级sid获取本级部门信息 -// SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); -// useOrgSid = sysOrganization1.getSid(); -// } else { -// SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); -// useOrgSid = sysOrganization.getSid(); -// } -// } -// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) -// .ne("isDelete","1") -// .eq("useOrgSid",useOrgSid) -// ); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1") + .eq("useOrgSid",useOrgSid) + ); return rb.success().setData(pagging); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java index 764a8de26d..d4642bd1dd 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsunit/BaseGoodsUnitService.java @@ -21,6 +21,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.text.SimpleDateFormat; import java.util.Arrays; @@ -91,21 +92,8 @@ public class BaseGoodsUnitService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); List records = pagging.getRecords(); return rb.success().setData(p); - } public ResultBean> listAll(OrgPathQuery query) { + } public ResultBean> listAll(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - String useOrgSid = ""; - String orgPath = query.getOrgPath(); - if (StringUtils.isNotBlank(orgPath)) { - List split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - useOrgSid = sysOrganization1.getSid(); - } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - useOrgSid = sysOrganization.getSid(); - } - } List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) .ne("isDelete","1") .eq("useOrgSid",useOrgSid) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java index 8533244534..8ba4e3bff3 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basemanufacturer/BaseManufacturerService.java @@ -21,6 +21,7 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -94,63 +95,12 @@ public class BaseManufacturerService extends MybatisBaseService records = pagging.getRecords(); return rb.success().setData(p); } - public ResultBean> listAll(OrgPathQuery query) { + public ResultBean> listAll(String useOrgSid) { ResultBean rb = ResultBean.fireFail(); - QueryWrapper qw = new QueryWrapper<>(); - PrivilegeQuery privilegeQuery = new PrivilegeQuery(); - privilegeQuery.setOrgPath(query.getOrgPath()); - privilegeQuery.setMenuUrl(query.getMenuUrl()); - privilegeQuery.setUserSid(query.getUserSid()); - ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); - if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { - //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) - String orgSidPath = query.getOrgPath(); - orgSidPath = orgSidPath + "/"; - int i1 = orgSidPath.indexOf("/"); - int i2 = orgSidPath.indexOf("/", i1 + 1); - int i3 = orgSidPath.indexOf("/", i2 + 1); - int i4 = orgSidPath.indexOf("/", i3 + 1); - String orgLevelKey = defaultIdReltBean.getData(); - if ("1".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i1); - qw.like("u.orgSidPath", orgSidPath); - } else if ("2".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i2); - qw.like("u.orgSidPath", orgSidPath); - } else if ("3".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i3); - qw.like("u.orgSidPath", orgSidPath); - } else if ("4".equals(orgLevelKey)) { - orgSidPath = orgSidPath.substring(0, i4); - qw.like("u.orgSidPath", orgSidPath); - } else if ("5".equals(orgLevelKey)) { - qw.eq("p.createBySid", query.getUserSid()); - } else { - return rb.success().setData(new ArrayList<>()); - } - } else { - return rb.success().setData(new ArrayList<>()); - } - qw.eq("p.isEnable",1); - qw.ne("p.isDelete",1); - List pagging = baseMapper.selListAll(qw); -// String useOrgSid = ""; -// String orgPath = query.getOrgPath(); -// if (StringUtils.isNotBlank(orgPath)) { -// List split = Arrays.asList(orgPath.split("/")); -// if (split.size() > 1) { -// //获取本级sid获取本级部门信息 -// SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); -// useOrgSid = sysOrganization1.getSid(); -// } else { -// SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); -// useOrgSid = sysOrganization.getSid(); -// } -// } -// List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) -// .ne("isDelete","1") -// .eq("useOrgSid",useOrgSid) -// ); + List pagging = baseMapper.selectList(new QueryWrapper().eq("isEnable",1) + .ne("isDelete","1") + .eq("useOrgSid",useOrgSid) + ); return rb.success().setData(pagging); } From 307b716904583cea833e96aed13a53be43e22f51 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 1 Jul 2024 10:17:01 +0800 Subject: [PATCH 06/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/goods/goods/goodsAdd.vue | 62 +++++++++++++------ yxt-as-ui/src/views/goods/goods/goodsAdd2.vue | 52 +++++++++++----- 2 files changed, 78 insertions(+), 36 deletions(-) diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue index c201e6c07d..04460046e3 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue @@ -135,7 +135,7 @@
是否上架
- + 上架 下架 @@ -373,7 +373,8 @@
是否原厂
- + 是 否 @@ -387,7 +388,8 @@
是否库存警戒
- + 是 否 @@ -473,7 +475,8 @@
是否积分兑换
- + 是 否 @@ -494,7 +497,8 @@
锁定销售价格
- + 是 否 @@ -567,7 +571,7 @@
是否原厂
- + 是 否 @@ -676,7 +680,7 @@
是否积分兑换
- + 是 否 @@ -698,7 +702,7 @@
锁定销售价格
- + 是 否 @@ -782,9 +786,10 @@ goodsDescription: "" }, baseGoodsSkus: [], - useOrgSid: window.sessionStorage.getItem('departmentSid'), + useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1), orgPath: window.sessionStorage.getItem('defaultOrgPath'), - createOrgSid: window.sessionStorage.getItem('orgSid'), + createOrgSid:'', userSid: window.sessionStorage.getItem('userSid'), }, brandList: [], @@ -800,16 +805,31 @@ } }, created() { - this.initData() + // this.initData() }, methods: { initData() { - var parpams = { - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - userSid: window.sessionStorage.getItem('userSid'), - menuUrl: this.$route.path + getOrgSidByPath({ + orgPath: window.sessionStorage.getItem('defaultOrgPath') + }).then((res) => { + if (res.success) { + this.formobj.createOrgSid = res.data + } + }) + + + // var parpams = { + // orgPath: window.sessionStorage.getItem('defaultOrgPath'), + // userSid: window.sessionStorage.getItem('userSid'), + // menuUrl: this.$route.path + // } + + var parpams ={ + useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1) } + req2.getAllBrand(parpams).then(resp => { this.brandList = resp.data }) @@ -874,14 +894,16 @@ goodsDescription: "" }, baseGoodsSkus: [], - useOrgSid: window.sessionStorage.getItem('departmentSid'), - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - createOrgSid: window.sessionStorage.getItem('orgSid'), - userSid: window.sessionStorage.getItem('userSid'), + useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1), + orgPath: window.sessionStorage.getItem('defaultOrgPath'), + createOrgSid:'', + userSid: window.sessionStorage.getItem('userSid'), } this.$emit('doback') }, showAdd() { + this.initData() var sid = require('uuid').v1() console.log('>>>>>>>>>showAdd', sid) @@ -895,7 +917,7 @@ return index + 1 }, showEdit(row) { - + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index 0fb4199555..5afaf2da17 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -117,8 +117,8 @@
原厂标志
- + 是 否 @@ -170,7 +170,7 @@
锁定销售定价
- 是 否 @@ -243,8 +243,10 @@ submitdisabled: false, formobj: { "sid": "", - "userSid": window.sessionStorage.getItem('userSid'), - "orgPath": window.sessionStorage.getItem('orgSidPath'), + "userSid": '', + "orgPath": '', + 'useOrgSid': '', + 'createOrgSid': '', "goodsName": "", "goodsCode": "", "goodsPY": "", @@ -326,7 +328,7 @@ } }, created() { - this.initData() + // this.initData() }, methods: { @@ -343,11 +345,26 @@ }, initData() { + + getOrgSidByPath({ + orgPath: window.sessionStorage.getItem('defaultOrgPath') + }).then((res) => { + if (res.success) { + this.formobj.createOrgSid = res.data + } + }) + + // var parpams = { + // orgPath: window.sessionStorage.getItem('defaultOrgPath'), + // userSid: window.sessionStorage.getItem('userSid'), + // menuUrl: this.$route.path + // } + var parpams = { - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - userSid: window.sessionStorage.getItem('userSid'), - menuUrl: this.$route.path + useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage + .getItem('defaultOrgPath').lastIndexOf('/') + 1) } + req2.getAllBrand(parpams).then(resp => { this.brandList = resp.data }) @@ -396,8 +413,10 @@ if (isreload === 'true') this.$emit('reloadlist') this.formobj = { "sid": "", - "userSid": window.sessionStorage.getItem('userSid'), - "orgPath": window.sessionStorage.getItem('orgSidPath'), + "userSid": '', + "orgPath": , + 'useOrgSid': '', + 'createOrgSid': '', "goodsName": "", "goodsCode": "", "goodsPY": "", @@ -433,17 +452,18 @@ // console.log('>>>>>>>>>showAdd', sid) // this.formobj.sid = sid - - this.$nextTick(() => { - this.$refs['form_obj'].clearValidate() - }) + this.initData() + this.formobj.userSid = window.sessionStorage.getItem('userSid'), + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, indexMethod(index) { return index + 1 }, showEdit(row) { - + this.initData() this.$nextTick(() => { this.$refs['form_obj'].clearValidate() }) From 6e2238e1cb823b52ae448f8b0a692d49cdc1b543 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Mon, 1 Jul 2024 10:19:53 +0800 Subject: [PATCH 07/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/goods/goods/goodsAdd2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index 5afaf2da17..24d584ac86 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -414,7 +414,7 @@ this.formobj = { "sid": "", "userSid": '', - "orgPath": , + "orgPath": '', 'useOrgSid': '', 'createOrgSid': '', "goodsName": "", From 1eca2182394364ba4d5f2ff1ac1f1b1257143257 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 1 Jul 2024 10:22:51 +0800 Subject: [PATCH 08/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=98=E6=AC=BE?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E4=B8=8B=E8=BD=BDpdf=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanRepaymentScheduleFeign.java | 4 +-- .../LoanRepaymentScheduleService.java | 4 +++ .../resources/ftl/vouchers/returnMoney3.ftl | 4 +-- .../basegoodsspu/BaseGoodsDetailsDto.java | 2 ++ .../base/basegoodsspu/BaseGoodsDetailsVo.java | 3 +- .../basegoodsspu/BaseGoodsSpuService.java | 34 ++---------------- .../还款计划/还款计划3.docx | Bin 17909 -> 20036 bytes 7 files changed, 14 insertions(+), 37 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java index 8b40e45119..12db583f7f 100644 --- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java +++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymentschedule/LoanRepaymentScheduleFeign.java @@ -87,9 +87,7 @@ public interface LoanRepaymentScheduleFeign { @ApiOperation(value = "导入贷后历史数据") @PostMapping("/importHistoryData") public ResultBean importHistoryData( - @RequestParam(value = "file") MultipartFile file, - HttpServletRequest request, - HttpServletResponse response) throws IOException; + @RequestParam(value = "file") MultipartFile file, @RequestParam(value = "request") HttpServletRequest request, @RequestParam(value = "response") HttpServletResponse response) throws IOException; //-------------------------app接口-------------------- diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java index 180ab062ef..2da59b339d 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java @@ -2666,6 +2666,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService vehicles = busSalesOrderVehicleFeign.selectListByOrderSidAndXdConSid(salesOrderSid, loanContractSid).getData(); String isOtherPolicy = schedule.getIsOtherPolicy(); String sameBank = schedule.getSameBank(); + String isDifferent = schedule.getIsDifferent(); // 是否有单独车辆不同 String mainOrOther = ""; if (null != salesOrder) { if (!vehicles.isEmpty()) { @@ -2920,6 +2921,9 @@ public class LoanRepaymentScheduleService extends MybatisBaseService - ${fMoney2!} + ${fMoney3!} @@ -8226,4 +8226,4 @@ - \ No newline at end of file + diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java index ac59d059d1..0483557627 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsDto.java @@ -19,6 +19,8 @@ public class BaseGoodsDetailsDto implements Dto { private String userSid; private String orgPath; + private String createOrgSid; + private String useOrgSid; private String goodsName;//商品名称 private String goodsCode;//图号 private String goodsPY;//拼音缩写 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java index 8e9f5a9603..a6e784e335 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsDetailsVo.java @@ -17,7 +17,8 @@ public class BaseGoodsDetailsVo implements Vo { private String sid; private String userSid; private String orgPath; - + private String createOrgSid; + private String useOrgSid; private String goodsName;//商品名称 private String goodsCode;//图号 private String goodsPY;//拼音缩写 diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java index ae69066cac..0fb1b5061f 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basegoodsspu/BaseGoodsSpuService.java @@ -282,10 +282,6 @@ public class BaseGoodsSpuService extends MybatisBaseService saveOrUpdateGoods(BaseGoodsDetailsDto dto) { ResultBean rb = ResultBean.fireFail(); String sid = ""; - String orgPath = ""; - if (StringUtils.isNotBlank(dto.getOrgPath())) { - orgPath = dto.getOrgPath(); - } BaseGoodsSpu spun = baseMapper.selectOne(new QueryWrapper().eq("sid", dto.getSid())); if (spun != null) { sid = dto.getSid(); @@ -415,34 +411,10 @@ public class BaseGoodsSpuService extends MybatisBaseService split = Arrays.asList(orgPath.split("/")); - if (split.size() > 1) { - //获取本级sid获取本级部门信息 - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(split.size() - 2)).getData(); - SysOrganizationVo sysOrganization1 = sysOrganizationFeign.fetchBySid(split.get(split.size() - 1)).getData(); - deptName = sysOrganization.getName() + "/" + sysOrganization1.getName(); - deptName = sysOrganization1.getName(); - deptSid = sysOrganization1.getSid(); - } else { - SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(split.get(0)).getData(); - deptName = sysOrganization.getName(); - deptName = sysOrganization.getName(); - deptSid = sysOrganization.getSid(); - } - wmsGoods.setUseOrgSid(deptSid); - createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); - //创建组织使用组织 - ResultBean organizationResultBean = sysOrganizationFeign.fetchBySid(createOrgSid); - if (organizationResultBean.getData() != null) { - wmsGoods.setCreateOrgSid(createOrgSid); - } - } + wmsGoods.setUseOrgSid(dto.getUseOrgSid()); + wmsGoods.setCreateOrgSid(dto.getCreateOrgSid()); wmsGoods.setGoodsPY(PinYinUtils.sx(wmsGoods.getGoodsName())); - BaseGoodsSpu spu = baseMapper.checkForInsert(dto.getGoodsCode(), deptSid); + BaseGoodsSpu spu = baseMapper.checkForInsert(dto.getGoodsCode(), dto.getUseOrgSid()); if (spu != null) { return rb.setMsg("商品编码重复"); } diff --git a/工作内容需要的文档/单据模板/财务凭证打印模板/还款计划/还款计划3.docx b/工作内容需要的文档/单据模板/财务凭证打印模板/还款计划/还款计划3.docx index 10b63ee3fee7c474ebab8c40acc58695cfa6fea4..f65cc62e96e31b1ee8d2f67f4cd5d5592c2175d6 100644 GIT binary patch delta 13147 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 delta 10989 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 From e2f2f35ef660185bd17d60aa5555b17735f0e776 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 10:45:11 +0800 Subject: [PATCH 09/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/goods/goods/goodsAdd2.vue | 670 ++++++++---------- yxt-as-ui/src/views/goods/goods/index.vue | 9 +- 2 files changed, 295 insertions(+), 384 deletions(-) diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue index 24d584ac86..b288c29711 100644 --- a/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd2.vue @@ -1,6 +1,5 @@ diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue index 1d4a5e5810..96a4602449 100644 --- a/yxt-as-ui/src/views/goods/goods/index.vue +++ b/yxt-as-ui/src/views/goods/goods/index.vue @@ -147,6 +147,7 @@ import pageye from '@/components/pagination/pageye' import divAdd from './goodsAdd2.vue' import divInfo from './goodsInfo2.vue' + import { getOrgSidByPath } from '@/api/Common/dictcommons' export default { components: { ButtonBar, @@ -367,7 +368,13 @@ }, toAdd() { this.viewState = 2 - this.$refs['divadd'].showAdd() + var orgSid = '' + getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { + if (res.success) { + orgSid = res.data + } + }) + this.$refs['divadd'].showAdd(window.sessionStorage.getItem('userSid'), orgSid, window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)) }, toEdit() { From dcfb6606bbca205add1a5fcd7eedb4af2822c3b8 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 1 Jul 2024 10:51:09 +0800 Subject: [PATCH 10/22] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=85=B3=E8=81=94=E5=95=86=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java | 2 +- .../main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java | 2 +- .../main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java | 2 +- .../java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java index 08cee985a4..3742e13af1 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsBrandRest.java @@ -30,7 +30,7 @@ public class BaseGoodsBrandRest { return baseBrandInfoService.listPage(pq); } @ApiOperation("查询所有的品牌") - @PostMapping("/listAll") + @GetMapping("/listAll") public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { return baseBrandInfoService.listAll(useOrgSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java index 4f1793c353..4b49616ab1 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsTypeRest.java @@ -30,7 +30,7 @@ public class BaseGoodsTypeRest { return baseGoodsTypeService.listPage(pq); } @ApiOperation("查询所有的类别") - @PostMapping("/listAll") + @GetMapping("/listAll") public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { return baseGoodsTypeService.listAll(useOrgSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java index ee383a9798..0ca89338ff 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseGoodsUnitRest.java @@ -30,7 +30,7 @@ public class BaseGoodsUnitRest { return baseGoodsUnitService.listPage(pq); } @ApiOperation("查询所有的类别") - @PostMapping("/listAll") + @GetMapping("/listAll") public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { return baseGoodsUnitService.listAll(useOrgSid); } diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java index 93ad2a13ea..72e12c06a5 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseManufacturerRest.java @@ -31,7 +31,7 @@ public class BaseManufacturerRest { } @ApiOperation("查询所有的厂家") - @PostMapping("/listAll") + @GetMapping("/listAll") public ResultBean> listAll(@RequestParam("useOrgSid") String useOrgSid) { return baseManufacturerService.listAll(useOrgSid); } From 6b3cf4c372647b1214edc0f5269c7d1703c1bf76 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 11:02:08 +0800 Subject: [PATCH 11/22] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=95=86=E5=93=81=E7=AE=A1=E7=90=86=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/goods/brand.js | 34 ++--- yxt-as-ui/src/api/goods/category.js | 133 ++++++++---------- yxt-as-ui/src/api/goods/factory.js | 34 ++--- yxt-as-ui/src/api/goods/unit.js | 32 ++--- .../src/views/goods/category/categoryAdd.vue | 6 +- yxt-as-ui/src/views/goods/goods/index.vue | 9 +- 6 files changed, 92 insertions(+), 156 deletions(-) diff --git a/yxt-as-ui/src/api/goods/brand.js b/yxt-as-ui/src/api/goods/brand.js index a7c2bd124d..3dce620fa7 100644 --- a/yxt-as-ui/src/api/goods/brand.js +++ b/yxt-as-ui/src/api/goods/brand.js @@ -1,7 +1,6 @@ import request from '@/utils/request' export default { - // 查询分页列表 listPage: function(params) { return request({ @@ -13,28 +12,20 @@ export default { } }) }, - // 品牌查询 getAllBrand: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + method: 'get', + params: params }) }, - - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsbrand/updateIsEnable/' + sid + '/' + isEnable + }) }, - - // 新增、保存 saveBrands: function(data) { return request({ @@ -44,19 +35,15 @@ export default { headers: { 'Content-Type': 'application/json' } - }); + }) }, - // 初始化 initBrands: function(data) { return request({ url: '/yxtbase/apiadmin/base/basegoodsbrand/initialization/' + data, method: 'get' - }); + }) }, - - - // 品牌-- 删除 deleteBySids: function(data) { return request({ @@ -67,8 +54,5 @@ export default { 'Content-Type': 'application/json' } }) - }, - - - + } } diff --git a/yxt-as-ui/src/api/goods/category.js b/yxt-as-ui/src/api/goods/category.js index d938333e85..57870d9e62 100644 --- a/yxt-as-ui/src/api/goods/category.js +++ b/yxt-as-ui/src/api/goods/category.js @@ -1,78 +1,65 @@ import request from '@/utils/request' export default { + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + // 类别查询 + getAllType: function(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/listAll', + method: 'get', + params: params + }) + }, + // 修改是否可用状态 + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/updateIsEnable/' + sid + '/' + isEnable + }) + }, + // 修改是否一品一码 + updateIsGoodsID: function(sid, isGoodsID) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + '/' + isGoodsID + }) + }, + // 新增、保存 + saveTypes: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/saveOrUpdate', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, - // 查询分页列表 - listPage: function(params) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/listPage', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - // 类别查询 - getAllType: function(params) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - - - // 修改是否可用状态 - updateIsEnable: function(sid, isEnable) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable - }); - }, - - // 修改是否一品一码 - updateIsGoodsID: function(sid, isGoodsID) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID - }); - }, - - // 新增、保存 - saveTypes: function(data) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/saveOrUpdate', - method: 'post', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }); - }, - - // 初始化 - initTypes: function(data) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/initialization/' + data, - method: 'get' - }); - }, - - - - // 类别-- 删除 - deleteBySids: function(data) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodstype/delBySids', - method: 'DELETE', - data: data, - headers: { - 'Content-Type': 'application/json' - } - }) - }, - + // 初始化 + initTypes: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/initialization/' + data, + method: 'get' + }) + }, + // 类别-- 删除 + deleteBySids: function(data) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodstype/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + } } diff --git a/yxt-as-ui/src/api/goods/factory.js b/yxt-as-ui/src/api/goods/factory.js index 6f07cbee62..128ea6c33f 100644 --- a/yxt-as-ui/src/api/goods/factory.js +++ b/yxt-as-ui/src/api/goods/factory.js @@ -1,7 +1,6 @@ import request from '@/utils/request' export default { - // 查询分页列表 listPage: function(params) { return request({ @@ -13,27 +12,20 @@ export default { } }) }, - - // 厂家查询 + // 厂家查询 getAllFacturer: function(params) { return request({ url: '/yxtbase/apiadmin/base/basemanufacturer/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + method: 'get', + params: params }) }, - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/yxtbase/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/yxtbase/apiadmin/base/basemanufacturer/updateIsEnable/' + sid + '/' + isEnable + }) }, - - // 新增、保存 saveFacturer: function(data) { return request({ @@ -43,18 +35,16 @@ export default { headers: { 'Content-Type': 'application/json' } - }); + }) }, - // 初始化 initFacturer: function(data) { return request({ url: '/yxtbase/apiadmin/base/basemanufacturer/initialization/' + data, method: 'get' - }); + }) }, - - // 厂家-- 删除 + // 厂家-- 删除 deleteBySids: function(data) { return request({ url: '/yxtbase/apiadmin/base/basemanufacturer/delBySids', @@ -64,7 +54,5 @@ export default { 'Content-Type': 'application/json' } }) - }, - - + } } diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js index 70a0206e8b..31bfc161e3 100644 --- a/yxt-as-ui/src/api/goods/unit.js +++ b/yxt-as-ui/src/api/goods/unit.js @@ -1,7 +1,6 @@ import request from '@/utils/request' export default { - // 查询分页列表 listPage: function(params) { return request({ @@ -13,28 +12,20 @@ export default { } }) }, - // 单位查询 getAllUnit: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodsunit/listAll', - method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + method: 'post', + params: params }) }, - - // 修改是否可用状态 - updateIsEnable: function(sid,isEnable) { - return request({ - url: '/yxtbase/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable - }); + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodsunit/updateIsEnable/' + sid + '/' + isEnable + }) }, - - // 新增、保存 saveUnits: function(data) { return request({ @@ -44,18 +35,16 @@ export default { headers: { 'Content-Type': 'application/json' } - }); + }) }, - // 初始化 initUnits: function(data) { return request({ url: '/yxtbase/apiadmin/base/basegoodsunit/initialization/' + data, method: 'get' - }); + }) }, - - // 单位-- 删除 + // 单位-- 删除 deleteBySids: function(data) { return request({ url: '/yxtbase/apiadmin/base/basegoodsunit/delBySids', @@ -65,6 +54,5 @@ export default { 'Content-Type': 'application/json' } }) - }, - + } } diff --git a/yxt-as-ui/src/views/goods/category/categoryAdd.vue b/yxt-as-ui/src/views/goods/category/categoryAdd.vue index 5ee779c72c..b3e96840c8 100644 --- a/yxt-as-ui/src/views/goods/category/categoryAdd.vue +++ b/yxt-as-ui/src/views/goods/category/categoryAdd.vue @@ -211,11 +211,7 @@ methods: { initData() { console.log('>>>>>>>>>initData') - var parpams = { - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - userSid: window.sessionStorage.getItem('userSid'), - menuUrl: this.$route.path - } + var parpams = { useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) } req.getAllType(parpams).then(resp => { this.goodsTypeList = resp.data diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue index 96a4602449..2a8f4b1d06 100644 --- a/yxt-as-ui/src/views/goods/goods/index.vue +++ b/yxt-as-ui/src/views/goods/goods/index.vue @@ -231,29 +231,22 @@ }, methods: { initData() { - var parpams = { - orgPath: window.sessionStorage.getItem('defaultOrgPath'), - userSid: window.sessionStorage.getItem('userSid'), - menuUrl: this.$route.path - } + var parpams = { useOrgSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) } // 品牌 req2.getAllBrand(parpams).then(resp => { console.log('>>>>>>>>>getAllBrand', resp) this.brandList = resp.data }).catch(() => {}) - // 类别 req3.getAllType(parpams).then(resp => { console.log('>>>>>>>>>getAllType', resp) this.goodsTypeList = resp.data }).catch(() => {}) - // 厂家 req4.getAllFacturer(parpams).then(resp => { console.log('>>>>>>>>>getAllFacturer', resp) this.facturerList = resp.data }).catch(() => {}) - }, selectBrandChange(val) { From 1c74469507bf352e2c7206f117a32132b1e575bb Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 11:07:56 +0800 Subject: [PATCH 12/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/goods/unit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js index 31bfc161e3..fa5a6b2f90 100644 --- a/yxt-as-ui/src/api/goods/unit.js +++ b/yxt-as-ui/src/api/goods/unit.js @@ -16,7 +16,7 @@ export default { getAllUnit: function(params) { return request({ url: '/yxtbase/apiadmin/base/basegoodsunit/listAll', - method: 'post', + method: 'get', params: params }) }, From 9f9e82735299b86f7e13ecec29b287b88febaefd Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 1 Jul 2024 11:37:08 +0800 Subject: [PATCH 13/22] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E7=94=B3=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchase/procurement/procurementAdd.vue | 2 +- .../procurement/relation/chooseproducts.vue | 31 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index 8204f452ce..37054a71f6 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -546,7 +546,7 @@ export default { selectProducts() { this.viewState = 2 const aa = [] - this.$refs['divSp'].showData(aa, this.formobj.deptSid) + this.$refs['divSp'].showData(aa, this.formobj.createBySid, this.formobj.createOrgSid, this.formobj.deptSid) }, backData(value) { this.viewState = 1 diff --git a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue index ff36d12283..d121f1be99 100644 --- a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue @@ -1,10 +1,11 @@