Browse Source

Merge remote-tracking branch 'origin/master'

master
yunuo970428 3 years ago
parent
commit
a64581f1e4
  1. 20
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
  2. 8
      anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss
  3. 2
      anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss
  4. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue
  5. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue
  6. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue
  7. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue
  8. 2
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue
  9. 4
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java
  10. 3
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java
  11. 1
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml
  12. 15
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  13. 3
      anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java
  14. 3
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java
  15. 4
      anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java
  16. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java
  17. 4
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java
  18. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java
  19. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java
  20. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java
  21. 2
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java
  22. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java
  23. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java
  24. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java
  25. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemsVo.java
  26. 3
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java
  27. 1
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmapplyinbound/ScmApplyInboundService.java
  28. 2
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml
  29. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml
  30. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java
  31. 25
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java
  32. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml
  33. 30
      anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js
  34. 10
      anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js
  35. 2
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue
  36. 34
      anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_jianchabiao.vue
  37. 2
      anrui-scm/anrui-scm-ui/src/icons/svg/RMB.svg
  38. 2
      anrui-scm/anrui-scm-ui/src/icons/svg/exwarehouse.svg
  39. 8
      anrui-scm/anrui-scm-ui/src/styles/element-table.scss
  40. 6
      anrui-scm/anrui-scm-ui/src/styles/index.scss
  41. 65
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue
  42. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue
  43. 216
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  44. 13
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue
  45. 1
      anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue
  46. 140
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue
  47. 2
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue
  48. 3
      anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue
  49. 14
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java
  50. 4
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java
  51. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java
  52. 10
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

20
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@ -192,15 +192,13 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
*
* @param businessSid 业务sid
*/
public void updateByVinNo(String businessSid) {
public void updateByVinNo(String businessSid, String settlementStatus, String settlementStatusValue) {
ResultBean<List<String>> vinNoList = baseVehicleActualDetailsService.selectVinNoList(businessSid);
if (vinNoList.getSuccess()) {
if (vinNoList.getData().size() != 0) {
//结算状态设置为预买断
String settlementStatus = VehicleState.BuyoutEnum.PRE_BUYOUT.getCode();
BaseVehicleUpdateQuery baseVehicleUpdateQuery = new BaseVehicleUpdateQuery();
baseVehicleUpdateQuery.setSettlementStatus(settlementStatus);
baseVehicleUpdateQuery.setSettlementStatusValue(VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks());
baseVehicleUpdateQuery.setSettlementStatusValue(settlementStatusValue);
baseVehicleUpdateQuery.setVinNoLis(vinNoList.getData());
baseVehicleService.updateStatusByVinNo(baseVehicleUpdateQuery);
}
@ -307,6 +305,11 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
//更新车辆的结算状态为预买断
//结算状态设置为预买断
String settlementStatus = VehicleState.BuyoutEnum.PRE_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.PRE_BUYOUT.getRemarks();
updateByVinNo(bv.getBusinessSid(), settlementStatus, settlementStatusValue);
return rb;
}
@ -355,11 +358,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
//ToDo:未售买断通过后的状态更新
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
//更新车辆的结算状态
updateByVinNo(bv.getBusinessSid());
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
@ -508,6 +506,10 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
}
Map<String, Object> paramMap = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(paramMap);
//更新车辆状态为未买断
String settlementStatus = VehicleState.BuyoutEnum.UN_BUYOUT.getCode();
String settlementStatusValue = VehicleState.BuyoutEnum.UN_BUYOUT.getRemarks();
updateByVinNo(baseVehicleActualSales.getSid(), settlementStatus, settlementStatusValue);
return rb.success().setData(resultBean.getData());
}
}

8
anrui-buscenter/anrui-buscenter-ui/src/styles/element-table.scss

