Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 3 years ago
parent
commit
7a3b796619
  1. 30
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java
  2. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java
  3. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java
  4. 3
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java
  5. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java
  6. 5
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java
  7. 33
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
  8. 1
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml
  9. 4
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml
  10. 3
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml
  11. 2
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java
  12. 189
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml
  13. 8
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java
  14. 1
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml
  15. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java
  16. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java
  17. 120
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java
  18. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java
  19. 8
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  20. 1
      anrui-scm/anrui-scm-ui/src/api/portal/Upload.js
  21. 50
      anrui-scm/anrui-scm-ui/src/api/supplychain/yanchejiancha.js
  22. 1
      anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue
  23. 229
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejiancha.vue
  24. 2
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  25. 17
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue
  26. 32
      anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue
  27. 301
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue
  28. 303
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue
  29. 201
      anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue
  30. 2
      anrui-system-ui/src/api/system/departments/departments.js
  31. 58
      anrui-system-ui/src/views/organizationManage/organizationManage.vue

30
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelconfig/BaseModelConfigVo.java

@ -25,8 +25,8 @@ public class BaseModelConfigVo implements Vo {
@ApiModelProperty(value = "常用配置sid")
private String sid;
/* @ApiModelProperty("车型配置代码(陕汽必须的字段)")
private String vehicleCode;*/
/* @ApiModelProperty("车型配置代码(陕汽必须的字段)")
private String vehicleCode;*/
@ApiModelProperty("车身颜色key")
private String carColorKey;
@ApiModelProperty("车身颜色(陕汽必须的字段)")
@ -61,18 +61,18 @@ public class BaseModelConfigVo implements Vo {
private String airConditioner;
@ApiModelProperty("其他配置")
private String otherConfig;
/* @ApiModelProperty("彩色仪表盘(是、否)")
private String isColorPanel;
@ApiModelProperty("基础单位")
private String basedUnit;
@ApiModelProperty("公司指导价(陕汽必须的字段)")
private String companyGuidePrice;*/
/* @ApiModelProperty("彩色仪表盘(是、否)")
private String isColorPanel;
@ApiModelProperty("基础单位")
private String basedUnit;
@ApiModelProperty("公司指导价(陕汽必须的字段)")
private String companyGuidePrice;*/
@ApiModelProperty("后桥速比key")
private String rearAxleRatioKey;
@ApiModelProperty("后桥速比")
private String rearAxleRatio;
/* @ApiModelProperty("委改厂(欧曼)")
private String appointToFactory;*/
/* @ApiModelProperty("委改厂(欧曼)")
private String appointToFactory;*/
@ApiModelProperty("轮胎规格key")
private String tireSizeKey;
@ApiModelProperty("轮胎规格")
@ -134,8 +134,10 @@ public class BaseModelConfigVo implements Vo {
private Integer isUseState;
@ApiModelProperty(value = "销售指导价")
private String guidedPrice;
/* @ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "发动机型号")
private String engineTypeValue;*/
/* @ApiModelProperty(value = "车型名称")
private String modelName;
@ApiModelProperty(value = "发动机型号")
private String engineTypeValue;*/
@ApiModelProperty("创建组织名称")
private String createOrg;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModel.java

@ -90,9 +90,12 @@ public class BaseVehicleModel extends BaseEntity {
@ApiModelProperty(value = "发动机型号value值")
private String engineTypeValue;
@ApiModelProperty("创建组织(陕汽必须的字段)")
@ApiModelProperty("创建组织")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty("使用组织(陕汽必须的字段)")
private String useOrg;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDetailsVo.java

@ -92,6 +92,9 @@ public class BaseVehicleModelDetailsVo implements Vo {
@ApiModelProperty(value = "创建组织(陕汽必须的字段)")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty(value = "使用组织sid:List类型")
private String[][] useOrg;

3
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java

@ -128,6 +128,9 @@ public class BaseVehicleModelDto implements Dto {
@ApiModelProperty(value = "创建组织(陕汽必须的字段)")
private String createOrg;
@ApiModelProperty("创建组织名称")
private String createOrgName;
/* @ApiModelProperty(value = "使用组织id", required = true)
@NotBlank(message = "使用组织不能为空")
private String useOrg;

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelVo.java

@ -58,6 +58,8 @@ public class BaseVehicleModelVo implements Vo {
private String vehicleAlias;
@ApiModelProperty(value = "排放标准value值")
private String emissionStandardValue;
@ApiModelProperty("创建组织名称")
private String createOrgName;
@ApiModelProperty(value = "车型图片")
private List<String> vehicleModelUrls;
}

5
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVo.java

@ -26,6 +26,7 @@
package com.yxt.anrui.base.api.basevehmodelconfig;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
import java.util.Date;
/**
* Project: anrui-base(车型信息) <br/>
@ -53,6 +55,9 @@ public class BaseVehmodelConfigVo implements Vo {
@ApiModelProperty("车型与简述配置关联sid")
private String sid; // 车型与简述配置关联sid
@ApiModelProperty("最新更新日期")
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date modifyTime; // 最新更新日期
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
@ApiModelProperty("车型别名")

33
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java

@ -120,12 +120,15 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (bip.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (bip.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
if (StringUtils.isNotBlank(query.getNodeState())) {
//qw.eq("bip.nodeState",query.getNodeState());
}
if (StringUtils.isNotBlank(query.getSellerOrgSid())) {
qw.like("bip.sellerOrgSid", query.getSellerOrgSid());
}
if (StringUtils.isNotBlank(query.getShuntingTypeKey())) {
qw.eq("bip.shuntingTypeKey", query.getShuntingTypeKey());
}
if (StringUtils.isNotBlank(query.getBuyerOrgSid())) {
qw.eq("bip.buyerOrgSid", query.getBuyerOrgSid());
}
IPage<BaseInternalPurchase> page = PagerUtil.queryToPage(pq);
IPage<BaseInternalPurchaseVo> pagging = baseMapper.selectPageVo(page, qw);
PagerVo<BaseInternalPurchaseVo> p = PagerUtil.pageToVo(pagging, null);
@ -160,9 +163,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String dtoSid = dto.getSid();
List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
if (StringUtils.isBlank(dtoSid)) {//新增
String sellerOrgName = dto.getSellerOrgName();
if (StringUtils.isBlank(sellerOrgName)) {
return rb.setMsg("售方机构不能为空");
if (StringUtils.isBlank(dto.getShuntingTypeKey())) {
return rb.setMsg("调车类型不能为空");
}
if (StringUtils.isBlank(dto.getSellerOrgSid())) {
return rb.setMsg("调出分公司不能为空");
}
if (StringUtils.isBlank(dto.getBuyerOrgSid())) {
return rb.setMsg("调入分公司不能为空");
}
BaseInternalPurchase baseInternalPurchase = new BaseInternalPurchase();
String sid = baseInternalPurchase.getSid();
@ -196,6 +204,7 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
String sid1 = baseInternalPurchaseVehicle1.getSid();
BeanUtil.copyProperties(baseInternalPurchaseVehicle, baseInternalPurchaseVehicle1);
baseInternalPurchaseVehicle1.setSid(sid1);
baseInternalPurchaseVehicle1.setModelSid(baseInternalPurchaseVehicle.getVehicleSid());
baseInternalPurchaseVehicle1.setMainSid(dtoSid);
baseInternalPurchaseVehicleService.save(baseInternalPurchaseVehicle1);
}
@ -340,10 +349,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
if (StringUtils.isBlank(vinNo)) {
return rb.setMsg("请填写车架号");
}
if (StringUtils.isBlank(inventoryLocationSid)){
if (StringUtils.isBlank(inventoryLocationSid)) {
return rb.setMsg("请选择存放地点");
}
baseInternalPurchaseVehicleService.updateVinNoBySid(sid, vinNo,inventoryLocationSid,inventoryLocationName);
baseInternalPurchaseVehicleService.updateVinNoBySid(sid, vinNo, inventoryLocationSid, inventoryLocationName);
}
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {
@ -372,14 +381,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callOutOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
StringBuilder nextNodeUserSids =new StringBuilder();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
if (shuntingTypeValue.equals("调出")) {
@ -392,14 +401,14 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
userQuery.setRoleSid(candidateGroups.get(0));
userQuery.setOrgSidPath("11/11/" + callInOrgSid + "/11");
List<SysUserVo> sysUserVos = sysUserFeign.getUserByRole(userQuery).getData();
StringBuilder nextNodeUserSids =new StringBuilder();
StringBuilder nextNodeUserSids = new StringBuilder();
if (sysUserVos.size() > 0) {
for (SysUserVo sysUserVo : sysUserVos) {
String sid = sysUserVo.getSid();
nextNodeUserSids.append(sid).append(",");
}
}
String substring = nextNodeUserSids.substring(0,nextNodeUserSids.lastIndexOf(","));
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
bv.setNextNodeUserSids(substring);
}
if (bv.getTaskId().equals(baseInternalPurchase.getTaskId())) {

1
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemanufactorsubscription/BaseManufactorSubscriptionMapper.xml

@ -10,6 +10,7 @@
<where>
${ew.sqlSegment}
</where>
ORDER BY proSchAppNo DESC
</select>
<select id="selectListAllVo"

4
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelconfig/BaseModelConfigMapper.xml

@ -138,7 +138,9 @@
<!--保险杠(欧曼)-->
bmc.bumper,
<!--备注-->
bmc.remarks
bmc.remarks,
<!--创建组织名称-->
bmc.createOrg
FROM base_model_config bmc
<where>
${ew.sqlSegment}

3
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml

@ -12,6 +12,7 @@
SELECT count(*)
FROM base_vehicle_brand
WHERE brandCode = #{brandCode}
AND isDelete = 0
AND sid
&lt;&gt;
#{sid}
@ -99,6 +100,8 @@
SELECT bvb.brandName, bvb.sid
FROM base_vehicle_brand bvb
where bvb.manufacturerSid = #{manufacturerSid}
AND bvb.isDelete = 0
AND bvb.isValidity = 1
</select>
<!--根据分公司sid查询所有品牌列表-->
<select id="selectAppListByUserSid"

2
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@ -155,6 +155,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
if (StringUtils.isNotBlank(query.getName())) {
qw.like("bvb.brandName", query.getName());
}
qw.eq("bvb.isValidity",1);
}
return baseMapper.selectByOrgSid(qw);
}
@ -182,6 +183,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
qw.like("bvb.useOrg", name);
}
qw.eq("bvb.isDelete",0);
qw.eq("bvb.isValidity",1);
return baseMapper.namesDown(qw);
}

189
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@ -4,23 +4,24 @@
<!--分页列表-->
<select id="pagerList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelVo">
SELECT bvm.sid,
bvm.brandName,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.driveFormValue,
bvm.powerValue,
bvm.gearboxTypeValue,
bvm.fuelTypeValue,
bvm.vehicleVersionValue,
bvm.modelName,
bvm.engineTypeValue,
bvm.`vehicleVersionValue` vehicleVersion,
bvm.`vehicleTypeCode`,
bvm.`emissionStandardValue`,
bvm.vehicleAlias
bvm.brandName,
bvm.vehicleTypeValue,
bvm.productLineValue,
bvm.driveFormValue,
bvm.powerValue,
bvm.gearboxTypeValue,
bvm.fuelTypeValue,
bvm.vehicleVersionValue,
bvm.modelName,
bvm.engineTypeValue,
bvm.`vehicleVersionValue` vehicleVersion,
bvm.`vehicleTypeCode`,
bvm.`emissionStandardValue`,
bvm.vehicleAlias,
bvm.createOrgName
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle_brand bvb
ON bvm.carBrand = bvb.sid
LEFT JOIN base_vehicle_brand bvb
ON bvm.carBrand = bvb.sid
<where>
${ew.sqlSegment}
</where>
@ -28,7 +29,7 @@
<!--详情-->
<select id="details" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDetailsVo">
SELECT
-- <!--厂商名称-->
-- <!--厂商名称-->
bm.manufacturerName,
-- <!--厂商sid-->
bvm.manufacturer,
@ -88,8 +89,8 @@
-- <!--是否可以删除(1是0否)-->
bvm.isDel
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
where bvm.sid = #{sid}
</select>
<!--删除、批量删除-->
@ -124,8 +125,8 @@
<!--发动机号-->
bvm.engineType
FROM base_vehicle_model bvm
left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
${ew.customSqlSegment}
left join base_vehicle_brand bvb on bvb.sid = bvm.carBrand
${ew.customSqlSegment}
</select>
<!--查询车型信息下拉框-->
<!-- <select id="selectDown" resultType="java.util.List">-->
@ -145,20 +146,20 @@
<!--车型sid-->
bvm.sid
FROM base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectAppPageByOrgSid" resultType="com.yxt.anrui.base.api.basevehiclemodel.AppBaseVehicleModelVo">
SELECT bvm.sid, bvb.brandName, bm.manufacturerName, bvm.modelName
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
${ew.customSqlSegment}
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
${ew.customSqlSegment}
</select>
<!--根据车型型号模糊查询下拉款-->
<select id="selectDownPlus" resultType="java.util.Map">
select bvm.sid
from base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="getPcChooseListByModelSid"
@ -171,10 +172,9 @@
bmc.`specification`,
bmc.`fuelTank`
FROM anrui_base.base_vehicle_model bvm
LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvm.sid = #{vehicleSid}
LIMIT 1
LEFT JOIN anrui_base.base_vehmodel_config bvc ON bvc.modelSid = bvm.sid
LEFT JOIN anrui_base.base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvm.sid = #{vehicleSid} LIMIT 1
</select>
<select id="getListByModelSid"
resultType="com.yxt.anrui.base.api.basemodelconfig.BaseModelConfigVo">
@ -197,7 +197,7 @@
bvm.modelName,
bvm.engineTypeValue
FROM base_model_config bmc
LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
LEFT JOIN base_vehicle_model bvm ON bmc.vehicleSid = bvm.sid
WHERE vehicleSid = #{vehicleSid}
</select>
@ -218,8 +218,8 @@
bmc.configName AS sketChconfiguration,
bv.guidedPrice AS vehicleModelOffer
FROM base_vehicle_model bvm
LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
LEFT JOIN base_vehicle bv ON bv.modelSid = bvm.sid
LEFT JOIN base_model_config bmc ON bvm.sid = bmc.vehicleSid
WHERE bvm.sid = #{modelSid}
AND bmc.sid = #{configModelSid}
</select>
@ -289,15 +289,15 @@
<!--是否可以删除(1是0否)-->
bvm.isDel
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
LEFT JOIN base_manufacturer bm ON bm.sid = bvm.manufacturer
LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
where bvm.sid = #{sid}
</select>
<select id="selectDownPlusByModelName" resultType="java.util.Map">
SELECT bvm.modelName, bvm.sid
SELECT bvm.modelName, bvm.sid,bvm.vehicleAlias
FROM base_vehicle_model bvm
${ew.customSqlSegment}
${ew.customSqlSegment}
</select>
<select id="selectPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
@ -310,9 +310,9 @@
CONCAT(MIN(salesReferencePrice), '-', MAX(salesReferencePrice)) as salesReferencePrice,
bv.configurationItemsSid as configSid
from base_vehicle_model bm
left join base_vehmodel_config bv on bv.modelSid = bm.sid
left join base_model_config bc on bc.sid = bv.configurationItemsSid
${ew.customSqlSegment}
left join base_vehmodel_config bv on bv.modelSid = bm.sid
left join base_model_config bc on bc.sid = bv.configurationItemsSid
${ew.customSqlSegment}
</select>
<select id="downList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelDownListVo">
@ -323,64 +323,65 @@
bvm.`manufacturer`,
bvm.`carBrand`
FROM base_vehicle_model bvm
LEFT JOIN base_manufacturer bm
ON bvm.`manufacturer` = bm.`sid`
LEFT JOIN base_manufacturer bm
ON bvm.`manufacturer` = bm.`sid`
</select>
<!-- <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT DISTINCT bm.sid,
bm.brandName,
bm.carBrand as brandSid,
bm.vehicleAlias,
bm.vehicleVersionValue,
bm.fuelTypeValue,
bm.gearboxTypeValue,
bm.modelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), MAX(bvc.guidedPrice),
CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT COUNT(*)
FROM base_vehicle bv
WHERE bv.modelSid = bm.sid
AND bv.useOrg = #{useOrgSid}
AND lockedState = #{lockedStateKey}) AS nowCarNum,
(SELECT COUNT(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehicle_model bm
LEFT JOIN base_vehmodel_config bvc
ON bm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
ORDER BY nowCarNum DESC
</select>-->
<!-- <select id="modelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT DISTINCT bm.sid,
bm.brandName,
bm.carBrand as brandSid,
bm.vehicleAlias,
bm.vehicleVersionValue,
bm.fuelTypeValue,
bm.gearboxTypeValue,
bm.modelName,
(SELECT if(MIN(bvc.guidedPrice) = MAX(bvc.guidedPrice), MAX(bvc.guidedPrice),
CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice)))
FROM base_vehmodel_config bvc
WHERE bvc.modelSid
= bm.sid
AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
(SELECT COUNT(*)
FROM base_vehicle bv
WHERE bv.modelSid = bm.sid
AND bv.useOrg = #{useOrgSid}
AND lockedState = #{lockedStateKey}) AS nowCarNum,
(SELECT COUNT(*)
FROM bus_vehicle_apply_detail bvad
WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehicle_model bm
LEFT JOIN base_vehmodel_config bvc
ON bm.sid = bvc.modelSid
<where>
${ew.sqlSegment}
</where>
ORDER BY nowCarNum DESC
</select>-->
<!-- <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT bvc.useOrgSid,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
(SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bm ON bvc.modelSid = bm.sid
<where>
${ew.sqlSegment}
</where>
group by bvc.useOrgSid
</select>-->
<!-- <select id="notTheCompanyModelPageList" resultType="com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelListVo">
SELECT bvc.useOrgSid,
(SELECT count(*)
FROM base_vehicle bv
WHERE bv.modelSid = bvc.modelSid
and bv.useOrg = bvc.useOrgSid) AS nowCarNum,
(SELECT count(*) FROM bus_vehicle_apply_detail bvad WHERE bvad.vehicleSid = bm.sid) AS productionCarNum
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bm ON bvc.modelSid = bm.sid
<where>
${ew.sqlSegment}
</where>
group by bvc.useOrgSid
</select>-->
<select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig, bvc.guidedPrice,bvc.modelSid,bvc.configurationItemsSid configSid
SELECT bvm.`brandName`, bvm.`modelName`, bmc.`configName`, bmc.otherConfig,
bvc.guidedPrice,bvc.modelSid,bvc.configurationItemsSid configSid
FROM base_vehmodel_config bvc
LEFT JOIN base_vehicle_model bvm
ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc
ON bvc.`configurationItemsSid` = bmc.`sid`
LEFT JOIN base_vehicle_model bvm
ON bvc.`modelSid` = bvm.`sid`
LEFT JOIN base_model_config bmc
ON bvc.`configurationItemsSid` = bmc.`sid`
<where>
${ew.sqlSegment}
</where>
@ -420,8 +421,8 @@
SELECT bmc.sid,
bmc.`configName`
FROM base_model_config bmc
LEFT JOIN base_vehmodel_config bvc
ON bmc.sid = bvc.`configurationItemsSid`
LEFT JOIN base_vehmodel_config bvc
ON bmc.sid = bvc.`configurationItemsSid`
WHERE bvc.`modelSid` = #{modelSid}
and bvc.useOrgSid = #{orgSid}
</select>

8
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/sysorganization/SysOrganizationVo.java

@ -65,10 +65,10 @@ public class SysOrganizationVo implements Vo {
private String zgNames;
@ApiModelProperty("分管人员名称")
private String fgNames;
@ApiModelProperty("主管人员sids")
private String zgSids;
@ApiModelProperty("分管人员sids")
private String fgSids;
@ApiModelProperty("主管人员sid")
private String zgStaffSid;
@ApiModelProperty("分管人员sid")
private String fgStaffSid;
@ApiModelProperty("是否是部门(0否,1是)")
private Integer isDept;

1
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationMapper.xml

@ -127,6 +127,7 @@
SELECT so.name, so.psid, so.sid, so.orgSidPath, so.orgCode
FROM sys_organization so
WHERE psid = #{psid}
ORDER BY so.sort ASC
</select>
<select id="getUseOrgByUserSid" resultType="com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo">

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysorganization/SysOrganizationRest.java

@ -167,9 +167,9 @@ public class SysOrganizationRest implements SysOrganizationFeign {
SysOrganizationVo vo = new SysOrganizationVo();
BeanUtil.copyProperties(entity, vo);
vo.setFgNames(fgNames);
vo.setFgSids(fgSids);
vo.setFgStaffSid(fgSids);
vo.setZgNames(zgNames);
vo.setZgSids(zgSids);
vo.setZgStaffSid(zgSids);
return rb.success().setData(vo);
}

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouse.java

@ -71,7 +71,10 @@ public class ScmWarehouse extends BaseEntity {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

120
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseDto.java

@ -30,6 +30,7 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* Project: anrui-scm(进销存) <br/>
@ -45,6 +46,7 @@ import io.swagger.annotations.ApiModelProperty;
* @since 1.0
*/
@ApiModel(value = "仓库 数据传输对象", description = "仓库 数据传输对象")
@Data
public class ScmWarehouseDto implements Dto {
@ -69,119 +71,9 @@ public class ScmWarehouseDto implements Dto {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
/**
* @return 使用组织
*/
public String getUseOrg(){
return useOrg;
}
/**
* @param useOrg 使用组织 to set
*/
public void setUseOrg(String useOrg){
this.useOrg = useOrg;
}
/**
* @return 使用组织sid
*/
public String getUseOrgSid(){
return useOrgSid;
}
/**
* @param useOrgSid 使用组织sid to set
*/
public void setUseOrgSid(String useOrgSid){
this.useOrgSid = useOrgSid;
}
/**
* @return 编码
*/
public String getWarehouseCode(){
return warehouseCode;
}
/**
* @param warehouseCode 编码 to set
*/
public void setWarehouseCode(String warehouseCode){
this.warehouseCode = warehouseCode;
}
/**
* @return 名称
*/
public String getWarehouseName(){
return warehouseName;
}
/**
* @param warehouseName 名称 to set
*/
public void setWarehouseName(String warehouseName){
this.warehouseName = warehouseName;
}
/**
* @return 仓库属性
*/
public String getWarehouseAttribute(){
return warehouseAttribute;
}
/**
* @param warehouseAttribute 仓库属性 to set
*/
public void setWarehouseAttribute(String warehouseAttribute){
this.warehouseAttribute = warehouseAttribute;
}
/**
* @return 仓库负责人
*/
public String getWarehouseContract(){
return warehouseContract;
}
/**
* @param warehouseContract 仓库负责人 to set
*/
public void setWarehouseContract(String warehouseContract){
this.warehouseContract = warehouseContract;
}
/**
* @return 仓库负责人sid
*/
public String getWarehouseContractSid(){
return warehouseContractSid;
}
/**
* @param warehouseContractSid 仓库负责人sid to set
*/
public void setWarehouseContractSid(String warehouseContractSid){
this.warehouseContractSid = warehouseContractSid;
}
/**
* @return 分组
*/
public String getWarehouseGroup(){
return warehouseGroup;
}
/**
* @param warehouseGroup 分组 to set
*/
public void setWarehouseGroup(String warehouseGroup){
this.warehouseGroup = warehouseGroup;
}
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseVo.java

@ -72,7 +72,10 @@ public class ScmWarehouseVo implements Vo {
@ApiModelProperty("仓库负责人sid")
private String warehouseContractSid; // 仓库负责人sid
@ApiModelProperty("分组")
private String warehouseGroup; // 分组
@ApiModelProperty("存放地点分组key")
private String warehouseGroupKey; // 存放地点分组key
@ApiModelProperty("存放地点分组value")
private String warehouseGroupValue; // 存放地点分组value
}

8
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java

@ -169,11 +169,17 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
scmApplyInboundVehicleService.save(scmApplyInboundVehicle);
}
}else{
new ResultBean().fail().setMsg("车辆台数填写不正确");
return new ResultBean().fail().setMsg("车辆台数填写不正确");
}
return new ResultBean().success().setMsg("保存成功").setData(inboundVehicle.getSid());
} else { // 修改
List<ScmApplyInboundVehicleDto> vehicleList = dto.getVehicleList();
if (vehicleList.size() == 0){
return new ResultBean().fail().setMsg("车辆列表不能为空");
}
if (StringUtils.isBlank(dto.getDepartureDate())){
return new ResultBean().fail().setMsg("请填写厂家发车日期");
}
List<String> vinNoList = vehicleList.stream().filter(vehicle -> StringUtils.isNotBlank(vehicle.getVinNo())).map(vehicle -> vehicle.getVinNo()).collect(Collectors.toList());
// 采购订单下线日期一旦维护,二次确认,则不能修改 TODO
// 验证数据库是否重复

1
anrui-scm/anrui-scm-ui/src/api/portal/Upload.js

@ -4,6 +4,7 @@ import qs from 'qs'
// 文件上传接口
export const uploadFile = '/api/base/file/upload'
export const uploadFile_yanchejiancha = '/api/scm/file/upload'
// 上传图片
// export function imageUpload(data) {
// return request({

50
anrui-scm/anrui-scm-ui/src/api/supplychain/yanchejiancha.js

@ -0,0 +1,50 @@
import request from '@/utils/request'
// 获取验车检查项目管理列表
export function listPage(data) {
return request({
url: '/scm/v1/scmvehicleinspectitem/listPage',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 保存 验车单
export function save(data) {
return request({
url: '/scm/v1/scmvehicleinspectitem/save',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 验车管理 新增初始化
export function delBySids(data) {
return request({
url: '/scm/v1/scmvehicleinspectitem/delBySids',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
// 验车管理详情回显
export function fetchDetailsBySid(sid) {
return request({
url: '/scm/v1/scmvehicleinspectitem/fetchDetailsBySid/' + sid,
method: 'get'
})
}
// 通过 验车单
export function submitCarInspectedInfo(data) {
return request({
url: '/scm/v1/scmvehicleexamine/submitCarInspectedInfo',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}

1
anrui-scm/anrui-scm-ui/src/components/uploadFile/uploadImg.vue

@ -226,6 +226,7 @@
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
this.dialogVisible = true
},
//
uploadError() {

229
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_yanchejiancha.vue

@ -0,0 +1,229 @@
<template>
<div>
<el-upload class="upload-demo" :headers="accessToken" :action="uploadFile" :accept="accept" :data="uploadData"
:on-success="uploadImgSuccess_FuJian" :on-remove="handleRemove" :file-list="fileList_FuJian"
:on-preview="handlePictureCardPreview" :show-file-list="false" :multiple="true">
<el-button size="mini" type="primary">点击上传</el-button>
</el-upload>
</div>
</template>
<script>
import { uploadFile_yanchejiancha } from '@/api/portal/Upload'
import { getStorage } from '@/utils/auth.js'
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
type: String,
default: 'abc'
},
//
width: {
type: String,
default: '270px'
},
limit: {
type: Number,
default: 1
},
accept: {
type: String,
default:
'.jpg,.jpeg,.png,.JPG,.JPEG'
},
//
name: {
type: Array,
required: true
},
uploadData: {
type: Object,
default: {}
}
},
data() {
return {
dialogImageUrl: '',
dialogVisible: false,
accessToken: null,
uploadFile: uploadFile_yanchejiancha,
fileList_FuJian: [],
enclosure: '',
file_add: '',
file_catch: '',
files: [],
files_list: [],
filedUrl: '',
// fileUrl: fileUrl,
// showpicture:false,
isview: false,
nameArr: '',
loadding: false,
stateName: '',
/* uploadData: { modelSid: '' },*/
sid: ''
}
},
watch: {
name: {
deep: true,
immediate: true,
handler(newVal, oldVal) {
console.log('aaaa1', newVal)
this.files = newVal
console.log('aaaa2', this.files)
}
}
},
mounted() {
this.$nextTick(() => {
this.Init()
})
},
created() {
this.uploadFile = uploadFile_yanchejiancha //
this.accessToken = {
token: getStorage()
}
},
methods: {
view() {
// window.open(this.filedUrl)
},
showImg(sid) {
// this.uploadData.sid = sid
},
//
Init() {
if (this.name !== undefined) {
this.files = []
for (var i = 0; i < this.name.length; i++) {
this.files.push({
name: this.name[i],
url: this.name[i]
})
}
}
},
// --
uploadImgSuccess_FuJian(response, file, fileList) {
let _this = this
console.log('您选择的file:', file)
// console.log('data:', _this.uploadData)
if (file.response.code === '200') {
this.loadding = false
//
this.filedUrl = this.fileUrl + file.response.data
// var uid = file.response.data
this.files.push({
name: file.response.data.sourceFileName,
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
// this.getUrl()
// SaveList(this.tempInfo).then(response => {
// if (response.success) {
// }
// })
}
},
removeImage(file, ImageFileList) {
this.files.splice(this.files.indexOf(file), 1)
const imgFiles = []
this.files.forEach((o) => {
imgFiles.push(o.url)
})
this.$emit('fileChange', this.files)
},
handleRemove(file, fileList) {
console.log('file:' + JSON.stringify(file))
console.log('fileList:' + JSON.stringify(fileList))
this.enclosure = ''
// 1. id(this.file_add)
this.getNewFileId(fileList)
// 2. id(this.file_catch)
this.getCatchFileId(file)
// 3. id
this.getFileId()
// 4. id
this.$emit('change', this.enclosure)
},
// this.file_add(id)
getNewFileId(fileList) {
// debugger
this.file_add = ''
for (var i = 0; i < fileList.length; i++) {
if (fileList[i].response && fileList[i].response.code === '200') {
this.file_add = this.file_add + fileList[i].response.data + ','
}
}
if (this.file_add !== '') {
this.file_add = this.file_add.substring(0, this.file_add.length - 1)
}
// console.log('1. this.file_add: ' + this.file_add)
},
// this.file_catchid
getCatchFileId(file) {
for (var i = 0; i < this.files_list.length; i++) {
if (this.file_catch !== '') {
// 1. id
if (this.files_list[i].name === file.name) {
// 2. file_catchfils_arry
var fils_arry = this.file_catch.split(',')
// 3. fils_arry this.files_list[i].id
var arry = []
fils_arry.forEach((element) => {
//
if (element !== this.files_list[i].id) {
arry.push(element)
}
})
// 4. file_catch
this.file_catch = arry.join(',')
}
}
}
// console.log('2. this.file_catch:' + this.file_catch)
},
// id
getFileId() {
// console.log('3. this.file_catch:' + this.file_catch + ',this.file_add:' + this.file_add)
if (this.file_catch !== '') {
if (this.file_add !== '') {
this.enclosure = this.file_catch + ',' + this.file_add
} else {
this.enclosure = this.file_catch
}
} else {
this.enclosure = this.file_add
}
},
handlePictureCardPreview(file) {
this.dialogImageUrl = file.url
},
//
uploadError() {
this.loadding = false
},
uploadProgrees(event, file, fileList) {
if (Number(event.percent) > 0) {
this.loadding = true
}
}
}
}
</script>
<style scoped></style>

2
anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js

@ -538,7 +538,7 @@ const codemenu = [
children: [{
path: '/yanchejianchaxiangmu/yanchejiancha',
component: () => import('@/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue'),
name: 'yanchejiancha',
name: 'yanchejianchaxiangmu',
meta: { title: '验车检查项目管理', noCache: true }
}]
},

17
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouse.vue

@ -28,7 +28,10 @@
<el-input v-model="queryParams.params.warehouseContract" placeholder="请输入负责人" clearable/>
</el-form-item>
<el-form-item label="分组">
<el-input v-model="queryParams.params.warehouseGroup" placeholder="请输入分组" clearable/>
<el-select v-model="queryParams.params.warehouseGroupKey" placeholder="请选择" clearable
class="addinputw">
<el-option v-for="item in warehouseGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
@ -63,7 +66,7 @@
<el-table-column width="240px" prop="useOrg" label="使用组织" align="center"/>
<el-table-column prop="warehouseAttribute" label="详细地址" align="center"/>
<el-table-column width="200px" prop="warehouseContract" label="负责人及电话" align="center"/>
<el-table-column width="140px" prop="warehouseGroup" label="分组" align="center"/>
<el-table-column width="140px" prop="warehouseGroupValue" label="分组" align="center"/>
</el-table>
</div>
<!--End 项目列表-->
@ -99,6 +102,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './scmwarehouseAdd'
import divInfo from './scmwarehouseInfo'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ScmWarehouseIndex',
@ -117,6 +121,7 @@ export default {
tableLoading: false,
dataList: [],
useOrg_list:[],
warehouseGroup_list:[],
useOrg: '', // 使
useOrgSid: '', // 使sid
queryParams: {
@ -170,6 +175,7 @@ export default {
// this.loadList()
this.getUseOrg()
this.getListOrgAll()
this.getType()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
@ -294,6 +300,13 @@ export default {
this.multipleSelection = val
console.log('点击数据', this.multipleSelection)
},
getType(){
typeValues({type:'locationGroup'}).then((res) => {
if (res.success){
this.warehouseGroup_list = res.data
}
})
},
// sid
getUseOrg() {
const userSid = window.sessionStorage.getItem('userSid')

32
anrui-scm/anrui-scm-ui/src/views/anruiscm/scmwarehouse/scmwarehouseAdd.vue

@ -56,8 +56,12 @@
<el-form-item><span slot="label"><span class="icon">*</span>分组</span></el-form-item>
</el-col>
<el-col :span="6" class="trightb">
<el-form-item prop="warehouseGroup">
<el-input v-model="formobj.warehouseGroup" placeholder="分组" class="addinputw" clearable/>
<el-form-item prop="warehouseGroupKey">
<el-select v-model="formobj.warehouseGroupKey" placeholder="请选择" @change="changeWarehouseGroup" clearable
class="addinputw">
<el-option v-for="item in warehouseGroup_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
<!-- <el-input v-model="formobj.warehouseGroup" placeholder="分组" class="addinputw" clearable/>-->
</el-form-item>
</el-col>
</el-row>
@ -80,6 +84,7 @@
<script>
import req from '@/api/anruiscm/scmwarehouse'
import { getUseOrgByUserSid } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'ScmWarehouseAdd',
@ -107,6 +112,7 @@ export default {
},
orgOptions: [],
orgArr: [],
warehouseGroup_list:[],
formobj: {
id: '',
sid: '',
@ -117,7 +123,8 @@ export default {
warehouseAttribute: '', //
warehouseContract: '', //
warehouseContractSid: '', // sid
warehouseGroup: '' //
warehouseGroupValue:'',
warehouseGroupKey:''
},
rules: {
useOrg: [{ required: true, message: '使用组织不能为空', trigger: 'change' }], // 使
@ -127,7 +134,7 @@ export default {
warehouseAttribute: [{ required: true, message: '存放地点详细地址不能为空', trigger: 'blur' }], //
warehouseContract: [{ required: true, message: '存放地点负责人不能为空', trigger: 'blur' }], //
warehouseContractSid: [{ required: true, message: '存放地点负责人sid不能为空', trigger: 'blur' }], // sid
warehouseGroup: [{ required: true, message: '分组不能为空', trigger: 'blur' }] //
warehouseGroupKey: [{ required: true, message: '分组不能为空', trigger: 'blur' }] //
},
submitdisabled: false
}
@ -209,6 +216,21 @@ export default {
}
})
},
getType(){
typeValues({type:'locationGroup'}).then((res) => {
if (res.success){
this.warehouseGroup_list = res.data
}
})
},
changeWarehouseGroup(val){
if (val) {
const choosetItem = this.warehouseGroup_list.filter((item) => item.dictKey == val)
this.formobj.warehouseGroupValue = choosetItem[0].dictValue
console.log('name:', this.formobj.warehouseGroupValue, 'key:', this.formobj.warehouseGroupKey)
}
},
// //
// useOrgChange(e) {
// console.log('' + JSON.stringify(e))
@ -280,6 +302,7 @@ export default {
this.dialogStatus = 'add'
this.viewTitle = '【新增】存放地点'
this.getUseOrg()
this.getType()
},
showEdit(row) {
this.$nextTick(() => {
@ -306,6 +329,7 @@ export default {
this.formobj = row
})
this.getUseOrg()
this.getType()
},
saveAdd() {
const _this = this

301
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejiancha.vue

@ -1,13 +1,308 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div v-show="viewState == 1">
<button-bar view-title="验车检查项目管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="项目名称">
<el-input v-model="listQuery.params.item" placeholder="" clearable/>
</el-form-item>
<el-form-item label="是否上传图片">
<el-select v-model="listQuery.params.isImg" placeholder="请选择" clearable filterable>
<el-option v-for="item in isImg_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">车辆检查项列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed width="50px" type="selection" align="center"/>
<el-table-column fixed width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" width="150px" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">编辑</el-button>
</template>
</el-table-column>
<el-table-column label="项目" align="center">
<template slot-scope="scope">
<span>{{ scope.row.item }}</span>
</template>
</el-table-column>
<el-table-column label="排序号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sortNo }}</span>
</template>
</el-table-column>
<el-table-column label="检查结果" align="center">
<template slot-scope="scope">
<span>{{ scope.row.result }}</span>
</template>
</el-table-column>
<el-table-column label="是否上传图片" align="center">
<template slot-scope="scope">
<span>{{ scope.row.isImg }}</span>
</template>
</el-table-column>
<el-table-column label="照片说明" align="center">
<template slot-scope="scope">
<span>{{ scope.row.remarks }}</span>
</template>
</el-table-column>
</el-table>
</div>
<div class="pages">
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
</div>
</div>
<yanchejianchaAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import { listPage, delBySids } from '@/api/supplychain/yanchejiancha'
import yanchejianchaAdd from './yanchejianchaAdd'
export default {
name: 'yanchejiancha'
name: 'yanchejianchaxiangmu',
components: {
Pagination,
pageye,
ButtonBar,
yanchejianchaAdd
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增'
},
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
org_list: [],
accadjType_list: [],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
sids: [],
isImg_list: [
{
dictKey: 0,
dictValue: '否'
},
{
dictKey: 1,
dictValue: '是'
}
],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
item: '',
isImg: ''
},
current: 1,
size: 10,
total: 0
},
rules: {}
}
},
created() {
//
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'toAdd':
this.toAdd()
break
case 'doDel':
this.doDel()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
handleSelectionChange(row) {
const aa = []
row.forEach((element) => {
aa.push(element.sid)
})
this.sids = aa
console.log('sids', this.sids)
},
//
getList() {
this.listLoading = true
listPage(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success && response.data && response.data.total > 0) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
handleReset() {
this.listQuery = {
params: {
item: '',
isImg: ''
},
current: 1,
size: 10,
total: 0
}
this.getList()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
toEdit(row) {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
doDel() {
if (this.sids.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
return
}
const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
delBySids(this.sids).then(resp => {
loading.close()
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.getList()
}
}).catch(e => {
loading.close()
})
}).catch(() => {
})
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
.btn {
padding: 15px 0 15px 0;
border: 1px solid #e0e3eb;
}
.tab-header {
background-color: #edf1f7;
padding: 8px 20px;
margin-bottom: 0 !important;
}
.tab-header /deep/ .el-form-item {
margin-bottom: 10px;
}
.listtop {
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.tit {
margin-bottom: -10px;
}
.pagination {
margin-bottom: -10px;
}
</style>

303
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaAdd.vue

@ -1,13 +1,310 @@
<template>
<div class="app-container">
<div v-show="viewState== 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存
</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>车辆检查项</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>项目名称</span></div>
<el-form-item>
<el-input v-model="formobj.item" clearable class="addinputw addinputwOne" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排序号</span></div>
<el-form-item>
<el-input v-model="formobj.sortNo" clearable class="addinputw addinputwOne" placeholder=""></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>检查结果</span></div>
<el-form-item>
<el-input v-model="formobj.result" clearable class="addinputw addinputwOne" placeholder=""></el-input>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>是否上传图片</span></div>
<el-form-item>
<div class="addinputw addinputwOne">
<el-radio v-model="formobj.isImg" :label="1"></el-radio>
<el-radio v-model="formobj.isImg" :label="0"></el-radio>
</div>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>照片说明</span></div>
<el-form-item>
<el-input v-model="formobj.remarks" clearable class="addinputw addinputwOne" placeholder=""></el-input>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold;color: #ffffff">检查项内容</div>
<div class="baocun">
<el-button type="primary" size="small" icon="el-icon-plus" class="btntopblueline" @click="addExamine()">添加
</el-button>
</div>
</div>
<el-table :key="tableKey" :data="formobj.inspectdetail" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="deleteExamine(scope.$index)">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="排序号" align="center">
<template slot-scope="scope">
<el-input clearable placeholder="" v-model="scope.row.sortNo"></el-input>
</template>
</el-table-column>
<el-table-column label="内容" align="left" header-align="center">
<template slot-scope="scope">
<el-input clearable placeholder="" v-model="scope.row.itemContent"></el-input>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.isImg == 1" class="tableStyle">
<div style="margin-left: 5px;font-weight: bold;color: #ffffff">照片实例</div>
<div class="baocun">
<el-button type="primary" size="small" icon="el-icon-plus" class="btntopblueline" @click="addPicture()">添加
</el-button>
</div>
</div>
<el-table v-if="formobj.isImg == 1" :key="imgKey" :data="formobj.inspectimgtemp" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed prop="name" label="操作" width="100px" align="center" header-align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" @click="deletePicture(scope.$index)">删除
</el-button>
</template>
</el-table-column>
<el-table-column label="照片名称" align="left" header-align="center">
<template slot-scope="scope">
<el-input clearable placeholder="" v-model="scope.row.imgTitle"></el-input>
</template>
</el-table-column>
<el-table-column label="照片实例" align="center" width="250">
<template slot-scope="scope">
<div class="upload_img">
<upload_yanchejiancha ref="uploadMoreImg" v-model="imglist" bucket="map" @change="backData($event, scope.row)" :upload-data="{type:'0001',sid: scope.row.sid}"/>
</div>
<el-button type="primary" v-if="scope.row.imgTempUrl.length > 0" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<el-dialog title="" :visible.sync="dialogImgVisible" width="70%" :close-on-click-modal="false">
<el-form label-position="right" class="formadd">
<el-row style="border: 1px solid #e0e3eb;">
<el-col :span="24">
<el-form-item>
<div v-for="item in srcList" style="float: left">
<div style="display: flex;flex-direction: column;justify-content: center;align-items: center;" >
<el-image style="cursor:pointer;width: 150px;height: 150px;margin-top: 5px" :src="item" @click="magnify(item)">
</el-image>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<img alt="" :src="dialogUrl" width="100%">
</el-dialog>
</div>
</template>
<script>
import { save, fetchDetailsBySid } from '@/api/supplychain/yanchejiancha'
import upload_yanchejiancha from '@/components/uploadFile/upload_yanchejiancha'
export default {
name: 'yanchejianchaAdd'
name: 'yanchejianchaAdd',
components: {
upload_yanchejiancha
},
data() {
return {
viewTitle: '',
viewState: 1,
index: 0,
tableKey: 0,
imgKey: 1,
dialogImgVisible: false,
srcList: [],
imglist: [],
dialogVisible: false,
dialogUrl: '',
//
formobj: {
iconUrl: '',
isImg: '',
item: '',
result: '',
sid: '',
sortNo: '',
inspectdetail: [],
inspectimgtemp: []
},
rules: {},
submitdisabled: false
}
},
methods: {
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【新增】车辆检查项'
this.dialogStatus = 'add'
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】车辆检查项'
this.dialogStatus = 'edit'
console.log('编辑回显', row.sid)
fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
addExamine() {
this.formobj.inspectdetail.push({
itemContent: '',
sortNo: ''
})
},
deleteExamine(index) {
this.formobj.inspectdetail.splice(index, 1)
},
addPicture() {
this.formobj.inspectimgtemp.push({
imgTempUrl: [],
imgTitle: ''
})
},
deletePicture(index) {
this.formobj.inspectimgtemp.splice(index, 1)
},
backData(val, row) {
const aa = []
if (val.length > 0) {
val.forEach((e) => {
aa.push(e.url)
})
row.imgTempUrl = aa
}
},
handleLook(row) {
this.dialogImgVisible = true
this.srcList = row.imgTempUrl
},
magnify(row) {
this.dialogVisible = true
this.dialogUrl = row
},
saveOrUpdate() {
if (this.formobj.isImg === '') {
this.$message({ showClose: true, type: 'error', message: '请勾选是否上传图片' })
return
}
console.log(this.formobj)
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
save(this.formobj).then((resp) => {
this.submitdisabled = false
if (resp.success) {
this.$message({
showClose: true,
type: 'success',
message: resp.msg
})
this.handleReturn('true')
}
}).catch(() => {
this.submitdisabled = false
})
} else {
return false
}
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
iconUrl: '',
isImg: '',
item: '',
result: '',
sid: '',
sortNo: '',
inspectdetail: [],
inspectimgtemp: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 60px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #018ad2;
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.spanOneWidth {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
}
.upload_img {
display: inline-block;
padding-right: 10px;
}
</style>

201
anrui-scm/anrui-scm-ui/src/views/supplychain/yanchejianchaxiangmu/yanchejianchaInfo.vue

@ -1,13 +1,208 @@
<template>
<div class="app-container">
<div v-show="viewState== 1">
<!--标题按钮部分开始-->
<div class="tab-header webtop">
<!--标题-->
<div>{{ viewTitle }}</div>
<!--start 添加修改按钮-->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<!--标题按钮部分结束-->
<!--Start 新增修改部分-->
<div class="listconadd">
<div class="wlInfo"><span>分公司间调车申请</span></div>
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>项目名称</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.item }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>排序号</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.sortNo }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>检查结果</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.result }}</span>
</el-form-item>
</el-col>
<el-col :span="12">
<div class="span-sty spanOneWidth"><span>是否上传图片</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.isImg }}</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty spanOneWidth"><span>照片说明</span></div>
<el-form-item>
<span class="addinputInfo addinputwOne">{{ formobj.remarks }}</span>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div class="tableStyle">
<div style="margin-left: 5px;font-weight: bold;color: #ffffff">检查项内容</div>
</div>
<el-table :key="tableKey" :data="formobj.inspectdetail" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="排序号" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sortNo }}</span>
</template>
</el-table-column>
<el-table-column label="内容" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.itemContent }}</span>
</template>
</el-table-column>
</el-table>
<div v-if="formobj.isImg == 1" class="tableStyle">
<div style="margin-left: 5px;font-weight: bold;color: #ffffff">照片实例</div>
</div>
<el-table v-if="formobj.isImg == 1" :key="imgKey" :data="formobj.inspectimgtemp" :index="index" border style="width: 100%">
<el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column label="照片名称" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.imgTitle }}</span>
</template>
</el-table-column>
<el-table-column label="照片实例" align="center" width="250">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="handleLook(scope.row)">查看</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<!--End 添加修改部分-->
<el-dialog title="" :visible.sync="dialogImgVisible" width="70%" :close-on-click-modal="false">
<el-form label-position="right" class="formadd">
<el-row style="border: 1px solid #e0e3eb;">
<el-col :span="24">
<el-form-item>
<div v-for="item in srcList" style="float: left">
<div style="display: flex;flex-direction: column;justify-content: center;align-items: center;" >
<el-image style="cursor:pointer;width: 150px;height: 150px;margin-top: 5px" :src="item.fileUrl" @click="magnify(item.fileUrl)">
</el-image>
</div>
</div>
</el-form-item>
</el-col>
</el-row>
</el-form>
</el-dialog>
<el-dialog :visible.sync="dialogVisible" :append-to-body="true">
<img alt="" :src="dialogUrl" width="100%">
</el-dialog>
</div>
</template>
<script>
import { fetchDetailsBySid } from '@/api/supplychain/yanchejiancha'
export default {
name: 'yanchejianchaInfo'
name: 'yanchejianchaInfo',
data() {
return {
viewTitle: '',
viewState: 1,
index: 0,
tableKey: 0,
imgKey: 1,
dialogImgVisible: false,
srcList: [],
imglist: [],
dialogVisible: false,
dialogUrl: '',
//
formobj: {
iconUrl: '',
isImg: '',
item: '',
result: '',
sid: '',
sortNo: '',
inspectdetail: [],
inspectimgtemp: []
},
rules: {},
submitdisabled: false
}
},
methods: {
showInfo(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.viewTitle = '【编辑】车辆检查项'
this.dialogStatus = 'edit'
console.log('编辑回显', row.sid)
fetchDetailsBySid(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
}
}).catch((e) => {
this.formobj = row
})
},
// ===
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
iconUrl: '',
isImg: '',
item: '',
result: '',
sid: '',
sortNo: '',
inspectdetail: [],
inspectimgtemp: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.formaddcopy02 {
padding: 0px !important;
}
.wlInfo {
text-align: center;
font-size: 28px;
line-height: 90px;
border-bottom: 1px solid #e0e3eb;
}
.tableStyle {
background-color: #018ad2;
display: flex;
justify-content: space-between;
align-items: center;
border: 1px solid #dfe4ed;
height: 40px;
}
.spanOneWidth {
width: 100px !important;
}
.addinputwOne {
margin-left: 110px !important;
}
.upload_img {
display: inline-block;
padding-right: 10px;
}
</style>

2
anrui-system-ui/src/api/system/departments/departments.js

@ -39,7 +39,7 @@ export function postOrgtree(data) {
}
})
}
// 获取 机构分页列表
// 获取 机构分页列表(编辑部门信息)
export function putOrgtree(data) {
return request({
url: '/portal/v1/sysorganization/update/' + data.sid,

58
anrui-system-ui/src/views/organizationManage/organizationManage.vue

@ -52,16 +52,19 @@
<td>分管人员</td>
<td>
<el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"
placeholder="请选择" @select="handleSelect">
<i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>
<template slot-scope="{ item }">
<div style="paddingg:5px;background-color:Azure;">
<span>品牌名称</span>
<span style="color:red">{{ item.name }}</span><br>
</div>
</template>
</el-autocomplete>
<el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
<el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
<!-- <el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" class="addinputw"-->
<!-- placeholder="请选择" @select="handleSelect">-->
<!-- <i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>-->
<!-- <template slot-scope="{ item }">-->
<!-- <div style="paddingg:5px;background-color:Azure;">-->
<!-- <span>分管人员</span>-->
<!-- <span style="color:red">{{ item.name }}</span><br>-->
<!-- </div>-->
<!-- </template>-->
<!-- </el-autocomplete>-->
<!-- <el-select v-model="form.fgStaffSid" style="width:300px">-->
<!-- <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
<!-- </el-option>-->
@ -222,20 +225,9 @@
<td>分管人员</td>
<td>
<el-autocomplete v-model="form.fgStaffName" :fetch-suggestions="querySearchAsync" style="width:300px"
placeholder="请选择" @select="handleSelect">
<i slot="suffix" class="el-icon-edit el-input__icon" @click="inputclear"/>
<template slot-scope="{ item }">
<div style="paddingg:5px;background-color:Azure;">
<span>品牌名称</span>
<span style="color:red">{{ item.name }}</span><br>
</div>
</template>
</el-autocomplete>
<!-- <el-select v-model="form.fgStaffSid" style="width:300px" @change="fgStaffSidChange">-->
<!-- <el-option v-for="(item, i) in staffdata2" :key="i" :label="item.name" :value="item.sid">-->
<!-- </el-option>-->
<!-- </el-select>-->
<el-select v-model="form.fgStaffSid" style="width:300px" filterable multiple>
<el-option v-for="(item,index) in staffdata2" :key="item.sid" :label="item.name" :value="item.sid"/>
</el-select>
</td>
</tr>
<tr>
@ -384,6 +376,7 @@ export default {
})
},
save() {
this.form.fgStaffSid = this.form.fgStaffSid.join()
this.form.organizationSid = this.$store.getters.userInfo.orgSid
// this.form.dlxx = typeof(this.form.dlxx) == 'string' ? this.form.dlxx : this.form.dlxx.join()
if (this.form.sid) {
@ -422,15 +415,17 @@ export default {
this.getStaff2()
},
editRow(row) {
this.getStaff(row.sid)
this.getStaff2()
this.dialogTitle = '编辑'
this.isshow = 'edit'
selectBySid(row.sid).then((response) => {
if (response.success) {
this.form = response.data
this.form.fgStaffName = response.data.fgNames
this.form.fgStaffSid = response.data.fgSids
this.form.fgStaffSid = response.data.fgStaffSid.split(',')
this.form.zgStaffName = response.data.zgNames
this.form.zgStaffSid = response.data.zgSids
this.form.zgStaffSid = response.data.zgStaffSid
console.log('112233445566', this.form)
}
})
@ -450,10 +445,10 @@ export default {
// this.form.sort = row.sort
// this.form.zgStaffSid = row.zgSids
// this.form.fgStaffSid = row.fgSids
this.getStaff(row.sid)
this.getStaff2()
},
deit(data) { //
this.getStaff(data.sid)
this.getStaff2()
console.log(data, 8888)
this.dialogVisible = true
// this.form = Object.assign({}, data)
@ -467,11 +462,10 @@ export default {
this.form.linkPhone = data.linkPhone
this.form.sort = data.sort
this.form.zgStaffSid = data.zgSids
this.form.fgStaffSid = data.fgSids
this.getStaff(data.sid)
this.getStaff2()
this.form.fgStaffSid = data.fgSids.split(',')
},
nodeSave() { //
this.form.fgStaffSid = this.form.fgStaffSid.join()
postOrgtree(this.form).then(res => {
this.getOrgTree()
this.dialogVisible = false
@ -539,12 +533,12 @@ export default {
},
//
getStaff2() {
// let params = {}
getStaffName().then(res => {
this.staffdata2 = res.data
console.log('分管人员', this.staffdata2)
})
},
querySearchAsync(queryString, cb) {
console.log('查询条件:', queryString)
if (

Loading…
Cancel
Save