Tang 3 жил өмнө
parent
commit
14919a5979
32 өөрчлөгдсөн 638 нэмэгдсэн , 249 устгасан
  1. 68 4
      src/components/searchBoxNew.vue
  2. 1 1
      src/components/tableList.vue
  3. 1 1
      src/utils/request.js
  4. 7 7
      src/views/Marketing/goods/commodityManageMent/index.vue
  5. 15 8
      src/views/Marketing/goods/courseInquiryList/index.vue
  6. 9 9
      src/views/education/classManageMent/classHours/index.vue
  7. 4 5
      src/views/education/classManageMent/classList/addClass/index.vue
  8. 41 34
      src/views/education/classManageMent/classList/index.vue
  9. 5 12
      src/views/education/classManageMent/classList/manageClass/baseInfo.vue
  10. 14 10
      src/views/education/classManageMent/learningHoursRecordList/index.vue
  11. 8 8
      src/views/education/classManageMent/listOfhoursToBeReviewed/index.vue
  12. 8 8
      src/views/education/classManageMent/studentMenu/index.vue
  13. 2 30
      src/views/education/dataReview/dataConfig/index.vue
  14. 139 5
      src/views/education/studentManageMent/studentXQ/studentBaseManage.vue
  15. 4 4
      src/views/resource/bankManagement/chapterVolumeManagement/index.vue
  16. 2 2
      src/views/resource/bankManagement/testPaperManagement/addPaper/topicAddPaper/index.vue
  17. 2 2
      src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/index.vue
  18. 4 4
      src/views/resource/bankManagement/testPaperManagement/index.vue
  19. 5 5
      src/views/resource/bankManagement/topicManagement/index.vue
  20. 4 4
      src/views/resource/bankManagement/volumeManagement/index.vue
  21. 67 15
      src/views/resource/baseManageInfos/resource/businessLevel/index.vue
  22. 72 14
      src/views/resource/baseManageInfos/resource/professional/index.vue
  23. 61 14
      src/views/resource/baseManageInfos/resource/projectType/index.vue
  24. 64 12
      src/views/resource/baseManageInfos/resource/suject/index.vue
  25. 2 2
      src/views/resource/handoutManagement/handoutList/add/index.vue
  26. 2 2
      src/views/resource/handoutManagement/handoutList/edit/index.vue
  27. 4 4
      src/views/resource/videoManagement/chapter/index.vue
  28. 4 5
      src/views/resource/videoManagement/courseManagement/basicInfoAdd/index.vue
  29. 4 4
      src/views/resource/videoManagement/courseManagement/basicInfoEdit/index.vue
  30. 4 4
      src/views/resource/videoManagement/courseManagement/index.vue
  31. 5 4
      src/views/resource/videoManagement/festival/index.vue
  32. 6 6
      src/views/resource/videoManagement/moduleManagement/index.vue

+ 68 - 4
src/components/searchBoxNew.vue

@@ -26,6 +26,19 @@
         >
       </div>
     </div>
+    <div class="inputListBox" v-if="classStatus">
+      <div class="fon_s">开班状态:</div>
+      <div>
+        <el-button
+          :type="formData.classStatus === item.value ? 'primary' : ''"
+          :size="size"
+          v-for="(item, index) in classType"
+          :key="index"
+          @click="topClassType(item.value)"
+          >{{ item.label }}</el-button
+        >
+      </div>
+    </div>
     <div class="inputListBox" v-if="shType">
       <div class="fon_s">审核状态:</div>
       <div>
@@ -103,6 +116,20 @@
               :value="items.id"
             ></el-option>
           </el-select>
+          <!-- 项目类型 -->
+          <el-select
+            v-else-if="item.scope === 'projectLevel'"
+            v-model="formData[item.prop]"
+            :placeholder="item.placeholder"
+            :size="size"
+          >
+            <el-option
+              v-for="(items, indexs) in newProjectLevel"
+              :key="indexs"
+              :label="items.projectName"
+              :value="items.id"
+            ></el-option>
+          </el-select>
           <!-- 业务层次 -->
           <el-select
             v-else-if="item.scope === 'businessLevel'"
