Merge branch 'master' into 03/03SAVECHECK

dist/static/css/chunk-0320c3e4.87fc6880.css

@@ -0,0 +1 @@
+.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-57cd9361] .el-input__inner,.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-0fc223d0.770890c9.css

@@ -0,0 +1 @@
+.alert[data-v-3bf23a16]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}.el-button--primary[data-v-2ccd281c],.el-button--primary[data-v-2ccd281c]:active,.el-button--primary[data-v-2ccd281c]:focus,.el-button--primary[data-v-2ccd281c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2ccd281c] .el-date-editor.el-input,[data-v-2ccd281c] .el-select{width:100%!important}[data-v-2ccd281c] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-2ccd281c] .el-dialog__body{padding:10px 20px}.newBand[data-v-2ccd281c]{display:inline-block}

dist/static/css/chunk-2ddc0e3f.d1bc4b00.css

@@ -1 +0,0 @@
-.alert[data-v-3bf23a16]{margin:10px 0}.dialog-footer[data-v-290cb116]{margin-top:20px;display:block;text-align:right}

dist/static/css/chunk-42ab66a4.b2d5d021.css

@@ -1 +0,0 @@
-.el-button--primary[data-v-2ccd281c],.el-button--primary[data-v-2ccd281c]:active,.el-button--primary[data-v-2ccd281c]:focus,.el-button--primary[data-v-2ccd281c]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-2ccd281c] .el-date-editor.el-input,[data-v-2ccd281c] .el-select{width:100%!important}[data-v-2ccd281c] .el-table .cell{display:-webkit-box;overflow:hidden;text-overflow:ellipsis;-webkit-line-clamp:3;-webkit-box-orient:vertical}[data-v-2ccd281c] .el-dialog__body{padding:10px 20px}.newBand[data-v-2ccd281c]{display:inline-block}

dist/static/css/chunk-3573b058.cabdd01f.css → dist/static/css/chunk-43a42ee0.29e2a1fc.css

