用款借款台账修改

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

@@ -3,7 +3,7 @@
     <div class="searchBox">
       <div class="form">
         <span class="formSpan">保证金类型：</span>
-        <el-select v-model="queryParams.costType">
+        <el-select v-model="queryParams.costType" clearable>
           <el-option label="履约保证金" value="1401" />
           <el-option label="投标保证金" value="1402" />
           <el-option label="押金" value="1403" />
@@ -40,19 +40,30 @@
           @change="changeApplyDate"
         />
       </div>
-      <!-- <div class="form">
-        <span class="formSpan">项目部门：</span>
-        <el-tree-select
-          v-model="queryParams.projectDeptId"
-          :data="deptList"
-          :props="defaultProps"
-          check-strictly
-          default-expand-all
-          node-key="id"
-          placeholder="请选择部门"
-          clearable
+      <div class="form form-time-range">
+        <span class="formSpan">核销时间：</span>
+        <el-date-picker
+          v-model="writeOffTime"
+          type="daterange"
+          unlink-panels
+          range-separator="到"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeWriteOffTime"
         />
-      </div> -->
+      </div>
+      <div class="form">
+        <span class="formSpan">收款单位：</span>
+        <el-input
+          v-model="queryParams.collectionCompany"
+          placeholder="请输入收款单位"
+          style="width: 160px"
+        />
+      </div>
+      <div class="form">
+        <span class="formSpan">核销项目：</span>
+        <el-input v-model="queryParams.remark" placeholder="请输入核销项目" style="width: 160px" />
+      </div>
       <div class="form">
         <span class="formSpan">用款总金额：</span>
         <el-input
@@ -102,7 +113,12 @@
           show-overflow-tooltip="true"
           label="收款单位"
         />
-        <el-table-column show-overflow-tooltip="true" align="center" prop="xmmc" label="核销项目" />
+        <el-table-column
+          show-overflow-tooltip="true"
+          align="center"
+          prop="remark"
+          label="核销项目"
+        />
         <el-table-column align="center" prop="amount" label="金额(元)" />
         <el-table-column align="center" prop="writeOffAmount" label="已核销金额(元)" />
         <el-table-column align="center" label="未核销金额(元)">
