借款，保证金核销问题修改

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

@@ -123,12 +123,6 @@
           label="核销时间"
         />
         <el-table-column align="center" prop="userNickname" label="申请人" />
-        <el-table-column
-          show-overflow-tooltip="true"
-          align="center"
-          prop="paymentCompanyName"
-          label="付款单位"
-        />
         <el-table-column align="center" label="操作" width="80">
           <template #default="scope">
             <div class="operateBtn" @click="operateClick(scope.row)">

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

@@ -94,6 +94,8 @@ const checkAge = (rule: any, value: any, callback: any) => {
   setTimeout(() => {
     if (value < 0) {
       callback(new Error('核销金额必须大于0'))
+    } else if (value > formData.value.amount) {
+      callback(new Error('核销金额不能大于总金额'))
     } else {
       callback()
     }
@@ -108,6 +110,8 @@ const open = async (row: object) => {
   row.loanBalance = row.amount - row.writeOffAmount
   if (!row.writeOffTime) {
     row.writeOffTime = moment().format('YYYY-MM-DD')
+  } else {
+    row.writeOffTime = moment(row.writeOffTime).format('YYYY-MM-DD')
   }
   dialogVisible.value = true
   resetForm()
@@ -141,7 +145,7 @@ const submitForm = async () => {
       id: formData.value.detailId
     }
     if (formData.value.loanBalance == 0) {
-      sendData.isVerify = 1
+      sendData.iWriteOff = 1
     }
     const result = await request.post({ url: urlApi, params: sendData }, '/business')
     message.success(t('核销成功'))

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

@@ -136,12 +136,6 @@
           label="核销时间"
         />
         <el-table-column align="center" prop="userNickname" label="申请人" />
-        <el-table-column
-          show-overflow-tooltip="true"
-          align="center"
-          prop="paymentCompanyName"
-          label="付款单位"
-        />
         <el-table-column align="center" fixed="right" label="操作" width="120">
           <template #default="scope">
             <div style="display: flex">
@@ -172,7 +166,7 @@
       </div>
     </div>
   </div>
-  <UserForm ref="formRef" @success="queryLoanListAjax" />
+  <UserForm ref="formRef" @success="handleQuery" />
 </template>
 
 <script setup lang="ts">

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

@@ -94,6 +94,8 @@ const checkAge = (rule: any, value: any, callback: any) => {
   setTimeout(() => {
     if (value < 0) {
       callback(new Error('核销金额必须大于0'))
+    } else if (value > formData.value.loanAmount) {
+      callback(new Error('核销金额不能大于总金额'))
     } else {
       callback()
     }

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

@@ -31,14 +31,6 @@
           <el-option :key="0" label="未核销" :value="0" />
         </el-select>
       </div>
-      <div class="form">
-        <span class="formSpan">状态：</span>
-        <el-select width="160px" v-model="queryParams.flowStatus" placeholder="">
-          <el-option :key="''" label="全部" :value="''" />
-          <el-option :key="1" label="办理中" :value="1" />
-          <el-option :key="90" label="已借" :value="90" />
-        </el-select>
-      </div>
       <div class="form form-time-range">
         <span class="formSpan">申请时间：</span>
         <el-date-picker
@@ -82,16 +74,11 @@
         <el-table-column prop="verifyAmount" label="已核销金额" width="120" />
         <el-table-column prop="loanBalance" label="借款余额" width="120" />
         <el-table-column prop="agreedPayTime" label="约定付款期限" width="120" />
-        <el-table-column prop="isVerify" label="核销状态" width="80">
-          <template #default="scope">
-            {{ verifyMap[scope.row.isVerify] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="verifyDate" label="核销时间" width="120" />
         <el-table-column show-overflow-tooltip="true" prop="description" label="借款说明" />
-        <el-table-column prop="flowStatus" label="状态" width="80">
+        <el-table-column prop="isVerify" label="核销状态" width="160">
           <template #default="scope">
-            {{ flowStatusMap[scope.row.flowStatus] }}
+            {{ verifyMap[scope.row.isVerify] }}
           </template>
         </el-table-column>
         <el-table-column label="操作" width="80" fixed="right">

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

@@ -31,14 +31,6 @@
           <el-option :key="0" label="未核销" :value="0" />
         </el-select>
       </div>
-      <div class="form">
-        <span class="formSpan">状态：</span>
-        <el-select width="160px" v-model="queryParams.flowStatus" placeholder="">
-          <el-option :key="''" label="全部" :value="''" />
-          <el-option :key="1" label="办理中" :value="1" />
-          <el-option :key="90" label="已借" :value="90" />
-        </el-select>
-      </div>
       <div class="form form-time-range">
         <span class="formSpan">申请时间：</span>
         <el-date-picker
@@ -95,17 +87,17 @@
           </template>
         </el-table-column>
         <el-table-column prop="agreedPayTime" label="约定付款期限" width="120" />
-        <el-table-column prop="isVerify" label="核销状态" width="80">
-          <template #default="scope">
-            {{ verifyMap[scope.row.isVerify] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="verifyDate" label="核销时间" width="120" />
         <el-table-column show-overflow-tooltip="true" prop="description" label="借款说明" />
-        <el-table-column prop="flowStatus" label="状态" width="80">
+        <!-- <el-table-column prop="flowStatus" label="状态" width="80">
           <template #default="scope">
             {{ flowStatusMap[scope.row.flowStatus] }}
           </template>
+        </el-table-column> -->
+        <el-table-column prop="isVerify" label="核销状态" width="160">
+          <template #default="scope">
+            {{ verifyMap[scope.row.isVerify] }}
+          </template>
         </el-table-column>
         <el-table-column label="操作" width="120" fixed="right">
           <template #default="scope">

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

@@ -23,20 +23,6 @@
           <el-option :key="0" label="未核销" :value="0" />
         </el-select>
       </div>
-      <div class="form">
-        <span class="formSpan">状态：</span>
-        <el-select
-          width="160px"
-          v-model="queryParams.flowStatus"
-          class="m-2"
-          placeholder=""
-          size="large"
-        >
-          <el-option :key="''" label="全部" :value="''" />
-          <el-option :key="1" label="办理中" :value="1" />
-          <el-option :key="90" label="已借" :value="90" />
-        </el-select>
-      </div>
       <div class="form form-time-range">
         <span class="formSpan">申请时间：</span>
         <el-date-picker
@@ -80,16 +66,11 @@
         <el-table-column prop="verifyAmount" label="已核销金额" width="120" />
         <el-table-column prop="loanBalance" label="借款余额" width="120" />
         <el-table-column prop="agreedPayTime" label="约定付款期限" width="120" />
-        <el-table-column prop="isVerify" label="核销状态" width="80">
-          <template #default="scope">
-            {{ verifyMap[scope.row.isVerify] }}
-          </template>
-        </el-table-column>
         <el-table-column prop="verifyDate" label="核销时间" width="120" />
         <el-table-column show-overflow-tooltip="true" prop="description" label="借款说明" />
-        <el-table-column prop="flowStatus" label="状态" width="80">
+        <el-table-column prop="isVerify" label="核销状态" width="160">
           <template #default="scope">
-            {{ flowStatusMap[scope.row.flowStatus] }}
+            {{ verifyMap[scope.row.isVerify] }}
           </template>
         </el-table-column>
         <el-table-column label="操作" width="80" fixed="right">