Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 5 months ago
parent
commit
0b9366407a
  1. 93
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_FEntity.json
  2. 11
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_data.json
  3. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_model.json
  4. 1
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  5. 9
      anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js
  6. 35
      anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue
  7. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListQuery.java
  8. 42
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java
  9. 49
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java
  10. 41
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustCompleteDto.java
  11. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustDelegateQuery.java
  12. 26
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustGetNodeQuery.java
  13. 25
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustGetNodeVo.java
  14. 56
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustTaskQuery.java
  15. 20
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/SubmitAdjustDto.java
  16. 1
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsQuery.java
  17. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.java
  18. 27
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml
  19. 54
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java
  20. 562
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java
  21. 4
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustdetails/ScmFinanceAdjustDetailsMapper.xml
  22. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustdetails/ScmFinanceAdjustDetailsService.java
  23. 9
      anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js
  24. 135
      anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js
  25. 51
      anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js
  26. 352
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue
  27. 436
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue
  28. 203
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue
  29. 227
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue
  30. 266
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue
  31. 251
      anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue
  32. 463
      anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue
  33. 405
      anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue
  34. 249
      anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue
  35. 227
      anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue

93
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_FEntity.json

@ -1,116 +1,31 @@
{
"FEntryID": "0",
"FStockOrgID": {
"FNumber": "@KD_FStockOrgID"
},
"FMaterialID": {
"FNumber": "@KD_FMaterialID"
},
"FAuxPropId": {
"FAUXPROPID__FF100001": {
"FNumber": ""
},
"FAUXPROPID__FF100005": {
"FNumber": ""
},
"FAUXPROPID__FF100002": {
"FNumber": ""
},
"FAUXPROPID__FF100004": {
"FNumber": ""
},
"FAUXPROPID__FF100006": {
"FNumber": ""
}
},
"FLOT": {
"FNumber": ""
},
"FBOMId": {
"FNumber": ""
},
"FSTOCKSTATUSID": {
"FNumber": "KCZT01_SYS"
},
"FAdjustmentAMOUNT": "@KD_FAdjustmentAMOUNT",
"FAdjustmentAMOUNTFor": "0",
"FStockID": {
"FNumber": "ARZSCK"
},
"FOwnerID": {
"FNumber": "@KD_FOwnerID"
},
"FSTOCKLOCID": {
"FSTOCKLOCID__FF100001": {
"FNumber": ""
},
"FSTOCKLOCID__FF100002": {
"FNumber": ""
},
"FSTOCKLOCID__FF100003": {
"FNumber": ""
},
"FSTOCKLOCID__FF100004": {
"FNumber": ""
},
"FSTOCKLOCID__FF100005": {
"FNumber": ""
},
"FSTOCKLOCID__FF100006": {
"FNumber": ""
},
"FSTOCKLOCID__FF100007": {
"FNumber": ""
},
"FSTOCKLOCID__FF100008": {
"FNumber": ""
},
"FSTOCKLOCID__FF100009": {
"FNumber": ""
},
"FSTOCKLOCID__FF100010": {
"FNumber": ""
}
},
"FAcctgRangeID": {
"FNumber": ""
},
"FMtoNo": "",
"FSeqId": "",
"FPROJECTNO": "",
"FOwnerTypeId": "",
"FPrice": "0",
"FSeqEntryId": "0",
"FInvoiceRateType": {
"FNumber": ""
},
"FStockRateType": {
"FNumber": ""
},
"FOriginalCurrencyId": {
"FNumber": ""
},
"FStockRate": "0",
"FInvoiceRate": "0",
"FRateDiff": "0",
"FPriceDiff": "0",
"FQty": "0",
"FCostCenterID": {
"FNumber": ""
},
"FSRCSEQ": "0",
"FSRCBILLNO": "",
"FSRCBILLTYPEID": {
"FNumber": ""
"FNumber": "HSFW000001_SYS"
},
"FOwnerTypeId": "BD_OwnerOrg",
"FDepartmentId": {
"FNUMBER": "@KD_FDepartmentId"
},
"FExpense": [{
"FExpenseEntryID": "0",
"FExpenseID": {
"FNumber": ""
"FNumber": "FYXM01_SYS"
},
"FExpenseAmount": "0"
"FExpenseAmount": "@KD_FAdjustmentAMOUNT"
}]
}

11
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_data.json

@ -2,12 +2,13 @@
"Creator": "",
"NeedUpDateFields": [],
"NeedReturnFields": [],
"IsDeleteEntry": "True",
"IsDeleteEntry": "true",
"SubSystemId": "",
"IsVerifyBaseDataField": "True",
"IsEntryBatchFill": "True",
"ValidateFlag": "True",
"NumberSearch": "True",
"IsVerifyBaseDataField": "false",
"IsEntryBatchFill": "true",
"ValidateFlag": "true",
"NumberSearch": "true",
"InterationFlags": "",
"IsAutoSubmitAndAudit": "false",
"Model": {}
}

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/costadjustmentsbill/data_model.json

@ -23,14 +23,15 @@
},
"FAdjustmentReason": "",
"FAcctgId": "0",
"FDocumentStatus": "",
"FDocumentStatus": "Z",
"FCreateDate": "@KD_FDATE",
"FCreateOrgId": {
"FNumber": ""
"FNumber": "@KD_FAcctOrgID"
},
"FCreatorId": {
"FUserID": ""
},
"FInOutIndex": "",
"FInOutIndex": "1",
"F_PAEZ_Assistant": {
"FNumber": "01"
},

