XMTT 7 years ago
parent
commit
da6af5a8ff

+ 8 - 8
html/model/sys/professornew/details.html

137
                <div class="form-item dyn-mselect orgSize" name="industryList"></div>
137
                <div class="form-item dyn-mselect orgSize" name="industryList"></div>
138
            </div>
138
            </div>
139
        </div>
139
        </div>
140
        <div class="row">
141
            <div class="col-10"></div>
142
            <div class="col-4 pull-right">
143
                <div class="btn pull-right opt-save">
144
                    <i class="icon-check"></i> 保存
145
                </div>
146
            </div>
147
        </div>
148
    </div>
140
    </div>
149
    <div class="container">
141
    <div class="container">
150
        <table class="table table-bordered">
142
        <table class="table table-bordered">
261
            </tbody>
253
            </tbody>
262
        </table>
254
        </table>
263
    </div>
255
    </div>
256
    <div class="row">
257
        <div class="col-10"></div>
258
        <div class="col-4 pull-right">
259
            <div class="btn pull-right opt-save">
260
                <i class="icon-check"></i> 保存
261
            </div>
262
        </div>
263
    </div>
264
</div>
264
</div>

+ 4 - 4
html/model/sys/professornew/edu.html

6
        <div class="row">
6
        <div class="row">
7
            <div class="col-2 item-caption">学校名称</div>
7
            <div class="col-2 item-caption">学校名称</div>
8
            <div class="col-6">
8
            <div class="col-6">
9
                <div class="form-item text" placeholder="学校名称不得超过50个字" name="school"></div>
9
                <div class="form-item text trim" placeholder="学校名称不得超过50个字" name="school"></div>
10
            </div>
10
            </div>
11
            <span class="requiredSpan">*</span>
11
            <span class="requiredSpan">*</span>
12
        </div>
12
        </div>
13
        <div class="row">
13
        <div class="row">
14
            <div class="col-2 item-caption">院系名称</div>
14
            <div class="col-2 item-caption">院系名称</div>
15
            <div class="col-6">
15
            <div class="col-6">
16
                <div class="form-item text" placeholder="院系名称不得超过20个字" name="college"></div>
16
                <div class="form-item text trim" placeholder="院系名称不得超过20个字" name="college"></div>
17
            </div>
17
            </div>
18
        </div>
18
        </div>
19
        <div class="row">
19
        <div class="row">
20
            <div class="col-2 item-caption">专业名称</div>
20
            <div class="col-2 item-caption">专业名称</div>
21
            <div class="col-6">
21
            <div class="col-6">
22
                <div class="form-item text" placeholder="专业名称不得超过20个字" name="major"></div>
22
                <div class="form-item text trim" placeholder="专业名称不得超过20个字" name="major"></div>
23
            </div>
23
            </div>
24
        </div>
24
        </div>
25
        <div class="row">
25
        <div class="row">
38
            <div class="col-10"></div>
38
            <div class="col-10"></div>
39
            <div class="col-2">
39
            <div class="col-2">
40
                <div class="btn pull-right opt-save">
40
                <div class="btn pull-right opt-save">
41
                    <i class="icon-check"></i> SAVE
41
                    <i class="icon-check"></i> 保存
42
                </div>
42
                </div>
43
43
44
            </div>
44
            </div>

+ 2 - 2
html/model/sys/professornew/honor.html

6
        <div class="row">
6
        <div class="row">
7
            <div class="col-2 item-caption">奖项名称</div>
7
            <div class="col-2 item-caption">奖项名称</div>
8
            <div class="col-6">
8
            <div class="col-6">
9
                <div class="form-item text" placeholder="奖项名称不得超过50个字" name="name"></div>
9
                <div class="form-item text trim" placeholder="奖项名称不得超过50个字" name="name"></div>
10
            </div>
10
            </div>
11
            <span class="requiredSpan">*</span>
11
            <span class="requiredSpan">*</span>
12
        </div>
12
        </div>
26
            <div class="col-10"></div>
26
            <div class="col-10"></div>
27
            <div class="col-2">
27
            <div class="col-2">
28
                <div class="btn pull-right opt-save">
28
                <div class="btn pull-right opt-save">
29
                    <i class="icon-check"></i> SAVE
