用款，接口bug修改

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" @change="changeVerify1" type="number" />
+            <el-input v-model="formData.writeOffAmount" @change="changeVerify" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -32,7 +32,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="本次拟核销金额" prop="nowAmount">
             <el-input
               v-model="formData.nowAmount"
@@ -41,7 +41,7 @@
               type="number"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="核销时间" prop="writeOffTime">
             <el-date-picker
@@ -87,7 +87,6 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  nowAmount: 0,
   writeOffAmount: '',
   writeOffTime: '',
   writeOffRemark: '',
@@ -108,7 +107,7 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }, 1000)
 }
 const formRules = reactive({
-  //nowAmount: [{ validator: checkAge, trigger: 'blur' }]
+  writeOffAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -126,7 +125,6 @@ const open = async (row: object) => {
     formLoading.value = true
     try {
       formData.value = row
-      formData.value.nowAmount = 0
     } finally {
       formLoading.value = false
     }
@@ -150,7 +148,7 @@ const submitForm = async () => {
     }
 
     const sendData = {
-      writeOffAmount: parseInt(formData.value.writeOffAmount) + formData.value.nowAmount,
+      writeOffAmount: parseInt(formData.value.writeOffAmount),
       writeOffTime: formData.value.writeOffTime,
       writeOffRemark: formData.value.writeOffRemark,
       id: formData.value.detailId
@@ -168,12 +166,6 @@ const submitForm = async () => {
   }
 }
 const changeVerify = () => {
-  formData.value.loanBalance = formData.value.amount - formData.value.nowAmount
-  if (formData.value.loanBalance < 0) {
-    formData.value.loanBalance = 0
-  }
-}
-const changeVerify1 = () => {
   formData.value.loanBalance = formData.value.amount - formData.value.writeOffAmount
   if (formData.value.loanBalance < 0) {
     formData.value.loanBalance = 0
@@ -182,7 +174,6 @@ const changeVerify1 = () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    nowAmount: '',
     writeOffAmount: '',
     writeOffTime: '',
     writeOffRemark: '',

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" @change="changeVerify1" type="number" />
+            <el-input v-model="formData.verifyAmount" @change="changeVerify" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -32,7 +32,7 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="12">
+        <!-- <el-col :span="12">
           <el-form-item label="本次拟核销金额" prop="nowAmount">
             <el-input
               v-model="formData.nowAmount"
@@ -41,7 +41,7 @@
               type="number"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="12">
           <el-form-item label="核销时间" prop="verifyDate">
             <el-date-picker
@@ -87,7 +87,6 @@ const dialogVisible = ref(false) // 弹窗的是否展示
 const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
 const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref({
-  nowAmount: 0,
   verifyAmount: '',
   verifyDate: '',
   verifyBz: '',
@@ -99,16 +98,16 @@ const checkAge = (rule: any, value: any, callback: any) => {
   }
   setTimeout(() => {
     if (value < 0) {
-      callback(new Error('核销金额必须大于0'))
+      callback(new Error('已核销金额必须大于0'))
     } else if (value > formData.value.loanAmount) {
-      callback(new Error('核销金额不能大于总金额'))
+      callback(new Error('已核销金额不能大于总金额'))
     } else {
       callback()
     }
   }, 1000)
 }
 const formRules = reactive({
-  //nowAmount: [{ validator: checkAge, trigger: 'blur' }]
+  verifyAmount: [{ validator: checkAge, trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 /** 打开弹窗 */
@@ -124,7 +123,6 @@ const open = async (row: object) => {
     formLoading.value = true
     try {
       formData.value = row
-      formData.value.nowAmount = 0
     } finally {
       formLoading.value = false
     }
@@ -144,7 +142,7 @@ const submitForm = async () => {
   try {
     const urlApi = `/Loan/update`
     const sendData = {
-      verifyAmount: parseInt(formData.value.verifyAmount) + formData.value.nowAmount,
+      verifyAmount: parseInt(formData.value.verifyAmount),
       verifyDate: formData.value.verifyDate,
       verifyBz: formData.value.verifyBz,
       id: formData.value.id
@@ -162,12 +160,6 @@ const submitForm = async () => {
   }
 }
 const changeVerify = () => {
-  formData.value.loanBalance = formData.value.loanAmount - formData.value.nowAmount
-  if (formData.value.loanBalance < 0) {
-    formData.value.loanBalance = 0
-  }
-}
-const changeVerify1 = () => {
   formData.value.loanBalance = formData.value.loanAmount - formData.value.verifyAmount
   if (formData.value.loanBalance < 0) {
     formData.value.loanBalance = 0
@@ -176,7 +168,6 @@ const changeVerify1 = () => {
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
-    nowAmount: '',
     verifyAmount: '',
     verifyDate: '',
     bz1: '',

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

@@ -23,12 +23,13 @@
       <div class="form" style="width: 380px">
         <span class="formSpan">申请时间：</span>
         <el-date-picker
-          v-model="queryParams.applyTime"
+          v-model="applyDate"
           type="daterange"
           unlink-panels
           range-separator="到"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          @change="changeApplyDate"
         />
       </div>
       <!-- <div class="form">
@@ -147,6 +148,8 @@ import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 import { useRouter } from 'vue-router'
 import * as UserApi from '@/api/system/user'
+import moment from 'moment'
+
 defineOptions({ name: 'YksqDeptPage' })
 const { wsCache } = useCache()
 const user = wsCache.get(CACHE_KEY.USER)
@@ -162,7 +165,9 @@ const queryParams = reactive({
   projectDeptId: undefined,
   costType: undefined,
   status: undefined,
-  totalAmount: undefined
+  totalAmount: undefined,
+  applyOn: '',
+  applyOff: ''
 })
 const infoList: any = ref([
   {
@@ -192,9 +197,20 @@ const operateClick = (row: any) => {
     }
   })
 }
+const changeApplyDate = (value, data) => {
+  if (!value) {
+    queryParams.applyOn = ''
+    queryParams.applyOff = ''
+  }
+}
+const applyDate = ref()
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  if (applyDate.value && applyDate.value.length > 0) {
+    queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
+    queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
+  }
   try {
     const data = await UseMoneyApi.getUseMoneyDeptPage(queryParams)
     list.value = data.list
@@ -206,6 +222,10 @@ const getList = async () => {
 
 /** 查询概况 */
 const getOverview = async () => {
+  if (applyDate.value && applyDate.value.length > 0) {
+    queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
+    queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
+  }
   const data = await UseMoneyApi.getUseMoneyDeptOverview(queryParams)
   infoList.value[0].num = data.totalAmount
   infoList.value[1].num = data.totalUseAmount

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

@@ -221,21 +221,9 @@ const getOverview = async () => {
     queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
   }
   const data = await UseMoneyApi.getUseMoneyOverview(queryParams)
-  if (data.totalAmount > 100000) {
-    infoList.value[0].num = data.totalAmount / 10000
-    infoList.value[1].num = data.totalUseAmount / 10000
-    infoList.value[2].num = data.totalApplyAmount / 10000
-    infoList.value[0].name = '用款总金额(万元)'
-    infoList.value[1].name = '已用款总金额(万元)'
-    infoList.value[2].name = '申请用款总金额(万元)'
-  } else {
-    infoList.value[0].num = data.totalAmount
-    infoList.value[1].num = data.totalUseAmount
-    infoList.value[2].num = data.totalApplyAmount
-    infoList.value[0].name = '用款总金额(元)'
-    infoList.value[1].name = '已用款总金额(元)'
-    infoList.value[2].name = '申请用款总金额(元)'
-  }
+  infoList.value[0].num = data.totalAmount
+  infoList.value[1].num = data.totalUseAmount
+  infoList.value[2].num = data.totalApplyAmount
 }
 const exportData = async () => {
   const data = await UseMoneyApi.exportData(queryParams)

client/src/views/OaSystem/mineCenter/rightChild/wdyk.vue

@@ -17,9 +17,17 @@
           style="width: 160px"
         />
       </div>
-      <div class="form">
-        <span class="formSpan">状态：</span>
-        <el-input v-model="queryParams.status" style="width: 160px" />
+      <div class="form" style="width: 380px">
+        <span class="formSpan">申请时间：</span>
+        <el-date-picker
+          v-model="applyDate"
+          type="daterange"
+          unlink-panels
+          range-separator="到"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeApplyDate"
+        />
       </div>
       <div class="from">
         <div class="btnBox">
@@ -102,6 +110,7 @@ import { dateFormatter2 } from '@/utils/formatTime'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
 import TableLayout from '../../oaViews/layout/TableLayout.vue'
 import { useRouter } from 'vue-router'
+import moment from 'moment'
 
 defineOptions({ name: 'UseMoneyDept' })
 const { wsCache } = useCache()
@@ -116,8 +125,10 @@ const queryParams = reactive({
   applyTime: [],
   projectDeptId: undefined,
   costType: undefined,
-  status: undefined,
-  totalAmount: undefined
+  flowStatus: undefined,
+  totalAmount: undefined,
+  applyOn: '',
+  applyOff: ''
 })
 const infoList: any = ref([
   {
@@ -140,6 +151,10 @@ const list = ref([]) // 列表的数
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  if (applyDate.value && applyDate.value.length > 0) {
+    queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
+    queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
+  }
   try {
     const data = await UseMoneyApi.getUseMoneyPage(queryParams)
     list.value = data.list
@@ -148,9 +163,19 @@ const getList = async () => {
     loading.value = false
   }
 }
-
+const changeApplyDate = (value, data) => {
+  if (!value) {
+    queryParams.applyOn = ''
+    queryParams.applyOff = ''
+  }
+}
+const applyDate = ref()
 /** 查询概况 */
 const getOverview = async () => {
+  if (applyDate.value && applyDate.value.length > 0) {
+    queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
+    queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
+  }
   const data = await UseMoneyApi.getUseMoneyOverview(queryParams)
   infoList.value[0].num = data.totalAmount
   infoList.value[1].num = data.totalUseAmount

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/dao/UseMoneyDao.java

@@ -55,7 +55,12 @@ public interface UseMoneyDao extends BaseMapperX<UseMoneyDO> {
 
     default PageResult<UseMoneyDO> getUseMoneyDeptPage(UseMoneyPageReqVO pageReqVO, List<String> projectIds, List<String> deptIds) {
         return selectPage(pageReqVO, new LambdaQueryWrapperX<UseMoneyDO>()
+                .eqIfPresent(UseMoneyDO::getUserId, pageReqVO.getUserId())
+                .eqIfPresent(UseMoneyDO::getTotalAmount, pageReqVO.getTotalAmount())
+                .likeIfPresent(UseMoneyDO::getUseMoneyNo, pageReqVO.getUseMoneyNo())
                 .in(UseMoneyDO::getFlowStatus, FLOW_FINISHED, FLOW_PAYMENT)
+                .gt(pageReqVO.getApplyOn()!=null,UseMoneyDO::getApplyTime, pageReqVO.getApplyOn())
+                .lt(pageReqVO.getApplyOff()!=null,UseMoneyDO::getApplyTime, pageReqVO.getApplyOff())
                 .and(wq -> wq.in(UseMoneyDO::getDeptId, deptIds)
                         .or()
                         .in(projectIds.size()>0,UseMoneyDO::getProjectId, projectIds))

zjugis-business/src/main/resources/mapper/oracle/UseMoneyMapper.xml

@@ -118,7 +118,7 @@
                 AND T2.COMMON_COST_NO = #{params.useMoneyNo}
             </if>
             <if test="params != null and params.totalAmount != null and params.totalAmount != ''">
-                AND T2.TOTAL_AMOUNT_SQ = #{params.totalAmount}
+                AND T1.AMOUNT = #{params.totalAmount}
             </if>
             <if test="params != null and params.status != null  and params.status != ''">
                 AND T1.I_WRITE_OFF = #{params.status}
@@ -287,7 +287,7 @@
 <!--                AND T2.COMMON_COST_NO = #{params.useMoneyNo}-->
 <!--            </if>-->
             <if test="params != null and params.totalAmount != null and params.totalAmount != ''">
-                AND T2.TOTAL_AMOUNT_SQ = #{params.totalAmount}
+                AND T1.AMOUNT = #{params.totalAmount}
             </if>
             <if test="params != null and params.status != null  and params.status != ''">
                 AND T1.I_WRITE_OFF = #{params.status}