@@ -172,7 +188,11 @@ const queryParams = reactive({
   status: undefined,
   totalAmount: undefined,
   applyOn: '',
-  applyOff: ''
+  applyOff: '',
+  collectionCompany: '',
+  remark: '',
+  writeOn: '',
+  writeOff: ''
 })
 const infoList: any = ref([
   {
@@ -212,7 +232,14 @@ const changeApplyDate = (value, data) => {
     queryParams.applyOff = ''
   }
 }
+const changeWriteOffTime = (value, data) => {
+  if (!value) {
+    queryParams.writeOn = ''
+    queryParams.writeOff = ''
+  }
+}
 const applyDate = ref()
+const writeOffTime = ref()
 
 /** 查询列表 */
 const getList = async () => {
@@ -222,6 +249,10 @@ const getList = async () => {
       queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
       queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
     }
+    if (writeOffTime.value && writeOffTime.value.length > 0) {
+      queryParams.writeOn = moment(writeOffTime.value[0]).format('YYYY-MM-DD')
+      queryParams.writeOff = moment(writeOffTime.value[1]).format('YYYY-MM-DD')
+    }
     const data = await UseMoneyApi.getUseMoneyEarnestDeptPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -235,23 +266,15 @@ const getOverview = async () => {
     queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
     queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
   }
+  if (writeOffTime.value && writeOffTime.value.length > 0) {
+    queryParams.writeOn = moment(writeOffTime.value[0]).format('YYYY-MM-DD')
+    queryParams.writeOff = moment(writeOffTime.value[1]).format('YYYY-MM-DD')
+  }
   const data = await UseMoneyApi.getUseMoneyOverviewHx(queryParams)
   if (data) {
-    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 () => {

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

@@ -2,12 +2,12 @@
   <div class="oa-sys-list-view">
     <div class="searchBox">
       <div class="form">
-        <span class="formSpan">用款单号：</span>
-        <el-input
-          v-model="queryParams.useMoneyNo"
-          placeholder="请输入报销单号"
-          style="width: 210px"
-        />
+        <span class="formSpan">保证金类型：</span>
+        <el-select v-model="queryParams.costType" clearable>
+          <el-option label="履约保证金" value="1401" />
+          <el-option label="投标保证金" value="1402" />
+          <el-option label="押金" value="1403" />
+        </el-select>
       </div>
       <div class="form">
         <span class="formSpan">申请人：</span>
@@ -29,6 +29,18 @@
         <span class="formSpan">项目部门：</span>
         <DeptTree v-model="queryParams['projectDeptId']" placeholder="请选择部门" check-strictly />
       </div>
+      <div class="form">
+        <span class="formSpan">收款单位：</span>
+        <el-input
+          v-model="queryParams.collectionCompany"
+          placeholder="请输入收款单位"
+          style="width: 160px"
+        />
+      </div>
+      <div class="form">
+        <span class="formSpan">核销项目：</span>
+        <el-input v-model="queryParams.remark" placeholder="请输入核销项目" style="width: 160px" />
+      </div>
       <div class="form">
         <span class="formSpan">用款总金额：</span>
         <el-input
@@ -49,6 +61,18 @@
           @change="changeApplyDate"
         />
       </div>
+      <div class="form form-time-range">
+        <span class="formSpan">核销时间：</span>
+        <el-date-picker
+          v-model="writeOffTime"
+          type="daterange"
+          unlink-panels
+          range-separator="到"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="changeWriteOffTime"
+        />
+      </div>
       <div class="from">
         <div class="btnBox">
           <el-button type="primary" style="background: #3485ff" @click="handleQuery">
@@ -90,7 +114,12 @@
           show-overflow-tooltip="true"
           label="收款单位"
         />
-        <el-table-column show-overflow-tooltip="true" align="center" prop="xmmc" label="核销项目" />
+        <el-table-column
+          show-overflow-tooltip="true"
+          align="center"
+          prop="remark"
+          label="核销项目"
+        />
         <el-table-column align="center" prop="amount" label="金额(元)" />
         <el-table-column align="center" prop="writeOffAmount" label="已核销金额(元)" />
         <el-table-column align="center" label="未核销金额(元)">
@@ -168,7 +197,11 @@ const queryParams = reactive({
   totalAmount: undefined,
   useMoneyNo: undefined,
   applyOn: '',
-  applyOff: ''
+  applyOff: '',
+  collectionCompany: '',
+  remark: '',
+  writeOn: '',
+  writeOff: ''
 })
 const infoList: any = ref([
   {
@@ -208,7 +241,14 @@ const changeApplyDate = (value, data) => {
     queryParams.applyOff = ''
   }
 }
+const changeWriteOffTime = (value, data) => {
+  if (!value) {
+    queryParams.writeOn = ''
+    queryParams.writeOff = ''
+  }
+}
 const applyDate = ref()
+const writeOffTime = ref()
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
@@ -217,6 +257,10 @@ const getList = async () => {
       queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
       queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
     }
+    if (writeOffTime.value && writeOffTime.value.length > 0) {
+      queryParams.writeOn = moment(writeOffTime.value[0]).format('YYYY-MM-DD')
+      queryParams.writeOff = moment(writeOffTime.value[1]).format('YYYY-MM-DD')
+    }
     const data = await UseMoneyApi.getUseMoneyEarnestPage(queryParams)
     list.value = data.list
     total.value = data.total
@@ -230,22 +274,14 @@ const getOverview = async () => {
     queryParams.applyOn = moment(applyDate.value[0]).format('YYYY-MM-DD')
     queryParams.applyOff = moment(applyDate.value[1]).format('YYYY-MM-DD')
   }
-  const data = await UseMoneyApi.getUseMoneyOverviewHx(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 = '未核销总金额(元)'
+  if (writeOffTime.value && writeOffTime.value.length > 0) {
+    queryParams.writeOn = moment(writeOffTime.value[0]).format('YYYY-MM-DD')
+    queryParams.writeOff = moment(writeOffTime.value[1]).format('YYYY-MM-DD')
   }
+  const data = await UseMoneyApi.getUseMoneyOverviewHx(queryParams)
+  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.exportDataBzj(queryParams)

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

@@ -242,21 +242,9 @@ const getOverview = async () => {
   }
   const data = await request.get({ url: urlApi, params: sendData }, '/business')
   if (data) {
-    if (data.totalAmount > 100000) {
-      infoList.value[0].num = data.totalAmount / 10000
-      infoList.value[1].num = data.hexiaoAmount / 10000
-      infoList.value[2].num = (data.totalAmount - data.hexiaoAmount) / 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.hexiaoAmount
-      infoList.value[2].num = data.totalAmount - data.hexiaoAmount
-      infoList.value[0].name = '已借款总金额(元)'
-      infoList.value[1].name = '已核销总金额(元)'
-      infoList.value[2].name = '借款总余额(元)'
-    }
+    infoList.value[0].num = data.totalAmount
+    infoList.value[1].num = data.hexiaoAmount
+    infoList.value[2].num = data.totalAmount - data.hexiaoAmount
   }
 }
 </script>

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

@@ -258,21 +258,9 @@ const getOverview = async () => {
   }
   const data = await request.get({ url: urlApi, params: sendData }, '/business')
   if (data) {
-    if (data.totalAmount > 100000) {
-      infoList.value[0].num = data.totalAmount / 10000
-      infoList.value[1].num = data.hexiaoAmount / 10000
-      infoList.value[2].num = (data.totalAmount - data.hexiaoAmount) / 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.hexiaoAmount
-      infoList.value[2].num = data.totalAmount - data.hexiaoAmount
-      infoList.value[0].name = '已借款总金额(元)'
-      infoList.value[1].name = '已核销总金额(元)'
-      infoList.value[2].name = '借款总余额(元)'
-    }
+    infoList.value[0].num = data.totalAmount
+    infoList.value[1].num = data.hexiaoAmount
+    infoList.value[2].num = data.totalAmount - data.hexiaoAmount
   }
 }
 const formRef = ref()

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

@@ -220,21 +220,9 @@ const getOverview = async () => {
   }
   const data = await request.get({ url: urlApi, params: sendData }, '/business')
   if (data) {
-    if (data.totalAmount > 100000) {
-      infoList.value[0].num = data.totalAmount / 10000
-      infoList.value[1].num = data.hexiaoAmount / 10000
-      infoList.value[2].num = (data.totalAmount - data.hexiaoAmount) / 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.hexiaoAmount
-      infoList.value[2].num = data.totalAmount - data.hexiaoAmount
-      infoList.value[0].name = '已借款总金额(元)'
-      infoList.value[1].name = '已核销总金额(元)'
-      infoList.value[2].name = '借款总余额(元)'
-    }
+    infoList.value[0].num = data.totalAmount
+    infoList.value[1].num = data.hexiaoAmount
+    infoList.value[2].num = data.totalAmount - data.hexiaoAmount
   }
 }
 </script>

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

@@ -229,21 +229,9 @@ const getOverview = async () => {
   }
   const data = await request.get({ url: urlApi, params: sendData }, '/business')
   if (data) {
-    if (data.totalAmount > 100000) {
-      infoList.value[0].num = data.totalAmount / 10000
-      infoList.value[1].num = data.hexiaoAmount / 10000
-      infoList.value[2].num = (data.totalAmount - data.hexiaoAmount) / 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.hexiaoAmount
-      infoList.value[2].num = data.totalAmount - data.hexiaoAmount
-      infoList.value[0].name = '已借款总金额(元)'
-      infoList.value[1].name = '已核销总金额(元)'
-      infoList.value[2].name = '借款总余额(元)'
-    }
+    infoList.value[0].num = data.totalAmount
+    infoList.value[1].num = data.hexiaoAmount
+    infoList.value[2].num = data.totalAmount - data.hexiaoAmount
   }
 }
 </script>

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

@@ -53,7 +53,12 @@
           show-overflow-tooltip="true"
           label="收款单位"
         />
-        <el-table-column show-overflow-tooltip="true" align="center" prop="xmmc" label="核销项目" />
+        <el-table-column
+          show-overflow-tooltip="true"
+          align="center"
+          prop="remark"
+          label="核销项目"
+        />
         <el-table-column align="center" prop="amount" label="金额(元)" />
         <el-table-column align="center" prop="writeOffAmount" label="已核销金额(元)" width="140" />
         <el-table-column align="center" label="未核销金额(元)" width="140">

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/controller/vo/UseMoneyPageReqVO.java

@@ -77,4 +77,15 @@ public class UseMoneyPageReqVO extends PageParam {
 
     @Schema(description = "id")
     private List<String> ids;
+
+    @Schema(description = "收款单位")
+    private String collectionCompany;
+
+    @Schema(description = "核销项目")
+    private String remark;
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate writeOn;
+
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    private LocalDate writeOff;
 }

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

@@ -22,16 +22,16 @@
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T1.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.projectDept != null and params.projectDept != ''">
-                AND T2.ZRBM_ID = #{params.projectDept}
-            </if>
+<!--            <if test="params != null and params.projectDept != null and params.projectDept != ''">-->
+<!--                AND T2.ZRBM_ID = #{params.projectDept}-->
+<!--            </if>-->
             <if test="params != null and params.assetNo != null and params.assetNo != ''">
                 <bind name="assetNo" value="'%'+params.assetNo+'%'"/>
-                AND T.ASSET_NO LIKE #{params.assetNo}
+                AND T.ASSET_NO LIKE #{assetNo}
             </if>
             <if test="params != null and params.assetName != null and params.assetName != ''">
                 <bind name="assetName" value="'%'+params.assetName+'%'"/>
-                AND T.ASSET_NAME LIKE  #{params.assetName}
+                AND T.ASSET_NAME LIKE  #{assetName}
             </if>
             <if test="params != null and params.assetType != null and params.assetType != ''">
                 AND T.ASSET_TYPE= #{params.assetType}

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

@@ -30,6 +30,14 @@
             LEFT JOIN project T4 ON T1.PROJECT_ID=T4.ID
         <where>
             T1.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND T2.COLLECTION_COMPANY like #{collectionCompany}
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.REMARK like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -45,12 +53,18 @@
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null ">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null ">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">
@@ -89,6 +103,14 @@
         LEFT JOIN PROJECT T3 ON T1.PROJECT_ID=T3.ID
         <where>
             T1.COST_TYPE LIKE '14%' and T2.FLOW_STATUS=90
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND 1!=1
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.BZ1 like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -104,12 +126,18 @@
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null ">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">
@@ -168,6 +196,14 @@
                     </if>
                 )
             </if>
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND T2.COLLECTION_COMPANY like #{collectionCompany}
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.REMARK like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -180,12 +216,18 @@
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null ">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null ">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">
@@ -230,6 +272,14 @@
                 </if>
                 )
             </if>
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND 1!=1
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.BZ1 like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -245,12 +295,18 @@
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null ">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null ">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">
@@ -301,6 +357,14 @@ select sum(num) from (
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         <where>
             T1.ISVALID = 1 and T2.FLOW_STATUS=90 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND T2.COLLECTION_COMPANY like #{collectionCompany}
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.REMARK like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -316,12 +380,18 @@ select sum(num) from (
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null ">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null ">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">
@@ -359,6 +429,14 @@ select sum(num) from (
         LEFT JOIN project T3 ON T2.PROJECT_ID=T3.ID
         <where>
             T1.ISVALID = 1 and T2.FLOW_STATUS=90 AND T2.ISVALID = 1 and T1.COST_TYPE LIKE '14%'
+            <if test="params != null and params.collectionCompany != null and params.collectionCompany != ''">
+                <bind name="collectionCompany" value="'%'+params.collectionCompany+'%'"/>
+                AND 1!=1
+            </if>
+            <if test="params != null and params.REMARK != null and params.REMARK != ''">
+                <bind name="REMARK" value="'%'+params.REMARK+'%'"/>
+                AND T1.BZ1 like #{REMARK}
+            </if>
             <if test="params != null and params.costType != null and params.costType != ''">
                 AND T1.COST_TYPE = #{params.costType}
             </if>
@@ -374,12 +452,18 @@ select sum(num) from (
             <if test="params != null and params.userId != null and params.userId != ''">
                 AND T2.USER_ID = #{params.userId}
             </if>
-            <if test="params != null and params.applyOn != null and params.applyOn != ''">
+            <if test="params != null and params.applyOn != null ">
                 AND T2.APPLY_TIME &gt;= #{params.applyOn}
             </if>
-            <if test="params != null and params.applyOff != null and params.applyOff != ''">
+            <if test="params != null and params.applyOff != null ">
                 AND T2.APPLY_TIME &lt;= #{params.applyOff}
             </if>
+            <if test="params != null and params.writeOn != null">
+                AND T1.WRITE_OFF_TIME &gt;= #{params.writeOn}
+            </if>
+            <if test="params != null and params.writeOff != null ">
+                AND T1.WRITE_OFF_TIME &lt;= #{params.writeOff}
+            </if>
             <if test="params != null and params.DeptList != null and params.DeptList.size > 0">
                 AND T3.ZRBM_ID in
                 <foreach collection="params.DeptList" item="item" open="(" close=")" separator=",">

zjugis-business/src/main/resources/templates/UseMoney/js/index.js

@@ -176,6 +176,12 @@
         if(!$("[name='UserMoneyDetailDO[" + i + "]$costType']").val()){
           z.ui.alertWarning(`实际所属类型不能为空！`)
           return false;
+        }else if($("[name='UserMoneyDetailDO[" + i + "]$costType']").val()=='1401'||$("[name='UserMoneyDetailDO[" + i + "]$costType']").val()=='1402'
+            ||$("[name='UserMoneyDetailDO[" + i + "]$costType']").val()=='1403'){
+          if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$remark']").getValue()){
+            z.ui.alertWarning(`类型为保证金/押金的情况下，备注不能为空！`)
+            return false;
+          }
         }
         if(!z.ui.input("[name='UserMoneyDetailDO[" + i + "]$costContent']").getValue()){
           z.ui.alertWarning(`用途不能为空！`)