29
                    <i class="icon-check"></i> 保存
30
                </div>
30
                </div>
31
31
32
            </div>
32
            </div>

+ 4 - 4
html/model/sys/professornew/job.html

6
        <div class="row">
6
        <div class="row">
7
            <div class="col-2 item-caption">机构名称</div>
7
            <div class="col-2 item-caption">机构名称</div>
8
            <div class="col-6">
8
            <div class="col-6">
9
                <div class="form-item text" placeholder="机构名称不得超过50个字" name="company"></div>
9
                <div class="form-item text trim" placeholder="机构名称不得超过50个字" name="company"></div>
10
            </div>
10
            </div>
11
            <span class="requiredSpan">*</span>
11
            <span class="requiredSpan">*</span>
12
        </div>
12
        </div>
13
        <div class="row">
13
        <div class="row">
14
            <div class="col-2 item-caption">所在部门</div>
14
            <div class="col-2 item-caption">所在部门</div>
15
            <div class="col-6">
15
            <div class="col-6">
16
                <div class="form-item text" placeholder="部门名称不得超过50个字" name="department"></div>
16
                <div class="form-item text trim" placeholder="部门名称不得超过50个字" name="department"></div>
17
            </div>
17
            </div>
18
        </div>
18
        </div>
19
        <div class="row">
19
        <div class="row">
20
            <div class="col-2 item-caption">职位</div>
20
            <div class="col-2 item-caption">职位</div>
21
            <div class="col-6">
21
            <div class="col-6">
22
                <div class="form-item text" placeholder="职位不得超过50个字" name="title"></div>
22
                <div class="form-item text trim" placeholder="职位不得超过50个字" name="title"></div>
23
            </div>
23
            </div>
24
            <span class="requiredSpan">*</span>
24
            <span class="requiredSpan">*</span>
25
        </div>
25
        </div>
37
            <div class="col-10"></div>
37
            <div class="col-10"></div>
38
            <div class="col-2">
38
            <div class="col-2">
39
                <div class="btn pull-right opt-save">
39
                <div class="btn pull-right opt-save">
40
                    <i class="icon-check"></i> SAVE
40
                    <i class="icon-check"></i> 保存
41
                </div>
41
                </div>
42
42
43
            </div>
43
            </div>

+ 1 - 1
html/model/sys/professornew/project.html

30
            <div class="col-10"></div>
30
            <div class="col-10"></div>
31
            <div class="col-2">
31
            <div class="col-2">
32
                <div class="btn pull-right opt-save">
32
                <div class="btn pull-right opt-save">
33
                    <i class="icon-check"></i> SAVE
33
                    <i class="icon-check"></i> 保存
34
                </div>
34
                </div>
35
            </div>
35
            </div>
36
        </div>
36
        </div>

+ 1 - 1
html/model/sys/userInfo/edu.html

38
            <div class="col-10"></div>
38
            <div class="col-10"></div>
39
            <div class="col-2">
39
            <div class="col-2">
40
                <div class="btn pull-right opt-save">
40
                <div class="btn pull-right opt-save">
41
                    <i class="icon-check"></i> SAVE
41
                    <i class="icon-check"></i> 保存
42
                </div>
42
                </div>
43
43
44
            </div>
44
            </div>

+ 1 - 1
html/model/sys/userInfo/honor.html

26
            <div class="col-10"></div>
26
            <div class="col-10"></div>
27
            <div class="col-2">
27
            <div class="col-2">
28
                <div class="btn pull-right opt-save">
28
                <div class="btn pull-right opt-save">
29
                    <i class="icon-check"></i> SAVE
29
                    <i class="icon-check"></i> 保存
30
                </div>
30
                </div>
31
31
32
            </div>
32
            </div>

+ 1 - 1
html/model/sys/userInfo/job.html

37
            <div class="col-10"></div>
37
            <div class="col-10"></div>
38
            <div class="col-2">
38
            <div class="col-2">
39
                <div class="btn pull-right opt-save">
39
                <div class="btn pull-right opt-save">
40
                    <i class="icon-check"></i> SAVE
40
                    <i class="icon-check"></i> 保存
41
                </div>
41
                </div>
42
42
43
            </div>
43
            </div>

