From 042f17cf49b6b8dfad9f2230bf949b3312033f7c Mon Sep 17 00:00:00 2001 From: herenshan112 Date: Tue, 29 Nov 2022 09:03:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 +- package.json | 2 + src/api/people/peopledata.js | 414 ++++++ src/api/personnel/post.js | 57 +- src/api/systemaccredit/systemapi.js | 9 + src/api/systemaccredit/systemhrapi.js | 51 + src/api/time/dateval.js | 75 ++ src/main.js | 2 + src/router/index.js | 12 +- .../gwQualitativeIndicators.vue | 4 +- src/views/assessmentProgram/rules.vue | 2 +- src/views/basicCont/departTarget.vue | 2 +- src/views/echarts/total.vue | 2 +- src/views/hr/newhr/addpeople.vue | 1080 ++++++++++++++++ src/views/hr/newhr/appraisalrecords.vue | 92 ++ src/views/hr/newhr/competence.vue | 91 ++ src/views/hr/newhr/content/info.vue | 44 + src/views/hr/newhr/doubleemployees.vue | 154 +++ src/views/hr/newhr/emergencycontact.vue | 151 +++ src/views/hr/newhr/employmentrelationship.vue | 91 ++ src/views/hr/newhr/familymembers.vue | 164 +++ src/views/hr/newhr/introducevue.js | 11 + src/views/hr/newhr/people.vue | 1138 +++++++++++++++++ src/views/hr/newhr/peoplecont.vue | 258 ++++ src/views/hr/newhr/peopleinfor.vue | 288 +++++ src/views/hr/newhr/personneleducation.vue | 157 +++ src/views/hr/newhr/rewpunireco.vue | 91 ++ src/views/hr/newhr/talentreview.vue | 91 ++ src/views/hr/newhr/workhistory.vue | 109 ++ src/views/hr/organization.vue | 17 +- src/views/hr/position.vue | 17 +- src/views/hr/team.vue | 11 +- src/views/personnel/post/index.vue | 18 +- src/views/personnel/post/position.vue | 594 +++++++++ src/views/purview/manage.vue | 34 +- src/views/purview/rolepower.vue | 10 +- 36 files changed, 5326 insertions(+), 42 deletions(-) create mode 100644 src/api/people/peopledata.js create mode 100644 src/api/time/dateval.js create mode 100644 src/views/hr/newhr/addpeople.vue create mode 100644 src/views/hr/newhr/appraisalrecords.vue create mode 100644 src/views/hr/newhr/competence.vue create mode 100644 src/views/hr/newhr/content/info.vue create mode 100644 src/views/hr/newhr/doubleemployees.vue create mode 100644 src/views/hr/newhr/emergencycontact.vue create mode 100644 src/views/hr/newhr/employmentrelationship.vue create mode 100644 src/views/hr/newhr/familymembers.vue create mode 100644 src/views/hr/newhr/introducevue.js create mode 100644 src/views/hr/newhr/people.vue create mode 100644 src/views/hr/newhr/peoplecont.vue create mode 100644 src/views/hr/newhr/peopleinfor.vue create mode 100644 src/views/hr/newhr/personneleducation.vue create mode 100644 src/views/hr/newhr/rewpunireco.vue create mode 100644 src/views/hr/newhr/talentreview.vue create mode 100644 src/views/hr/newhr/workhistory.vue create mode 100644 src/views/personnel/post/position.vue diff --git a/README.md b/README.md index 50e1aba..7ccf82b 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,26 @@ # kpi_vue_pc -绩效考核PC端 \ No newline at end of file +绩效考核PC端 + +### 金蝶图片处理方法 + + +1、原始值 + +``` +/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0a\r\nHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIy\r\nMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAB4AGQDASIA\r\nAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQA\r\nAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3\r\nODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWm\r\np6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEA\r\nAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSEx\r\nBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElK\r\nU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3\r\nuLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iii\r\ngAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiuK8afE3RfBhEM+65vCM+RERkfU9q8s\r\n1L9ojUpfMXTtLtoBkbTIS5Az+A9aAPoiivnSy/aJ1aIQrdaTbTgMfMcMVZhnjHYHHtXVJ+0LoTzq\r\ng0m9CFsFyy8DjnH50WA9horN0fX9L161W50y9huI2GfkbkfUda0qACiiigAooooAKKKKACvNfi94\r\n/n8IaRFaad5f268DDeSCYk6E4znPPB6cGvSq+N/G+pX3iXxxfzzyO7GYxxgrjYgOFAHYYoA5ue5u\r\ntQuGklkeWRjyTyTWtp/g/Vb6MSCHYh6F+K6/QfDUNqql0DMeQxFd9Y28SxqCOg5riqYuztE76eDu\r\nryPJofhvrMr4xGBjPLVU1TwPrWmAu1uZYx1aPkV77FEkZGBjj0qd7VHjJOMnsalYqZTwsD578KeI\r\n77wrrkN/b8SRHlWHUHqK+uPDmvWviXQ7bVLQ/u5l5U9VYdRXhPj7wnFc6c19bRKlzB8x2jG9e4rq\r\n/gLqvm6Pf6UyyboHEoJOVw3B7cHj1NddKqqkbo46tJ03Y9gooorQyCiiigAooooARlDKVPQjBr5B\r\nuNOksfGd/ZlQGguJFYAYxhiK+v68I+IPh5NJ+Icmp7D9m1FFkzjgOMhh/I/jUVHaLNKSvNGfbXq+\r\nXFFDH5jg9DwK37N7yKbzJ7B44iP9YrBl/H0rmpNAu7jUVnspmjhOPuqCf1rq9Pt7rT7SQ3OpTz5J\r\n2q4TGMcDgfrXm8sbHqXka0d1HcQwsqEDndx6VKNQjuUEcNtI7DrjA/nVbQZPO0l4jgsSV3d6zIdH\r\n1a01PdFqckaDO5PKVt47cnkU4aikjWmiS8tpYnjIyCCrDmsr4K2Mtvq2vuMeRGwh6dWDHv8AQH8x\r\nW7bi5SLF08byAfeRSufwya3PAelHTdHupGUA3d5LOP8AdLYH6DP4104bRuxyYnZHU0UUV1nGFFFF\r\nABRRRQAV598WkB0GxkI+7dYz6ZU/4V6DXMfEGxS+8FagGdEaBPPRnIABXnGT6jI/Gk1dFRdpJnEa\r\nA6yW6bSOnftTPFp+xadCsQIeeUIZOy9//rfjWJ4Xvz5WD9a19V1xY0XzxhG+VQR1NeW0k7WPYTbs\r\nyx4VvbRdHbdMdyNhmxkA5xW+syysY5gN6n5Hx1FYGj6qsdoqi2mWIdcQnn3rZe7tryJfKcM6Y5HU\r\nZ7GrtbUmSd9S7MuWVVHLcV2kUawxJGgAVQAAK47SUa51GBOysGb8Oa7SurD7NnDinqkFFFFdByhR\r\nRRQAUVxHi74oaL4R1A6fNFcXV4FDPHCBhM9AxJ6kc8Zrz7Xvj1fywGLRNKjtXPWa4fzCPouAPzzV\r\nKDZLkke8V4n8cPHWmS6B/wAI3pt3Hc3M8qtcmF9yxopyFJHGS2OO2Oe1eXan4/8AFWs20i3mt3jR\r\nygrJGj7EI9Nq4GKwYrYSISRnNWqbuS6iOl8IeINsqRTPyDg5r0GWKDV5FBfKg5BU9DXjCWksM6yw\r\nN8wPavR/D8d9NBHcRo+GGC0RHOPVT3+lcOJw7i+Y9DC4hSXKeiafZFAsf2mQADocY/lU17tgdW+U\r\nMBjPqKyrCK8chSbgkdyuKzfG2pLpFglmj7tRvPlUA58tP4nJ+nT3rmUJTaijpnVUU5M1tE+Iul6V\r\nrFzFeRSNBsCrPGN2GzyMenTn2rvtK8a+HNaYJZavbNIeBE7bHJ/3WwT+FfNKjaKy5gY7n5eAen+F\r\ne59VjCKSPB+tSnNtn2RRXyhpfi7X9ElX7Fql1HH2TeWX8VPBr0XQvjVdwsket2aXEXea3G1x7leh\r\n/Ss5UJLY0VaL3PaqKxdN8W6Dq1kl3a6pbeW3aSQIwPoQcGisrM05kfIs11dX80l1dzyTzync8srF\r\nmY+5PJpChwM0sC/IvsKsrGGBY/QV2qOhyOWpmonzTJjjINX7H/j3Q+oNQop+1Sj2FSQsLe2w5IKg\r\nnCjtmiKswbuiyAI8kDJNbHh3xNd6BeCSIGWFiBNAeVcf0Poa57z2kl8qNQMrnc57UtqUcEku/ue/\r\n07CiVpaCjeOqPoOPxT4e/sX+1fNxEB8y7TuVv7pA715JretSa7qz6i/yRE7YkIxtXt9TVDw/fxWu\r\npRSXFrHcWzHDQOThsMP16DPoTTL+2A1GZmVkyxGw9vQYrKlRUamhtWrOULMeD19KozkNNjsT+VKA\r\nUkZQxA9M8Uq88jrnqa7HqcaViAf6xoz+GakUlVKn8aimB87d6c1YADrkelSkU2S29w8MWwdM0VGv\r\nA60VauiXYu+FfD48QySILkQBV4YrnJOT0z6A1rzeCryGKIrPAyyIXG7K44Bx068iiivmcXmFejiX\r\nCL006eR6EKMJRuzOTwlfC5EjtAEc7PkYsQOTnp/+skVe1HwlCunyPDLIJo0LfvMFXwCSOBx90469\r\nKKKKWPrVEm2enh8DRlRnOS1V/wAFc4ooyQq+MvCSpHqP/wBVWUdTHmMDDDOR3oor30eEy1p8e61R\r\nyM7ZSD9Dx/hXUeIbXTLdNPFnNI92Yc3iuDhX9uOnX8AKKKqK99GcpPlaOXClpnPvToxgj0JxRRWx\r\nDGSICTz14ptucqVxlh70UVL3GtibyyaKKKsm5//Z +``` + +2、去除 \r\n 字符 + +3、添加base64头 + +``` +data:image/jpeg;base64, +``` + +4、处理后的效果 + +``` +data:image/jpeg;base64,/9j/4AAQSkZJRgABAgAAAQABAAD/2wBDAAgGBgcGBQgHBwcJCQgKDBQNDAsLDBkSEw8UHRofHh0aHBwgJC4nICIsIxwcKDcpLDAxNDQ0Hyc5PTgyPC4zNDL/2wBDAQkJCQwLDBgNDRgyIRwhMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjL/wAARCAB4AGQDASIAAhEBAxEB/8QAHwAAAQUBAQEBAQEAAAAAAAAAAAECAwQFBgcICQoL/8QAtRAAAgEDAwIEAwUFBAQAAAF9AQIDAAQRBRIhMUEGE1FhByJxFDKBkaEII0KxwRVS0fAkM2JyggkKFhcYGRolJicoKSo0NTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqDhIWGh4iJipKTlJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uHi4+Tl5ufo6erx8vP09fb3+Pn6/8QAHwEAAwEBAQEBAQEBAQAAAAAAAAECAwQFBgcICQoL/8QAtREAAgECBAQDBAcFBAQAAQJ3AAECAxEEBSExBhJBUQdhcRMiMoEIFEKRobHBCSMzUvAVYnLRChYkNOEl8RcYGRomJygpKjU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6goOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4uPk5ebn6Onq8vP09fb3+Pn6/9oADAMBAAIRAxEAPwD3+iiigAooooAKKKKACiiigAooooAKKKKACiiigAooooAKKKKACiuK8afE3RfBhEM+65vCM+RERkfU9q8s1L9ojUpfMXTtLtoBkbTIS5Az+A9aAPoiivnSy/aJ1aIQrdaTbTgMfMcMVZhnjHYHHtXVJ+0LoTzqg0m9CFsFyy8DjnH50WA9horN0fX9L161W50y9huI2GfkbkfUda0qACiiigAooooAKKKKACvNfi94/n8IaRFaad5f268DDeSCYk6E4znPPB6cGvSq+N/G+pX3iXxxfzzyO7GYxxgrjYgOFAHYYoA5ue5utQuGklkeWRjyTyTWtp/g/Vb6MSCHYh6F+K6/QfDUNqql0DMeQxFd9Y28SxqCOg5riqYuztE76eDuryPJofhvrMr4xGBjPLVU1TwPrWmAu1uZYx1aPkV77FEkZGBjj0qd7VHjJOMnsalYqZTwsD578KeI77wrrkN/b8SRHlWHUHqK+uPDmvWviXQ7bVLQ/u5l5U9VYdRXhPj7wnFc6c19bRKlzB8x2jG9e4rq/gLqvm6Pf6UyyboHEoJOVw3B7cHj1NddKqqkbo46tJ03Y9gooorQyCiiigAooooARlDKVPQjBr5BuNOksfGd/ZlQGguJFYAYxhiK+v68I+IPh5NJ+Icmp7D9m1FFkzjgOMhh/I/jUVHaLNKSvNGfbXq+XFFDH5jg9DwK37N7yKbzJ7B44iP9YrBl/H0rmpNAu7jUVnspmjhOPuqCf1rq9Pt7rT7SQ3OpTz5J2q4TGMcDgfrXm8sbHqXka0d1HcQwsqEDndx6VKNQjuUEcNtI7DrjA/nVbQZPO0l4jgsSV3d6zIdH1a01PdFqckaDO5PKVt47cnkU4aikjWmiS8tpYnjIyCCrDmsr4K2Mtvq2vuMeRGwh6dWDHv8AQH8xW7bi5SLF08byAfeRSufwya3PAelHTdHupGUA3d5LOP8AdLYH6DP4104bRuxyYnZHU0UUV1nGFFFFABRRRQAV598WkB0GxkI+7dYz6ZU/4V6DXMfEGxS+8FagGdEaBPPRnIABXnGT6jI/Gk1dFRdpJnEaA6yW6bSOnftTPFp+xadCsQIeeUIZOy9//rfjWJ4Xvz5WD9a19V1xY0XzxhG+VQR1NeW0k7WPYTbsyx4VvbRdHbdMdyNhmxkA5xW+syysY5gN6n5Hx1FYGj6qsdoqi2mWIdcQnn3rZe7tryJfKcM6Y5HUZ7GrtbUmSd9S7MuWVVHLcV2kUawxJGgAVQAAK47SUa51GBOysGb8Oa7SurD7NnDinqkFFFFdByhRRRQAUVxHi74oaL4R1A6fNFcXV4FDPHCBhM9AxJ6kc8Zrz7Xvj1fywGLRNKjtXPWa4fzCPouAPzzVKDZLkke8V4n8cPHWmS6B/wAI3pt3Hc3M8qtcmF9yxopyFJHGS2OO2Oe1eXan4/8AFWs20i3mt3jRygrJGj7EI9Nq4GKwYrYSISRnNWqbuS6iOl8IeINsqRTPyDg5r0GWKDV5FBfKg5BU9DXjCWksM6ywN8wPavR/D8d9NBHcRo+GGC0RHOPVT3+lcOJw7i+Y9DC4hSXKeiafZFAsf2mQADocY/lU17tgdW+UMBjPqKyrCK8chSbgkdyuKzfG2pLpFglmj7tRvPlUA58tP4nJ+nT3rmUJTaijpnVUU5M1tE+Iul6VrFzFeRSNBsCrPGN2GzyMenTn2rvtK8a+HNaYJZavbNIeBE7bHJ/3WwT+FfNKjaKy5gY7n5eAen+Fe59VjCKSPB+tSnNtn2RRXyhpfi7X9ElX7Fql1HH2TeWX8VPBr0XQvjVdwsket2aXEXea3G1x7leh/Ss5UJLY0VaL3PaqKxdN8W6Dq1kl3a6pbeW3aSQIwPoQcGisrM05kfIs11dX80l1dzyTzync8srFmY+5PJpChwM0sC/IvsKsrGGBY/QV2qOhyOWpmonzTJjjINX7H/j3Q+oNQop+1Sj2FSQsLe2w5IKgnCjtmiKswbuiyAI8kDJNbHh3xNd6BeCSIGWFiBNAeVcf0Poa57z2kl8qNQMrnc57UtqUcEku/ue/07CiVpaCjeOqPoOPxT4e/sX+1fNxEB8y7TuVv7pA715JretSa7qz6i/yRE7YkIxtXt9TVDw/fxWupRSXFrHcWzHDQOThsMP16DPoTTL+2A1GZmVkyxGw9vQYrKlRUamhtWrOULMeD19KozkNNjsT+VKAUkZQxA9M8Uq88jrnqa7HqcaViAf6xoz+GakUlVKn8aimB87d6c1YADrkelSkU2S29w8MWwdM0VGvA60VauiXYu+FfD48QySILkQBV4YrnJOT0z6A1rzeCryGKIrPAyyIXG7K44Bx068iiivmcXmFejiXCL006eR6EKMJRuzOTwlfC5EjtAEc7PkYsQOTnp/+skVe1HwlCunyPDLIJo0LfvMFXwCSOBx90469KKKKWPrVEm2enh8DRlRnOS1V/wAFc4ooyQq+MvCSpHqP/wBVWUdTHmMDDDOR3oor30eEy1p8e61RyM7ZSD9Dx/hXUeIbXTLdNPFnNI92Yc3iuDhX9uOnX8AKKKqK99GcpPlaOXClpnPvToxgj0JxRRWxDGSICTz14ptucqVxlh70UVL3GtibyyaKKKsm5//Z +``` diff --git a/package.json b/package.json index 9ae281c..cc4d62d 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "core-js": "^3.20.2", "echarts": "^5.3.2", "element-ui": "2.15.6", + "font-awesome": "^4.7.0", "js-cookie": "2.2.0", "normalize.css": "7.0.0", "nprogress": "0.2.0", @@ -27,6 +28,7 @@ "vuex": "3.1.0" }, "devDependencies": { + "@fortawesome/fontawesome-free": "^6.2.1", "@vue/cli-plugin-babel": "4.4.4", "@vue/cli-plugin-eslint": "4.4.4", "@vue/cli-plugin-unit-jest": "4.4.4", diff --git a/src/api/people/peopledata.js b/src/api/people/peopledata.js new file mode 100644 index 0000000..b0d4213 --- /dev/null +++ b/src/api/people/peopledata.js @@ -0,0 +1,414 @@ +//性别 +const sexData=[ + { + id:1, + tittle:'男' + }, + { + id:2, + tittle:'女' + }, + ]; +// 用工关系选择列表 +const emptypeList=[ + { + id:1, + tittle:'临时工' + }, + { + id:2, + tittle:'编外人员' + }, + { + id:3, + tittle:'实习&实习生' + }, + { + id:4, + tittle:'试用员工' + }, + { + id:5, + tittle:'待分配' + }, + { + id:6, + tittle:'待岗' + }, + { + id:7, + tittle:'临时调入' + }, + { + id:8, + tittle:'正式员工' + }, + { + id:9, + tittle:'长期病假' + }, + { + id:10, + tittle:'停薪留职' + }, + { + id:11, + tittle:'退休' + }, + { + id:12, + tittle:'辞职' + }, + { + id:13, + tittle:'辞退' + }, + { + id:14, + tittle:'离职' + }, + ]; +// 星座列表 +const constellationList = [ + { + id:1, + tittle:'白羊座' + }, + { + id:2, + tittle:'金牛座' + }, + { + id:3, + tittle:'双子座' + }, + { + id:4, + tittle:'巨蟹座' + }, + { + id:5, + tittle:'狮子座' + }, + { + id:6, + tittle:'处女座' + }, + { + id:7, + tittle:'天枰座' + }, + { + id:8, + tittle:'天蝎座' + }, + { + id:9, + tittle:'射手座' + }, + { + id:10, + tittle:'摩羯座' + }, + { + id:11, + tittle:'水瓶座' + }, + { + id:12, + tittle:'双鱼座' + }, + ]; +// 婚姻状态列表 +const marriageList=[ + { + id:1, + tittle:'未婚' + }, + { + id:2, + tittle:'已婚' + }, + { + id:3, + tittle:'丧偶' + }, + { + id:4, + tittle:'离异' + }, + ]; +// 健康状况列表 +const healthList=[ + { + id:1, + tittle:'良好' + }, + { + id:2, + tittle:'一般' + }, + { + id:3, + tittle:'较弱' + }, + { + id:4, + tittle:'有生理缺陷' + }, + { + id:5, + tittle:'残废' + }, + ]; +// 政治面貌列表 +const politicsList=[ + { + id:1, + tittle:'群众' + }, + { + id:2, + tittle:'无党派' + }, + { + id:3, + tittle:'台盟会员' + }, + { + id:4, + tittle:'九三社员' + }, + { + id:5, + tittle:'致公党员' + }, + { + id:6, + tittle:'农工党员' + }, + { + id:7, + tittle:'民进会员' + }, + { + id:8, + tittle:'民建会员' + }, + { + id:9, + tittle:'民盟盟员' + }, + { + id:10, + tittle:'民革会员' + }, + { + id:11, + tittle:'共青团员' + }, + { + id:12, + tittle:'预备党员' + }, + { + id:13, + tittle:'中共党员' + }, + + ]; + // 教育经历列表 +const educationList=[ + { + id:1, + tittle:'初中及以下' + }, + { + id:2, + tittle:'中专' + }, + { + id:3, + tittle:'高中' + }, + { + id:4, + tittle:'中技' + }, + { + id:5, + tittle:'高技' + }, + { + id:6, + tittle:'函数专科' + }, + { + id:7, + tittle:'大学专科' + }, + { + id:8, + tittle:'函数本科' + }, + { + id:9, + tittle:'大学本科' + }, + { + id:10, + tittle:'硕士研究生' + }, + { + id:11, + tittle:'博士研究生' + }, + { + id:12, + tittle:'专家、教授' + }, + ]; +//雇佣类型 +const employmentType = [ + { + id:1, + tittle:'雇佣入职' + }, + { + id:2, + tittle:'再入职' + } +]; +//入职等级 +const positiongrade = [ + { + id:1, + tittle:'一级' + }, + { + id:2, + tittle:'二级' + }, + { + id:3, + tittle:'三级' + } +]; + +//注册定义的方法 +export const peopleMethod= { + sexData, + emptypeList, + constellationList, + marriageList, + healthList, + politicsList, + educationList, + employmentType, + positiongrade +}; + + +//date 当前日期,num 几个月 +export function getNtoMonth(date, num) { + if (!date || !num) return; + var num1 = parseInt(num); + var d = new Date(date); + + var thisMonth = d.getMonth() + 1; + var thisYear = d.getFullYear(); + var thisDay = d.getDate(); + var dateStr = ""; + var addCount = thisMonth + num1; + var diffMonthCount = parseInt(addCount / 12); //取整 + + if ((thisMonth + num1) === 12 * diffMonthCount) { //如果是本年 + if ((thisMonth + num1) === 12) { + diffMonthCount = 0; + } else { + diffMonthCount = diffMonthCount - 1; + } + } + if (thisMonth + num1 > 12) { //如果是大于一年 + thisYear += diffMonthCount; + } + thisMonth = (addCount) - 12 * diffMonthCount; + if (thisMonth < 10) { + thisMonth = "0" + thisMonth; + } + + var thatDate = new Date(thisYear, thisMonth, 0); //当天数为0 js自动处理为上一月的最后一天 + + + + var thatDay = thatDate.getDate();//指定年月的当月最大天数 + let m1 = date.substring(5, 7); + if (thisDay === 30 || thisDay === 31 || (m1 === "02" && thisDay >= 28)) { + thisDay = thatDay; + console.log("thisYear------------->",thisYear,thisDay,date) + if (date) { + let m2 = date.substring(5, 10); + // 成立日为2月份，且期限为整年的判断闰年 + if (m2 === "02-28" && num % 12 === 0) { + if (!(thisYear % (thisYear % 100 ? 4 : 400))) { + thisDay = "29"; + } + } + console.log("thisYear-------1------>",thisYear,thisMonth,thisDay,date,m2,num) + } + + dateStr = thisYear + "-" + thisMonth + "-" + thisDay; + } else { + console.log("thisYear-------2------>",thisYear,thisDay,date,m1) + dateStr = addMonth2(date, num); + } + return dateStr; + } + function addMonth2(date, num) { + var monthnum = 0; + if (typeof (num) === "string") { monthnum = parseInt(num); } else { monthnum = num; } + if (typeof (date) === "string") { date = new Date(date); } + var year = date.getFullYear(); + var month = date.getMonth() + 1; + var day = date.getDate(); + var sumMonths = month + monthnum; + var newyear = year + parseInt(sumMonths / 12); + var newmonth = sumMonths % 12; + var newday = day; + + if (newmonth < 1) { + if (newmonth === 0) newyear--; + newmonth = 0 - (sumMonths - 1) % 12; + } + + + var da = new Date(newyear, newmonth, 0); + var newDayMax = da.getDate() + // if() + + + // console.log("thisYear-------4---1--->",newyear) + // console.log("thisYear-------4---2--->",newmonth) + // console.log("thisYear-------4---3--->",newday) + // console.log("thisYear-------4---4--->",date) + // console.log("thisYear-------4---5--->",da) + // console.log("thisYear-------4---6--->",year) + // console.log("thisYear-------4---7--->",month) + // console.log("thisYear-------4---8--->",day) + // console.log("thisYear-------4---9--->",newDayMax) + + return newyear + "-" + newmonth + "-" + (da.getDate() < newday ? da.getDate() : newday); +}; + + +//判断是不是数组 +export function judgeArray(ary){ + if(ary.isArray){ + return true; + }else{ + if (Object.prototype.toString.call(ary) === '[object Array]') { + return true; + } + } + return false; +}; \ No newline at end of file diff --git a/src/api/personnel/post.js b/src/api/personnel/post.js index f60f037..65d6170 100644 --- a/src/api/personnel/post.js +++ b/src/api/personnel/post.js @@ -31,6 +31,14 @@ export const positionlist = (data) => { data: data }) } +//职位（岗位）列表本岗位 +export const positionlistIsMe = (data) => { + return request({ + url: '/org/get_my_posit_list', + method: 'post', + data: data + }) +} //编辑职位（岗位） export const eitepositioncont = (data) => { return request({ @@ -64,14 +72,14 @@ export const govthree = (data) => { if(data){ // let dataJsonKeys=Object.keys(dataJson); let keys=Object.keys(data); - console.log('-------------------->key:',data,'value:',keys); + // console.log('-------------------->key:',data,'value:',keys); keys.forEach((items) => { - console.log('------------12-------->key:',items,'value:',data[items]); + // console.log('------------12-------->key:',items,'value:',data[items]); dataJson[items] = data[items] }) } - console.log('------------END-------->key:',dataJson,'value:',dataJson); + // console.log('------------END-------->key:',dataJson,'value:',dataJson); return request({ url: '/org/govthree', method: 'post', @@ -305,3 +313,46 @@ export const eiteteamcont = (data) => { } +//行政组织树编辑用 +export const orgThreeList = (data) => { + return request({ + url: '/org/govthreeing', + method: 'post', + data: data + }) +} + +//根据行政组织获取岗位 +export const getOrgPostList = (data) => { + return request({ + url: '/org/basis_org_postList', + method: 'post', + data: data + }) +} + +//添加职位（岗位）新版 +export const addpositioncontnew = (data) => { + return request({ + url: '/org/addpositioncontnew', + method: 'post', + data: data + }) +} +//添加职位（岗位）新版 +export const editpositioncontnew = (data) => { + return request({ + url: '/org/eitepositioncontnew', + method: 'post', + data: data + }) +} + +//添加人员信息（新版） +export const newAddPeopleCont = (data) => { + return request({ + url: '/staff/add_people_cont', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/api/systemaccredit/systemapi.js b/src/api/systemaccredit/systemapi.js index af2d746..6be31ff 100644 --- a/src/api/systemaccredit/systemapi.js +++ b/src/api/systemaccredit/systemapi.js @@ -90,4 +90,13 @@ export const delAboutPeople = (data) => { method: 'post', data: data }) +} + +//添加角色相关人员 +export const addAboutPeople = (data) => { + return request({ + url: '/powerpc/add_role_user', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/api/systemaccredit/systemhrapi.js b/src/api/systemaccredit/systemhrapi.js index b56279f..f2a8118 100644 --- a/src/api/systemaccredit/systemhrapi.js +++ b/src/api/systemaccredit/systemhrapi.js @@ -17,4 +17,55 @@ export const getOrgAndManSearchlist = (data) => { method: 'post', data: data }) +} + +//获取人员基本信息 +export const getOnlyOnePeopleCont = (data) => { + return request({ + url: '/staff/get_archives_cont', + method: 'post', + data: data + }) +} +//获取人员主信息 +export const getOnlyOnePeopleMainCont = (data) => { + return request({ + url: '/staff/get_people_main_cont', + method: 'post', + data: data + }) +} + +//获取紧急联系人列表 +export const getEmergencyContactList = (data) => { + return request({ + url: '/staff/emergencycontactlist', + method: 'post', + data: data + }) +} +//获取双职工列表 +export const getDoubleWorkerList = (data) => { + return request({ + url: '/staff/doubleworkerlist', + method: 'post', + data: data + }) +} + +//获取家庭成员列表 +export const getFamilyList = (data) => { + return request({ + url: '/staff/familymemberslist', + method: 'post', + data: data + }) +} +//获取教育经历列表 +export const getPersonneleDucationlist = (data) => { + return request({ + url: '/staff/personneleducationlist', + method: 'post', + data: data + }) } \ No newline at end of file diff --git a/src/api/time/dateval.js b/src/api/time/dateval.js new file mode 100644 index 0000000..e027a51 --- /dev/null +++ b/src/api/time/dateval.js @@ -0,0 +1,75 @@ +/** +@ 作者: 秦东 +@ 时间: 2022-11-25 11:10:03 +@ 功能: 计算N个月后的时间 +@ 参数 + #date 当前时间 格式：2022-11-25 + #num 几个月 +@ 返回值 + #计算后的时间 +@ 方法原型 + #function calculationDate(date,num) +*/ +export function calculationDate(date,num){ + console.log("date------123------>",date) + if (!date || !num) return; + if(date == "" || date == null) return; + var numInt = parseInt(num); + var oldDate = new Date(date); + //计算年月日 + var oldYear = oldDate.getFullYear(); + var oldMonth = oldDate.getMonth() + 1; + var oldDay = oldDate.getDate(); + + var guDuMonth = oldMonth + numInt; + var diffMonthCount = parseInt(guDuMonth / 12); //取整 + //修正差异月数值 + if(guDuMonth === 12 * diffMonthCount){ //如果是当前年 + if (guDuMonth === 12){ + diffMonthCount = 0 + }else{ + diffMonthCount = diffMonthCount - 1; + } + } + var newYear = oldYear + if(guDuMonth > 12){ //判断计算后的月份是否超过12月 + newYear = oldYear + diffMonthCount; + } + var newMonth = guDuMonth - 12 * diffMonthCount + + var thatDate = new Date(newYear, newMonth, 0); //当天数为0 js自动处理为上一月的最后一天 + var thatDay = thatDate.getDate();//指定年月的当月最大天数 + let newDay = thatDay; + let originalDate = date.substring(5, 7); + let dateStr = newYear + "-" + newMonth + "-" + oldDay; + // console.log("时间-----》",oldDay,thatDay) + if(oldDay > thatDay){ //判断源日期天是否大于目标日期天 + let differenceDay = oldDay - thatDay; + + if(differenceDay > 0){ + newMonth++; + newDay = differenceDay + }else if(differenceDay < 0){ + newMonth--; + var lastMonthDate = new Date(newYear, newMonth, 0); + newDay = lastMonthDate + differenceDay + }else{ + newMonth--; + newDay = new Date(newYear, newMonth, 0); + } + dateStr = newYear + "-" + newMonth + "-" + newDay; + }else{ + newDay = oldDay + } + if(newMonth < 10){ + newMonth = "0" + newMonth; + } + if(newDay < 10){ + newDay = "0" + newDay; + } + return { + newYear:newYear, + newMonth:newMonth, + newDay:newDay + }; +} \ No newline at end of file diff --git a/src/main.js b/src/main.js index 5654222..3a9aef8 100644 --- a/src/main.js +++ b/src/main.js @@ -13,6 +13,8 @@ import App from './App' import store from './store' import router from './router' +import 'font-awesome/css/font-awesome.min.css' + // import 'handsontable/dist/handsontable.full.css'; import '@/icons' // icon // import '@/permission' // permission control diff --git a/src/router/index.js b/src/router/index.js index 5abb910..4b8afb9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -136,7 +136,8 @@ export const constantRoutes = [ // UserHome 将被渲染到 User 的 内部 { path: 'post', - component: () => import('@/views/personnel/post/index'), + // component: () => import('@/views/personnel/post/index'), + component: () => import('@/views/personnel/post/position'), meta: { title: '岗位管理'} }, @@ -151,7 +152,8 @@ export const constantRoutes = [ // UserHome 将被渲染到 User 的 内部 { path: 'personnel', - component: () => import('@/views/hr/personnel.vue'), + // component: () => import('@/views/hr/personnel.vue'), + component: () => import('@/views/hr/newhr/people.vue'), meta: { title: '人员管理'} }, { @@ -176,6 +178,12 @@ export const constantRoutes = [ component: () => import('@/views/hr/team.vue'), meta: { title: '班组管理'} }, + + { + path: 'employeeinformation', + component: () => import('@/views/hr/newhr/peoplecont.vue'), + meta: { title: '人员详情'} + }, ], }, // 数据提报 diff --git a/src/views/assessmentProgram/gwQualitativeIndicators.vue b/src/views/assessmentProgram/gwQualitativeIndicators.vue index e471c81..9d96031 100644 --- a/src/views/assessmentProgram/gwQualitativeIndicators.vue +++ b/src/views/assessmentProgram/gwQualitativeIndicators.vue @@ -605,9 +605,9 @@ --> - + diff --git a/src/views/assessmentProgram/rules.vue b/src/views/assessmentProgram/rules.vue index aa11e28..0e31d82 100644 --- a/src/views/assessmentProgram/rules.vue +++ b/src/views/assessmentProgram/rules.vue @@ -101,7 +101,7 @@ :value="item"> - + -acceptdepartmentid + + + \ No newline at end of file diff --git a/src/views/hr/newhr/appraisalrecords.vue b/src/views/hr/newhr/appraisalrecords.vue new file mode 100644 index 0000000..b2360ba --- /dev/null +++ b/src/views/hr/newhr/appraisalrecords.vue @@ -0,0 +1,92 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/competence.vue b/src/views/hr/newhr/competence.vue new file mode 100644 index 0000000..59e6f57 --- /dev/null +++ b/src/views/hr/newhr/competence.vue @@ -0,0 +1,91 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/content/info.vue b/src/views/hr/newhr/content/info.vue new file mode 100644 index 0000000..95a3b23 --- /dev/null +++ b/src/views/hr/newhr/content/info.vue @@ -0,0 +1,44 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/doubleemployees.vue b/src/views/hr/newhr/doubleemployees.vue new file mode 100644 index 0000000..5701dc3 --- /dev/null +++ b/src/views/hr/newhr/doubleemployees.vue @@ -0,0 +1,154 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/emergencycontact.vue b/src/views/hr/newhr/emergencycontact.vue new file mode 100644 index 0000000..5a9d123 --- /dev/null +++ b/src/views/hr/newhr/emergencycontact.vue @@ -0,0 +1,151 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/employmentrelationship.vue b/src/views/hr/newhr/employmentrelationship.vue new file mode 100644 index 0000000..af30c11 --- /dev/null +++ b/src/views/hr/newhr/employmentrelationship.vue @@ -0,0 +1,91 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/familymembers.vue b/src/views/hr/newhr/familymembers.vue new file mode 100644 index 0000000..b3103e4 --- /dev/null +++ b/src/views/hr/newhr/familymembers.vue @@ -0,0 +1,164 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/introducevue.js b/src/views/hr/newhr/introducevue.js new file mode 100644 index 0000000..b8d3871 --- /dev/null +++ b/src/views/hr/newhr/introducevue.js @@ -0,0 +1,11 @@ +export { default as peopleinfor } from "./peopleinfor.vue" //基本信息 +export { default as emergencycontact } from "./emergencycontact.vue" //紧急联系人 +export { default as doubleemployees } from "./doubleemployees.vue" //双职工 +export { default as familymembers } from "./familymembers.vue" //家庭成员 +export { default as personneleducation } from "./personneleducation.vue" //教育经历 +export { default as workhistory } from "./workhistory.vue" //工作履历 +export { default as employmentrelationship } from "./employmentrelationship.vue" //用工关系 +export { default as rewpunireco } from "./rewpunireco.vue" //奖惩记录 +export { default as competence } from "./competence.vue" //能力素质 +export { default as talentreview } from "./talentreview.vue" //人才盘点 +export { default as appraisalrecords } from "./appraisalrecords.vue" //考评记录 \ No newline at end of file diff --git a/src/views/hr/newhr/people.vue b/src/views/hr/newhr/people.vue new file mode 100644 index 0000000..7a68273 --- /dev/null +++ b/src/views/hr/newhr/people.vue @@ -0,0 +1,1138 @@ + + + + \ No newline at end of file diff --git a/src/views/hr/newhr/peoplecont.vue b/src/views/hr/newhr/peoplecont.vue new file mode 100644 index 0000000..5e45349 --- /dev/null +++ b/src/views/hr/newhr/peoplecont.vue @@ -0,0 +1,258 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/peopleinfor.vue b/src/views/hr/newhr/peopleinfor.vue new file mode 100644 index 0000000..d3a47b8 --- /dev/null +++ b/src/views/hr/newhr/peopleinfor.vue @@ -0,0 +1,288 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/personneleducation.vue b/src/views/hr/newhr/personneleducation.vue new file mode 100644 index 0000000..6c7031c --- /dev/null +++ b/src/views/hr/newhr/personneleducation.vue @@ -0,0 +1,157 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/rewpunireco.vue b/src/views/hr/newhr/rewpunireco.vue new file mode 100644 index 0000000..7ad57f0 --- /dev/null +++ b/src/views/hr/newhr/rewpunireco.vue @@ -0,0 +1,91 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/talentreview.vue b/src/views/hr/newhr/talentreview.vue new file mode 100644 index 0000000..0ebeb8e --- /dev/null +++ b/src/views/hr/newhr/talentreview.vue @@ -0,0 +1,91 @@ + + + \ No newline at end of file diff --git a/src/views/hr/newhr/workhistory.vue b/src/views/hr/newhr/workhistory.vue new file mode 100644 index 0000000..9cb582f --- /dev/null +++ b/src/views/hr/newhr/workhistory.vue @@ -0,0 +1,109 @@ + + + \ No newline at end of file diff --git a/src/views/hr/organization.vue b/src/views/hr/organization.vue index 5642c8e..76d4ab5 100644 --- a/src/views/hr/organization.vue +++ b/src/views/hr/organization.vue @@ -211,7 +211,7 @@ + \ No newline at end of file diff --git a/src/views/purview/manage.vue b/src/views/purview/manage.vue index 463eb66..58de374 100644 --- a/src/views/purview/manage.vue +++ b/src/views/purview/manage.vue @@ -47,7 +47,7 @@ {{tableName}}（{{total}}人） - 角色详情 + @@ -189,7 +189,9 @@ - + + 已选择的部门或成员 + @@ -227,7 +229,7 @@