Merge branch 'dev' into 'master'

Dev

See merge request !8

.prettierrc

 {
   "tabWidth": 2,
   "singleQuote": true,
-  "printWidth": 80,
+  "printWidth": 180,
   "semi": false,
   "trailingComma": "none",
   "bracketSpacing": true,

package-lock.json

@@ -2012,6 +2012,49 @@
         "webpack-merge": "^5.7.3",
         "webpack-virtual-modules": "^0.4.2",
         "whatwg-fetch": "^3.6.2"
+      },
+      "dependencies": {
+        "@vue/vue-loader-v15": {
+          "version": "npm:vue-loader@15.10.1",
+          "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.1.tgz",
+          "integrity": "sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==",
+          "dev": true,
+          "requires": {
+            "@vue/component-compiler-utils": "^3.1.0",
+            "hash-sum": "^1.0.2",
+            "loader-utils": "^1.1.0",
+            "vue-hot-reload-api": "^2.3.0",
+            "vue-style-loader": "^4.1.0"
+          },
+          "dependencies": {
+            "hash-sum": {
+              "version": "1.0.2",
+              "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
+              "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
+              "dev": true
+            }
+          }
+        },
+        "json5": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.2.tgz",
+          "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+          "dev": true,
+          "requires": {
+            "minimist": "^1.2.0"
+          }
+        },
+        "loader-utils": {
+          "version": "1.4.2",
+          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.2.tgz",
+          "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
+          "dev": true,
+          "requires": {
+            "big.js": "^5.2.2",
+            "emojis-list": "^3.0.0",
+            "json5": "^1.0.1"
+          }
+        }
       }
     },
     "@vue/cli-shared-utils": {
@@ -2172,47 +2215,6 @@
         "eslint-import-resolver-webpack": "^0.13.1"
       }
     },