+ 1 - 1
html/model/sys/userInfo/project.html

30
            <div class="col-10"></div>
30
            <div class="col-10"></div>
31
            <div class="col-2">
31
            <div class="col-2">
32
                <div class="btn pull-right opt-save">
32
                <div class="btn pull-right opt-save">
33
                    <i class="icon-check"></i> SAVE
33
                    <i class="icon-check"></i> 保存
34
                </div>
34
                </div>
35
            </div>
35
            </div>
36
        </div>
36
        </div>

+ 30 - 14
js/model/sys/professornew/details.js

24
                };
24
                };
25
                var saveBtn = root.find(".opt-save"),
25
                var saveBtn = root.find(".opt-save"),
26
                    save = function () {
26
                    save = function () {
27
                        var researchAreas = [];
28
                        var researchList = form.val().researchAreaList || [];
29
                        for (var i = 0; i < researchList.length; ++i) {
30
                            var item = {caption: researchList[i], professorId: data.data.id};
31
                            researchAreas.push(item);
32
                        }
33
                        form.val({researchAreas: researchAreas});
34
                        if(form.val().industryList) {
35
                            form.val({
36
                                industry: oString(form.val().industryList)
37
                            });
38
                        }else {
39
                            form.val({industry: null});
40
                        }
41
                        if(form.val().subjectList) {
42
                            form.val({
43
                                subject: oString(form.val().subjectList)
44
                            });
45
                        }else {
46
                            form.val({subject: null});
47
                        }
27
                        form.val({
48
                        form.val({
28
                            industry: oString(form.val().industryList),
29
                            subject: oString(form.val().subjectList),
30
                            researchArea: form.val().researchAreaList,
31
                            subjectList: "", industryList: "", researchAreaList: ""
49
                            subjectList: "", industryList: "", researchAreaList: ""
32
                        });
50
                        });
33
                        if (form.val().title) {
51
                        if (form.val().title) {
96
                                if (data.hand) {
114
                                if (data.hand) {
97
                                    data.hand();
115
                                    data.hand();
98
                                }
116
                                }
99
                            }, function (data) {
100
                                util.alert(data.msg);
101
                            });
117
                            }, {"50000":"只能修改未激活用户信息"});
102
                        } else {
118
                        } else {
103
                            util.alert("手机或邮箱至少输入一项");
119
                            util.alert("手机或邮箱至少输入一项");
104
                        }
120
                        }
211
                var split2 = function (data) {
227
                var split2 = function (data) {
212
                    var arr = [];
228
                    var arr = [];
213
                    for (var m = 0; m < data.length; m++) {
229
                    for (var m = 0; m < data.length; m++) {
214
                        ca.items.push({code: data[m], caption: data[m]});
215
                        arr.push(data[m]);
230
                        ca.items.push({code: data[m].caption, caption: data[m].caption});
231
                        arr.push(data[m].caption);
216
                    }
232
                    }
217
                    return arr;
233
                    return arr;
218
                };
234
                };
223
                if (data.data.subject) {
239
                if (data.data.subject) {
224
                    form.val({subjectList: split(data.data.subject)});
240
                    form.val({subjectList: split(data.data.subject)});
225
                }
241
                }
226
                if (data.data.researchArea) {
227
                    form.val({researchAreaList: split2(data.data.researchArea)});
242
                if (data.data.researchAreas) {
243
                    form.val({researchAreaList: split2(data.data.researchAreas)});
228
                }
244
                }
