Merge branch 'master' of http://yun.pashanhoo.com:9090/bdc/bdcjg-web

@@ -118,7 +118,9 @@ export function timeFormat (date, end) {
   }
   var y = date.getFullYear(); //年
   var m = date.getMonth() + 1; //月
+  m < 10 && (m = '0' + m)
   var d = date.getDate(); //日
+  d < 10 && (d = '0' + d)
   if (end) {
     return y + "/" + m + "/" + d + ' 23:59:59';
   } else {

@@ -11,7 +11,8 @@
           <el-col :span="4">
             <el-form-item label="开始日期" prop="startTime">
               <el-date-picker
-                type="datetime"
+                type="date"
+                :clearable="false"
                 class="width100"
                 placeholder="开始日期"
                 :picker-options="pickerOptionsStart"
@@ -24,16 +25,18 @@
             <el-form-item label="结束日期" prop="endTime">
               <el-date-picker
                 class="width100"
-                type="datetime"
+                :clearable="false"
+                type="date"
                 placeholder="结束日期"
                 :picker-options="pickerOptionsEnd"
                 v-model="form.endTime"
                 value-format="yyyy/MM/dd HH:mm:ss"
+                @change="endTimeChange"
               ></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="16" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="getProcessCounts">查询</btn>
           </el-col>
@@ -60,7 +63,7 @@ export default {
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
-            return time.getTime() >= new Date(this.form.endTime).getTime();
+            return time.getTime() > new Date(this.form.endTime).getTime();
           }
         },
       },
@@ -68,7 +71,7 @@ export default {
       pickerOptionsEnd: {
         disabledDate: (time) => {
           if (this.form.startTime) {
-            return time.getTime() <= new Date(this.form.startTime).getTime();
+            return time.getTime() < new Date(this.form.startTime).getTime();
           }
         },
       },
@@ -88,6 +91,9 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
+    endTimeChange(val){
+      this.form.endTime = timeFormat(new Date(val),true)
+    },
     //查询各区县办件数量
     async getProcessCounts () {
       this.pieChartsData = [];

@@ -29,7 +29,8 @@
           <el-col :span="4">
             <el-form-item label="开始日期" prop="startTime">
               <el-date-picker
-                type="datetime"
+                type="date"
+                :clearable="false"
                 class="width100"
                 placeholder="开始日期"
                 :picker-options="pickerOptionsStart"
@@ -41,17 +42,19 @@
           <el-col :span="4">
             <el-form-item label="结束日期" prop="endTime">
               <el-date-picker
-                type="datetime"
+                type="date"
+                :clearable="false"
                 class="width100"
                 placeholder="结束日期"
                 :picker-options="pickerOptionsEnd"
                 v-model="form.endTime"
                 value-format="yyyy/MM/dd HH:mm:ss"
+                @change="endTimeChange"
               ></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="12" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="getSuucessRate">查询</btn>
           </el-col>
@@ -78,7 +81,7 @@ export default {
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
-            return time.getTime() >= new Date(this.form.endTime).getTime();
+            return time.getTime() > new Date(this.form.endTime).getTime();
           }
         },
       },
@@ -86,7 +89,7 @@ export default {
       pickerOptionsEnd: {
         disabledDate: (time) => {
           if (this.form.startTime) {
-            return time.getTime() <= new Date(this.form.startTime).getTime();
+            return time.getTime() < new Date(this.form.startTime).getTime();
           }
         },
       },
@@ -108,6 +111,9 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
+    endTimeChange(val){
+      this.form.endTime = timeFormat(new Date(val),true)
+    },
     async getSuucessRate () {
       this.recTypeArr = [];
       this.chartData = [];

@@ -30,7 +30,8 @@
             <el-form-item label="开始日期">
               <el-date-picker
                 class="width100"
-                type="datetime"
+                :clearable="false"
+                type="date"
                 placeholder="开始日期"
                 :picker-options="pickerOptionsStart"
                 v-model="form.startTime"
@@ -42,16 +43,18 @@
             <el-form-item label="结束日期">
               <el-date-picker
                 class="width100"
-                type="datetime"
+                :clearable="false"
+                type="date"
                 placeholder="结束日期"
                 :picker-options="pickerOptionsEnd"
                 v-model="form.endTime"
                 value-format="yyyy/MM/dd HH:mm:ss"
+                @change="endTimeChange"
               ></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
-          <el-col :span="4" class="btnColRight">
+          <el-col :span="12" class="btnColRight">
             <btn nativeType="cz" @click="resetForm">重置</btn>
             <btn nativeType="cx" @click="getProcessCounts">查询</btn>
           </el-col>
@@ -78,7 +81,7 @@ export default {
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
-            return time.getTime() >= new Date(this.form.endTime).getTime();
+            return time.getTime() > new Date(this.form.endTime).getTime();
           }
         },
       },
