统计问题修改

precision-effect-system/src/main/resources/mapper/business/TPurchaseMapper.xml

@@ -87,7 +87,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null  and isDel != ''"> and t.is_del = #{isDel}</if>
             <if test="purchaseStatus != null  and purchaseStatus != ''"> and t.purchase_status = #{purchaseStatus}</if>
             <if test="approvedTime != null "> and t.approved_time = #{approvedTime}</if>
-            <if test="purchaseType != null  and purchaseType != ''"> and purchase_type = #{purchaseType}</if>
+            <if test="purchaseType != null  and purchaseType != ''"> and t.purchase_type = #{purchaseType}</if>
+            <if test="applyBeginTime != null and applyEndTime != null">and t.create_time between #{applyBeginTime} and #{applyEndTime}</if>
         </where>
         ORDER BY t.create_time DESC
     </select>

precision-effect-system/src/main/resources/mapper/system/TBorrowingApplyForMapper.xml

@@ -49,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="registrationDate != null "> and a.registration_date = #{registrationDate}</if>
             <if test="attachmentUrl != null  and attachmentUrl != ''"> and a.attachment_url = #{attachmentUrl}</if>
             <if test="isDel != null  and isDel != ''"> and a.is_del = #{isDel}</if>
+            <if test="registrationBeginDate != null and registrationEndDate != null">and a.registration_date between #{registrationBeginDate} and #{registrationEndDate}</if>
         </where>
         order by a.borrowing desc
     </select>

precision-effect-web/src/views/statistics/borrowingStatistics/calculate/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="部门" prop="borrowingDeptId">
-        <div style="width: 160px">
+        <div style="width: 200px">
           <treeselect
             v-model="queryParams.borrowingDeptId"
             :options="deptOptions"
@@ -41,20 +41,6 @@
         />
       </el-form-item>
 
-      <el-form-item label="申请时间">
-        <el-date-picker
-          v-model="registrationDate"
-          size="small"
-          type="datetimerange"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          range-separator="至"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          @change="timeChange"
-          style="width: 340px"
-        >
-        </el-date-picker>
-      </el-form-item>
 
       <el-form-item label="状态" prop="approvalStatus">
         <el-select
@@ -70,6 +56,21 @@
 
       </el-form-item>
 
+      <el-form-item label="申请时间">
+        <el-date-picker
+          v-model="registrationDate"
+          size="small"
+          type="datetimerange"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          @change="timeChange"
+          style="width: 340px"
+        >
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button
           type="primary"
@@ -148,6 +149,9 @@
         if (value) {
           this.queryParams.registrationBeginDate = value[0];
           this.queryParams.registrationEndDate = value[1];
+        }else{
+          this.queryParams.registrationBeginDate = null;
+          this.queryParams.registrationEndDate = null;
         }
       },
       getTreeselect() {

precision-effect-web/src/views/statistics/borrowingStatistics/index.vue

@@ -114,6 +114,9 @@
         if (value) {
           this.queryParams.registrationBeginDate = value[0];
           this.queryParams.registrationEndDate = value[1];
+        }else{
+          this.queryParams.registrationBeginDate = null;
+          this.queryParams.registrationEndDate = null;
         }
       },
       handleExport(){

precision-effect-web/src/views/statistics/purchaseStatistics/calculate/index.vue

@@ -11,7 +11,7 @@
       </el-form-item>
 
       <el-form-item label="部门" prop="purchaseDeptId">
-        <div style="width: 160px">
+        <div style="width: 210px">
           <treeselect
             v-model="queryParams.purchaseDeptId"
             :options="deptOptions"
@@ -206,6 +206,9 @@
         if (value) {
           this.queryParams.applyBeginTime = value[0];
           this.queryParams.applyEndTime = value[1];
+        }else{
+          this.queryParams.applyBeginTime = null;
+          this.queryParams.applyEndTime = null;
         }
       },
       changeTab(tabNum){

precision-effect-web/src/views/statistics/purchaseStatistics/index.vue

@@ -180,6 +180,9 @@
         if (value) {
           this.queryParams.applyBeginTime = value[0];
           this.queryParams.applyEndTime = value[1];
+        }else{
+          this.queryParams.applyBeginTime = null;
+          this.queryParams.applyEndTime = null;
         }
       },
       changeTab(tabNum){

precision-effect-web/src/views/statistics/tradeStatistics/calculate/index.vue

@@ -30,7 +30,7 @@
       </el-form-item>
 
       <el-form-item label="卖方部门" prop="applyDeptId" v-if="tab == '1'">
-        <div style="width: 160px">
+        <div style="width: 190px">
           <treeselect
             v-model="queryParams.applyDeptId"
             :options="deptOptions"
@@ -41,7 +41,7 @@
       </el-form-item>
 
       <el-form-item label="买方部门" prop="tradeDeptId" v-if="tab == '0'">
-        <div style="width: 160px">
+        <div style="width: 190px">
           <treeselect
             v-model="queryParams.tradeDeptId"
             :options="deptOptions"
@@ -218,6 +218,9 @@
         if (value) {
           this.queryParams.createBeginTime = value[0];
           this.queryParams.createEndTime = value[1];
+        }else{
+          this.queryParams.createBeginTime = null;
+          this.queryParams.createEndTime = null;
         }
       },
       //导出

precision-effect-web/src/views/statistics/tradeStatistics/index.vue

@@ -21,7 +21,7 @@
         </el-form-item>
 
         <el-form-item label="卖方部门" prop="applyDeptId" v-if="tab == '1'">
-          <div style="width: 160px">
+          <div style="width: 200px">
             <treeselect
               v-model="queryParams.applyDeptId"
               :options="deptOptions"
@@ -32,7 +32,7 @@
         </el-form-item>
 
         <el-form-item label="买方部门" prop="tradeDeptId" v-if="tab == '0'">
-          <div style="width: 160px">
+          <div style="width: 200px">
             <treeselect
               v-model="queryParams.tradeDeptId"
               :options="deptOptions"
@@ -212,6 +212,9 @@
         if (value) {
           this.queryParams.createBeginTime = value[0];
           this.queryParams.createEndTime = value[1];
+        }else{
+          this.queryParams.createBeginTime = null;
+          this.queryParams.createEndTime = null;
         }
       },
       //导出