-    "@vue/vue-loader-v15": {
-      "version": "npm:vue-loader@15.10.0",
-      "resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.10.0.tgz",
-      "integrity": "sha512-VU6tuO8eKajrFeBzMssFUP9SvakEeeSi1BxdTH5o3+1yUyrldp8IERkSdXlMI2t4kxF2sqYUDsQY+WJBxzBmZg==",
-      "dev": true,
-      "requires": {
-        "@vue/component-compiler-utils": "^3.1.0",
-        "hash-sum": "^1.0.2",
-        "loader-utils": "^1.1.0",
-        "vue-hot-reload-api": "^2.3.0",
-        "vue-style-loader": "^4.1.0"
-      },
-      "dependencies": {
-        "hash-sum": {
-          "version": "1.0.2",
-          "resolved": "https://registry.npmmirror.com/hash-sum/-/hash-sum-1.0.2.tgz",
-          "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
-          "dev": true
-        },
-        "json5": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmmirror.com/json5/-/json5-1.0.1.tgz",
-          "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
-          "dev": true,
-          "requires": {
-            "minimist": "^1.2.0"
-          }
-        },
-        "loader-utils": {
-          "version": "1.4.0",
-          "resolved": "https://registry.npmmirror.com/loader-utils/-/loader-utils-1.4.0.tgz",
-          "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
-          "dev": true,
-          "requires": {
-            "big.js": "^5.2.2",
-            "emojis-list": "^3.0.0",
-            "json5": "^1.0.1"
-          }
-        }
-      }
-    },
     "@vue/web-component-wrapper": {
       "version": "1.3.0",
       "resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
@@ -2670,7 +2672,7 @@
     },
     "async-validator": {
       "version": "1.8.5",
-      "resolved": "https://registry.npmmirror.com/async-validator/-/async-validator-1.8.5.tgz",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-1.8.5.tgz",
       "integrity": "sha512-tXBM+1m056MAX0E8TL2iCjg8WvSyXu0Zc8LNtYqrVeyoL3+esHRZ4SieE9fKQyyU09uONjnMEjrNBMqT0mbvmA==",
       "requires": {
         "babel-runtime": "6.x"
@@ -2713,7 +2715,7 @@
     },
     "babel-helper-vue-jsx-merge-props": {
       "version": "2.0.3",
-      "resolved": "https://registry.npmmirror.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
       "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
     },
     "babel-loader": {
@@ -2769,7 +2771,7 @@
     },
     "babel-runtime": {
       "version": "6.26.0",
-      "resolved": "https://registry.npmmirror.com/babel-runtime/-/babel-runtime-6.26.0.tgz",
+      "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
       "integrity": "sha512-ITKNuq2wKlW1fJg9sSW52eepoYgZBggvOAHC0u/CYu/qxQ9EVzThCgR69BnSXLHjy2f7SY5zaQ4yt7H9ZVxY2g==",
       "requires": {
         "core-js": "^2.4.0",
@@ -2778,12 +2780,12 @@
       "dependencies": {
         "core-js": {
           "version": "2.6.12",
-          "resolved": "https://registry.npmmirror.com/core-js/-/core-js-2.6.12.tgz",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.12.tgz",
           "integrity": "sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="
         },
         "regenerator-runtime": {
           "version": "0.11.1",
-          "resolved": "https://registry.npmmirror.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
+          "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz",
           "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg=="
         }
       }
@@ -3923,7 +3925,7 @@
     },
     "element-ui": {
       "version": "2.15.10",
-      "resolved": "https://registry.npmmirror.com/element-ui/-/element-ui-2.15.10.tgz",
+      "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.15.10.tgz",
       "integrity": "sha512-jmD++mU2wKXbisvx4fxOl2mHaU+HWHTAq/3Wf8x9Bwyu4GdDZPLABb+CGi3DWN6fPqdgRcd74aX39DO+YHObLw==",
       "requires": {
         "async-validator": "~1.8.1",
@@ -6661,7 +6663,7 @@
     },
     "normalize-wheel": {
       "version": "1.0.1",
-      "resolved": "https://registry.npmmirror.com/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/normalize-wheel/-/normalize-wheel-1.0.1.tgz",
       "integrity": "sha512-1OnlAPZ3zgrk8B91HyRj+eVv+kS5u+Z0SCsak6Xil/kmgEia50ga7zfkumayonZrImffAxPU/5WcyGhzetHNPA=="
     },
     "npm-run-path": {
@@ -7722,7 +7724,7 @@
     },
     "resize-observer-polyfill": {
       "version": "1.5.1",
-      "resolved": "https://registry.npmmirror.com/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
       "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
     },
     "resolve": {
@@ -8544,7 +8546,7 @@
     },
     "throttle-debounce": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmmirror.com/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/throttle-debounce/-/throttle-debounce-1.1.0.tgz",
       "integrity": "sha512-XH8UiPCQcWNuk2LYePibW/4qL97+ZQ1AN3FNXwZRBNPPowo/NRU5fAlDCSNBJIYCKbioZfuYtMhG4quqoJhVzg=="
     },
     "thunky": {

src/common/api/order.js

+import axios from './axios'
+
+export function getOrderTree() {
+  return axios.get('platform/platformWorkOrder/erp/findStateGroupList')
+}
+
+export function workConfirmed(id) {
+  return axios.post('platform/platformWorkOrder/confirmed', {
+    id: id,
+  })
+}
+
+export function workAssigned(id, user) {
+  return axios.post('platform/platformWorkOrder/assign', {
+    id: id,
+    leader: user,
+  })
+}
+
+export function startWorder(id) {
+  return axios.post('platform/platformWorkOrder/start', {
+    id: id,
+  })
+}
+
+export function archiveWorkOrder(id) {
+  return axios.post('platform/platformWorkOrder/archive', {
+    id: id,
+  })
+}
+
+export function replyTocustomer(id, msg) {
+  return axios.post('platform/platformWorkOrderChat/add', {
+    msg: msg,
+    workOrderId: id,
+  })
+}
+
+export function getOrderType() {
+  return axios.get('platform/platformWorkOrder/orderTypeList')
+}

src/common/api/system.js

+import axios from './axios'
+
+// 获取系统用户
+export function getSystemUserList() {
+  return axios.get('platform/user/list')
+}

src/common/style/index.scss

@@ -66,6 +66,10 @@
   padding-top: 5px;
   padding-bottom: 5px;
 }
+
+.el-form-item--mini.el-form-item {
+  margin-bottom: 10px;
+}
 .icon-view{
   font-size: 18px;
   cursor: pointer;
@@ -73,4 +77,53 @@
 }
 .icon-view + .icon-view{
   margin-left: 10px;
-}
\ No newline at end of file
+}
+
+.icon-view {
+  width: 23px;
+  height: 23px;
+  font-size: 16px;
+  line-height: 23px;
+  border-radius: 4px;
+  text-align: center;
+  display: inline-block;
+  color: #fff;
+  cursor: pointer;
+  vertical-align: middle;
+}
+
+.icon-view:not(:first-child) {
+  margin-left: 5px;
+}
+
+.icon-edit-view {
+  background-color: #ff9900;
+}
+
+.icon-edit-view:hover {
+  background-color: #ffd36a;
+}
+
+.icon-del-view {
+  background-color: #f56c6c;
+}
+
+.icon-del-view:hover {
+  background-color: #f78989;
+}
+
+.icon-tools-view {
+  background-color: #8cc34b;
+}
+
+.icon-tools-view:hover {
+  background-color: #85ce61;
+}
+
+.icon-primary-view {
+  background-color: #4168FF;
+}
+
+.icon-primary-view:hover {
+  background-color: #66b1ff;
+}

src/main.js

@@ -5,9 +5,11 @@ import store from './store'
 import element from '@/common/components/element-ui.js'
 import vxeTable from '@/common/components/vxeTable.js'
 import './common/style/index.scss'
+import Directives from './utils/directives'
 // import { getToken } from '@/utils/auth'
 
 Vue.config.productionTip = false
+Vue.use(Directives)
 
 Vue.use(element)
 Vue.use(vxeTable)

src/utils/directives/enter-submit.js

+/**
+ * @type {import("vue/types/options").DirectiveOptions}
+ */
+const enterSubmit = {
+  inserted: (el, binding) => {
+    el._enterSubmitFn = (e) => {
+      if (e.key !== 'Enter') return
+      if (typeof binding.value === 'function') {
+        setTimeout(() => {
+          binding.value()
+        }, 100)
+      }
+    }
+
+    el.addEventListener('keydown', el._enterSubmitFn, true)
+  },
+  unbind: (el) => {
+    el.removeEventListener(
+      'keydown',
+      el._enterSubmitFn,
+      true,
+    )
+  },
+}
+
+export default enterSubmit

src/utils/directives/index.js

+import enterSubmit from './enter-submit'
+
+export default {
+  install(Vue) {
+    Vue.directive('enter-submit', enterSubmit)
+  },
+}