From 6912dc8a831f149e71d5f17d7ff9d3fb3a422cf7 Mon Sep 17 00:00:00 2001 From: hp <2969694837@qq.com> Date: Thu, 8 Dec 2022 17:15:55 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppDeliveredApplyInfoVo.java | 2 +- .../AppSubmitDeliveredApplyDto.java | 2 + .../BusDeliveredApplyService.java | 40 ++++++++++++++----- .../retrieval/AppBusDeliveredApplyFeign.java | 15 +++---- .../retrieval/DeliveredApplyDetailsVo.java | 3 +- .../flowable/SubmitRetrievalDto.java | 19 ++------- .../api/base/account/AppManufacturerVo.java | 2 + 7 files changed, 49 insertions(+), 34 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java index 91351d1e7f..2eee814ec7 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyInfoVo.java @@ -54,7 +54,7 @@ public class AppDeliveredApplyInfoVo implements Vo { private String createBySid; @ApiModelProperty("流程实列id") - private String procInsId; + private String procInstId; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java index 62a549db7e..a5d5fa57e9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppSubmitDeliveredApplyDto.java @@ -1,5 +1,6 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; +import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -10,6 +11,7 @@ public class AppSubmitDeliveredApplyDto extends AppDeliveredApplyDto { @ApiModelProperty("意见") private String comment; @ApiModelProperty("流程实例id") + @JsonProperty("procInsId") private String instanceId; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 707a8e3974..e59884c8ea 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -47,8 +47,6 @@ import com.yxt.anrui.buscenter.biz.busdeliveredapplydetails.BusDeliveredApplyDet import com.yxt.anrui.buscenter.biz.busdeliveredusemessage.BusDeliveredUseMessageService; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo; -import com.yxt.anrui.fin.api.kingdee.KingDeeResult; -import com.yxt.anrui.fin.api.kingdee.saloutstock.SalOutStock; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; @@ -65,14 +63,14 @@ import com.yxt.common.base.utils.PagerUtil; 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 org.apache.commons.lang3.StringUtils; -import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import javax.annotation.Resource; -import java.text.SimpleDateFormat; import java.util.*; import java.util.stream.Collectors; @@ -114,6 +112,8 @@ public class BusDeliveredApplyService extends MybatisBaseService getRetrievalApplyInfoBySid(String sid) { @@ -869,9 +876,7 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = BeanUtil.beanToMap(dto); - //若有网关，则赋值网关中判断的字段。 - variables.put("businessSid", businessSid); + Map variables = new HashMap<>(); //用户的部门全路径sid bv.setOrgSidPath(orgSidPath); //业务sid @@ -879,12 +884,29 @@ public class BusDeliveredApplyService extends MybatisBaseService appMap = new HashMap<>(); + //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。 + appMap.put("sid", businessSid); + variables.put("app", appMap); //流程定义id bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId()); if (r == 1) { ResultBean voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); updateFlowFiled(BeanUtil.beanToMap(ufVo)); + //极光推送 + busDeliveredApply = fetchBySid(businessSid); + MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); + MessageFlowVo messageFlowVo = new MessageFlowVo(); + BeanUtil.copyProperties(ufVo, messageFlowVo); + messageFlowableQuery.setUfVo(messageFlowVo); + messageFlowableQuery.setAppMap(appMap); + messageFlowableQuery.setBusinessSid(businessSid); + messageFlowableQuery.setModuleName("出库申请"); + messageFlowableQuery.setMsgContent(busDeliveredApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); + messageFlowableQuery.setMsgTitle("出库申请"); + ResultBean stringResultBean = messageFeign.pushMessage(messageFlowableQuery); return voResultBean; } if (r == 2) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java index 1f71b58607..8c788a6eb7 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java @@ -44,6 +44,7 @@ import org.springframework.cloud.openfeign.FeignClient; import org.springframework.cloud.openfeign.SpringQueryMap; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; import java.util.List; /** @@ -128,30 +129,30 @@ public interface AppBusDeliveredApplyFeign { @ApiOperation("提交流程") @PostMapping("/submitRetrievalInfo") @ResponseBody - ResultBean submitRetrievalInfo(@RequestBody SubmitRetrievalDto dto); + ResultBean submitRetrievalInfo(@Valid @RequestBody SubmitRetrievalDto dto); @ApiOperation("办理") - @PutMapping("/agreeAdvanceInvoiceInfo") + @PutMapping("/agreeRetrievalInfo") @ResponseBody - ResultBean agreeRetrievalInfo(@RequestBody CompleteRetrievalDto dto); + ResultBean agreeRetrievalInfo(@Valid @RequestBody CompleteRetrievalDto dto); @ApiOperation("驳回") @PutMapping("/rejectRetrievalInfo") @ResponseBody - ResultBean rejectRetrievalInfo(@RequestBody RetrievalTaskQuery query); + ResultBean rejectRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query); @ApiOperation("撤回") @PutMapping("/recallRetrievalInfo") @ResponseBody - ResultBean recallRetrievalInfo(@RequestBody RetrievalTaskQuery query); + ResultBean recallRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query); @ApiOperation("终止") @PutMapping("/stopRetrievalInfo") @ResponseBody - ResultBean stopRetrievalInfo(@RequestBody RetrievalTaskQuery query); + ResultBean stopRetrievalInfo(@Valid @RequestBody RetrievalTaskQuery query); @ApiOperation("获取流程操作标题") @GetMapping("/getFlowOperateTitle") @ResponseBody - ResultBean getFlowOperateTitle(@SpringQueryMap RetrievalQuery query); + ResultBean getFlowOperateTitle(@Valid @SpringQueryMap RetrievalQuery query); } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java index 0f43f20bc7..c0e5d9098c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredApplyDetailsVo.java @@ -51,7 +51,8 @@ public class DeliveredApplyDetailsVo implements Vo { private String userSid; @ApiModelProperty("流程实列id") - private String procInsId; + @JsonProperty("procInsId") + private String procInstId; @ApiModelProperty("任务id") private String taskId; diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java index 0f9ec209a1..d13a3d567e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/flowable/SubmitRetrievalDto.java @@ -11,23 +11,10 @@ import javax.validation.constraints.NotBlank; public class SubmitRetrievalDto extends DeliveredApplyDto { private static final long serialVersionUID = -471108222247151552L; - @ApiModelProperty(value = "任务id") - @NotBlank(message = "参数错误：taskId") - private String taskId; - @ApiModelProperty(value = "流程id") - @NotBlank(message = "参数错误：procInsId") + @ApiModelProperty("流程实例id") @JsonProperty("procInsId") private String instanceId; - @ApiModelProperty(value = "意见") - private String comment; - @ApiModelProperty(value = "业务sid") - @NotBlank(message = "参数错误：businessSid") - private String businessSid; - @ApiModelProperty(value = "用户sid") - @NotBlank(message = "参数错误：userSid") - private String userSid; - @ApiModelProperty(value = "节点id") - @NotBlank(message = "参数错误：taskDefKey") - private String taskDefKey; + @ApiModelProperty("任务id") + private String taskId; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java index 566cf1c84a..bdc684ba60 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/account/AppManufacturerVo.java @@ -8,6 +8,8 @@ import lombok.Data; public class AppManufacturerVo implements Vo { private static final long serialVersionUID = 6743866407572366715L; + @ApiModelProperty("本分公司开户账号sid") + private String accountSid; @ApiModelProperty("银行账号") private String bankAccount; @ApiModelProperty("账户名称") From 4e9b88ddf3c22eb6c3eba3c81a00016eec9cbef9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Thu, 8 Dec 2022 18:15:04 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE?= =?UTF-8?q?=E4=B9=B0=E6=96=AD=E3=80=81=E5=8E=82=E5=AE=B6=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E3=80=81=E8=BD=A6=E8=BE=86=E5=A4=96=E9=87=87=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E4=B8=AD=E6=84=8F=E8=A7=81=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/baseoutsourcingapplication.vue | 6 ++--- .../cheliangpaichanDaiBanInfo.vue | 2 +- .../weishoumaiduanDaiBanInfo.vue | 23 ++++++++++++------- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue index e24009c88a..2beca34139 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -263,7 +263,7 @@ 意见 - + @@ -287,7 +287,7 @@ 意见 - + @@ -304,7 +304,7 @@ 意见 - + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue index 0473e991d8..b83f7410f2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue @@ -153,7 +153,7 @@ 意见: - +
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue index aff49ce9d6..8184593e26 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue @@ -164,17 +164,21 @@ - + - -
当前环节:
- {{ current.taskName }}->{{ nextNode.name }} + + 当前环节: + + + {{ current.taskName }}->{{ nextNode.name }} - - -
意见:
- + + + 意见: + + +
@@ -444,5 +448,8 @@ export default { text-align: center; padding: 30px 0 20px 0; } +.rowClass{ + border-top: 1px solid #E0E3EB; +} From 383fb53c1727410ab71e33f9369986d1eb70c072 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Dec 2022 10:53:57 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E7=AE=80?= =?UTF-8?q?=E6=98=93=E8=AE=A2=E5=8D=95=E7=9A=84=E8=BD=A6=E8=BE=86=E9=A2=84?= =?UTF-8?q?=E5=AE=9A=E5=88=97=E8=A1=A8=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commoncontract/CommonContractService.java | 5 ++-- .../AppBusDepositBuscenterDetailVo.java | 6 ++--- .../BusDepositVehicleService.java | 23 +++++++++++-------- .../busmaindeposit/BusMainDepositService.java | 12 ++++++---- .../deposit/DepositBuscenterDetailVo.java | 8 ++++--- 5 files changed, 31 insertions(+), 23 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java index 43623e90d6..955baf5716 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java @@ -76,6 +76,7 @@ import org.springframework.transaction.annotation.Transactional; import java.io.File; import java.io.InputStream; import java.math.BigDecimal; +import java.text.MessageFormat; import java.text.SimpleDateFormat; import java.util.*; import java.util.concurrent.*; @@ -1405,7 +1406,7 @@ public class CommonContractService extends MybatisBaseService(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); - /* Future future1 = pool.submit(() -> { + Future future1 = pool.submit(() -> { return genCarSaleContract(dto, map, appOrderDetailsVo); }); PrintConfirmVo printConfirmVo = null; @@ -1433,7 +1434,7 @@ public class CommonContractService extends MybatisBaseService userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid()); if (!userVoResultBean.getSuccess()) { diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java index 6e911878cb..cf35c9fb4e 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/virtualOrders/deposit/DepositBuscenterDetailVo.java @@ -1,6 +1,6 @@ package com.yxt.anrui.terminal.api.autoservice.virtualOrders.deposit; -import com.yxt.anrui.buscenter.api.busdepositcustomer.AppBusDepositCustomerListVo; +import com.fasterxml.jackson.annotation.JsonProperty; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -27,10 +27,12 @@ public class DepositBuscenterDetailVo implements Vo { private String payDate; @ApiModelProperty("付款方式") - private String payType; + @JsonProperty("payType") + private String payTypeKey; @ApiModelProperty("付款方式") - private String payTypeValue; + @JsonProperty("payTypeValue") + private String payType; @ApiModelProperty("付款人") private String payName; From b52e73cfb20b9c507295c3700e82f01b20573d96 Mon Sep 17 00:00:00 2001 From: dimengzhe <251008545@qq.com> Date: Fri, 9 Dec 2022 14:57:19 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E9=94=80?= =?UTF-8?q?=E5=94=AE=E8=AE=A2=E5=8D=95=E8=AE=A2=E9=87=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/bussalesorderdeposit/BusSalesOrderDepositService.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 73f53caf74..231a538b05 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -236,6 +236,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService Date: Fri, 9 Dec 2022 15:16:34 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E9=87=87=E8=B4=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue | 5 +++++ .../supplychain/cheliangpaichan/cheliangpaichanInfo.vue | 5 +++++ .../paichanguanli/cheliangpaichanDaiBanInfo.vue | 5 +++++ .../paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue | 5 +++++ .../paichanguanli/cheliangpaichanYiBanInfo.vue | 5 +++++ 5 files changed, 25 insertions(+) diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue index 83485ce95c..977054d748 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanAdd.vue @@ -19,6 +19,11 @@
厂家采购
+ + +
金额单位：元
+ +
分公司:
diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue index a475b70a23..c5394c90d8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/cheliangpaichan/cheliangpaichanInfo.vue @@ -15,6 +15,11 @@
厂家采购
+ + +
金额单位：元
+ +
分公司:
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue index b83f7410f2..e52ea2ccb4 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanDaiBanInfo.vue @@ -17,6 +17,11 @@
厂家采购
+ + +
金额单位：元
+ +
分公司:
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue index 97cc47e894..8046c82187 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanEdit.vue @@ -18,6 +18,11 @@
排产申请
+ + +
金额单位：元
+ +
分公司:
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue index 775b7f5b76..353f562845 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanYiBanInfo.vue @@ -15,6 +15,11 @@
厂家采购
+ + +
金额单位：元
+ +
分公司:
From a808882b9211bef69c0e751a45964a48c6dd30d9 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Fri, 9 Dec 2022 15:18:36 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BD=A6=E5=9E=8B?= =?UTF-8?q?=E6=8A=A5=E4=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../daibaojiaguanli/daibaojiaInfo.vue | 126 +++++----- .../daibaojiaguanli/diabaojiaAdd.vue | 217 ++++++++++-------- 2 files changed, 183 insertions(+), 160 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue index e50285d61b..a4d2926bb8 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/daibaojiaInfo.vue @@ -8,7 +8,7 @@
-
【品牌】车型询价单
+
【品牌】车型询价单
销售专员
@@ -30,24 +30,24 @@ - +
车型配置
- {{ formobj.vehModelConfig }} {{ formobj.moreConfig }} + {{ formobj.vehModelConfig }} {{ formobj.moreConfig }} - +
换、选装说明
- {{ formobj.repInstr }} + {{ formobj.repInstr }} - +
其他特殊配置说明
- {{ formobj.otherConfig }} + {{ formobj.otherConfig }} -
【品牌】车型报价单
+
【品牌】车型报价单
{{ formobj.vehicleAlias }}
@@ -84,7 +84,7 @@ {{ formobj.gearboxTypeValue }} -
车型信息
+
车型信息
排放标准
@@ -107,102 +107,102 @@ {{ formobj.departmentValue }} -
常用配置
+
常用配置
-
颜色
- {{ formobj.carColor }} +
后桥
+ {{ formobj.rearAxleValue }} -
缓速器
- {{ formobj.slowMachine }} +
速比
+ {{ formobj.rearAxleRatio }} -
后视镜
- {{ formobj.rearViewMirror }} +
轴距
+ {{ formobj.wheelbase }} -
轮胎
- {{ formobj.tireSize }} +
悬架
+ {{ formobj.suspension }} -
驾驶室
- {{ formobj.specification }} +
鞍座
+ {{ formobj.saddle }} -
后桥速比
- {{ formobj.rearAxleRatio }} +
颜色
+ {{ formobj.carColor }} -
空调
- {{ formobj.airConditioner }} +
驾驶室
+ {{ formobj.specification }} -
轮毂材质
- {{ formobj.hubMaterial }} +
保险杠
+ {{ formobj.bumper }} -
导流罩
- {{ formobj.baffleModel }} +
燃料箱
+ {{ formobj.fuelTank }} -
悬架
- {{ formobj.suspension }} +
导流罩
+ {{ formobj.baffleModel }} -
座椅
- {{ formobj.seat }} +
独立热源
+ {{ formobj.independentSources }} -
护轮罩
- {{ formobj.tireCover }} +
缓速器
+ {{ formobj.slowMachine }} -
鞍座
- {{ formobj.saddle }} +
护轮罩
+ {{ formobj.tireCover }} -
轴距
- {{ formobj.wheelbase }} +
后视镜
+ {{ formobj.rearViewMirror }} -
保险杠
- {{ formobj.bumper }} +
轮胎
+ {{ formobj.tireSize }} -
配置包
- {{ formobj.configuringBao }} +
轮毂材质
+ {{ formobj.hubMaterial }} -
独立热源
- {{ formobj.independentSources }} +
空调
+ {{ formobj.airConditioner }} -
燃料箱
- {{ formobj.fuelTank }} +
座椅
+ {{ formobj.seat }}
多媒体
{{ formobj.multimedia }} -
货箱
- {{ formobj.packingCase }} +
配置包
+ {{ formobj.configuringBao }} -
更多配置
+
更多配置
{{ formobj.moreConfig }} -
特殊或差异说明
+
特殊或差异说明
@@ -267,15 +267,6 @@ export default { } diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue index d69439b6b1..4f7d7c2710 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexingbaojia/daibaojiaguanli/diabaojiaAdd.vue @@ -31,21 +31,21 @@ - +
车型配置
- {{ formobj.vehModelConfig }} {{ formobj.moreConfig }} + {{ formobj.vehModelConfig }} {{ formobj.moreConfig }} - +
换、选装说明
- {{ formobj.repInstr }} + {{ formobj.repInstr }} - +
其他特殊配置说明
- {{ formobj.otherConfig }} + {{ formobj.otherConfig }}
【品牌】车型报价单
@@ -111,81 +111,89 @@
常用配置
-
颜色
+
后桥
- - + + - + -
缓速器
+
速比
- - + + - + -
后视镜
+
轴距
- - + + - + -
轮胎
+
悬架
- - + + - + -
驾驶室
+
鞍座
- - + + - + -
后桥速比
+
颜色
- - + + - + -
空调
+
驾驶室
- - + + - + -
轮毂材质
+
保险杠
- - + + - + +
燃料箱
+ + + + + + + +
导流罩
@@ -195,25 +203,26 @@ - -
悬架
+ + + +
独立热源
- - + + - + - - -
座椅
+
缓速器
- - + + - +
护轮罩
@@ -226,61 +235,52 @@ -
鞍座
- - - - - - - - -
轴距
+
后视镜
- - + + - + -
保险杠
+
轮胎
- - + + - + -
配置包
+
轮毂材质
- - + + - + -
独立热源
+
空调
- - + + - -
燃料箱
+
座椅
- - + + - +
多媒体
@@ -292,14 +292,14 @@ - -
货箱
+ +
配置包
- - + + - +
更多配置
@@ -367,7 +367,7 @@