229
245
230
246
295
                        if (project) {
311
                        if (project) {
296
                            util.boxMsg({
312
                            util.boxMsg({
297
                                title: "确认删除",
313
                                title: "确认删除",
298
                                content: "确认删除该项目经历?",
314
                                content: "确认删除该项目经历?删除后无法恢复。",
299
                                btns: [{
315
                                btns: [{
300
                                    caption: "删除",
316
                                    caption: "删除",
301
                                    hand: function () {
317
                                    hand: function () {
339
                        if (honor) {
355
                        if (honor) {
340
                            util.boxMsg({
356
                            util.boxMsg({
341
                                title: "确认删除",
357
                                title: "确认删除",
342
                                content: "确认删除该荣誉奖项?",
358
                                content: "确认删除该荣誉奖项?删除后无法恢复。",
343
                                btns: [{
359
                                btns: [{
344
                                    caption: "删除",
360
                                    caption: "删除",
345
                                    hand: function () {
361
                                    hand: function () {
383
                        if (job) {
399
                        if (job) {
384
                            util.boxMsg({
400
                            util.boxMsg({
385
                                title: "确认删除",
401
                                title: "确认删除",
386
                                content: "确认删除该工作经历?",
402
                                content: "确认删除该工作经历?删除后无法恢复。",
387
                                btns: [{
403
                                btns: [{
388
                                    caption: "删除",
404
                                    caption: "删除",
389
                                    hand: function () {
405
                                    hand: function () {
427
                        if (edu) {
443
                        if (edu) {
428
                            util.boxMsg({
444
                            util.boxMsg({
429
                                title: "确认删除",
445
                                title: "确认删除",
430
                                content: "确认删除该教育经历?",
446
                                content: "确认删除该教育经历?删除后无法恢复。",
431
                                btns: [{
447
                                btns: [{
432
                                    caption: "删除",
448
                                    caption: "删除",
433
                                    hand: function () {
449
                                    hand: function () {

+ 19 - 17
js/model/sys/professornew/eduNew.js

6
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
6
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
7
        return {
7
        return {
8
            modal: function (data) {
8
            modal: function (data) {
9
                var root = spa.findInModal(".sys_userinfo_edu");
9
                var root = spa.findInModal(".sys_professornew_edu");
10
                var form = fb.build(root.find(".newForm"));
10
                var form = fb.build(root.find(".newForm"));
11
                var saveBtn = root.find(".opt-save"),
11
                var saveBtn = root.find(".opt-save"),
12
                    save = function () {
12
                    save = function () {
13
                        if (form.val().eduSchool) {
14
                            var eduSchool = trim(form.val().eduSchool);
15
                            if (eduSchool.length > 50) {
13
                        if (form.val().school) {
14
                            var school = trim(form.val().school);
15
                            if (school.length > 50) {
16
                                util.alert("学校名称不得超过50个字");
16
                                util.alert("学校名称不得超过50个字");
17
                                return;
17
                                return;
18
                            }
18
                            }
20
                            util.alert("请填写学校名称");
20
                            util.alert("请填写学校名称");
21
                            return;
21
                            return;
22
                        }
22
                        }
23
                        if (form.val().eduCollege) {
24
                            var eduCollege = trim(form.val().eduCollege);
25
                            if (eduCollege.length > 20) {
23
                        if (form.val().college) {
24
                            var college = trim(form.val().college);
25
                            if (college.length > 20) {
26
                                util.alert("院系名称不得超过20个字");
26
                                util.alert("院系名称不得超过20个字");
27
                                return;
27
                                return;
28
                            }
28
                            }
29
                        }
29
                        }
30
                        if (form.val().eduMajor) {
31
                            var eduMajor = trim(form.val().eduMajor);
32
                            if (eduMajor.length > 20) {
30
                        if (form.val().major) {
31
                            var major = trim(form.val().major);
32
                            if (major.length > 20) {
33
                                util.alert("专业名称不得超过20个字");
33
                                util.alert("专业名称不得超过20个字");
34
                                return;
34
                                return;
35
                            }
35
                            }
36
                        }
36
                        }
37
                        if (form.val().eduYear) {
38
                            form.val({eduYear: form.val().eduYear.substring(0, 4)});
37
                        if (form.val().year) {
38
                            form.val({year: form.val().year.substring(0, 4)});
39
                        }
39
                        }
40
                        var item = form.val();
41
                        item.no = data.data.length;
42
                        data.data.push(item);
43
                        data.hand();
44
                        spa.closeModal();
40
                        form.val({professorId: data.data});
41
                        form.doPost("../ajax/edu", function () {
42
                            spa.closeModal();
43
                            if (data.hand) {
44
                                data.hand();
45
                            }
46
                        });
45
                    };
47
                    };
46
                root.find(".modal-ctrl .icon-times").on("click", function () {
48
                root.find(".modal-ctrl .icon-times").on("click", function () {
47
                    spa.closeModal();
49
                    spa.closeModal();