yangdamao 3 년 전
부모
커밋
613ed09e97

+ 1 - 0
src/views/2Cport/referralManageMent/tab1/addGL.vue

@@ -452,6 +452,7 @@ export default {
       });
       this.$api
         .inquireGoods({
+          educationTypeId: this.listData.educationTypeId,
           businessId: this.listData.businessId,
           majorId: this.listData.majorId,
           subjectIdList: this.listData.subjectIds,

+ 1 - 0
src/views/2Cport/referralManageMent/tab2/addGL.vue

@@ -452,6 +452,7 @@ export default {
       });
       this.$api
         .inquireGoods({
+          educationTypeId: this.listData.educationTypeId,
           businessId: this.listData.businessId,
           majorId: this.listData.majorId,
           subjectIdList: this.listData.subjectIds,

+ 1 - 1
src/views/Marketing/goods/commodityManageMent/index.vue

@@ -18,7 +18,7 @@
     >
       <template slot="btn" slot-scope="props">
         <el-button
-          v-if="props.scope.row.goodsType == 1"
+          v-if="props.scope.row.goodsType == 1 && props.scope.row.courseNum && props.scope.row.courseNum > 0"
           type="text"
           @click="setTeacher(props.scope.row)"
           >双师制设置</el-button

+ 4 - 3
src/views/Marketing/goods/commodityManageMent/teacher/index.vue

@@ -39,7 +39,7 @@
           ref="resultData"
         >
           <el-form-item label="模板名称" prop="name">
-            <el-input v-model="resultData.name"></el-input>
+            <el-input v-model="resultData.name" placeholder="请输入别名"></el-input>
           </el-form-item>
           <el-form-item label="关联课程" prop="majors">
             <el-button type="primary" size="small" @click="link"
@@ -102,10 +102,10 @@ export default {
       dialogVisible: false,
       bieName: "",
       navText: {
-        title: "双师模板设置",
+        title: "双师模板设置",
         num: false,
         border: true,
-        choice: true,
+        choice: false,
         addHide: false,
         changeWidth: "180px",
         backFatherBtn: {
@@ -165,6 +165,7 @@ export default {
     },
     closeBZ() {
       this.dialogVisible = false;
+      this.search()
     },
     link() {
       //打开关联课程组件

+ 2 - 3
src/views/Marketing/goods/commodityManageMent/teacher/selectCourse.vue

@@ -17,8 +17,7 @@
           />
         </div>
       </div>
-      <div style="margin-bottom: 10px">
-        <!-- 搜索框 -->
+      <!-- <div style="margin-bottom: 10px">
         <el-input
           style="width: 230px; margin: 0px 10px"
           :size="size"
@@ -29,7 +28,7 @@
           >查询</el-button
         >
         <el-button :size="size" @click="getInfos(0)">重置</el-button>
-      </div>
+      </div> -->
       <span style="color: red">注:最多选择3条数据进行关联</span>
       <el-table
         ref="multipleTable"

+ 15 - 2
src/views/resource/videoManagement/courseManagement/chapterContent/index.vue

@@ -41,7 +41,6 @@
             删除
           </el-button>
           <el-button
-            v-if="data.type === 2"
             type="text"
             size="mini"
             style="color: green"
@@ -607,7 +606,7 @@ export default {
       }
     },
     initSort() {
-      this.sortList = JSON.parse(JSON.stringify(this.tableDataInfos));
+      this.sortList = JSON.parse(JSON.stringify(this.tableDataInfos));  
     },
     submitTableBoxs() {
       let arr = this.sortList.map((items) => {
@@ -651,10 +650,12 @@ export default {
     //1确定关联试卷弹窗
     submitExam() {
       if (!this.templateRadio && !this.goodsName) {
+        console.log(this.menuExamList,'this.menuExamList111111');
         this.menuExamList = this.menuExamList.filter((item) => {
           return item.onlyId != this.onlyId;
         });
       } else {
+        console.log(this.menuExamList,'this.menuExamList222222');
         var arrays = {};
         let ast = this.onlyId.split("-").map(Number);
         arrays = {
@@ -683,6 +684,7 @@ export default {
     },
     //开启关联试卷盒子
     openExamBox(node, item) {
+      console.log(this.tableDataInfos,'this.tableDataInfos');
       var ints = item.id.split("-").map(Number);
       var arr = [];
       if (ints[0] === 1) {
@@ -1243,6 +1245,17 @@ export default {
           sort: item.sort,
         });
       });
+      if(this.menuExamList && this.menuExamList.length > 0){
+          this.menuExamList.forEach((item) => {
+              if(item.moduleId != 0 && item.sectionId == 0 && item.chapterId == 0){
+                item.type = 3
+              }else if(item.sectionId != 0){
+                item.type = 2
+              }else{
+                item.type = 1
+              }
+          })
+      } 
       var data = {
         courseId: Number(this.$route.query.id),
         menuExamList: this.menuExamList,