Tang vor 2 Jahren
Ursprung
Commit
029cf440c2

+ 1 - 1
src/components/searchBoxNew.vue

@@ -501,7 +501,7 @@
             :style="item.prop === 'searchKey' ? 'width:260px;' : ''"
             v-else-if="!item.scope"
             clearable
-            v-model="formData[item.prop]"
+            v-model.trim="formData[item.prop]"
             :placeholder="item.placeholder"
             :size="size"
             @keyup.enter.native="search"

+ 4 - 2
src/views/Marketing/goods/commodityManageMent/edit/courseContent/playPhoto.vue

@@ -96,6 +96,7 @@
           <div>
             <el-radio-group
               v-model="photoVideoList.goodsPhotographExamConfig.photograph"
+              :disabled="disabledFunc()"
             >
               <el-radio :label="1">是</el-radio>
               <el-radio :label="0">否</el-radio>
@@ -143,7 +144,8 @@ export default {
   methods: {
     disabledFunc() {
       if (
-        this.listDataCopy.educationName === "考前培训" &&
+        (this.listDataCopy.educationName === "考前培训" ||
+          this.listDataCopy.educationName === "继续教育") &&
         this.listDataCopy.projectName === "施工现场专业人员" &&
         this.listDataCopy.businessName === "七大员"
       ) {
@@ -156,7 +158,7 @@ export default {
      * 初始进入
      */
     openBox(obj) {
-      console.log(obj)
+      console.log(obj);
       this.listDataCopy = obj;
       if (obj.playConfig) {
         this.photoVideoList.playConfig = JSON.parse(

+ 2 - 1
src/views/classHoursReview/component/LessonTable.vue

@@ -450,7 +450,8 @@ export default {
     },
     comput(item) {
       var ast = item.studyEndTime - item.studyStartTime;
-      if (ast < item.durationTime) {
+      let status = item.durationTime - ast
+      if (status > 25) {
         return "color:red;";
       } else {
         return "";

+ 2 - 1
src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -341,7 +341,8 @@ export default {
     },
     comput(item) {
       var ast = item.studyEndTime - item.studyStartTime;
-      if (ast < item.durationTime) {
+      let status = item.durationTime - ast
+      if (status > 25) {
         return "color:red;";
       } else {
         return "";

+ 1 - 1
src/views/education/examManagement/applicationData/asPlanned.vue

@@ -431,7 +431,7 @@ export default {
   components: { batchImportDialoga,searchBoxNew, tableList, pagination, goodsList },
   data() {
     return {
-      dialogVisible:true,
+      dialogVisible:false,
       month: "",
       monthList: [
         { label: "一月", value: "01" },

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

@@ -450,10 +450,10 @@ export default {
           label: "所属院校",
           prop: "schoolName",
         },
-        {
-          label: "所属专业",
-          prop: "categoryName",
-        },
+        // {
+        //   label: "所属专业",
+        //   prop: "categoryName",
+        // },
         {
           label: "科目",
           prop: "subjectName",

+ 6 - 6
src/views/resource/videoManagement/courseManagement/index.vue

@@ -88,12 +88,12 @@ export default {
           scope: "schoolList",
           edu: "educationTypeId",
         },
-        {
-          prop: "majorId",
-          placeholder: "专业",
-          scope: "Professional",
-          edu: "educationTypeId",
-        },
+        // {
+        //   prop: "majorId",
+        //   placeholder: "专业",
+        //   scope: "Professional",
+        //   edu: "educationTypeId",
+        // },
         {
           prop: "subjectId",
           placeholder: "科目",

+ 1 - 0
src/views/resource/videoManagement/festival/index.vue

@@ -303,6 +303,7 @@ export default {
           pageSize: 10,
           pageNum: 1,
         };
+        this.$refs.tableList.clearMoreActive()
       }
       this.$api
         .inquireCourseSection(this.formData)