diff --git a/package-lock.json b/package-lock.json
index 563f6c5be057d5a167fc6f4efc2f33c211e5ad93..1bdda5adde3b46391926aa76554e979fccbf1dd6 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 aa9e0e0184626af3165ecd923d9c26e6a04f2484..d323b096f007750b00985bbfdc76faf6cacdfbba 100644
--- a/src/config/router.config.js
+++ b/src/config/router.config.js
@@ -126,6 +126,46 @@ export const asyncRouterMap = [
               title: '报销审批'
             }
           },
+          {
+            path: 'par-work-info-unit',
+            name: 'parWorkInfoUnit',
+            component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/parworkinfo/ParWorkInfoUnit.vue'),
+            meta: {
+              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: '工作派发级'
+            }
+          },
+          {
+            path: 'par-exam-period',
+            name: 'parExamPeriod',
+            component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/par/examperiod/ExamPeriod.vue'),
+            meta: {
+              title: '考评周期管理'
+            }
+          },
+          {
+            path: 'statistical-report',
+            name: 'statisticalReport',
+            component: () => import(/* webpackChunkName: "ribsApprove" */ '@/views/statisticalreport/StatisticalReport.vue'),
+            meta: {
+              title: '目标绩效管理考评综合评定评分表'
+            }
+          },
           {
             path: 'par-basic-data',
             name: 'ParBasicData',
diff --git a/src/views/par/examperiod/ExamPeriod.vue b/src/views/par/examperiod/ExamPeriod.vue
new file mode 100644
index 0000000000000000000000000000000000000000..bbaaafd36e15528028dfb0a8ebe9d1d760d9dbc1
--- /dev/null
+++ b/src/views/par/examperiod/ExamPeriod.vue
@@ -0,0 +1,274 @@
+<template>
+  <a-card style="margin-top:-2px" :bordered="false">
+    <div class>
+      <a-form>
+        <!--查询条件 start-->
+        <a-row class="form-row">
+          <a-col :span="6" :offset="1">
+            <a-form-item label="考评周期名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input style="width:210px" v-model="queryParam.kpzqmc" />
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--查询条件 end-->
+        <!--操作按钮 start -->
+        <a-row :gutter="24" algin="center" style="margin-top:10px">
+          <a-col :md="12">
+            <span style="float:right" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="search">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+          <a-col :md="11">
+            <span class="table-page-search-submitButtons">
+              <a-button
+                type="primary"
+                style="margin-left: 8px;float:right"
+                @click="modelMethod('add',{})"
+                v-action:add
+              >新增</a-button>
+            </span>
+          </a-col>
+        </a-row>
+        <!--操作按钮 end -->
+      </a-form>
+    </div>
+    <s-table
+      class="text-overflow"
+      ref="stable"
+      size="default"
+      :columns="columns"
+      :data="loadData"
+      style="margin-top:10px"
+      :scroll="{ x: 150 }"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a @click="modelMethod('detile',record)">详情</a>
+        <a-divider type="vertical" />
+        <a @click="modelMethod('del',record)" v-action:delete>删除</a>
+        <a-divider type="vertical" />
+        <a @click="modelMethod('edit',record)" v-action:update>编辑</a>
+      </span>
+    </s-table>
+    <!-- 弹出框 -->
+    <a-modal
+      :title="operate=='detile'?'详情':operate=='edit'?'编辑':'新增'"
+      :width="900"
+      v-model="modelVisible"
+      @ok="handleOk"
+      :destroyOnClose="true"
+      :confirmLoading="confirmLoading"
+      centered
+    >
+      <a-form :form="form">
+        <a-row class="form-row">
+          <a-col :span="10" :offset="1">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="考评周期名称">
+              <a-input v-model="selectInfo.kpzqmc" :disabled="operate=='detile'?'disabled':false" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="20" :offset="1" style="padding-top:5px;">
+            <a-form-item :labelCol="{span:4}" :wrapperCol="{span:20}" label="备注">
+              <!-- <a-input v-model="selectInfo.bz" :disabled="operate=='detile'?'disabled':false" /> -->
+              <a-textarea
+                v-model="selectInfo.bz"
+                placeholder="请输入备注"
+                :auto-size="{ minRows: 3, maxRows: 5 }"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-modal>
+  </a-card>
+</template>
+<script>
+import { STable } from '@/components'
+import { query, method, download } from '@/api/admin'
+
+export default {
+  components: {
+    STable
+  },
+  data () {
+    return {
+      visible: false,
+      form: this.$form.createForm(this),
+      // 查询参数
+      queryParam: {},
+
+      inAdd: false,
+      inEdit: false,
+      inDetail: false,
+
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return query('/par/examperiod' + '/queryPage', 'GET', parameter).then(
+          res => {
+            return res.result
+          }
+        )
+      },
+      // 表头
+      columns: [
+        {
+          title: '考评周期名称',
+          dataIndex: 'kpzqmc'
+        },
+        {
+          title: '备注',
+          dataIndex: 'bz'
+        },
+        {
+          title: '操作',
+          width: '150px',
+          dataIndex: 'action',
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      modelVisible: false, // 弹出框显示
+      operate: 'query', // 当前操作
+      selectInfo: {}, // 选中的数据
+      confirmLoading: false, // Loading
+      url: '/par/examperiod', // ajax请求地址
+      loading: false
+    }
+  },
+  created () {},
+  methods: {
+    /**
+     * 搜索
+     */
+    search () {
+      this.$refs.stable.loadData({}, this.queryParam, {})
+    },
+
+    // 操作按钮
+    modelMethod (action, selectInfo) {
+      this.operate = action // 记录当前操作
+      this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
+      const _this = this
+      if (this.operate === 'del') {
+        // 删除
+        this.$confirm({
+          title: '警告',
+          content: `确认要删除该条记录吗?`,
+          okText: '确认',
+          okType: 'danger',
+          cancelText: '取消',
+          onOk () {
+            _this.actionParam = {
+              // 请求参数
+              url: _this.url + '/delete',
+              action: 'DELETE',
+              parameter: {},
+              data: _this.selectInfo,
+              message: '删除成功'
+            }
+            // 调用请求
+            method(_this.actionParam).then(res => {
+              _this.$refs.stable.refresh(true) // 刷新列表
+            })
+          },
+          onCancel: () => {
+            this.$notification['info']({
+              message: '取消删除操作',
+              duration: 4
+            })
+          }
+        })
+      } else {
+        this.modelVisible = true // 弹出框显示
+      }
+    },
+    // 确认
+    handleOk () {
+      this.confirmLoading = true
+      if (this.operate === 'detile') {
+        // 详情
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+      }
+      if (this.operate === 'add') {
+        // 新增
+        this.actionParam = {
+          url: '/par/examperiod/insert',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '新增成功'
+        }
+      }
+      if (this.operate === 'edit') {
+        // 修改
+        this.actionParam = {
+          url: '/par/examperiod/update',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '修改成功'
+        }
+      }
+      // 调用请求
+      return method(this.actionParam).then(res => {
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+        // 刷新列表
+        this.$refs.stable.refresh(true)
+      })
+    },
+    exportExcel () {
+      this.loading = true
+      this.actionParam = {
+        // 请求参数
+        url: this.url + '/export',
+        parameter: this.queryParam,
+        action: 'GET',
+        data: {}
+      }
+      return this.downloadFile(this.actionParam).then(res => {
+        download(res)
+        this.loading = false
+      })
+    },
+    /**
+     * 下载
+     */
+    downloadFile (data) {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(
+        new Blob([data], { type: 'application/vnd.ms-excel' })
+      )
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      // 获取文件名
+      // download 属性定义了下载链接的地址而不是跳转路径
+      link.setAttribute('download', '测试代码生成.xlsx')
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/par/parworkinfo/ParWorkInfoDept.vue b/src/views/par/parworkinfo/ParWorkInfoDept.vue
new file mode 100644
index 0000000000000000000000000000000000000000..c37def35c447f2fc41bbf311459240cffaa734f1
--- /dev/null
+++ b/src/views/par/parworkinfo/ParWorkInfoDept.vue
@@ -0,0 +1,834 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-card style="margin-top:-2px" :bordered="false">
+      <div class>
+        <a-form>
+          <!--查询条件 start-->
+          <a-row class="form-row">
+            <a-col :span="6" :offset="1">
+              <a-form-item label="执行人" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-tree-select
+                  v-model="queryParam.zxr"
+                  style="width:100%"
+                  :dropdown-style="{maxHeight:'400px',overflow:'auto'}"
+                  placeholder="请选择执行人"
+                  allow-clear
+                >
+                  <a-tree-select-node
+                    v-for="staff in staffList"
+                    :key="staff.id"
+                    :value="staff.id"
+                    :title="staff.name"
+                  ></a-tree-select-node>
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" :offset="1">
+              <a-form-item label="工作类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-select
+                  v-model="queryParam.gzlb"
+                  style="width: 100%;"
+                  placeholder="请选择工作类别"
+                  @change="gzlbChange"
+                  :allowClear="true"
+                >
+                  <a-select-option value="1">指令性工作</a-select-option>
+                  <a-select-option value="2">目标任务问题清单</a-select-option>
+                  <a-select-option value="3">个人工作备忘</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <!--查询条件 end-->
+          <!--操作按钮 start -->
+          <a-row :gutter="24" algin="center" style="margin-top:10px">
+            <a-col :md="12">
+              <span style="float:right" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="search">查询</a-button>
+                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+              </span>
+            </a-col>
+            <a-col :md="11">
+              <span class="table-page-search-submitButtons">
+                <a-button
+                  type="primary"
+                  style="margin-left: 8px;float:right"
+                  @click="modelMethod('add',{})"
+                  v-action:add
+                >新增</a-button>
+                <a-upload
+                  :fileList="fileList"
+                  :showUploadList="false"
+                  style="float:right;margin-left:8px;"
+                  :before-upload="beforeUpload"
+                >
+                  <a-button type="primary">
+                    <a-icon type="upload" />导入
+                  </a-button>
+                </a-upload>
+                <a-button
+                  type="primary"
+                  style="margin-left: 8px;float:right"
+                  @click="exportExcel()"
+                >下载模版</a-button>
+              </span>
+            </a-col>
+          </a-row>
+          <!--操作按钮 end -->
+        </a-form>
+      </div>
+      <s-table
+        class="text-overflow"
+        ref="stable"
+        size="default"
+        :columns="columns"
+        :data="loadData"
+        style="margin-top:10px"
+        :scroll="{ x: 3500 }"
+      >
+        <span slot="action" slot-scope="text, record">
+          <a @click="detail(record)">详情</a>
+          <a-divider type="vertical" v-if="record.crtUser===userInfo.id&&record.pfzt==='0'" />
+          <a
+            @click="modelMethod('del',record)"
+            v-action:delete
+            v-if="record.crtUser===userInfo.id&&record.pfzt==='0'"
+          >删除</a>
+          <a-divider type="vertical" v-if="record.crtUser===userInfo.id&&record.pfzt==='0'" />
+          <a
+            @click="modelMethod('edit',record)"
+            v-action:update
+            v-if="record.crtUser===userInfo.id&&record.pfzt==='0'"
+          >编辑</a>
+          <a-divider type="vertical" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id" />
+          <a @click="hangOut(record)" v-if="record.pfzt==='0'&&record.crtUser===userInfo.id">派发</a>
+          <a-divider type="vertical" v-if="record.zxr===userInfo.id&&record.pfzt==='1'" />
+          <a @click="sign(record)" v-if="record.zxr===userInfo.id&&record.pfzt==='1'">打卡</a>
+        </span>
+        <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
+        <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
+        <span slot="pfzt" slot-scope="text">{{ pfztEcho(text) }}</span>
+        <span slot="sfszqxgz" slot-scope="text">{{ sfszqxgzEcho(text) }}</span>
+        <span slot="qdlx" slot-scope="text">{{ qdlxEcho(text) }}</span>
+        <span slot="zq" slot-scope="text">{{ zqEcho(text) }}</span>
+      </s-table>
+      <!-- 弹出框 -->
+      <a-modal
+        :title="operate==='detile'?'详情':operate==='edit'?'编辑':'新增'"
+        width="60%"
+        v-model="modelVisible"
+        @ok="handleOk"
+        :destroyOnClose="true"
+        :confirmLoading="confirmLoading"
+        centered
+      >
+        <a-form :form="form">
+          <a-row class="form-row" type="flex">
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行人">
+                <a-tree-select
+                  v-model="selectInfo.zxr"
+                  style="width:100%"
+                  :dropdown-style="{maxHeight:'400px',overflow:'auto'}"
+                  placeholder="请选择执行人"
+                  allow-clear
+                >
+                  <a-tree-select-node
+                    v-for="staff in staffList"
+                    :key="staff.id"
+                    :value="staff.id"
+                    :title="staff.name"
+                  ></a-tree-select-node>
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+                <a-select
+                  v-model="selectInfo.gzlb"
+                  style="width: 100%;"
+                  placeholder="请选择工作类别"
+                  @change="gzlbChange"
+                >
+                  <a-select-option value="1">指令性工作</a-select-option>
+                  <a-select-option value="2">目标任务问题清单</a-select-option>
+                  <a-select-option value="3">个人工作备忘</a-select-option>
+                </a-select>
+                <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+              </a-form-item>
+            </a-col>
+            <a-col :span="10" :offset="1" v-if="qdShow" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+                <a-select v-model="selectInfo.qdlx" style="width: 100%;" placeholder="请选择清单类型">
+                  <a-select-option value="1">问题类型</a-select-option>
+                  <a-select-option value="2">任务类型</a-select-option>
+                  <a-select-option value="3">工作类型</a-select-option>
+                </a-select>
+                <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :span="10" :offset="1">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-input v-model="selectInfo.qdlx" :disabled="operate==='detile'?'disabled':false" />
+            </a-form-item>
+            </a-col>-->
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="工作内容"
+              >
+                <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-textarea
+                  v-model="selectInfo.gznr"
+                  placeholder="请输入工作内容"
+                  :auto-size="{ minRows: 3, maxRows: 5 }"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-row>
+                <a-col :span="12">
+                  <a-form-item
+                    :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                    :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                    label="周期性工作"
+                  >
+                    <a-radio-group
+                      v-model="selectInfo.sfszqxgz"
+                      default-value="2"
+                      @change="zqxChange"
+                    >
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="2">否</a-radio>
+                    </a-radio-group>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12" v-if="zqShow">
+                  <a-form-item
+                    :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                    :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                    label="周期"
+                  >
+                    <a-select
+                      style="width: 100%"
+                      v-model="selectInfo.zq"
+                      placeholder="请输入选择周期"
+                      @change="onZqChange"
+                    >
+                      <a-select-option value="1">年</a-select-option>
+                      <a-select-option value="2">季度</a-select-option>
+                      <a-select-option value="3">月</a-select-option>
+                      <a-select-option value="4">周</a-select-option>
+                      <a-select-option value="5">日</a-select-option>
+                      <a-select-option value="6">自定义</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="zdyzqShow">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="自定义周期"
+              >
+                <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+                <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-date-picker
+                  v-model="selectInfo.kssj"
+                  placeholder="请选择开始时间"
+                  style="width:100%;"
+                  @change="startChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+                <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-date-picker
+                  v-model="selectInfo.jzsj"
+                  placeholder="请选择截止时间"
+                  style="width:100%;"
+                  @change="endChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="3" style="color:red;padding-left:3px;padding-top:6px;">不选视为永久有效</a-col>
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+                <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-tree-select
+                  v-model="selectInfo.zrdwList"
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择责任单位"
+                  allow-clear
+                  multiple
+                  :tree-data="orgTree"
+                ></a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+                <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-tree-select
+                  v-model="selectInfo.zrrList"
+                  show-search
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择责任人"
+                  allow-clear
+                  multiple
+                >
+                  <a-tree-select-node
+                    v-for="staff in staffList"
+                    :key="staff.id"
+                    :value="staff.id"
+                    :title="staff.name"
+                  ></a-tree-select-node>
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="质量要求"
+              >
+                <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-textarea
+                  v-model="selectInfo.zlyq"
+                  placeholder="请输入质量要求"
+                  :auto-size="{ minRows: 3, maxRows: 5 }"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-modal>
+      <sign-modal ref="signModalRef"></sign-modal>
+      <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
+    </a-card>
+  </a-spin>
+</template>
+<script>
+import { STable } from '@/components'
+import { query, method, getOrgTree, download } from '@/api/admin'
+import { mapGetters } from 'vuex'
+
+import SignModal from './SignModal'
+import moment from 'moment'
+import ParWorkInfoDetail from './ParWorkInfoDetail'
+
+export default {
+  components: {
+    STable,
+    getOrgTree,
+    SignModal,
+    ParWorkInfoDetail
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      visible: false,
+      form: this.$form.createForm(this),
+      // 查询参数
+      queryParam: {},
+      inAdd: false,
+      inEdit: false,
+      inDetail: false,
+      zqShow: false,
+      zdyzqShow: false,
+      zqSpan: 20,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return query(
+          '/par/parworkinfo' + '/listQueryByOrgId',
+          'GET',
+          parameter
+        ).then(res => {
+          console.log('列表结果', res.result)
+          return res.result
+        })
+      },
+      // 表头
+      columns: [
+        {
+          title: '执行人/单位',
+          dataIndex: 'zxrstr'
+        },
+        {
+          title: '工作类别',
+          dataIndex: 'gzlb',
+          scopedSlots: { customRender: 'gzlb' }
+        },
+        {
+          title: '清单类型',
+          dataIndex: 'qdlx',
+          scopedSlots: { customRender: 'qdlx' }
+        },
+        {
+          title: '工作内容',
+          dataIndex: 'gznr'
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'kssj'
+        },
+        {
+          title: '截止时间',
+          dataIndex: 'jzsj'
+        },
+        // {
+        //   title: "完成时间",
+        //   dataIndex: "wcsj"
+        // },
+        {
+          title: '工作状态',
+          dataIndex: 'gzzt',
+          scopedSlots: { customRender: 'gzzt' }
+        },
+        {
+          title: '派发状态',
+          dataIndex: 'pfzt',
+          scopedSlots: { customRender: 'pfzt' }
+        },
+        {
+          title: '责任单位',
+          dataIndex: 'zrdw'
+        },
+        {
+          title: '质量要求',
+          dataIndex: 'zlyq'
+        },
+        // {
+        //   title: "备注",
+        //   dataIndex: "bz"
+        // },
+        // {
+        //   title: "工作说明",
+        //   dataIndex: "gzsm"
+        // },
+        // {
+        //   title: "延期原因",
+        //   dataIndex: "yqyy"
+        // },
+        {
+          title: '是否是周期性工作',
+          dataIndex: 'sfszqxgz',
+          scopedSlots: { customRender: 'sfszqxgz' }
+        },
+        {
+          title: '周期',
+          dataIndex: 'zq',
+          scopedSlots: { customRender: 'zq' }
+        },
+        {
+          title: '自定义周期',
+          dataIndex: 'zdyzq'
+        },
+        {
+          title: '责任人',
+          dataIndex: 'zrr'
+        },
+        {
+          title: '操作',
+          width: '150px',
+          dataIndex: 'action',
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      modelVisible: false, // 弹出框显示
+      operate: 'query', // 当前操作
+      selectInfo: {}, // 选中的数据
+      confirmLoading: false, // Loading
+      url: '/par/parworkinfo', // ajax请求地址
+      loading: false,
+      orgTree: [],
+      staffList: [],
+      currentRole: 'unitRole',
+      qdShow: false,
+      fileList: []
+    }
+  },
+  created () {
+    this.selectInfo.sfszqxgz = '2'
+    const vm = this
+    // 获取树形组织信息
+    getOrgTree({ parentTreeId: 'root' }).then(res => {
+      console.log('1111111111122222222222222')
+      console.log('组织机构查询', res)
+      vm.orgTree = vm.genernateTree(res.result.data)
+    })
+    // 获取当前登陆人部门
+    query('/par/parworkinfo' + '/getOrgInfoByStaffId', 'GET', {
+      id: vm.userInfo.id
+    }).then(resDept => {
+      console.log('人员部门查询', resDept)
+      const deptId = resDept.result.id
+      // 获取当前部门下人员
+      query('/par/parworkinfo' + '/getStaffInfoByOrgId', 'GET', {
+        id: deptId
+      }).then(res => {
+        console.log('人员查询', res)
+        vm.staffList = res.result
+        console.log('人员选择集合', vm.staffList)
+      })
+    })
+    console.log('当前登录用户', this.userInfo)
+  },
+  methods: {
+    // 周期回显
+    zqEcho (text) {
+      if (text === '1') {
+        return '年'
+      } else if (text === '2') {
+        return '季度'
+      } else if (text === '3') {
+        return '月'
+      } else if (text === '4') {
+        return '周'
+      } else if (text === '5') {
+        return '日'
+      } else if (text === '6') {
+        return '自定义'
+      }
+    },
+    beforeUpload (file) {
+      const vm = this
+      this.confirmLoading = true
+      this.fileList = [...this.fileList, file]
+      console.log('文件', this.fileList)
+      const formData = new FormData()
+      this.fileList.forEach(file => {
+        formData.append('file', file)
+      })
+      const actionParam = {
+        // 请求参数
+        url: '/par/parworkinfo/importFile',
+        action: 'POST',
+        parameter: {},
+        data: formData,
+        message: '导入成功'
+      }
+      // 调用请求
+      method(actionParam).then(res => {
+        vm.$refs.stable.refresh(true) // 刷新列表
+        this.confirmLoading = false
+      })
+      return false
+    },
+    // 详情
+    detail (record) {
+      console.log('详情', record)
+      this.$refs.parWorkInfoDetailRef.open(record)
+    },
+    // 下载
+    exportExcel () {
+      this.actionParam = {
+        url: '/par/parworkinfo/export',
+        action: 'get',
+        parameter: this.queryParam,
+        data: {}
+      }
+      return download(this.actionParam).then(res => {
+        this.download(res)
+        this.loaidng = false
+      })
+    },
+    /**
+     * 下载
+     */
+    download (data) {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(
+        new Blob([data], { type: 'application/vnd.ms-excel' })
+      )
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      // 获取文件名
+      // download 属性定义了下载链接的地址而不是跳转路径
+      link.setAttribute('download', '工作模版.xlsx')
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    },
+    // 工作类别回显
+    gzlbEcho (text) {
+      if (text === '1') {
+        return '指令性工作'
+      } else if (text === '2') {
+        return '目标任务问题清单'
+      } else if (text === '3') {
+        return '个人工作备忘'
+      }
+    },
+    // 工作状态回显
+    gzztEcho (text) {
+      if (text === '1') {
+        return '已完成'
+      } else if (text === '0') {
+        return '未完成'
+      }
+    },
+    // 派发状态回显
+    pfztEcho (text) {
+      if (text === '1') {
+        return '已派发'
+      } else if (text === '0') {
+        return '未派发'
+      }
+    },
+    // 是否周期性工作回显
+    sfszqxgzEcho (text) {
+      if (text === '1') {
+        return '是'
+      } else if (text === '2') {
+        return '否'
+      }
+    },
+    // 清单类型回显
+    qdlxEcho (text) {
+      if (text === '1') {
+        return '问题清单'
+      } else if (text === '2') {
+        return '任务清单'
+      } else if (text === '3') {
+        return '工作清单'
+      }
+    },
+    // 工作类别改变
+    gzlbChange (val, e) {
+      if (val === '2') {
+        this.qdShow = true
+      } else {
+        this.qdShow = false
+      }
+    },
+    // 打卡
+    sign (record) {
+      console.log('打卡', record)
+      this.$refs.signModalRef.open(record)
+    },
+    // 派发
+    hangOut (record) {
+      const vm = this
+      console.log('派发', record)
+      this.$confirm({
+        title: '提示',
+        content: `确认要派发该条记录吗?`,
+        okText: '确认',
+        okType: 'warn',
+        cancelText: '取消',
+        onOk () {
+          vm.actionParam = {
+            // 请求参数
+            url: vm.url + '/updateDistributeStatus',
+            action: 'POST',
+            parameter: record,
+            data: record,
+            message: '派发成功'
+          }
+          // 调用请求
+          method(vm.actionParam).then(res => {
+            vm.$refs.stable.refresh(true) // 刷新列表
+          })
+        },
+        onCancel: () => {
+          vm.$notification['info']({
+            message: '取消删除操作',
+            duration: 4
+          })
+        }
+      })
+    },
+    // 开始时间变化
+    startChange (date, str) {
+      console.log('开始时间', date, str)
+      this.selectInfo.kssjstr = str
+    },
+    // 截止时间变化
+    endChange (date, str) {
+      console.log('截止时间', date, str)
+      this.selectInfo.jzsjstr = str
+    },
+    /**
+     * 处理后台返回值
+     */
+    genernateTree (value) {
+      value.forEach(item => {
+        item.value = item.id
+        if (item.children && item.children.length) {
+          this.genernateTree(item.children)
+        }
+      })
+      return value
+    },
+    zqxChange (e) {
+      console.log('是否周期性变化', e)
+      const val = e.target.value
+      if (val === '1') {
+        this.zqShow = true
+      } else {
+        this.zqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    onZqChange (value, e) {
+      console.log('是否自定义周期', value)
+      if (value === '6') {
+        this.zdyzqShow = true
+      } else {
+        this.zdyzqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    /**
+     * 搜索
+     */
+    search () {
+      this.$refs.stable.loadData({}, this.queryParam, {})
+    },
+
+    // 操作按钮
+    modelMethod (action, selectInfo) {
+      this.zqShow = false
+      this.zdyzqShow = false
+      this.qdShow = false
+      console.log('点击操作', action, selectInfo)
+      this.operate = action // 记录当前操作
+      this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
+      this.selectInfo.sfszqxgz = '2'
+      const dateFormat = 'YYYY-MM-DD'
+      if (this.selectInfo.kssj) {
+        this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
+      }
+      if (this.selectInfo.jzsj) {
+        this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
+      }
+      console.log('日期处理', this.selectInfo)
+      if (action === 'edit') {
+        const sfszqxgz = this.selectInfo.sfszqxgz
+          ? this.selectInfo.sfszqxgz
+          : '2'
+        this.selectInfo.sfszqxgz = sfszqxgz
+        if (sfszqxgz === '1') {
+          this.zqShow = true
+        } else {
+          this.zqShow = false
+        }
+        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
+        if (zdyzq === '6') {
+          this.zdyzqShow = true
+        } else {
+          this.zdyzqShow = false
+        }
+        const gzlb = this.selectInfo.gzlb ? this.selectInfo.gzlb : ''
+        if (gzlb === '2') {
+          this.qdShow = true
+        } else {
+          this.qdShow = false
+        }
+      }
+      const _this = this
+      if (this.operate === 'del') {
+        // 删除
+        this.$confirm({
+          title: '警告',
+          content: `确认要删除该条记录吗?`,
+          okText: '确认',
+          okType: 'danger',
+          cancelText: '取消',
+          onOk () {
+            _this.actionParam = {
+              // 请求参数
+              url: _this.url + '/' + _this.selectInfo.id,
+              action: 'delete',
+              parameter: {},
+              data: {},
+              message: '删除成功'
+            }
+            // 调用请求
+            method(_this.actionParam).then(res => {
+              _this.$refs.stable.refresh(true) // 刷新列表
+            })
+          },
+          onCancel: () => {
+            this.$notification['info']({
+              message: '取消删除操作',
+              duration: 4
+            })
+          }
+        })
+      } else {
+        this.modelVisible = true // 弹出框显示
+      }
+    },
+    // 确认
+    handleOk () {
+      this.confirmLoading = true
+      this.selectInfo.zxrlb = '2'
+      if (this.operate === 'detile') {
+        // 详情
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+      }
+      if (this.operate === 'add') {
+        // 新增
+        this.actionParam = {
+          url: '/par/parworkinfo/insert',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '新增成功'
+        }
+      }
+      if (this.operate === 'edit') {
+        // 修改
+        this.actionParam = {
+          url: '/par/parworkinfo/update',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '修改成功'
+        }
+      }
+      // 调用请求
+      return method(this.actionParam).then(res => {
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+        // 刷新列表
+        this.$refs.stable.refresh(true)
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/par/parworkinfo/ParWorkInfoDetail.vue b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
new file mode 100644
index 0000000000000000000000000000000000000000..d4e4a8461d8f19d71d92c206d4d2c5c50bc3dba5
--- /dev/null
+++ b/src/views/par/parworkinfo/ParWorkInfoDetail.vue
@@ -0,0 +1,285 @@
+<template>
+  <a-modal
+    title="详情"
+    :width="900"
+    v-model="modelVisible"
+    :destroyOnClose="true"
+    :confirmLoading="confirmLoading"
+    centered
+    :footer="null"
+  >
+    <a-form :form="form">
+      <a-row class="form-row" type="flex">
+        <a-col :span="10" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="执行人/单位"
+          >{{ selectInfo.zxrstr }}</a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="工作类别"
+          >{{ gzlbEcho(selectInfo.gzlb) }}</a-form-item>
+        </a-col>
+        <a-col :span="10" :offset="1" v-if="qdShow" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="清单类型"
+          >{{ qdlxEcho(selectInfo.qdlx) }}</a-form-item>
+        </a-col>
+        <!-- <a-col :span="10" :offset="1">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-input v-model="selectInfo.qdlx" :disabled="operate==='detile'?'disabled':false" />
+            </a-form-item>
+        </a-col>-->
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="工作内容"
+          >{{ selectInfo.gznr }}</a-form-item>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-row>
+            <a-col :span="12">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                label="周期性工作"
+              >{{ sfszqxgzEcho(selectInfo.sfszqxgz) }}</a-form-item>
+            </a-col>
+            <a-col :span="12" v-if="zqShow">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                label="周期"
+              >{{ zqEcho(selectInfo.zq) }}</a-form-item>
+            </a-col>
+          </a-row>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="zdyzqShow">
+          <a-form-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="自定义周期"
+          >{{ selectInfo.zdyzq }}</a-form-item>
+        </a-col>
+        <a-col :span="10" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="开始时间"
+          >{{ selectInfo.kssj }}</a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="截止时间"
+          >{{ selectInfo.jzsj }}</a-form-item>
+        </a-col>
+        <a-col :span="10" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="labelCol"
+            :wrapperCol="wrapperCol"
+            label="责任单位"
+          >{{ selectInfo.zrdw }}</a-form-item>
+        </a-col>
+        <a-col :span="10">
+          <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">{{ selectInfo.zrr }}</a-form-item>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="质量要求"
+          >{{ selectInfo.zlyq }}</a-form-item>
+        </a-col>
+        <a-divider>打卡记录</a-divider>
+        <a-col :span="22" :offset="1">
+          <a-table bordered :columns="columns" :data-source="workClockList">
+            <template slot="bz" slot-scope="text">
+              <!-- <a-tooltip>
+                <template slot="title">{{text}}</template>
+                {{text}}
+              </a-tooltip>-->
+              <a-row>
+                <a-popover>
+                  <a-col :span="12" :offset="6" slot="content">{{ text }}</a-col>
+                  {{ text }}
+                </a-popover>
+              </a-row>
+            </template>
+          </a-table>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import { query } from '@/api/admin'
+
+export default {
+  components: {},
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      form: this.$form.createForm(this),
+      modelVisible: false, // 弹出框显示
+      confirmLoading: false, // Loading
+      selectInfo: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      qdShow: false,
+      zqShow: false,
+      zdyzqShow: false,
+      workClockList: [],
+      columns: [
+        {
+          title: '打卡时间',
+          dataIndex: 'dksj',
+          key: 'dksj',
+          width: 180
+        },
+        {
+          title: '备注',
+          dataIndex: 'bz',
+          key: 'bz',
+          ellipsis: true,
+          scopedSlots: { customRender: 'bz' }
+        }
+      ]
+    }
+  },
+  created () {},
+  methods: {
+    open (record) {
+      const vm = this
+      console.log('详细', record)
+      this.selectInfo = record
+      const sfszqxgz = record.sfszqxgz ? record.sfszqxgz : '2'
+      record.sfszqxgz = sfszqxgz
+      if (sfszqxgz === '1') {
+        this.zqShow = true
+      } else {
+        this.zqShow = false
+      }
+      const zdyzq = record.zdyzq ? record.zdyzq : ''
+      if (zdyzq === '6') {
+        this.zdyzqShow = true
+      } else {
+        this.zdyzqShow = false
+      }
+      const gzlb = record.gzlb ? record.gzlb : ''
+      if (gzlb === '2') {
+        this.qdShow = true
+      } else {
+        this.qdShow = false
+      }
+      this.modelVisible = true
+      // let actionParam = {
+      //   // 请求参数
+      //   url: "/par/parworkclock/list",
+      //   action: "GET",
+      //   parameter: record,
+      //   data: {},
+      //   message: "删除成功"
+      // };
+      // // 调用请求
+      // method(actionParam).then(res => {
+      //   console.log("打卡记录集合", res);
+      // });
+      // 获取所有人员
+      query('/par/parworkclock/list', 'GET', record).then(res => {
+        console.log('打卡记录集合', res)
+        vm.workClockList = res.result.data
+      })
+    },
+    // 工作类别回显
+    gzlbEcho (text) {
+      if (text === '1') {
+        return '指令性工作'
+      } else if (text === '2') {
+        return '目标任务问题清单'
+      } else if (text === '3') {
+        return '个人工作备忘'
+      }
+    },
+    // 工作状态回显
+    gzztEcho (text) {
+      if (text === '1') {
+        return '已完成'
+      } else if (text === '0') {
+        return '未完成'
+      }
+    },
+    // 派发状态回显
+    pfztEcho (text) {
+      if (text === '1') {
+        return '已派发'
+      } else if (text === '0') {
+        return '未派发'
+      }
+    },
+    // 是否周期性工作回显
+    sfszqxgzEcho (text) {
+      if (text === '1') {
+        return '是'
+      } else if (text === '2') {
+        return '否'
+      }
+    },
+    // 清单类型回显
+    qdlxEcho (text) {
+      if (text === '1') {
+        return '问题清单'
+      } else if (text === '2') {
+        return '任务清单'
+      } else if (text === '3') {
+        return '工作清单'
+      }
+    },
+    // 周期回显
+    zqEcho (text) {
+      if (text === '1') {
+        return '年'
+      } else if (text === '2') {
+        return '季度'
+      } else if (text === '3') {
+        return '月'
+      } else if (text === '4') {
+        return '周'
+      } else if (text === '5') {
+        return '日'
+      } else if (text === '6') {
+        return '自定义'
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
+<style>
+.ant-popover-inner {
+  width: auto;
+}
+</style>
diff --git a/src/views/par/parworkinfo/ParWorkInfoUnit.vue b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..46f48d38de1712a421a01c3409db4dcbee238dea
--- /dev/null
+++ b/src/views/par/parworkinfo/ParWorkInfoUnit.vue
@@ -0,0 +1,818 @@
+<template>
+  <a-spin :spinning="confirmLoading">
+    <a-card style="margin-top:-2px" :bordered="false">
+      <div class>
+        <a-form>
+          <!--查询条件 start-->
+          <a-row class="form-row">
+            <a-col :span="6" :offset="1">
+              <a-form-item label="执行单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <!-- <a-input style="width:210px" v-model="queryParam.zxr" /> -->
+                <a-tree-select
+                  v-model="queryParam.zxr"
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择单位"
+                  allow-clear
+                  :tree-data="orgTree"
+                ></a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="6" :offset="1">
+              <a-form-item label="工作类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+                <a-select
+                  v-model="queryParam.gzlb"
+                  style="width: 100%;"
+                  placeholder="请选择工作类别"
+                  @change="gzlbChange"
+                  :allowClear="true"
+                >
+                  <a-select-option value="1">指令性工作</a-select-option>
+                  <a-select-option value="2">目标任务问题清单</a-select-option>
+                  <a-select-option value="3">个人工作备忘</a-select-option>
+                </a-select>
+              </a-form-item>
+            </a-col>
+          </a-row>
+          <!--查询条件 end-->
+          <!--操作按钮 start -->
+          <a-row :gutter="24" algin="center" style="margin-top:10px">
+            <a-col :md="12">
+              <span style="float:right" class="table-page-search-submitButtons">
+                <a-button type="primary" @click="search">查询</a-button>
+                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+              </span>
+            </a-col>
+            <a-col :md="11">
+              <span class="table-page-search-submitButtons">
+                <a-button
+                  type="primary"
+                  style="margin-left: 8px;float:right"
+                  @click="modelMethod('add',{})"
+                  v-action:add
+                >新增</a-button>
+                <a-upload
+                  :fileList="fileList"
+                  :showUploadList="false"
+                  style="float:right;margin-left:8px;"
+                  :before-upload="beforeUpload"
+                >
+                  <a-button type="primary">
+                    <a-icon type="upload" />导入
+                  </a-button>
+                </a-upload>
+                <a-button
+                  type="primary"
+                  style="margin-left: 8px;float:right"
+                  @click="exportExcel()"
+                >下载模版</a-button>
+              </span>
+            </a-col>
+          </a-row>
+          <!--操作按钮 end -->
+        </a-form>
+      </div>
+      <s-table
+        class="text-overflow"
+        ref="stable"
+        size="default"
+        :columns="columns"
+        :data="loadData"
+        style="margin-top:10px"
+        :scroll="{ x: 3500 }"
+      >
+        <span slot="action" slot-scope="text, record">
+          <a @click="detail(record)">详情</a>
+          <a-divider type="vertical" v-show="record.pfzt==='0'&&record.crtUser===userInfo.id" />
+          <a
+            @click="modelMethod('del',record)"
+            v-action:delete
+            v-show="record.pfzt==='0'&&record.crtUser===userInfo.id"
+          >删除</a>
+          <a-divider type="vertical" v-show="record.pfzt==='0'&&record.crtUser===userInfo.id" />
+          <a
+            @click="modelMethod('edit',record)"
+            v-action:update
+            v-show="record.pfzt==='0'&&record.crtUser===userInfo.id"
+          >编辑</a>
+          <a-divider type="vertical" v-show="record.pfzt==='0'&&record.crtUser===userInfo.id" />
+          <a @click="hangOut(record)" v-show="record.pfzt==='0'&&record.crtUser===userInfo.id">派发</a>
+        </span>
+        <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
+        <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
+        <span slot="pfzt" slot-scope="text">{{ pfztEcho(text) }}</span>
+        <span slot="sfszqxgz" slot-scope="text">{{ sfszqxgzEcho(text) }}</span>
+        <span slot="qdlx" slot-scope="text">{{ qdlxEcho(text) }}</span>
+        <span slot="zq" slot-scope="text">{{ zqEcho(text) }}</span>
+      </s-table>
+      <!-- 弹出框 -->
+      <a-modal
+        :title="operate==='detile'?'详情':operate==='edit'?'编辑':'新增'"
+        width="60%"
+        v-model="modelVisible"
+        @ok="handleOk"
+        :destroyOnClose="true"
+        :confirmLoading="confirmLoading"
+        centered
+      >
+        <a-form :form="form">
+          <a-row class="form-row" type="flex">
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="执行单位">
+                <a-tree-select
+                  v-model="selectInfo.zxr"
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择单位"
+                  allow-clear
+                  :tree-data="orgTree"
+                ></a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+                <a-select
+                  v-model="selectInfo.gzlb"
+                  style="width: 100%;"
+                  placeholder="请选择工作类别"
+                  @change="gzlbChange"
+                >
+                  <a-select-option value="1">指令性工作</a-select-option>
+                  <a-select-option value="2">目标任务问题清单</a-select-option>
+                  <a-select-option value="3">个人工作备忘</a-select-option>
+                </a-select>
+                <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+              </a-form-item>
+            </a-col>
+            <a-col :span="10" :offset="1" style="padding-top:5px;" v-show="qdShow">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+                <a-select
+                  v-model="selectInfo.qdlx"
+                  @change="qdlxChange"
+                  style="width: 100%;"
+                  placeholder="请选择清单类型"
+                >
+                  <a-select-option value="1">问题类型</a-select-option>
+                  <a-select-option value="2">任务类型</a-select-option>
+                  <a-select-option value="3">工作类型</a-select-option>
+                </a-select>
+                <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+              </a-form-item>
+            </a-col>
+            <!-- <a-col :span="10" :offset="1">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-input v-model="selectInfo.qdlx" :disabled="operate==='detile'?'disabled':false" />
+            </a-form-item>
+            </a-col>-->
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="工作内容"
+              >
+                <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-textarea
+                  v-model="selectInfo.gznr"
+                  placeholder="请输入工作内容"
+                  :auto-size="{ minRows: 3, maxRows: 5 }"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-row>
+                <a-col :span="12">
+                  <a-form-item
+                    :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                    :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                    label="周期性工作"
+                  >
+                    <a-radio-group
+                      v-model="selectInfo.sfszqxgz"
+                      default-value="2"
+                      @change="zqxChange"
+                    >
+                      <a-radio value="1">是</a-radio>
+                      <a-radio value="2">否</a-radio>
+                    </a-radio-group>
+                  </a-form-item>
+                </a-col>
+                <a-col :span="12" v-show="zqShow">
+                  <a-form-item
+                    :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                    :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                    label="周期"
+                  >
+                    <a-select
+                      style="width: 100%"
+                      v-model="selectInfo.zq"
+                      placeholder="请输入选择周期"
+                      @change="onZqChange"
+                    >
+                      <a-select-option value="1">年</a-select-option>
+                      <a-select-option value="2">季度</a-select-option>
+                      <a-select-option value="3">月</a-select-option>
+                      <a-select-option value="4">周</a-select-option>
+                      <a-select-option value="5">日</a-select-option>
+                      <a-select-option value="6">自定义</a-select-option>
+                    </a-select>
+                  </a-form-item>
+                </a-col>
+              </a-row>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;" v-show="zdyzqShow">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="自定义周期"
+              >
+                <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
+              </a-form-item>
+            </a-col>
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+                <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-date-picker
+                  v-model="selectInfo.kssj"
+                  placeholder="请选择开始时间"
+                  style="width:100%;"
+                  @change="startChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+                <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-date-picker
+                  v-model="selectInfo.jzsj"
+                  placeholder="请选择截止时间"
+                  style="width:100%;"
+                  @change="endChange"
+                />
+              </a-form-item>
+            </a-col>
+            <a-col :span="3" style="color:red;padding-left:3px;padding-top:6px;">不选视为永久有效</a-col>
+            <a-col :span="10" :offset="1" style="padding-top:5px;">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+                <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-tree-select
+                  v-model="selectInfo.zrdwList"
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择责任单位"
+                  allow-clear
+                  multiple
+                  :tree-data="orgTree"
+                ></a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="10">
+              <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+                <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-tree-select
+                  v-model="selectInfo.zrrList"
+                  show-search
+                  style="width: 100%"
+                  :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                  placeholder="请选择责任人"
+                  allow-clear
+                  multiple
+                >
+                  <a-tree-select-node
+                    v-for="staff in staffList"
+                    :key="staff.id"
+                    :value="staff.id"
+                    :title="staff.name"
+                  ></a-tree-select-node>
+                </a-tree-select>
+              </a-form-item>
+            </a-col>
+            <a-col :span="20" :offset="1" style="padding-top:5px;">
+              <a-form-item
+                :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+                :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+                label="质量要求"
+              >
+                <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+                <a-textarea
+                  v-model="selectInfo.zlyq"
+                  placeholder="请输入质量要求"
+                  :auto-size="{ minRows: 3, maxRows: 5 }"
+                />
+              </a-form-item>
+            </a-col>
+          </a-row>
+        </a-form>
+      </a-modal>
+      <sign-modal ref="signModalRef"></sign-modal>
+      <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
+    </a-card>
+  </a-spin>
+</template>
+<script>
+import { STable } from '@/components'
+import { query, method, download, getOrgTree } from '@/api/admin'
+import { mapGetters } from 'vuex'
+
+import SignModal from './SignModal'
+import moment from 'moment'
+import ParWorkInfoDetail from './ParWorkInfoDetail'
+
+export default {
+  components: {
+    STable,
+    getOrgTree,
+    SignModal,
+    ParWorkInfoDetail
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      visible: false,
+      form: this.$form.createForm(this),
+      // 查询参数
+      queryParam: {},
+      inAdd: false,
+      inEdit: false,
+      inDetail: false,
+      zqShow: false,
+      zdyzqShow: false,
+      zqSpan: 20,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return query('/par/parworkinfo' + '/queryPage', 'GET', parameter).then(
+          res => {
+            console.log('列表结果', res.result)
+            return res.result
+          }
+        )
+      },
+      // 表头
+      columns: [
+        {
+          title: '执行人/单位',
+          dataIndex: 'zxrstr'
+        },
+        {
+          title: '工作类别',
+          dataIndex: 'gzlb',
+          scopedSlots: { customRender: 'gzlb' }
+        },
+        {
+          title: '清单类型',
+          dataIndex: 'qdlx',
+          scopedSlots: { customRender: 'qdlx' }
+        },
+        {
+          title: '工作内容',
+          dataIndex: 'gznr'
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'kssj'
+        },
+        {
+          title: '截止时间',
+          dataIndex: 'jzsj'
+        },
+        // {
+        //   title: "完成时间",
+        //   dataIndex: "wcsj"
+        // },
+        {
+          title: '工作状态',
+          dataIndex: 'gzzt',
+          scopedSlots: { customRender: 'gzzt' }
+        },
+        {
+          title: '派发状态',
+          dataIndex: 'pfzt',
+          scopedSlots: { customRender: 'pfzt' }
+        },
+        {
+          title: '责任单位',
+          dataIndex: 'zrdw'
+        },
+        {
+          title: '质量要求',
+          dataIndex: 'zlyq'
+        },
+        // {
+        //   title: "备注",
+        //   dataIndex: "bz"
+        // },
+        // {
+        //   title: "工作说明",
+        //   dataIndex: "gzsm"
+        // },
+        // {
+        //   title: "延期原因",
+        //   dataIndex: "yqyy"
+        // },
+        {
+          title: '是否是周期性工作',
+          dataIndex: 'sfszqxgz',
+          scopedSlots: { customRender: 'sfszqxgz' }
+        },
+        {
+          title: '周期',
+          dataIndex: 'zq',
+          scopedSlots: { customRender: 'zq' }
+        },
+        {
+          title: '自定义周期',
+          dataIndex: 'zdyzq'
+        },
+        {
+          title: '责任人',
+          dataIndex: 'zrr'
+        },
+        {
+          title: '操作',
+          width: '150px',
+          dataIndex: 'action',
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      modelVisible: false, // 弹出框显示
+      operate: 'query', // 当前操作
+      selectInfo: {}, // 选中的数据
+      confirmLoading: false, // Loading
+      url: '/par/parworkinfo', // ajax请求地址
+      loading: false,
+      orgTree: [],
+      staffList: [],
+      currentRole: 'unitRole',
+      qdShow: false,
+      fileList: []
+    }
+  },
+  created () {
+    this.selectInfo.sfszqxgz = '2'
+    const vm = this
+    // 获取树形组织信息
+    getOrgTree({ parentTreeId: 'root' }).then(res => {
+      console.log('1111111111122222222222222')
+      console.log('组织机构查询', res)
+      vm.orgTree = vm.genernateTree(res.result.data)
+    })
+    // 获取所有人员
+    query('/admin/pmUser' + '/query', 'GET').then(res => {
+      console.log('人员查询', res)
+      vm.staffList = res.result.data
+    })
+    console.log('当前登录用户', this.userInfo)
+  },
+  methods: {
+    beforeUpload (file) {
+      const vm = this
+      this.confirmLoading = true
+      this.fileList = [...this.fileList, file]
+      console.log('文件', this.fileList)
+      const formData = new FormData()
+      this.fileList.forEach(file => {
+        formData.append('file', file)
+      })
+      const actionParam = {
+        // 请求参数
+        url: '/par/parworkinfo/importFile',
+        action: 'POST',
+        parameter: {},
+        data: formData,
+        message: '导入成功'
+      }
+      // 调用请求
+      method(actionParam).then(res => {
+        vm.$refs.stable.refresh(true) // 刷新列表
+        this.confirmLoading = false
+      })
+      return false
+    },
+    // 详情
+    detail (record) {
+      console.log('详情', record)
+      this.$refs.parWorkInfoDetailRef.open(record)
+    },
+    // 下载
+    exportExcel () {
+      this.actionParam = {
+        url: '/par/parworkinfo/export',
+        action: 'get',
+        parameter: this.queryParam,
+        data: {}
+      }
+      return download(this.actionParam).then(res => {
+        this.download(res)
+        this.loaidng = false
+      })
+    },
+    /**
+     * 下载
+     */
+    download (data) {
+      if (!data) {
+        return
+      }
+      const url = window.URL.createObjectURL(
+        new Blob([data], { type: 'application/vnd.ms-excel' })
+      )
+      const link = document.createElement('a')
+      link.style.display = 'none'
+      link.href = url
+      // 获取文件名
+      // download 属性定义了下载链接的地址而不是跳转路径
+      link.setAttribute('download', '工作模版.xlsx')
+      document.body.appendChild(link)
+      link.click()
+      document.body.removeChild(link)
+    },
+    // 工作类别回显
+    gzlbEcho (text) {
+      if (text === '1') {
+        return '指令性工作'
+      } else if (text === '2') {
+        return '目标任务问题清单'
+      } else if (text === '3') {
+        return '个人工作备忘'
+      }
+    },
+    // 工作状态回显
+    gzztEcho (text) {
+      if (text === '1') {
+        return '已完成'
+      } else if (text === '0') {
+        return '未完成'
+      }
+    },
+    // 派发状态回显
+    pfztEcho (text) {
+      if (text === '1') {
+        return '已派发'
+      } else if (text === '0') {
+        return '未派发'
+      }
+    },
+    // 是否周期性工作回显
+    sfszqxgzEcho (text) {
+      if (text === '1') {
+        return '是'
+      } else if (text === '2') {
+        return '否'
+      }
+    },
+    // 周期回显
+    zqEcho (text) {
+      if (text === '1') {
+        return '年'
+      } else if (text === '2') {
+        return '季度'
+      } else if (text === '3') {
+        return '月'
+      } else if (text === '4') {
+        return '周'
+      } else if (text === '5') {
+        return '日'
+      } else if (text === '6') {
+        return '自定义'
+      }
+    },
+    // 清单类型回显
+    qdlxEcho (text) {
+      if (text === '1') {
+        return '问题清单'
+      } else if (text === '2') {
+        return '任务清单'
+      } else if (text === '3') {
+        return '工作清单'
+      }
+    },
+    qdlxChange (val, e) {
+      console.log('清单类型', val)
+      this.selectInfo.qdlx = val
+    },
+    // 工作类别改变
+    gzlbChange (val, e) {
+      if (val === '2') {
+        this.qdShow = true
+      } else {
+        this.qdShow = false
+      }
+    },
+    // 打卡
+    sign (record) {
+      console.log('打卡', record, this.currentRole)
+      this.$refs.signModalRef.open(record, this.currentRole)
+    },
+    // 派发
+    hangOut (record) {
+      const vm = this
+      console.log('派发', record)
+      this.$confirm({
+        title: '提示',
+        content: `确认要派发该条记录吗?`,
+        okText: '确认',
+        okType: 'warn',
+        cancelText: '取消',
+        onOk () {
+          vm.actionParam = {
+            // 请求参数
+            url: vm.url + '/updateDistributeStatus',
+            action: 'POST',
+            parameter: record,
+            data: record,
+            message: '派发成功'
+          }
+          // 调用请求
+          method(vm.actionParam).then(res => {
+            vm.$refs.stable.refresh(true) // 刷新列表
+          })
+        },
+        onCancel: () => {
+          vm.$notification['info']({
+            message: '取消删除操作',
+            duration: 4
+          })
+        }
+      })
+    },
+    // 开始时间变化
+    startChange (date, str) {
+      console.log('开始时间', date, str)
+      this.selectInfo.kssjstr = str
+    },
+    // 截止时间变化
+    endChange (date, str) {
+      console.log('截止时间', date, str)
+      this.selectInfo.jzsjstr = str
+    },
+    /**
+     * 处理后台返回值
+     */
+    genernateTree (value) {
+      value.forEach(item => {
+        item.value = item.id
+        if (item.children && item.children.length) {
+          this.genernateTree(item.children)
+        }
+      })
+      return value
+    },
+    zqxChange (e) {
+      console.log('是否周期性变化', e)
+      const val = e.target.value
+      if (val === '1') {
+        this.zqShow = true
+      } else {
+        this.zqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    onZqChange (value, e) {
+      console.log('是否自定义周期', value)
+      if (value === '6') {
+        this.zdyzqShow = true
+      } else {
+        this.zdyzqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    /**
+     * 搜索
+     */
+    search () {
+      this.$refs.stable.loadData({}, this.queryParam, {})
+    },
+
+    // 操作按钮
+    modelMethod (action, selectInfo) {
+      this.zqShow = false
+      this.zdyzqShow = false
+      this.qdShow = false
+      console.log('点击操作', action, selectInfo)
+      this.operate = action // 记录当前操作
+      this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
+      this.selectInfo.sfszqxgz = '2'
+      const dateFormat = 'YYYY-MM-DD'
+      if (this.selectInfo.kssj) {
+        this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
+      }
+      if (this.selectInfo.jzsj) {
+        this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
+      }
+      console.log('日期处理', this.selectInfo)
+      if (action === 'edit') {
+        const sfszqxgz = this.selectInfo.sfszqxgz
+          ? this.selectInfo.sfszqxgz
+          : '2'
+        this.selectInfo.sfszqxgz = sfszqxgz
+        if (sfszqxgz === '1') {
+          this.zqShow = true
+        } else {
+          this.zqShow = false
+        }
+        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
+        if (zdyzq === '6') {
+          this.zdyzqShow = true
+        } else {
+          this.zdyzqShow = false
+        }
+        const gzlb = this.selectInfo.gzlb ? this.selectInfo.gzlb : ''
+        if (gzlb === '2') {
+          this.qdShow = true
+        } else {
+          this.qdShow = false
+        }
+      }
+      const _this = this
+      if (this.operate === 'del') {
+        // 删除
+        this.$confirm({
+          title: '警告',
+          content: `确认要删除该条记录吗?`,
+          okText: '确认',
+          okType: 'danger',
+          cancelText: '取消',
+          onOk () {
+            _this.actionParam = {
+              // 请求参数
+              url: _this.url + '/' + _this.selectInfo.id,
+              action: 'delete',
+              parameter: {},
+              data: {},
+              message: '删除成功'
+            }
+            // 调用请求
+            method(_this.actionParam).then(res => {
+              _this.$refs.stable.refresh(true) // 刷新列表
+            })
+          },
+          onCancel: () => {
+            this.$notification['info']({
+              message: '取消删除操作',
+              duration: 4
+            })
+          }
+        })
+      } else {
+        this.modelVisible = true // 弹出框显示
+      }
+    },
+    // 确认
+    handleOk () {
+      this.confirmLoading = true
+      this.selectInfo.zxrlb = '1'
+      if (this.operate === 'detile') {
+        // 详情
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+      }
+      if (this.operate === 'add') {
+        // 新增
+        this.actionParam = {
+          url: '/par/parworkinfo/insert',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '新增成功'
+        }
+      }
+      if (this.operate === 'edit') {
+        // 修改
+        this.actionParam = {
+          url: '/par/parworkinfo/update',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '修改成功'
+        }
+      }
+      // 调用请求
+      return method(this.actionParam).then(res => {
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+        // 刷新列表
+        this.$refs.stable.refresh(true)
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/par/parworkinfo/ParWorkInfoUser.vue b/src/views/par/parworkinfo/ParWorkInfoUser.vue
new file mode 100644
index 0000000000000000000000000000000000000000..cb138edb6c80db5d6c19d866cfd687337e72c958
--- /dev/null
+++ b/src/views/par/parworkinfo/ParWorkInfoUser.vue
@@ -0,0 +1,677 @@
+<template>
+  <a-card style="margin-top:-2px" :bordered="false">
+    <div class>
+      <a-form>
+        <!--查询条件 start-->
+        <a-row class="form-row">
+          <a-col :span="6" :offset="1">
+            <a-form-item label="工作类别" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select
+                v-model="queryParam.gzlb"
+                style="width: 100%;"
+                placeholder="请选择工作类别"
+                @change="gzlbChange"
+                :allowClear="true"
+              >
+                <a-select-option value="1">指令性工作</a-select-option>
+                <a-select-option value="2">目标任务问题清单</a-select-option>
+                <a-select-option value="3">个人工作备忘</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--查询条件 end-->
+        <!--操作按钮 start -->
+        <a-row :gutter="24" algin="center" style="margin-top:10px">
+          <a-col :md="12">
+            <span style="float:right" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="search">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+          <a-col :md="11">
+            <span class="table-page-search-submitButtons">
+              <a-button
+                type="primary"
+                style="margin-left: 8px;float:right"
+                @click="modelMethod('add',{})"
+                v-action:add
+              >新增</a-button>
+            </span>
+          </a-col>
+        </a-row>
+        <!--操作按钮 end -->
+      </a-form>
+    </div>
+    <s-table
+      class="text-overflow"
+      ref="stable"
+      size="default"
+      :columns="columns"
+      :data="loadData"
+      style="margin-top:10px"
+      :scroll="{ x: 3500 }"
+    >
+      <span slot="action" slot-scope="text, record">
+        <a @click="detail(record)">详情</a>
+        <a-divider type="vertical" v-if="record.crtUser===userInfo.id" />
+        <a @click="modelMethod('del',record)" v-action:delete v-if="record.crtUser===userInfo.id">删除</a>
+        <a-divider type="vertical" v-if="record.crtUser===userInfo.id" />
+        <a @click="modelMethod('edit',record)" v-action:update v-if="record.crtUser===userInfo.id">编辑</a>
+        <a-divider type="vertical" />
+        <a @click="sign(record)">打卡</a>
+      </span>
+      <span slot="gzlb" slot-scope="text">{{ gzlbEcho(text) }}</span>
+      <span slot="gzzt" slot-scope="text">{{ gzztEcho(text) }}</span>
+      <span slot="pfzt" slot-scope="text">{{ pfztEcho(text) }}</span>
+      <span slot="sfszqxgz" slot-scope="text">{{ sfszqxgzEcho(text) }}</span>
+      <span slot="qdlx" slot-scope="text">{{ qdlxEcho(text) }}</span>
+      <span slot="zq" slot-scope="text">{{ zqEcho(text) }}</span>
+    </s-table>
+    <!-- 弹出框 -->
+    <a-modal
+      :title="operate==='detile'?'详情':operate==='edit'?'编辑':'新增'"
+      width="60%"
+      v-model="modelVisible"
+      @ok="handleOk"
+      :destroyOnClose="true"
+      :confirmLoading="confirmLoading"
+      centered
+    >
+      <a-form :form="form">
+        <a-row class="form-row" type="flex">
+          <a-col :span="10" :offset="1" style="padding-top:5px;">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="工作类别">
+              <a-select
+                v-model="selectInfo.gzlb"
+                style="width: 100%;"
+                placeholder="请选择工作类别"
+                @change="gzlbChange"
+              >
+                <a-select-option value="1">指令性工作</a-select-option>
+                <a-select-option value="2">目标任务问题清单</a-select-option>
+                <a-select-option value="3">个人工作备忘</a-select-option>
+              </a-select>
+              <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+            </a-form-item>
+          </a-col>
+          <a-col :span="10" v-if="qdShow">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-select v-model="selectInfo.qdlx" style="width: 100%;" placeholder="请选择清单类型">
+                <a-select-option value="1">问题类型</a-select-option>
+                <a-select-option value="2">任务类型</a-select-option>
+                <a-select-option value="3">工作类型</a-select-option>
+              </a-select>
+              <!-- <a-input v-model="selectInfo.gzlb" :disabled="operate==='detile'?'disabled':false" /> -->
+            </a-form-item>
+          </a-col>
+          <!-- <a-col :span="10" :offset="1">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="清单类型">
+              <a-input v-model="selectInfo.qdlx" :disabled="operate==='detile'?'disabled':false" />
+            </a-form-item>
+          </a-col>-->
+          <a-col :span="20" :offset="1" style="padding-top:5px;">
+            <a-form-item
+              :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+              :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+              label="工作内容"
+            >
+              <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-textarea
+                v-model="selectInfo.gznr"
+                placeholder="请输入工作内容"
+                :auto-size="{ minRows: 3, maxRows: 5 }"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="20" :offset="1" style="padding-top:5px;">
+            <a-row>
+              <a-col :span="12">
+                <a-form-item
+                  :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                  :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                  label="周期性工作"
+                >
+                  <a-radio-group
+                    v-model="selectInfo.sfszqxgz"
+                    default-value="2"
+                    @change="zqxChange"
+                  >
+                    <a-radio value="1">是</a-radio>
+                    <a-radio value="2">否</a-radio>
+                  </a-radio-group>
+                </a-form-item>
+              </a-col>
+              <a-col :span="12" v-if="zqShow">
+                <a-form-item
+                  :labelCol="{xs: { span: 12 },sm: { span: 8 }}"
+                  :wrapperCol="{xs: { span: 12 },sm: { span: 16 }}"
+                  label="周期"
+                >
+                  <a-select
+                    style="width: 100%"
+                    v-model="selectInfo.zq"
+                    placeholder="请输入选择周期"
+                    @change="onZqChange"
+                  >
+                    <a-select-option value="1">年</a-select-option>
+                    <a-select-option value="2">季度</a-select-option>
+                    <a-select-option value="3">月</a-select-option>
+                    <a-select-option value="4">周</a-select-option>
+                    <a-select-option value="5">日</a-select-option>
+                    <a-select-option value="6">自定义</a-select-option>
+                  </a-select>
+                </a-form-item>
+              </a-col>
+            </a-row>
+          </a-col>
+          <a-col :span="20" :offset="1" style="padding-top:5px;" v-if="zdyzqShow">
+            <a-form-item
+              :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+              :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+              label="自定义周期"
+            >
+              <a-input v-model="selectInfo.zdyzq" :disabled="operate==='detile'?'disabled':false" />
+            </a-form-item>
+          </a-col>
+          <a-col :span="10" :offset="1" style="padding-top:5px;">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="开始时间">
+              <!-- <a-input v-model="selectInfo.kssj" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-date-picker
+                v-model="selectInfo.kssj"
+                placeholder="请选择开始时间"
+                style="width:100%;"
+                @change="startChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="10">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="截止时间">
+              <!-- <a-input v-model="selectInfo.jzsj" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-date-picker
+                v-model="selectInfo.jzsj"
+                placeholder="请选择截止时间"
+                style="width:100%;"
+                @change="endChange"
+              />
+            </a-form-item>
+          </a-col>
+          <a-col :span="10" :offset="1" style="padding-top:5px;">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任单位">
+              <!-- <a-input v-model="selectInfo.zrdw" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-tree-select
+                v-model="selectInfo.zrdwList"
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                placeholder="请选择责任单位"
+                allow-clear
+                multiple
+                :tree-data="orgTree"
+              ></a-tree-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="10">
+            <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="责任人">
+              <!-- <a-input v-model="selectInfo.zrr" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-tree-select
+                v-model="selectInfo.zrrList"
+                show-search
+                style="width: 100%"
+                :dropdown-style="{ maxHeight: '400px', overflow: 'auto' }"
+                placeholder="请选择责任人"
+                allow-clear
+                multiple
+              >
+                <a-tree-select-node
+                  v-for="staff in staffList"
+                  :key="staff.id"
+                  :value="staff.id"
+                  :title="staff.name"
+                ></a-tree-select-node>
+              </a-tree-select>
+            </a-form-item>
+          </a-col>
+          <a-col :span="20" :offset="1" style="padding-top:5px;">
+            <a-form-item
+              :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+              :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+              label="质量要求"
+            >
+              <!-- <a-input v-model="selectInfo.gznr" :disabled="operate==='detile'?'disabled':false" /> -->
+              <a-textarea
+                v-model="selectInfo.zlyq"
+                placeholder="请输入质量要求"
+                :auto-size="{ minRows: 3, maxRows: 5 }"
+              />
+            </a-form-item>
+          </a-col>
+        </a-row>
+      </a-form>
+    </a-modal>
+    <sign-modal ref="signModalRef"></sign-modal>
+    <par-work-info-detail ref="parWorkInfoDetailRef"></par-work-info-detail>
+  </a-card>
+</template>
+<script>
+import { STable } from '@/components'
+import { query, method, getOrgTree } from '@/api/admin'
+import { mapGetters } from 'vuex'
+
+import SignModal from './SignModal'
+import moment from 'moment'
+import ParWorkInfoDetail from './ParWorkInfoDetail'
+
+export default {
+  components: {
+    STable,
+    getOrgTree,
+    SignModal,
+    ParWorkInfoDetail
+  },
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      visible: false,
+      form: this.$form.createForm(this),
+      // 查询参数
+      queryParam: {},
+      inAdd: false,
+      inEdit: false,
+      inDetail: false,
+      zqShow: false,
+      zdyzqShow: false,
+      zqSpan: 20,
+      // 加载数据方法 必须为 Promise 对象
+      loadData: parameter => {
+        return query(
+          '/par/parworkinfo' + '/listQueryByStaffId',
+          'GET',
+          parameter
+        ).then(res => {
+          console.log('列表结果', res.result)
+          return res.result
+        })
+      },
+      // 表头
+      columns: [
+        {
+          title: '执行人/单位',
+          dataIndex: 'zxrstr'
+        },
+        {
+          title: '工作类别',
+          dataIndex: 'gzlb',
+          scopedSlots: { customRender: 'gzlb' }
+        },
+        {
+          title: '清单类型',
+          dataIndex: 'qdlx',
+          scopedSlots: { customRender: 'qdlx' }
+        },
+        {
+          title: '工作内容',
+          dataIndex: 'gznr'
+        },
+        {
+          title: '开始时间',
+          dataIndex: 'kssj'
+        },
+        {
+          title: '截止时间',
+          dataIndex: 'jzsj'
+        },
+        // {
+        //   title: "完成时间",
+        //   dataIndex: "wcsj"
+        // },
+        {
+          title: '工作状态',
+          dataIndex: 'gzzt',
+          scopedSlots: { customRender: 'gzzt' }
+        },
+        {
+          title: '派发状态',
+          dataIndex: 'pfzt',
+          scopedSlots: { customRender: 'pfzt' }
+        },
+        {
+          title: '责任单位',
+          dataIndex: 'zrdw'
+        },
+        {
+          title: '质量要求',
+          dataIndex: 'zlyq'
+        },
+        // {
+        //   title: "备注",
+        //   dataIndex: "bz"
+        // },
+        // {
+        //   title: "工作说明",
+        //   dataIndex: "gzsm"
+        // },
+        // {
+        //   title: "延期原因",
+        //   dataIndex: "yqyy"
+        // },
+        {
+          title: '是否是周期性工作',
+          dataIndex: 'sfszqxgz',
+          scopedSlots: { customRender: 'sfszqxgz' }
+        },
+        {
+          title: '周期',
+          dataIndex: 'zq',
+          scopedSlots: { customRender: 'zq' }
+        },
+        {
+          title: '自定义周期',
+          dataIndex: 'zdyzq'
+        },
+        {
+          title: '责任人',
+          dataIndex: 'zrr'
+        },
+        {
+          title: '操作',
+          width: '150px',
+          dataIndex: 'action',
+          fixed: 'right',
+          scopedSlots: { customRender: 'action' }
+        }
+      ],
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      modelVisible: false, // 弹出框显示
+      operate: 'query', // 当前操作
+      selectInfo: {}, // 选中的数据
+      confirmLoading: false, // Loading
+      url: '/par/parworkinfo', // ajax请求地址
+      loading: false,
+      orgTree: [],
+      staffList: [],
+      currentRole: 'unitRole',
+      qdShow: false,
+      currDate: moment(new Date())
+    }
+  },
+  created () {
+    this.selectInfo.sfszqxgz = '2'
+    const vm = this
+    // 获取树形组织信息
+    getOrgTree({ parentTreeId: 'root' }).then(res => {
+      console.log('1111111111122222222222222')
+      console.log('组织机构查询', res)
+      vm.orgTree = vm.genernateTree(res.result.data)
+    })
+    // 获取所有人员
+    query('/admin/pmUser' + '/query', 'GET').then(res => {
+      console.log('人员查询', res)
+      vm.staffList = res.result.data
+    })
+    console.log('当前登录用户', this.userInfo)
+  },
+  methods: {
+    // 周期回显
+    zqEcho (text) {
+      if (text === '1') {
+        return '年'
+      } else if (text === '2') {
+        return '季度'
+      } else if (text === '3') {
+        return '月'
+      } else if (text === '4') {
+        return '周'
+      } else if (text === '5') {
+        return '日'
+      } else if (text === '6') {
+        return '自定义'
+      }
+    },
+    // 工作类别回显
+    gzlbEcho (text) {
+      if (text === '1') {
+        return '指令性工作'
+      } else if (text === '2') {
+        return '目标任务问题清单'
+      } else if (text === '3') {
+        return '个人工作备忘'
+      }
+    },
+    // 工作状态回显
+    gzztEcho (text) {
+      if (text === '1') {
+        return '已完成'
+      } else if (text === '0') {
+        return '未完成'
+      }
+    },
+    // 派发状态回显
+    pfztEcho (text) {
+      if (text === '1') {
+        return '已派发'
+      } else if (text === '0') {
+        return '未派发'
+      }
+    },
+    // 是否周期性工作回显
+    sfszqxgzEcho (text) {
+      if (text === '1') {
+        return '是'
+      } else if (text === '2') {
+        return '否'
+      }
+    },
+    // 清单类型回显
+    qdlxEcho (text) {
+      if (text === '1') {
+        return '问题清单'
+      } else if (text === '2') {
+        return '任务清单'
+      } else if (text === '3') {
+        return '工作清单'
+      }
+    },
+    // 工作类别改变
+    gzlbChange (val, e) {
+      if (val === '2') {
+        this.qdShow = true
+      } else {
+        this.qdShow = false
+      }
+    },
+    // 打卡
+    sign (record) {
+      console.log('打卡', record)
+      this.$refs.signModalRef.open(record)
+    },
+    // 详情
+    detail (record) {
+      console.log('详情', record)
+      this.$refs.parWorkInfoDetailRef.open(record)
+    },
+    // 派发
+    hangOut (record) {
+      console.log('派发', record)
+    },
+    // 开始时间变化
+    startChange (date, str) {
+      console.log('开始时间', date, str)
+      this.selectInfo.kssjstr = str
+    },
+    // 截止时间变化
+    endChange (date, str) {
+      console.log('截止时间', date, str)
+      this.selectInfo.jzsjstr = str
+    },
+    /**
+     * 处理后台返回值
+     */
+    genernateTree (value) {
+      value.forEach(item => {
+        item.value = item.id
+        if (item.children && item.children.length) {
+          this.genernateTree(item.children)
+        }
+      })
+      return value
+    },
+    zqxChange (e) {
+      console.log('是否周期性变化', e)
+      const val = e.target.value
+      if (val === '1') {
+        this.zqShow = true
+      } else {
+        this.zqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    onZqChange (value, e) {
+      console.log('是否自定义周期', value)
+      if (value === '6') {
+        this.zdyzqShow = true
+      } else {
+        this.zdyzqShow = false
+        this.selectInfo.zdyzq = ''
+      }
+    },
+    /**
+     * 搜索
+     */
+    search () {
+      this.$refs.stable.loadData({}, this.queryParam, {})
+    },
+
+    // 操作按钮
+    modelMethod (action, selectInfo) {
+      this.zqShow = false
+      this.zdyzqShow = false
+      this.qdShow = false
+      console.log('点击操作', action, selectInfo)
+      this.operate = action // 记录当前操作
+      this.selectInfo = Object.assign({}, selectInfo) // 记录当前操作的数据
+      this.selectInfo.sfszqxgz = '2'
+      const dateFormat = 'YYYY-MM-DD'
+      if (selectInfo.kssj) {
+        this.selectInfo.kssj = moment(this.selectInfo.kssj, dateFormat)
+      }
+      if (this.selectInfo.jzsj) {
+        this.selectInfo.jzsj = moment(this.selectInfo.jzsj, dateFormat)
+      }
+      console.log('日期处理', selectInfo)
+      if (action === 'edit') {
+        const sfszqxgz = this.selectInfo.sfszqxgz
+          ? this.selectInfo.sfszqxgz
+          : '2'
+        this.selectInfo.sfszqxgz = sfszqxgz
+        if (sfszqxgz === '1') {
+          this.zqShow = true
+        } else {
+          this.zqShow = false
+        }
+        const zdyzq = this.selectInfo.zdyzq ? this.selectInfo.zdyzq : ''
+        if (zdyzq === '6') {
+          this.zdyzqShow = true
+        } else {
+          this.zdyzqShow = false
+        }
+        const gzlb = this.selectInfo.gzlb ? this.selectInfo.gzlb : ''
+        if (gzlb === '2') {
+          this.qdShow = true
+        } else {
+          this.qdShow = false
+        }
+      }
+      const _this = this
+      if (this.operate === 'del') {
+        // 删除
+        this.$confirm({
+          title: '警告',
+          content: `确认要删除该条记录吗?`,
+          okText: '确认',
+          okType: 'danger',
+          cancelText: '取消',
+          onOk () {
+            _this.actionParam = {
+              // 请求参数
+              url: _this.url + '/' + _this.selectInfo.id,
+              action: 'delete',
+              parameter: {},
+              data: {},
+              message: '删除成功'
+            }
+            // 调用请求
+            method(_this.actionParam).then(res => {
+              _this.$refs.stable.refresh(true) // 刷新列表
+            })
+          },
+          onCancel: () => {
+            this.$notification['info']({
+              message: '取消删除操作',
+              duration: 4
+            })
+          }
+        })
+      } else {
+        this.modelVisible = true // 弹出框显示
+      }
+    },
+    // 确认
+    handleOk () {
+      this.confirmLoading = true
+      this.selectInfo.zxrlb = '2'
+      this.selectInfo.zxr = this.userInfo.id
+      this.selectInfo.pfzt = '1'
+      if (this.operate === 'detile') {
+        // 详情
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+      }
+      if (this.operate === 'add') {
+        // 新增
+        this.actionParam = {
+          url: '/par/parworkinfo/insert',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '新增成功'
+        }
+      }
+      if (this.operate === 'edit') {
+        // 修改
+        this.actionParam = {
+          url: '/par/parworkinfo/update',
+          action: 'POST',
+          parameter: {},
+          data: this.selectInfo,
+          message: '修改成功'
+        }
+      }
+      // 调用请求
+      return method(this.actionParam).then(res => {
+        this.confirmLoading = false
+        // 关闭编辑框
+        this.modelVisible = false
+        // 刷新列表
+        this.$refs.stable.refresh(true)
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/par/parworkinfo/SignModal.vue b/src/views/par/parworkinfo/SignModal.vue
new file mode 100644
index 0000000000000000000000000000000000000000..0eb5b65fe347aad1c7ec4a1c143932be04ba19e9
--- /dev/null
+++ b/src/views/par/parworkinfo/SignModal.vue
@@ -0,0 +1,97 @@
+<template>
+  <a-modal
+    title="打卡"
+    :width="900"
+    v-model="modelVisible"
+    @ok="handleOk"
+    :destroyOnClose="true"
+    :confirmLoading="confirmLoading"
+    centered
+  >
+    <a-form :form="form">
+      <a-row class="form-row" type="flex">
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="打卡时间"
+          >{{ selectInfo.dksj }}</a-form-item>
+        </a-col>
+        <a-col :span="20" :offset="1" style="padding-top:5px;">
+          <a-form-item
+            :labelCol="{xs: { span: 12 },sm: { span: 4 }}"
+            :wrapperCol="{xs: { span: 12 },sm: { span: 20 }}"
+            label="备注"
+          >
+            <!-- <a-input v-model="selectInfo.gznr" :disabled="operate=='detile'?'disabled':false" /> -->
+            <a-textarea
+              v-model="selectInfo.bz"
+              placeholder="请输入工作内容"
+              :auto-size="{ minRows: 8, maxRows: 8 }"
+              :maxLength="600"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+    </a-form>
+  </a-modal>
+</template>
+<script>
+import { mapGetters } from 'vuex'
+import moment from 'moment'
+import { method } from '@/api/admin'
+
+export default {
+  components: {},
+  computed: {
+    ...mapGetters(['userInfo'])
+  },
+  data () {
+    return {
+      form: this.$form.createForm(this),
+      modelVisible: false, // 弹出框显示
+      confirmLoading: false, // Loading
+      selectInfo: {}
+    }
+  },
+  created () {},
+  methods: {
+    open (record) {
+      console.log('打卡', record)
+      // this.selectInfo = record;
+      this.modelVisible = true
+      this.selectInfo.dksj = moment()
+        .locale('zh-cn')
+        .format('YYYY-MM-DD HH:mm:ss')
+      this.selectInfo.workInfoId = record.id
+      console.log('当前时间', this.selectInfo.dksj)
+    },
+    // 确认
+    handleOk () {
+      const vm = this
+      this.confirmLoading = true
+      vm.actionParam = {
+        // 请求参数
+        url: '/par/parworkclock/insert',
+        action: 'POST',
+        parameter: {},
+        data: vm.selectInfo,
+        message: '打卡成功'
+      }
+      // 调用请求
+      method(vm.actionParam).then(res => {
+        vm.confirmLoading = false
+        // 关闭弹窗
+        vm.modelVisible = false
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/src/views/statisticalreport/StatisticalReport.vue b/src/views/statisticalreport/StatisticalReport.vue
new file mode 100644
index 0000000000000000000000000000000000000000..94ba74378b15bb5d6e7bef1496e2928ef9f192ba
--- /dev/null
+++ b/src/views/statisticalreport/StatisticalReport.vue
@@ -0,0 +1,218 @@
+<template>
+  <a-card style="margin-top:-2px" :bordered="false">
+    <div class>
+      <a-form>
+        <!--查询条件 start-->
+        <a-row class="form-row">
+          <a-col :span="6" :offset="1">
+            <a-form-item label="考评周期" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <!-- <a-input style="width:210px" v-model="queryParam.kpzqid" /> -->
+              <a-select
+                v-model="queryParam.kpzqid"
+                style="width: 100%;"
+                placeholder="请选择考评周期"
+                :allowClear="true"
+              >
+                <a-select-option
+                  v-for="item in kpzqList"
+                  :key="item.id"
+                  :value="item.id"
+                >{{ item.kpzqmc }}</a-select-option>
+              </a-select>
+            </a-form-item>
+          </a-col>
+        </a-row>
+        <!--查询条件 end-->
+        <!--操作按钮 start -->
+        <a-row :gutter="24" algin="center" style="margin-top:10px">
+          <a-col :md="12">
+            <span style="float:right" class="table-page-search-submitButtons">
+              <a-button type="primary" @click="search">查询</a-button>
+              <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+            </span>
+          </a-col>
+        </a-row>
+        <!--操作按钮 end -->
+      </a-form>
+      <a-spin :spinning="confirmLoading">
+        <a-row type="flex" style="padding-top:3%;">
+          <a-col
+            :span="3"
+            :offset="1"
+            style="text-align:center;padding-top:1.3%;border:solid #ddd 1px;"
+          >单位/项目</a-col>
+          <!-- 循环横坐标 -->
+          <a-col
+            style="text-align:center;border:solid #ddd 1px;border-left:none;padding:0.5% 0;"
+            :span="3"
+            v-for="heng in hengList"
+            :key="heng.id"
+            v-html="hengResolve(heng.name)"
+          ></a-col>
+        </a-row>
+        <div style="padding-bottom:3%;">
+          <a-row v-for="zong in zongList" :key="zong.id" type="flex">
+            <!-- 循环纵坐标 -->
+            <a-col
+              :span="3"
+              :offset="1"
+              style="text-align:center;border:solid #ddd 1px;padding:1% 0;border-top:none;"
+            >{{ zong.orgName }}</a-col>
+            <!-- 循环内容 -->
+            <a-col
+              :span="3"
+              v-for="(heng,hengIndex) in hengList"
+              :key="hengIndex"
+              style="text-align:center;border:solid #ddd 1px;padding-top:0.9%;border-left:none;border-top:none;"
+            >
+              <div v-for="(content,contentIndex) in contentList" :key="contentIndex">
+                <div v-if="content.id==zong.id">
+                  <div v-for="(value,key,index) in content" :key="index">
+                    <!-- <span>{{content['fs'+(hengIndex+1)]}}</span> -->
+                    <span v-if="(index-hengIndex)==1">{{ value }}</span>
+                  </div>
+                </div>
+              </div>
+            </a-col>
+          </a-row>
+        </div>
+      </a-spin>
+    </div>
+  </a-card>
+</template>
+<script>
+// import { STable } from "@/components";
+import { query } from '@/api/admin'
+
+export default {
+  components: {
+    // STable
+  },
+  data () {
+    return {
+      visible: false,
+      // 查询参数
+      queryParam: {},
+      labelCol: {
+        xs: { span: 24 },
+        sm: { span: 8 }
+      },
+      wrapperCol: {
+        xs: { span: 24 },
+        sm: { span: 16 }
+      },
+      confirmLoading: false, // Loading
+      hengList: [],
+      zongList: [],
+      contentList: [],
+      kpzqList: []
+    }
+  },
+  created () {
+    this.confirmLoading = true
+    this.heng()
+    this.zong()
+    this.content()
+    this.queryKPZQ()
+  },
+  methods: {
+    // 查询考评周期
+    queryKPZQ () {
+      const vm = this
+      query('/par/statisticalreport/parExamPeriodInfo', 'GET').then(res => {
+        console.log('考评周期结果', res)
+        vm.kpzqList = res.result
+        this.confirmLoading = false
+      })
+    },
+    // 横向标题解析
+    hengResolve (str) {
+      str = str.replace('考评标准及要点', '')
+      const index = str.indexOf('（')
+      return this.insertStr(str, index, '<br/>')
+    },
+    // 插入
+    // 为字符串插入字符 其中soure为原字符串,start为将要插入字符的位置，newStr为要插入的字符
+    insertStr (soure, start, newStr) {
+      return soure.slice(0, start) + newStr + soure.slice(start)
+    },
+    /**
+     * 搜索
+     */
+    search () {
+      this.confirmLoading = true
+      this.content()
+    },
+    // 横向
+    heng () {
+      // let actionParam = {
+      //   // 请求参数
+      //   url: "/par/statisticalreport/horizontal",
+      //   method: "GET",
+      //   parameter: {},
+      //   data: this.queryParam,
+      //   message: ""
+      // };
+      // // 调用请求
+      // query(actionParam).then(res => {
+      //   console.log("横向结果", res);
+      // });
+      const vm = this
+      query('/par/statisticalreport/horizontal', 'GET').then(res => {
+        console.log('横向结果', res)
+        vm.hengList = res.result
+        this.confirmLoading = false
+      })
+    },
+    // 纵向
+    zong () {
+      // let actionParam = {
+      //   // 请求参数
+      //   url: "/par/statisticalreport/vertical",
+      //   method: "GET",
+      //   parameter: {},
+      //   data: this.queryParam,
+      //   message: ""
+      // };
+      // // 调用请求
+      // query(actionParam).then(res => {
+      //   console.log("纵向结果", res);
+      // });
+      const vm = this
+      query('/par/statisticalreport/vertical', 'GET').then(res => {
+        console.log('纵向结果', res)
+        vm.zongList = res.result
+        this.confirmLoading = false
+      })
+    },
+    // 内容
+    content () {
+      // let actionParam = {
+      //   // 请求参数
+      //   url: "/par/statisticalreport/content",
+      //   method: "GET",
+      //   parameter: {},
+      //   data: this.queryParam,
+      //   message: ""
+      // };
+      // // 调用请求
+      // query(actionParam).then(res => {
+      //   console.log("内容结果", res);
+      // });
+      const vm = this
+      query('/par/statisticalreport/content', 'GET').then(res => {
+        console.log('内容结果', res)
+        vm.contentList = res.result
+        this.confirmLoading = false
+      })
+    }
+  }
+}
+</script>
+<style scoped>
+.text-overflow {
+  display: block; /*内联对象需加*/
+  word-break: keep-all; /* 不换行 */
+  white-space: nowrap; /* 不换行 */
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index c0c355459e5380db6664af1bb874108cb0b96741..c3b7946cee868837b2fd4103ec218075c6ad16b5 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,