From 16f26a1fe8c53bac06ffdb5e49ad00c328454245 Mon Sep 17 00:00:00 2001 From: zzq Date: Tue, 25 Aug 2020 17:01:02 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 166 ++++--- src/config/router.config.js | 8 + src/views/par/parworkinfo/ParWorkInfo.vue | 554 ++++++++++++++++++++++ vue.config.js | 3 +- 4 files changed, 670 insertions(+), 61 deletions(-) create mode 100644 src/views/par/parworkinfo/ParWorkInfo.vue diff --git a/package-lock.json b/package-lock.json index 563f6c5..1bdda5a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,21 +5,21 @@ "requires": true, "dependencies": { "@ant-design/colors": { - "version": "3.1.0", - "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.1.0.tgz", - "integrity": "sha1-t+LMYaTobT0QlJQDSs+xIi2sqjw=", + "version": "3.2.2", + "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz?cache=0&sync_timestamp=1596611396536&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Fcolors%2Fdownload%2F%40ant-design%2Fcolors-3.2.2.tgz", + "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=", "requires": { "tinycolor2": "^1.4.1" } }, "@ant-design/icons": { "version": "2.1.1", - "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz", + "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz?cache=0&sync_timestamp=1596529281626&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons%2Fdownload%2F%40ant-design%2Ficons-2.1.1.tgz", "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko=" }, "@ant-design/icons-vue": { "version": "2.0.0", - "resolved": "https://registry.npm.taobao.org/@ant-design/icons-vue/download/@ant-design/icons-vue-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/@ant-design/icons-vue/download/@ant-design/icons-vue-2.0.0.tgz?cache=0&sync_timestamp=1596264283887&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-vue%2Fdownload%2F%40ant-design%2Ficons-vue-2.0.0.tgz", "integrity": "sha1-A1f1AQpATp80qHpLQbKgjfaR284=", "requires": { "@ant-design/colors": "^3.1.0", @@ -996,7 +996,6 @@ "version": "7.5.5", "resolved": "https://registry.npm.taobao.org/@babel/runtime/download/@babel/runtime-7.5.5.tgz?cache=0&sync_timestamp=1563398515522&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40babel%2Fruntime%2Fdownload%2F%40babel%2Fruntime-7.5.5.tgz", "integrity": "sha1-dPulbTXvvspEQJHHhQzNSU/S8TI=", - "dev": true, "requires": { "regenerator-runtime": "^0.13.2" }, @@ -1004,8 +1003,7 @@ "regenerator-runtime": { "version": "0.13.3", "resolved": "https://registry.npm.taobao.org/regenerator-runtime/download/regenerator-runtime-0.13.3.tgz", - "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U=", - "dev": true + "integrity": "sha1-fPanfY9cb2Drc8X8GVWyzrAea/U=" } } }, @@ -1225,6 +1223,22 @@ "integrity": "sha1-K1o6s/kYzKSKjHVMCBaOPwPrphs=", "dev": true }, + "@simonwep/pickr": { + "version": "1.7.2", + "resolved": "https://registry.npm.taobao.org/@simonwep/pickr/download/@simonwep/pickr-1.7.2.tgz", + "integrity": "sha1-mcc6OFJjP3ScjBh8gmJ6RIt2se8=", + "requires": { + "core-js": "^3.6.5", + "nanopop": "^1.3.0" + }, + "dependencies": { + "core-js": { + "version": "3.6.5", + "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.6.5.tgz", + "integrity": "sha1-c5XcJzrzf7LlDpvT2f6EEoUjHRo=" + } + } + }, "@soda/friendly-errors-webpack-plugin": { "version": "1.7.1", "resolved": "https://registry.npm.taobao.org/@soda/friendly-errors-webpack-plugin/download/@soda/friendly-errors-webpack-plugin-1.7.1.tgz", @@ -1358,11 +1372,15 @@ } } }, + "@vant/icons": { + "version": "1.2.5", + "resolved": "https://registry.npm.taobao.org/@vant/icons/download/@vant/icons-1.2.5.tgz", + "integrity": "sha1-89tDxLMAMAgp48TpCb6qM9HL54Y=" + }, "@vue/babel-helper-vue-jsx-merge-props": { "version": "1.0.0", "resolved": "https://registry.npm.taobao.org/@vue/babel-helper-vue-jsx-merge-props/download/@vue/babel-helper-vue-jsx-merge-props-1.0.0.tgz", - "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA=", - "dev": true + "integrity": "sha1-BI/leZWNpAj7eosqPsBQtQpmEEA=" }, "@vue/babel-plugin-transform-vue-jsx": { "version": "1.0.0", @@ -2297,7 +2315,7 @@ }, "add-dom-event-listener": { "version": "1.1.0", - "resolved": "http://registry.npm.taobao.org/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz", "integrity": "sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=", "requires": { "object-assign": "4.x" @@ -2383,26 +2401,28 @@ "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=" }, "ant-design-vue": { - "version": "1.3.14", - "resolved": "https://registry.npm.taobao.org/ant-design-vue/download/ant-design-vue-1.3.14.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fant-design-vue%2Fdownload%2Fant-design-vue-1.3.14.tgz", - "integrity": "sha1-S+8HnsenTnmiDFxPq3sKt/s1aPw=", + "version": "1.6.4", + "resolved": "https://registry.npm.taobao.org/ant-design-vue/download/ant-design-vue-1.6.4.tgz?cache=0&sync_timestamp=1597417388348&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fant-design-vue%2Fdownload%2Fant-design-vue-1.6.4.tgz", + "integrity": "sha1-2roc5rNXtmiN/kSoJYZJU6XGxiQ=", "requires": { "@ant-design/icons": "^2.1.1", "@ant-design/icons-vue": "^2.0.0", + "@simonwep/pickr": "~1.7.0", "add-dom-event-listener": "^1.0.2", "array-tree-filter": "^2.1.0", - "async-validator": "^1.8.2", + "async-validator": "^3.0.3", "babel-helper-vue-jsx-merge-props": "^2.0.3", "babel-runtime": "6.x", "classnames": "^2.2.5", "component-classes": "^1.2.6", - "dom-align": "^1.7.0", + "dom-align": "^1.10.4", "dom-closest": "^0.2.0", - "dom-scroll-into-view": "^1.2.1", + "dom-scroll-into-view": "^2.0.0", "enquire.js": "^2.1.6", "intersperse": "^1.0.0", + "is-mobile": "^2.2.1", "is-negative-zero": "^2.0.0", - "ismobilejs": "^0.5.1", + "ismobilejs": "^1.0.0", "json2mq": "^0.2.0", "lodash": "^4.17.5", "moment": "^2.21.0", @@ -2413,8 +2433,8 @@ "resize-observer-polyfill": "^1.5.1", "shallow-equal": "^1.0.0", "shallowequal": "^1.0.2", - "vue-ref": "^1.0.4", - "warning": "^3.0.0" + "vue-ref": "^2.0.0", + "warning": "^4.0.0" } }, "any-promise": { @@ -2516,7 +2536,7 @@ }, "array-tree-filter": { "version": "2.1.0", - "resolved": "http://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz", "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA=" }, "array-union": { @@ -2640,9 +2660,9 @@ "dev": true }, "async-validator": { - "version": "1.12.2", - "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-1.12.2.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-1.12.2.tgz", - "integrity": "sha1-vq5nHnF00pOLe0tp0vt+cit/1yw=" + "version": "3.4.0", + "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-3.4.0.tgz?cache=0&sync_timestamp=1596625258256&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-3.4.0.tgz", + "integrity": "sha1-hxs+WUEkv0xOt7zRqeeLRPOwnK4=" }, "asynckit": { "version": "0.4.0", @@ -2812,7 +2832,7 @@ }, "babel-helper-vue-jsx-merge-props": { "version": "2.0.3", - "resolved": "http://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz", "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY=" }, "babel-helpers": { @@ -3784,7 +3804,7 @@ }, "classnames": { "version": "2.2.6", - "resolved": "http://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz", + "resolved": "https://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz", "integrity": "sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4=" }, "clean-css": { @@ -4163,7 +4183,7 @@ }, "component-classes": { "version": "1.2.6", - "resolved": "http://registry.npm.taobao.org/component-classes/download/component-classes-1.2.6.tgz", + "resolved": "https://registry.npm.taobao.org/component-classes/download/component-classes-1.2.6.tgz", "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=", "requires": { "component-indexof": "0.0.3" @@ -4177,7 +4197,7 @@ }, "component-indexof": { "version": "0.0.3", - "resolved": "http://registry.npm.taobao.org/component-indexof/download/component-indexof-0.0.3.tgz", + "resolved": "https://registry.npm.taobao.org/component-indexof/download/component-indexof-0.0.3.tgz", "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ=" }, "compressible": { @@ -5534,13 +5554,13 @@ } }, "dom-align": { - "version": "1.10.2", - "resolved": "https://registry.npm.taobao.org/dom-align/download/dom-align-1.10.2.tgz", - "integrity": "sha1-VA6hyeIEYr0RufwoxWHcg1Hs5MY=" + "version": "1.12.0", + "resolved": "https://registry.npm.taobao.org/dom-align/download/dom-align-1.12.0.tgz", + "integrity": "sha1-VvtxVt8LkQmYMDZNLUj4iWP1opw=" }, "dom-closest": { "version": "0.2.0", - "resolved": "http://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz", "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=", "requires": { "dom-matches": ">=1.0.1" @@ -5563,13 +5583,13 @@ }, "dom-matches": { "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz", "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw=" }, "dom-scroll-into-view": { - "version": "1.2.1", - "resolved": "https://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-1.2.1.tgz", - "integrity": "sha1-6PNnMt0ImwIBqI14Fdw/iObWbH4=" + "version": "2.0.1", + "resolved": "https://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-2.0.1.tgz", + "integrity": "sha1-DezIUigB/Y0/HGujVadNOCxfmJs=" }, "dom-serializer": { "version": "0.2.1", @@ -8989,7 +9009,7 @@ }, "intersperse": { "version": "1.0.0", - "resolved": "http://registry.npm.taobao.org/intersperse/download/intersperse-1.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/intersperse/download/intersperse-1.0.0.tgz", "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE=" }, "invariant": { @@ -9184,9 +9204,14 @@ "is-extglob": "^2.1.1" } }, + "is-mobile": { + "version": "2.2.2", + "resolved": "https://registry.npm.taobao.org/is-mobile/download/is-mobile-2.2.2.tgz?cache=0&sync_timestamp=1592980461945&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fis-mobile%2Fdownload%2Fis-mobile-2.2.2.tgz", + "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ=" + }, "is-negative-zero": { "version": "2.0.0", - "resolved": "http://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.0.tgz", + "resolved": "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.0.tgz", "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=" }, "is-number": { @@ -9340,9 +9365,9 @@ "dev": true }, "ismobilejs": { - "version": "0.5.2", - "resolved": "https://registry.npm.taobao.org/ismobilejs/download/ismobilejs-0.5.2.tgz?cache=0&sync_timestamp=1565500536297&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fismobilejs%2Fdownload%2Fismobilejs-0.5.2.tgz", - "integrity": "sha1-6Bus9hh8UyrYNINV9P7Nbmrf3OE=" + "version": "1.1.1", + "resolved": "https://registry.npm.taobao.org/ismobilejs/download/ismobilejs-1.1.1.tgz?cache=0&sync_timestamp=1586902809632&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fismobilejs%2Fdownload%2Fismobilejs-1.1.1.tgz", + "integrity": "sha1-xWygro5Sskyg8iul7zIVot27qg4=" }, "isobject": { "version": "3.0.1", @@ -11168,7 +11193,7 @@ }, "json2mq": { "version": "0.2.0", - "resolved": "http://registry.npm.taobao.org/json2mq/download/json2mq-0.2.0.tgz", + "resolved": "https://registry.npm.taobao.org/json2mq/download/json2mq-0.2.0.tgz", "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=", "requires": { "string-convert": "^0.2.0" @@ -12021,9 +12046,9 @@ "dev": true }, "mutationobserver-shim": { - "version": "0.3.3", - "resolved": "http://registry.npm.taobao.org/mutationobserver-shim/download/mutationobserver-shim-0.3.3.tgz", - "integrity": "sha1-ZYaWMLyJ17+MnNnLghiM2VWqzSs=" + "version": "0.3.7", + "resolved": "https://registry.npm.taobao.org/mutationobserver-shim/download/mutationobserver-shim-0.3.7.tgz?cache=0&sync_timestamp=1591727024563&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fmutationobserver-shim%2Fdownload%2Fmutationobserver-shim-0.3.7.tgz", + "integrity": "sha1-i/YzsMCwKRoRByVe0ywTCIqMW/M=" }, "mute-stream": { "version": "0.0.7", @@ -12077,6 +12102,11 @@ } } }, + "nanopop": { + "version": "1.3.0", + "resolved": "https://registry.npm.taobao.org/nanopop/download/nanopop-1.3.0.tgz", + "integrity": "sha1-gx3wGBafsKaZ1VqNcKLs2Cq+fQA=" + }, "natural-compare": { "version": "1.4.0", "resolved": "http://registry.npm.taobao.org/natural-compare/download/natural-compare-1.4.0.tgz", @@ -12135,7 +12165,7 @@ }, "node-emoji": { "version": "1.10.0", - "resolved": "https://registry.npm.taobao.org/node-emoji/download/node-emoji-1.10.0.tgz", + "resolved": "https://registry.npm.taobao.org/node-emoji/download/node-emoji-1.10.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fnode-emoji%2Fdownload%2Fnode-emoji-1.10.0.tgz", "integrity": "sha1-iIar0l2ce7YYAqZYUj0fjSqJsto=", "requires": { "lodash.toarray": "^4.4.0" @@ -14021,7 +14051,7 @@ }, "raf": { "version": "3.4.1", - "resolved": "http://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz", "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=", "requires": { "performance-now": "^2.1.0" @@ -14450,7 +14480,7 @@ }, "resize-observer-polyfill": { "version": "1.5.1", - "resolved": "http://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", + "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz", "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ=" }, "resolve": { @@ -14881,13 +14911,13 @@ } }, "shallow-equal": { - "version": "1.2.0", - "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fshallow-equal%2Fdownload%2Fshallow-equal-1.2.0.tgz", - "integrity": "sha1-/YKNICn/ThlWnbfhnlNelOLR9cw=" + "version": "1.2.1", + "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz?cache=0&sync_timestamp=1575627899561&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fshallow-equal%2Fdownload%2Fshallow-equal-1.2.1.tgz", + "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo=" }, "shallowequal": { "version": "1.1.0", - "resolved": "http://registry.npm.taobao.org/shallowequal/download/shallowequal-1.1.0.tgz", + "resolved": "https://registry.npm.taobao.org/shallowequal/download/shallowequal-1.1.0.tgz", "integrity": "sha1-GI1SHelbkIdAT9TctosT3wrk5/g=" }, "shebang-command": { @@ -15438,7 +15468,7 @@ }, "string-convert": { "version": "0.2.1", - "resolved": "http://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz", + "resolved": "https://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz", "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c=" }, "string-length": { @@ -16032,7 +16062,7 @@ }, "tinycolor2": { "version": "1.4.1", - "resolved": "http://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz", + "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.1.tgz", "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g=" }, "tmp": { @@ -16545,6 +16575,17 @@ "spdx-expression-parse": "^3.0.0" } }, + "vant": { + "version": "2.10.2", + "resolved": "https://registry.npm.taobao.org/vant/download/vant-2.10.2.tgz", + "integrity": "sha1-95LYWDMVyTL0pwBRwSKQS5xuUAI=", + "requires": { + "@babel/runtime": "7.x", + "@vant/icons": "1.2.5", + "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", + "vue-lazyload": "1.2.3" + } + }, "vary": { "version": "1.1.2", "resolved": "http://registry.npm.taobao.org/vary/download/vary-1.1.2.tgz", @@ -16737,6 +16778,11 @@ } } }, + "vue-lazyload": { + "version": "1.2.3", + "resolved": "https://registry.npm.taobao.org/vue-lazyload/download/vue-lazyload-1.2.3.tgz", + "integrity": "sha1-kB+ewVx+bKeHgaK65KNDaGve2yw=" + }, "vue-loader": { "version": "15.7.1", "resolved": "https://registry.npm.taobao.org/vue-loader/download/vue-loader-15.7.1.tgz?cache=0&sync_timestamp=1563435501637&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-loader%2Fdownload%2Fvue-loader-15.7.1.tgz", @@ -16802,9 +16848,9 @@ "integrity": "sha1-zz6UW/gMExehwyvFFtbP1N2o+P0=" }, "vue-ref": { - "version": "1.0.6", - "resolved": "http://registry.npm.taobao.org/vue-ref/download/vue-ref-1.0.6.tgz", - "integrity": "sha1-ubPX0OKQ7i/T1Q1de9rFIIBssmU=" + "version": "2.0.0", + "resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz", + "integrity": "sha1-SDCE1zKr7RHaeWd4qCZqOvDqGpw=" }, "vue-resize": { "version": "0.4.5", @@ -16939,9 +16985,9 @@ } }, "warning": { - "version": "3.0.0", - "resolved": "http://registry.npm.taobao.org/warning/download/warning-3.0.0.tgz", - "integrity": "sha1-MuU3fLVy3kqwR1O9+IIcAe1gW3w=", + "version": "4.0.3", + "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz", + "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=", "requires": { "loose-envify": "^1.0.0" } diff --git a/src/config/router.config.js b/src/config/router.config.js index ca9fa6e..4a56dbc 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -125,6 +125,14 @@ export const asyncRouterMap = [ meta: { title: '报销审批' } + }, + { + path: 'par-work-info', + name: 'parWorkInfo', + component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfo.vue'), + meta: { + title: '工作派发' + } } ] }, diff --git a/src/views/par/parworkinfo/ParWorkInfo.vue b/src/views/par/parworkinfo/ParWorkInfo.vue new file mode 100644 index 0000000..150e4cf --- /dev/null +++ b/src/views/par/parworkinfo/ParWorkInfo.vue @@ -0,0 +1,554 @@ + + + \ No newline at end of file diff --git a/vue.config.js b/vue.config.js index c0c3554..c3b7946 100644 --- a/vue.config.js +++ b/vue.config.js @@ -104,7 +104,8 @@ module.exports = { proxy: { '/api': { // target: 'http://192.168.1.55:8072', - target: 'http://192.168.1.205:8072', + // target: 'http://192.168.1.205:8072', + target: 'http://192.168.1.67:8072', // target: 'http://61.161.239.224:8072', // target: 'http://192.168.199.112:8072', // wandi ws: false, -- Gitee From cbcac913ae254af29ad744a82ec4f4cbeed317d7 Mon Sep 17 00:00:00 2001 From: zzq Date: Wed, 26 Aug 2020 13:34:21 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 2 +- src/views/par/parworkinfo/ParWorkInfoDept.vue | 543 ++++++++++++++++++ .../{ParWorkInfo.vue => ParWorkInfoUnit.vue} | 76 ++- src/views/par/parworkinfo/ParWorkInfoUser.vue | 532 +++++++++++++++++ src/views/par/parworkinfo/SignModal.vue | 159 +++++ 5 files changed, 1268 insertions(+), 44 deletions(-) create mode 100644 src/views/par/parworkinfo/ParWorkInfoDept.vue rename src/views/par/parworkinfo/{ParWorkInfo.vue => ParWorkInfoUnit.vue} (91%) create mode 100644 src/views/par/parworkinfo/ParWorkInfoUser.vue create mode 100644 src/views/par/parworkinfo/SignModal.vue diff --git a/src/config/router.config.js b/src/config/router.config.js index 9d26e25..832f641 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -129,7 +129,7 @@ export const asyncRouterMap = [ { path: 'par-work-info', name: 'parWorkInfo', - component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfo.vue'), + component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoUnit.vue'), meta: { title: '工作派发' } diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue new file mode 100644 index 0000000..705f66d --- /dev/null +++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue @@ -0,0 +1,543 @@ + + + \ No newline at end of file diff --git a/src/views/par/parworkinfo/ParWorkInfo.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue similarity index 91% rename from src/views/par/parworkinfo/ParWorkInfo.vue rename to src/views/par/parworkinfo/ParWorkInfoUnit.vue index 150e4cf..90c12e9 100644 --- a/src/views/par/parworkinfo/ParWorkInfo.vue +++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue @@ -43,7 +43,9 @@ 编辑 - 派发 + 派发 + + 打卡 @@ -57,8 +59,8 @@ > - - + + - - - - - - - @@ -237,6 +219,7 @@ + + \ No newline at end of file diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue new file mode 100644 index 0000000..3073c87 --- /dev/null +++ b/src/views/par/parworkinfo/SignModal.vue @@ -0,0 +1,159 @@ + + + -- Gitee From 7502559fa3fd82e1ffaa5599bda6136f6d7fd3a8 Mon Sep 17 00:00:00 2001 From: zzq Date: Mon, 31 Aug 2020 09:01:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E6=B4=BE=E5=8F=91?= =?UTF-8?q?=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/router.config.js | 22 +- src/views/par/parworkinfo/ParWorkInfoDept.vue | 449 ++++++++++++++---- .../par/parworkinfo/ParWorkInfoDetail.vue | 288 +++++++++++ src/views/par/parworkinfo/ParWorkInfoUnit.vue | 404 +++++++++++++--- src/views/par/parworkinfo/ParWorkInfoUser.vue | 288 +++++++---- src/views/par/parworkinfo/SignModal.vue | 144 ++---- 6 files changed, 1246 insertions(+), 349 deletions(-) create mode 100644 src/views/par/parworkinfo/ParWorkInfoDetail.vue diff --git a/src/config/router.config.js b/src/config/router.config.js index 832f641..6f02e68 100644 --- a/src/config/router.config.js +++ b/src/config/router.config.js @@ -127,11 +127,27 @@ export const asyncRouterMap = [ } }, { - path: 'par-work-info', - name: 'parWorkInfo', + path: 'par-work-info-unit', + name: 'parWorkInfoUnit', component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoUnit.vue'), meta: { - title: '工作派发' + title: '工作派发区级' + } + }, + { + path: 'par-work-info-dept', + name: 'parWorkInfoDept', + component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoDept.vue'), + meta: { + title: '工作派发部门级' + } + }, + { + path: 'par-work-info-user', + name: 'parWorkInfoUser', + component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoUser.vue'), + meta: { + title: '工作派发级' } }, { diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue index 705f66d..ad3970f 100644 --- a/src/views/par/parworkinfo/ParWorkInfoDept.vue +++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue @@ -3,7 +3,26 @@
- + + + + + + + + + @@ -21,6 +40,21 @@ @click="modelMethod('add',{})" v-action:add >新增 + + + 导入 + + + 下载模版 @@ -34,42 +68,57 @@ :columns="columns" :data="loadData" style="margin-top:10px" - :scroll="{ x: 150 }" + :scroll="{ x: 3500 }" > - 详情 - - 删除 - - 编辑 - - 派发 - - 打卡 + 详情 + + 删除 + + 编辑 + + 派发 + + 打卡 + {{gzlbEcho(text)}} + {{gzztEcho(text)}} + {{pfztEcho(text)}} + {{sfszqxgzEcho(text)}} + {{qdlxEcho(text)}} + {{zqEcho(text)}} - + - + 指令性工作 目标任务问题清单 个人工作备忘 + + + + + + + 问题类型 + 任务类型 + 工作类型 + + - + + + - - - - 是 - 否 - - - - + + + + 是 + 否 + + + + - - - - - - + + + + + + - + 不选视为永久有效 + - + + + + diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue index 90c12e9..411cdeb 100644 --- a/src/views/par/parworkinfo/ParWorkInfoUnit.vue +++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue @@ -3,7 +3,21 @@
- + + + + + + + + @@ -21,6 +35,21 @@ @click="modelMethod('add',{})" v-action:add >新增 + + + 导入 + + + 下载模版 @@ -34,32 +63,45 @@ :columns="columns" :data="loadData" style="margin-top:10px" - :scroll="{ x: 150 }" + :scroll="{ x: 3500 }" > - 详情 - - 删除 - - 编辑 - - 派发 - - 打卡 + 详情 + + 删除 + + 编辑 + + 派发 + {{gzlbEcho(text)}} + {{gzztEcho(text)}} + {{pfztEcho(text)}} + {{sfszqxgzEcho(text)}} + {{qdlxEcho(text)}} + {{zqEcho(text)}} - + - + 指令性工作 目标任务问题清单 个人工作备忘 @@ -81,12 +128,27 @@ + + + + 问题类型 + 任务类型 + 工作类型 + + + + - + - - - - 是 - 否 - - - - + + + + 是 + 否 + + + + - - - - - - + + + + + + - + 不选视为永久有效 + - + + + \ No newline at end of file diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue index ad3970f..0e599b8 100644 --- a/src/views/par/parworkinfo/ParWorkInfoDept.vue +++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue @@ -1,303 +1,320 @@ + \ No newline at end of file -- Gitee From 8fbfc824eb585266c6605c495fd7a275ed5f1d2f Mon Sep 17 00:00:00 2001 From: zzq Date: Tue, 1 Sep 2020 09:00:06 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/par/examperiod/ExamPeriod.vue | 160 ++--- src/views/par/parworkinfo/ParWorkInfoDept.vue | 608 +++++++++--------- .../par/parworkinfo/ParWorkInfoDetail.vue | 191 +++--- src/views/par/parworkinfo/ParWorkInfoUnit.vue | 586 ++++++++--------- src/views/par/parworkinfo/ParWorkInfoUser.vue | 480 +++++++------- src/views/par/parworkinfo/SignModal.vue | 54 +- .../statisticalreport/StatisticalReport.vue | 106 +-- 7 files changed, 1090 insertions(+), 1095 deletions(-) diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue index c68a4c8..bbaaafd 100644 --- a/src/views/par/examperiod/ExamPeriod.vue +++ b/src/views/par/examperiod/ExamPeriod.vue @@ -83,14 +83,14 @@ \ No newline at end of file + diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue index 0e599b8..c37def3 100644 --- a/src/views/par/parworkinfo/ParWorkInfoDept.vue +++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue @@ -9,13 +9,13 @@ 详情 - + 删除 - + 编辑 - - 派发 - - 打卡 + + 派发 + + 打卡 - {{gzlbEcho(text)}} - {{gzztEcho(text)}} - {{pfztEcho(text)}} - {{sfszqxgzEcho(text)}} - {{qdlxEcho(text)}} - {{zqEcho(text)}} + {{ gzlbEcho(text) }} + {{ gzztEcho(text) }} + {{ pfztEcho(text) }} + {{ sfszqxgzEcho(text) }} + {{ qdlxEcho(text) }} + {{ zqEcho(text) }} 目标任务问题清单 个人工作备忘 - + @@ -164,12 +164,12 @@ 任务类型 工作类型 - + @@ -178,7 +178,7 @@ :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}" label="工作内容" > - + - + - + - + 不选视为永久有效 - + - + - + \ No newline at end of file + diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue index 9bfcb66..d4e4a84 100644 --- a/src/views/par/parworkinfo/ParWorkInfoDetail.vue +++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue @@ -15,25 +15,25 @@ :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行人/单位" - >{{selectInfo.zxrstr}} + >{{ selectInfo.zxrstr }} {{ gzlbEcho(selectInfo.gzlb)}} + >{{ gzlbEcho(selectInfo.gzlb) }} {{qdlxEcho(selectInfo.qdlx)}} + >{{ qdlxEcho(selectInfo.qdlx) }} @@ -41,7 +41,7 @@ :labelCol="{xs: { span: 12 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}" label="工作内容" - >{{selectInfo.gznr}} + >{{ selectInfo.gznr }} @@ -50,14 +50,14 @@ :labelCol="{xs: { span: 12 },sm: { span: 8 }}" :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}" label="周期性工作" - >{{sfszqxgzEcho(selectInfo.sfszqxgz)}} + >{{ sfszqxgzEcho(selectInfo.sfszqxgz) }} {{zqEcho(selectInfo.zq)}} + >{{ zqEcho(selectInfo.zq) }} @@ -66,38 +66,38 @@ :labelCol="{xs: { span: 12 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}" label="自定义周期" - >{{selectInfo.zdyzq}} + >{{ selectInfo.zdyzq }} {{selectInfo.kssj}} + >{{ selectInfo.kssj }} {{selectInfo.jzsj}} + >{{ selectInfo.jzsj }} {{selectInfo.zrdw}} + >{{ selectInfo.zrdw }} - {{selectInfo.zrr}} + {{ selectInfo.zrr }} {{selectInfo.zlyq}} + >{{ selectInfo.zlyq }} 打卡记录 @@ -109,8 +109,8 @@ --> - {{text}} - {{text}} + {{ text }} + {{ text }} @@ -121,16 +121,15 @@ \ No newline at end of file + diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue index 9a6b65e..cb138ed 100644 --- a/src/views/par/parworkinfo/ParWorkInfoUser.vue +++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue @@ -54,23 +54,23 @@ > 详情 - - 删除 - - 编辑 + + 删除 + + 编辑 打卡 - {{gzlbEcho(text)}} - {{gzztEcho(text)}} - {{pfztEcho(text)}} - {{sfszqxgzEcho(text)}} - {{qdlxEcho(text)}} - {{zqEcho(text)}} + {{ gzlbEcho(text) }} + {{ gzztEcho(text) }} + {{ pfztEcho(text) }} + {{ sfszqxgzEcho(text) }} + {{ qdlxEcho(text) }} + {{ zqEcho(text) }} 目标任务问题清单 个人工作备忘 - + @@ -102,12 +102,12 @@ 任务类型 工作类型 - + @@ -116,7 +116,7 @@ :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}" label="工作内容" > - + - + - + - + - + - + - + \ No newline at end of file + diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue index 259aac6..0eb5b65 100644 --- a/src/views/par/parworkinfo/SignModal.vue +++ b/src/views/par/parworkinfo/SignModal.vue @@ -15,7 +15,7 @@ :labelCol="{xs: { span: 12 },sm: { span: 4 }}" :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}" label="打卡时间" - >{{selectInfo.dksj}} + >{{ selectInfo.dksj }} \ No newline at end of file + -- Gitee