1
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@ -83,6 +83,7 @@ public enum ProcDefEnum {
LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"),
LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"),
ENTERPRISEAPPLY("定点企业备案", "process_tvywp9ri:2:14197516"),
JTTXCYSQ("金融贴息差异调整申请", "process_q1yy2tlg:2:16682508"),
/******************************测试流程id*********************************************/

9
anrui-riskcenter-ui/src/api/overduevehicle/overduevehicle.js

@ -10,6 +10,15 @@ export default {
headers: { 'Content-Type': 'application/json' }
})
},
exportExcel(data) {
return request({
url: '/riskcenter/v1/Loanbeoverdueveh/excelList',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 风控专员--查看的逾期车辆列表
riskListPage: function(data) {
return request({

35
anrui-riskcenter-ui/src/views/overduevehicle/overduevehicle.vue

@ -158,6 +158,13 @@ export default {
btnKey: 'toAllot',
btnLabel: '分配风控人员'
},
{
type: 'primary',
size: 'small',
icon: 'export',
btnKey: 'doExport',
btnLabel: '导出'
},
{
type: 'info',
size: 'small',
@ -263,6 +270,9 @@ export default {
break
case 'toAllot':
this.toAllot()
case 'doExport':
this.doExport()
break
break
case 'doClose':
this.doClose()
@ -381,6 +391,31 @@ export default {
this.$message({ showClose: true, type: 'error', message: '请选择风控人员' })
}
},
doExport() {
const loading = this.$loading({
lock: true,
text: 'Loading',
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.exportExcel(this.listQuery.params).then((resp) => {
loading.close()
const blob = new Blob([resp], {
type: 'application/vnd.ms-excel'
})
const fileName = '逾期车辆列表' + '.xls'
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'nonde'
elink.href = URL.createObjectURL(blob)
document.body.appendChild(elink)
elink.click()
URL.revokeObjectURL(elink.href)
document.body.removeChild(elink)
}).catch(() => {
loading.close()
})
},
resetState() {
this.viewState = 1
},

1
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/AdjustVehListQuery.java

@ -26,4 +26,5 @@ public class AdjustVehListQuery implements Query {
@ApiModelProperty("用户sid")
private String userSid;
private String[] sids; //已选择车辆sid
}

42
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeign.java

@ -25,14 +25,20 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmfinanceadjustapply;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: scm(金融贴息) <br/>
* File: ScmFinanceAdjustApplyFeign.java <br/>
@ -86,5 +92,41 @@ public interface ScmFinanceAdjustApplyFeign {
@ResponseBody
public ResultBean<PagerVo<AdjustVehListVo>> finAdjustList(@RequestBody PagerQuery<AdjustVehListQuery> pq);
//------------------------------流程接口----------------------------------------------
@ApiOperation("欠款客户备案提交")
@PostMapping("/submit")
public ResultBean submitRecordApplication(@RequestBody @Valid SubmitAdjustDto dto);
@ApiOperation(value = "办理(同意)")
@PostMapping("/complete")
public ResultBean complete(@Valid @RequestBody AdjustCompleteDto dto);
@ApiOperation(value = "撤回流程")
@PostMapping(value = "/revokeProcess")
public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody AdjustTaskQuery query);
@ApiOperation(value = "驳回任务")
@PostMapping(value = "/reject")
public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody AdjustTaskQuery query);
@ApiOperation(value = "终止任务")
@PostMapping(value = "/breakProcess")
public ResultBean breakProcess(@RequestBody AdjustTaskQuery query);
@ApiOperation(value = "流程历史流转记录")
@GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
@ApiOperation(value = "获取下一个环节")
@GetMapping(value = "/getNextNodesForSubmit")
ResultBean<List<AdjustGetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap AdjustGetNodeQuery query);
@ApiOperation(value = "获取上一个环节")
@GetMapping(value = "/getPreviousNodesForReject")
ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap AdjustGetNodeQuery query);
@ApiOperation(value = "加签")
@PostMapping(value = "/delegate")
public ResultBean delegate(@RequestBody AdjustDelegateQuery distributorDelegateQuery);
}

49
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/ScmFinanceAdjustApplyFeignFallback.java

@ -25,11 +25,15 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmfinanceadjustapply;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
import javax.validation.Valid;
import java.util.List;
/**
* Project: scm(金融贴息) <br/>
* File: ScmFinanceAdjustApplyFeignFallback.java <br/>
@ -77,4 +81,49 @@ public class ScmFinanceAdjustApplyFeignFallback implements ScmFinanceAdjustApply
public ResultBean<PagerVo<AdjustVehListVo>> finAdjustList(PagerQuery<AdjustVehListQuery> pq) {
return null;
}
@Override
public ResultBean submitRecordApplication(@Valid SubmitAdjustDto dto) {
return null;
}
@Override
public ResultBean complete(@Valid AdjustCompleteDto dto) {
return null;
}
@Override
public ResultBean revokeProcess(AdjustTaskQuery query) {
return null;
}
@Override
public ResultBean taskReject(AdjustTaskQuery query) {
return null;
}
@Override
public ResultBean breakProcess(AdjustTaskQuery query) {
return null;
}
@Override
public ResultBean flowRecord(String procInsId) {
return null;
}
@Override
public ResultBean<List<AdjustGetNodeVo>> getNextNodesForSubmit(@Valid AdjustGetNodeQuery query) {
return null;
}
@Override
public ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject(@Valid AdjustGetNodeQuery query) {
return null;
}
@Override
public ResultBean delegate(AdjustDelegateQuery distributorDelegateQuery) {
return null;
}
}

41
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustCompleteDto.java

@ -0,0 +1,41 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import com.yxt.common.core.dto.Dto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 9:01
* @Description
*/
@Data
public class AdjustCompleteDto implements Dto {
private static final long serialVersionUID = 3240453987322803352L;
@ApiModelProperty(value = "用户sid")
@NotBlank(message = "参数错误:userSid")
private String userSid;
@ApiModelProperty(value = "用户全路径sid")
private String orgSidPath;
@ApiModelProperty(value = "节点id")
@NotBlank(message = "参数错误:taskDefKey")
private String taskDefKey;
@ApiModelProperty(value = "任务id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
@ApiModelProperty(value = "流程id")
@NotBlank(message = "参数错误:instanceId")
private String instanceId;
@ApiModelProperty(value = "意见")
@NotBlank(message = "参数错误:comment")
private String comment;
@ApiModelProperty(value = "业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustDelegateQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @author Administrator
* @description
* @date 2023/9/28 9:28
*/
@Data
public class AdjustDelegateQuery {
@ApiModelProperty
private String userSid;
@ApiModelProperty("流程实例id")
// @JsonProperty("procInsId")
private String instanceId;
@ApiModelProperty("任务Id")
private String taskId;
@ApiModelProperty("审批人sid")
private String assignee;
@ApiModelProperty("填写意见")
private String views;
}

26
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustGetNodeQuery.java

@ -0,0 +1,26 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Map;
/**
* @Author dimengzhe
* @Date 2022/6/28 10:42
* @Description
*/
@Data
public class AdjustGetNodeQuery implements Query {
private static final long serialVersionUID = -5674867230708197611L;
@ApiModelProperty(value = "环节定义id")
private String taskDefKey;
@ApiModelProperty(value = "业务sid")
private String businessSid;
@ApiModelProperty(value = "分支字段及业务字段")
private Map<String, Object> formVariables;
}

25
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustGetNodeVo.java

@ -0,0 +1,25 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
/**
* @Author dimengzhe
* @Date 2022/6/28 11:09
* @Description
*/
@Data
public class AdjustGetNodeVo implements Vo {
private static final long serialVersionUID = 8802774014747063504L;
@ApiModelProperty(value = "节点名称")
private String name;
@ApiModelProperty(value = "节点id")
private String id;
@ApiModelProperty(value = "审批组")
private List<String> candidateGroups;
@ApiModelProperty(value = "是否是最后环节")
private String endTask;
}

56
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/AdjustTaskQuery.java

@ -0,0 +1,56 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotBlank;
/**
* @Author dimengzhe
* @Date 2022/6/28 17:29
* @Description 终止撤回驳回查询参数
*/
@Data
public class AdjustTaskQuery implements Query {
private static final long serialVersionUID = -4006020771892400451L;
/**
* 终止驳回撤回
*/
@ApiModelProperty("任务Id")
@NotBlank(message = "参数错误:taskId")
private String taskId;
/**
* 终止驳回撤回
*/
@ApiModelProperty("业务sid")
@NotBlank(message = "参数错误:businessSid")
private String businessSid;
/**
* 终止驳回
*/
@ApiModelProperty("任务意见")
private String comment;
/**
* 终止撤回驳回
*/
@ApiModelProperty("用户Sid")
private String userSid;
/**
* 终止
*/
@ApiModelProperty("流程实例Id")
private String instanceId;
/*@ApiModelProperty("用户Id")
private String userId;
@ApiModelProperty("节点")
private String targetKey;
@ApiModelProperty("流程变量信息")
private Map<String, Object> values = new HashMap<>();
@ApiModelProperty("审批人")
private String assignee;
@ApiModelProperty("候选人")
private List<String> candidateUsers = new ArrayList<>();
@ApiModelProperty("审批组")
private List<String> candidateGroups = new ArrayList<>();*/
}

20
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustapply/flow/SubmitAdjustDto.java

@ -0,0 +1,20 @@
package com.yxt.anrui.scm.api.scmfinanceadjustapply.flow;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.ScmFinanceAdjustApplyDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @Author dimengzhe
* @Date 2022/6/27 13:38
* @Description
*/
@Data
public class SubmitAdjustDto extends ScmFinanceAdjustApplyDto {
private static final long serialVersionUID = 378585162071125756L;
@ApiModelProperty("流程实例id")
private String instanceId;
@ApiModelProperty("任务id")
private String taskId;
}

1
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmfinanceadjustdetails/ScmFinanceAdjustDetailsQuery.java

@ -98,6 +98,7 @@ public class ScmFinanceAdjustDetailsQuery implements Query {
* 车架号
*/
private String vinNo;
private String adjustWay;
}

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.java

@ -39,6 +39,7 @@ import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
import java.util.List;
import java.util.Map;
/**
* Project: scm(金融贴息) <br/>
@ -73,4 +74,6 @@ public interface ScmFinanceAdjustApplyMapper extends BaseMapper<ScmFinanceAdjust
int selectNum(String bill);
int selectBySid(String join);
int updateFlowFiled(Map<String, Object> map);
}

27
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyMapper.xml

@ -1,7 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yxt.anrui.scm.biz.scmfinanceadjustapply.ScmFinanceAdjustApplyMapper">
<!-- <where> ${ew.sqlSegment} </where>-->
<update id="updateFlowFiled">
UPDATE scm_finance_adjust_apply
SET nodeState=#{nodeState}
, nodeSid=#{taskDefKey}
<if test="procDefId != null and procDefId != ''">
, procDefId=#{procDefId}
</if>
<if test="procInsId != null and procInsId != ''">
, procInstId=#{procInsId}
</if>
<if test="taskId != null and taskId != ''">
, taskId=#{taskId}
</if>
WHERE sid = #{sid}
</update>
<!-- <where> ${ew.sqlSegment} </where>-->
<!-- ${ew.customSqlSegment} -->
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmfinanceadjustapply.ScmFinanceAdjustApplyVo">
SELECT
@ -49,9 +64,9 @@
r.uploadMoney,
r.adjustmentMoney,
( SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') as alreadyMoney,
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') as alreadyMoney,
(r.adjustmentMoney - ( SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
(SELECT o.sid orderSid FROM anrui_buscenter.bus_sales_order_vehicle bv LEFT JOIN anrui_buscenter.bus_sales_order as o ON bv.salesOrderSid = o.sid WHERE bv.linkSid = d.vehSid AND o.nodeState = '已办结' ORDER BY o.createTime DESC LIMIT 1) as orderSid
FROM
scm_vehrebate_checkapplydetail AS d
@ -87,9 +102,9 @@
r.uploadMoney,
r.adjustmentMoney,
( SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') as alreadyMoney,
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') as alreadyMoney,
(r.adjustmentMoney - ( SELECT IFNULL(SUM(fd.nowAdjustmentMoney),0) FROM scm_finance_adjust_details as fd LEFT JOIN scm_finance_adjust_apply as fa ON fd.mainSid = fa.sid
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
WHERE fd.rebateSid = d.vehRebateSid AND fa.nodeState != '提交' AND fa.nodeState != '终止') ) as nowDiffAmount,
(SELECT o.sid orderSid FROM anrui_buscenter.bus_sales_order_vehicle bv LEFT JOIN anrui_buscenter.bus_sales_order as o ON bv.salesOrderSid = o.sid WHERE bv.linkSid = d.vehSid AND o.nodeState = '已办结' ORDER BY o.createTime DESC LIMIT 1) as orderSid
FROM
scm_vehrebate_checkapplydetail AS d
@ -107,7 +122,7 @@
<select id="selectBySid" resultType="java.lang.Integer">
SELECT COUNT(*)
FROM base_internal_purchase
WHERE nodeState != '提交'
WHERE nodeState != '提交'
and find_in_set(sid, #{list})
</select>
</mapper>

54
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyRest.java

@ -25,7 +25,11 @@
*********************************************************/
package com.yxt.anrui.scm.biz.scmfinanceadjustapply;
import cn.hutool.core.bean.BeanUtil;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.*;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmfinanceadjustdetails.ScmFinanceAdjustDetailsService;
import com.yxt.common.core.query.PagerQuery;
@ -37,6 +41,8 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* Project: scm(金融贴息) <br/>
* File: ScmFinanceAdjustApplyFeignFallback.java <br/>
@ -125,4 +131,52 @@ public class ScmFinanceAdjustApplyRest implements ScmFinanceAdjustApplyFeign {
PagerVo<AdjustVehListVo> pv = scmFinanceAdjustApplyService.finAdjustList(pq);
return rb.success().setData(pv);
}
@Override
public ResultBean submitRecordApplication(SubmitAdjustDto dto) {
return scmFinanceAdjustApplyService.submitRecordApplication(dto);
}
@Override
public ResultBean complete(AdjustCompleteDto dto) {
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(dto, bv);
bv.setModelId(ProcDefEnum.JTTXCYSQ.getProDefId());
return scmFinanceAdjustApplyService.complete(bv);
}
@Override
public ResultBean revokeProcess(AdjustTaskQuery query) {
return scmFinanceAdjustApplyService.revokeProcess(query);
}
@Override
public ResultBean taskReject(AdjustTaskQuery query) {
return scmFinanceAdjustApplyService.taskReject(query);
}
@Override
public ResultBean breakProcess(AdjustTaskQuery query) {
return scmFinanceAdjustApplyService.breakProcess(query);
}
@Override
public ResultBean flowRecord(String procInsId) {
return scmFinanceAdjustApplyService.flowRecord(procInsId);
}
@Override
public ResultBean<List<AdjustGetNodeVo>> getNextNodesForSubmit(AdjustGetNodeQuery query) {
return scmFinanceAdjustApplyService.getNextNodesForSubmit(query);
}
@Override
public ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject(AdjustGetNodeQuery query) {
return scmFinanceAdjustApplyService.getPreviousNodesForReject(query);
}
@Override
public ResultBean delegate(AdjustDelegateQuery delegateQuery) {
return scmFinanceAdjustApplyService.delegate(delegateQuery);
}
}

562
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustapply/ScmFinanceAdjustApplyService.java

@ -26,20 +26,36 @@
package com.yxt.anrui.scm.biz.scmfinanceadjustapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
import com.yxt.anrui.flowable.api.flow2.FlowFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.PrivilegeVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.scm.api.scmfile.ScmFileDto;
import com.yxt.anrui.scm.api.scmfile.ScmFileVo;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.*;
import com.yxt.anrui.scm.api.scmfinanceadjustapply.flow.*;
import com.yxt.anrui.scm.api.scmfinanceadjustdetails.ScmFinanceAdjustDetails;
import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
import com.yxt.anrui.scm.biz.scmfinanceadjustdetails.ScmFinanceAdjustDetailsService;
@ -50,12 +66,17 @@ import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import com.yxt.messagecenter.api.message.MessageFeign;
import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
import java.math.BigDecimal;
import java.util.*;
import java.util.concurrent.*;
import java.util.stream.Collectors;
/**
* Project: scm(金融贴息) <br/>
@ -73,6 +94,16 @@ import java.util.List;
@Service
public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceAdjustApplyMapper, ScmFinanceAdjustApply> {
@Autowired
private MessageFeign messageFeign;
@Autowired
private FlowTaskFeign flowTaskFeign;
@Autowired
private FlowFeign flowFeign;
@Autowired
private FlowableFeign flowableFeign;
@Autowired
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private ScmFileService scmFileService;
@Autowired
@ -173,7 +204,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
ScmFinanceAdjustApply entity = new ScmFinanceAdjustApply();
sid = entity.getSid();
BeanUtil.copyProperties(dto,entity,"id","sid");
entity.setNodeState("提交");
entity.setNodeState("提交");
String applyCode = getApplyCode(dto.getUseOrgSid());
entity.setBillNo(applyCode);
baseMapper.insert(entity);
@ -239,6 +270,7 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (StringUtils.isNotBlank(entity.getProcInstId())) {
vo.setInstanceId(entity.getProcInstId());
}
vo.setCreateTime(DateUtil.formatDate(entity.getCreateTime()));
List<ScmFileVo> scmFileVos = scmFileService.fetchByMainSid(sid);
if (!scmFileVos.isEmpty() && scmFileVos.size() > 0) {
for (ScmFileVo scmFileVo : scmFileVos) {
@ -288,6 +320,14 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
if (StringUtils.isNotBlank(query.getStaffSid())) {
qw.eq("bo.createBySid",query.getStaffSid());
}
String[] sids = query.getSids();
if (sids != null) {
for (String sid : sids) {
if (StringUtils.isNotBlank(sid)) {
qw.ne("n.vehSid", sid);
}
}
}
qw.apply("n.nowDiffAmount != 0");
qw.eq("n.useOrgSid",query.getUseOrgSid());
IPage<ScmFinanceAdjustApply> page = PagerUtil.queryToPage(pq);
@ -357,4 +397,520 @@ public class ScmFinanceAdjustApplyService extends MybatisBaseService<ScmFinanceA
public int selectBySid(String join) {
return baseMapper.selectBySid(join);
}
//-------------------------------------流程------------------------------------------------/
/**
* 判断提交的流程是否被允许
*
* @param dto
* @return
*/
private synchronized int submitBusinessData(SubmitAdjustDto dto, ScmFinanceAdjustApply scmFinanceAdjustApply) {
int r = 0;
if (StringUtils.isBlank(dto.getSid())) {
r = 1;
} else {
if (scmFinanceAdjustApply != null) {
String businessTaskId = scmFinanceAdjustApply.getTaskId();
if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
//新提交
r = 1;
} else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
//二次提交//只有数据一致的时候才能进行下一步
r = 2;
}
} else {
r = 3;
}
}
return r;
}
/**
* 更新流程相关的状态
*
* @param map
* @return
*/
private int updateFlowFiled(Map<String, Object> map) {
return baseMapper.updateFlowFiled(map);
}
public ResultBean submitRecordApplication(SubmitAdjustDto dto) {
ResultBean rb = ResultBean.fireFail();
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(dto.getSid());
int r = submitBusinessData(dto, scmFinanceAdjustApply);
if (r == 3) {
return rb.setMsg("该申请不存在");
}
if (r == 0) {
return rb.setMsg("操作失败!提交的数据不一致");
}
//新增修改保存
String businessSid = saveBill(dto);
ScmFinanceAdjustApply entity = fetchBySid(businessSid);
String orgSidPath = "";
if (StringUtils.isNotBlank(entity.getDeptSid())) {
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(entity.getDeptSid()).getData();
if (null != organizationVo) {
orgSidPath = organizationVo.getOrgSidPath();
}
} else {
SysUserVo data = sysUserFeign.fetchBySid(entity.getCreateBySid()).getData();
if (null != data) {
//根据staffSid获取用户的组织全路径
ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(data.getStaffSid());
if (!staffOrgResultBean.getSuccess()) {
return rb.setMsg(staffOrgResultBean.getMsg());
}
//用户的组织全路径
orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
}
}
List<String> orgPathList = Arrays.asList(orgSidPath.split("/"));
SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(orgPathList.get(orgPathList.size() - 1)).getData();
if (sysOrganization == null) {
return rb.setMsg("当前所在的组织机构不存在");
}
if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
// return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}
//创建BusinessVariables实体对象
BusinessVariables bv = new BusinessVariables();
//流程中的参数赋值
Map<String, Object> variables = BeanUtil.beanToMap(dto);
Map<String, Object> appMap = new HashMap<>();
//若有网关,则赋值网关中判断的字段。
boolean isCustomer = false; //调整方式是否为客户交纳
boolean isMoney = false;//认损金额是否>2000
//去查询调整方式是否为客户交纳
if (entity.getAdjustWay().equals("客户交纳")) {
isCustomer = true;
} else {
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(businessSid);
if (!details.isEmpty()) {
for (ScmFinanceAdjustDetails detail : details) {
BigDecimal rensunMoney = BigDecimal.ZERO;
if (null != detail.getNowAdjustmentMoney()) {
rensunMoney = detail.getNowAdjustmentMoney();
}
if (rensunMoney.compareTo(new BigDecimal("2000")) > 0) {
//判断认损金额>2000
isMoney = true;
}
}
}
}
variables.put("isCustomer", isCustomer);
variables.put("isMoney", isMoney);
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
variables.put("app", appMap);
String orderNames = "金融贴息差异调整申请";
variables.put("orderNames", orderNames);
ScmFinanceAdjustApply scmFinanceAdjustApply1 = fetchBySid(businessSid);
String msgBusinessSid = scmFinanceAdjustApply1.getSid();
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
//业务sid
bv.setBusinessSid(businessSid);
//用户sid
bv.setUserSid(dto.getCreateBySid());
bv.setFormVariables(variables);
String nextNodeUserSids_ = sysOrganization.getManagerSid();
if (isCustomer) {
if (StringUtils.isNotBlank(entity.getStaffSid())) {
bv.setNextNodeUserSids(entity.getStaffSid());
} else {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}
}
//流程定义id
bv.setModelId(ProcDefEnum.JTTXCYSQ.getProDefId());
if (r == 1) {
//流程定义id
bv.setModelId(ProcDefEnum.JTTXCYSQ.getProDefId());
ResultBean<UpdateFlowFieldVo> voResultBean = flowFeign.startProcess(bv);
if (!voResultBean.getSuccess()) {
return rb.setMsg(voResultBean.getMsg());
}
UpdateFlowFieldVo ufVo = voResultBean.getData();
int i = updateFlowFiled(BeanUtil.beanToMap(ufVo));
//==================================添加线程
try {
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
.setNameFormat("demo-pool-%d").build();
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future future1 = pool.submit(() -> {
//极光推送
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(msgBusinessSid);
messageFlowableQuery.setModuleName("金融贴息差异调整申请");
SysUserVo userVo = sysUserFeign.fetchBySid(scmFinanceAdjustApply1.getCreateBySid()).getData();
if (userVo != null) {
if (StringUtils.isNotBlank(userVo.getName())) {
messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
}
messageFlowableQuery.setMsgTitle("金融贴息差异调整申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
});
} catch (Exception e) {
e.printStackTrace();
}
//==================================添加线程
return voResultBean;
}
if (r == 2) {
// ToDo:驳回到发起人后再次提交
if (StringUtils.isBlank(dto.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
ScmFinanceAdjustApply scmFinanceAdjustApply2 = fetchBySid(dto.getSid());
bv.setTaskId(dto.getTaskId());
bv.setTaskDefKey(scmFinanceAdjustApply2.getNodeSid());
bv.setComment("重新提交");
bv.setInstanceId(dto.getInstanceId());
return complete(bv);
}
return rb;
}
public ResultBean complete(BusinessVariables bv) {
ResultBean rb = ResultBean.fireFail();
String businessSid = bv.getBusinessSid();
ScmFinanceAdjustApply entity = this.fetchBySid(businessSid);
if (bv.getTaskId().equals(entity.getTaskId())) {
String orgSidPath = "";
if (StringUtils.isNotBlank(entity.getDeptSid())) {
SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(entity.getDeptSid()).getData();
if (null != organizationVo) {
orgSidPath = organizationVo.getOrgSidPath();
}
}
bv.setOrgSidPath(orgSidPath);
//流程中的参数赋值
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
//若有网关,则赋值网关中判断的字段。
boolean isCustomer = false; //调整方式是否为客户交纳
boolean isMoney = false;//认损金额是否>2000
//去查询调整方式是否为客户交纳
if (entity.getAdjustWay().equals("客户交纳")) {
isCustomer = true;
} else {
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(businessSid);
if (!details.isEmpty()) {
for (ScmFinanceAdjustDetails detail : details) {
BigDecimal rensunMoney = BigDecimal.ZERO;
if (null != detail.getNowAdjustmentMoney()) {
rensunMoney = detail.getNowAdjustmentMoney();
}
if (rensunMoney.compareTo(new BigDecimal("2000")) > 0) {
//判断认损金额>2000
isMoney = true;
}
}
}
}
variables.put("isCustomer", isCustomer);
variables.put("isMoney", isMoney);
if (bv.getTaskDefKey().equals("Activity_049lvok")) {
if (StringUtils.isNotBlank(entity.getSalesManageSid())) {
bv.setNextNodeUserSids(entity.getSalesManageSid());
} else {
bv.setNextNodeUserSids(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}
}
variables.put("businessSid", businessSid);
appMap.put("sid", businessSid);
variables.put("app", appMap);
bv.setFormVariables(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
int i = updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(businessSid);
scmFinanceAdjustApply.setClosingDate(new Date());
baseMapper.updateById(scmFinanceAdjustApply);
} else {
//极光推送
entity = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
messageFlowVo.setProcDefId(entity.getProcDefId());
messageFlowVo.setProcInsId(entity.getProcInstId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("金融贴息差异调整申请");
messageFlowableQuery.setMsgContent(entity.getCreateByName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
messageFlowableQuery.setMsgTitle("金融贴息差异调整申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
}
return rb.success().setData(resultBean.getData());
} else {
return rb.setMsg("操作失败!提交的数据不一致");
}
}
public ResultBean revokeProcess(AdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmFinanceAdjustApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
return rb.success().setData(resultBean.getData());
}
}
return rb.setMsg("操作失败,提交的数据不一致!");
}
public ResultBean taskReject(AdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
String businessSid = query.getBusinessSid();
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(businessSid);
if (scmFinanceAdjustApply == null) {
return rb.setMsg("该申请不存在");
}
String businessTaskId = scmFinanceAdjustApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {
if (StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
if (org.apache.commons.lang3.StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", businessSid);
variables.put("app", appMap);
//若有网关,则赋值网关中判断的字段。
boolean isCustomer = false; //调整方式是否为客户交纳
boolean isMoney = false;//认损金额是否>2000
//去查询调整方式是否为客户交纳
if (scmFinanceAdjustApply.getAdjustWay().equals("客户交纳")) {
isCustomer = true;
} else {
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(businessSid);
if (!details.isEmpty()) {
for (ScmFinanceAdjustDetails detail : details) {
BigDecimal rensunMoney = BigDecimal.ZERO;
if (null != detail.getNowAdjustmentMoney()) {
rensunMoney = detail.getNowAdjustmentMoney();
}
if (rensunMoney.compareTo(new BigDecimal("2000")) > 0) {
//判断认损金额>2000
isMoney = true;
}
}
}
}
variables.put("isCustomer", isCustomer);
variables.put("isMoney", isMoney);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
UpdateFlowFieldVo ufVo = resultBean.getData();
Map<String, Object> map = BeanUtil.beanToMap(ufVo);
//更新业务中的流程相关的参数
updateFlowFiled(map);
//极光推送
scmFinanceAdjustApply = fetchBySid(businessSid);
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
MessageFlowVo messageFlowVo = new MessageFlowVo();
BeanUtil.copyProperties(ufVo, messageFlowVo);
String procId = scmFinanceAdjustApply.getProcInstId();
messageFlowVo.setProcInsId(procId);
messageFlowVo.setProcDefId(scmFinanceAdjustApply.getProcDefId());
messageFlowableQuery.setUfVo(messageFlowVo);
messageFlowableQuery.setAppMap(appMap);
messageFlowableQuery.setBusinessSid(businessSid);
messageFlowableQuery.setModuleName("金融贴息差异调整申请");
ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(procId);
String nextName = listResultBean.getData().get(0).getName_();
String nextNodeUserSids = listResultBean.getData().get(0).getASSIGNEE_();
List<String> receiveSidList = Arrays.asList(nextNodeUserSids.split(","));
// if (receiveSidList.size() == 1 && receiveSidList.get(0).equals(busVehicleApply.getCreateBySid())) {
if ("发起申请".equals(nextName)) {
messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
} else {
SysUserVo userVo = sysUserFeign.fetchBySid(scmFinanceAdjustApply.getCreateBySid()).getData();
if (userVo != null) {
if (org.apache.commons.lang3.StringUtils.isNotBlank(userVo.getName())) {
messageFlowableQuery.setMsgContent(userVo.getName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
}
}
}
messageFlowableQuery.setMsgTitle("金融贴息差异调整申请");
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
return rb.success();
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean breakProcess(AdjustTaskQuery query) {
ResultBean rb = ResultBean.fireFail();
if (org.apache.commons.lang3.StringUtils.isBlank(query.getInstanceId())) {
return rb.setMsg("参数错误:instanceId");
}
if (org.apache.commons.lang3.StringUtils.isBlank(query.getUserSid())) {
return rb.setMsg("参数错误:userSid");
}
if (org.apache.commons.lang3.StringUtils.isBlank(query.getComment())) {
return rb.setMsg("请填写意见");
}
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(query.getBusinessSid());
String businessTaskId = scmFinanceAdjustApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (query.getUserSid().equals(scmFinanceAdjustApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
} else {
if (businessTaskId.equals(query.getTaskId())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
return rb.success().setData(resultBean.getData());
}
}
}
return rb.setMsg("操作失败!提交的数据不一致!");
}
public ResultBean flowRecord(String procInsId) {
return flowTaskFeign.businessFlowRecord(procInsId);
}
public ResultBean<List<AdjustGetNodeVo>> getNextNodesForSubmit(AdjustGetNodeQuery query) {
ResultBean<List<AdjustGetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//根据业务sid查询信息
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(query.getBusinessSid());
//若有网关,则赋值网关中判断的字段。
boolean isCustomer = false; //调整方式是否为客户交纳
boolean isMoney = false;//认损金额是否>2000
//去查询调整方式是否为客户交纳
if (scmFinanceAdjustApply.getAdjustWay().equals("客户交纳")) {
isCustomer = true;
} else {
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(query.getBusinessSid());
if (!details.isEmpty()) {
for (ScmFinanceAdjustDetails detail : details) {
BigDecimal rensunMoney = BigDecimal.ZERO;
if (null != detail.getNowAdjustmentMoney()) {
rensunMoney = detail.getNowAdjustmentMoney();
}
if (rensunMoney.compareTo(new BigDecimal("2000")) > 0) {
//判断认损金额>2000
isMoney = true;
}
}
}
}
variables.put("isCustomer", isCustomer);
variables.put("isMoney", isMoney);
bv.setFormVariables(variables);
bv.setModelId(scmFinanceAdjustApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AdjustGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdjustGetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean<List<AdjustGetNodeVo>> getPreviousNodesForReject(AdjustGetNodeQuery query) {
ResultBean<List<AdjustGetNodeVo>> rb = ResultBean.fireFail();
BusinessVariables bv = new BusinessVariables();
BeanUtil.copyProperties(query, bv);
//流程中的参数赋值、若有网关,则赋值网关中判断的字段。
Map<String, Object> variables = new HashMap<>();
//根据业务sid查询排产
ScmFinanceAdjustApply scmFinanceAdjustApply = fetchBySid(query.getBusinessSid());
//若有网关,则赋值网关中判断的字段。
boolean isCustomer = false; //调整方式是否为客户交纳
boolean isMoney = false;//认损金额是否>2000
//去查询调整方式是否为客户交纳
if (scmFinanceAdjustApply.getAdjustWay().equals("客户交纳")) {
isCustomer = true;
} else {
List<ScmFinanceAdjustDetails> details = scmFinanceAdjustDetailsService.selByMainSid(query.getBusinessSid());
if (!details.isEmpty()) {
for (ScmFinanceAdjustDetails detail : details) {
BigDecimal rensunMoney = BigDecimal.ZERO;
if (null != detail.getNowAdjustmentMoney()) {
rensunMoney = detail.getNowAdjustmentMoney();
}
if (rensunMoney.compareTo(new BigDecimal("2000")) > 0) {
//判断认损金额>2000
isMoney = true;
}
}
}
}
variables.put("isCustomer", isCustomer);
variables.put("isMoney", isMoney);
bv.setFormVariables(variables);
bv.setModelId(scmFinanceAdjustApply.getProcDefId());
ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
//判断数组是否为空,若为空则赋值,若不为空,则遍历循环将map中的数据赋值给getNodeVo
List<AdjustGetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AdjustGetNodeVo.class)).collect(Collectors.toList());
return rb.success().setData(voList);
}
public ResultBean delegate(AdjustDelegateQuery adjustDelegateQuery) {
ResultBean rb = ResultBean.fireFail();
FlowDelegateQuery delegateQuery = new FlowDelegateQuery();
BeanUtil.copyProperties(adjustDelegateQuery, delegateQuery);
flowFeign.delegate(delegateQuery);
return rb.success();
}
}

4
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustdetails/ScmFinanceAdjustDetailsMapper.xml

@ -6,8 +6,8 @@
<select id="selectPageVo" resultType="com.yxt.anrui.scm.api.scmfinanceadjustdetails.ScmFinanceAdjustDetailsVo">
SELECT
CASE
WHEN a.nodeState = '未提交' THEN'未提交'
WHEN a.nodeState != '提交' AND a.nodeState != '已办结' AND a.nodeState != '终止' THEN '申请中'
WHEN a.nodeState = '待提交' THEN'待提交'
WHEN a.nodeState != '提交' AND a.nodeState != '已办结' AND a.nodeState != '终止' THEN '申请中'
WHEN a.nodeState = '已办结' THEN '已办结'
WHEN a.nodeState = '终止' THEN '终止'
END AS `nodeState`,

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmfinanceadjustdetails/ScmFinanceAdjustDetailsService.java

@ -129,6 +129,9 @@ public class ScmFinanceAdjustDetailsService extends MybatisBaseService<ScmFinanc
if (StringUtils.isNotBlank(query.getBillNo())) {
qw.like("a.billNo",query.getBillNo());
}
if (StringUtils.isNotBlank(query.getAdjustWay())) {
qw.like("a.adjustWay",query.getAdjustWay());
}
String applyStartTime = query.getCreateStartDate();
String applyEndTime = query.getCreateEndDate();
qw.apply(StringUtils.isNotEmpty(applyStartTime), "date_format (a.createTime,'%Y-%m-%d') >= date_format('" + applyStartTime + "','%Y-%m-%d')").

9
anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js

@ -139,6 +139,15 @@ export function selectOrgList(data) {
})
}
// 根据当前登录用户sid获取本分公司下的销售专员
export function selectStaffListByUseOrgSid(data) {
return request({
url: '/portal/v1/sysorganization/selectStaffListByUseOrgSid',
method: 'get',
params: data
})
}
// 根据选择的销售专员获取客户
export function selectCustomerList(data) {
return request({

135
anrui-scm/anrui-scm-ui/src/api/financialDiscount/financialDiscount.js

@ -0,0 +1,135 @@
import request from '@/utils/request'
export default {
// 查询分页列表 -- 金融差异调整管理
finAdjustList: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/finAdjustList',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 金融差异调整申请
listPage: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 金融贴息差异调整申请选择车辆
getAdjustVehList: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/getAdjustVehList',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 查询分页列表 -- 金融贴息差异调整申请选择车辆
adjustDetail: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustdetails/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 删除
delete: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/delBySids',
method: 'DELETE',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 新增保存修改记录
save: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/save',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
// 通过sid查询一条记录
fetchBySid: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/fetchDetailsBySid/' + data,
method: 'get'
})
},
// 提交流程
submit: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/submit',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(同意)
complete: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/complete',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(加签)
delegate: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/delegate',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(驳回)
reject: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/reject',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(终止)
breakProcess: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/breakProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 流程审批(撤回)
revokeProcess: function(params) {
return request({
url: '/scm/v1/scmfinanceadjustapply/revokeProcess',
method: 'post',
data: params,
headers: { 'Content-Type': 'application/json' }
})
},
// 审批流程(同意)获取下一环节
getNextNodesForSubmit: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/getNextNodesForSubmit',
method: 'get',
params: data
})
},
// 审批流程(驳回)获取上一环节
getPreviousNodesForReject: function(data) {
return request({
url: '/scm/v1/scmfinanceadjustapply/getPreviousNodesForReject',
method: 'get',
params: data
})
}
}

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

@ -1054,7 +1054,35 @@ const codemenu = [{
}
]
},
// 金融贴息差异调整
{
path: '/financialDiscount',
component: Layout,
redirect: '/financialDiscount',
meta: {
title: '金融贴息差异调整'
},
children: [
{
path: '/financialDiscount/differentialAdjustment',
component: () => import('@/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue'),
name: 'DifferentialAdjustment',
meta: {
title: '差异调整管理',
noCache: true
}
},
{
path: '/financialDiscount/differenceManagement',
component: () => import('@/views/financialDiscount/differenceManagement/differenceManagement.vue'),
name: 'DifferenceManagement',
meta: {
title: '差异调整申请',
noCache: true
}
}
]
},
// 流程审批
// 入库管理编辑
{
@ -1571,6 +1599,27 @@ const codemenu = [{
component: () =>
import('@/views/workFlow/chaijianpankuiFlow/inventoryLossesYiBan.vue'),
name: 'InventoryLossesYiBan'
},
// 金融贴息差异调整申请待办详情页面
{
path: '/chayitiaozhengFlow/differenceManagementDaiBan',
component: () =>
import('@/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue'),
name: 'differenceManagementDaiBan'
},
// 金融贴息差异调整申请已办详情
{
path: '/chayitiaozhengFlow/differenceManagementEdit',
component: () =>
import('@/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue'),
name: 'DifferenceManagementEdit'
},
// 金融贴息差异调整申请办理
{
path: '/chayitiaozhengFlow/differenceManagementYiBan',
component: () =>
import('@/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue'),
name: 'DifferenceManagementYiBan'
}
]
export default codemenu

352
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagement.vue

@ -0,0 +1,352 @@
<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="switch_btn">
<el-button :class="{btn_style:viewState === 1}">差异调整申请</el-button>
<el-button class="" @click="handleClick">差异调整金融明细</el-button>
</div>
<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.useOrgName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请部门">
<el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请人">
<el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="调整方式">
<el-input v-model="listQuery.params.adjustWay" placeholder="" clearable/>
</el-form-item>
<el-form-item label="申请日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="办结日期">
<el-date-picker v-model="listQuery.params.closeStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.closeEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">金融贴息差异调整申请列表</div>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column fixed type="selection" align="center" width="50" />
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="操作" align="center" width="180" >
<template slot-scope="scope">
<el-button type="primary" size="mini" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true" @click="toEdit(scope.row)">办理</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="状态" width="180" header-align="center">
<template slot-scope="scope">
<span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
<span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
</template>
</el-table-column>
<el-table-column prop="billNo" label="申请编号" align="center" min-width="180" />
<el-table-column prop="useOrgName" label="分公司" align="center" width="150" />
<el-table-column prop="deptName" label="申请部门" align="center" width="120" />
<el-table-column prop="createByName" label="申请人" align="center" width="120" />
<el-table-column prop="createTime" label="申请日期" align="center" width="120" />
<el-table-column prop="closingDate" label="办结日期" align="center" width="120" />
<el-table-column prop="adjustWay" label="调整方式" align="center" width="120" />
</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>
<!-- 差异调整金额明细记录 -->
<varianceDetail v-show="viewState == 2" ref="divDetail" @doback="resetState" />
<!-- 差异调整申请新增 -->
<differenceManagementAdd v-show="viewState == 3 || viewState == 4" ref="divAdd" @doback="resetState" @reloadlist="getList" />
<!-- 差异调整申请详情 -->
<differenceManagementInfo v-show="viewState == 5" ref="divInfo" @doback="resetState" />
<!-- 审批记录 -->
<el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
<iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
import { getStorage } from '@/utils/auth'
import varianceDetail from '../differenceManagement/varianceDetail'
import differenceManagementAdd from './differenceManagementAdd'
import differenceManagementInfo from './differenceManagementInfo'
export default {
name: 'DifferenceManagement',
components: {
Pagination,
ButtonBar,
varianceDetail,
differenceManagementAdd,
differenceManagementInfo
},
data() {
return {
url: '',
dialogHeight: '80%',
centerDialogVisible: false,
btndisabled: false,
btnList: [
{
type: 'danger',
size: 'small',
icon: 'del',
btnKey: 'doDel',
btnLabel: '删除'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
sids: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartDate: '',
createEndDate: '',
closeStartDate: '',
closeEndDate: '',
adjustWay: '',
orgPath: '',
userSid: '',
menuUrl: ''
},
current: 1,
size: 5,
total: 0
}
}
},
created() {
//
this.getList()
},
mounted() {
// vuewindowpostMessagehandleMessage
window.addEventListener('message', this.handleMessage)
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
async handleMessage(event) {
var code = ''
if (event.data.params !== null && event.data.params !== undefined) {
code = event.data.params.code
}
if (code === 1) {
this.init()
this.centerDialogVisible = false
} else if (code === 2) {
this.dialogHeight = event.data.params.data
this.setIframeHeight(document.getElementById('iframe'))
}
},
closeIt() {
this.url = ''
this.centerDialogVisible = false
},
setIframeHeight(iframe) {
iframe.height = this.dialogHeight
},
flowRecord(row) {
this.centerDialogVisible = true
var params = {
deployId: row.procDefId,
procInsId: row.procInstId,
token: getStorage()
}
this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
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
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.listPage(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
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: {
useOrgName: '',
deptName: '',
createByName: '',
billNo: '',
createStartDate: '',
createEndDate: '',
closeStartDate: '',
closeEndDate: '',
adjustWay: '',
orgPath: '',
userSid: '',
menuUrl: ''
},
current: 1,
size: 5,
total: 0
}
this.getList()
},
handleClick() {
this.viewState = 2
this.$refs['divDetail'].getList()
},
toEdit(row) {
this.viewState = 4
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 5
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)'
})
req.delete(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({ type: 'success', message: resp.msg, showClose: true })
this.loadList()
}
}).catch((e) => {
loading.close()
})
}).catch(() => {
})
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
.switch_btn {
padding: 15px 0 10px 0;
}
.btn_style {
background-color: #018ad2;
color: white;
font-weight: 600;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed {
height: 100% !important;
}
/*表格列设置fixed后固定列出现下边框的设置*/
/deep/ .el-table__fixed-right {
height: 100% !important;
}
</style>

436
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementAdd.vue

@ -0,0 +1,436 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>调整方式</div>
<el-form-item prop="adjustWayKey">
<el-select class="addinputInfo" v-model="formobj.adjustWayKey" placeholder="请选择" @change="changeAdjustWay" filterable clearable>
<el-option v-for="item in adjustWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty"><span class="icon">*</span>销售专员</div>
<el-form-item prop="staffSid">
<el-select class="addinputInfo" v-model="formobj.staffSid" placeholder="请选择" @change="changeStaff" filterable clearable>
<el-option v-for="item in staff_list" :key="item.userSid" :label="item.name" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty"><span class="icon">*</span>销售经理</div>
<el-form-item prop="salesManageSid">
<el-select class="addinputInfo" v-model="formobj.salesManageSid" placeholder="请选择" @change="changeSalesManage" filterable clearable>
<el-option v-for="item in salesManager_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</div>
</el-col>
</el-row>
<div class="title titleOne">
<el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
</div>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="120" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="170" />
<el-table-column prop="estimateRebate" label="订单贴息金额" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传贴息金额" align="center" width="150" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="alreadyMoney" label="已调整金额" align="center" width="140" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整金额" align="center" width="160">
<template slot-scope="scope">
<el-input v-model="scope.row.nowAdjustmentMoney" @keyup.native="scope.row.nowAdjustmentMoney = getNumber(scope.row.nowAdjustmentMoney, 2)" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="调整说明" align="center" min-width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.filePath" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<chooseAdjustment v-show="viewState == 2" ref="divChoose" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import { getOrgSidByPath, fetchBySid, selectSysUserList, typeValues, selectStaffListByUseOrgSid } from '@/api/cheliang/dictcommons'
import uploadImg from '@/components/uploadFile/uploadImg'
import chooseAdjustment from './relation/chooseAdjustment'
export default {
name: 'DifferenceManagementAdd',
components: {
uploadImg,
chooseAdjustment
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
adjustWay_list: [],
staff_list: [],
salesManager_list: [],
formobj: {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
},
rules: {
adjustWayKey: [{ required: true, message: '调整方式不能为空', trigger: 'change' }],
staffSid: [{ required: true, message: '销售专员不能为空', trigger: 'change' }],
salesManageSid: [{ required: true, message: '销售经理不能为空', trigger: 'change' }]
}
}
},
methods: {
init() {
typeValues({ type: 'adjustingWay' }).then((res) => {
if (res.success) {
this.adjustWay_list = res.data
}
})
selectSysUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.salesManager_list = resp.data
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showAdd() {
this.viewTitle = '【新增】金融贴息差异调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
this.formobj.createByName = window.sessionStorage.getItem('name')
this.formobj.createBySid = window.sessionStorage.getItem('userSid')
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
var nowDate = new Date()
var date = {
year: nowDate.getFullYear(),
month: nowDate.getMonth() + 1,
day: nowDate.getDate()
}
this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
if (resp.success) {
this.formobj.useOrgSid = resp.data
selectStaffListByUseOrgSid({ useOrgSid: resp.data }).then((res) => {
if (res.success) {
this.staff_list = res.data
}
})
fetchBySid(resp.data).then((respsone) => {
if (respsone.success) {
this.formobj.useOrgName = respsone.data.name
}
})
}
})
},
showEdit(row) {
this.viewTitle = '【编辑】金融贴息差异调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
selectStaffListByUseOrgSid({ useOrgSid: this.formobj.useOrgSid }).then((res) => {
if (res.success) {
this.staff_list = res.data
}
})
}
})
},
changeAdjustWay(value) {
const choose = this.adjustWay_list.filter((item) => item.dictKey === value)
if (choose !== null) {
this.formobj.adjustWay = choose[0].dictValue
} else {
this.formobj.adjustWay = ''
}
},
changeStaff(value) {
const choose = this.staff_list.filter((item) => item.userSid === value)
if (choose !== null) {
this.formobj.staffName = choose[0].name
} else {
this.formobj.staffName = ''
}
},
changeSalesManage(value) {
const choose = this.salesManager_list.filter((item) => item.sid === value)
if (choose !== null) {
this.formobj.salesManage = choose[0].name
} else {
this.formobj.salesManage = ''
}
},
handleSelect() {
if (this.formobj.adjustWayKey === '001' && this.formobj.staffName === '') {
this.$message({ showClose: true, type: 'error', message: '因调整方式为客户交纳,请先选择销售专员' })
return
}
this.viewState = 2
this.$refs['divChoose'].showData(this.formobj.list, this.formobj.useOrgSid, this.formobj.staffSid)
},
backData(value) {
this.viewState = 1
value = JSON.parse(JSON.stringify(value))
value.forEach((e) => {
this.formobj.list.push({
rebateSid: e.rebateSid,
purchaseSystemSid: e.purchaseSystemSid,
purchaseSystemName: e.purchaseSystemName,
brandSid: e.brandSid,
brandName: e.brandName,
vehModelSid: e.vehModelSid,
vehModelName: e.vehModelName,
vehSid: e.vehSid,
vinNo: e.vinNo,
customerSid: e.customerSid,
customerName: e.customerName,
contractNo: e.contractNo,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
alreadyMoney: e.alreadyMoney,
nowDiffAmount: e.nowDiffAmount,
nowAdjustmentMoney: '',
remarks: ''
})
})
},
handleDelete(index) {
this.formobj.list.splice(index, 1)
},
resetState() {
this.viewState = 1
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'estimateRebate' || column.property === 'uploadMoney' || column.property === 'adjustmentMoney' || column.property === 'alreadyMoney' || column.property === 'nowDiffAmount' || column.property === 'nowAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
}
})
return sums
},
saveOrUpdate() {
if (this.formobj.list.length === 0) {
this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
if (this.formobj.list.length === 0) {
this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.formobj = {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
}
this.submitdisabled = false
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
}
</style>

203
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/differenceManagementInfo.vue

@ -0,0 +1,203 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调整方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustWay }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售专员</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售经理</div>
<el-form-item><span class="addinputInfo">{{ formobj.salesManage }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="120" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="170" />
<el-table-column prop="estimateRebate" label="订单贴息金额" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传贴息金额" align="center" width="150" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="alreadyMoney" label="已调整金额" align="center" width="140" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整金额" align="center" width="160" />
<el-table-column prop="remarks" label="调整说明" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePath" :key="index" :src="item" :preview-src-list="formobj.filePath" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
export default {
name: 'DifferenceManagementInfo',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
},
rules: {}
}
},
methods: {
showInfo(row) {
this.viewTitle = '金融贴息差异调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(row.sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.filePath.length > 0) {
const aa = []
this.formobj.filePath.forEach((e) => {
aa.push(e.url)
})
this.formobj.filePath = aa
}
}
})
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'estimateRebate' || column.property === 'uploadMoney' || column.property === 'adjustmentMoney' || column.property === 'alreadyMoney' || column.property === 'nowDiffAmount' || column.property === 'nowAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
}
})
return sums
},
handleReturn() {
this.formobj = {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
}
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

227
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/relation/chooseAdjustment.vue

@ -0,0 +1,227 @@
<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.purchaseSystemName" placeholder="" clearable />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModel" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.contractNo" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @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 type="selection" align="center" width="50" />
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column prop="state" label="状态" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="200" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="customerName" label="客户名称" align="center" width="140" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
<el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
<el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />
</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>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
export default {
name: 'ChooseAdjustment',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toConfirm',
btnLabel: '确认'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
multipleSelection: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
useOrgSid: '',
staffSid: '',
purchaseSystemName: '',
brandName: '',
vehModel: '',
vinNo: '',
customerName: '',
contractNo: '',
sids: []
},
current: 1,
size: 5,
total: 0
}
}
},
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 'toConfirm':
this.toConfirm()
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) {
this.multipleSelection = row
},
showData(value, useOrgSid, staffSid) {
this.listQuery.params.useOrgSid = useOrgSid
this.listQuery.params.staffSid = staffSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].vehSid)
}
this.listQuery.params.sids = aa
} else {
this.listQuery.params.sids = []
}
this.handleReset()
},
//
getList() {
this.listLoading = true
req.getAdjustVehList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success) {
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.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.listQuery.params.vehModel = ''
this.listQuery.params.vinNo = ''
this.listQuery.params.customerName = ''
this.listQuery.params.contractNo = ''
this.getList()
},
toConfirm() {
if (this.multipleSelection.length > 0) {
this.listQuery.params.useOrgSid = ''
this.listQuery.params.staffSid = ''
this.listQuery.params.sids = []
this.$emit('backData', this.multipleSelection)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条数据进行操作' })
}
},
doClose() {
this.listQuery.params.useOrgSid = ''
this.listQuery.params.staffSid = ''
this.listQuery.params.sids = []
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>

266
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differenceManagement/varianceDetail.vue

@ -0,0 +1,266 @@
<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="switch_btn">
<el-button class="" @click="handleClick">差异调整申请</el-button>
<el-button :class="{btn_style:viewState === 1}">差异调整金融明细</el-button>
</div>
<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-select v-model="listQuery.params.nodeState" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue" />
</el-select>
</el-form-item>
<el-form-item label="采购系统">
<el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModelName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.contractNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="审批编号">
<el-input v-model="listQuery.params.billNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="调整日期">
<el-date-picker v-model="listQuery.params.createStartDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.createEndDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="调整方式">
<el-input v-model="listQuery.params.adjustWay" placeholder="" clearable />
</el-form-item>
<el-form-item label="调整说明">
<el-input v-model="listQuery.params.remarks" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @click="handleReset" size="small">重置</el-button>
</div>
</div>
</div>
<div class="listtop">
<div class="tit">金融贴息差异调整明细列表</div>
</div>
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column prop="nodeState" label="状态" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="200" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="customerName" label="客户名称" align="center" width="140" />
<el-table-column prop="contractNo" label="合同编号" align="center" min-width="160" />
<el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
<el-table-column prop="uploadMoney" label="上传贴息" align="center" width="120" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整" align="center" width="100" />
<el-table-column prop="nowDiffAmount" label="本次调整后差额" align="center" width="140" />
<el-table-column prop="adjustTime" label="调整时间" align="center" width="100" />
<el-table-column prop="adjustWay" label="调整方式" align="center" width="100" />
<el-table-column prop="remarks" label="调整说明" align="center" min-width="200" />
</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>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import Pagination from '@/components/pagination'
import ButtonBar from '@/components/ButtonBar'
export default {
name: 'VarianceDetail',
components: {
Pagination,
ButtonBar
},
data() {
return {
btndisabled: false,
dialogVisible: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
sids: [],
FormLoading: false,
state_list: [
{
dictKey: '0',
dictValue: '待提交'
},
{
dictKey: '1',
dictValue: '申请中'
},
{
dictKey: '2',
dictValue: '已办结'
}
],
listLoading: false,
listQuery: {
params: {
orgPath: '',
menuUrl: '',
userSid: '',
nodeState: '',
purchaseSystemName: '',
brandName: '',
vehModelName: '',
vinNo: '',
customerName: '',
contractNo: '',
billNo: '',
createStartDate: '',
createEndDate: '',
adjustWay: '',
remarks: ''
},
current: 1,
size: 5,
total: 0
}
}
},
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 '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
},
//
getList() {
this.listLoading = true
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.adjustDetail(this.listQuery).then((response) => {
this.listLoading = false
if (response.success) {
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: {
orgPath: '',
menuUrl: '',
userSid: '',
nodeState: '',
purchaseSystemName: '',
brandName: '',
vehModelName: '',
vinNo: '',
customerName: '',
contractNo: '',
billNo: '',
createStartDate: '',
createEndDate: '',
adjustWay: '',
remarks: ''
},
current: 1,
size: 5,
total: 0
}
this.getList()
},
handleClick() {
this.$parent.resetState()
this.$parent.handleReset()
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
.switch_btn {
padding: 15px 0 10px 0;
}
.btn_style {
background-color: #018ad2;
color: white;
font-weight: 600;
}
</style>

251
anrui-scm/anrui-scm-ui/src/views/financialDiscount/differentialAdjustment/differentialAdjustment.vue

@ -0,0 +1,251 @@
<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-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue" />
</el-select>
</el-form-item>
<el-form-item label="采购系统">
<el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModel" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.contractNo" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @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%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column prop="state" label="状态" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="150" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="customerName" label="客户名称" align="center" width="140" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="180" />
<el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
<el-table-column prop="uploadMoney" label="差额" align="center" width="120" />
<el-table-column prop="alreadyMoney" label="已调整" align="center" width="120" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
</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>
<!-- 新增返利 -->
<differenceManagementAdd v-show="viewState == 2" ref="divAdd" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import differenceManagementAdd from '../differenceManagement/differenceManagementAdd'
export default {
name: 'DifferentialAdjustment',
components: {
Pagination,
pageye,
ButtonBar,
differenceManagementAdd
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '差异调整申请'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
sids: [],
FormLoading: false,
listLoading: false,
state_list: [
{
dictKey: '0',
dictValue: '未调整'
},
{
dictKey: '1',
dictValue: '已调整'
},
{
dictKey: '2',
dictValue: '部分调整'
}
],
listQuery: {
params: {
state: '',
purchaseSystemName: '',
brandName: '',
vehModel: '',
vinNo: '',
customerName: '',
contractNo: '',
orgPath: '',
userSid: '',
menuUrl: ''
},
current: 1,
size: 5,
total: 0
}
}
},
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 '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
this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.listQuery.params.menuUrl = this.$route.path
req.finAdjustList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success) {
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: {
state: '',
purchaseSystemName: '',
brandName: '',
vehModel: '',
vinNo: '',
customerName: '',
contractNo: '',
orgPath: '',
userSid: '',
menuUrl: ''
},
current: 1,
size: 5,
total: 0
}
this.getList()
},
toAdd() {
this.viewState = 2
this.$refs['divAdd'].showAdd()
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

463
anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementDaiBan.vue

@ -0,0 +1,463 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" @click="openCountersign('加签')"> </el-button>
<el-button type="primary" size="small" @click="openAgree('同意')"> </el-button>
<el-button type="danger" size="small" @click="openReject('驳回')"> </el-button>
<el-button type="danger" size="small" @click="openStop('终止')"> </el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调整方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustWay }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售专员</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售经理</div>
<el-form-item><span class="addinputInfo">{{ formobj.salesManage }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="120" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="170" />
<el-table-column prop="estimateRebate" label="订单贴息金额" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传贴息金额" align="center" width="150" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="alreadyMoney" label="已调整金额" align="center" width="140" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整金额" align="center" width="160" />
<el-table-column prop="remarks" label="调整说明" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePath" :key="index" :src="item" :preview-src-list="formobj.filePath" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<!-- 选择待办人 的弹出框-->
<el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
<el-form class="formadd" >
<el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span class="icon">*</span>加签人员:
</el-col>
<el-col :span="20">
<el-form-item>
<el-select v-model="countersign.assignee" placeholder="请选择" filterable>
<el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
<el-col :span="4" class="tleftb">
<span>当前环节:</span>
</el-col>
<el-col :span="20">
<el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
</el-col>
</el-row>
<el-row :class="{rowClass:!currentLink}">
<el-col :span="4" class="tleftb">
<span>意见:</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
</el-col>
</el-row>
<div style="text-align:center;margin-top: 20px;">
<el-button type="primary" size="mini" @click="reject"> </el-button>
<el-button type="info " size="mini" @click="nodeDialogVisible = false"> </el-button>
</div>
</el-form>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import { selectStaffListss } from '@/api/Common/dictcommons'
export default {
name: 'DifferenceManagementDaiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
},
rules: {},
options: [],
operation: '', //
dialogList: {
comment: ''
},
startTask: true,
current: {
taskDefKey: '',
taskName: '' //
},
nextNode: {}, //
nodeDialogVisible: false,
currentLink: true,
countersignLink: false,
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
},
//
countersign: {
taskId: '',
assignee: '',
userSid: '',
instanceId: '',
views: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
// this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
this.current.taskDefKey = obj.taskDefKey
this.current.taskName = obj.taskName
//
this.countersign.taskId = obj.taskId
this.countersign.userSid = window.sessionStorage.getItem('userSid')
this.countersign.instanceId = obj.instanceId
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '金融贴息差异调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.filePath.length > 0) {
const aa = []
this.formobj.filePath.forEach((e) => {
aa.push(e.url)
})
this.formobj.filePath = aa
}
}
})
selectStaffListss().then((res) => {
if (res.success) {
this.options = res.data
}
})
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'estimateRebate' || column.property === 'uploadMoney' || column.property === 'adjustmentMoney' || column.property === 'alreadyMoney' || column.property === 'nowDiffAmount' || column.property === 'nowAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
}
})
return sums
},
//
openCountersign(val) {
this.operation = val
this.currentLink = true
this.countersignLink = true
this.dialogList.comment = ''
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openAgree(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = '同意'
req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openReject(val) {
this.operation = val
this.currentLink = true
this.countersignLink = false
this.dialogList.comment = ''
req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
if (resp.success) {
var arr = resp.data
this.nextNode = arr[0]
this.nodeDialogVisible = true
}
this.submitdisabled = false
})
},
//
openStop(val) {
this.operation = val
this.currentLink = false
this.countersignLink = false
this.dialogList.comment = ''
this.nodeDialogVisible = true
},
reject() {
if (this.operation === '同意') {
this.handleAgree()
} else if (this.operation === '驳回') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleReject()
}
} else if (this.operation === '终止') {
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
} else {
this.handleStop()
}
} else if (this.operation === '加签') {
this.handleCountersign()
}
},
/** 加签 */
handleCountersign() {
if (this.countersign.assignee === '') {
this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
return
}
if (this.dialogList.comment === '') {
this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
return
}
this.countersign.views = this.dialogList.comment
req.delegate(this.countersign).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 同意任务 */
handleAgree() {
this.linkByParameter.comment = this.dialogList.comment
req.complete(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 驳回任务 */
handleReject() {
this.linkByParameter.comment = this.dialogList.comment
req.reject(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
},
/** 终止任务 */
handleStop() {
this.linkByParameter.comment = this.dialogList.comment
req.breakProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.rowClass{
border-top: 1px solid #E0E3EB;
}
</style>

405
anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementEdit.vue

@ -0,0 +1,405 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="icon">*</span>调整方式</div>
<el-form-item prop="adjustWayKey">
<el-select class="addinputInfo" v-model="formobj.adjustWayKey" placeholder="请选择" @change="changeAdjustWay" filterable clearable>
<el-option v-for="item in adjustWay_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"></el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty"><span class="icon">*</span>销售专员</div>
<el-form-item prop="staffSid">
<el-select class="addinputInfo" v-model="formobj.staffSid" placeholder="请选择" @change="changeStaff" filterable clearable>
<el-option v-for="item in staff_list" :key="item.userSid" :label="item.name" :value="item.userSid"></el-option>
</el-select>
</el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty"><span class="icon">*</span>销售经理</div>
<el-form-item prop="salesManageSid">
<el-select class="addinputInfo" v-model="formobj.salesManageSid" placeholder="请选择" @change="changeSalesManage" filterable clearable>
<el-option v-for="item in salesManager_list" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
</el-select>
</el-form-item>
</div>
</el-col>
</el-row>
<div class="title titleOne">
<el-button size="mini" type="primary" class="btntopblueline" @click="handleSelect()">选择</el-button>
</div>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column fixed label="操作" align="center" width="100">
<template slot-scope="scope">
<el-button type="danger" size="small" @click="handleDelete(scope.$index)">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="120" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="170" />
<el-table-column prop="estimateRebate" label="订单贴息金额" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传贴息金额" align="center" width="150" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="alreadyMoney" label="已调整金额" align="center" width="140" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整金额" align="center" width="160">
<template slot-scope="scope">
<el-input v-model="scope.row.nowAdjustmentMoney" @keyup.native="scope.row.nowAdjustmentMoney = getNumber(scope.row.nowAdjustmentMoney, 2)" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="调整说明" align="center" min-width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remarks" clearable placeholder="" />
</template>
</el-table-column>
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item>
<uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.filePath" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
</el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
<chooseAdjustment v-show="viewState == 2" ref="divChoose" @backData="backData" @doback="resetState" />
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import { getOrgSidByPath, fetchBySid, selectSysUserList, typeValues, selectStaffListByUseOrgSid } from '@/api/cheliang/dictcommons'
import uploadImg from '@/components/uploadFile/uploadImg'
import chooseAdjustment from './relation/chooseAdjustment'
export default {
name: 'DifferenceManagementEdit',
components: {
uploadImg,
chooseAdjustment
},
data() {
return {
viewTitle: '',
viewState: 1,
submitdisabled: false,
tableKey: 1,
index: 0,
adjustWay_list: [],
staff_list: [],
salesManager_list: [],
formobj: {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
},
rules: {
adjustWayKey: [{ required: true, message: '调整方式不能为空', trigger: 'change' }],
staffSid: [{ required: true, message: '销售专员不能为空', trigger: 'change' }],
salesManageSid: [{ required: true, message: '销售经理不能为空', trigger: 'change' }]
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 500 + 'px'
}
}, '*')
},
methods: {
init() {
typeValues({ type: 'adjustingWay' }).then((res) => {
if (res.success) {
this.adjustWay_list = res.data
}
})
},
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
showInfo(sid) {
this.viewTitle = '【编辑】金融贴息差异调整申请'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
selectSysUserList({ userSid: window.sessionStorage.getItem('userSid'), orgPath: this.formobj.orgPath }).then((resp) => {
if (resp.success) {
this.salesManager_list = resp.data
}
})
selectStaffListByUseOrgSid({ useOrgSid: this.formobj.useOrgSid }).then((res) => {
if (res.success) {
this.staff_list = res.data
}
})
}
})
},
changeAdjustWay(value) {
const choose = this.adjustWay_list.filter((item) => item.dictKey === value)
if (choose !== null) {
this.formobj.adjustWay = choose[0].dictValue
} else {
this.formobj.adjustWay = ''
}
},
changeStaff(value) {
const choose = this.staff_list.filter((item) => item.userSid === value)
if (choose !== null) {
this.formobj.staffName = choose[0].name
} else {
this.formobj.staffName = ''
}
},
changeSalesManage(value) {
const choose = this.salesManager_list.filter((item) => item.sid === value)
if (choose !== null) {
this.formobj.salesManage = choose[0].name
} else {
this.formobj.salesManage = ''
}
},
handleSelect() {
if (this.formobj.adjustWayKey === '001' && this.formobj.staffName === '') {
this.$message({ showClose: true, type: 'error', message: '因调整方式为客户交纳,请先选择销售专员' })
return
}
this.viewState = 2
this.$refs['divChoose'].showData(this.formobj.list, this.formobj.useOrgSid, this.formobj.staffSid)
},
backData(value) {
this.viewState = 1
value = JSON.parse(JSON.stringify(value))
value.forEach((e) => {
this.formobj.list.push({
rebateSid: e.rebateSid,
purchaseSystemSid: e.purchaseSystemSid,
purchaseSystemName: e.purchaseSystemName,
brandSid: e.brandSid,
brandName: e.brandName,
vehModelSid: e.vehModelSid,
vehModelName: e.vehModelName,
vehSid: e.vehSid,
vinNo: e.vinNo,
customerSid: e.customerSid,
customerName: e.customerName,
contractNo: e.contractNo,
estimateRebate: e.estimateRebate,
uploadMoney: e.uploadMoney,
adjustmentMoney: e.adjustmentMoney,
alreadyMoney: e.alreadyMoney,
nowDiffAmount: e.nowDiffAmount,
nowAdjustmentMoney: '',
remarks: ''
})
})
},
handleDelete(index) {
this.formobj.list.splice(index, 1)
},
resetState() {
this.viewState = 1
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'estimateRebate' || column.property === 'uploadMoney' || column.property === 'adjustmentMoney' || column.property === 'alreadyMoney' || column.property === 'nowDiffAmount' || column.property === 'nowAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
}
})
return sums
},
saveOrUpdate() {
if (this.formobj.list.length === 0) {
this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submit() {
if (this.formobj.list.length === 0) {
this.$message({ showClose: true, type: 'error', message: '列表不能为空' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
// ()
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: flex-end;
align-items: center;
}
</style>

249
anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/differenceManagementYiBan.vue

@ -0,0 +1,249 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<div class="tab-header webtop">
<div>{{ viewTitle }}</div>
<div>
<el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
</div>
</div>
<div class="">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<el-row style="border-top: 1px solid #e0e3eb">
<el-col :span="16">
<div class="span-sty">申请编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">分公司</div>
<el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请部门</div>
<el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">申请人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">调整方式</div>
<el-form-item><span class="addinputInfo">{{ formobj.adjustWay }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售专员</div>
<el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
</div>
</el-col>
<el-col :span="8">
<div v-if="formobj.adjustWayKey == '001'">
<div class="span-sty">销售经理</div>
<el-form-item><span class="addinputInfo">{{ formobj.salesManage }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-table :key="tableKey" :data="formobj.list" :index="index" border style="width: 100%" show-summary :summary-method="getSummaries">
<el-table-column fixed width="60" label="序号" type="index" :index="index + 1" align="center"/>
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="120" />
<el-table-column prop="brandName" label="品牌" align="center" width="100" />
<el-table-column prop="vehModelName" label="车型" align="center" min-width="160" />
<el-table-column prop="vinNo" label="车架号" align="center" width="140" />
<el-table-column prop="customerName" label="客户名称" align="center" width="120" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="170" />
<el-table-column prop="estimateRebate" label="订单贴息金额" align="center" width="150" />
<el-table-column prop="uploadMoney" label="上传贴息金额" align="center" width="150" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="100" />
<el-table-column prop="alreadyMoney" label="已调整金额" align="center" width="140" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="120" />
<el-table-column prop="nowAdjustmentMoney" label="本次调整金额" align="center" width="160" />
<el-table-column prop="remarks" label="调整说明" align="center" min-width="200" />
</el-table>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">附件</div>
<el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePath" :key="index" :src="item" :preview-src-list="formobj.filePath" /></el-form-item>
</el-col>
</el-row>
</el-form>
</div>
</div>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
export default {
name: 'DifferenceManagementYiBan',
data() {
return {
viewTitle: '',
viewState: 1,
tableKey: 1,
index: 0,
formobj: {
sid: '',
createTime: '',
createBySid: '',
createByName: '',
billNo: '',
useOrgSid: '',
useOrgName: '',
deptName: '',
deptSid: '',
adjustWay: '',
adjustWayKey: '',
staffSid: '',
staffName: '',
salesManageSid: '',
salesManage: '',
remarks: '',
taskId: '',
instanceId: '',
list: [],
filePath: []
},
rules: {},
//
linkByParameter: {
businessSid: '',
comment: '',
instanceId: '',
taskId: '',
orgSidPath: '',
taskDefKey: '',
userSid: ''
}
}
},
created() {
console.log('url:' + window.location.href)
var one = window.location.href.indexOf('&data') + 6
const data = window.location.href.substr(one) // urlunescape()web,使
const obj = JSON.parse(decodeURIComponent(data))
console.log('iframe页面获取的obj:', obj)
//
this.linkByParameter.businessSid = obj.businessSid
this.linkByParameter.instanceId = obj.instanceId
this.linkByParameter.taskId = obj.taskId
this.linkByParameter.taskDefKey = obj.taskDefKey
this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
//
this.showInfo(obj.businessSid)
},
mounted() {
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 2,
data: 400 + 'px'
}
}, '*')
},
methods: {
showInfo(sid) {
this.viewTitle = '金融贴息差异调整申请详情'
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
req.fetchBySid(sid).then((res) => {
if (res.success) {
this.formobj = res.data
if (this.formobj.filePath.length > 0) {
const aa = []
this.formobj.filePath.forEach((e) => {
aa.push(e.url)
})
this.formobj.filePath = aa
}
}
})
},
getSummaries(param) {
const { columns, data } = param
const sums = []
columns.forEach((column, index) => {
if (index === 0) {
sums[index] = '合计'
return
}
const values = data.map(item => Number(item[column.property]))
if (column.property === 'estimateRebate' || column.property === 'uploadMoney' || column.property === 'adjustmentMoney' || column.property === 'alreadyMoney' || column.property === 'nowDiffAmount' || column.property === 'nowAdjustmentMoney') {
sums[index] = values.reduce((prev, curr) => {
const value = Number(curr)
if (!isNaN(value)) {
return Math.round((parseFloat(prev) + parseFloat(curr)) * 100) / 100
} else {
return Math.round((parseFloat(prev)) * 100) / 100
}
}, 0)
sums[index] += ''
}
})
return sums
},
/** 确认撤回任务 */
openRevoke() {
this.$confirm('是否确认执行撤回操作', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.handleRevoke()
}).catch(() => {
this.$message({
type: 'info',
message: '已取消撤回'
})
})
},
/** 撤回任务 */
handleRevoke() {
req.revokeProcess(this.linkByParameter).then((response) => {
if (response.success) {
this.$notify({
title: '提示',
message: '执行成功',
type: 'success',
duration: 2000
})
this.nodeDialogVisible = false
//
window.parent.postMessage({
cmd: 'returnHeight',
params: {
//
code: 1
}
}, '*')
}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
</style>

227
anrui-scm/anrui-scm-ui/src/views/workFlow/chayitiaozhengFlow/relation/chooseAdjustment.vue

@ -0,0 +1,227 @@
<template>
<div class="app-container">
<!-- Start 列表页面 -->
<div v-show="viewState == 1">
<button-bar view-title="金融贴息差异调整管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="">
<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.purchaseSystemName" placeholder="" clearable />
</el-form-item>
<el-form-item label="品牌">
<el-input v-model="listQuery.params.brandName" placeholder="" clearable />
</el-form-item>
<el-form-item label="车型">
<el-input v-model="listQuery.params.vehModel" placeholder="" clearable />
</el-form-item>
<el-form-item label="车架号">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable />
</el-form-item>
<el-form-item label="客户名称">
<el-input v-model="listQuery.params.customerName" placeholder="" clearable />
</el-form-item>
<el-form-item label="合同编号">
<el-input v-model="listQuery.params.contractNo" placeholder="" clearable />
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" @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 type="selection" align="center" width="50" />
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column prop="state" label="状态" align="center" width="150" />
<el-table-column prop="purchaseSystemName" label="采购系统" align="center" width="140" />
<el-table-column prop="brandName" label="品牌" align="center" width="200" />
<el-table-column prop="vehModelName" label="车型" align="center" width="200" />
<el-table-column prop="vinNo" label="车架号" align="center" width="150" />
<el-table-column prop="customerName" label="客户名称" align="center" width="140" />
<el-table-column prop="contractNo" label="合同编号" align="center" width="120" />
<el-table-column prop="estimateRebate" label="订单贴息" align="center" width="120" />
<el-table-column prop="adjustmentMoney" label="差额" align="center" width="150" />
<el-table-column prop="alreadyMoney" label="已调整" align="center" width="150" />
<el-table-column prop="nowDiffAmount" label="当前差额" align="center" width="100" />
</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>
</div>
</template>
<script>
import req from '@/api/financialDiscount/financialDiscount'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
export default {
name: 'ChooseAdjustment',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'primary',
size: 'small',
icon: '',
btnKey: 'toConfirm',
btnLabel: '确认'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1,
// -----------
tableKey: 0,
list: [],
multipleSelection: [],
FormLoading: false,
listLoading: false,
listQuery: {
params: {
useOrgSid: '',
staffSid: '',
purchaseSystemName: '',
brandName: '',
vehModel: '',
vinNo: '',
customerName: '',
contractNo: '',
sids: []
},
current: 1,
size: 5,
total: 0
}
}
},
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 'toConfirm':
this.toConfirm()
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) {
this.multipleSelection = row
},
showData(value, useOrgSid, staffSid) {
this.listQuery.params.useOrgSid = useOrgSid
this.listQuery.params.staffSid = staffSid
const aa = []
if (value.length > 0) {
for (var i = 0; i < value.length; i++) {
aa.push(value[i].vehSid)
}
this.listQuery.params.sids = aa
} else {
this.listQuery.params.sids = []
}
this.handleReset()
},
//
getList() {
this.listLoading = true
req.getAdjustVehList(this.listQuery).then((response) => {
console.log('列表查询结果:', response)
this.listLoading = false
if (response.success) {
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.current = 1
this.listQuery.size = 5
this.listQuery.total = 0
this.listQuery.params.purchaseSystemName = ''
this.listQuery.params.brandName = ''
this.listQuery.params.vehModel = ''
this.listQuery.params.vinNo = ''
this.listQuery.params.customerName = ''
this.listQuery.params.contractNo = ''
this.getList()
},
toConfirm() {
if (this.multipleSelection.length > 0) {
this.listQuery.params.useOrgSid = ''
this.listQuery.params.staffSid = ''
this.listQuery.params.sids = []
this.$emit('backData', this.multipleSelection)
} else {
this.$message({ showClose: true, type: 'error', message: '请选择至少一条数据进行操作' })
}
},
doClose() {
this.listQuery.params.useOrgSid = ''
this.listQuery.params.staffSid = ''
this.listQuery.params.sids = []
this.$emit('doback')
}
}
}
</script>
<style scoped>
</style>
Loading…
Cancel
Save