@@ -86,7 +89,7 @@ export default {
       pickerOptionsEnd: {
         disabledDate: (time) => {
           if (this.form.startTime) {
-            return time.getTime() <= new Date(this.form.startTime).getTime();
+            return time.getTime() < new Date(this.form.startTime).getTime();
           }
         },
       },
@@ -109,6 +112,9 @@ export default {
     ...mapGetters(["dicData"]),
   },
   methods: {
+    endTimeChange(val){
+      this.form.endTime = timeFormat(new Date(val),true)
+    },
     async getProcessCounts(){
       this.chartData = [];
       let { result: res } = await efficient.getProcessCounts(

@@ -19,13 +19,13 @@
           <el-col :span="6">
             <el-form-item label="接收日期" prop="receiveStartTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                clearable v-model="form.receiveStartTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.receiveStartTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="至" prop="receiveEndTime" label-width="35px">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.receiveEndTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.receiveEndTime" value-format="yyyy/MM/dd HH:mm:ss" @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -107,6 +107,8 @@ import tableMixin from "@/mixins/tableMixin.js";
 import { getReceiveDataReportPage } from "@/api/dataReport.js";
 // 引入详情弹框
 import dataDetails from "@/components/EditDialog";
+//引入日期处理方法
+import {timeFormat } from "@/utils/operation";
 export default {
   name: "jsbwcx",
   mixins: [tableMixin],
@@ -121,8 +123,8 @@ export default {
           let endDateVal = this.form.receiveEndTime;
           if (endDateVal) {
             return (
-              time.getTime() >
-              new Date(endDateVal).getTime() - 1 * 24 * 60 * 60 * 1000
+              time.getTime() >=
+              new Date(endDateVal).getTime() 
             );
           }
         },
@@ -133,7 +135,7 @@ export default {
           if (beginDateVal) {
             return (
               time.getTime() <
-              new Date(beginDateVal).getTime() + 1 * 24 * 60 * 60 * 1000
+              new Date(beginDateVal).getTime()
             );
           }
         },
@@ -213,6 +215,10 @@ export default {
     };
   },
   methods: {
+    //截止日期变化
+    endTimeChange(val){
+      this.form.receiveEndTime = timeFormat(new Date(val),true)
+    },
     // 初始化数据
     queryClick () {
       getReceiveDataReportPage({ ...this.form, ...this.formData }).then(

@@ -19,13 +19,13 @@
           <el-col :span="6">
             <el-form-item label="开始日期" prop="startTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" :picker-options="pickerOptionsStart"
-                clearable v-model="form.startTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.startTime" value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="结束日期" prop="endTime">
               <el-date-picker type="date" class="width100" placeholder="结束日期" :picker-options="pickerOptionsEnd"
-                clearable v-model="form.endTime" value-format="yyyy-MM-dd"></el-date-picker>
+                clearable v-model="form.endTime" value-format="yyyy/MM/dd HH:mm:ss"  @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <!-- 操作按钮 -->
@@ -54,6 +54,8 @@ import { datas, sendThis } from "./data"
 import tableMixin from "@/mixins/tableMixin.js";
 import { getRecordLogPage } from "@/api/recordLog.js";
 import { mapGetters } from 'vuex'
+//引入日期处理方法
+import {timeFormat } from "@/utils/operation";
 export default {
   name: "dbrzcx",
   mixins: [tableMixin],
@@ -66,9 +68,7 @@ export default {
       pickerOptionsStart: {
         disabledDate: (time) => {
           if (this.form.endTime) {
-            return (
-              time.getTime() >= new Date(this.form.endTime).getTime()
-            );
+            return  time.getTime() >= new Date(this.form.endTime).getTime()
           }
         }
       },
@@ -76,9 +76,7 @@ export default {
       pickerOptionsEnd: {
         disabledDate: (time) => {
           if (this.form.startTime) {
-            return (
-              time.getTime() <= new Date(this.form.startTime).getTime()
-            );
+            return  time.getTime() < new Date(this.form.startTime).getTime()
           }
         }
       },
@@ -88,12 +86,6 @@ export default {
         startTime: '',
         endTime: '',
       },
-      // 分页
-      pageData: {
-        total: 0,
-        pageSize: 10,
-        current: 1
-      },
       // table数据
       tableData: {
         // 表头
@@ -116,6 +108,10 @@ export default {
     sendThis(this);
   },
   methods: {
+    //截止日期变化
+    endTimeChange(val){
+      this.form.endTime = timeFormat(new Date(val),true)
+    },
     queryClick () {
       getRecordLogPage({ ...this.form, ...this.pageData }).then(res => {
         if (res.code === 200) {

@@ -20,18 +20,18 @@
             <el-form-item label="汇交时间" prop="exchangeStartTime">
               <el-date-picker type="date" class="width100" placeholder="开始日期" clearable
                 :picker-options="pickerOptionsStart" v-model="form.exchangeStartTime"
-                value-format="yyyy-MM-dd"></el-date-picker>
+                value-format="yyyy/MM/dd HH:mm:ss"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="至" prop="exchangeStartTime" label-width="35px">
               <el-date-picker type="date" class="width100" placeholder="结束日期" clearable
                 :picker-options="pickerOptionsEnd" v-model="form.exchangeEndTime"
-                value-format="yyyy-MM-dd"></el-date-picker>
+                value-format="yyyy/MM/dd HH:mm:ss"  @change="endTimeChange"></el-date-picker>
             </el-form-item>
           </el-col>
           <el-col :span="6">
-            <el-form-item label="汇交状态" prop="state">
+            <el-form-item label="汇交状态" prop="hjjg">
               <el-select v-model="form.hjjg" class="width100" clearable placeholder="汇交状态">
                 <el-option v-for="item in dicData['sbhjzt']" :key="item.DCODE" :label="item.DNAME" :value="item.DCODE">
                 </el-option>
@@ -90,7 +90,8 @@ import tableMixin from "@/mixins/tableMixin.js";
 // 引入详情弹框
 import dataDetails from "@/components/EditDialog";
 import { getDataReportPage } from "@/api/dataReport.js";
-
+//引入日期处理方法
+import {timeFormat } from "@/utils/operation";
 export default {
   name: "sbbwcx",
   mixins: [tableMixin],
@@ -113,7 +114,7 @@ export default {
       pickerOptionsEnd: {
         disabledDate: (time) => {
           if (this.form.exchangeStartTime) {
-            return time.getTime() <= new Date(this.form.exchangeStartTime).getTime();
+            return time.getTime() < new Date(this.form.exchangeStartTime).getTime();
           }
         },
       },
@@ -122,6 +123,7 @@ export default {
         qxdm: "", // 行政区
         exchangeStartTime: "", // 开始日期
         exchangeEndTime: "", // 结束日期
+        hjjg:"", //汇交状态
         bdcdyh: "", // 不动产单元号
         ywh: "", // 业务号
         qllx: "", // 权利类型
@@ -170,6 +172,10 @@ export default {
     sendThis(this);
   },
   methods: {
+    //截止日期变化
+    endTimeChange(val){
+      this.form.exchangeEndTime = timeFormat(new Date(val),true)
+    },
     // 初始化数据
     queryClick () {
       getDataReportPage({ ...this.form, ...this.pageData }).then((res) => {
@@ -196,6 +202,7 @@ export default {
     // 重置
     resetForm () {
       this.$refs.ruleForm.resetFields();
+      this.form.exchangeEndTime = ""
       this.form.currentPage = 1
       this.queryClick();
     },