@@ -1 +1 @@
-.cl-container .topFrom{margin:20px 30px 0}.cl-container .topFrom .classlist{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li{list-style:none}.cl-container .searchForm{margin:0 30px}.btnWraps{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div{margin-right:20px}.m-container .m-core .msg.ing[data-v-6ac5c6d1]{color:#14928a}.m-container .m-core .msg[data-v-6ac5c6d1]{text-align:right;color:#777;font-size:32px;font-weight:700;position:absolute;right:40px;top:-33px}.m-container .m-core .msg img[data-v-6ac5c6d1]{width:36px;height:36px;position:relative;top:5px;margin-right:8px}.m-container .m-core .abs[data-v-6ac5c6d1]{position:absolute;right:240px;top:-28px}.m-container .term[data-v-6ac5c6d1]{height:32px;line-height:32px;border-radius:24px;width:100px;color:#14928a;border:1px solid #14928a;font-size:14px;text-align:center;margin-right:12px}.m-container .term[data-v-6ac5c6d1]:first-child{margin-left:47px}.m-container .term.active[data-v-6ac5c6d1]{color:#fff;background-color:#14928a}
+.cl-container .topFrom{margin:20px 30px 0}.cl-container .topFrom .classlist{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.cl-container .topFrom .classlist ul li{list-style:none}.cl-container .searchForm{margin:0 30px}.btnWraps{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.btnWraps div{margin-right:20px}.m-container .m-core .msg.ing[data-v-302f7eb4]{color:#14928a}.m-container .m-core .msg[data-v-302f7eb4]{text-align:right;color:#777;font-size:32px;font-weight:700;position:absolute;right:40px;top:-33px}.m-container .m-core .msg img[data-v-302f7eb4]{width:36px;height:36px;position:relative;top:5px;margin-right:8px}.m-container .m-core .abs[data-v-302f7eb4]{position:absolute;right:240px;top:-28px}.m-container .term[data-v-302f7eb4]{height:32px;line-height:32px;border-radius:24px;width:100px;color:#14928a;border:1px solid #14928a;font-size:14px;text-align:center;margin-right:12px}.m-container .term[data-v-302f7eb4]:first-child{margin-left:47px}.m-container .term.active[data-v-302f7eb4]{color:#fff;background-color:#14928a}

dist/static/css/chunk-288b1ca9.0903b3b1.css → dist/static/css/chunk-43be6c96.c201d6f6.css

@@ -1 +1 @@
-.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-3a2c8a7a]{font-size:14px}.btnList[data-v-3a2c8a7a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-3a2c8a7a]{margin-right:15px}
+.process[data-v-f049a426]{padding:10px;max-height:600px;overflow-y:auto}.dialog-footer[data-v-7a44cd83]{margin-top:20px;display:block;text-align:right}.select[data-v-4407b8ca]{font-size:14px}.btnList[data-v-4407b8ca]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start;-webkit-box-align:center;-ms-flex-align:center;align-items:center}.btnList div[data-v-4407b8ca]{margin-right:15px}

dist/static/css/chunk-6a97b9c3.c9ab11db.css

@@ -1 +0,0 @@
-.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner,.number-input[data-v-57cd9361] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}

dist/static/css/chunk-d59046ce.4b3b0a28.css → dist/static/css/chunk-86dc7b98.97d60f9d.css

@@ -1 +1 @@
-[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-5ec13f8a]{width:100%}.number-input[data-v-5ec13f8a] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-4c19b502]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-4c19b502],[data-v-4c19b502] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-4c19b502] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-4c19b502] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-4c19b502] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-4c19b502] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-4c19b502] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}
+[data-v-ce3060a2] .dialog-footer{margin-top:10px}.dialog-footer[data-v-ce3060a2]{float:right}.number-input[data-v-e3750f40]{width:100%}.number-input[data-v-e3750f40] .el-input__inner{text-align:left}.number-input[data-v-55ad3016]{width:100%}.number-input[data-v-55ad3016] .el-input__inner{text-align:left}.courseDiv[data-v-4c19b502]{height:45px;line-height:45px;-webkit-box-orient:vertical;-webkit-box-direction:normal;-ms-flex-direction:column;flex-direction:column}.courseDiv[data-v-4c19b502],[data-v-4c19b502] .header{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center}[data-v-4c19b502] .header{width:100%;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}[data-v-4c19b502] .header>span:first-child{display:-webkit-box;display:-ms-flexbox;display:flex}[data-v-4c19b502] .header>span:first-child:before{content:"";display:block;width:5px;background-color:#14928a;margin-right:10px;border-radius:2px;height:48px}[data-v-4c19b502] .header .icon{font-size:18px;font-weight:400;margin-right:20px}[data-v-4c19b502] .header /deep/.el-collapse-item__wrap{border-bottom:none!important}.title[data-v-225a961a]{line-height:44px}.fixedBox[data-v-225a961a]{position:fixed;bottom:20px;right:10px;z-index:100;width:200px;background-color:#fff;font-size:14px}.fixedBox .boxWrap[data-v-225a961a]{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:space-between}.fixedBox .boxWrap i[data-v-225a961a]{font-size:18px;cursor:pointer}[data-v-225a961a] .el-divider--horizontal{margin:0!important}.minus[data-v-225a961a]{float:right;line-height:44px;padding-right:20px;font-size:20px;cursor:pointer}

src/views/resetTeaming/modals/subject-preview.vue

@@ -35,7 +35,7 @@
 			</el-row>
 			<!-- 可选课程信息集合 -->
 			<template v-for="(item, index) in courseInfo">
-				<el-row class="option-row" :key="index" @click.native="onCourseChange(item)" v-if="courseViewType == 0">
+				<el-row class="option-row" :key="index" @click.native="onCourseChange(item)" v-if="courseViewType == 0 && !item.isStudentOptional">
 					<el-col :span="12">
 						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
 					</el-col>