From 69869b21d1c5d8eed8c319f8d21da78403edfaca Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 7 May 2024 14:35:35 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apiadmin/base/BaseSupplierInfoRest.java | 2 +- .../basesupplierinfo/BaseSupplierInfo.java | 4 ++ .../BaseSupplierInfoDetailsVo.java | 3 + .../basesupplierinfo/BaseSupplierInfoDto.java | 3 + .../pmssupplierinfo/PmsSupplierInfoDto.java | 3 +- .../PmsSupplierInfoService.java | 68 +++++++------------ .../yxtbase/supplier/BaseSupplierInfoDto.java | 3 + 7 files changed, 40 insertions(+), 46 deletions(-) diff --git a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java index ba36c8a33d..76ec333b69 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/apiadmin/base/BaseSupplierInfoRest.java @@ -51,7 +51,7 @@ import java.util.List; */ @Api(tags = "供应商信息") @RestController -@RequestMapping("/apiadmin/base/basesupplierinfo") +@RequestMapping("v1/basesupplierinfo") public class BaseSupplierInfoRest { @Autowired diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfo.java index c89cb37e92..ae79b6e2ac 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfo.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; + /** * Project: yxt-base(供应商管理)
* File: BaseSupplierInfo.java
@@ -102,6 +104,8 @@ public class BaseSupplierInfo extends BaseEntity { private String billingTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billingTypeValue; // 开票类型value + @ApiModelProperty("税率") + private BigDecimal taxRate; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java index 4bdb326393..1d5a7e35e7 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDetailsVo.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -106,6 +107,8 @@ public class BaseSupplierInfoDetailsVo implements Vo { private String billingTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billingTypeValue; // 开票类型value + @ApiModelProperty("税率") + private BigDecimal taxRate; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") diff --git a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java index 31b89cf81c..749c43edf2 100644 --- a/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java +++ b/yxt-base-biz/src/main/java/com/yxt/base/biz/base/basesupplierinfo/BaseSupplierInfoDto.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -106,6 +107,8 @@ public class BaseSupplierInfoDto implements Dto { private String billingTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billingTypeValue; // 开票类型value + @ApiModelProperty("税率") + private BigDecimal taxRate; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java index 7641fb0f76..f42a54f830 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssupplierinfo/PmsSupplierInfoDto.java @@ -33,6 +33,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; /** @@ -115,5 +116,5 @@ public class PmsSupplierInfoDto implements Dto { @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sid @ApiModelProperty("开户行信息") - private List pmsSupplierBankList; + private List pmsSupplierBankList = new ArrayList<>(); } \ No newline at end of file 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 20a22fb897..55453ea622 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 @@ -37,10 +37,14 @@ import com.yxt.pms.biz.pms.pmssupplierBank.PmsSupplierBankService; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; +import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierBankDto; +import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoDto; +import com.yxt.pms.feign.yxtbase.supplier.BaseSupplierInfoFeign; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; /** @@ -61,6 +65,8 @@ public class PmsSupplierInfoService extends MybatisBaseService listPageVo(PagerQuery pq) { PmsSupplierInfoQuery query = pq.getParams(); @@ -89,54 +95,28 @@ public class PmsSupplierInfoService extends MybatisBaseService pmsSupplierBankDtoList = dto.getPmsSupplierBankList(); - if (pmsSupplierBankDtoList == null || pmsSupplierBankDtoList.size() == 0){ - return rb.setMsg("开户行信息不能为空"); - } - if (StringUtils.isBlank(dtoSid)) { - String sid = this.insertByDto(dto); - for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankDtoList) { - pmsSupplierBankDto.setSupplierSid(sid); - pmsSupplierBankService.saveOrUpdateDto(pmsSupplierBankDto); - } - return rb.success(); - } - this.updateByDto(dto); - for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankDtoList) { - String bankSid = pmsSupplierBankDto.getSid(); - if(StringUtils.isNotBlank(bankSid)){ - PmsSupplierBank pmsSupplierBank = pmsSupplierBankService.fetchBySid(bankSid); - BeanUtil.copyProperties(pmsSupplierBankDto,pmsSupplierBank,"sid"); - pmsSupplierBank.setSupplierSid(dtoSid); - pmsSupplierBankService.updateById(pmsSupplierBank); - }else{ - PmsSupplierBank pmsSupplierBank = new PmsSupplierBank(); - BeanUtil.copyProperties(pmsSupplierBankDto,pmsSupplierBank,"sid"); - pmsSupplierBank.setSupplierSid(dtoSid); - pmsSupplierBankService.insert(pmsSupplierBank); - } + //获取pms下供应商开户行信息 + List pmsSupplierBankList = dto.getPmsSupplierBankList(); + //创建base下供应商信息对象 + BaseSupplierInfoDto baseSupplierInfoDto = new BaseSupplierInfoDto(); + //复制pms供应商信息到base供应商信息中 + BeanUtil.copyProperties(dto,baseSupplierInfoDto); + //创建base下供应商开户行信息list对象 + List baseSupplierBankDtos = new ArrayList<>(); + //循环pms下供应商开户行list对象 + for (PmsSupplierBankDto pmsSupplierBankDto : pmsSupplierBankList) { + //创建base下供应商开户行信息 + BaseSupplierBankDto baseSupplierBankDto = new BaseSupplierBankDto(); + //复制pms供应商开户行信息到base供应商开户行信息中 + BeanUtil.copyProperties(pmsSupplierBankDto,baseSupplierBankDto); + //添加base供应商开户行信息到base供应商开户行list对象中 + baseSupplierBankDtos.add(baseSupplierBankDto); } + baseSupplierInfoDto.setBaseSupplierBankList(baseSupplierBankDtos); + baseSupplierInfoFeign.save(baseSupplierInfoDto); return rb.success(); } - public String insertByDto(PmsSupplierInfoDto dto){ - PmsSupplierInfo entity = new PmsSupplierInfo(); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.insert(entity); - return entity.getSid(); - } - - public void updateByDto(PmsSupplierInfoDto dto){ - String dtoSid = dto.getSid(); - if (StringUtils.isBlank(dtoSid)) { - return; - } - PmsSupplierInfo entity = fetchBySid(dtoSid); - BeanUtil.copyProperties(dto, entity, "id", "sid"); - baseMapper.updateById(entity); - } - public PmsSupplierInfoDetailsVo fetchDetailsVoBySid(String sid){ PmsSupplierInfo entity = fetchBySid(sid); PmsSupplierInfoDetailsVo vo = new PmsSupplierInfoDetailsVo(); diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java index f913d83bdf..5cab63cc2c 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/yxtbase/supplier/BaseSupplierInfoDto.java @@ -32,6 +32,7 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.math.BigDecimal; import java.util.List; /** @@ -105,6 +106,8 @@ public class BaseSupplierInfoDto implements Dto { private String billingTypeKey; // 开票类型key @ApiModelProperty("开票类型value") private String billingTypeValue; // 开票类型value + @ApiModelProperty("税率") + private BigDecimal taxRate; @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid @ApiModelProperty("创建组织名称") From a81e78da93c3edddda84df87bc2a09d59e4e9aef Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 7 May 2024 15:03:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pms/apiadmin/pms/PmsSupplierTypeRest.java | 10 ++++ .../pmssuppliertype/PmsSupplierTypeDown.java | 54 +++++++++++++++++++ .../PmsSupplierTypeMapper.java | 3 ++ .../PmsSupplierTypeService.java | 8 +++ 4 files changed, 75 insertions(+) create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDown.java diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java index bab2185696..aea17241d2 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/apiadmin/pms/PmsSupplierTypeRest.java @@ -34,6 +34,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * Project: yxt-base(仓储基础信息供应商)
* File: BaseSupplierTypeFeignFallback.java
@@ -78,4 +80,12 @@ public class PmsSupplierTypeRest { baseSupplierTypeService.del(sids); return rb.success(); } + + @ApiOperation("获取供应商类型") + @PostMapping("/selSupplierType") + public ResultBean> selSupplierType(@RequestParam("orgPath") String orgPath){ + ResultBean rb = ResultBean.fireFail(); + List pmsSupplierTypeDowns = baseSupplierTypeService.selSupplierType(orgPath); + return rb.success().setData(pmsSupplierTypeDowns); + } } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDown.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDown.java new file mode 100644 index 0000000000..31ebb156a3 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeDown.java @@ -0,0 +1,54 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.pms.biz.pms.pmssuppliertype; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: yxt-base(仓储基础信息供应商)
+ * File: BaseSupplierTypeVo.java
+ * Class: com.yxt.anrui.as.api.pmssuppliertype.BaseSupplierTypeVo
+ * Description: 供应商类型 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2024-03-13 16:51:56
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +public class PmsSupplierTypeDown implements Vo { + + @ApiModelProperty("供应商类型名称") + private String supplierTypeName; + @ApiModelProperty("供应商类型编码") + private String supplierTypeCode; +} diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java index 4da13daf8e..1894711d6b 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeMapper.java @@ -53,4 +53,7 @@ public interface PmsSupplierTypeMapper extends BaseMapper { @Delete("delete from yxt_base.base_supplier_type where sid = #{sid}") void del(String sid); + + @Select("select * from yxt_base.base_supplier_type where createOrgSid = #{createOrgSid}") + List selSupplierType(String createOrgSid); } \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java index 50ce7c31d0..8811636989 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmssuppliertype/PmsSupplierTypeService.java @@ -41,6 +41,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; + /** * Project: yxt-base(仓储基础信息供应商)
* File: BaseSupplierTypeService.java
@@ -99,4 +101,10 @@ public class PmsSupplierTypeService extends MybatisBaseService selSupplierType(String orgPath) { + String createOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); + List pmsSupplierTypeDowns = baseMapper.selSupplierType(createOrgSid); + return pmsSupplierTypeDowns; + } } \ No newline at end of file From 07d09b244531bb2a975022a50a12d4396c19b793 Mon Sep 17 00:00:00 2001 From: guoxing <1369478551@qq.com> Date: Tue, 7 May 2024 15:09:59 +0800 Subject: [PATCH 3/5] 11111111 --- yxt-as-ui/src/api/goods/brand.js | 49 + yxt-as-ui/src/api/goods/category.js | 55 + yxt-as-ui/src/api/goods/factory.js | 48 + yxt-as-ui/src/api/goods/goods.js | 39 + yxt-as-ui/src/api/goods/unit.js | 49 + yxt-as-ui/src/api/storage/inOutStorage.js | 55 + yxt-as-ui/src/api/storage/inStorage.js | 22 + yxt-as-ui/src/api/storage/outStorage.js | 99 ++ yxt-as-ui/src/api/warehouse/goodsShelves.js | 41 + yxt-as-ui/src/api/warehouse/warehouse.js | 51 + yxt-as-ui/src/api/warehouse/warehouseArea.js | 49 + .../src/api/warehouse/warehouseAreaType.js | 51 + yxt-as-ui/src/router/index.js | 306 ++++- .../src/views/goods/brands/brandsAdd.vue | 282 ++++ yxt-as-ui/src/views/goods/brands/index.vue | 256 ++++ .../src/views/goods/category/categoryAdd.vue | 218 ++++ yxt-as-ui/src/views/goods/category/index.vue | 285 ++++ .../src/views/goods/factory/factoryAdd.vue | 175 +++ yxt-as-ui/src/views/goods/factory/index.vue | 261 ++++ yxt-as-ui/src/views/goods/goods/goodsAdd.vue | 1101 ++++++++++++++++ yxt-as-ui/src/views/goods/goods/goodsInfo.vue | 945 ++++++++++++++ yxt-as-ui/src/views/goods/goods/index.vue | 289 +++++ yxt-as-ui/src/views/goods/unit/index.vue | 245 ++++ yxt-as-ui/src/views/goods/unit/unitAdd.vue | 208 +++ .../src/views/storage/inOutStorage/index.vue | 396 ++++++ .../views/storage/inStorage/inStorageAdd.vue | 1143 +++++++++++++++++ .../views/storage/inStorage/inStorageInfo.vue | 308 +++++ .../src/views/storage/inStorage/index.vue | 241 ++++ .../storage/outStorage/distributionAdd.vue | 291 +++++ .../src/views/storage/outStorage/index.vue | 335 +++++ .../storage/outStorage/outStorageAdd.vue | 529 ++++++++ .../storage/outStorage/outStorageInfo.vue | 231 ++++ .../goodsShelves/goodsShelvesAdd.vue | 223 ++++ .../views/warehouse/goodsShelves/index.vue | 262 ++++ .../src/views/warehouse/warehouse/index.vue | 265 ++++ .../warehouse/warehouse/warehouseAdd.vue | 240 ++++ .../views/warehouse/warehouseArea/index.vue | 264 ++++ .../warehouseArea/warehouseAreaAdd.vue | 234 ++++ .../warehouse/warehouseAreaType/index.vue | 261 ++++ .../warehouseAreaTypeAdd.vue | 163 +++ 40 files changed, 10502 insertions(+), 63 deletions(-) create mode 100644 yxt-as-ui/src/api/goods/brand.js create mode 100644 yxt-as-ui/src/api/goods/category.js create mode 100644 yxt-as-ui/src/api/goods/factory.js create mode 100644 yxt-as-ui/src/api/goods/goods.js create mode 100644 yxt-as-ui/src/api/goods/unit.js create mode 100644 yxt-as-ui/src/api/storage/inOutStorage.js create mode 100644 yxt-as-ui/src/api/storage/inStorage.js create mode 100644 yxt-as-ui/src/api/storage/outStorage.js create mode 100644 yxt-as-ui/src/api/warehouse/goodsShelves.js create mode 100644 yxt-as-ui/src/api/warehouse/warehouse.js create mode 100644 yxt-as-ui/src/api/warehouse/warehouseArea.js create mode 100644 yxt-as-ui/src/api/warehouse/warehouseAreaType.js create mode 100644 yxt-as-ui/src/views/goods/brands/brandsAdd.vue create mode 100644 yxt-as-ui/src/views/goods/brands/index.vue create mode 100644 yxt-as-ui/src/views/goods/category/categoryAdd.vue create mode 100644 yxt-as-ui/src/views/goods/category/index.vue create mode 100644 yxt-as-ui/src/views/goods/factory/factoryAdd.vue create mode 100644 yxt-as-ui/src/views/goods/factory/index.vue create mode 100644 yxt-as-ui/src/views/goods/goods/goodsAdd.vue create mode 100644 yxt-as-ui/src/views/goods/goods/goodsInfo.vue create mode 100644 yxt-as-ui/src/views/goods/goods/index.vue create mode 100644 yxt-as-ui/src/views/goods/unit/index.vue create mode 100644 yxt-as-ui/src/views/goods/unit/unitAdd.vue create mode 100644 yxt-as-ui/src/views/storage/inOutStorage/index.vue create mode 100644 yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue create mode 100644 yxt-as-ui/src/views/storage/inStorage/inStorageInfo.vue create mode 100644 yxt-as-ui/src/views/storage/inStorage/index.vue create mode 100644 yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue create mode 100644 yxt-as-ui/src/views/storage/outStorage/index.vue create mode 100644 yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue create mode 100644 yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue create mode 100644 yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue create mode 100644 yxt-as-ui/src/views/warehouse/goodsShelves/index.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouse/index.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouseArea/index.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue create mode 100644 yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue diff --git a/yxt-as-ui/src/api/goods/brand.js b/yxt-as-ui/src/api/goods/brand.js new file mode 100644 index 0000000000..b8d23d5270 --- /dev/null +++ b/yxt-as-ui/src/api/goods/brand.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodsbrand/listPage', + method: 'post', + data: params, + }) + }, + + // 类别查询 + getAllBrand: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodsbrand/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveBrands: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodsbrand/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initBrands: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodsbrand/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/goods/category.js b/yxt-as-ui/src/api/goods/category.js new file mode 100644 index 0000000000..4523584fd0 --- /dev/null +++ b/yxt-as-ui/src/api/goods/category.js @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/listPage', + method: 'post', + data: params, + }) + }, + + // 类别查询 + getAllType: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable + }); + }, + + // 修改是否一品一码 + updateIsGoodsID: function(sid, isGoodsID) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID + }); + }, + + // 新增、保存 + saveTypes: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initTypes: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodstype/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/goods/factory.js b/yxt-as-ui/src/api/goods/factory.js new file mode 100644 index 0000000000..df6af06cff --- /dev/null +++ b/yxt-as-ui/src/api/goods/factory.js @@ -0,0 +1,48 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/basemanufacturer/listPage', + method: 'post', + data: params, + }) + }, + + // 厂家查询 + getAllFacturer: function(params) { + return request({ + url: '/wms/apiadmin/base/basemanufacturer/listAll', + method: 'get' + }) + }, + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveFacturer: function(data) { + return request({ + url: '/wms/apiadmin/base/basemanufacturer/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initFacturer: function(data) { + return request({ + url: '/wms/apiadmin/base/basemanufacturer/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/goods/goods.js b/yxt-as-ui/src/api/goods/goods.js new file mode 100644 index 0000000000..0fd74e5762 --- /dev/null +++ b/yxt-as-ui/src/api/goods/goods.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/listPage', + method: 'post', + data: params, + }) + }, + + // 修改是否可用状态 + updateIsEnable: function(sid, isEnable) { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable + }); + }, + + // 新增、保存 + saveGoods: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initGoods: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js new file mode 100644 index 0000000000..eb42b6d9d9 --- /dev/null +++ b/yxt-as-ui/src/api/goods/unit.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodsunit/listPage', + method: 'post', + data: params, + }) + }, + + // 单位查询 + getAllUnit: function(params) { + return request({ + url: '/wms/apiadmin/base/basegoodsunit/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveUnits: function(data) { + return request({ + url: '/wms/apiadmin/base/basegoodsunit/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initUnits: function(data) { + return request({ + url: '/base/basegoodsunit/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/storage/inOutStorage.js b/yxt-as-ui/src/api/storage/inOutStorage.js new file mode 100644 index 0000000000..403bc2f28c --- /dev/null +++ b/yxt-as-ui/src/api/storage/inOutStorage.js @@ -0,0 +1,55 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventoryrecord/pageList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 导出报表 + exportExcel: function(data) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventoryrecord/exportExcel', + method: 'post', + responseType: 'blob', // 表明返回服务器返回的数据类型 + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 选择供应商 + choiceSupplier: function(params) { + return request({ + url: '/wms/apiadmin/base/basesupplierinfo/choiceSupplierInfo', + method: 'post', + data: params, + }) + }, + + // 查询所有仓库 + getWarehouses: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/selectAll', + method: 'get' + }) + }, + + // 根据仓库查询库位 + getWarehouseareas: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/selectAll', + method: 'get', + data: data, + }); + }, +} diff --git a/yxt-as-ui/src/api/storage/inStorage.js b/yxt-as-ui/src/api/storage/inStorage.js new file mode 100644 index 0000000000..f77ed8ce26 --- /dev/null +++ b/yxt-as-ui/src/api/storage/inStorage.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/inventory/wmsinventorybill/listPage', + method: 'post', + data: params, + }) + }, + + + // 选择商品列表 + getAllGoods: function(params) { + return request({ + url: '/base/basegoodssku/getSelectList', + method: 'get' + }) + }, +} diff --git a/yxt-as-ui/src/api/storage/outStorage.js b/yxt-as-ui/src/api/storage/outStorage.js new file mode 100644 index 0000000000..1ef43dd62e --- /dev/null +++ b/yxt-as-ui/src/api/storage/outStorage.js @@ -0,0 +1,99 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsOutBill/listPage', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 详情初始化 + init: function(data) { + return request({ + url: '/wms/apiadmin/WmsOutBill/details', + method: 'get', + data: data + }); + }, + + // 初始配货单 + initDistribution: function(data) { + return request({ + url: '/wms/apiadmin/WmsDistributeBill/getInit', + method: 'get', + data: data + }); + }, + + + // 新增、保存 + save: function(data) { + return request({ + url: '/wms/apiadmin/WmsOutBill/saveOrUpdateOutBill', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + // 确认 + submit: function(data) { + return request({ + url: '/wms/apiadmin/WmsOutBill/confirm', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + + + // 新增、保存 配货单 + saveDistribution: function(data) { + return request({ + url: '/wms/apiadmin/WmsDistributeBill/saveOrUpdateBill', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + deleteBySids: function(data) { + return request({ + url: '/wms/apiadmin/WmsShelfBill/delBySids', + method: 'DELETE', + data: data, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + + // 查询分页列表 + getGoodsListPage: function(params) { + return request({ + url: '/wms/apiadmin/WmsOutBill/getInventoryList', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) + }, + +} diff --git a/yxt-as-ui/src/api/warehouse/goodsShelves.js b/yxt-as-ui/src/api/warehouse/goodsShelves.js new file mode 100644 index 0000000000..1c8bb37858 --- /dev/null +++ b/yxt-as-ui/src/api/warehouse/goodsShelves.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/listPage', + method: 'post', + data: params, + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveGoodsShelves: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initGoodsShelves: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouserack/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/warehouse/warehouse.js b/yxt-as-ui/src/api/warehouse/warehouse.js new file mode 100644 index 0000000000..390f74dd77 --- /dev/null +++ b/yxt-as-ui/src/api/warehouse/warehouse.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/listPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + + // 仓库查询 + getAllWarehouse: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/updateStatus/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveWarehouse: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/saveOrUpdate', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }); + }, + + // 初始化 + initWarehouse: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseinfo/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/warehouse/warehouseArea.js b/yxt-as-ui/src/api/warehouse/warehouseArea.js new file mode 100644 index 0000000000..afff3cea2c --- /dev/null +++ b/yxt-as-ui/src/api/warehouse/warehouseArea.js @@ -0,0 +1,49 @@ +import request from '@/utils/request' + +export default { + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/listPage', + method: 'post', + data: params, + }) + }, + + // 库区查询 + getAllWarehousearea: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveWarehousearea: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initWarehousearea: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehousearea/initialization/' + data, + method: 'get' + }); + }, + + +} diff --git a/yxt-as-ui/src/api/warehouse/warehouseAreaType.js b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js new file mode 100644 index 0000000000..6ecf1e569a --- /dev/null +++ b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js @@ -0,0 +1,51 @@ +import request from '@/utils/request' + +export default { + + + // 查询分页列表 + listPage: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/listPage', + method: 'post', + data: params, + }) + }, + + // 库位查询 + getAllWarehouseareatype: function(params) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/listAll', + method: 'get' + }) + }, + + + // 修改是否可用状态 + updateIsEnable: function(sid,isEnable) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/updateIsEnable/'+sid+"/"+isEnable + }); + }, + + + // 新增、保存 + saveWarehousearea: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/saveOrUpdate', + method: 'post', + data: data + }); + }, + + // 初始化 + initWarehousearea: function(data) { + return request({ + url: '/wms/apiadmin/base/wmswarehouseareatype/initialization/' + data, + method: 'get' + }); + }, + + + +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index dbca01d881..dcf3a97a2a 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -7,8 +7,7 @@ Vue.use(Router) import Layout from '@/layout' /* 所有角色可以访问/没有权限要求的基页 */ -export const constantRoutes = [ - { +export const constantRoutes = [{ path: '/redirect', component: Layout, hidden: true, @@ -17,26 +16,26 @@ export const constantRoutes = [ component: () => import('@/views/redirect/index.vue') }] }, - { - path: '/', - redirect: 'index' - }, - { - path: '/index', - component: Layout, - redirect: '/index', - children: [{ - path: '/index', - component: () => - import('@/views/index.vue'), - name: 'index', - meta: { - title: '主页', - noCache: true, - affix: true - } - }] - }, + { + path: '/', + redirect: 'index' + }, + { + path: '/index', + component: Layout, + redirect: '/index', + children: [{ + path: '/index', + component: () => + import('@/views/index.vue'), + name: 'index', + meta: { + title: '主页', + noCache: true, + affix: true + } + }] + }, { path: '/404', component: () => @@ -50,48 +49,68 @@ export const constantRoutes = [ meta: { title: '业务' }, - children: [ - { + children: [{ path: '/preregistration/preregistration', component: () => import('@/views/operation/preregistration/preregistration.vue'), name: 'Preregistration', - meta: { title: '预约登记', noCache: true } + meta: { + title: '预约登记', + noCache: true + } }, { path: '/repairbill/repairbill', component: () => import('@/views/operation/repairbill/repairbill.vue'), name: 'RepairBill', - meta: { title: '维修开单管理(登记)', noCache: true } + meta: { + title: '维修开单管理(登记)', + noCache: true + } }, { path: '/repairbill/repairbillBySendWork', component: () => import('@/views/operation/repairbill/repairbillBySendWork.vue'), name: 'RepairBillBySendWork', - meta: { title: '维修开单管理(派工)', noCache: true } + meta: { + title: '维修开单管理(派工)', + noCache: true + } }, { path: '/repairbill/repairbillByMaintain', component: () => import('@/views/operation/repairbill/repairbillByMaintain.vue'), name: 'RepairBillByMaintain', - meta: { title: '维修开单管理(维修)', noCache: true } + meta: { + title: '维修开单管理(维修)', + noCache: true + } }, { path: '/repairbill/repairbillByBeCompleted', component: () => import('@/views/operation/repairbill/repairbillByBeCompleted.vue'), name: 'RepairBillByBeCompleted', - meta: { title: '维修开单管理(竣工)', noCache: true } + meta: { + title: '维修开单管理(竣工)', + noCache: true + } }, { path: '/repairbill/repairbillBySettleAccounts', component: () => import('@/views/operation/repairbill/repairbillBySettleAccounts.vue'), name: 'RepairBillBySettleAccounts', - meta: { title: '维修开单管理(结算)', noCache: true } + meta: { + title: '维修开单管理(结算)', + noCache: true + } }, { path: '/repairbill/repairbillBYLeaveFactory', component: () => import('@/views/operation/repairbill/repairbillBYLeaveFactory.vue'), name: 'RepairBillBYLeaveFactory', - meta: { title: '维修开单管理(出厂)', noCache: true } + meta: { + title: '维修开单管理(出厂)', + noCache: true + } }, // { // path: '/workslrsettlement/workslrsettlement', @@ -101,7 +120,107 @@ export const constantRoutes = [ // }, ] }, + { + path: '/operation', + component: Layout, + redirect: '/operation', + meta: { + title: '仓库管理' + }, + children: [{ + path: '/goodsShelves/index', + component: () => import('@/views/warehouse/goodsShelves/index.vue'), + name: 'GoodsShelves', + meta: { + title: '库位管理', + noCache: true + } + }, + { + path: '/warehouseArea/index', + component: () => import('@/views/warehouse/warehouseArea/index.vue'), + name: 'WarehouseArea', + meta: { + title: '库区管理', + noCache: true + } + }, + { + path: '/warehouseAreaType/index', + component: () => import('@/views/warehouse/warehouseAreaType/index.vue'), + name: 'WarehouseAreaType', + meta: { + title: '库区类型管理', + noCache: true + } + }, + { + path: '/warehouse/index', + component: () => import('@/views/warehouse/warehouse/index.vue'), + name: 'Warehouse', + meta: { + title: '仓库管理', + noCache: true + } + }, + + ] + }, + { + path: '/goods', + component: Layout, + redirect: '/goods', + meta: { + title: '商品管理' + }, + children: [{ + path: '/brands/index', + component: () => import('@/views/goods/brands/index.vue'), + name: 'Brands', + meta: { + title: '品牌管理', + noCache: true + } + }, + { + path: '/category/index', + component: () => import('@/views/goods/category/index.vue'), + name: 'Category', + meta: { + title: '类别管理', + noCache: true + } + }, + { + path: '/factory/index', + component: () => import('@/views/goods/factory/index.vue'), + name: 'Factory', + meta: { + title: '厂家管理', + noCache: true + } + }, + { + path: '/goods/index', + component: () => import('@/views/goods/goods/index.vue'), + name: 'Goods', + meta: { + title: '商品管理', + noCache: true + } + }, + { + path: '/unit/index', + component: () => import('@/views/goods/unit/index.vue'), + name: 'Unit', + meta: { + title: '单位管理', + noCache: true + } + }, + ] + }, { path: '/storage', component: Layout, @@ -109,18 +228,32 @@ export const constantRoutes = [ meta: { title: '仓储' }, - children: [ + children: [{ + path: 'outStorage', + name: 'outStorage', + component: () => import('@/views/storage/outStorage/index'), + meta: { + title: '出库管理', + noCache: true + } + }, { path: '/inventory/inventory', component: () => import('@/views/storage/inventory/inventory.vue'), name: 'Inventory', - meta: { title: '库存查询', noCache: true } + meta: { + title: '库存查询', + noCache: true + } }, { path: '/inventory/inventoryRefer', component: () => import('@/views/storage/inventory/inventoryRefer.vue'), name: 'InventoryRefer', - meta: { title: '出入库查询', noCache: true } + meta: { + title: '出入库查询', + noCache: true + } }, { path: '/stocktaking/index', @@ -231,18 +364,23 @@ export const constantRoutes = [ meta: { title: '采购' }, - children: [ - { + children: [{ path: '/procurement/procurement', component: () => import('@/views/purchase/procurement/procurement.vue'), name: 'Procurement', - meta: { title: '采购开单', noCache: true } + meta: { + title: '采购开单', + noCache: true + } }, { path: '/purchasereturn/purchasereturn', component: () => import('@/views/purchase/purchasereturn/purchasereturn.vue'), name: 'PurchaseReturn', - meta: { title: '采购退货', noCache: true } + meta: { + title: '采购退货', + noCache: true + } } ] }, @@ -253,48 +391,68 @@ export const constantRoutes = [ meta: { title: '报表' }, - children: [ - { + children: [{ path: '/salesstatement/merchandisesalesdetail', component: () => import('@/views/statement/salesstatement/merchandisesalesdetail.vue'), name: 'MerchandiseSalesDetail', - meta: { title: '销售明细商品', noCache: true } + meta: { + title: '销售明细商品', + noCache: true + } }, { path: '/salesstatement/merchandisesalessummary', component: () => import('@/views/statement/salesstatement/merchandisesalessummary.vue'), name: 'MerchandiseSalesSummary', - meta: { title: '销售汇总商品', noCache: true } + meta: { + title: '销售汇总商品', + noCache: true + } }, { path: '/salesstatement/salestrendreport', component: () => import('@/views/statement/salesstatement/salestrendreport.vue'), name: 'SalesTrendReport', - meta: { title: '销售价趋势报表', noCache: true } + meta: { + title: '销售价趋势报表', + noCache: true + } }, { path: '/warehousereport/inventorystatistics', component: () => import('@/views/statement/warehousereport/inventorystatistics.vue'), name: 'InventoryStatistics', - meta: { title: '库存统计', noCache: true } + meta: { + title: '库存统计', + noCache: true + } }, { path: '/warehousereport/receiptandreceiptrecord', component: () => import('@/views/statement/warehousereport/receiptandreceiptrecord.vue'), name: 'ReceiptAndReceiptRecord', - meta: { title: '收发存明细报表', noCache: true } + meta: { + title: '收发存明细报表', + noCache: true + } }, { path: '/purchasereport/detailedpurchasereport', component: () => import('@/views/statement/purchasereport/detailedpurchasereport.vue'), name: 'DetailedPurchaseReport', - meta: { title: '采购明细报表', noCache: true } + meta: { + title: '采购明细报表', + noCache: true + } }, { path: '/purchasereport/purchasesummaryreport', component: () => import('@/views/statement/purchasereport/purchasesummaryreport.vue'), name: 'PurchaseSummaryReport', - meta: { title: '采购汇总报表', noCache: true } + meta: { + title: '采购汇总报表', + noCache: true + } } ] }, @@ -305,48 +463,68 @@ export const constantRoutes = [ meta: { title: '基础信息' }, - children: [ - { + children: [{ path: '/maintenanceitem/maintenanceitem', component: () => import('@/views/basicinformation/maintenanceitem/maintenanceitem.vue'), name: 'MaintenanceItem', - meta: { title: '维修项目管理', noCache: true } + meta: { + title: '维修项目管理', + noCache: true + } }, { path: '/additionitem/additionitem', component: () => import('@/views/basicinformation/additionitem/additionitem.vue'), name: 'AdditionItem', - meta: { title: '附加项目管理', noCache: true } + meta: { + title: '附加项目管理', + noCache: true + } }, { path: '/setmeal/setmeal', component: () => import('@/views/basicinformation/setmeal/setmeal.vue'), name: 'Setmeal', - meta: { title: '套餐管理', noCache: true } + meta: { + title: '套餐管理', + noCache: true + } }, { path: '/profession/profession', component: () => import('@/views/basicinformation/profession/profession.vue'), name: 'Profession', - meta: { title: '工种管理', noCache: true } + meta: { + title: '工种管理', + noCache: true + } }, { path: '/subjects/subjects', component: () => import('@/views/basicinformation/subjects/subjects.vue'), name: 'Subjects', - meta: { title: '科目管理', noCache: true } + meta: { + title: '科目管理', + noCache: true + } }, { path: '/team/team', component: () => import('@/views/basicinformation/team/team.vue'), name: 'Team', - meta: { title: '班组管理', noCache: true } + meta: { + title: '班组管理', + noCache: true + } }, { path: '/suppliertype/suppliertype', component: () => import('@/views/basicinformation/suppliertype/suppliertype.vue'), name: 'SupplierType', - meta: { title: '供应商类型管理', noCache: true } + meta: { + title: '供应商类型管理', + noCache: true + } }, // { // path: '/supplier/supplier', @@ -356,22 +534,24 @@ export const constantRoutes = [ // } ] }, - // 404 page must be placed at the end !!! - // { path: '*', redirect: '/404', hidden: true } + // 404 page must be placed at the end !!! + // { path: '*', redirect: '/404', hidden: true } ] const createRouter = () => new Router({ - // mode: 'history', // require service support - scrollBehavior: () => ({ y: 0 }), - routes: constantRoutes + // mode: 'history', // require service support + scrollBehavior: () => ({ + y: 0 + }), + routes: constantRoutes }) const router = createRouter() // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465 export function resetRouter() { - const newRouter = createRouter() - router.matcher = newRouter.matcher // reset router + const newRouter = createRouter() + router.matcher = newRouter.matcher // reset router } export default router diff --git a/yxt-as-ui/src/views/goods/brands/brandsAdd.vue b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue new file mode 100644 index 0000000000..75c4756677 --- /dev/null +++ b/yxt-as-ui/src/views/goods/brands/brandsAdd.vue @@ -0,0 +1,282 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/brands/index.vue b/yxt-as-ui/src/views/goods/brands/index.vue new file mode 100644 index 0000000000..a63f06b1aa --- /dev/null +++ b/yxt-as-ui/src/views/goods/brands/index.vue @@ -0,0 +1,256 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/category/categoryAdd.vue b/yxt-as-ui/src/views/goods/category/categoryAdd.vue new file mode 100644 index 0000000000..4fe3f2a1e0 --- /dev/null +++ b/yxt-as-ui/src/views/goods/category/categoryAdd.vue @@ -0,0 +1,218 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/category/index.vue b/yxt-as-ui/src/views/goods/category/index.vue new file mode 100644 index 0000000000..710a106e4f --- /dev/null +++ b/yxt-as-ui/src/views/goods/category/index.vue @@ -0,0 +1,285 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/factory/factoryAdd.vue b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue new file mode 100644 index 0000000000..6cbabb4b99 --- /dev/null +++ b/yxt-as-ui/src/views/goods/factory/factoryAdd.vue @@ -0,0 +1,175 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/factory/index.vue b/yxt-as-ui/src/views/goods/factory/index.vue new file mode 100644 index 0000000000..7bd36663ad --- /dev/null +++ b/yxt-as-ui/src/views/goods/factory/index.vue @@ -0,0 +1,261 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/goods/goodsAdd.vue b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue new file mode 100644 index 0000000000..d2bb507b42 --- /dev/null +++ b/yxt-as-ui/src/views/goods/goods/goodsAdd.vue @@ -0,0 +1,1101 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/goods/goodsInfo.vue b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue new file mode 100644 index 0000000000..cb54f3debc --- /dev/null +++ b/yxt-as-ui/src/views/goods/goods/goodsInfo.vue @@ -0,0 +1,945 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/goods/index.vue b/yxt-as-ui/src/views/goods/goods/index.vue new file mode 100644 index 0000000000..ffd2d1adcb --- /dev/null +++ b/yxt-as-ui/src/views/goods/goods/index.vue @@ -0,0 +1,289 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/unit/index.vue b/yxt-as-ui/src/views/goods/unit/index.vue new file mode 100644 index 0000000000..bd142e5b43 --- /dev/null +++ b/yxt-as-ui/src/views/goods/unit/index.vue @@ -0,0 +1,245 @@ + + + + diff --git a/yxt-as-ui/src/views/goods/unit/unitAdd.vue b/yxt-as-ui/src/views/goods/unit/unitAdd.vue new file mode 100644 index 0000000000..b83a328752 --- /dev/null +++ b/yxt-as-ui/src/views/goods/unit/unitAdd.vue @@ -0,0 +1,208 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/inOutStorage/index.vue b/yxt-as-ui/src/views/storage/inOutStorage/index.vue new file mode 100644 index 0000000000..b2212efe41 --- /dev/null +++ b/yxt-as-ui/src/views/storage/inOutStorage/index.vue @@ -0,0 +1,396 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue new file mode 100644 index 0000000000..46d75e8666 --- /dev/null +++ b/yxt-as-ui/src/views/storage/inStorage/inStorageAdd.vue @@ -0,0 +1,1143 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/inStorage/inStorageInfo.vue b/yxt-as-ui/src/views/storage/inStorage/inStorageInfo.vue new file mode 100644 index 0000000000..a2f2abed83 --- /dev/null +++ b/yxt-as-ui/src/views/storage/inStorage/inStorageInfo.vue @@ -0,0 +1,308 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/inStorage/index.vue b/yxt-as-ui/src/views/storage/inStorage/index.vue new file mode 100644 index 0000000000..5574cd0312 --- /dev/null +++ b/yxt-as-ui/src/views/storage/inStorage/index.vue @@ -0,0 +1,241 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue b/yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue new file mode 100644 index 0000000000..468a191c42 --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/distributionAdd.vue @@ -0,0 +1,291 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/index.vue b/yxt-as-ui/src/views/storage/outStorage/index.vue new file mode 100644 index 0000000000..aad61858cd --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/index.vue @@ -0,0 +1,335 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue new file mode 100644 index 0000000000..b71ee5c56b --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/outStorageAdd.vue @@ -0,0 +1,529 @@ + + + + diff --git a/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue b/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue new file mode 100644 index 0000000000..2df4b5482a --- /dev/null +++ b/yxt-as-ui/src/views/storage/outStorage/outStorageInfo.vue @@ -0,0 +1,231 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue new file mode 100644 index 0000000000..57e9704401 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/goodsShelvesAdd.vue @@ -0,0 +1,223 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue new file mode 100644 index 0000000000..af7f9b2607 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/goodsShelves/index.vue @@ -0,0 +1,262 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouse/index.vue b/yxt-as-ui/src/views/warehouse/warehouse/index.vue new file mode 100644 index 0000000000..9a4851724f --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouse/index.vue @@ -0,0 +1,265 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue new file mode 100644 index 0000000000..7331b206f2 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouse/warehouseAdd.vue @@ -0,0 +1,240 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue new file mode 100644 index 0000000000..8f81b6f152 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/index.vue @@ -0,0 +1,264 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue new file mode 100644 index 0000000000..775b3823e2 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouseArea/warehouseAreaAdd.vue @@ -0,0 +1,234 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue b/yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue new file mode 100644 index 0000000000..aded094c30 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouseAreaType/index.vue @@ -0,0 +1,261 @@ + + + + diff --git a/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue new file mode 100644 index 0000000000..40249cb071 --- /dev/null +++ b/yxt-as-ui/src/views/warehouse/warehouseAreaType/warehouseAreaTypeAdd.vue @@ -0,0 +1,163 @@ + + + + From c82a3f6537aee86fbd53420228621cdc9be5fd58 Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Tue, 7 May 2024 15:24:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=94=B6=E6=AC=BE=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E9=AA=8C=E8=AF=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinCollectionConfirmationService.java | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java index 3cc353b1e5..d9b5b09e98 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java @@ -1329,13 +1329,13 @@ public class FinCollectionConfirmationService extends MybatisBaseService Date: Tue, 7 May 2024 15:54:53 +0800 Subject: [PATCH 5/5] 11111 --- yxt-as-ui/src/api/goods/brand.js | 18 +++++++++++------ yxt-as-ui/src/api/goods/category.js | 20 ++++++++++++------- yxt-as-ui/src/api/goods/factory.js | 18 +++++++++++------ yxt-as-ui/src/api/goods/goods.js | 16 ++++++++++----- yxt-as-ui/src/api/goods/unit.js | 16 ++++++++++----- yxt-as-ui/src/api/warehouse/goodsShelves.js | 8 +++++++- yxt-as-ui/src/api/warehouse/warehouse.js | 5 ++++- yxt-as-ui/src/api/warehouse/warehouseArea.js | 13 ++++++++++-- .../src/api/warehouse/warehouseAreaType.js | 13 ++++++++++-- 9 files changed, 92 insertions(+), 35 deletions(-) diff --git a/yxt-as-ui/src/api/goods/brand.js b/yxt-as-ui/src/api/goods/brand.js index b8d23d5270..169ea82ca7 100644 --- a/yxt-as-ui/src/api/goods/brand.js +++ b/yxt-as-ui/src/api/goods/brand.js @@ -5,16 +5,19 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodsbrand/listPage', + url: '/yxtbase/apiadmin/base/basegoodsbrand/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, // 类别查询 getAllBrand: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodsbrand/listAll', + url: '/yxtbase/apiadmin/base/basegoodsbrand/listAll', method: 'get' }) }, @@ -23,7 +26,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable + url: '/yxtbase/apiadmin/base/basegoodsbrand/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -31,16 +34,19 @@ export default { // 新增、保存 saveBrands: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodsbrand/saveOrUpdate', + url: '/yxtbase/apiadmin/base/basegoodsbrand/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, // 初始化 initBrands: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodsbrand/initialization/' + data, + url: '/yxtbase/apiadmin/base/basegoodsbrand/initialization/' + data, method: 'get' }); }, diff --git a/yxt-as-ui/src/api/goods/category.js b/yxt-as-ui/src/api/goods/category.js index 4523584fd0..4c4156f338 100644 --- a/yxt-as-ui/src/api/goods/category.js +++ b/yxt-as-ui/src/api/goods/category.js @@ -5,16 +5,19 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodstype/listPage', + url: '/yxtbase/apiadmin/base/basegoodstype/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, // 类别查询 getAllType: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodstype/listAll', + url: '/yxtbase/apiadmin/base/basegoodstype/listAll', method: 'get' }) }, @@ -23,30 +26,33 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid, isEnable) { return request({ - url: '/wms/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable + url: '/yxtbase/apiadmin/base/basegoodstype/updateIsEnable/' + sid + "/" + isEnable }); }, // 修改是否一品一码 updateIsGoodsID: function(sid, isGoodsID) { return request({ - url: '/wms/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID + url: '/yxtbase/apiadmin/base/basegoodstype/updateIsGoodsID/' + sid + "/" + isGoodsID }); }, // 新增、保存 saveTypes: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodstype/saveOrUpdate', + url: '/yxtbase/apiadmin/base/basegoodstype/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, // 初始化 initTypes: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodstype/initialization/' + data, + url: '/yxtbase/apiadmin/base/basegoodstype/initialization/' + data, method: 'get' }); }, diff --git a/yxt-as-ui/src/api/goods/factory.js b/yxt-as-ui/src/api/goods/factory.js index df6af06cff..71facdeb5b 100644 --- a/yxt-as-ui/src/api/goods/factory.js +++ b/yxt-as-ui/src/api/goods/factory.js @@ -5,16 +5,19 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/basemanufacturer/listPage', + url: '/yxtbase/apiadmin/base/basemanufacturer/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, // 厂家查询 getAllFacturer: function(params) { return request({ - url: '/wms/apiadmin/base/basemanufacturer/listAll', + url: '/yxtbase/apiadmin/base/basemanufacturer/listAll', method: 'get' }) }, @@ -22,7 +25,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable + url: '/yxtbase/apiadmin/base/basemanufacturer/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -30,16 +33,19 @@ export default { // 新增、保存 saveFacturer: function(data) { return request({ - url: '/wms/apiadmin/base/basemanufacturer/saveOrUpdate', + url: '/yxtbase/apiadmin/base/basemanufacturer/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, // 初始化 initFacturer: function(data) { return request({ - url: '/wms/apiadmin/base/basemanufacturer/initialization/' + data, + url: '/yxtbase/apiadmin/base/basemanufacturer/initialization/' + data, method: 'get' }); }, diff --git a/yxt-as-ui/src/api/goods/goods.js b/yxt-as-ui/src/api/goods/goods.js index 0fd74e5762..1dd709d78d 100644 --- a/yxt-as-ui/src/api/goods/goods.js +++ b/yxt-as-ui/src/api/goods/goods.js @@ -5,32 +5,38 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodsspu/listPage', + url: '/yxtbase/apiadmin/base/basegoodsspu/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, // 修改是否可用状态 updateIsEnable: function(sid, isEnable) { return request({ - url: '/wms/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable + url: '/yxtbase/apiadmin/base/basegoodsspu/updateIsEnable/' + sid + "/" + isEnable }); }, // 新增、保存 saveGoods: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodsspu/saveOrUpdate', + url: '/yxtbase/apiadmin/base/basegoodsspu/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, // 初始化 initGoods: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodsspu/initialization/' + data, + url: '/yxtbase/apiadmin/base/basegoodsspu/initialization/' + data, method: 'get' }); }, diff --git a/yxt-as-ui/src/api/goods/unit.js b/yxt-as-ui/src/api/goods/unit.js index eb42b6d9d9..8795c0b363 100644 --- a/yxt-as-ui/src/api/goods/unit.js +++ b/yxt-as-ui/src/api/goods/unit.js @@ -5,16 +5,19 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodsunit/listPage', + url: '/yxtbase/apiadmin/base/basegoodsunit/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, // 单位查询 getAllUnit: function(params) { return request({ - url: '/wms/apiadmin/base/basegoodsunit/listAll', + url: '/yxtbase/apiadmin/base/basegoodsunit/listAll', method: 'get' }) }, @@ -23,7 +26,7 @@ export default { // 修改是否可用状态 updateIsEnable: function(sid,isEnable) { return request({ - url: '/wms/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable + url: '/yxtbase/apiadmin/base/basegoodsunit/updateIsEnable/'+sid+"/"+isEnable }); }, @@ -31,9 +34,12 @@ export default { // 新增、保存 saveUnits: function(data) { return request({ - url: '/wms/apiadmin/base/basegoodsunit/saveOrUpdate', + url: '/yxtbase/apiadmin/base/basegoodsunit/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, diff --git a/yxt-as-ui/src/api/warehouse/goodsShelves.js b/yxt-as-ui/src/api/warehouse/goodsShelves.js index 1c8bb37858..c7b64fa867 100644 --- a/yxt-as-ui/src/api/warehouse/goodsShelves.js +++ b/yxt-as-ui/src/api/warehouse/goodsShelves.js @@ -8,6 +8,9 @@ export default { url: '/wms/apiadmin/base/wmswarehouserack/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, @@ -25,7 +28,10 @@ export default { return request({ url: '/wms/apiadmin/base/wmswarehouserack/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, diff --git a/yxt-as-ui/src/api/warehouse/warehouse.js b/yxt-as-ui/src/api/warehouse/warehouse.js index 390f74dd77..875d9917ee 100644 --- a/yxt-as-ui/src/api/warehouse/warehouse.js +++ b/yxt-as-ui/src/api/warehouse/warehouse.js @@ -16,7 +16,10 @@ export default { getAllWarehouse: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseinfo/listAll', - method: 'get' + method: 'get', + headers: { + 'Content-Type': 'application/json' + } }) }, diff --git a/yxt-as-ui/src/api/warehouse/warehouseArea.js b/yxt-as-ui/src/api/warehouse/warehouseArea.js index afff3cea2c..9a9f2c477b 100644 --- a/yxt-as-ui/src/api/warehouse/warehouseArea.js +++ b/yxt-as-ui/src/api/warehouse/warehouseArea.js @@ -8,6 +8,9 @@ export default { url: '/wms/apiadmin/base/wmswarehousearea/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, @@ -15,7 +18,10 @@ export default { getAllWarehousearea: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehousearea/listAll', - method: 'get' + method: 'get', + headers: { + 'Content-Type': 'application/json' + } }) }, @@ -33,7 +39,10 @@ export default { return request({ url: '/wms/apiadmin/base/wmswarehousearea/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, diff --git a/yxt-as-ui/src/api/warehouse/warehouseAreaType.js b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js index 6ecf1e569a..f147b7ea4e 100644 --- a/yxt-as-ui/src/api/warehouse/warehouseAreaType.js +++ b/yxt-as-ui/src/api/warehouse/warehouseAreaType.js @@ -9,6 +9,9 @@ export default { url: '/wms/apiadmin/base/wmswarehouseareatype/listPage', method: 'post', data: params, + headers: { + 'Content-Type': 'application/json' + } }) }, @@ -16,7 +19,10 @@ export default { getAllWarehouseareatype: function(params) { return request({ url: '/wms/apiadmin/base/wmswarehouseareatype/listAll', - method: 'get' + method: 'get', + headers: { + 'Content-Type': 'application/json' + } }) }, @@ -34,7 +40,10 @@ export default { return request({ url: '/wms/apiadmin/base/wmswarehouseareatype/saveOrUpdate', method: 'post', - data: data + data: data, + headers: { + 'Content-Type': 'application/json' + } }); },