From de2db3bda43bf118731703f5b55b8f7247f41b6e Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 28 May 2024 10:57:53 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=8C=82=E8=BD=A6=E8=AF=A6=E6=83=85=20?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BE=9B=E5=BA=94=E5=95=86=E4=BC=A0=E5=8F=82?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app/order/AppOrderDetailsVo.java | 2 + .../app/order/AppOrderTrailerInfoVo.java | 82 +++++++++++++++++++ .../bussalesorder/BusSalesOrderService.java | 29 +++++++ .../saleOrders/order/OrderDetailsVo.java | 3 + .../saleOrders/order/OrderTrailerInfoVo.java | 82 +++++++++++++++++++ .../pms/apiadmin/pms/PmsSupplierInfoRest.java | 4 +- .../PmsSupplierInfoMapper.java | 4 +- .../PmsSupplierInfoService.java | 4 +- 8 files changed, 204 insertions(+), 6 deletions(-) create mode 100644 anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java index 82eb574d34..b79581eecf 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java @@ -62,6 +62,8 @@ public class AppOrderDetailsVo implements Vo { private AppOrderPriceInfoVo priceInfo; @ApiModelProperty(value = "上装信息") private AppOrderTopInfoVo topInfo; + @ApiModelProperty(value = "挂车信息") + private List trailerInfo = new ArrayList<>(); @ApiModelProperty(value = "主车优惠") private List discountList = new ArrayList<>(); @ApiModelProperty(value = "订金信息") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java new file mode 100644 index 0000000000..462029278e --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderTrailerInfoVo.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.buscenter.api.bussalesorder.app.order; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo
+ * Description: 销售订单-挂车信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情") +public class AppOrderTrailerInfoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private String appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + + @ApiModelProperty("挂车标识") + private String trailerName; + @ApiModelProperty("合计") + private BigDecimal totalPrice; +} \ No newline at end of file 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 42727e4527..1a5b62c9fb 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 @@ -104,6 +104,8 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit; import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmitDto; import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusBorrowVehicleVo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo; @@ -3849,6 +3851,33 @@ public class BusSalesOrderService extends MybatisBaseService busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(sid); + List appOrderTrailerInfoVos = new ArrayList<>(); + for (BusSalesOrderTrailerDetailsVo busSalesOrderTrailerDetailsVo : busSalesOrderTrailerDetailsVos) { + AppOrderTrailerInfoVo appOrderTrailerInfoVo = new AppOrderTrailerInfoVo(); + BeanUtil.copyProperties(busSalesOrderTrailerDetailsVo,appOrderTrailerInfoVo,"contractFile","certFile"); + List contractFile = busSalesOrderTrailerDetailsVo.getContractFile(); + List certFile = busSalesOrderTrailerDetailsVo.getCertFile(); + ArrayList contractFileString = new ArrayList<>(); + ArrayList certFileString = new ArrayList<>(); + for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : contractFile) { + contractFileString.add(busSalesOrderTrailerFile.getUrl()); + } + for (BusSalesOrderTrailerFile busSalesOrderTrailerFile : certFile) { + certFileString.add(busSalesOrderTrailerFile.getUrl()); + } + appOrderTrailerInfoVo.setContractFile(contractFileString); + appOrderTrailerInfoVo.setCertFile(certFileString); + appOrderTrailerInfoVo.setAppearanceSizeLong("长" + appOrderTrailerInfoVo.getAppearanceSizeLong() + "m"); + appOrderTrailerInfoVo.setTotalPrice(appOrderTrailerInfoVo.getSingleFinalPrice().multiply(new BigDecimal(appOrderTrailerInfoVo.getTrailerCount()))); + appOrderTrailerInfoVos.add(appOrderTrailerInfoVo); + } + for (int i = 0; i < appOrderTrailerInfoVos.size(); i++) { + AppOrderTrailerInfoVo appOrderTrailerInfoVo = appOrderTrailerInfoVos.get(i); + appOrderTrailerInfoVo.setTrailerName("挂车" + (i + 1)); + } + vo.setTrailerInfo(appOrderTrailerInfoVos); /***************************主车优惠***************************************/ List discountList = busSalesOrderDiscountService.selectDiscount(sid); discountList.removeAll(Collections.singleton(null)); diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java index eb93077c4b..ee2d5d9fcd 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderDetailsVo.java @@ -1,6 +1,7 @@ package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; import com.fasterxml.jackson.annotation.JsonProperty; +import com.yxt.anrui.terminal.api.autoservice.saleOrders.trailer.AppSalesOrderTrailerDetailsVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -54,6 +55,8 @@ public class OrderDetailsVo implements Vo { private OrderPriceInfoVo priceInfo; @ApiModelProperty(value = "上装信息") private OrderTopInfoVo topInfo; + @ApiModelProperty(value = "挂车信息") + private List trailerInfo; @ApiModelProperty(value = "主车优惠") private List discountList; @ApiModelProperty(value = "订金信息") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java new file mode 100644 index 0000000000..85860943e8 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/OrderTrailerInfoVo.java @@ -0,0 +1,82 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.saleOrders.order; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.List; + +/** + * Project: anrui-buscenter(销售订单挂车信息)
+ * File: BusSalesOrderTrailerVo.java
+ * Class: com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerVo
+ * Description: 销售订单-挂车信息 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-05-24 09:54:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售订单-挂车信息 视图数据详情", description = "销售订单-挂车信息 视图数据详情") +public class OrderTrailerInfoVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("销售订单sid") + private String salesOrderSid; // 销售订单sid + @ApiModelProperty("挂车类型key") + private String trailerTypeKey; // 挂车类型key + @ApiModelProperty("挂车类型value") + private String trailerTypeValue; // 挂车类型value + @ApiModelProperty("外廓尺寸长") + private String appearanceSizeLong; // 外廓尺寸长 + @ApiModelProperty("单台成交价") + private BigDecimal singleFinalPrice; // 单台成交价 + @ApiModelProperty("数量") + private Integer trailerCount; // 数量 + @ApiModelProperty("合同附件") + private List contractFile = new ArrayList<>(); // 合同附件 + @ApiModelProperty("同车型合格证附件") + private List certFile = new ArrayList<>(); // 同车型合格证附件 + @ApiModelProperty("0不过票，1过票") + private Integer isCompPassTicket; // 0不过票，1过票 + + @ApiModelProperty("挂车标识") + private String trailerName; + @ApiModelProperty("合计") + private BigDecimal totalPrice; +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java index 2786908d37..710b6111ea 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierInfoRest.java @@ -89,9 +89,9 @@ public class PmsSupplierInfoRest { @ApiOperation("选择供应商") @PostMapping("/choiceSupplierInfo") - public ResultBean> choiceSupplierInfo(@RequestParam("orgSid") String orgSid){ + public ResultBean> choiceSupplierInfo(@RequestParam("deptSid") String deptSid){ ResultBean rb = ResultBean.fireFail(); - List baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(orgSid); + List baseSupplierInfoChoiceList = pmsSupplierInfoService.choiceSupplierInfo(deptSid); return rb.success().setData(baseSupplierInfoChoiceList); } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java index bb8332d56f..04adeb0b45 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoMapper.java @@ -57,8 +57,8 @@ public interface PmsSupplierInfoMapper extends BaseMapper { @Update("update yxt_base.base_supplier_info set isDelete = '1' where sid = #{sid}") int updateBySidIsDelete(String sid); - @Select("select * from yxt_base.base_supplier_info where createOrgSid = #{createOrgSid} and isDelete = '0'") - List choiceSupplierInfo(String createOrgSid); + @Select("select * from yxt_base.base_supplier_info where useOrgSid = #{deptSid} and isDelete = '0'") + List choiceSupplierInfo(String deptSid); @Select("select * from yxt_base.base_supplier_info where sid = #{sid} and isDelete = '0'") PmsSupplierInfo selBySid(String sid); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java index 6bfdb1d02e..79b76387ad 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoService.java @@ -187,8 +187,8 @@ public class PmsSupplierInfoService extends MybatisBaseService choiceSupplierInfo(String orgSid) { - List pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(orgSid); + public List choiceSupplierInfo(String deptSid) { + List pmsSupplierInfoChoiceList = baseMapper.choiceSupplierInfo(deptSid); for (PmsSupplierInfoChoice pmsSupplierInfoChoice : pmsSupplierInfoChoiceList) { List pmsSupplierBankChoices = new ArrayList<>(); List pmsSupplierBankDetailsVos = pmsSupplierBankService.selectBySupplierSid(pmsSupplierInfoChoice.getSid()); From cd2be2d38359d327bba70478e9cd3d604440da1e Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 28 May 2024 11:57:29 +0800 Subject: [PATCH 2/7] =?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 --- yxt-as-ui/src/api/Common/dictcommons.js | 8 ++++++++ .../purchase/procurement/procurement.vue | 10 ++++++++-- .../purchase/procurement/procurementAdd.vue | 20 +++++++++++-------- .../purchase/procurement/procurementInfo.vue | 6 +++++- .../procurement/relation/chooseproducts.vue | 6 +++--- .../workFlow/caigouFlow/procurementDaiBan.vue | 12 ++++++++++- .../workFlow/caigouFlow/procurementEdit.vue | 12 +++++++---- .../workFlow/caigouFlow/procurementYiBan.vue | 6 +++++- .../caigouFlow/relation/chooseproducts.vue | 6 +++--- 9 files changed, 63 insertions(+), 23 deletions(-) diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index 56b627f857..d12fd243e7 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -58,6 +58,14 @@ export function getButtonPermissions(data) { }) } +// 获取集团所有在职人员 +export function selectStaffListss() { + return request({ + url: '/portal/v1/sysstaffinfo/selectStaffListss', + method: 'get' + }) +} + // 根据当前登录用户的全路径查询相应部门下的所有人 export function selAllByOrgSidPath(data) { return request({ diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue index 95945f0879..3d93269a3a 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue @@ -205,7 +205,9 @@ export default { payTypeValue: '', supplierName: '', isInvoicing: '', - orgPath: '' + orgPath: '', + menuUrl: '', + userSid: '' } } } @@ -308,6 +310,8 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.menuUrl = this.$route.path this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') req.listPage(this.listQuery).then((response) => { this.listLoading = false @@ -345,7 +349,9 @@ export default { payTypeValue: '', supplierName: '', isInvoicing: '', - orgPath: '' + orgPath: '', + menuUrl: '', + userSid: '' } } this.init() diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue index c7077e6841..568e173b31 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementAdd.vue @@ -89,10 +89,14 @@ - +
备注
 + +
预计到货日期
+ +
订金及付款申请
@@ -371,11 +375,11 @@ export default { if (res.success) { this.formobj.createOrgSid = res.data this.formobj.useOrgSid = res.data - choiceSupplierInfo({ orgSid: res.data }).then((resp) => { - if (resp.success) { - this.supplier_list = resp.data - } - }) + } + }) + choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => { + if (resp.success) { + this.supplier_list = resp.data } }) }, @@ -490,7 +494,7 @@ export default { selectProducts() { this.viewState = 2 const aa = [] - this.$refs['divSp'].showData(aa, this.formobj.createOrgSid) + this.$refs['divSp'].showData(aa, this.formobj.deptSid) }, backData(value) { this.viewState = 1 @@ -502,7 +506,7 @@ export default { goodSpuSid: e.goodsSpuSid, goodsSpuName: e.goodsSpuName, goodsSkuSid: e.goodsSkuSid, - goodsSkuTitle: '', + goodsSkuTitle: e.goodsSpuName, goodsSkuCode: e.goodsSkuCode, goodsSkuOwnSpec: e.indexes, unit: e.goodsUnitName, diff --git a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue index 30bac952bd..46982e5da4 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurementInfo.vue @@ -66,10 +66,14 @@ - +
备注
{{ formobj.remarks }} + +
预计到货日期
+ {{ formobj.deliveryDate }} +
订金及付款申请
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 f2e1ffcd65..ff36d12283 100644 --- a/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue +++ b/yxt-as-ui/src/views/purchase/procurement/relation/chooseproducts.vue @@ -76,7 +76,7 @@ export default { current: 1, size: 5, params: { - createOrgSid: '', + useOrgSid: '', goodsSpuName: '', goodsSkuCode: '', manufacturerName: '' @@ -129,7 +129,7 @@ export default { handleSelectionChange(row) { this.sids = row }, - showData(value, createOrgSid) { + showData(value, useOrgSid) { // const aa = [] // if (value.length > 0) { // for (var i = 0; i < value.length; i++) { @@ -139,7 +139,7 @@ export default { // } else { // this.listQuery.params.saleVehSids = [] // }`` - this.listQuery.params.createOrgSid = createOrgSid + this.listQuery.params.useOrgSid = useOrgSid this.listQuery.current = 1 this.listQuery.size = 5 this.listQuery.total = 0 diff --git a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue index 9433e26fac..232f8ffa7e 100644 --- a/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/caigouFlow/procurementDaiBan.vue @@ -69,10 +69,14 @@ - +
备注
{{ formobj.remarks }} + +
预计到货日期
+ {{ formobj.deliveryDate }} +
订金及付款申请
@@ -201,6 +205,7 @@