@@ -470,6 +497,7 @@ export default {
     "redIcon",
     "advanced",
     "advancedName",
+    "classStatus",
   ], //参考文档 component.md
   data() {
     return {
@@ -496,6 +524,20 @@ export default {
           value: 4,
         },
       ],
+      classType: [
+        {
+          label: "全部",
+          value: "",
+        },
+        {
+          label: "已开班",
+          value: 1,
+        },
+        {
+          label: "预报名(未开班)",
+          value: 0,
+        },
+      ],
       pendlists: [
         {
           label: "初审",
@@ -511,10 +553,6 @@ export default {
           label: "全部",
           value: "",
         },
-        {
-          label: "通过",
-          value: 1,
-        },
         {
           label: "待审核",
           value: 2,
@@ -523,6 +561,10 @@ export default {
           label: "不通过",
           value: 3,
         },
+        {
+          label: "通过",
+          value: 1,
+        },
       ],
       lists6: [
         {
@@ -585,6 +627,7 @@ export default {
         },
       ], //题目类型
       size: "small", //输入框尺寸类型
+      newProjectLevel: [], //项目类型-筛选后的数据
       newBusinessLevel: [], //业务层次-筛选后的数据
       newSchoolList: [], //院校-筛选后的数据
       newProfessional: [], //专业-筛选后的数据
@@ -689,6 +732,10 @@ export default {
               if (this.formData["applyId"]) {
                 return items;
               }
+            } else if (items.scope === "projectLevel") {
+              if (this.formData["educationId"]) {
+                return items;
+              }
             } else {
               return items;
             }
@@ -788,6 +835,15 @@ export default {
       this.formData.periodStatus = status;
       this.$emit("search", 4);
     },
+    /**
+     *
+     * @param {int} status
+     * @remark 顶部定制按钮-根据审核状态类型点击快速搜索
+     */
+    topClassType(status) {
+      this.formData.classStatus = status;
+      this.$emit("search", 4);
+    },
     /**
      *
      * @param {int} status
@@ -846,6 +902,9 @@ export default {
       });
       this.tireStatus = this.educationType[indexs].tireStatus;
       if (!status1) {
+        if (this.formData.projectId) {
+          this.formData.projectId = "";
+        }
         if (this.formData.businessId) {
           this.formData.businessId = "";
         }
@@ -860,6 +919,11 @@ export default {
       if (this.formData.subjectId) {
         this.formData.subjectId = "";
       }
+      this.$api
+        .inquireCourseProjectType({ status: 1, educationId: id })
+        .then((res) => {
+          this.newProjectLevel = res.rows;
+        });
       this.$api
         .inquirebusinessList({ status: 1, educationId: id })
         .then((res) => {

+ 1 - 1
src/components/tableList.vue

@@ -1174,7 +1174,7 @@
               scope.row[item.prop] === 1
                 ? `已开班:${scope.row[item.prop1]}`
                 : scope.row[item.prop] === 0
-                ? "未开班"
+                ? "预报名(未开班)"
                 : ""
             }}
           </span>

+ 1 - 1
src/utils/request.js

@@ -15,7 +15,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 /**
  * @remard 测试地址
  */
-export const baseURL = 'http://192.168.1.222:5030/'
+export const baseURL = 'http://192.168.1.24:5030/'
 export const BASE_IMG_URL = 'https://file-dev.xyyxt.net'
 const service = axios.create({
   // axios中请求配置有baseURL选项,表示请求URL公共部分

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

@@ -168,29 +168,29 @@ export default {
         {
           label: "商品编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "专业",
           prop: "categoryName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "院校",
           prop: "schoolName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "业务层次",
           prop1: "projectName",
           prop2: "businessName",
-          hidden: true,
+          hidden: false,
           scope: "InfoMore",
         },
         {
           label: "教育类型",
           prop: "educationName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学时",
@@ -212,7 +212,7 @@ export default {
         {
           label: "商品状态",
           prop: "status",
-          hidden: true,
+          hidden: false,
           scope: "hasTime",
         },
         {
@@ -235,7 +235,7 @@ export default {
         {
           label: "供应方(服务)",
           prop: "supplyName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "最后编辑时间",

+ 15 - 8
src/views/Marketing/goods/courseInquiryList/index.vue

@@ -35,7 +35,7 @@
       :close-on-click-modal="false"
     >
       <div slot="title" class="hearders">
-        <div class="leftTitle">我是商品名称</div>
+        <div class="leftTitle">{{goodsBoxName}}</div>
         <div class="rightBoxs">
           <img src="@/assets/images/Close@2x.png" alt="" @click="close" />
         </div>
@@ -248,7 +248,7 @@ export default {
         {
           label: "商品编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "商品名称",
@@ -258,7 +258,7 @@ export default {
         {
           label: "商品状态",
           prop: "status",
-          hidden: true,
+          hidden: false,
           scope: "hasTime",
         },
         {
@@ -284,7 +284,7 @@ export default {
           prop3: "studyStartTime",
           prop4: "studyEndTime",
           scope: "studentServicePeriod",
-          hidden: true,
+          hidden: false,
         },
       ],
       tableData: [], //表单数据
@@ -300,6 +300,7 @@ export default {
       vidzb: "",
       classBox: false,
       goodsId: "",
+      goodsBoxName:"",
     };
   },
   mounted() {
@@ -359,6 +360,7 @@ export default {
         this.formData.pageNum = 1;
       }
       var data = JSON.parse(JSON.stringify(this.formData));
+      data.haveCourse = 1
       this.$api
         .inquireGoods(data)
         .then((res) => {
@@ -377,18 +379,23 @@ export default {
      * 点击详情
      */
     msgInfo(option) {
+      this.goodsBoxName = option.goodsName
       this.$api.obtainCourseSgoodsId(option.goodsId).then(async (res) => {
-        if (res.rows.length) {
+        // if (res.rows.length) {
+        if (!res.rows.length) {
+          this.dialogVisible = true;
+        } else {
           res.rows.forEach((item, index) => {
             item.checked = false;
           });
           this.courseList = res.rows;
           await this.autoGetCourseInfos(res.rows[0], 0);
           this.dialogVisible = true;
-        } else {
-          this.$message.warning("该商品暂无课程");
-          return;
         }
+        // } else {
+        //   this.$message.warning("该商品暂无课程");
+        //   return;
+        // }
       });
     },
     /**

+ 9 - 9
src/views/education/classManageMent/classHours/index.vue

@@ -195,7 +195,7 @@ export default {
         {
           label: "学员编码",
           prop: "studentCode",
-          hidden: true,
+          hidden: false,
           width: "180px",
         },
         {
@@ -218,33 +218,33 @@ export default {
         {
           label: "所购商品",
           prop: "goodsName",
-          hidden: true,
+          hidden: false,
           width: "280px",
         },
         {
           label: "所在班级",
           prop: "className",
-          hidden: true,
+          hidden: false,
           width: "160px",
         },
         {
           label: "班级有效期",
           prop1: "classStartTime",
           prop2: "classEndTime",
-          hidden: true,
+          hidden: false,
           scope: "TimeLists",
           width: "260px",
         },
         {
           label: "学时",
           prop: "classHours",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "视频学习进度(节)",
           prop1: "stuAllNum",
           prop2: "secAllNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
           width: "160px",
         },
@@ -252,7 +252,7 @@ export default {
           label: "做题进度(章卷)",
           prop1: "recordNum",
           prop2: "examNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
           width: "160px",
         },
@@ -274,7 +274,7 @@ export default {
           label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
-          hidden: true,
+          hidden: false,
           Diszing: true,
           scope: "TimeLists",
         },
@@ -310,7 +310,7 @@ export default {
           label: "待重修(视频节和题卷)",
           prop: "waitRebuildNum",
           prop1: "rebuildNum",
-          hidden: true,
+          hidden: false,
           scope: "againStudent",
           width: "160px",
         },

+ 4 - 5
src/views/education/classManageMent/classList/addClass/index.vue

@@ -27,7 +27,6 @@
           </el-form-item>
           <el-form-item label="学员上限" prop="studentUpper">
             <el-input-number
-              :max="1000000"
               :controls="false"
               v-model="listData.studentUpper"
               placeholder="请填写学员上限"
@@ -83,7 +82,7 @@
               v-model="listData.classStatus"
               @change="changeClassStatus"
             >
-              <el-radio :label="0">未开班</el-radio>
+              <el-radio :label="0">预报名(未开班)</el-radio>
               <el-radio :label="1">已开班</el-radio>
             </el-radio-group>
           </el-form-item>
@@ -182,10 +181,10 @@
         </el-col>
         <el-col :span="12">
           <div v-if="statusShow === 1">
-            <el-form-item label="官方信息推送" prop="interfacePushId">
+            <el-form-item label="官方报名推送" prop="interfacePushId">
               <el-select
                 v-model="listData.interfacePushId"
-                placeholder="请选择官方信息推送"
+                placeholder="请选择官方报名推送"
                 clearable
               >
                 <el-option
@@ -391,7 +390,7 @@ export default {
         officialName: "",
         cityId: "",
         classGradeGoodsAddBos: [],
-        studentUpper: 300,
+        studentUpper: 1000000,
         // officialLearningUrl: "",
       },
       rules: {

+ 41 - 34
src/views/education/classManageMent/classList/index.vue

@@ -6,6 +6,7 @@
       :formList="formList"
       @search="search"
       @init="init"
+      :classStatus="classStatus"
     />
     <table-list
       :tableSets="tableSet"
@@ -58,6 +59,7 @@ export default {
           title: "未定义",
         },
       },
+      classStatus: true,
       //搜索
       formList: [
         {
@@ -87,7 +89,7 @@ export default {
           prop: "status",
           placeholder: "班级状态",
           scope: "select",
-          noClear:false,
+          noClear: false,
           options: [
             { label: "全部状态", value: "0,1" },
             { label: "无效", value: 0 },
@@ -102,14 +104,15 @@ export default {
           scope: "moreDataPicker",
         },
         {
-          prop: "className",
-          placeholder: "请输入班级名称",
+          prop: "searchKey",
+          placeholder: "请输入班级名称/商品名称/学员姓名",
         },
       ],
       formData: {
         status: "0,1",
         pageSize: 10,
         pageNum: 1,
+        classStatus: "",
       },
       // 表单
       tableSet: [
@@ -117,14 +120,14 @@ export default {
           label: "商品编码",
           prop: "code",
           objProp: "goodsList",
-          hidden: true,
+          hidden: false,
           scope: "objType",
         },
         {
           label: "年份",
           prop: "year",
           objProp: "goodsList",
-          hidden: true,
+          hidden: false,
           scope: "objType",
         },
         {
@@ -133,7 +136,7 @@ export default {
           prop2: "projectName",
           prop3: "businessName",
           objProp: "goodsList",
-          hidden: true,
+          hidden: false,
           scope: "objTypeYW",
         },
         {
@@ -146,7 +149,7 @@ export default {
         {
           label: "班级编码",
           prop: "gradeCode",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "班级号",
@@ -165,13 +168,13 @@ export default {
           label: "学时",
           prop: "classHours",
           objProp: "goodsList",
-          hidden: true,
+          hidden: false,
           scope: "objType",
         },
         {
           label: "班主任",
           prop: "nickName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "班级人数",
@@ -190,7 +193,7 @@ export default {
         {
           label: "班级状态",
           prop: "status",
-          hidden: true,
+          hidden: false,
           scope: "hasTime",
         },
         {
@@ -226,8 +229,12 @@ export default {
           status: "0,1",
           pageSize: 10,
           pageNum: 1,
+          classStatus: "",
         };
       }
+      if (int === 4) {
+        this.formData.pageNum = 1;
+      }
       var data = JSON.parse(JSON.stringify(this.formData));
       if (this.formData.classStartTime) {
         data.classStartTime = data.classStartTime / 1000;
@@ -283,31 +290,31 @@ export default {
         });
       } else {
         if (int === 2) {
-        const jump = () => {
-          //班级详情
-          this.$router.push({
-            path: "manageClass",
-            query: {
-              id: v.gradeId,
-            },
-          });
-        };
-        const statusPage = this.$store.state.tagsView.visitedViews.some(
-          (item) => {
-            return item.name == "ManageClass";
-          }
-        );
-        if (statusPage) {
-          this.$store
-            .dispatch("tagsView/delCachedView", {
-              name: "ManageClass",
-            })
-            .then((res) => {
-              jump();
+          const jump = () => {
+            //班级详情
+            this.$router.push({
+              path: "manageClass",
+              query: {
+                id: v.gradeId,
+              },
             });
-        } else {
-          jump();
-        }
+          };
+          const statusPage = this.$store.state.tagsView.visitedViews.some(
+            (item) => {
+              return item.name == "ManageClass";
+            }
+          );
+          if (statusPage) {
+            this.$store
+              .dispatch("tagsView/delCachedView", {
+                name: "ManageClass",
+              })
+              .then((res) => {
+                jump();
+              });
+          } else {
+            jump();
+          }
         }
         if (int === 3) {
           // 学员管理

+ 5 - 12
src/views/education/classManageMent/classList/manageClass/baseInfo.vue

@@ -47,7 +47,6 @@
             <el-form-item label="学员上限" prop="studentUpper">
               <el-input-number
                 :min="minNums"
-                :max="1000000"
                 :controls="false"
                 v-model="listData.studentUpper"
                 placeholder="请填写学员上限"
@@ -116,7 +115,7 @@
                 @change="changeClassStatus"
                 :disabled="classStatusDis"
               >
-                <el-radio :label="0">未开班</el-radio>
+                <el-radio :label="0">预报名(未开班)</el-radio>
                 <el-radio :label="1">已开班</el-radio>
               </el-radio-group>
             </el-form-item>
@@ -322,7 +321,7 @@ import { mapGetters } from "vuex";
 export default {
   data() {
     return {
-      copyData:{},
+      copyData: {},
       classStartStatus: false,
       classEndStatus: false,
       minNums: 0,
@@ -406,10 +405,7 @@ export default {
       //   this.$message.warning("超出商品学习有效期,请重新选择");
       //   this.listData.classStartTime = "";
       // } else
-       if (
-        this.listData.classEndTime &&
-        arr > this.listData.classEndTime
-      ) {
+      if (this.listData.classEndTime && arr > this.listData.classEndTime) {
         this.$message.warning("开始时间不能大于等于结束时间,请重新选择");
         this.listData.classStartTime = "";
       }
@@ -422,10 +418,7 @@ export default {
       //   this.$message.warning("超出商品学习有效期,请重新选择");
       //   this.listData.classEndTime = "";
       // } else
-       if (
-        this.listData.classStartTime &&
-        arr <= this.listData.classStartTime
-      ) {
+      if (this.listData.classStartTime && arr <= this.listData.classStartTime) {
         this.$message.warning("结束时间不能小于等于开始时间,请重新选择");
         this.listData.classEndTime = "";
       }
@@ -482,7 +475,7 @@ export default {
             ];
           }
           this.minNums = res.data.studentNum;
-          this.copyData = JSON.parse(JSON.stringify(res.data))
+          this.copyData = JSON.parse(JSON.stringify(res.data));
           this.listData = res.data;
         })
         .finally(() => {

+ 14 - 10
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -166,6 +166,10 @@ export default {
           scope: "businessLevel",
           edu: "educationTypeId",
         },
+        {
+          prop: "className",
+          placeholder: "请输入班级名称",
+        },
         {
           prop: "studyStatus",
           placeholder: "学习状态",
@@ -295,7 +299,7 @@ export default {
           label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
-          hidden: true,
+          hidden: false,
           Diszing: true,
           scope: "TimeLists",
         },
@@ -305,14 +309,14 @@ export default {
           prop2: "classEndTime",
           scope: "TimeLists",
           Diszing: false,
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学习时间",
           prop1: "startTime",
           prop2: "endTime",
           scope: "TimeLists",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学习状态",
@@ -369,7 +373,7 @@ export default {
         {
           label: "学时官方推送状态",
           prop: "learnStatus",
-          hidden: true,
+          hidden: false,
           scope: "isOptions",
           options: [
             {
@@ -425,14 +429,14 @@ export default {
       this.$modal.loading("正在导出数据,请稍后...");
       this.$api
         .inquireGradegradeListexport(data)
-        .then(async(res) => {
+        .then(async (res) => {
           for (let k in res.data) {
-          if (res.data[k].code === 200) {
-            await this.dowmFunc(res, k);
-          } else {
-            this.$message.error("code值错误:", res.data[k].code);
+            if (res.data[k].code === 200) {
+              await this.dowmFunc(res, k);
+            } else {
+              this.$message.error("code值错误:", res.data[k].code);
+            }
           }
-        }
         })
         .catch((err) => {
           /**

+ 8 - 8
src/views/education/classManageMent/listOfhoursToBeReviewed/index.vue

@@ -123,7 +123,7 @@ export default {
         {
           label: "学员编码",
           prop: "studentCode",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学员姓名",
@@ -138,7 +138,7 @@ export default {
         {
           label: "绑定手机号码",
           prop: "telPhone",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "所购商品",
@@ -154,26 +154,26 @@ export default {
           label: "班级有效期",
           prop1: "classStartTime",
           prop2: "classEndTime",
-          hidden: true,
+          hidden: false,
           scope: "TimeLists",
         },
         {
           label: "学时",
           prop: "classHours",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "视频学习进度(节)",
           prop1: "stuAllNum",
           prop2: "secAllNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
         },
         {
           label: "做题进度(章卷)",
           prop1: "recordNum",
           prop2: "examNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
         },
         {
@@ -192,7 +192,7 @@ export default {
           label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
-          hidden: true,
+          hidden: false,
           Diszing: true,
           scope: "TimeLists",
         },
@@ -226,7 +226,7 @@ export default {
           label: "待重修(视频节和题卷)",
           prop: "waitRebuildNum",
           prop1: "rebuildNum",
-          hidden: true,
+          hidden: false,
           scope: "againStudent",
         },
       ],

+ 8 - 8
src/views/education/classManageMent/studentMenu/index.vue

@@ -359,7 +359,7 @@
                     ]"
                   >
                   </el-image>
-                  <div class="pos_bottom">身份证正面照片</div>
+                  <div class="pos_bottom">身份证头像照</div>
                 </div>
                 <div class="photoSty2" style="margin-right: 0px">
                   <img
@@ -377,7 +377,7 @@
                     ]"
                   >
                   </el-image>
-                  <div class="pos_bottom">身份证背面照片</div>
+                  <div class="pos_bottom">身份证国徽照</div>
                 </div>
               </div>
             </el-col>
@@ -610,7 +610,7 @@ export default {
         {
           label: "学员编码",
           prop: "studentCode",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学员姓名",
@@ -636,20 +636,20 @@ export default {
         {
           label: "学时",
           prop: "classHours",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "视频学习进度(节)",
           prop1: "stuAllNum",
           prop2: "secAllNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
         },
         {
           label: "做题进度(章卷)",
           prop1: "recordNum",
           prop2: "examNum",
-          hidden: true,
+          hidden: false,
           scope: "computer",
         },
         {
@@ -662,7 +662,7 @@ export default {
           label: "学习服务期",
           prop1: "serviceStartTime",
           prop2: "serviceEndTime",
-          hidden: true,
+          hidden: false,
           Diszing: true,
           scope: "TimeLists",
         },
@@ -688,7 +688,7 @@ export default {
         {
           label: "复购-学时冲突",
           prop: "rebuy",
-          hidden: true,
+          hidden: false,
           scope: "rebuy",
         },
       ],

+ 2 - 30
src/views/education/dataReview/dataConfig/index.vue

@@ -48,7 +48,7 @@
     <el-dialog
       @closed="loadingClose"
       :visible.sync="dialogVisible"
-      width="900px"
+      width="1000px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -149,7 +149,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleRecord"
-      width="900px"
+      width="1000px"
       :show-close="false"
       :close-on-click-modal="false"
     >
@@ -754,34 +754,6 @@ export default {
       }
       this.dialogVisible = true;
     },
-    submit() {
-      this.disabledBtn = true;
-      return;
-      if (this.statusPop === 1) {
-        this.$api
-          .apppaynature(this.listData)
-          .then((res) => {
-            this.$message.success("新增成功");
-            this.dialogVisible = false;
-            this.search();
-          })
-          .catch(() => {
-            this.disabledBtn = false;
-          });
-      }
-      if (this.statusPop === 0) {
-        this.$api
-          .editpaynature(this.listData)
-          .then((res) => {
-            this.$message.success("修改成功");
-            this.dialogVisible = false;
-            this.search();
-          })
-          .catch(() => {
-            this.disabledBtn = false;
-          });
-      }
-    },
     close() {
       this.dialogVisible = false;
     },

+ 139 - 5
src/views/education/studentManageMent/studentXQ/studentBaseManage.vue

@@ -27,6 +27,22 @@
                   ]"
                 >
                 </el-image>
+                <el-button
+                  class="topRightIcon"
+                  size="mini"
+                  type="success"
+                  icon="el-icon-refresh"
+                  circle
+                  onclick="document.querySelector('#file1').click()"
+                ></el-button>
+                <input
+                  id="file1"
+                  type="file"
+                  ref="file1"
+                  style="display: none"
+                  @change="uploadImg(1)"
+                />
+
                 <div class="pos_bottom">一寸头像图</div>
               </div>
               <div class="photoSty2">
@@ -45,7 +61,22 @@
                   ]"
                 >
                 </el-image>
-                <div class="pos_bottom">身份证正面照片</div>
+                <el-button
+                  class="topRightIcon"
+                  size="mini"
+                  type="success"
+                  icon="el-icon-refresh"
+                  circle
+                  onclick="document.querySelector('#file2').click()"
+                ></el-button>
+                <input
+                  id="file2"
+                  type="file"
+                  ref="file2"
+                  style="display: none"
+                  @change="uploadImg(2)"
+                />
+                <div class="pos_bottom">身份证头像照</div>
               </div>
               <div class="photoSty2" style="margin-right: 0px">
                 <img
@@ -63,7 +94,22 @@
                   ]"
                 >
                 </el-image>
-                <div class="pos_bottom">身份证背面照片</div>
+                <el-button
+                  class="topRightIcon"
+                  size="mini"
+                  type="success"
+                  icon="el-icon-refresh"
+                  circle
+                  onclick="document.querySelector('#file3').click()"
+                ></el-button>
+                <input
+                  id="file3"
+                  type="file"
+                  ref="file3"
+                  style="display: none"
+                  @change="uploadImg(3)"
+                />
+                <div class="pos_bottom">身份证国徽照</div>
               </div>
             </div>
           </el-col>
@@ -72,13 +118,13 @@
               <el-input disabled v-model="listData.studentCode"></el-input>
             </el-form-item>
             <el-form-item label="绑定手机号" prop="telphone">
-              <el-input disabled v-model="listData.telphone"></el-input>
+              <el-input  v-model="listData.telphone"></el-input>
             </el-form-item>
             <el-form-item label="姓名" prop="realname">
-              <el-input disabled v-model="listData.realname"></el-input>
+              <el-input  v-model="listData.realname"></el-input>
             </el-form-item>
             <el-form-item label="身份证号码" prop="idCard">
-              <el-input disabled v-model="listData.idCard"></el-input>
+              <el-input  v-model="listData.idCard"></el-input>
             </el-form-item>
             <el-form-item label="性别" prop="sex">
               <el-radio-group v-model="listData.sex">
@@ -233,6 +279,74 @@ export default {
     this.getUserInfos();
   },
   methods: {
+    uploadImg(int) {
+      var self = this;
+      if (int === 1) {
+        var file = self.$refs.file1.files[0];
+      }
+      if (int === 2) {
+        var file = self.$refs.file2.files[0];
+      }
+      if (int === 3) {
+        var file = self.$refs.file3.files[0];
+      }
+
+      if (file === undefined) {
+        if (int === 1) {
+          self.$set(self.listData, "oneInchPhotos", "");
+        }
+        if (int === 2) {
+          self.$set(self.listData, "idCardImg1", "");
+        }
+        if (int === 3) {
+          self.$set(self.listData, "idCardImg2", "");
+        }
+        return;
+      }
+      if (file.size > 0.3 * 1024 * 1024) {
+        self.$message.error("图片不得大于300kb");
+        return;
+      }
+      if (int === 1) {
+        var type = self.$refs.file1.value.toLowerCase().split(".").splice(-1);
+      }
+      if (int === 2) {
+        var type = self.$refs.file2.value.toLowerCase().split(".").splice(-1);
+      }
+      if (int === 3) {
+        var type = self.$refs.file3.value.toLowerCase().split(".").splice(-1);
+      }
+      if (
+        type[0] != "jpg" &&
+        type[0] != "png" &&
+        type[0] != "jpeg" &&
+        type[0] != "gif"
+      ) {
+        self.$message.error("上传格式需为:.jpg/.png/.jpeg/gif");
+
+        if (int === 1) {
+          self.$refs.file1.value = "";
+        }
+        if (int === 2) {
+          self.$refs.file2.value = "";
+        }
+        if (int === 3) {
+          self.$refs.file3.value = "";
+        }
+        return;
+      }
+      this.$upload.upload(file, 0).then((res) => {
+        if (int === 1) {
+          self.listData.oneInchPhotos = res;
+        }
+        if (int === 2) {
+          self.listData.idCardImg1 = res;
+        }
+        if (int === 3) {
+          self.listData.idCardImg2 = res;
+        }
+      });
+    },
     getUserInfos() {
       this.$api
         .inquiregradestudentlistStudent({ userId: this.$route.query.id })
@@ -280,6 +394,16 @@ export default {
   background-color: #fff;
   position: relative;
   margin-bottom: 30px;
+  .topRightIcon {
+    display: none;
+    position: absolute;
+    top: 4px;
+    font-size: 14px;
+    right: 4px;
+  }
+  &:hover .topRightIcon {
+    display: block;
+  }
 }
 .photoSty2 {
   position: relative;
@@ -288,6 +412,16 @@ export default {
   height: 160px;
   background-color: #fff;
   margin-bottom: 30px;
+  .topRightIcon {
+    display: none;
+    position: absolute;
+    top: 4px;
+    font-size: 14px;
+    right: 4px;
+  }
+  &:hover .topRightIcon {
+    display: block;
+  }
 }
 .pos_bottom {
   position: absolute;

+ 4 - 4
src/views/resource/bankManagement/chapterVolumeManagement/index.vue

@@ -108,12 +108,12 @@ export default {
         {
           label: "章卷编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "章卷标题",
@@ -127,14 +127,14 @@ export default {
           prop2: "projectName",
           prop3: "businessName",
           prop4: "subjectName",
-          hidden: true,
+          hidden: false,
           scope: "eduTypes",
         },
         {
           label: "关联商品",
           prop: "goodsList",
           prop1: "goodsName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 7,
         },

+ 2 - 2
src/views/resource/bankManagement/testPaperManagement/addPaper/topicAddPaper/index.vue

@@ -763,12 +763,12 @@ export default {
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "知识点",
           prop: "knowledgeList",
-          hidden: true,
+          hidden: false,
           scope: "knowledge",
           width: "200px",
           showTooltip: true,

+ 2 - 2
src/views/resource/bankManagement/testPaperManagement/editPaper/topicEditPaper/index.vue

@@ -766,13 +766,13 @@ export default {
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
           width: "160px",
         },
         {
           label: "知识点",
           prop: "knowledgeList",
-          hidden: true,
+          hidden: false,
           scope: "knowledge",
           width: "200px",
           showTooltip: true,

+ 4 - 4
src/views/resource/bankManagement/testPaperManagement/index.vue

@@ -121,12 +121,12 @@ export default {
         {
           label: "试卷编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "名称前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "试卷名称",
@@ -140,7 +140,7 @@ export default {
           prop2: "projectName",
           prop3: "businessName",
           prop4: "subjectName",
-          hidden: true,
+          hidden: false,
           scope: "eduTypes",
         },
         {
@@ -165,7 +165,7 @@ export default {
           label: "关联商品",
           prop: "goodsList",
           prop1: "goodsName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 6,
         },

+ 5 - 5
src/views/resource/bankManagement/topicManagement/index.vue

@@ -341,12 +341,12 @@ export default {
         {
           label: "题目编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "题目标题",
@@ -364,14 +364,14 @@ export default {
         {
           label: "知识点",
           prop: "knowledgeList",
-          hidden: true,
+          hidden: false,
           scope: "knowledge",
           showTooltip: true,
         },
         {
           label: "适用业务层级",
           prop: "businessList",
-          hidden: true,
+          hidden: false,
           scope: "mapTypesMores",
         },
         {
@@ -406,7 +406,7 @@ export default {
           label: "关联试卷",
           prop: "examList",
           prop1: "examName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 5,
         },

+ 4 - 4
src/views/resource/bankManagement/volumeManagement/index.vue

@@ -108,12 +108,12 @@ export default {
         {
           label: "模块卷编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "模块卷标题",
@@ -127,14 +127,14 @@ export default {
           prop2: "projectName",
           prop3: "businessName",
           prop4: "subjectName",
-          hidden: true,
+          hidden: false,
           scope:"eduTypes",
         },
         {
           label: "关联商品",
           prop: "goodsList",
           prop1: "goodsName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int:8
         },

+ 67 - 15
src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="businessLevel">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="init"
+    />
     <table-list
       rowKey="id"
       ref="tableList"
@@ -31,8 +38,8 @@
     </table-list>
     <pagination
       :total="total"
-      :pageSize="pageSize"
-      :currentPage="currentPage"
+      :pageSize="formData.pageSize"
+      :currentPage="formData.pageNum"
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
@@ -225,15 +232,15 @@
 </template>
 
 <script>
-import searchBox from "@/components/searchBox";
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "BusinessLevel",
-  components: { searchBox, tableList, pagination },
+  components: { searchBoxNew, tableList, pagination },
   data() {
     return {
-      activeId:'',
+      activeId: "",
       disabledBtn: false,
       loading: false, //当前表单加载是否加载动画
       navText: {
@@ -250,6 +257,48 @@ export default {
           title: "配置下单填选模板",
         },
       },
+      //搜索
+      formList: [
+        {
+          prop: "educationId",
+          placeholder: "教育类型",
+          scope: "educationType",
+        },
+        {
+          prop: "projectId",
+          placeholder: "项目类型",
+          scope: "projectLevel",
+        },
+        {
+          prop: "status",
+          placeholder: "状态",
+          scope: "select",
+          noClear: false,
+          options: [
+            {
+              label: "全部",
+              value: "0,1",
+            },
+            {
+              label: "启用",
+              value: 1,
+            },
+            {
+              label: "关闭",
+              value: 0,
+            },
+          ],
+        },
+        {
+          prop: "businessName",
+          placeholder: "请输入业务层次名称",
+        },
+      ],
+      formData: {
+        status: "0,1",
+        pageSize: 10,
+        pageNum: 1,
+      },
       // 表单
       tableSet: [
         {
@@ -447,7 +496,7 @@ export default {
     setOptions(v, int) {
       if (int) {
         this.learningOrder = v.goodsLearningOrder;
-        this.activeId = v.id
+        this.activeId = v.id;
         this.dialogVisibleSet = true;
       } else {
         if (!this.$refs.tableList.allCheckData.length) {
@@ -581,11 +630,14 @@ export default {
     },
     search(v) {
       this.loading = true;
-      var data = {
-        status: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
+      if (v === 2) {
+        this.formData = {
+          status: "0,1",
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
         .inquirebusinessList(data)
         .then((res) => {
@@ -598,7 +650,7 @@ export default {
         });
     },
     init() {
-      this.search();
+      this.search(2);
     },
     del(v) {
       this.$alert(
@@ -686,12 +738,12 @@ export default {
       this.dialogVisible = false;
     },
     handleSizeChange(v) {
-      this.pageSize = v;
-      this.currentPage = 1;
+      this.formData.pageSize = v;
+      this.formData.pageNum = 1;
       this.search();
     },
     handleCurrentChange(v) {
-      this.currentPage = v;
+      this.formData.pageNum = v;
       this.search();
     },
   },

+ 72 - 14
src/views/resource/baseManageInfos/resource/professional/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="professional">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="init"
+    />
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -17,8 +24,8 @@
     </table-list>
     <pagination
       :total="total"
-      :pageSize="pageSize"
-      :currentPage="currentPage"
+      :pageSize="formData.pageSize"
+      :currentPage="formData.pageNum"
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
@@ -50,6 +57,7 @@
             :key="indexs"
             :label="items.label"
             :prop="items.prop"
+            :required="items.required"
           >
             <el-radio-group
               v-if="items.scope === 'status'"
@@ -167,12 +175,12 @@
 </template>
 
 <script>
-import searchBox from "@/components/searchBox";
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "Professional",
-  components: { searchBox, tableList, pagination },
+  components: { searchBoxNew, tableList, pagination },
   data() {
     return {
       disabledBtn: false,
@@ -191,6 +199,48 @@ export default {
           title: "未定义",
         },
       },
+      //搜索
+      formList: [
+        {
+          prop: "educationId",
+          placeholder: "教育类型",
+          scope: "educationType",
+        },
+        {
+          prop: "projectId",
+          placeholder: "项目类型",
+          scope: "projectLevel",
+        },
+        {
+          prop: "status",
+          placeholder: "状态",
+          scope: "select",
+          noClear: false,
+          options: [
+            {
+              label: "全部",
+              value: "0,1",
+            },
+            {
+              label: "启用",
+              value: 1,
+            },
+            {
+              label: "关闭",
+              value: 0,
+            },
+          ],
+        },
+        {
+          prop: "categoryName",
+          placeholder: "请输入专业名称",
+        },
+      ],
+      formData: {
+        status: "0,1",
+        pageSize: 10,
+        pageNum: 1,
+      },
       // 表单
       tableSet: [
         {
@@ -241,6 +291,7 @@ export default {
         {
           label: "适用项目类型",
           scope: "certificate",
+          required: true,
         },
         {
           label: "",
@@ -304,7 +355,7 @@ export default {
     this.BQListApi();
     this.initOptions();
   },
-  activated(){
+  activated() {
     this.search();
     this.BQListApi();
     this.initOptions();
@@ -379,11 +430,14 @@ export default {
     },
     search(v) {
       this.loading = true;
-      var data = {
-        status: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
+      if (v === 2) {
+        this.formData = {
+          status: "0,1",
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
         .inquireCourseMajor(data)
         .then((res) => {
@@ -396,7 +450,7 @@ export default {
         });
     },
     init() {
-      this.search();
+      this.search(2);
     },
     closeType(id) {
       this.cauType.splice(this.cauType.indexOf(id), 1);
@@ -457,6 +511,10 @@ export default {
     submit(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
+          if (!this.cauType.length) {
+            this.$message.warning("请添加适用项目类型");
+            return;
+          }
           this.rulesTableSumbit();
         } else {
           return false;
@@ -497,12 +555,12 @@ export default {
       this.dialogVisible = false;
     },
     handleSizeChange(v) {
-      this.pageSize = v;
-      this.currentPage = 1;
+      this.formData.pageSize = v;
+      this.formData.pageNum = 1;
       this.search();
     },
     handleCurrentChange(v) {
-      this.currentPage = v;
+      this.formData.pageNum = v;
       this.search();
     },
   },

+ 61 - 14
src/views/resource/baseManageInfos/resource/projectType/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="projectType">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="init"
+    />
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -17,8 +24,8 @@
     </table-list>
     <pagination
       :total="total"
-      :pageSize="pageSize"
-      :currentPage="currentPage"
+      :pageSize="formData.pageSize"
+      :currentPage="formData.pageNum"
       @handleSizeChange="handleSizeChange"
       @handleCurrentChange="handleCurrentChange"
     />
@@ -107,12 +114,12 @@
 </template>
 
 <script>
-import searchBox from "@/components/searchBox";
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "ProjectType",
-  components: { searchBox, tableList, pagination },
+  components: { searchBoxNew, tableList, pagination },
   data() {
     return {
       disabledBtn: false,
@@ -129,6 +136,43 @@ export default {
           title: "未定义",
         },
       },
+      //搜索
+      formList: [
+        {
+          prop: "educationId",
+          placeholder: "教育类型",
+          scope: "educationType",
+        },
+        {
+          prop: "status",
+          placeholder: "状态",
+          scope: "select",
+          noClear: false,
+          options: [
+            {
+              label: "全部",
+              value: "0,1",
+            },
+            {
+              label: "启用",
+              value: 1,
+            },
+            {
+              label: "关闭",
+              value: 0,
+            },
+          ],
+        },
+        {
+          prop: "projectName",
+          placeholder: "请输入项目类型名称",
+        },
+      ],
+      formData: {
+        status: "0,1",
+        pageSize: 10,
+        pageNum: 1,
+      },
       // 表单
       tableSet: [
         {
@@ -215,7 +259,7 @@ export default {
     this.search();
     this.getEduType();
   },
-  activated(){
+  activated() {
     this.search();
     this.getEduType();
   },
@@ -237,11 +281,14 @@ export default {
     },
     search(v) {
       this.loading = true;
-      var data = {
-        status: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
+      if (v === 2) {
+        this.formData = {
+          status: "0,1",
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
         .inquireCourseProjectType(data)
         .then((res) => {
@@ -254,7 +301,7 @@ export default {
         });
     },
     init() {
-      this.search();
+      this.search(2);
     },
     del(v) {
       this.$alert(
@@ -342,12 +389,12 @@ export default {
       this.disabledBtn = false;
     },
     handleSizeChange(v) {
-      this.pageSize = v;
-      this.currentPage = 1;
+      this.formData.pageSize = v;
+      this.formData.pageNum = 1;
       this.search();
     },
     handleCurrentChange(v) {
-      this.currentPage = v;
+      this.formData.pageNum = v;
       this.search();
     },
   },

+ 64 - 12
src/views/resource/baseManageInfos/resource/suject/index.vue

@@ -1,5 +1,12 @@
 <template>
   <div id="suject">
+    <search-box-new
+      ref="searchBox"
+      :formData="formData"
+      :formList="formList"
+      @search="search"
+      @init="init"
+    />
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -154,12 +161,12 @@
 </template>
 
 <script>
-import searchBox from "@/components/searchBox";
+import searchBoxNew from "@/components/searchBoxNew";
 import tableList from "@/components/tableList";
 import pagination from "@/components/pagination";
 export default {
   name: "Suject",
-  components: { searchBox, tableList, pagination },
+  components: { searchBoxNew, tableList, pagination },
   data() {
     return {
       disabledBtn: false,
@@ -178,6 +185,48 @@ export default {
           title: "未定义",
         },
       },
+      //搜索
+      formList: [
+        {
+          prop: "educationId",
+          placeholder: "教育类型",
+          scope: "educationType",
+        },
+        {
+          prop: "projectId",
+          placeholder: "项目类型",
+          scope: "projectLevel",
+        },
+        {
+          prop: "status",
+          placeholder: "状态",
+          scope: "select",
+          noClear: false,
+          options: [
+            {
+              label: "全部",
+              value: "0,1",
+            },
+            {
+              label: "启用",
+              value: 1,
+            },
+            {
+              label: "关闭",
+              value: 0,
+            },
+          ],
+        },
+        {
+          prop: "subjectName",
+          placeholder: "请输入科目名称",
+        },
+      ],
+      formData: {
+        status: "0,1",
+        pageSize: 10,
+        pageNum: 1,
+      },
       // 表单
       tableSet: [
         {
@@ -222,7 +271,7 @@ export default {
         {
           label: "适用项目类型",
           scope: "certificate",
-          required:true
+          required: true,
         },
         {
           label: "",
@@ -337,11 +386,14 @@ export default {
     },
     search(v) {
       this.loading = true;
-      var data = {
-        status: "0,1",
-        pageSize: this.pageSize,
-        pageNum: this.currentPage,
-      };
+      if (v === 2) {
+        this.formData = {
+          status: "0,1",
+          pageSize: 10,
+          pageNum: 1,
+        };
+      }
+      var data = JSON.parse(JSON.stringify(this.formData));
       this.$api
         .inquireCourseSubject(data)
         .then((res) => {
@@ -354,7 +406,7 @@ export default {
         });
     },
     init() {
-      this.search();
+      this.search(2);
     },
     closeType(id) {
       this.cauType.splice(this.cauType.indexOf(id), 1);
@@ -459,12 +511,12 @@ export default {
       this.dialogVisible = false;
     },
     handleSizeChange(v) {
-      this.pageSize = v;
-      this.currentPage = 1;
+      this.formData.pageSize = v;
+      this.formData.pageNum = 1;
       this.search();
     },
     handleCurrentChange(v) {
-      this.currentPage = v;
+      this.formData.pageNum = v;
       this.search();
     },
   },

+ 2 - 2
src/views/resource/handoutManagement/handoutList/add/index.vue

@@ -484,8 +484,8 @@ export default {
         self.$set(self.listData, "handoutsUrl", "");
         return;
       }
-      if (file.size > 20 * 1024 * 1024) {
-        self.$message.error("pdf文件不得大于20MB");
+      if (file.size > 100 * 1024 * 1024) {
+        self.$message.error("pdf文件不得大于100MB");
         return;
       }
       var type = self.$refs.file.value.toLowerCase().split(".").splice(-1);

+ 2 - 2
src/views/resource/handoutManagement/handoutList/edit/index.vue

@@ -500,8 +500,8 @@ export default {
         self.$set(self.listData, "handoutsUrl", "");
         return;
       }
-      if (file.size > 20 * 1024 * 1024) {
-        self.$message.error("pdf文件不得大于20MB");
+      if (file.size > 100 * 1024 * 1024) {
+        self.$message.error("pdf文件不得大于100MB");
         return;
       }
       var type = self.$refs.file.value.toLowerCase().split(".").splice(-1);

+ 4 - 4
src/views/resource/videoManagement/chapter/index.vue

@@ -109,12 +109,12 @@ export default {
         {
           label: "章编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "章标题",
@@ -125,14 +125,14 @@ export default {
         {
           label: "适用业务层级",
           prop: "businessList",
-          hidden: true,
+          hidden: false,
           scope: "mapTypesMores",
         },
         {
           label: "关联模块",
           prop: "moduleList",
           prop1: "moduleName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 2,
         },

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

@@ -394,7 +394,6 @@ export default {
           } else {
             this.newSchoolOption = newSchoolOption;
           }
-
           for (let i = 0; i < this.majorOption.length; i++) {
             if (
               this.majorOption[i].courseArrays.indexOf(item.projectId) !== -1
@@ -402,11 +401,11 @@ export default {
               newMajorOption.push(this.majorOption[i]);
             }
           }
-          if (!newMajorOption.length) {
-            this.newMajorOption = this.majorOption;
-          } else {
+          // if (!newMajorOption.length) {
+          //   this.newMajorOption = this.majorOption;
+          // } else {
             this.newMajorOption = newMajorOption;
-          }
+          // }
           for (let i = 0; i < this.sujectOption.length; i++) {
             if (
               this.sujectOption[i].courseArrays.indexOf(item.projectId) !== -1

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

@@ -480,11 +480,11 @@ export default {
               newMajorOption.push(this.majorOption[i]);
             }
           }
-          if (!newMajorOption.length) {
-            this.newMajorOption = this.majorOption;
-          } else {
+          // if (!newMajorOption.length) {
+          //   this.newMajorOption = this.majorOption;
+          // } else {
             this.newMajorOption = newMajorOption;
-          }
+          // }
 
           for (let i = 0; i < this.sujectOption.length; i++) {
             if (

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

@@ -126,12 +126,12 @@ export default {
         {
           label: "课程编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "名称前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "课程名称",
@@ -147,12 +147,12 @@ export default {
         {
           label: "专业",
           prop: "categoryName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "院校",
           prop: "schoolName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "业务层次",

+ 5 - 4
src/views/resource/videoManagement/festival/index.vue

@@ -220,12 +220,12 @@ export default {
         {
           label: "节编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "节标题",
@@ -236,14 +236,14 @@ export default {
         {
           label: "适用业务层级",
           prop: "businessList",
-          hidden: true,
+          hidden: false,
           scope: "mapTypesMores",
         },
         {
           label: "关联章",
           prop: "chapterList",
           prop1: "chapterName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 1,
         },
@@ -262,6 +262,7 @@ export default {
           prop: "sectionType",
           hidden: true,
           scope: "sectionTypesTTT",
+          width:"120px"
         },
         {
           label: "节时长",

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

@@ -108,12 +108,12 @@ export default {
         {
           label: "模块编码",
           prop: "code",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "标题前缀",
           prop: "prefixName",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "模块标题",
@@ -124,26 +124,26 @@ export default {
         {
           label: "适用业务层级",
           prop: "businessList",
-          hidden: true,
+          hidden: false,
           scope: "mapTypesMores",
         },
         {
           label: "关联课程",
           prop: "courseList",
           prop1: "courseName",
-          hidden: true,
+          hidden: false,
           scope: "aboutChapter",
           int: 3,
         },
         {
           label: "章总数",
           prop: "chapterNum",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "节总数",
           prop: "sectionNum",
-          hidden: true,
+          hidden: false,
         },
         {
           label: "学习时长",