统计报表-教育培训、报警测试情况、离行式自助银行、网点负责人自查查询条件改为月份范围选择

src/api/core/reportForms/resumptionReport.js

@@ -13,8 +13,8 @@ export function listReport(query) {
 export function listIntrusionTestReport(query) {
   return request({
     url: '/core/resumptionReport/intrusionTest',
-    method: 'get',
-    params: query
+    method: 'post',
+    data: query
   })
 }
 export function listStandbyPowerReport(query) {

src/views/core/reportForms/eduTraining.vue

@@ -15,7 +15,6 @@
           <org-tree
                     v-model="queryParams.orgId"
                     @defaultOrg="getDefaultOrg"
-                    @checkChange="checkChange"
                     @click="clickTreeNode"
                     hangsheTree
                   ref="orgTree"
@@ -57,8 +56,8 @@
         </el-form-item>
 
         <el-form-item label="时间" prop="date">
-          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" @change="dateChanged"
-                          align="right" type="month" placeholder="请选择查询时间">
+          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" type="monthrange" range-separator="至"
+                          align="right" start-placeholder="开始月份" end-placeholder="结束月份">
           </el-date-picker>
         </el-form-item>
 
@@ -110,6 +109,7 @@ import {getEduPlanList, getEduReportData} from "@/api/evaluateTable/evaluateTabl
 import {deptTreeSelect} from "@/api/system/public";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import dayjs from "dayjs";
+import {Message} from "element-ui";
 
 export default {
   name: "eduTrainingReport",
@@ -124,7 +124,7 @@ export default {
       queryParams: {
         orgId: null,
         planId: "",
-        date: new Date(),
+        date: [new Date(),new Date()],
         isWebSelect: 1,
       },
       // 显示搜索条件
@@ -158,15 +158,13 @@ export default {
     getReportTitle()
     {
       let titleBase="教育培训情况表";
-      if(!this.queryParams)
+      if (!this.queryParams){
+        titleBase+= "("+dayjs(new Date()).format("YYYY-MM")+"至"+ dayjs(new Date()).format("YYYY-MM") +")";
+      }else if(this.queryParams.date)
       {
-        titleBase+= "("+dayjs(new Date()).format("YYYY-MM")+")";       
+        titleBase+= "("+dayjs(this.queryParams.date[0]).format("YYYY-MM")+"至"+ dayjs(this.queryParams.date[1]).format("YYYY-MM") +")";
       }
-      else if(this.queryParams.date)
-      {
-        titleBase+= "("+dayjs(this.queryParams.date).format("YYYY-MM")+")";       
-      }
-      return titleBase;      
+      return titleBase;
     },
     // dateChanged()
     // {
@@ -226,6 +224,11 @@ export default {
     },
     //获取列表
     getList() {
+      //this.title = this.getReportTitle();
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
       this.loading = true;
       getEduReportData(this.queryParams).then((res) => {
         let {code, data, msg} = res;
@@ -255,17 +258,21 @@ export default {
       this.queryParams = {
         orgId: this.orgId,
         planId: this.options[0].id,
-        date:new Date(),
+        date: [new Date(),new Date()],
       };
-     // this.getList();
+      this.title = this.getReportTitle();
     },
 
     /** 导出按钮操作 */
     handleExport() {
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
       let param = {
         ...this.queryParams,
       }
-      param.date = dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
+      //param.date = dayjs(param.date).format("YYYY-MM-DD HH:mm:s")
       this.download(
         "core/eduTask/exportReport",
         param,

src/views/core/reportForms/intrusionTestReport.vue

@@ -31,9 +31,9 @@
                   ></org-tree>
               </el-form-item>
 
-              <el-form-item label="时间" prop="searchTime">
-              <el-date-picker   value-format='yyyy-MM' v-model="queryParams.searchTime"
-                                align="right" type="month" placeholder="请选择查询时间">
+              <el-form-item label="时间" prop="date">
+                <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" type="monthrange" range-separator="至"
+                                align="right" start-placeholder="开始月份" end-placeholder="结束月份">
                 </el-date-picker>
               </el-form-item>
           </el-form>
@@ -89,6 +89,8 @@
           //import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
     import { defineComponent } from 'vue';
+  import dayjs from "dayjs";
+  import {Message} from "element-ui";
 export default {
   dicts: ['sys_normal_disable','sys_org_type','repot_cycle'],
   name: "Check",
@@ -123,9 +125,7 @@ export default {
       //区域
       roleOptions: [],
        //全部检查机构
-  orgOptions: [],
-      //搜索tree
-      deptName: null,
+      orgOptions: [],
       // 部门树选项
       deptOptions: [],
       // 总条数
@@ -145,15 +145,11 @@ export default {
         pageSize: 10,
         checkName: null,
         areaId: null,
+        date: [new Date(),new Date()],
         orgId: null,
-        searchTime:new Date(),
       },
       // 表单参数
       form: {},
-      // 表单校验
-      checkList: [],
-      roleOptions: [],
-      defaultKeys: [],
       //是否关联下级
       checked: false,
       defaultProps: {
@@ -229,15 +225,30 @@ export default {
       );
     },
     handleExport() {
-  this.download('core/resumptionReport/intrusionTestExport', {
-    ...this.queryParams
-  }, `${this.orgName+'-报警测试情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
+      let param = {
+        ...this.queryParams,
+      }
+      this.download(
+        'core/resumptionReport/intrusionTestExport',
+        param,
+        `${this.orgName+'-报警测试情况表-'+this.formatTime(new Date(),'YYYYMMDD')}.xlsx`)
 },
 
 
     getList() {
       if(!this.queryParams.orgId) return;
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
       this.loading = true;
+      if (this.queryParams && this.queryParams.date){
+        this.queryParams.date = [dayjs(this.queryParams.date[0]).format("YYYY-MM-DD"),dayjs(this.queryParams.date[1]).format("YYYY-MM-DD")];
+      }
       listIntrusionTestReport(this.queryParams).then(response => {
         this.checkList = response.data;
         this.title=response.title;
@@ -283,6 +294,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.orgId=this.orgId;
       this.handleQuery();
+      this.queryParams.date = [new Date(),new Date()];
      // this.getDeptTree();
     },
     // 多选框选中数据
@@ -303,4 +315,4 @@ export default {
       width: 264px;
     }
   }
-  </style>
+  </style>

src/views/core/reportForms/selfInspectReport.vue

@@ -27,7 +27,7 @@
                   :showCheckSub="false"
                   ></org-tree>
               </el-form-item>
-      
+
       <el-form-item label="统计周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择统计周期">
           <el-option
@@ -39,9 +39,9 @@
         </el-select>
       </el-form-item>
 
-      <el-form-item v-if="queryParams.cycle==1 || queryParams.cycle==null" label="时间" prop="year">
-        <el-date-picker v-model="queryParams.year" align="right"
-                        placeholder="请选择查询时间" type="month" value-format='yyyy-MM'>
+      <el-form-item v-if="queryParams.cycle==1 || queryParams.cycle==null" label="时间" prop="date">
+        <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" type="monthrange" range-separator="至"
+                        align="right" start-placeholder="开始月份" end-placeholder="结束月份" @focus="datePositionMonth">
         </el-date-picker>
       </el-form-item>
 
@@ -50,7 +50,9 @@
           v-model="queryParams.year"
           placeholder="选择年份"
           type="year"
-          value-format='yyyy'>
+          value-format='yyyy'
+          @focus="datePositionYear"
+        >
         </el-date-picker>
       </el-form-item>
     </el-form>
@@ -105,6 +107,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import {deptTreeSelect} from "@/api/system/public";
 //import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
+import {Message} from "element-ui";
 export default {
   dicts: ['sys_normal_disable', 'sys_org_type'],
   name: "Check",
@@ -140,8 +143,6 @@ export default {
       roleOptions: [],
       //全部检查机构
       orgOptions: [],
-      //搜索tree
-      deptName: null,
       // 部门树选项
       deptOptions: [],
       // 总条数
@@ -160,14 +161,11 @@ export default {
         pageSize: 10,
         orgId: null,
         year: new Date(),
-        cycle: 1
+        cycle: 1,
+        date:[new Date(),new Date()]
       },
       // 表单参数
       form: {},
-      // 表单校验
-      checkList: [],
-      roleOptions: [],
-      defaultKeys: [],
       //是否关联下级
       checked: false,
       defaultProps: {
@@ -251,6 +249,25 @@ export default {
 
 
     getList() {
+      if (!this.queryParams || !this.queryParams.cycle){
+        Message.error("请选择统计周期");
+        return;
+      }
+      //cycle 1.月份 2.年份
+      if (this.queryParams.cycle === 2 && !this.queryParams.year){
+        Message.error("请选择统统计年份");
+        return;
+      }
+      if (this.queryParams.cycle === 1 && !this.queryParams.date){
+        Message.error("请选择统统计月份范围");
+        return;
+      }
+      if (this.queryParams.cycle === 1){
+        this.queryParams.year = null;
+      }
+      if (this.queryParams.cycle === 2){
+        this.queryParams.date = null;
+      }
       this.loading = true;
       listSelfReport(this.queryParams).then(response => {
         this.orgName = response.orgName;
@@ -296,6 +313,7 @@ export default {
     resetQuery() {
       this.resetForm("queryForm");
       this.queryParams.orgId=this.orgId;
+      this.queryParams.date = [new Date(),new Date()]
       this.handleQuery();
     },
     // 多选框选中数据
@@ -305,7 +323,26 @@ export default {
       this.single = selection.length !== 1
       this.multiple = !selection.length
     },
-
+    datePositionYear(e){
+      this.$nextTick(() => {
+        e.popperJS.state.position = 'absolute';
+        setTimeout(() => {
+          e.picker.$el.style.top = '16%'
+          e.picker.$el.style.left = '47%'
+        },0)
+        e.popperJS.update();
+      })
+    },
+    datePositionMonth(e){
+      this.$nextTick(() => {
+        e.popperJS.state.position = 'absolute';
+        setTimeout(() => {
+          e.picker.$el.style.top = '16%'
+          e.picker.$el.style.left = '30%'
+        },0)
+        e.popperJS.update();
+      })
+    }
   }
 };
 </script>
@@ -316,4 +353,4 @@ export default {
     width: 264px;
   }
 }
-</style>
+</style>

src/views/core/reportForms/serviceBankReport.vue

@@ -15,9 +15,9 @@
           ></org-tree>
         </el-form-item>
 
-        <el-form-item label="时间" prop="searchTime">
-          <el-date-picker value-format='yyyy-MM' v-model="queryParams.searchTime"
-                          align="right" type="month" placeholder="请选择查询时间">
+        <el-form-item label="时间" prop="date">
+          <el-date-picker value-format='yyyy-MM-dd' v-model="queryParams.date" type="monthrange" range-separator="至"
+                          align="right" start-placeholder="开始月份" end-placeholder="结束月份">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -81,6 +81,8 @@ import {deptTreeSelect, businessTreeSelect} from "@/api/system/public";
 //import orgTree from "@/components/orgTree";
 import OrgTree from "@/components/orgTree/orgQuerySelector.vue";
 import {defineComponent} from 'vue';
+import {Message} from "element-ui";
+import dayjs from "dayjs";
 
 export default {
   dicts: ['sys_normal_disable', 'sys_org_type', 'repot_cycle'],
@@ -137,7 +139,7 @@ export default {
         checkName: null,
         areaId: null,
         orgId: null,
-        searchTime: new Date()
+        date: [new Date(),new Date()]
       },
       orgName: null,
       // 表单参数
@@ -230,6 +232,10 @@ export default {
       );
     },
     handleExport() {
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
       this.download('core/resumptionReport/serviceBankExport', {
         ...this.queryParams
       }, `${this.orgName + '-离行式自助银行巡检情况表-' + this.formatTime(new Date(), 'YYYYMMDD')}.xlsx`)
@@ -238,7 +244,14 @@ export default {
 
     getList() {
       if(!this.queryParams.orgId) return;
+      if (!this.queryParams || !this.queryParams.date){
+        Message.error("请选择时间范围");
+        return;
+      }
       this.loading = true;
+      if (this.queryParams && this.queryParams.date){
+        this.queryParams.date = [dayjs(this.queryParams.date[0]).format("YYYY-MM-DD"),dayjs(this.queryParams.date[1]).format("YYYY-MM-DD")];
+      }
       listServiceBankReport(this.queryParams).then(response => {
         this.checkList = response.data;
         this.title = response.title;
@@ -284,6 +297,7 @@ export default {
       this.resetForm("queryForm");
       this.queryParams.orgId = this.orgId;
       this.handleQuery();
+      this.queryParams.date = [new Date(),new Date()]
     },
     // 多选框选中数据
     handleSelectionChange(selection) {