Commit f356d795fa1df53540907ff7e438e2b696a4593a
1 parent
33c82f21
11
Showing
3 changed files
with
150 additions
and
8 deletions
src/utils/routerList.js
src/views/user/userlist.vue
| ... | ... | @@ -128,7 +128,9 @@ |
| 128 | 128 | |
| 129 | 129 | <el-table-column prop="date" label="近期测试"> |
| 130 | 130 | <template slot-scope="{ row }"> |
| 131 | - <span title="查看面试记录" v-if="row.TestPaperTitle || 1 == 1" @click="handleTestHitory(row)" class="el-icon-star-off" style="font-size:24px;color:#409EFF;cursor:pointer;"></span> | |
| 131 | + <span title="查看面试记录" v-if="row.TestPaperTitle || 1 == 1" @click="handleTestHitory(row)" | |
| 132 | + class="el-icon-star-off" | |
| 133 | + style="font-size:24px;color:#409EFF;cursor:pointer;"></span> | |
| 132 | 134 | <span>{{ row.TestPaperTitle || "无" }}</span> |
| 133 | 135 | </template> |
| 134 | 136 | </el-table-column> |
| ... | ... | @@ -373,6 +375,108 @@ |
| 373 | 375 | <el-input v-model="adminUserInfo.RegisteredResidence" placeholder="请输入户籍所在地" style="width: 70%"> |
| 374 | 376 | </el-input> |
| 375 | 377 | </el-form-item> |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + <el-form-item label="技能优势" prop="skillAdvantages" style="width:100%;clear:both"> | |
| 385 | + <el-card class="box-card" v-for="(saitem,index) in adminUserInfo.skillAdvantages" > | |
| 386 | + | |
| 387 | + <el-row style="margin-bottom:0px;display:flex;justify-content: space-between;"> | |
| 388 | + <el-col style="width:20px"> | |
| 389 | + <el-tag size="mini" effect="plain" >{{index+1}}.</el-tag> | |
| 390 | + </el-col> | |
| 391 | + <el-col :span="10" > | |
| 392 | + <el-input v-model="saitem.title" placeholder="技能名称" > | |
| 393 | + </el-input> | |
| 394 | + </el-col> | |
| 395 | + <el-col :span="11" > | |
| 396 | + <el-input v-model="saitem.desc" placeholder="技能描述"></el-input> | |
| 397 | + </el-col> | |
| 398 | + | |
| 399 | + | |
| 400 | + <el-button @click.prevent="removeInfo('skillAdvantages',saitem)" | |
| 401 | + style="margin-left:10px;">删除</el-button> | |
| 402 | + <el-button v-if="index == (adminUserInfo.skillAdvantages.length-1)" @click="addInfo('skillAdvantages')">新增</el-button> | |
| 403 | + | |
| 404 | + | |
| 405 | + </el-row> | |
| 406 | + | |
| 407 | + | |
| 408 | + </el-card> | |
| 409 | + | |
| 410 | + | |
| 411 | + </el-form-item> | |
| 412 | + | |
| 413 | + | |
| 414 | + <el-form-item label="教育经历" prop="RegisteredResidence" style="width:100%"> | |
| 415 | + <el-card class="box-card" v-for="(saitem,index) in adminUserInfo.educationalExperience" > | |
| 416 | + | |
| 417 | + <el-row style="margin-bottom:0px;display:flex;justify-content: space-between;"> | |
| 418 | + <el-col style="width:20px"> | |
| 419 | + <el-tag size="mini" effect="plain" >{{index+1}}.</el-tag> | |
| 420 | + </el-col> | |
| 421 | + <el-col :span="6" > | |
| 422 | + <el-input v-model="saitem.school" placeholder="学校" > | |
| 423 | + </el-input> | |
| 424 | + </el-col> | |
| 425 | + <el-col :span="5" > | |
| 426 | + <el-input v-model="saitem.date" placeholder="时间"></el-input> | |
| 427 | + </el-col> | |
| 428 | + | |
| 429 | + <el-col :span="4" > | |
| 430 | + <el-input v-model="saitem.major" placeholder="专业"></el-input> | |
| 431 | + </el-col> | |
| 432 | + | |
| 433 | + <el-col :span="6" > | |
| 434 | + <el-input v-model="saitem.degree" placeholder="学历"></el-input> | |
| 435 | + </el-col> | |
| 436 | + | |
| 437 | + <el-button @click.prevent="removeInfo('educationalExperience',saitem)" | |
| 438 | + style="margin-left:10px;">删除</el-button> | |
| 439 | + <el-button v-if="index == (adminUserInfo.educationalExperience.length-1)" @click="addInfo('educationalExperience')">新增</el-button> | |
| 440 | + | |
| 441 | + | |
| 442 | + </el-row> | |
| 443 | + | |
| 444 | + | |
| 445 | + </el-card> | |
| 446 | + | |
| 447 | + | |
| 448 | + </el-form-item> | |
| 449 | + | |
| 450 | + | |
| 451 | + <el-form-item label="工作经历" prop="RegisteredResidence" style="width:100%"> | |
| 452 | + <el-card class="box-card"v-for="(saitem,index) in adminUserInfo.workExperience" > | |
| 453 | + | |
| 454 | + <el-row style="margin-bottom:0px;display:flex;justify-content: space-between;"> | |
| 455 | + <el-col style="width:20px"> | |
| 456 | + <el-tag size="mini" effect="plain" >{{index+1}}.</el-tag> | |
| 457 | + </el-col> | |
| 458 | + <el-col :span="5" class="padding"> | |
| 459 | + <el-input v-model="saitem.company" placeholder="公司"> | |
| 460 | + </el-input> | |
| 461 | + </el-col> | |
| 462 | + <el-col :span="5"> | |
| 463 | + <el-input v-model="saitem.position" placeholder="岗位"></el-input> | |
| 464 | + </el-col> | |
| 465 | + <el-col :span="5"> | |
| 466 | + <el-input v-model="saitem.date" placeholder="时间"></el-input> | |
| 467 | + </el-col> | |
| 468 | + | |
| 469 | + <el-col :span="5"> | |
| 470 | + <el-input v-model="saitem.desc" placeholder="概述"></el-input> | |
| 471 | + </el-col> | |
| 472 | + <el-button @click.prevent="removeInfo('workExperience',saitem)">删除</el-button> | |
| 473 | + <el-button v-if="index == (adminUserInfo.workExperience.length-1)" @click="addInfo('workExperience')">新增</el-button> | |
| 474 | + | |
| 475 | + </el-row> | |
| 476 | + </el-card> | |
| 477 | + </el-form-item> | |
| 478 | + | |
| 479 | + | |
| 376 | 480 | <!-- <el-form-item label="密码" prop="password" > |
| 377 | 481 | <el-input v-model="adminUserInfo.password " placeholder="请输入密码 不填默认不修改" show-password style="width: 40%;"></el-input> |
| 378 | 482 | </el-form-item> --> |
| ... | ... | @@ -569,8 +673,13 @@ |
| 569 | 673 | dialogVisiblecat: false, |
| 570 | 674 | filterText: "", |
| 571 | 675 | gridData: [], |
| 676 | + Dataform:{}, | |
| 572 | 677 | Count: 0, |
| 573 | - adminUserInfo: {}, | |
| 678 | + adminUserInfo: { | |
| 679 | + skillAdvantages: [{}],// 技能优势 | |
| 680 | + workExperience: [{}],// 工作经历 | |
| 681 | + educationalExperience: [{}],// 教育经历 | |
| 682 | + }, | |
| 574 | 683 | temp: { |
| 575 | 684 | ParentId: 0, |
| 576 | 685 | }, |
| ... | ... | @@ -700,6 +809,15 @@ |
| 700 | 809 | this.loadTree(); |
| 701 | 810 | }, |
| 702 | 811 | methods: { |
| 812 | + removeInfo(type, item) { | |
| 813 | + var index = this.adminUserInfo[type].indexOf(item) | |
| 814 | + if (index !== -1) { | |
| 815 | + this.adminUserInfo[type].splice(index, 1) | |
| 816 | + } | |
| 817 | + }, | |
| 818 | + addInfo(type) { | |
| 819 | + this.adminUserInfo[type].push({}); | |
| 820 | + }, | |
| 703 | 821 | handleChangeCat() { |
| 704 | 822 | var rows = this.$refs.userList.selection; |
| 705 | 823 | if (!rows || rows.length < 1) { |
| ... | ... | @@ -872,7 +990,15 @@ |
| 872 | 990 | let formData = { |
| 873 | 991 | ...this.adminUserInfo |
| 874 | 992 | }; |
| 875 | - console.log('submitForm', JSON.stringify(formData)); | |
| 993 | + if(formData.skillAdvantages) formData.skillAdvantages = JSON.stringify(formData.skillAdvantages); | |
| 994 | + if(formData.workExperience) formData.workExperience = JSON.stringify(formData.workExperience); | |
| 995 | + if(formData.educationalExperience) formData.educationalExperience = JSON.stringify(formData.educationalExperience); | |
| 996 | + | |
| 997 | + | |
| 998 | +// 技能优势 | |
| 999 | +// 工作经历 | |
| 1000 | +// 教育经历 | |
| 1001 | + | |
| 876 | 1002 | if (formData.id) { |
| 877 | 1003 | |
| 878 | 1004 | SelectPhoneBool(formData.id, formData.phone).then(res => { |
| ... | ... | @@ -903,13 +1029,29 @@ |
| 903 | 1029 | } |
| 904 | 1030 | }, |
| 905 | 1031 | handleEdit(data) { |
| 1032 | + debugger; | |
| 906 | 1033 | this.dialogClassIVIsible = true; |
| 907 | 1034 | console.log(" -_- ", data); |
| 908 | 1035 | if (data == -1) { |
| 909 | - this.adminUserInfo = { userClassId: (this.query.userClassId || 0) }; | |
| 1036 | + this.adminUserInfo = { | |
| 1037 | + userClassId: (this.query.userClassId || 0), | |
| 1038 | + skillAdvantages: [{}],// 技能优势 | |
| 1039 | + workExperience: [{}],// 工作经历 | |
| 1040 | + educationalExperience: [{}],// 教育经历 | |
| 1041 | + }; | |
| 910 | 1042 | } |
| 911 | - else | |
| 1043 | + else { | |
| 1044 | + if (!data.skillAdvantages) data.skillAdvantages = [{}]; | |
| 1045 | + else if(typeof(data.skillAdvantages)=='string')data.skillAdvantages = JSON.parse(data.skillAdvantages);; | |
| 1046 | + if (!data.workExperience) data.workExperience = [{}]; | |
| 1047 | + else if(typeof(data.workExperience)=='string')data.workExperience = JSON.parse(data.workExperience);; | |
| 1048 | + if (!data.educationalExperience) data.educationalExperience = [{}]; | |
| 1049 | + else if(typeof(data.educationalExperience)=='string')data.educationalExperience = JSON.parse(data.educationalExperience);; | |
| 1050 | + | |
| 912 | 1051 | this.adminUserInfo = data; |
| 1052 | + | |
| 1053 | + } | |
| 1054 | + | |
| 913 | 1055 | }, |
| 914 | 1056 | handleTestHitory(row) { |
| 915 | 1057 | GetHistoryList({ | ... | ... |
vue.config.js
| ... | ... | @@ -38,8 +38,8 @@ module.exports = { |
| 38 | 38 | }, |
| 39 | 39 | proxy: { |
| 40 | 40 | '/development': { |
| 41 | - target: `http://admin.7-stars.com.cn/`, //后台服务地址 | |
| 42 | - // target:'http://localhost:8877', | |
| 41 | + // target: `http://admin.7-stars.com.cn/`, //后台服务地址 | |
| 42 | + target:'http://localhost:8877', | |
| 43 | 43 | // target:'http://localhost:8009', |
| 44 | 44 | changeOrigin: true, |
| 45 | 45 | pathRewrite: { | ... | ... |