diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java index 2c91abd29f..09ab71357c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerDto.java @@ -55,6 +55,8 @@ public class BusSalesOrderTrailerDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("挂车类型key") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java index 697c3d73a9..14076f1030 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeign.java @@ -61,7 +61,7 @@ public interface BusSalesOrderTrailerFeign { @ApiOperation("新增或修改") @PostMapping("/save") @ResponseBody - public ResultBean save(@RequestBody List dto); + public ResultBean save(@RequestBody BusSalesOrderTrailerDto dto); @ApiOperation("根据sid删除记录") @DeleteMapping("/delete") @@ -72,4 +72,9 @@ public interface BusSalesOrderTrailerFeign { @GetMapping("/fetchDetailsByOrderSid/{orderSid}") @ResponseBody public ResultBean> fetchDetailsByOrderSid(@PathVariable("orderSid") String orderSid); + + @ApiOperation("初始化") + @GetMapping("/fetchBySid") + @ResponseBody + ResultBean fetchBySid(@RequestParam("sid") String sid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java index a1c49bf30c..710bb4b269 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordertrailer/BusSalesOrderTrailerFeignFallback.java @@ -49,7 +49,7 @@ import java.util.List; public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFeign { @Override - public ResultBean save(List dto) { + public ResultBean save(BusSalesOrderTrailerDto dto) { return null; } @@ -62,4 +62,9 @@ public class BusSalesOrderTrailerFeignFallback implements BusSalesOrderTrailerFe public ResultBean> fetchDetailsByOrderSid(String orderSid) { return null; } + + @Override + public ResultBean fetchBySid(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java index f3b3963938..dc169b504b 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerMapper.java @@ -62,4 +62,10 @@ public interface BusSalesOrderTrailerMapper extends BaseMapper fetchAllByOrderSid(String orderSid); + + @Select("select * from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid}") + BusSalesOrderTrailerDetailsVo fetchByOrderSidOne(String salesOrderSid); + + @Select("select * from bus_sales_order_trailer where salesOrderSid = #{salesOrderSid} and sid != #{dtoSid}") + BusSalesOrderTrailerDetailsVo fetchByOrderSidAndNotSidOne(@Param("salesOrderSid") String salesOrderSid,@Param("dtoSid") String dtoSid); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java index 96c01d3af8..b4bc59ecc6 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerRest.java @@ -25,8 +25,10 @@ *********************************************************/ package com.yxt.anrui.buscenter.biz.bussalesordertrailer; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailer; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -58,8 +60,8 @@ public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign { private BusSalesOrderTrailerService busSalesOrderTrailerService; @Override - public ResultBean save(List dto) { - return null; + public ResultBean save(BusSalesOrderTrailerDto dto) { + return busSalesOrderTrailerService.saveOrUpdateDto(dto); } @Override @@ -75,4 +77,11 @@ public class BusSalesOrderTrailerRest implements BusSalesOrderTrailerFeign { List busSalesOrderTrailerDetailsVos = busSalesOrderTrailerService.fetchAllByOrderSid(orderSid); return rb.success().setData(busSalesOrderTrailerDetailsVos); } + + @Override + public ResultBean fetchBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerService.fetchBySid(sid); + return rb.success().setData(busSalesOrderTrailer); + } } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java index f691d001aa..c845a0b2ae 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordertrailer/BusSalesOrderTrailerService.java @@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; import com.yxt.common.base.config.component.FileUploadComponent; +import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -64,18 +65,51 @@ public class BusSalesOrderTrailerService extends MybatisBaseService certFile = dto.getCertFile(); + String certUrl = ""; + for (String cert : certFile) { + String filePath = cert.replace(fileUploadComponent.getUrlPrefix(), ""); + certUrl = certUrl + filePath + ","; + } + String contractUrl = ""; + List contractFile = dto.getContractFile(); + for (String contract : contractFile) { + String filePath = contract.replace(fileUploadComponent.getUrlPrefix(), ""); + contractUrl = contractUrl + filePath + ","; + } + entity.setCertFile(certUrl); + entity.setContractFile(contractUrl); baseMapper.insert(entity); } @@ -86,6 +120,20 @@ public class BusSalesOrderTrailerService extends MybatisBaseService certFile = dto.getCertFile(); + String certUrl = ""; + for (String cert : certFile) { + String filePath = cert.replace(fileUploadComponent.getUrlPrefix(), ""); + certUrl = certUrl + filePath + ","; + } + String contractUrl = ""; + List contractFile = dto.getContractFile(); + for (String contract : contractFile) { + String filePath = contract.replace(fileUploadComponent.getUrlPrefix(), ""); + contractUrl = contractUrl + filePath + ","; + } + entity.setCertFile(certUrl); + entity.setContractFile(contractUrl); baseMapper.updateById(entity); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java index c6be8d2fdf..59f8fefdde 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeign.java @@ -182,10 +182,15 @@ public interface AppBusSalesOrderFeign { @ResponseBody ResultBean getAppTrailerListVoByOrderSid(@PathVariable(value = "orderSid") String orderSid); + @ApiOperation("根据sid初始化") + @GetMapping("/initAppOrderTrailer") + @ResponseBody + ResultBean initAppOrderTrailer(@RequestParam(value = "sid") String sid); + @ApiOperation("保存挂车信息") @PostMapping("/saveOrUpdateAppOrderTrailer") @ResponseBody - ResultBean saveOrUpdateAppOrderTrailer(@RequestBody List dto); + ResultBean saveOrUpdateAppOrderTrailer(@RequestBody AppSalesOrderTrailerDto dto); @ApiOperation("删除挂车信息") @DeleteMapping("/delAppOrderTrailerBySid") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java index ac97922404..861ca273c6 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/AppBusSalesOrderFeignFallback.java @@ -160,7 +160,12 @@ public class AppBusSalesOrderFeignFallback implements AppBusSalesOrderFeign { } @Override - public ResultBean saveOrUpdateAppOrderTrailer(List dto) { + public ResultBean initAppOrderTrailer(String sid) { + return null; + } + + @Override + public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) { return null; } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java index 4f77bfa379..d0182e9322 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/trailer/AppSalesOrderTrailerDto.java @@ -54,6 +54,8 @@ public class AppSalesOrderTrailerDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("销售订单sid") private String salesOrderSid; // 销售订单sid @ApiModelProperty("挂车类型key") diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java index 70a5c5ec77..6a24505f49 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderRest.java @@ -235,7 +235,12 @@ public class AppBusSalesOrderRest implements AppBusSalesOrderFeign { } @Override - public ResultBean saveOrUpdateAppOrderTrailer(List dto) { + public ResultBean initAppOrderTrailer(String sid) { + return appBusSalesOrderService.initAppOrderTrailer(sid); + } + + @Override + public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) { return appBusSalesOrderService.saveOrUpdateAppOrderTrailer(dto); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java index 68b206e2d2..b5f050f0ff 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/saleOrders/AppBusSalesOrderService.java @@ -70,10 +70,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelD import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceDto; import com.yxt.anrui.buscenter.api.bussalesorderprice.app.AppBusSalesOrderPriceVo; -import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDetailsVo; -import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerDto; -import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFeign; -import com.yxt.anrui.buscenter.api.bussalesordertrailer.BusSalesOrderTrailerFile; +import com.yxt.anrui.buscenter.api.bussalesordertrailer.*; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusVehicleBorrowVo; import com.yxt.anrui.buscenter.api.bussolutionschange.flow.flow.SolutionsChangeDelegateQuery; @@ -123,6 +120,7 @@ import com.yxt.anrui.terminal.api.base.common.SystemVo; import com.yxt.anrui.terminal.api.risk.loanhomevisitinvestigate.AppLoanHomeVisitVo; import com.yxt.anrui.terminal.biz.base.common.CommonService; import com.yxt.anrui.terminal.config.CoverUtils; +import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -195,6 +193,8 @@ public class AppBusSalesOrderService { private FinCompanyInvoicingFeign finCompanyInvoicingFeign; @Autowired private BusSalesOrderTrailerFeign busSalesOrderTrailerFeign; + @Autowired + private FileUploadComponent fileUploadComponent; /************************************* 销售订单接口 *********************************************/ @@ -778,7 +778,7 @@ public class AppBusSalesOrderService { } } else {//贷款 - if("Activity_1ckx8lq".equals(query.getTaskDefKey())){//金融服务部经理审批 + if ("Activity_1ckx8lq".equals(query.getTaskDefKey())) {//金融服务部经理审批 flowOrderVo.setShow(true); } } @@ -953,7 +953,7 @@ public class AppBusSalesOrderService { BigDecimal total = new BigDecimal("0"); for (BusSalesOrderTrailerDetailsVo datum : data) { AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); - BeanUtil.copyProperties(datum,appSalesOrderTrailerDetailsVo,"contractFile","certFile"); + BeanUtil.copyProperties(datum, appSalesOrderTrailerDetailsVo, "contractFile", "certFile"); List contractFile = datum.getContractFile(); List certFile = datum.getCertFile(); ArrayList contractFileString = new ArrayList<>(); @@ -980,17 +980,41 @@ public class AppBusSalesOrderService { return rb.success().setData(trailerVo); } - public ResultBean saveOrUpdateAppOrderTrailer(List dto) { - List busSalesOrderTrailerDtos = new ArrayList<>(); - for (AppSalesOrderTrailerDto appSalesOrderTrailerDto : dto) { - BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto(); - BeanUtil.copyProperties(appSalesOrderTrailerDto,busSalesOrderTrailerDto); - busSalesOrderTrailerDtos.add(busSalesOrderTrailerDto); - } - return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDtos); + public ResultBean saveOrUpdateAppOrderTrailer(AppSalesOrderTrailerDto dto) { + BusSalesOrderTrailerDto busSalesOrderTrailerDto = new BusSalesOrderTrailerDto(); + BeanUtil.copyProperties(dto, busSalesOrderTrailerDto); + return busSalesOrderTrailerFeign.save(busSalesOrderTrailerDto); } public ResultBean delAppOrderTrailerBySid(String sid) { return busSalesOrderTrailerFeign.delete(sid); } + + public ResultBean initAppOrderTrailer(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppSalesOrderTrailerDetailsVo appSalesOrderTrailerDetailsVo = new AppSalesOrderTrailerDetailsVo(); + BusSalesOrderTrailer busSalesOrderTrailer = busSalesOrderTrailerFeign.fetchBySid(sid).getData(); + BeanUtil.copyProperties(busSalesOrderTrailer, appSalesOrderTrailerDetailsVo); + List contractFiless = new ArrayList<>(); + List certFiless = new ArrayList<>(); + String certFile = busSalesOrderTrailer.getCertFile(); + if (StringUtils.isNotBlank(certFile)) { + String[] certFiles = certFile.split(","); + for (String file : certFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + certFiless.add(url); + } + } + String contractFile = busSalesOrderTrailer.getContractFile(); + if (StringUtils.isNotBlank(contractFile)) { + String[] contractFiles = contractFile.split(","); + for (String file : contractFiles) { + String url = fileUploadComponent.getUrlPrefix() + file; + contractFiless.add(url); + } + } + appSalesOrderTrailerDetailsVo.setCertFile(certFiless); + appSalesOrderTrailerDetailsVo.setContractFile(contractFiless); + return rb.success().setData(appSalesOrderTrailerDetailsVo); + } } \ No newline at end of file diff --git a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue index 2d64043bf0..362e3410d6 100644 --- a/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue +++ b/yxt-as-ui/src/views/basicinformation/additionitem/additionitem.vue @@ -52,11 +52,11 @@ - + -
项目名称
- +
*项目名称
+
拼音缩写
@@ -69,18 +69,18 @@
-
排序
- +
*排序
+
-
销售价
- +
*销售价
+
-
成本
- +
*成本
+
@@ -121,6 +121,12 @@ export default { createOrgSid: '', useOrgSid: '' }, + rules: { + aitemName: [{ required: true, message: '项目名称不能为空', trigger: 'blur' }], + price: [{ required: true, message: '销售价不能为空', trigger: 'blur' }], + sortNo: [{ required: true, message: '排序不能为空', trigger: 'blur' }], + cost: [{ required: true, message: '成本不能为空', trigger: 'blur' }], + }, btndisabled: false, btnList: [ { @@ -252,6 +258,9 @@ export default { }, toAdd() { this.dialogVisible = true + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) }, getNumber(val, limit) { val = val.replace(/[^0-9.]/g, '') // 保留数字 @@ -285,11 +294,15 @@ export default { getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => { if (res.success) { this.formobj.createOrgSid = res.data - req.saveOrUpdate(this.formobj).then((resp) => { - if (resp.success) { - this.$message({ showClose: true, type: 'success', message: '保存成功' }) - this.getList() - this.handleClose() + this.$refs['form_obj'].validate((valid) => { + if (valid) { + req.saveOrUpdate(this.formobj).then((resp) => { + if (resp.success) { + this.$message({ showClose: true, type: 'success', message: '保存成功' }) + this.getList() + this.handleClose() + } + }) } }) } @@ -354,6 +367,9 @@ export default { .addinputInfo { margin-left: 75px !important; } +/deep/ .el-form-item__error { + margin-left: 75px !important; +} .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw { margin-left: 75px !important; width: calc(100% - 70px); diff --git a/yxt-as-ui/src/views/basicinformation/profession/profession.vue b/yxt-as-ui/src/views/basicinformation/profession/profession.vue index 8509c26f3a..a1baa61ff2 100644 --- a/yxt-as-ui/src/views/basicinformation/profession/profession.vue +++ b/yxt-as-ui/src/views/basicinformation/profession/profession.vue @@ -160,7 +160,9 @@ export default { params: { orgPath: '', serviceTypeName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } } @@ -218,6 +220,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 @@ -244,7 +248,9 @@ export default { params: { orgPath: '', serviceTypeName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } this.getList() diff --git a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue index f7bf12613d..ce21e7f742 100644 --- a/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue +++ b/yxt-as-ui/src/views/basicinformation/setmeal/setmealAdd.vue @@ -12,7 +12,7 @@ -
*套餐名称
+
*套餐名称
@@ -211,7 +211,8 @@ export default { size: 2, total: 0, params: { - name: '' + name: '', + orgPath: '' } }, commodityData: [], diff --git a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue index 02e07afd90..e3a9c7431b 100644 --- a/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue +++ b/yxt-as-ui/src/views/basicinformation/subjects/subjects.vue @@ -154,7 +154,9 @@ export default { params: { orgPath: '', subjectName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } } @@ -212,6 +214,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 @@ -238,7 +242,9 @@ export default { params: { orgPath: '', subjectName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } this.getList() diff --git a/yxt-as-ui/src/views/basicinformation/team/team.vue b/yxt-as-ui/src/views/basicinformation/team/team.vue index 65effc4574..ff1bfde5ee 100644 --- a/yxt-as-ui/src/views/basicinformation/team/team.vue +++ b/yxt-as-ui/src/views/basicinformation/team/team.vue @@ -139,7 +139,9 @@ export default { params: { orgPath: '', groupName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } } @@ -197,6 +199,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 @@ -223,7 +227,9 @@ export default { params: { orgPath: '', groupName: '', - store: '' + store: '', + menuUrl: '', + userSid: '' } } this.getList()