Merge remote-tracking branch 'origin/master' into master

imcs-ui/package.json

@@ -93,13 +93,13 @@
     "less-loader": "^5.0.0",
     "lint-staged": "8.1.5",
     "mockjs": "1.0.1-beta3",
-    "node-sass": "^4.14.1",
+    "node-sass": "^6.0.1",
     "plop": "2.3.0",
     "pug": "^3.0.2",
     "pug-plain-loader": "^1.1.0",
     "qs": "^6.10.2",
     "runjs": "^4.3.2",
-    "sass-loader": "^7.1.0",
+    "sass-loader": "^10.0.1",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",

imcs-ui/src/api/Dispatch.js

@@ -0,0 +1,61 @@
+import axiosApi from './AxiosApi.js'
+
+const apiList = {
+  page: {
+    url: `/authority/dispatchRecord/page`,
+    method: 'POST'
+  },
+  pageException: {
+    url: `/authority/dispatchException/page`,
+    method: 'POST'
+  },
+  save: {
+    url: `/authority/dispatchException`,
+    method: 'POST'
+  },
+  update: {
+    url: `/authority/dispatchException`,
+    method: 'PUT'
+  },
+  delete: {
+    url: `/authority/dispatchException`,
+    method: 'DELETE'
+  },
+  preview: {
+    method: 'POST',
+    url: `/authority/dispatch/preview`
+  }
+}
+
+export default {
+  page (data) {
+    return axiosApi({
+      ...apiList.page,
+      data
+    })
+  },
+  pageException (data) {
+    return axiosApi({
+      ...apiList.pageException,
+      data
+    })
+  },
+  save (data) {
+    return axiosApi({
+      ...apiList.save,
+      data
+    })
+  },
+  update (data) {
+    return axiosApi({
+      ...apiList.update,
+      data
+    })
+  },
+  delete (data) {
+    return axiosApi({
+      ...apiList.delete,
+      data
+    })
+  }
+}

imcs-ui/src/views/zuihou/dispatchMgr/dispatchRecord/Index.vue

@@ -18,7 +18,9 @@
           type="datetimerange"
           range-separator="至"
           start-placeholder="开始时间"
-          end-placeholder="结束时间" >
+          end-placeholder="结束时间" 
+          value-format="yyyy-MM-dd HH:mm:ss"
+          >
         </el-date-picker>
       </span>
       <span style="margin-left: 15px">
@@ -107,7 +109,7 @@
 
 <script>
 import Pagination from "@/components/Pagination";
-import areaMgrApi from "@/api/resourceProductMgr/areaMgr";
+import dispatchMgrApi from "@/api/Dispatch";
 
 import elDragDialog from "@/directive/el-drag-dialog";
 import { initDicts, initQueryParams } from "@/utils/commons";
@@ -168,15 +170,15 @@ export default {
     fetch(params = {}) {
       this.loading = true;
       if (this.queryParams.timeRange) {
-        this.queryParams.map.createTime_st = this.queryParams.timeRange[0];
-        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1];
+        this.queryParams.map.distributeTime_st = this.queryParams.timeRange[0];
+        this.queryParams.map.distributeTime_ed = this.queryParams.timeRange[1];
       }
 
       this.queryParams.current = params.current
         ? params.current
         : this.queryParams.current;
       this.queryParams.size = params.size ? params.size : this.queryParams.size;
-      areaMgrApi
+      dispatchMgrApi
         .page(this.queryParams)
         .then((response) => {
           const res = response.data;

imcs-ui/src/views/zuihou/dispatchMgr/exception/Index.vue

@@ -146,13 +146,13 @@
 
 <script>
 import Pagination from "@/components/Pagination";
-import areaMgrApi from "@/api/resourceProductMgr/areaMgr";
+import dispatchMgrApi from "@/api/Dispatch";
 
 import elDragDialog from "@/directive/el-drag-dialog";
 import { initDicts, initQueryParams } from "@/utils/commons";
 import { convertEnum } from "@/utils/utils";
 export default {
-  name: "dispatchRecordMgr",
+  name: "dispatchExceptionMgr",
   directives: { elDragDialog },
   components: { Pagination },
   props: {},
@@ -213,16 +213,16 @@ export default {
     fetch(params = {}) {
       this.loading = true;
       if (this.queryParams.timeRange) {
-        this.queryParams.map.createTime_st = this.queryParams.timeRange[0];
-        this.queryParams.map.createTime_ed = this.queryParams.timeRange[1];
+        this.queryParams.map.operationTime_st = this.queryParams.timeRange[0];
+        this.queryParams.map.operationTime_ed = this.queryParams.timeRange[1];
       }
 
       this.queryParams.current = params.current
         ? params.current
         : this.queryParams.current;
       this.queryParams.size = params.size ? params.size : this.queryParams.size;
-      areaMgrApi
-        .page(this.queryParams)
+      dispatchMgrApi
+        .pageException(this.queryParams)
         .then((response) => {
           const res = response.data;
           if (res.isSuccess) {