@ -9,6 +9,14 @@
}
}
.el-table {
.el-table__row {
.cell {
line-height:15px;
}
}
}
.el-table {
.el-table__body {
tr td {

2
anrui-buscenter/anrui-buscenter-ui/src/styles/index.scss

@ -187,7 +187,7 @@ div:focus {
.search {
.tab-header {
.el-form-item {
margin-right: 30px;
margin-right: 16px;
.el-form-item__label {
font-size: 16px;

2
anrui-buscenter/anrui-buscenter-ui/src/views/chexingchaxun/modelinquire/vehiclelibraryconfiguration.vue

@ -125,7 +125,7 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%">
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span class="bluezi" @click="handlink(scope.row)">{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/cheliangxuqiu/modelsToChoose.vue

@ -47,7 +47,7 @@
<span>{{ scope.row.modelName }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/vehiclelibraryconfiguration.vue

@ -129,7 +129,7 @@
@selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" width="50"/>
<el-table-column width="80px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope"> <!---->
<span>{{ scope.row.configName }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/xunidingdanxuanze.vue

@ -42,7 +42,7 @@
<span>{{ scope.row.modelAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.config }}</span>
</template>

2
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/yixiangchexingxuanze.vue

@ -42,7 +42,7 @@
<span>{{ scope.row.modelAlias }}</span>
</template>
</el-table-column>
<el-table-column label="常用配置" align="center">
<el-table-column label="常用配置" align="left" header-align="center">
<template slot-scope="scope">
<span>{{ scope.row.config }}</span>
</template>

4
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowTask.java

@ -91,11 +91,11 @@ public class FlowTask extends BaseEntity implements Serializable {
private String candidate;
@ApiModelProperty("任务创建时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date createTime;
@ApiModelProperty("任务完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
private Date finishTime;
@ApiModelProperty("环节的办理人信息")

3
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskController.java

@ -237,7 +237,8 @@ public class FlowTaskController implements FlowTaskFeign {
@Override
public ResultBean<FlowRecordVo> businessFlowRecord(String procInsId, String deployId) {
return flowTaskService.businessFlowRecord(procInsId, deployId);
ResultBean<FlowRecordVo> flowRecordVoResultBean = flowTaskService.businessFlowRecord(procInsId, deployId);
return flowRecordVoResultBean;
}
@Override

1
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskMapper.xml

@ -134,6 +134,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ahpi.END_TIME_,
ahpi.PROC_DEF_ID_,
ahpi.PROC_INST_ID_,
ahpi.START_TIME_ processCreateTime,
arpd.KEY_ AS PROC_DEF_KEY_,
arpd.NAME_ AS PROC_DEF_NAME_,
arpd.VERSION_ AS PROC_DEF_VERSION_,

15
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@ -5,15 +5,14 @@ import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto;
import com.yxt.anrui.flowable.api.flowtask.*;
import com.yxt.anrui.flowable.api.sysform.SysForm;
import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFlowStateEnum;
import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo;
import com.yxt.anrui.flowable.biz.process.ProcessService;
import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService;
import com.yxt.anrui.flowable.biz.sysprourl.SysProUrlService;
import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
import com.yxt.anrui.flowable.exception.CustomException;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskParam;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessTaskQuery;
@ -26,7 +25,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUser;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserInfoVo;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuserrole.SysUserRoleFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
@ -259,10 +257,14 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
FlowTask flowTask = new FlowTask();
flowTask.setTaskId(histIns.getTaskId());
flowTask.setTaskName(histIns.getActivityName());
Date startTime = histIns.getStartTime();
flowTask.setCreateTime(startTime);
Date endTime = histIns.getEndTime();
flowTask.setFinishTime(startTime);
flowTask.setFinishTime(endTime);
/*
flowTask.setCreateTime(histIns.getStartTime());
flowTask.setFinishTime(histIns.getEndTime());*/
if (StringUtils.isNotBlank(histIns.getAssignee())) {
ResultBean<List<SysUserVo>> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getAssignee());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee()));
List<SysUserVo> data1 = sysUserVoResultBean.getData();
@ -311,6 +313,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
flowRecordVo.setFlowList(hisFlowList);
}
return rb.success().setData(flowRecordVo);
}
@ -774,9 +777,13 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setTaskId(histTask.get("ID_").toString());
// 审批人员信息
Timestamp start_time_ = (Timestamp) histTask.get("START_TIME_");
Timestamp processCreateTime = (Timestamp) histTask.get("processCreateTime");
long time = start_time_.getTime();
long processCreateTime1 = processCreateTime.getTime();
Date date = new Date(time);
flowTask.setCreateTime(date);
flowTask.setProcessCreateTime(new Date(processCreateTime1));
flowTask.setAssigneeSid(histTask.get("ASSIGNEE_") == null ? "" : histTask.get("ASSIGNEE_").toString());
if (histTask.get("ASSIGNEE_") != null && StringUtils.isNotBlank(histTask.get("ASSIGNEE_").toString())) {
ResultBean<List<SysUserVo>> assignee_ = sysUserFeign.fetchBySids(histTask.get("ASSIGNEE_").toString());

3
anrui-portal/anrui-portal-api/src/main/java/com/yxt/anrui/portal/api/flow/app/FlowTaskFinishVo.java

@ -44,6 +44,9 @@ public class FlowTaskFinishVo implements Vo {
@ApiModelProperty(value = "发起日期")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty("任务结束时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date endTime;
@JsonIgnore
private Map<String, Object> processVariables;
@ApiModelProperty("办理的url")

3
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@ -132,7 +132,8 @@ public class FlowableRest implements FlowableFeign {
@Override
public ResultBean<FlowRecordVo> flowRecord(String procInsId, String deployId) {
return flowableService.flowRecord(procInsId, deployId);
ResultBean<FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
return flowRecordVoResultBean;// flowableService.flowRecord(procInsId, deployId);
}
@Override

4
anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableService.java

@ -296,7 +296,8 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
* @return
*/
public ResultBean<FlowRecordVo> flowRecord(String procInsId, String deployId) {
return flowTaskFeign.businessFlowRecord(procInsId, deployId);
ResultBean<FlowRecordVo> flowRecordVoResultBean = flowTaskFeign.businessFlowRecord(procInsId, deployId);
return flowRecordVoResultBean;//flowTaskFeign.businessFlowRecord(procInsId, deployId);
}
/**
@ -590,7 +591,6 @@ public class FlowableService extends MybatisBaseService<FlowableMapper, Flowable
Map<String, Object> flowMap = f.getProcessVariables();
Map<String, Object> appMap = ConstantUtils.getMap(flowMap, "app");
String json = JSONObject.toJSONString(appMap);
System.out.println(json);
AppVo appVo = new AppVo();
appVo.setJson(json);
//app版本的sid

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturn.java

@ -30,4 +30,6 @@ public class ScmVehicleReturn extends BaseEntity {
private String taskDefKey;
@ApiModelProperty(value = "分公司名称")
private String orgName;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

4
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDetailsVo.java

@ -36,4 +36,8 @@ public class ScmVehicleReturnDetailsVo implements Vo {
private String remarks;
@ApiModelProperty(value = "分公司名称")
private String orgName;
@ApiModelProperty(value = "createBySid")
private String createBySid;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnDto.java

@ -64,4 +64,6 @@ public class ScmVehicleReturnDto implements Dto {
private String createBySid;
@ApiModelProperty(value = "分公司名称")
private String orgName;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnFlowDto.java

@ -53,4 +53,6 @@ public class ScmVehicleReturnFlowDto implements Serializable {
private String taskDefKey;
@ApiModelProperty(value = "分公司名称")
private String orgName;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnQuery.java

@ -24,5 +24,8 @@ public class ScmVehicleReturnQuery implements Query {
@ApiModelProperty(value = "用户sid")
private String userSid;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

2
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclereturn/ScmVehicleReturnVo.java

@ -29,4 +29,6 @@ public class ScmVehicleReturnVo implements Vo {
private Integer num;
@ApiModelProperty(value = "分公司名称")
private String orgName;
@ApiModelProperty(value = "分公司sid")
private String createOrgSid;
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/AppScmVehinspectItemInfoVo.java

@ -17,6 +17,9 @@ public class AppScmVehinspectItemInfoVo implements Vo {
@ApiModelProperty("项目名称")
private String itemConten;
@ApiModelProperty("项目图标")
private String iconUrl;
@ApiModelProperty("检查结果:1是,0否,2无结果,默认2")
private Integer result;

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmResultImageDto.java

@ -6,6 +6,7 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -22,6 +23,6 @@ public class ScmResultImageDto implements Dto {
private String remarks;
@ApiModelProperty("相关图片")
private ScmVehinspectItemimgDto scmVehinspectItemimgDto;
private List<ScmVehinspectItemimgDto> itemImgVoList = new ArrayList<>();
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemResultImageDto.java

@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -14,6 +15,6 @@ public class ScmVehinspectItemResultImageDto implements Dto {
private String vehInspectSid;
@ApiModelProperty("检验结果及相关照片")
private List<ScmResultImageDto> scmResultImageDtos;
private List<ScmResultImageDto> scmResultImageDtos = new ArrayList<>();
}

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitem/ScmVehinspectItemsVo.java

@ -21,6 +21,9 @@ public class ScmVehinspectItemsVo implements Dto {
@ApiModelProperty(value = "序号")
private Integer sortNo;
@ApiModelProperty(value = "图标")
private String iconUrl;
private List<ScmItemDetailVo> details;
private List<ScmItemImgVo> itemImgs;

3
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehinspectitemimg/ScmVehinspectItemimgDto.java

@ -4,6 +4,7 @@ import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.ArrayList;
import java.util.List;
@Data
@ -16,7 +17,7 @@ public class ScmVehinspectItemimgDto implements Dto {
@ApiModelProperty("照片路径")
private String imgUrl;
@ApiModelProperty("照片路径集合")
private List<String> imgUrlList;
private List<String> imgUrlList = new ArrayList<>();
@ApiModelProperty("照片模板路径")
private String imgPath;
}

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

@ -112,6 +112,7 @@ public class ScmApplyInboundService extends MybatisBaseService<ScmApplyInboundMa
if (StringUtils.isNotBlank(query.getModelName())) {
qw.like("modelName", query.getModelName());
}
qw.eq("useOrgSid",query.getCreateOrgSid());
return qw;
}

2
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleexamine/ScmVehicleExamineMapper.xml

@ -33,7 +33,7 @@
and concat(sve.vinNo,sve.modelName,sve.purchaseType) LIKE concat('%', #{names}, '%')
</if>
</where>
ORDER BY inspectionDate DESC
ORDER BY sve.createTime DESC
</select>
<select id="getCarInspectedInfo"

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehicleinspectitem/ScmVehicleInspectitemMapper.xml

@ -36,7 +36,7 @@
<collection property="details" ofType="com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo"
select="detailsList" column="sid">
</collection>
<collection property="itemImgs" ofType="com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemsVo"
<collection property="itemImgs" ofType="com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo"
select="imgList" column="sid">
</collection>
</resultMap>
@ -46,7 +46,7 @@
from scm_vehicle_inspectdetail si
where si.itemSid = #{sid}
</select>
<select id="imgList" resultType="com.yxt.anrui.scm.api.scmvehinspectitem.ScmVehinspectItemsVo">
<select id="imgList" resultType="com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo">
select si.imgTitle, si.imgTempUrl as imgUrl
from scm_vehicle_inspectimgtemp si
where si.itemSid = #{sid}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclereturn/ScmVehicleReturnService.java

@ -178,6 +178,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
if (StringUtils.isNotBlank(params.getUserSid())) {
qw.eq("sr.createBySid", params.getUserSid());
}
qw.eq("sr.createOrgSid",params.getCreateOrgSid());
}
IPage<ScmVehicleReturnVo> pagging = baseMapper.pagerList(page, qw);
PagerVo<ScmVehicleReturnVo> p = PagerUtil.pageToVo(pagging, null);
@ -490,7 +491,7 @@ public class ScmVehicleReturnService extends MybatisBaseService<ScmVehicleReturn
public ResultBean<ScmVehicleReturnDetailsVo> details(String sid) {
ResultBean<ScmVehicleReturnDetailsVo> rb = ResultBean.fireFail();
ScmVehicleReturnDetailsVo vo = new ScmVehicleReturnDetailsVo();
if (StringUtils.isBlank(sid)) {
if (StringUtils.isBlank(sid)) {
//申请日期即为当天
vo.setCreateTime(DateUtil.today());
//申请单编号

25
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitem/ScmVehinspectItemService.java

@ -30,9 +30,9 @@ import com.yxt.anrui.scm.api.scmvehinspectitem.*;
import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmItemDetailVo;
import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetail;
import com.yxt.anrui.scm.api.scmvehinspectitemdetail.ScmVehinspectItemdetailVo;
import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto;
import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmItemImgVo;
import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimg;
import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgDto;
import com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo;
import com.yxt.anrui.scm.biz.scmvehicleinspectitem.ScmVehicleInspectitemService;
import com.yxt.anrui.scm.biz.scmvehinspectitemdetail.ScmVehinspectItemdetailService;
@ -45,7 +45,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -110,14 +109,20 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
}
List<ScmResultImageDto> scmResultImageDtos = dto.getScmResultImageDtos();
for (ScmResultImageDto scmResultImageDto : scmResultImageDtos) {
baseMapper.updateByVehInspectSid(scmResultImageDto.getSid(), scmResultImageDto.getRemarks(), scmResultImageDto.getResult());
ScmVehinspectItemimgDto scmVehinspectItemimgDto = scmResultImageDto.getScmVehinspectItemimgDto();
List<String> imgUrlList = scmVehinspectItemimgDto.getImgUrlList();
String imgUrl = null;
for (int i = 0; i < imgUrlList.size(); i++) {
imgUrl = imgUrlList.get(i).replace(fileUploadComponent.getUrlPrefix(), "") + ",";
List<ScmVehinspectItemimgDto> itemImgVoList = scmResultImageDto.getItemImgVoList();
for (ScmVehinspectItemimgDto scmVehinspectItemimgDto : itemImgVoList) {
String imgUrl = "";
List<String> imgUrlList = scmVehinspectItemimgDto.getImgUrlList();
for (String s : imgUrlList) {
imgUrl = s.replace(fileUploadComponent.getUrlPrefix(), "") + ",";
}
scmVehinspectItemimgDto.setImgUrl(imgUrl);
scmVehinspectItemimgService.updateByMainSid(scmVehinspectItemimgDto.getMainSid(), scmVehinspectItemimgDto.getImgUrl(), scmVehinspectItemimgDto.getImgTitle());
}
scmVehinspectItemimgService.updateByMainSid(scmResultImageDto.getSid(), imgUrl, scmVehinspectItemimgDto.getImgTitle());
}
return rb.success().setMsg("保存成功");
}
@ -142,6 +147,7 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
AppScmVehinspectItemInfoVo vo = new AppScmVehinspectItemInfoVo();
ScmVehinspectItem scmVehinspectItem = fetchBySid(sid);
vo.setIconUrl(fileUploadComponent.getUrlPrefix() + scmVehinspectItem.getIconUrl());
vo.setSid(sid);
vo.setVehInspectSid(scmVehinspectItem.getVehInspectSid());
vo.setResult(scmVehinspectItem.getResult());
@ -239,9 +245,6 @@ public class ScmVehinspectItemService extends MybatisBaseService<ScmVehinspectIt
String sid = scmVehinspectItem.getSid();
BeanUtil.copyProperties(item, scmVehinspectItem);
scmVehinspectItem.setVehInspectSid(vehInspectSid);
if (!scmVehinspectItem.getIconUrl().contains(fileUploadComponent.getUrlPrefix())){
scmVehinspectItem.setIconUrl(fileUploadComponent.getUrlPrefix()+scmVehinspectItem.getIconUrl());
}
baseMapper.insert(scmVehinspectItem);
List<ScmItemDetailVo> detailsList = item.getDetails();
detailsList.removeAll(Collections.singleton(null));

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehinspectitemimg/ScmVehinspectItemimgMapper.xml

@ -21,7 +21,8 @@
<select id="getInfoByMainSid"
resultType="com.yxt.anrui.scm.api.scmvehinspectitemimg.ScmVehinspectItemimgVo">
SELECT imgTitle,
SELECT sid as mainSid,
imgTitle,
imgUrl,
imgPath
FROM scm_vehinspect_itemimg

30
anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js

@ -125,3 +125,33 @@ export function fetchByUseOrgSid(data) {
params: data
})
}
// 出库
export function vehicleOutLibrary(data) {
return request({
url: '/base/v1/basevehicle/vehicleOutLibrary',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}
// 销售专员
export function getUserByOrgSid(data) {
return request({
url: '/portal/v1/sysuser/getUserByOrgSid',
method: 'get',
params: data,
})
}
// 买断
export function vehicleBuyBreak(data) {
return request({
url: '/base/v1/basevehicle/vehicleBuyBreak',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
}

10
anrui-scm/anrui-scm-ui/src/api/supplychain/yancheguanli.js

@ -55,6 +55,16 @@ export function getVehinspectItemInfo(vehInspectSid) {
})
}
// 保存 验车单
export function saveResultImage(data) {
return request({
url: '/scm/v1/scmvehinspectitem/saveResultImage',
data,
method: 'post',
headers: { 'Content-Type': 'application/json' }
})
}
// 数据字典
export function typeValues(data) {
return request({

2
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_chexing.vue

@ -143,8 +143,8 @@
url: file.response.data.fullUrl,
size: file.response.data.size
})
this.$emit('change', this.files)
this.$emit('eett', this.files)
this.$emit('change', this.files)
// this.getUrl()
// SaveList(this.tempInfo).then(response => {
// if (response.success) {

34
anrui-scm/anrui-scm-ui/src/components/uploadFile/upload_jianchabiao.vue

@ -5,28 +5,28 @@
</el-dialog>
<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">
:on-preview="handlePictureCardPreview" :show-file-list="false">
<el-button size="small" type="primary">点击上传</el-button>
</el-upload>
</div>
</template>
<script>
import { uploadFile } from '@/api/portal/Upload.js'
import { getStorage } from '@/utils/auth.js' //token
import { mapGetters } from 'vuex'
import { uploadFile } from '@/api/portal/Upload.js'
import { getStorage } from '@/utils/auth.js' //token
import { mapGetters } from 'vuex'
export default {
model: {
prop: 'name',
event: 'change'
export default {
model: {
prop: 'name',
event: 'change'
},
props: {
placeholder: {
type: String,
default: ''
},
props: {
placeholder: {
type: String,
default: ''
},
bucket: {
bucket: {
type: String,
default: 'abc'
},
@ -140,11 +140,7 @@
//
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.files.push(file.response.data.fullUrl)
this.$emit('change', this.files)
this.$emit('eett', this.files)
}

2
anrui-scm/anrui-scm-ui/src/icons/svg/RMB.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659150238918" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4239" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M883 552.5v-87.7H617.8L864.9 107l-73-48-272.6 394.9L246 59.4 172.3 106l247.5 358.8H154.9v87.1h320v90.2h-320V731h320v234h88.7V729.8H883v-86.5H563.6v-89.5z" p-id="4240" fill="#ffffff"></path></svg>

After

Width:  |  Height:  |  Size: 888 B

2
anrui-scm/anrui-scm-ui/src/icons/svg/exwarehouse.svg

@ -0,0 +1,2 @@
<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1659150062635" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2249" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
</style></defs><path d="M112.8 990.4h204.32a35.68 35.68 0 1 0 0-71.36H115.04V356.64l378.4-254.4 384 268v178.4a36.32 36.32 0 0 0 72.64 0V368.96a68.64 68.64 0 0 0-29.6-56.32L534.4 43.2a71.68 71.68 0 0 0-80-0.8l-380.64 256a68.8 68.8 0 0 0-30.56 57.12v565.76a69.44 69.44 0 0 0 69.6 69.12z" fill="#ffffff" p-id="2250"></path><path d="M867.2 808.8H486.08a35.04 35.04 0 1 1 0-70.08H867.2a35.04 35.04 0 0 1 0 70.08z" fill="#ffffff" p-id="2251"></path><path d="M749.92 981.28a34.88 34.88 0 0 1-25.44-58.88l140.96-150.72-148.16-145.28A35.04 35.04 0 0 1 766.4 576l172.48 169.6a35.04 35.04 0 0 1 1.12 48.96l-164.32 176a35.2 35.2 0 0 1-25.76 10.72z" fill="#ffffff" p-id="2252"></path></svg>

After

Width:  |  Height:  |  Size: 1.3 KiB

8
anrui-scm/anrui-scm-ui/src/styles/element-table.scss

@ -9,6 +9,14 @@
}
}
.el-table {
.el-table__row {
.cell {
line-height:15px;
}
}
}
.el-table {
.el-table__body {
tr td {

6
anrui-scm/anrui-scm-ui/src/styles/index.scss

@ -171,7 +171,7 @@ div:focus {
.search {
.tab-header {
.el-form-item {
margin-right: 30px;
margin-right: 16px;
.el-form-item__label {
font-size: 16px;
font-weight: 500;
@ -232,7 +232,9 @@ div:focus {
text-align: left;
color: #ffffff;
}
.first_row{
border-top: 1px solid $table-border-color;
}
.el-row {
display: flex;
flex-wrap: wrap;

65
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@ -105,6 +105,10 @@
<!-- 车型配置标准页面 -->
<vehicleconfiguration v-show="viewState == 5" ref="divPeizhi" @doback="resetState"/>
<!-- <changyongpeizhi-info v-show="viewState == 5" ref="divPeizhi" @doback="resetState"></changyongpeizhi-info>-->
<!-- 出库 -->
<cheliangtaizhang-chu v-show="viewState == 6" ref="divPeizhi" @doback="resetState" />
<!-- 买断 -->
<cheliangtaizhang-mai v-show="viewState == 7" ref="divPeizhi" @doback="resetState" />
</div>
</template>
@ -127,6 +131,8 @@ import vehicleconfiguration from '@/views/cheliang/cheliangtaizhang/relation/veh
import ButtonBar from '@/components/ButtonBar'
import Vehicle from '@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle'
import { getPathSidByUserSid } from '@/api/cheliang/basevehiclemodel'
import cheliangtaizhangChu from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu'
import cheliangtaizhangMai from '@/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai'
export default {
name: 'cheliangtaizhang',
@ -138,7 +144,9 @@ export default {
ButtonBar,
cheliangtaizhangAdd,
CheliangtaizhangInfo,
vehicleconfiguration
vehicleconfiguration,
cheliangtaizhangChu,
cheliangtaizhangMai
},
data() {
return {
@ -170,16 +178,16 @@ export default {
btnLabel: '删除'
},
{
type: 'danger',
type: 'primary',
size: 'small',
icon: '',
icon: 'exwarehouse',
btnKey: 'doChuku',
btnLabel: '出库'
},
{
type: 'danger',
type: 'primary',
size: 'small',
icon: '',
icon: 'RMB',
btnKey: 'doMaiduan',
btnLabel: '买断'
},
@ -432,6 +440,53 @@ export default {
// query: { sid: row.sid }
// })
},
//
doChuku(){
if (this.sids.length === 1) {
this.viewState = 6
const sid = this.sids[0]
// this.$refs['divchuku'].showChu(sid)
} else if (this.sids.length > 1) {
this.$notify({
title: '提示',
message: '不能选中多个车辆台账修改!!',
type: 'info',
duration: 2000
})
} else {
this.$notify({
title: '提示',
message: '没有选择车辆台账!!',
type: 'error',
duration: 2000
})
return
}
},
//
doMaiduan(){
if (this.sids.length === 1) {
this.viewState = 7
const sid = this.sids[0]
// this.$refs['divmaiduan'].showMai(sid)
} else if (this.sids.length > 1) {
this.$notify({
title: '提示',
message: '只可选择一条数据进行操作!',
type: 'info',
duration: 2000
})
} else {
this.$notify({
title: '提示',
message: '请选择一条数据进行操作!',
type: 'error',
duration: 2000
})
return
}
},
//
createData() {
// console.log('' + JSON.stringify(this.temp))

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhangAdd.vue

@ -842,7 +842,7 @@ export default {
// if (this.vehiclePhoto_Images.length > 0) {
// for (var i = 0; i < this.vehiclePhoto_Images.length; i++) {
// var image_start = this.vehiclePhoto_Images.indexOf('/upload') + 8
// var image_url = this.vehiclePhoto_Images.substring(image_start)
// var image_url = his.vehiclePhoto_Images.substring(image_start)
// this.temp.vehiclePhoto.push(image_url)
// }
// }

216
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue

@ -0,0 +1,216 @@
<template>
<div class="app-container">
<div class="tab-header webtop">
<div>车辆出库</div>
<div>
<el-button type="primary" size="small" :disabled="dialogFormVisible" @click="handleCreate()">保存</el-button>
<el-button type="info" size="small" :disabled="dialogFormVisible" @click="handleReturn()">返回</el-button>
</div>
</div>
<div class="listconadd">
<div class="titwu">车辆出库</div>
<el-form ref="dataForm" :model="temp" label-position="right" label-width="190px" class="formadd" :rules="rules">
<el-row class="first_row">
<el-col :span="12">
<el-form-item prop="modelName">
<span slot="label">出库类型</span>
<el-select ref="config" v-model="temp.modelSid" class="addinputw" clearable placeholder=""
filterable
@change="modelSidChange">
<el-option v-for="(item,index) in modelName_list" :key="item.sid" :label="item.modelName"
:value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="modelConfigSid">
<span slot="label">常用配置</span>
<el-select ref="config" v-model="temp.modelConfigSid" class="addinputw" clearable placeholder=""
@change="modelConfigChange">
<el-option v-for="(item,index) in modelConfig_list" :key="item.sid" :label="item.configName"
:value="item.sid"/>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="vehicleState">
<span slot="label">库存状态</span>
<el-select v-model="temp.vehicleState" class="addinputw" clearable placeholder=""
@change="vehicleStateValueChange">
<el-option v-for="(item,index) in vehicleState_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item>
<span slot="label">车架号</span>
<el-input v-model="temp.vinNo" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="">
<span slot="label">内部编码</span>
<el-input placeholder="" class="addinputw" v-model="temp.insideCode" clearable/>
</el-form-item>
<!-- <el-form-item prop="engineNo">-->
<!-- <span slot="label">发动机号/许可证号</span>-->
<!-- <el-input v-model="temp.engineNo" maxlength="125" placeholder="" class="addinputw" clearable/>-->
<!-- </el-form-item>-->
</el-col>
<el-col :span="12">
<el-form-item prop="orderingNo">
<span slot="label">厂家订单编码</span>
<el-input v-model="temp.orderingNo" maxlength="125" placeholder="" class="addinputw" clearable/>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="manPurOrderTypeKey">
<span slot="label">厂家采购订单类型</span>
<el-select v-model="temp.manPurOrderTypeKey " class="addinputw" clearable placeholder=""
@change="manPurOrderTypeChange">
<el-option v-for="(item,index) in manPurOrderType_list" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey"/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="priceDate">
<span slot="label">厂家入库日期</span>
<el-date-picker v-model="temp.priceDate" type="date" format="yyyy-MM-dd" class="addinputw"
value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
<!-- <el-input v-model="temp.manufactureDate" maxlength="125" placeholder="" class="addinputw" clearable /> -->
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item prop="departureDate">
<span slot="label">发车日期</span>
<el-date-picker v-model="temp.departureDate" type="date" format="yyyy-MM-dd" class="addinputw"
value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item prop="arrivalDate">
<span slot="label">到货日期</span>
<el-date-picker v-model="temp.arrivalDate" type="date" format="yyyy-MM-dd" class="addinputw"
value-format="yyyy-MM-dd" placeholder="选择日期时间"/>
<!-- <el-input v-model="temp.manufactureDate" maxlength="125" placeholder="" class="addinputw" clearable /> -->
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</template>
<script>
import { getUserByOrgSid, vehicleOutLibrary } from '@/api/cheliang/basevehicle'
import { typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'cheliangtaizhangChu',
data() {
return {
temp: {
address: '',//
contractNo: '',//
customerName: '',//
customerType: '',// value
customerTypeKey: '',// key
idnumber: '', //
mobile: '',//
outLibraryValue: '',// value
salePrice: '',//
userSid: '',// userSid
vehicleSid: '',// sid
vehicleStateValue: '' // value
},
payType_list:[],
customertype_list:[],
person_list:[],
dialogFormVisible: false,
rules: {}
}
},
methods: {
getType() {
typeValues({
type:'payType'
}).then((res) => {
if (res.success){
this.payType_list = res.data
}
})
typeValues({
type:'customertype'
}).then((res) => {
if (res.success){
this.customertype_list = res.data
}
})
},
outLibraryChange(val) {
if (val) {
const choosetItem = this.payType_list.filter((item) => item.dictValue == val)
this.temp.outLibraryKey = choosetItem[0].dictKey
console.log('name:', this.temp.outLibraryValue, 'key:', this.temp.outLibraryKey)
}
},
customertypeChange(val) {
if (val) {
const choosetItem = this.customertype_list.filter((item) => item.dictKey == val)
this.temp.customerType = choosetItem[0].dictValue
console.log('name:', this.temp.customerType, 'key:', this.temp.customerTypeKey)
}
},
getUser() {
const data = {
orgSid: window.sessionStorage.getItem('orgSid'),
userSid: window.sessionStorage.getItem('userSid')
}
getUserByOrgSid(data).then((res) => {
if (res.success){
this.person_list = res.data
}
})
},
showChu(sid){
this.temp.vehicleSid = sid
this.getType()
this.getUser()
},
//
handleCreate() {
vehicleOutLibrary(this.temp).then((response) => {
this.FormLoading = false
if (response.code === '200') {
this.dialogFormVisible = false
this.handleReturn('true')
}
})
.catch(e => {
this.dialogFormVisible = false
})
},
//
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.temp = {}
this.$emit('doback')
// this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

13
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangMai.vue

@ -0,0 +1,13 @@
<template>
</template>
<script>
export default {
name: 'cheliangtaizhangMai'
}
</script>
<style scoped>
</style>

1
anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue

@ -484,6 +484,7 @@ export default {
//
getList() {
this.listLoading = true
console.log('123456')
pagerList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false

140
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/vehiclechecklist.vue

@ -3,13 +3,13 @@
<div class="tab-header webtop">
<div>验车单</div>
<div>
<el-button type="primary" size="small" @click="handleCreate">保存</el-button>
<el-button type="primary" size="small" :disabled="disable" @click="handleCreate">保存</el-button>
<el-button type="info" size="small" @click="handleReturn">关闭</el-button>
</div>
</div>
<el-form class="formadd">
<div>
<el-table :data="tableData" border style="width: 100%; margin-top: 20px" max-height="600">
<el-table :data="scmResultImageDtos" border style="width: 100%; margin-top: 20px" max-height="600">
<el-table-column label="序号" width="70" align="center">
<template slot-scope="scope">
<span>{{ scope.row.sortNo }}</span>
@ -38,17 +38,27 @@
<el-input v-model="scope.row.remarks" clearable placeholder="" resize="none" type="textarea" :autosize="{ minRows: 2, maxRows: 8 }"></el-input>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="left" width="360">
<el-table-column label="操作" header-align="center" align="left" width="410">
<template slot-scope="scope">
<div v-if="scope.row.itemImgVoList.length > 0">
<div class="operate" v-for="item in scope.row.itemImgVoList">
<div class="operate" v-for="(item,index) in scope.row.itemImgVoList">
<div>
<span>{{ item.imgTitle }}</span>
</div>
<div>
<el-button type="primary" size="small" @click="handleLookImg">查看</el-button>
<el-button type="primary" size="small" @click="handleUpload">上传</el-button>
<el-button type="primary" size="small" @click="handleExample">图片示例</el-button>
<el-button type="primary" size="small"
@click="handleLookImg(scope.row.itemImgVoList[index].imgUrlList)">查看
</el-button>
<div class="upload_img"> <!-- @change="getUrl($event, index,scope.$index)" -->
<upload_jianchabiao ref="uploadMoreImg"
v-model="scope.row.itemImgVoList[index].imgUrlList"
:limit="1" bucket="map"
:upload-data="{type:'0001'}"/>
</div>
<!-- <el-button type="primary" size="small" @click="handleUpload">上传</el-button>-->
<el-button type="primary" size="small"
@click="handleExample(scope.row.itemImgVoList[index].imgPathList)">图片示例
</el-button>
</div>
</div>
</div>
@ -57,19 +67,59 @@
</el-table>
</div>
</el-form>
<!-- 查看上传图片弹窗 -->
<el-dialog title="开票信息图片" :visible.sync="dialogVisible">
<div v-for="(item,index) in dialogUrl" style="display:inline-block;">
<div class="dialogImg">
<el-image
:key="index"
:src="item"
style="width: 100px; height: 100px"
:preview-src-list="dialogUrl">
</el-image>
<el-button class="btn_style" type="danger" size="mini" @click="handleDel(index)">删除</el-button>
</div>
</div>
</el-dialog>
<!-- 查看图片示例弹窗 -->
<el-dialog title="开票信息图片" :visible.sync="dialogVisiblePath">
<div v-for="(item,index) in dialogimgPathList" style="display:inline-block;">
<div class="dialogImg">
<el-image
:key="index"
:src="item"
style="width: 100px; height: 100px"
:preview-src-list="dialogimgPathList">
</el-image>
</div>
</div>
</el-dialog>
</div>
</template>
<script>
import { getVehinspectItemInfo } from '@/api/supplychain/yancheguanli'
import upload from '@/components/uploadFile/upload'
import { getVehinspectItemInfo, saveResultImage } from '@/api/supplychain/yancheguanli'
import upload_jianchabiao from '@/components/uploadFile/upload_jianchabiao'
export default {
name: 'cheliangjianchabiao',
components: {
upload_jianchabiao
},
data() {
return {
formobj: {},
tableData: [],
temp: {
vehInspectSid: '',
scmResultImageDtos: []
},
disable: false,
scmResultImageDtos: [],
dialogVisible: false,
dialogUrl: [], //
dialogVisiblePath: false,
dialogimgPathList: [], //
aa: [1, 3, 0, 0]
}
},
@ -77,27 +127,61 @@ export default {
// this.showEdit()
},
methods: {
handleCreate() {},
handleCreate() {
this.temp.scmResultImageDtos = this.scmResultImageDtos
// this.$refs['dataForm'].validate((valid) => {
// if (valid) {
this.disable = true
//
saveResultImage(this.temp).then((response) => {
this.disable = false
if (response.code === '200') {
this.handleReturn()
} else {
this.$message({
showClose: true,
message: '保存失败!',
type: 'error'
})
}
})
// }
// })
},
handleReturn() {
this.$emit('doback')
},
showCheck(inspectedSid) {
const vehInspectSid = inspectedSid
this.temp.vehInspectSid = vehInspectSid
getVehinspectItemInfo(vehInspectSid).then((resp) => {
if (resp.success) {
this.tableData = resp.data
this.scmResultImageDtos = resp.data
}
})
},
handleLookImg(){
},
handleUpload(){
//
handleLookImg(val) {
console.log('上传图片', val)
this.dialogVisible = true
this.dialogUrl = val
},
handleExample(){
//
handleExample(val) {
console.log('图片示例', val)
this.dialogVisiblePath = true
this.dialogimgPathList = val
},
handleDel(index) {
this.dialogUrl.splice(index, 1)
// this.dialogUrl.forEach((item, index) => {
// if (item === val) {
// this.dialogUrl.splice(index, 1)
// }
// })
}
// getUrl(){
// }
// arraySpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log(rowIndex, columnIndex)
// if (columnIndex === 0 || columnIndex === 1 || columnIndex === 3 || columnIndex === 4 || columnIndex === 5) {
@ -118,6 +202,7 @@ export default {
.btn {
border-bottom: 1px solid #e0e3eb;
}
.operate {
display: flex;
flex-direction: row;
@ -125,7 +210,20 @@ export default {
align-items: center;
padding-top: 5px;
}
.con_style{
.con_style {
padding: 2px 0;
}
.upload_img {
display: inline-block;
padding: 0 10px;
}
.dialogImg{
display: flex;
flex-direction: column;
justify-content: center;
align-items: center;
}
</style>

2
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliAdd.vue

@ -84,7 +84,7 @@
</el-form-item>
</el-col>
<el-col :span="2">
<!-- <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-col>
</el-row>
</div>

3
anrui-scm/anrui-scm-ui/src/views/supplychain/yancheguanli/yancheguanliInfo.vue

@ -50,7 +50,7 @@
</el-col>
<el-col :span="2">
<el-form-item>
<!-- <el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>-->
<el-button type="primary" size="small" @click="handleChecklist()">车辆检查表</el-button>
</el-form-item>
</el-col>
</el-row>
@ -168,6 +168,7 @@ export default {
getCarInspected(row.inspectedSid).then((res) => {
if (res.success) {
this.temp = res.data
this.temp.inspectedSid = row.inspectedSid
}
})
},

14
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java

@ -1,11 +1,13 @@
package com.yxt.anrui.terminal.api.app.flowable;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
@ -26,10 +28,14 @@ public class AppFlowableRecordVo implements Vo {
@ApiModelProperty(value = "流程状态value")
private String stateValue;
@ApiModelProperty(value = "办理时间")
private String time;
@ApiModelProperty(value = "接收时间")
private String createTime;
@ApiModelProperty("接收时间")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date createTime;
@ApiModelProperty("办理时间")
@JsonProperty("time")
@JsonFormat(pattern = "yyyy-MM-dd")
private Date finishTime;
@ApiModelProperty(value = "任务耗时")
private String duration;

4
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionDetailsVo.java

@ -10,13 +10,15 @@ import java.util.List;
@Data
public class AppGressionDetailsVo implements Vo {
private static final long serialVersionUID = -2419006122141103302L;
private String sid;
@ApiModelProperty("任务id")
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
@JsonProperty("procInsId")
private String procInstId;
@ApiModelProperty("用户sid")
private String userSid;

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionInfoVo.java

@ -16,7 +16,8 @@ public class AppGressionInfoVo implements Vo {
private String taskId;
@ApiModelProperty("流程实例id")
private String procInsId;
@JsonProperty("procInsId")
private String procInstId;
@ApiModelProperty("用户sid")
private String userSid;

10
anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@ -36,13 +36,14 @@ public class AppService {
List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
voList.removeAll(Collections.singleton(null));
for (AppFlowableRecordVo vo : voList) {
String time = vo.getTime();
if (StringUtils.isNotBlank(time)) {
if (vo.getFinishTime() != null) {
AppFlowCommentVo commentVo = vo.getComment();
//类型
String type = commentVo.getType();
String comment = commentVo.getComment();
vo.setContent(comment);
if(StringUtils.isNotBlank(comment) ){
vo.setContent(comment);
}
String stateValue = FlowComment.getRemarkByType(type);
if (StringUtils.isNotBlank(stateValue)) {
vo.setStateValue(stateValue);
@ -50,10 +51,7 @@ public class AppService {
if (StringUtils.isNotBlank(type)) {
vo.setStateKey(type);
}
vo.setTime(sdf.format(new Date(Long.parseLong(time))));
}
vo.setCreateTime(sdf.format(new Date(Long.parseLong(vo.getCreateTime()))));
}
return rb.success().setData(voList);
}

Loading…
Cancel
Save