11

html/model/sys/professornew/details.html

@@ -137,14 +137,6 @@
                <div class="form-item dyn-mselect orgSize" name="industryList"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-10"></div>
            <div class="col-4 pull-right">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> 保存
                </div>
            </div>
        </div>
    </div>
    <div class="container">
        <table class="table table-bordered">
@@ -261,4 +253,12 @@
            </tbody>
        </table>
    </div>
    <div class="row">
        <div class="col-10"></div>
        <div class="col-4 pull-right">
            <div class="btn pull-right opt-save">
                <i class="icon-check"></i> 保存
            </div>
        </div>
    </div>
</div>

html/model/sys/professornew/edu.html

@@ -6,20 +6,20 @@
        <div class="row">
            <div class="col-2 item-caption">学校名称</div>
            <div class="col-6">
                <div class="form-item text" placeholder="学校名称不得超过50个字" name="school"></div>
                <div class="form-item text trim" placeholder="学校名称不得超过50个字" name="school"></div>
            </div>
            <span class="requiredSpan">*</span>
        </div>
        <div class="row">
            <div class="col-2 item-caption">院系名称</div>
            <div class="col-6">
                <div class="form-item text" placeholder="院系名称不得超过20个字" name="college"></div>
                <div class="form-item text trim" placeholder="院系名称不得超过20个字" name="college"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-2 item-caption">专业名称</div>
            <div class="col-6">
                <div class="form-item text" placeholder="专业名称不得超过20个字" name="major"></div>
                <div class="form-item text trim" placeholder="专业名称不得超过20个字" name="major"></div>
            </div>
        </div>
        <div class="row">
@@ -38,7 +38,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/professornew/honor.html

@@ -6,7 +6,7 @@
        <div class="row">
            <div class="col-2 item-caption">奖项名称</div>
            <div class="col-6">
                <div class="form-item text" placeholder="奖项名称不得超过50个字" name="name"></div>
                <div class="form-item text trim" placeholder="奖项名称不得超过50个字" name="name"></div>
            </div>
            <span class="requiredSpan">*</span>
        </div>
@@ -26,7 +26,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/professornew/job.html

@@ -6,20 +6,20 @@
        <div class="row">
            <div class="col-2 item-caption">机构名称</div>
            <div class="col-6">
                <div class="form-item text" placeholder="机构名称不得超过50个字" name="company"></div>
                <div class="form-item text trim" placeholder="机构名称不得超过50个字" name="company"></div>
            </div>
            <span class="requiredSpan">*</span>
        </div>
        <div class="row">
            <div class="col-2 item-caption">所在部门</div>
            <div class="col-6">
                <div class="form-item text" placeholder="部门名称不得超过50个字" name="department"></div>
                <div class="form-item text trim" placeholder="部门名称不得超过50个字" name="department"></div>
            </div>
        </div>
        <div class="row">
            <div class="col-2 item-caption">职位</div>
            <div class="col-6">
                <div class="form-item text" placeholder="职位不得超过50个字" name="title"></div>
                <div class="form-item text trim" placeholder="职位不得超过50个字" name="title"></div>
            </div>
            <span class="requiredSpan">*</span>
        </div>
@@ -37,7 +37,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/professornew/project.html

@@ -30,7 +30,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>
        </div>

html/model/sys/userInfo/edu.html

@@ -38,7 +38,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/userInfo/honor.html

@@ -26,7 +26,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/userInfo/job.html

@@ -37,7 +37,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>

html/model/sys/userInfo/project.html

@@ -30,7 +30,7 @@
            <div class="col-10"></div>
            <div class="col-2">
                <div class="btn pull-right opt-save">
                    <i class="icon-check"></i> SAVE
                    <i class="icon-check"></i> 保存
                </div>
            </div>
        </div>

js/model/sys/professornew/details.js

@@ -24,10 +24,28 @@ spa_define(function () {
                };
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        var researchAreas = [];
                        var researchList = form.val().researchAreaList || [];
                        for (var i = 0; i < researchList.length; ++i) {
                            var item = {caption: researchList[i], professorId: data.data.id};
                            researchAreas.push(item);
                        }
                        form.val({researchAreas: researchAreas});
                        if(form.val().industryList) {
                            form.val({
                                industry: oString(form.val().industryList)
                            });
                        }else {
                            form.val({industry: null});
                        }
                        if(form.val().subjectList) {
                            form.val({
                                subject: oString(form.val().subjectList)
                            });
                        }else {
                            form.val({subject: null});
                        }
                        form.val({
                            industry: oString(form.val().industryList),
                            subject: oString(form.val().subjectList),
                            researchArea: form.val().researchAreaList,
                            subjectList: "", industryList: "", researchAreaList: ""
                        });
                        if (form.val().title) {
@@ -96,9 +114,7 @@ spa_define(function () {
                                if (data.hand) {
                                    data.hand();
                                }
                            }, function (data) {
                                util.alert(data.msg);
                            });
                            }, {"50000":"只能修改未激活用户信息"});
                        } else {
                            util.alert("手机或邮箱至少输入一项");
                        }
