Merge branch 'dev' of http://101.95.0.106:8888/youxiw20000/trash into dev

youxiw2000
2 parents a3187b66 541db4d4
Showing 7 changed files with 40 additions and 26 deletions
trash-ui/src/api/dayWorkReport.js
trash-ui/src/views/activiti/taskhistory/index.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseFileInfo.vue
trash-ui/src/views/casefile/violationCaseFile/violationCaseTable.vue
trash-ui/src/views/casefile/violationWarningInformation/violationWarningInformationTable.vue
trash-ui/src/views/h5/taskhistory/index.vue
-
 import h5Page from '@/views/h5/Pagination';
@@ -105,7 +104,7 @@ export default {
   created() {
     this.getList(0);
-    getArea().then(res=>{
+    getArea().then(res => {
       this.areas = res.result;
     });
@@ -146,9 +145,9 @@ export default {
       this.queryParams.page = 1;
       this.queryParams.pageSize = 9999;
-      if(this.queryParams.timeRange){
+      if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
-        this.queryParams.workEndTime =  this.queryParams.timeRange[1];
+        this.queryParams.workEndTime = this.queryParams.timeRange[1];
         this.queryParams.timeRange = null;
       }
@@ -211,7 +210,6 @@ export default {
         }
-
       });
     },
@@ -226,28 +224,29 @@ export default {
       // let query = this.queryParams;
       if (tabIdx == 1) {
-      this.queryParams.pageNum = 1;
+        this.queryParams.pageNum = 1;
         this.resetQuery();
         this.queryParams.his = tabIdx;
       } else if (tabIdx == 0) {
-      this.queryParams.pageNum = 1;
+        this.queryParams.pageNum = 1;
         this.resetQuery();
         this.queryParams.his = tabIdx;
       }
-      if(this.queryParams.timeRange){
+      const timeRange = this.queryParams.timeRange;
+      if (this.queryParams.timeRange) {
         this.queryParams.workStartTime = this.queryParams.timeRange[0];
-        this.queryParams.workEndTime =  this.queryParams.timeRange[1];
+        this.queryParams.workEndTime = this.queryParams.timeRange[1];
         this.queryParams.timeRange = null;
       }
       dayWorkList(this.queryParams).then(response => {
-          this.threestepList = response.rows;
-
-          this.loading.close();
+        this.threestepList = response.rows;
+        this.queryParams.timeRange = timeRange;
+        this.loading.close();
-          this.dayWorkCount = response.msg;
-          this.total = response.total;
+        this.dayWorkCount = response.msg;
+        this.total = response.total;
       });
@@ -357,7 +356,6 @@ export default {
       });
-
     },
     checkEndSuccess() {
@@ -413,7 +411,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delThreestep(ids);
       }).then(() => {
         this.getList();
@@ -430,7 +428,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         that.loading = true;
         that.getListAndExport();
       });
@@ -103,7 +103,12 @@ import violationCaseFileInfo from &quot;@/views/casefile/violationCaseFile/violationC
 import violationWarningInformationInfo
   from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
 import supervisionInfo from "../task/SupervisionInfo";
-import {getDict} from "@/api/dict";
+import {
+  getArea,
+  getDict,
+  getUsers,
+  getSupervision
+} from "@/api/dict";
 export default {
@@ -50,8 +50,6 @@
             </el-date-picker>
       </el-form-item>
         </el-col>
-
-      </el-col>
       </el-row>
       <el-form-item>
         <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button>
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="115px">
+  <el-form ref="form" :model="form" label-width="115px">
     <el-row :gutter="2">
       <el-col :span="11">
         <el-form-item label="案卷编号" prop="number">
@@ -131,8 +131,12 @@ export default {
       return sums;
     },
     handleQuery() {
-      let startDate = this.formatDate(this.createTime[0]);
-      let endDate = this.formatDate(this.createTime[1]);
+      let startDate = null;
+      let endDate = null;
+      if(this.createTime.length!=0){
+        startDate = this.formatDate(this.createTime[0]);
+        endDate = this.formatDate(this.createTime[1]);
+      }
       caseTable({owningRegion: this.owningRegion, startDate: startDate, endDate: endDate}).then(res => {
         this.tableData = res.data;
         this.hackReset = false;
@@ -130,8 +130,12 @@ export default {
       return sums;
     },
     handleQuery(){
-      let startDate = this.formatDate(this.createTime[0]);
-      let endDate = this.formatDate(this.createTime[1]);
+      let startDate = null;
+      let endDate = null;
+      if(this.createTime.length!=0){
+        startDate = this.formatDate(this.createTime[0]);
+        endDate = this.formatDate(this.createTime[1]);
+      }
       caseTable({owningRegion:this.owningRegion,startDate:startDate,endDate:endDate}).then(res => {
         this.tableData = res.data;
         this.hackReset = false;
@@ -91,7 +91,12 @@
   import caseOfflineInfo from "@/views/h5/caseOffline/caseOfflineInfo";
   import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
   import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
-  import {getDict} from "@/api/dict";
+  import {
+    getArea,
+    getDict,
+    getUsers,
+    getSupervision
+  } from "@/api/dict";
   export default {
     name: "taskHistory",