From f1be1e7b5d4e994de923a8b2cb92b22a7a55c948 Mon Sep 17 00:00:00 2001
From: orangebabu <2409692770@qq.com>
Date: Thu, 24 Jul 2025 17:09:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/books/subject-relate.vue        |  2 +-
 sql/jinbooks_v1.0.1-add.sql                   | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/jinbooks-ui/src/views/books/subject-relate.vue b/jinbooks-ui/src/views/books/subject-relate.vue
index 4f4503d..ee2627a 100644
--- a/jinbooks-ui/src/views/books/subject-relate.vue
+++ b/jinbooks-ui/src/views/books/subject-relate.vue
@@ -87,7 +87,7 @@
         </el-table-column>
         <el-table-column prop="direction" :label="t('subjectBalanceDirection')" align="center" min-width="50">
           <template #default="scope">
-            <el-tag type="warning" v-if="scope.row.direction == 0">{{ t('subjectDirectionNone') }}</el-tag>
+            <el-tag type="warning" v-if="scope.row.direction == 0">{{ t('subjectDirectimonNone') }}</el-tag>
             <el-tag type="warning" v-if="scope.row.direction == 1">{{ t('subjectDebit') }}</el-tag>
             <el-tag type="success" v-if="scope.row.direction == 2">{{ t('subjectCredit') }}</el-tag>
           </template>
diff --git a/sql/jinbooks_v1.0.1-add.sql b/sql/jinbooks_v1.0.1-add.sql
index 607c351..cb41358 100644
--- a/sql/jinbooks_v1.0.1-add.sql
+++ b/sql/jinbooks_v1.0.1-add.sql
@@ -1,29 +1,37 @@
-ALTER TABLE `jinbooks`.`jbx_employee_salary_temp` 
+ALTER TABLE `jinbooks`.`jbx_employee_salary_temp`
 ADD COLUMN `pay_amount` DECIMAL(10,5) NULL DEFAULT '0.00000' COMMENT '应发工资=工资+应增-应扣' AFTER `personal_tax`;
 
 
-ALTER TABLE `jinbooks`.`jbx_employee_salary` 
+ALTER TABLE `jinbooks`.`jbx_employee_salary`
 ADD COLUMN `pay_amount` DECIMAL(10,5) NULL DEFAULT '0.00000' COMMENT '应发工资=工资+应增-应扣' AFTER `personal_tax`;
 
-ALTER TABLE `jinbooks`.`jbx_employee_salary_summary` 
+ALTER TABLE `jinbooks`.`jbx_employee_salary_summary`
 ADD COLUMN `pay_amount` DECIMAL(10,5) NULL DEFAULT '0.00000' COMMENT '应发工资=工资+应增-应扣' AFTER `personal_tax`;
 
-ALTER TABLE `jinbooks`.`jbx_employee_salary_summary` 
+ALTER TABLE `jinbooks`.`jbx_employee_salary_summary`
 DROP COLUMN `salary_voucher_id`,
 DROP COLUMN `accrual_voucher_id`;
 
 
 DROP TABLE `jinbooks`.`jbx_employee_salary_voucher_rule_template`, `jinbooks`.`jbx_employee_salary_voucher_rule`;
 
-ALTER TABLE `jinbooks`.`jbx_voucher_template` 
+ALTER TABLE `jinbooks`.`jbx_voucher_template`
 ADD COLUMN `voucher_date` SMALLINT NULL DEFAULT 0 COMMENT '默认凭证日期，为月份的第几天，0为月末' AFTER `voucher_type`;
 
 
 -- 上月数据
 
-ALTER TABLE `jinbooks`.`jbx_statement_subject_balance` 
+ALTER TABLE `jinbooks`.`jbx_statement_subject_balance`
 ADD COLUMN `prev_balance` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月末余额' AFTER `closing_balance_credit`,
 ADD COLUMN `prev_closing_balance_debit` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月期末余额（借方）' AFTER `prev_balance`,
 ADD COLUMN `prev_closing_balance_credit` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月期末余额（贷方）' AFTER `prev_closing_balance_debit`,
 ADD COLUMN `prev_year_to_date_debit` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月本年累计发生额（借方）' AFTER `prev_closing_balance_credit`,
-ADD COLUMN `prev_year_to_date_credit` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月本年累计发生额（贷方）' AFTER `prev_year_to_date_debit`;
\ No newline at end of file
+ADD COLUMN `prev_year_to_date_credit` DECIMAL(18,2) NOT NULL DEFAULT '0.00' COMMENT '上月本年累计发生额（贷方）' AFTER `prev_year_to_date_debit`;
+
+ALTER TABLE `jinbooks`.`jbx_employee_salary`
+ADD COLUMN `accrual_voucher_id` varchar(45) DEFAULT NULL COMMENT '收票凭证编码',
+ADD COLUMN `salary_voucher_id` varchar(45) DEFAULT NULL COMMENT '发放凭证编码';
+
+ALTER TABLE `jinbooks`.`jbx_voucher_item`
+MODIFY COLUMN `subject_balance` decimal(10,2) NOT NULL DEFAULT '0.00' COMMENT '科目余额';
+