diff --git a/jinbooks-ui/src/views/hr/salary-summary.vue b/jinbooks-ui/src/views/hr/salary-summary.vue
index fdb77c1..b0621b0 100644
--- a/jinbooks-ui/src/views/hr/salary-summary.vue
+++ b/jinbooks-ui/src/views/hr/salary-summary.vue
@@ -187,30 +187,6 @@
{{ formatAmount(scope.row.businessExpenditureCosts) }}
-
-
-
- 生成
-
-
- 查看
-
-
-
-
-
-
- 生成
-
-
- 查看
-
-
-
-
+
@@ -62,7 +62,7 @@
-
@@ -157,7 +157,7 @@
-
+
@@ -249,7 +249,7 @@ const data = reactive({
bookId: currBookStore.bookId
},
voucherForm: {},
- rules: {
+ items: {
itemCode: [
{required: true, message: '编码不能为空', trigger: 'blur'}
],
@@ -259,7 +259,7 @@ const data = reactive({
}
});
-const {queryParams, form, rules, voucherForm} = toRefs(data);
+const {queryParams, form, items, voucherForm} = toRefs(data);
/** 查询列表 */
function getList() {
@@ -373,8 +373,10 @@ const submitForm = () => {
voucherTemplateRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.items = form.value.items.filter((item: any) => {
+ console.log("subjectCode "+item.subjectCode+ " summary " + item.summary +" direction "+ item.direction);
return item.subjectCode && item.summary && item.direction
})
+
form.value.relatedId = form.value.relatedId || queryParams.value.bookId;
buttonLoading.value = true;
diff --git a/jinbooks-ui/src/views/voucher/voucher-template.vue b/jinbooks-ui/src/views/voucher/voucher-template.vue
index 15f1cd3..75f7c7b 100644
--- a/jinbooks-ui/src/views/voucher/voucher-template.vue
+++ b/jinbooks-ui/src/views/voucher/voucher-template.vue
@@ -52,7 +52,7 @@
-
@@ -145,7 +145,7 @@
-
+
@@ -210,7 +210,7 @@ const data = reactive({
reportQuarter: getCurrentQuarter(),
reportDate: parseTime(new Date(), "{y}-{m}"),
},
- rules: {
+ items: {
itemCode: [
{required: true, message: '编码不能为空', trigger: 'blur'}
],
@@ -220,7 +220,7 @@ const data = reactive({
}
});
-const {queryParams, form, rules} = toRefs(data);
+const {queryParams, form, items} = toRefs(data);
const customPrefix = shallowRef({
render() {
@@ -345,6 +345,7 @@ const submitForm = () => {
voucherTemplateRef.value?.validate(async (valid: boolean) => {
if (valid) {
form.value.items = form.value.items.filter((item: any) => {
+ console.log("subjectCode "+item.subjectCode+ " summary " + item.summary +" direction "+ item.direction);
return item.subjectCode && item.summary && item.direction
})
form.value.relatedId =form.value.relatedId||queryParams.value.standardId;
diff --git a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
index 6639245..452e364 100644
--- a/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
+++ b/jinbooks/jinbooks-persistence/src/main/java/com/jinbooks/persistence/service/impl/SettlementCarryServiceImpl.java
@@ -29,6 +29,7 @@ import com.jinbooks.entity.book.BookSubject;
import com.jinbooks.entity.book.Settlement;
import com.jinbooks.entity.book.SettlementCarryforward;
import com.jinbooks.entity.book.vo.SettlementCarryforwardVo;
+import com.jinbooks.entity.hr.EmployeeSalarySummary;
import com.jinbooks.entity.statement.StatementSubjectBalance;
import com.jinbooks.entity.voucher.VoucherTemplate;
import com.jinbooks.entity.voucher.VoucherTemplateItem;
@@ -38,6 +39,7 @@ import com.jinbooks.entity.voucher.dto.VoucherItemChangeDto;
import com.jinbooks.entity.voucher.dto.VoucherTemplatePageDto;
import com.jinbooks.enums.VoucherStatusEnum;
import com.jinbooks.persistence.mapper.BookMapper;
+import com.jinbooks.persistence.mapper.EmployeeSalarySummaryMapper;
import com.jinbooks.persistence.mapper.SettlementCarryforwardMapper;
import com.jinbooks.persistence.mapper.SettlementMapper;
import com.jinbooks.persistence.mapper.VoucherTemplateItemMapper;
@@ -93,6 +95,9 @@ public class SettlementCarryServiceImpl extends ServiceImpl> fetchCarry(VoucherTemplatePageDto dto) {
dto.setCategory(1);//期末处理模板
@@ -197,7 +202,23 @@ public class SettlementCarryServiceImpl extends ServiceImpl salaryWrapper = new LambdaQueryWrapper<>();
+ salaryWrapper.eq(EmployeeSalarySummary::getBelongDate, currentTerm);
+ salaryWrapper.eq(EmployeeSalarySummary::getBookId, bookId);
+ salaryWrapper.eq(EmployeeSalarySummary::getLabel, "salary");
+ salaryWrapper.eq(EmployeeSalarySummary::getDeleted, "n");
+ EmployeeSalarySummary summary = employeeSalarySummaryMapper.selectOne(salaryWrapper);
+ if (voucherTemplate.getCode().startsWith("jt_gz")){
+ for (VoucherTemplateItem item : items) {
+ voucherItems.add(createVoucherItemDto(bookId, item, summary.getPayAmount()));
+ }
+ }else if (voucherTemplate.getCode().startsWith("jt_shebao")){
+ for (VoucherTemplateItem item : items) {
+ voucherItems.add(createVoucherItemDto(bookId, item, summary.getBusinessSocialInsurance()));
+ }
+ }
+ }else {
for (VoucherTemplateItem item : items) {
voucherItems.add(createVoucherItemDto(bookId, item, BigDecimal.ZERO));
}