diff --git a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/IncomeEntryApplicationOut.java b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/IncomeEntryApplicationOut.java
index 20d79374cfc78c180e738e64e217226a9aa2f5cf..d8250beb765cf88ea5fde69c78e722510fa91e4f 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/IncomeEntryApplicationOut.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/application/query/dto/out/IncomeEntryApplicationOut.java
@@ -50,4 +50,5 @@ public class IncomeEntryApplicationOut {
public Long invoiceId;
public Long incomeId;
public String entryType;
+ public String rejectReason;
}
diff --git a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/interfaces/controller/api/IncomeController.java b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/interfaces/controller/api/IncomeController.java
index 0be45b3c247d304d2d089285794ca1b621b48fd5..e7b9d11eabb7adc58d6589aa667af166cb55d471 100644
--- a/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/interfaces/controller/api/IncomeController.java
+++ b/ServiceSite/facade/src/main/java/com/seasky/ledgerincome/interfaces/controller/api/IncomeController.java
@@ -56,7 +56,8 @@ public interface IncomeController {
@ApiOperation("閫€鍥�")
@PostMapping("/reback")
Result<Object> reback(@RequestParam("incomeId") Long incomeId,
- @RequestParam("rejectReason") String rejectReason);
+ @RequestParam("rejectReason") String rejectReason,
+ @RequestParam("opterType") String opterType);
@ApiOperation("鏌ヨ鍑瘉")
@PostMapping("/selectVoucher")
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
index 6626fa8667a9fe1158b66f3eb38ffd15b32dcf7a..4fa1c083b610c2daeddfb0bad7b70d2bf2ef66a5 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/application/command/IncomeCommandServiceImpl.java
@@ -187,6 +187,7 @@ public class IncomeCommandServiceImpl extends BaseCommandAbstractService<Income
@Transactional
public void incomeAllocation(IncomeAllocationCmd cmd,String code) {
IncomeAggregate incomeAggregate=findById(cmd.getIncomeId());
+ incomeAggregate.changeRepairProject("");
if(cmd.getIncomeTypeName().equals(IncomeSpeedEnum.寰呰棰�.getValue())) {
incomeAggregate.changeIncomeSpeed(IncomeSpeedEnum.寰呰棰�.getValue());
incomeAggregate.changeNeedInQuire(true);
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
index ccd2c0dfacf7e0b67793223662e24fe7e5273728..76d28228beeb9a7ab61e047e79ff065b32495909 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/mapper/xml/EntryBillMapper.xml
@@ -23,7 +23,8 @@
a.need_in_quire,c.invoice_type,
entry_bill_id,voucher_state,
entry_bill_flow_id,voucher_id,
- c.invoice_id, a.id income_id
+ c.invoice_id, a.id income_id,
+ a.reject_reason
FROM
t_income a
left JOIN t_income_type b ON b.id = a.income_type_id
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomeEntryApplicationPo.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomeEntryApplicationPo.java
index 72a898bbb63ed3a97e7ae8edbb00f844359f61d3..6ddee121bfa077450527d717def4d3462726da68 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomeEntryApplicationPo.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/infrastructure/po/IncomeEntryApplicationPo.java
@@ -51,5 +51,5 @@ public class IncomeEntryApplicationPo implements Serializable {
public Long invoiceId;
public Long incomeId;
public String entryType;
-
+ public String rejectReason;
}
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/AccountEntryManageControllerImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/AccountEntryManageControllerImpl.java
index 6703bd8f5fd1f2618f723660969842405741fe25..4113b70f3ce2967094397a6a4220042ac8fa956f 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/AccountEntryManageControllerImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/AccountEntryManageControllerImpl.java
@@ -90,7 +90,7 @@ public class AccountEntryManageControllerImpl extends BaseControllerImpl implem
invoiceCommandServiece.rejectInvoice(cmd);
return Response.success();
}
- @LogOperation("鍥炲崟鍒嗛厤-杩涘害")
+ @LogOperation("鍥炲崟鍒嗛厤-鍥炲崟鍒嗛厤")
@Override
public Result<Object> incomeAllocation(IncomeAllocationCmd cmd) {
incomeCommandService.incomeAllocation(cmd,getLoginInfoOut().getUserName()+'-'+getLoginInfoOut().getPersonName());
diff --git a/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/IncomeControllerImpl.java b/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/IncomeControllerImpl.java
index 9100696f3bc24b612e4ad4c5ce8c3f0f9088c17f..5e6b07838953ae387c03655c31e87242f57e13ef 100644
--- a/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/IncomeControllerImpl.java
+++ b/ServiceSite/src/main/java/com/seasky/ledgerincome/interfaces/controller/IncomeControllerImpl.java
@@ -111,7 +111,7 @@ public class IncomeControllerImpl extends BaseControllerImpl implements IncomeCo
@Override
public Result<Object> reback(Long incomeId,
- String rejectReason) {
+ String rejectReason , String opterType) {
incomeCommandService.reback(incomeId,rejectReason);
return ok(ResponseCode.SUCCESS);
}
diff --git a/WebSite/src/views/entryapplication/components/incomeapplication.vue b/WebSite/src/views/entryapplication/components/incomeapplication.vue
index 6d7bad4faa6ed643418fbc923152d745231c9499..c9554e4bc43922667b83028a3a2b610d51232fab 100644
--- a/WebSite/src/views/entryapplication/components/incomeapplication.vue
+++ b/WebSite/src/views/entryapplication/components/incomeapplication.vue
@@ -116,7 +116,13 @@
:incomeDetailPara="incomeDetailPara"
v-model:visible="incomeDetailPara.visible"
></IncomeDetail>
+
+ <RejectReason :rejectIncomePara="rejectIncomePara"
+ v-if="rejectIncomePara.visible"
+ v-model:visible="rejectIncomePara.visible"
+ @closeRejectIncome="selectIncomeEntryApplication"></RejectReason>
</div>
+
</template>
<script>
@@ -126,9 +132,10 @@ import { ElMessage, ElNotification, ElMessageBox } from 'element-plus';
import Pagination from '@/components/Pagination';
import IncomeDetail from '@/views/common/incomedetail.vue';
import Income from '@/api/Income';
+import RejectReason from '@/views/srincomesupplement/components/rejectreason.vue';
export default {
name: 'incomeapplication',
- components: { Pagination, IncomeDetail },
+ components: { Pagination, IncomeDetail,RejectReason },
emits: ['returnIncomeApplication'],
props:['queryMod'],
setup(props, context) {
@@ -150,6 +157,12 @@ export default {
visible: false,
incomeId: '',
},
+ rejectIncomePara:{
+ visible:false,
+ incomeId:'',
+ rejectReason:'',
+ type:"鍏ヨ处鐢宠"
+ }
});
watch(
() => props.queryMod,
@@ -200,13 +213,10 @@ export default {
cancelButtonText: '鍙栨秷',
type: 'warning',
}).then(() => {
- Income.reback(row.incomeId).then((rs) => {
- if (rs.code != '00000') {
- return ElNotification.warning(rs.description);
- }
- selectIncomeEntryApplication();
- return ElMessage.success('閫€鍥炴垚鍔�!');
- });
+
+ data.rejectIncomePara.visible=true;
+ data.rejectIncomePara.incomeId=row.incomeId;
+ data.rejectReason=row.rejectReason;
});
};
return {
diff --git a/WebSite/src/views/srincomesupplement/components/rejectreason.vue b/WebSite/src/views/srincomesupplement/components/rejectreason.vue
index 2905ab7e9a3b0c176a5be3c3db7b8cec01e3a38b..f3399ba7b908569ec2baf9e6e98e2f18a8a2be83 100644
--- a/WebSite/src/views/srincomesupplement/components/rejectreason.vue
+++ b/WebSite/src/views/srincomesupplement/components/rejectreason.vue
@@ -43,7 +43,8 @@ setup(props,context){
visible:props.rejectIncomePara.visible,
incomeRejectCmd:{
incomeId:props.rejectIncomePara.incomeId,
- rejectReason:''
+ rejectReason:props.rejectIncomePara.rejectReason==null?'':props.rejectIncomePara.rejectReason,
+ opterType:props.rejectIncomePara.type==null?'':props.rejectIncomePara.type
}
});
const closeRejectDialog=()=>{
diff --git a/WebSite/src/views/srincomesupplement/index.vue b/WebSite/src/views/srincomesupplement/index.vue
index 5a8bf02d722e25eabd68361b493006df270facef..5e8d91d47a55dfd89bbe2308be4d18b741b25aec 100644
--- a/WebSite/src/views/srincomesupplement/index.vue
+++ b/WebSite/src/views/srincomesupplement/index.vue
@@ -342,7 +342,9 @@ export default {
},
rejectIncomePara:{
visible:false,
- incomeId:''
+ incomeId:'',
+ rejectReason:'',
+ type:"涓氬姟琛ュ厖"
}
});
onMounted(() => {