yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 months ago
parent
2b180a046a dc259acdb8
commit
d72fd7c45a
10 changed files with 217 additions and 103 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 65
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
  2. 24
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
  3. 21
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
  4. 61
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
  5. 21
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
  6. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java
  7. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java
  8. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
  9. 117
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
  10. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

65
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentAdd.vue
View File

@ -54,7 +54,7 @@
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
<el-form-item prop="isVeh">
<el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh">
<el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh" @change="isVehChange">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
@ -62,7 +62,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>付款单位</div>
<el-form-item prop="payCompany">
<el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
@ -70,15 +70,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">付款申请备注</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div v-if="formobj.isVeh == '0'">
<div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
<div class="span-sty"><span class="icon">*</span>是否事业部运营经理审批</div>
<el-form-item prop="isLeaderSp">
<el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
<el-radio label="1">是</el-radio>
@ -87,6 +87,17 @@
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div v-if="formobj.isVeh == '0' && formobj.isLeaderSp == '1'">
<div class="span-sty"><span class="icon">*</span>是否事业部总经理审批</div>
<el-form-item prop="isManageSp">
<el-radio-group class="addinputInfo" v-model="formobj.isManageSp">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</div>
</el-col>
</el-row>
<div v-if="formobj.costTypeValue === '融资付款'">
<div class="title titleOne">
@ -179,14 +190,14 @@
<div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
<div style="margin-right: 10px">
<span><span class="icon">*</span>是否已销售：</span>
<el-radio-group v-model="formobj.isSales" @change="clearByCar">
<el-radio-group v-model="formobj.isSales" @change="clearByCar('isSales', $event)">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</div>
<div style="margin-right: 10px">
<span><span class="icon">*</span>款项是否已交清：</span>
<el-radio-group v-model="formobj.isSettle" @change="clearByCar">
<el-radio-group v-model="formobj.isSettle" @change="clearByCar('isSettle', $event)">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
@ -397,7 +408,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -426,7 +438,8 @@ export default {
carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }]
isLeaderSp: [{ required: true, message: '是否事业部运营经理审批不能为空', trigger: 'change' }],
isManageSp: [{ required: true, message: '是否事业部总经理审批不能为空', trigger: 'change' }]
},
paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
@ -567,6 +580,18 @@ export default {
this.formobj.isVeh = ''
}
},
isVehChange(val) {
if (val === '1') {
this.formobj.isLeaderSp = ''
this.formobj.isManageSp = ''
} else if (val === '0') {
this.formobj.isSales = ''
this.formobj.isSettle = ''
this.formobj.vehicleList = []
this.formobj.isLeaderSp = '1'
this.formobj.isManageSp = ''
}
},
changePayCompany(value) {
const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value)
if (choose.length > 0 && choose !== null) {
@ -744,7 +769,14 @@ export default {
list: []
}
},
clearByCar() {
clearByCar(val, event) {
if (val === 'isSettle' && event === '1') {
this.formobj.isLeaderSp = '0'
this.formobj.isManageSp = '0'
} else if (val === 'isSettle' && event === '0') {
this.formobj.isLeaderSp = '1'
this.formobj.isManageSp = '1'
}
this.formobj.vehicleList = []
},
toSelect() {
@ -979,7 +1011,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -1014,17 +1047,17 @@ export default {
<style scoped>
.span-sty {
width: 150px !important;
width: 170px !important;
}
.addinputInfo {
margin-left: 140px !important;
margin-left: 160px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 140px !important;
width: calc(100% - 135px);
margin-left: 160px !important;
width: calc(100% - 155px);
}
/deep/ .el-form-item__error {
margin-left: 140px !important;
margin-left: 160px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;

24
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/fukuanshenqing/paymentInfo.vue
View File

@ -43,20 +43,26 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">付款单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<el-col :span="6" class="tlineheightb">
<div class="span-sty">付款申请备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div v-if="formobj.isVeh == '0'">
<div class="span-sty">是否事业部领导审批</div>
<div class="span-sty">是否事业部运营经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
<el-col :span="6">
<div v-if="formobj.isVeh == '0' && formobj.isLeaderSp == '1'">
<div class="span-sty">是否事业部总经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isManageSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<div v-if="formobj.costTypeValue === '融资付款'">
<div class="title">
@ -251,7 +257,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -392,7 +399,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -426,10 +434,10 @@ export default {
<style scoped>
.span-sty {
width: 150px !important;
width: 170px !important;
}
.addinputInfo {
margin-left: 140px !important;
margin-left: 160px !important;
}
.tlineheightb {
display: flex;

21
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanDaiBanInfo.vue
View File

@ -45,20 +45,26 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">付款单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<el-col :span="6" class="tlineheightb">
<div class="span-sty">付款申请备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div v-if="formobj.isVeh == '0'">
<div class="span-sty">是否事业部领导审批</div>
<div class="span-sty">是否事业部运营经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
<el-col :span="6">
<div v-if="formobj.isVeh == '0' && formobj.isLeaderSp == '1'">
<div class="span-sty">是否事业部总经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isManageSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<div v-if="formobj.costTypeValue === '融资付款'">
<div class="title">
@ -275,7 +281,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -596,10 +603,10 @@ export default {
border-top: 1px solid #e0e3eb;
}
.span-sty {
width: 150px !important;
width: 170px !important;
}
.addinputInfo {
margin-left: 140px !important;
margin-left: 160px !important;
}
.tlineheightb {
display: flex;

61
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanEdit.vue
View File

@ -53,7 +53,7 @@
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>是否涉及车辆</div>
<el-form-item prop="isVeh">
<el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh">
<el-radio-group :disabled="formobj.costTypeKey !== '001' && formobj.costTypeKey !== ''" class="addinputInfo" v-model="formobj.isVeh" @change="isVehChange">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
@ -61,7 +61,7 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty"><span class="icon">*</span>付款单位</div>
<el-form-item prop="payCompany">
<el-select class="addinputInfo" v-model="formobj.payCompany" filterable placeholder="请选择" @change="changePayCompany" clearable>
@ -69,15 +69,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">付款申请备注</div>
<el-form-item>
<el-input class="addinputInfo addinputw" v-model="formobj.remarks" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div v-if="formobj.isVeh == '0'">
<div class="span-sty"><span class="icon">*</span>是否事业部领导审批</div>
<div class="span-sty"><span class="icon">*</span>是否事业部运营经理审批</div>
<el-form-item prop="isLeaderSp">
<el-radio-group class="addinputInfo" v-model="formobj.isLeaderSp">
<el-radio label="1">是</el-radio>
@ -86,6 +86,17 @@
</el-form-item>
</div>
</el-col>
<el-col :span="6">
<div v-if="formobj.isVeh == '0' && formobj.isLeaderSp == '1'">
<div class="span-sty"><span class="icon">*</span>是否事业部总经理审批</div>
<el-form-item prop="isManageSp">
<el-radio-group class="addinputInfo" v-model="formobj.isManageSp">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</el-form-item>
</div>
</el-col>
</el-row>
<div v-if="formobj.costTypeValue === '融资付款'">
<div class="title titleOne">
@ -177,14 +188,14 @@
<div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
<div style="margin-right: 10px">
<span><span class="icon">*</span>是否已销售：</span>
<el-radio-group v-model="formobj.isSales" @change="clearByCar">
<el-radio-group v-model="formobj.isSales" @change="clearByCar('isSales', $event)">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
</div>
<div style="margin-right: 10px">
<span><span class="icon">*</span>款项是否已交清：</span>
<el-radio-group v-model="formobj.isSettle" @change="clearByCar">
<el-radio-group v-model="formobj.isSettle" @change="clearByCar('isSettle', $event)">
<el-radio label="1">是</el-radio>
<el-radio label="0">否</el-radio>
</el-radio-group>
@ -395,7 +406,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -424,7 +436,7 @@ export default {
carBrandName: [{ required: true, message: '品牌不能为空', trigger: 'change' }],
isVeh: [{ required: true, message: '是否涉及车辆不能为空', trigger: 'change' }],
payCompany: [{ required: true, message: '付款单位不能为空', trigger: 'change' }],
isLeaderSp: [{ required: true, message: '是否事业部领导审批不能为空', trigger: 'change' }]
isLeaderSp: [{ required: true, message: '是否事业部运营经理审批不能为空', trigger: 'change' }]
},
paymentVisible: false, // 付款明细表 -- 新增付款信息弹框
paymentBtn: false, // 付款明细表 -- 新增付款信息弹框 -- 页面按钮是否显示隐藏
@ -557,6 +569,18 @@ export default {
this.formobj.isVeh = ''
}
},
isVehChange(val) {
if (val === '1') {
this.formobj.isLeaderSp = ''
this.formobj.isManageSp = ''
} else if (val === '0') {
this.formobj.isSales = ''
this.formobj.isSettle = ''
this.formobj.vehicleList = []
this.formobj.isLeaderSp = '1'
this.formobj.isManageSp = ''
}
},
changePayCompany(value) {
const choose = this.payCompany_list.filter((item) => item.companyInvoicingName === value)
if (choose.length > 0 && choose !== null) {
@ -734,7 +758,14 @@ export default {
list: []
}
},
clearByCar() {
clearByCar(val, event) {
if (val === 'isSettle' && event === '1') {
this.formobj.isLeaderSp = '0'
this.formobj.isManageSp = '0'
} else if (val === 'isSettle' && event === '0') {
this.formobj.isLeaderSp = '1'
this.formobj.isManageSp = '1'
}
this.formobj.vehicleList = []
},
toSelect() {
@ -984,17 +1015,17 @@ export default {
padding: 30px 0 20px 0;
}
.span-sty {
width: 150px !important;
width: 170px !important;
}
.addinputInfo {
margin-left: 140px !important;
margin-left: 160px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 140px !important;
width: calc(100% - 135px);
margin-left: 160px !important;
width: calc(100% - 155px);
}
/deep/ .el-form-item__error {
margin-left: 140px !important;
margin-left: 160px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;

21
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/fukuanguanliFlow/fukuanguanli/fukuanYiBanInfo.vue
View File

@ -43,20 +43,26 @@
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col :span="6">
<div class="span-sty">付款单位</div>
<el-form-item><span class="addinputInfo">{{ formobj.payCompany }}</span></el-form-item>
</el-col>
<el-col :span="8" class="tlineheightb">
<el-col :span="6" class="tlineheightb">
<div class="span-sty">付款申请备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
<el-col :span="8">
<el-col :span="6">
<div v-if="formobj.isVeh == '0'">
<div class="span-sty">是否事业部领导审批</div>
<div class="span-sty">是否事业部运营经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isLeaderSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
<el-col :span="6">
<div v-if="formobj.isVeh == '0' && formobj.isLeaderSp == '1'">
<div class="span-sty">是否事业部总经理审批</div>
<el-form-item><span class="addinputInfo">{{ formobj.isManageSp == '1' ? '是' : '否' }}</span></el-form-item>
</div>
</el-col>
</el-row>
<div v-if="formobj.costTypeValue === '融资付款'">
<div class="title">
@ -250,7 +256,8 @@ export default {
createTime: '', // 申请日期
costRangeKey: '', // 款项范围Key
costRangeValue: '', // 款项范围value
isLeaderSp: '', // 是否事业部领导审批，1是0否
isLeaderSp: '', // 是否事业部运营经理审批，1是0否
isManageSp: '', // 是否事业部总经理审批， 1是0否
isSales: '', // 是否已销售
isSettle: '', // 款项是否已交清
costTypeKey: '', // 款项类别key
@ -465,10 +472,10 @@ export default {
padding: 30px 0 20px 0;
}
.span-sty {
width: 150px !important;
width: 170px !important;
}
.addinputInfo {
margin-left: 140px !important;
margin-left: 160px !important;
}
.tlineheightb {
display: flex;

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapply.java
View File

@ -69,6 +69,8 @@ public class FinPaymentapply extends BaseEntity {
private String costRangeValue;
@ApiModelProperty("是否事业部领导审批，1是0否")
private String isLeaderSp;
@ApiModelProperty("是否事业部总经理审批，1是0否")
private String isManageSp;
@ApiModelProperty("是否已销售，1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清，1是0否")

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDetailsVo.java
View File

@ -28,11 +28,8 @@ package com.yxt.anrui.fin.api.finpaymentapply;
import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetailVo;
import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEveDto;
import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplytop.FinPaymentapplyTopDto;
import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDetailsVo;
import com.yxt.anrui.fin.api.finpaymentapplytrailer.FinPaymentapplyTrailerDto;
import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModel;
@ -112,6 +109,8 @@ public class FinPaymentapplyDetailsVo implements Vo {
private String costRangeValue;
@ApiModelProperty("是否事业部领导审批，1是0否")
private String isLeaderSp;
@ApiModelProperty("是否事业部总经理审批，1是0否")
private String isManageSp;
@ApiModelProperty("是否已销售，1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清，1是0否")

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapply/FinPaymentapplyDto.java
View File

@ -113,6 +113,8 @@ public class FinPaymentapplyDto implements Dto {
private String costRangeValue;
@ApiModelProperty("是否事业部领导审批，1是0否")
private String isLeaderSp;
@ApiModelProperty("是否事业部总经理审批，1是0否")
private String isManageSp;
@ApiModelProperty("是否已销售，1是0否")
private String isSales;
@ApiModelProperty("款项是否已交清，1是0否")

117
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java
View File

@ -458,18 +458,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
variables.put("app", appMap);
//网关
finPaymentapply = fetchBySid(businessSid);
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
if (finPaymentapply.getIsLeaderSp().equals("1")) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
} else {
variables.put("isAdj", false);
}
if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
if (finPaymentapply.getIsManageSp().equals("1")) {
variables.put("isManageSp", true);
} else {
variables.put("isManageSp", false);
}
} else {
variables.put("isManageSp", false);
}
//用户的部门全路径sid
bv.setOrgSidPath(orgSidPath);
@ -607,25 +612,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
FinPaymentapply finPaymentapply = fetchBySid(bv.getBusinessSid());
bv.setModelId(finPaymentapply.getProcDefId());
if (bv.getTaskId().equals(finPaymentapply.getTaskId())) {
Map<String, Object> vaributes = new HashMap<>();
Map<String, Object> variables = new HashMap<>();
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
vaributes.put("isAdj", false);
if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
if (finPaymentapply.getIsLeaderSp().equals("1")) {
variables.put("isAdj", true);
} else {
vaributes.put("isAdj", true);
variables.put("isAdj", false);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
vaributes.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
if (finPaymentapply.getIsManageSp().equals("1")) {
variables.put("isManageSp", true);
} else {
vaributes.put("isAdj", false);
variables.put("isManageSp", false);
}
} else {
variables.put("isManageSp", false);
}
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", bv.getBusinessSid());
vaributes.put("app", appMap);
bv.setFormVariables(vaributes);
variables.put("app", appMap);
bv.setFormVariables(variables);
bv.setOrgSidPath(finPaymentapply.getOrgSidPath());
ResultBean<UpdateFlowFieldVo> resultBean = flowFeign.handleProsess(bv);
if (!resultBean.getSuccess()) {
@ -775,18 +785,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//查询业务信息
FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
if (finPaymentapply.getIsLeaderSp().equals("1")) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
} else {
variables.put("isAdj", false);
}
if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
if (finPaymentapply.getIsManageSp().equals("1")) {
variables.put("isManageSp", true);
} else {
variables.put("isManageSp", false);
}
} else {
variables.put("isManageSp", false);
}
bv.setModelId(finPaymentapply.getProcDefId());
bv.setFormVariables(variables);
@ -812,18 +827,23 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
//查询业务信息
FinPaymentapply finPaymentapply = fetchBySid(query.getBusinessSid());
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
variables.put("isAdj", false);
} else {
variables.put("isAdj", true);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
if (finPaymentapply.getIsLeaderSp().equals("1")) {
variables.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
} else {
variables.put("isAdj", false);
}
if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
if (finPaymentapply.getIsManageSp().equals("1")) {
variables.put("isManageSp", true);
} else {
variables.put("isManageSp", false);
}
} else {
variables.put("isManageSp", false);
}
bv.setModelId(finPaymentapply.getProcDefId());
bv.setFormVariables(variables);
@ -858,25 +878,30 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
}
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
Map<String, Object> vaributes = new HashMap<>();
Map<String, Object> variables = new HashMap<>();
Map<String, Object> appMap = new HashMap<>();
appMap.put("sid", query.getBusinessSid());
vaributes.put("app", appMap);
variables.put("app", appMap);
//网关
if ("1".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsSettle())) {
vaributes.put("isAdj", false);
if (StringUtils.isNotBlank(finPaymentapply.getIsLeaderSp())) {
if (finPaymentapply.getIsLeaderSp().equals("1")) {
variables.put("isAdj", true);
} else {
vaributes.put("isAdj", true);
variables.put("isAdj", false);
}
} else if ("0".equals(finPaymentapply.getIsVeh())) {
if ("1".equals(finPaymentapply.getIsLeaderSp())) {
vaributes.put("isAdj", true);
} else {
variables.put("isAdj", false);
}
if (StringUtils.isNotBlank(finPaymentapply.getIsManageSp())) {
if (finPaymentapply.getIsManageSp().equals("1")) {
variables.put("isManageSp", true);
} else {
vaributes.put("isAdj", false);
variables.put("isManageSp", false);
}
} else {
variables.put("isManageSp", false);
}
flowTaskVo.setValues(vaributes);
flowTaskVo.setValues(variables);
ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
if (!resultBean.getSuccess()) {
return rb.setMsg(resultBean.getMsg());

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -23,7 +23,7 @@ public enum ProcDefEnum {
// BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:8:725012"),
BASEVEHICLEACTUALSALES("未售买断", "process_6qx07b75:9:4087504"),
FINCOSTAPPLY("费用申请", "process_u0pahv0s:6:725016"),
FINPAYAPPLY("付款申请", "process_gin2tntb:6:16692504"),
FINPAYAPPLY("付款申请", "process_gin2tntb:7:18505004"),
RECORDAPPLICATION("入库申请", "process_xbwq2c7p:5:1742504"),
SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:722508"),
SEALAPPLY("盖章申请", "process_7h0z66tp:1:240064"),

Write Preview
Loading…
Cancel
Save