@@ -211,8 +227,8 @@ spa_define(function () {
                var split2 = function (data) {
                    var arr = [];
                    for (var m = 0; m < data.length; m++) {
                        ca.items.push({code: data[m], caption: data[m]});
                        arr.push(data[m]);
                        ca.items.push({code: data[m].caption, caption: data[m].caption});
                        arr.push(data[m].caption);
                    }
                    return arr;
                };
@@ -223,8 +239,8 @@ spa_define(function () {
                if (data.data.subject) {
                    form.val({subjectList: split(data.data.subject)});
                }
                if (data.data.researchArea) {
                    form.val({researchAreaList: split2(data.data.researchArea)});
                if (data.data.researchAreas) {
                    form.val({researchAreaList: split2(data.data.researchAreas)});
                }
@@ -295,7 +311,7 @@ spa_define(function () {
                        if (project) {
                            util.boxMsg({
                                title: "确认删除",
                                content: "确认删除该项目经历？",
                                content: "确认删除该项目经历？删除后无法恢复。",
                                btns: [{
                                    caption: "删除",
                                    hand: function () {
@@ -339,7 +355,7 @@ spa_define(function () {
                        if (honor) {
                            util.boxMsg({
                                title: "确认删除",
                                content: "确认删除该荣誉奖项？",
                                content: "确认删除该荣誉奖项？删除后无法恢复。",
                                btns: [{
                                    caption: "删除",
                                    hand: function () {
@@ -383,7 +399,7 @@ spa_define(function () {
                        if (job) {
                            util.boxMsg({
                                title: "确认删除",
                                content: "确认删除该工作经历？",
                                content: "确认删除该工作经历？删除后无法恢复。",
                                btns: [{
                                    caption: "删除",
                                    hand: function () {
@@ -427,7 +443,7 @@ spa_define(function () {
                        if (edu) {
                            util.boxMsg({
                                title: "确认删除",
                                content: "确认删除该教育经历？",
                                content: "确认删除该教育经历？删除后无法恢复。",
                                btns: [{
                                    caption: "删除",
                                    hand: function () {

js/model/sys/professornew/eduNew.js

@@ -6,13 +6,13 @@ spa_define(function () {
    return $.use(["spa", "util", "form"], function (spa, util, fb) {
        return {
            modal: function (data) {
                var root = spa.findInModal(".sys_userinfo_edu");
                var root = spa.findInModal(".sys_professornew_edu");
                var form = fb.build(root.find(".newForm"));
                var saveBtn = root.find(".opt-save"),
                    save = function () {
                        if (form.val().eduSchool) {
                            var eduSchool = trim(form.val().eduSchool);
                            if (eduSchool.length > 50) {
                        if (form.val().school) {
                            var school = trim(form.val().school);
                            if (school.length > 50) {
                                util.alert("学校名称不得超过50个字");
                                return;
                            }
@@ -20,28 +20,30 @@ spa_define(function () {
                            util.alert("请填写学校名称");
                            return;
                        }
                        if (form.val().eduCollege) {
                            var eduCollege = trim(form.val().eduCollege);
                            if (eduCollege.length > 20) {
                        if (form.val().college) {
                            var college = trim(form.val().college);
                            if (college.length > 20) {
                                util.alert("院系名称不得超过20个字");
                                return;
                            }
                        }
                        if (form.val().eduMajor) {
                            var eduMajor = trim(form.val().eduMajor);
                            if (eduMajor.length > 20) {
                        if (form.val().major) {
                            var major = trim(form.val().major);
                            if (major.length > 20) {
                                util.alert("专业名称不得超过20个字");
                                return;
                            }
                        }
                        if (form.val().eduYear) {
                            form.val({eduYear: form.val().eduYear.substring(0, 4)});
                        if (form.val().year) {
                            form.val({year: form.val().year.substring(0, 4)});
                        }
                        var item = form.val();
                        item.no = data.data.length;
                        data.data.push(item);
                        data.hand();
                        spa.closeModal();
                        form.val({professorId: data.data});
                        form.doPost("../ajax/edu", function () {
                            spa.closeModal();
                            if (data.hand) {
                                data.hand();
                            }
                        });
                    };
                root.find(".modal-ctrl .icon-times").on("click", function () {
                    spa.closeModal();