核销功能修改

client/src/views/OaSystem/financialManagement/bzjglPage/UserForm.vue

@@ -22,7 +22,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="已核销金额" prop="writeOffAmount">
-            <el-input v-model="formData.writeOffAmount" disabled />
+            <el-input v-model="formData.writeOffAmount" @change="changeVerify1" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -108,7 +108,7 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }, 1000)
 }
 const formRules = reactive({
-  nowAmount: [{ validator: checkAge, trigger: 'blur' }]
+  //nowAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -150,7 +150,7 @@ const submitForm = async () => {
     }
 
     const sendData = {
-      writeOffAmount: formData.value.writeOffAmount + formData.value.nowAmount,
+      writeOffAmount: parseInt(formData.value.writeOffAmount) + formData.value.nowAmount,
       writeOffTime: formData.value.writeOffTime,
       writeOffRemark: formData.value.writeOffRemark,
       id: formData.value.detailId
@@ -173,6 +173,12 @@ const changeVerify = () => {
     formData.value.loanBalance = 0
   }
 }
+const changeVerify1 = () => {
+  formData.value.loanBalance = formData.value.amount - formData.value.writeOffAmount
+  if (formData.value.loanBalance < 0) {
+    formData.value.loanBalance = 0
+  }
+}
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {

client/src/views/OaSystem/financialManagement/bzjglPage/index.vue

@@ -143,12 +143,7 @@
               <div class="operateBtn" @click="operateClick(scope.row)">
                 <span>查看</span>
               </div>
-              <div
-                v-hasPermi="['bzj-cancel']"
-                class="operateBtn"
-                @click="openForm(scope.row)"
-                v-if="scope.row.iwriteOff == 0 || !scope.row.iwriteOff"
-              >
+              <div v-hasPermi="['bzj-cancel']" class="operateBtn" @click="openForm(scope.row)">
                 <span>核销</span>
               </div>
             </div>

client/src/views/OaSystem/financialManagement/loan/UserForm.vue

@@ -22,7 +22,7 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="已核销金额" prop="verifyAmount">
-            <el-input v-model="formData.verifyAmount" disabled />
+            <el-input v-model="formData.verifyAmount" @change="changeVerify1" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -108,7 +108,7 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }, 1000)
 }
 const formRules = reactive({
-  nowAmount: [{ validator: checkAge, trigger: 'blur' }]
+  //nowAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -144,7 +144,7 @@ const submitForm = async () => {
   try {
     const urlApi = `/Loan/update`
     const sendData = {
-      verifyAmount: formData.value.verifyAmount + formData.value.nowAmount,
+      verifyAmount: parseInt(formData.value.verifyAmount) + formData.value.nowAmount,
       verifyDate: formData.value.verifyDate,
       verifyBz: formData.value.verifyBz,
       id: formData.value.id
@@ -167,6 +167,12 @@ const changeVerify = () => {
     formData.value.loanBalance = 0
   }
 }
+const changeVerify1 = () => {
+  formData.value.loanBalance = formData.value.loanAmount - formData.value.verifyAmount
+  if (formData.value.loanBalance < 0) {
+    formData.value.loanBalance = 0
+  }
+}
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {

client/src/views/OaSystem/financialManagement/loan/loan.vue

@@ -99,12 +99,7 @@
               <div class="operateBtn" @click="operateClick(scope.row)">
                 <span>查看</span>
               </div>
-              <div
-                v-hasPermi="['loan-cancel']"
-                class="operateBtn"
-                @click="openForm(scope.row)"
-                v-if="scope.row.isVerify == 0"
-              >
+              <div v-hasPermi="['loan-cancel']" class="operateBtn" @click="openForm(scope.row)">
                 <span>核销</span>
               </div>
             </div>

zjugis-business/src/main/java/com/zjugis/business/flow/loan/controller/vo/LoanBaseVO.java

@@ -78,7 +78,7 @@ public class LoanBaseVO {
     @Schema(description = "核销金额")
     private BigDecimal verifyAmount;
     @Schema(description = "核销备注")
-    private BigDecimal verifyBz;
+    private String verifyBz;
 
     @Schema(description = "是否核销")
     private Integer isVerify;