diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java index 95f714772e..e6bc2deb02 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderDetailsVo.java @@ -27,7 +27,6 @@ package com.yxt.anrui.buscenter.api.bussalesorder; import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo; import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo; @@ -167,4 +166,7 @@ public class BusSalesOrderDetailsVo implements Vo { private boolean finPlanState; private SolutionsDetailsssVo solutionsDetailsssVo; + + private String purchaseSystemSid; + private String purchaseSystemName; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 8ed9ea234b..4e3f2df1c7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -287,5 +287,5 @@ public interface BusSalesOrderFeign { @ApiOperation("生成销售订单PDF") @PostMapping("/createPdf") @ResponseBody - public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName); + public ResultBean createPdf(@RequestParam("sid") String sid,@RequestParam("userName") String userName); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java index 819c5b9d00..04b9bcbea1 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java @@ -155,4 +155,9 @@ public class AppBusSalesOrderVo implements Vo { private String saler; @ApiModelProperty("是否显示打印按钮") private boolean printOrderBtn; + + @ApiModelProperty("流程定义id") + private String procDefId; + @ApiModelProperty("流程实例id") + private String procInstId; } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml index ecd7516cea..7efa6915e7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml @@ -61,7 +61,9 @@ 0 as showFinancialBtn, bo.type, bo.contractNo as contractId, - bo.staffName as saler + bo.staffName as saler, + bo.procDefId, + bo.procInstId FROM bus_sales_order bo left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java index b794ecd9e7..89a52ecba3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderRest.java @@ -340,7 +340,7 @@ public class BusSalesOrderRest implements BusSalesOrderFeign { } @Override - public ResultBean createPdf(String sid, String userName) { + public ResultBean createPdf(String sid, String userName) { return busSalesOrderService.createPdf(sid,userName); } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a9f9ffaaeb..2b0a538022 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -149,16 +149,14 @@ import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign; import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; -import com.yxt.common.base.utils.ConstantUtils; -import com.yxt.common.base.utils.DateUtils; -import com.yxt.common.base.utils.PagerUtil; -import com.yxt.common.base.utils.WordUtils; +import com.yxt.common.base.utils.*; +import com.yxt.common.base.utils.Base64; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; -import com.yxt.messagecenter.api.message.MessageFeign; -import com.yxt.messagecenter.api.message.MessageFlowVo; -import com.yxt.messagecenter.api.message.MessageFlowableQuery; +import com.yxt.messagecenter.api.message.*; +import com.yxt.messagecenter.api.messagelist.MessageList; +import com.yxt.messagecenter.api.messagelist.MessageListFeign; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -166,8 +164,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.io.*; import java.math.BigDecimal; import java.math.BigInteger; +import java.net.HttpURLConnection; +import java.net.URL; +import java.net.URLEncoder; import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -250,6 +252,8 @@ public class BusSalesOrderService extends MybatisBaseService createPdf(String sid, String userName) { ResultBean rb = ResultBean.fireFail(); + List photoList = new ArrayList<>(); + List imgList = new ArrayList<>(); BusSalesOrder busSalesOrder = fetchBySid(sid); Map dataMap = new HashMap(); //获取创建人姓名 @@ -5067,8 +5073,33 @@ public class BusSalesOrderService extends MybatisBaseService fileList = (List) processCommentVo.get("fileList"); + if (fileList.size() > 0){ + for (String s : fileList) { + imgList.add(s); + } + } } } + List messages = messageFeign.selectByBusinessSid(busSalesOrder.getSid()).getData(); + if (messages.size() > 0){ + for (Message message : messages) { + BusSalesOrderSourceLCVo busSalesOrderSourceLCVo = new BusSalesOrderSourceLCVo(); + String receiverNames = ""; + List messageLists = messageListFeign.fetchByMainSid(message.getSid()).getData(); + if (messageLists.size() > 0){ + for (MessageList messageList : messageLists) { + receiverNames = receiverNames + messageList.getReceiverName() + "，"; + } + } + busSalesOrderSourceLCVo.setName("系统"); + busSalesOrderSourceLCVo.setComment("抄送 " + receiverNames.substring(0,receiverNames.lastIndexOf("，"))); + busSalesOrderSourceLCVo.setSpsj(DateUtil.format(message.getCreateTime(),"yyyy-MM-dd HH:mm:ss")); + busSalesOrderSourceLCVos.add(busSalesOrderSourceLCVo); + } + } + Collections.reverse(busSalesOrderSourceLCVos); + //busSalesOrderSourceLCVos.sort(comparing(BusSalesOrderSourceLCVo::getSpsj)); dataMap.put("lcList", busSalesOrderSourceLCVos); //创建时间 dataMap.put("time", DateUtil.format(busSalesOrder.getCreateTime(), "yyyy-MM-dd")); @@ -5089,7 +5120,7 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderFLS = new ArrayList<>(); //价格信息中获取数量 @@ -5156,6 +5195,14 @@ public class BusSalesOrderService extends MybatisBaseService photoList = new ArrayList<>(); if (StringUtils.isNotBlank(busSalesOrder.getImagesFile())){ String notesImage = busSalesOrder.getImagesFile(); String[] notesImages = notesImage.split(","); for (String image : notesImages) { String urlPrefix = fileUploadComponent.getUrlPrefix(); - image = urlPrefix + image; - photoList.add(image); + try { + image = urlPrefix + URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + photoList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } + } + if (imgList.size() > 0){ + for (String image : imgList) { + if (image.contains(fileUploadComponent.getUrlPrefix())) { + image = image.replace(fileUploadComponent.getUrlPrefix(), ""); + try { + image = fileUploadComponent.getUrlPrefix() + URLEncoder.encode(image, "utf-8"); + String image2Base64 = image2Base64(image); + photoList.add(image2Base64); + } catch (UnsupportedEncodingException e) { + e.printStackTrace(); + } + } } } dataMap.put("photoPath64", photoList); @@ -5195,6 +5260,71 @@ public class BusSalesOrderService extends MybatisBaseService SELECT * FROM bus_sales_order_insurance - WHERE salesOrderSid = #{sid} + WHERE salesOrderSid = #{saleOrderSid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml index efab819164..0bc93124f3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml @@ -21,7 +21,9 @@ guildPrice, finalPrice, brandName, - brandSid + brandSid, + publicModelSon, + publicModel from bus_sales_order_model where salesOrderSid = #{sid} diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xsddsp1.ftl b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xsddsp1.ftl new file mode 100644 index 0000000000..2f9a8fb505 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/resources/ftl/xsddsp1.ftl @@ -0,0 +1,3155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 销售订单审批 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 分公司名称（ + + + + + + + + ${orgName!} + + + + + + + + ） + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建时间： + + + + + + + + ${time!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 审批编号： + + + + + + + + 订单编号- + + + + + + + + ${billNo!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建人 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${userSid!} + + + + + + + + + + + + + + + + + + + + + + + + + + + 创建部门 + + + + + + + + + + + + + + + + + + + + + + + + + + + ${deptName!} + + + + + + + + + + + + + + + + + + + + + + + + + + 客户名称 + + + + + + + + + + + + + + + + + + + + + + + + ${custName!} + + + + + + + + + + + + + + + + + + + + + + + + 联系电话 + + + + + + + + + + + + + + + + + + + + + + + + ${phone!} + + + + + + + + + + + + + + + + + + + + + + + + + + 销售类型 + + + + + + + + + + + + + + + + + + + + + + + + ${saleType!} + + + + + + + + + + + + + + + + + + + + + + + + 车型 + + + + + + + + + + + + + + + + + + + + + + + + ${vehModel!} + + + + + + + + + + + + + + + + + + + + + + + + + + 销售指导价（元） + + + + + + + + + + + + + + + + + + + + + + + + ${salePrice!} + + + + + + + + + + + + + + + + + + + + + + + + 合同价格（元） + + + + + + + + + + + + + + + + + + + + + + + + ${conPrice!} + + + + + + + + + + + + + + + + + + + + + + + + + + 是否公司入保 + + + + + + + + + + + + + + + + + + + + + + + + ${isrb!} + + + + + + + + + + + + + + + + + + + + + + + + + + 是否赠送客户物品 + + + + + + + + + + + + + + + + + + + + + + + + ${iszs!} + + + + + + + + + + + + + + + + + + + + + + + + + + 赠送客户物品 + + + + + + + + + + + + + + + + + + + + + + + + ${zskhwp!} + + + + + + + + + + + + + + + + + + + + + + + + + + 是否返利 + + + + + + + + + + + + + + + + + + + + + + + + ${isfl!} + + + + + <#if (isfl == "是")> + + + + + + + + + + + + + + + + + + + + + + 返利备案表 + + + + + + + + + + + + + + + + + + + + + + + + + + 返利金额 + + + + + + + + + + + + + + + + + + + + + + + + 户名 + + + + + + + + + + + + + + + + + + + + + + + + 手机号 + + + + + + + + + + + + + + + + + + + + + + + + 账号 + + + + + + + + + + + + + + + + + + + + + + + 开户行 + + + + + <#list flList as fl> + + + + + + + + + + + + + + + + + + + + + + ${fl.flPrice!} + + + + + + + + + + + + + + + + + + + + + + + + ${fl.hm!} + + + + + + + + + + + + + + + + + + + + + + + + ${fl.sjh!} + + + + + + + + + + + + + + + + + + + + + + + + ${fl.zh!} + + + + + + + + + + + + + + + + + + + + + + + ${fl.khh!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + 金融信息备案 + + + + + + + + + + + + + + + + + + + + + + + + + 资方 + + + + + + + + + + + + + + + + + + + + + + + ${zf!} + + + + + + + + + + + + + + + + + + + + + + + + 贴息金额 + + + + + + + + + + + + + + + + + + + + + + + ${txPrice!} + + + + + + + + + + + + + + + + + + + + + + + 贴息用途 + + + + + + + + + + + + + + + + + + + + + + + ${txyt!} + + + + + + + + + + + + + + + + + + + + + + + + + 金融服务费 + + + + + + + + + + + + + + + + + + + + + + + ${jrfwf!} + + + + + + + + + + + + + + + + + + + + + + + + + 备注 + + + + + + + + + + + + + + + + + + + + + + + ${bz!} + + + + + + + + + + + + + + + + + + + + + 审批流程 + + + + <#list lcList as lc> + <#if (lc_index==0)> + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + + + + + + + + + + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + <#list lcList as lc> + <#if (lc_index>0)> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.comment!} + + + + + + + + + + + + + + + + + + ${lc.name!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${lc.spsj!} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <#list photoPath64 as photo> + + ${photo} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + God + + + God + 2 + 2023-03-31T06:32:00Z + 2023-03-31T06:32:00Z + + + + + + + + 0 + 2 + 75 + 431 + Microsoft Office Word + 0 + 3 + 1 + false + + false + 505 + false + false + 16.0000 + + + + \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/dingdanchaxun.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/dingdanchaxun.js new file mode 100644 index 0000000000..353a604fa1 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/dingdanchaxun.js @@ -0,0 +1,21 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 + listPage: function(data) { + return request({ + url: '/buscenter/v1/bussalesorder/getSaleOrdersByOrgPath', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 通过sid作废一条或多条记录 + createPdf: function(data) { + return request({ + url: '/buscenter/v1/bussalesorder/createPdf', + method: 'post', + params: data + }) + } +} diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js index 39e656a779..da23ce9c0e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js @@ -1,59 +1,137 @@ -import request from "@/utils/request"; +import request from '@/utils/request' // ----------------------------------- 订单管理 -// 销售订单管理列表 已改 +// 销售订单管理列表 export function getListPage(data) { return request({ - url: "/buscenter/v1/bussalesorder/listPage", - method: "post", + url: '/buscenter/v1/bussalesorder/listPage', + method: 'post', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } - }); + }) } -// 销售订单批量删除销售订单 已改 +// 销售订单批量删除销售订单 export function delBySids(data) { return request({ - url: "/buscenter/v1/bussalesorder/delBySids", - method: "delete", + url: '/buscenter/v1/bussalesorder/delBySids', + method: 'delete', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } }); } -// 销售订单新增保存 已改 +// 销售订单新增保存 export function saveOrderForm(data) { return request({ - url: "/buscenter/v1/bussalesorder/saveOrUpdate", - method: "post", + url: '/buscenter/v1/bussalesorder/saveOrUpdate', + method: 'post', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } }); } -// 编辑、详情初始化 已改(8.9修改后) -export function fetchDetailsBySid(params) { +// 编辑、详情初始化 +export function fetchDetailsBySid(data) { return request({ - url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid, - method: "get", - params: params, - }); + url: '/buscenter/v1/bussalesorder/fetchDetailsBySid/' + data, + method: 'get' + }) } + // 销售订单提交接口 (8.9修改后) export function submitOrderForm(params) { return request({ - url: "/buscenter/v1/bussalesorder/submit", - method: "post", + url: '/buscenter/v1/bussalesorder/submit', + method: 'post', data: params, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } - }); + }) +} + +// 流程审批（同意） +export function complete(params) { + return request({ + url: '/buscenter/v1/bussalesorder/complete', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批（同意--可选择采购系统） +export function completeBy(params) { + return request({ + url: '/buscenter/v1/bussalesorder/completeBy', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批（终止） +export function breakProcess(params) { + return request({ + url: '/buscenter/v1/bussalesorder/breakProcess', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批（驳回） +export function reject(params) { + return request({ + url: '/buscenter/v1/bussalesorder/reject', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批（撤回） +export function revokeProcess(params) { + return request({ + url: '/buscenter/v1/bussalesorder/revokeProcess', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批（获取下一环节） +export function getNextNodesForSubmit(data) { + return request({ + url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit', + method: 'get', + params: data + }) +} + +// 流程审批（获取上一环节） +export function getPreviousNodesForReject(data) { + return request({ + url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject', + method: 'get', + params: data + }) } // 外联表接口 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 049db637ea..9c7670bc52 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -217,6 +217,15 @@ export const constantRoutes = [ title: '销售让价权限管理' } }, + { + path: '/xiaoshouguanli/dingdanchaxun', + component: () => + import('@/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue'), + name: 'XiaoShouDingDanChaXun', + meta: { + title: '销售订单查询', noCache: true + } + }, { path: '/xiaoshouguanli/guachepeizhixinxi', component: () => @@ -487,14 +496,21 @@ export const constantRoutes = [ path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdan', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue'), - name: 'xiaoshoudingdanFlow' + name: 'XiaoShouDingDanDaiBanInfo' }, // 销售管理已办详情 { path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanInfo', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue'), - name: 'xiaoshoudingdanFlowInfo' + name: 'XiaoShouDingDanYiBanInfo' + }, + // 销售管理已办详情--销售支出部经理审批环节--选择采购系统 + { + path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCaiGou', + component: () => + import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue'), + name: 'xiaoshoudingdanByCaiGou' }, // 销售管理驳回到发起人办理 { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue index d27127d41d..afa984f3ae 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue @@ -547,7 +547,8 @@ export default { visitWay: '', // 见面方式 visitWayKey: '', userSid: '', - orgSid: '' + orgSid: '', + orgPath: '' }, // 添加和修改 templooke: {}, dialogFormVisible: false, @@ -945,6 +946,7 @@ export default { this.$message({ showClose: true, type: 'error', message: '因客户类型为企业,客户名称的长度应不少于5个汉字' }) return } + this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath') if (this.stateId === '0') { const tip = '客户名称、联系电话一经保存，无法修改，是否继续保存' this.$confirm(tip, '提示', { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue new file mode 100644 index 0000000000..33620dc485 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue @@ -0,0 +1,305 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue index 05a8aec9e9..188117e00d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue @@ -1,1015 +1,681 @@ - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue new file mode 100644 index 0000000000..98b7ba8c23 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue @@ -0,0 +1,752 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue index 1df29441c4..4431249871 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue @@ -1,717 +1,473 @@ - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue new file mode 100644 index 0000000000..2282068bda --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue @@ -0,0 +1,325 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue new file mode 100644 index 0000000000..44978eb033 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue @@ -0,0 +1,305 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue index 461308b4b7..0274505960 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue @@ -316,7 +316,7 @@ export default { // 打开查看详情 toInfo(row) { this.viewState = 4 - this.$refs['dingdanxinxiinfo'].showInfo(row.sid) + this.$refs['dingdanxinxiinfo'].showInfo(row) }, xiaoshouhetong(row) { this.$refs['hetongdanganguanli-Info'].showOrderHeTong(row.sid) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue index ab48d26391..42a8a588bb 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue @@ -1,673 +1,440 @@ - diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml index 8bf8540885..e96e634e6f 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml @@ -29,6 +29,7 @@ ${ew.sqlSegment} + order by fp.createTime desc