解决：选择组件有问题

src/components/education/custom/course-list.vue

@@ -8,8 +8,14 @@
       <li class="order">
         <div class="num" @click="toggleOrder">
           <span>学习人数</span>
+          <span v-show="kind == 0">
             <img v-show="!isRise" src="../../../assets/custom/icon/icon-rise.png" alt />
             <img v-show="isRise" src="../../../assets/custom/icon/icon-drop.png" alt />
+          </span>          
+          <span v-show="kind == 1">
+            <img v-show="!isRiseOrg" src="../../../assets/custom/icon/icon-rise.png" alt />
+            <img v-show="isRiseOrg" src="../../../assets/custom/icon/icon-drop.png" alt />
+          </span>
         </div>
         <div class="cart-wrapper">
           <div class="cart" @click="toggleCart">
@@ -114,10 +120,17 @@ export default {
     ...mapActions(["setCartList", "setSearchParam", "setSearchParamOrg"]),
 
     toggleOrder() {
+      if(this.kind == 0) {
         this.isRise = !this.isRise;
         let dir = this.isRise ? 1 : 2;
         this.searchParam.dir = dir;
         this.setSearchParam(this.searchParam);
+      } else {
+        this.isRiseOrg = !this.isRiseOrg;
+        let dir = this.isRiseOrg ? 1 : 2;
+        this.searchParamOrg.dir = dir;
+        this.setSearchParamOrg(this.searchParamOrg);
+      }
     },
     toggleCart() {
       this.isShowCart = !this.isShowCart;
@@ -155,6 +168,8 @@ export default {
       this.setCartList(this.cartList);
       this.$forceUpdate();
     },
+
+    // 通知父组件，打开创建资源（课程）弹框
     showOrgCourse() {
       this.$emit('showOrgCourse', 'add');
     },

src/utils/fetch.js

@@ -54,7 +54,7 @@ service.interceptors.request.use(config => {
     }
     if( process.env.BUILD_ENV == "development" ){  // 本地开发环境
       // console.log('环境变量>>>> ', process.env.BUILD_ENV);
-      config.headers['token'] = 'BCBEB604699441FE86DDB0C5C19A852B';
+      config.headers['token'] = '0BC342A9462E400FBEBBDAE1DB82C7DA';
       // config.headers['token'] = localStorage.getItem('storageToken')
     }else{
       config.headers['token'] = localStorage.getItem('storageToken')

src/views/education/edit-custom.vue

@@ -177,6 +177,34 @@ export default {
       isPreviewProtocol: false,
       protocolId: 5,
       protocolContent: '',
+      orgCourseInfo: {
+        defaultDoctor: {
+          courseDoctorAvatarUrl: '',
+          courseDoctorAvatarUrlCheck: '',
+          courseDoctorHospital: '',
+          courseDoctorHospitalCheck: '',
+          courseDoctorName: '',
+          courseDoctorNameCheck: '',
+          id: 0
+        },
+        doctorModelList: [
+          {
+            courseDoctorAvatarUrl: '',
+            courseDoctorAvatarUrlCheck: '',
+            courseDoctorHospital: '',
+            courseDoctorHospitalCheck: '',
+            courseDoctorName: '',
+            courseDoctorNameCheck: '',
+            id: 0
+          }
+        ],
+        limitModel: {
+          maxLimitOneVideoSize: 0,
+          maxLimitVideoCount: 0,
+          maxStorageSpace: 0,
+          usedStorageSpace: 0
+        }
+      },
     };
   },
   computed: {
@@ -185,6 +213,7 @@ export default {
   watch: {
     kind(newKind) {
       let searchParam = newKind == 0 ? this.searchParam : this.searchParamOrg;
+      this.setKind(newKind);
       this.getCourseList(searchParam);
     },
     searchParam: {
@@ -223,7 +252,6 @@ export default {
     resizeHeight();
     this.getLabelList();
     this.initPageParams();
-    // this.initPageParams();
   },
   methods: {
     ...mapActions([
@@ -236,25 +264,27 @@ export default {
       "setAllLabelListOrg",
       "setSubLabelListOrg",
       "setCourseLimitCount",
+      "setKind"
     ]),
 
     initPageParams(labelIdList) {
-      // let searchParam = {
-      //   kind: 0,
-      //   orderBy: 2,
-      //   dir: 1,
-      //   grade: 0,
-      //   pageNo: 1,
-      //   pageSize: 10,
-      //   labelIdList: labelIdList || []
-      // };
       this.setCartList([]);
       this.setCourseList([]);
       this.setAllLabelList([]);
       this.setSubLabelList([]);
+      this.setAllLabelListOrg([]);
+      this.setSubLabelListOrg([]);
       this.courseLimitCount();
-      // this.getLabelList();
-      // this.getCourseList(searchParam);
+      this.initOrgCourseInfo();
+    },
+
+    // 创建课程页面的初始信息
+    initOrgCourseInfo() {
+      vm.GET("contents/course/custom/info/init", {setEntry: true}).then(res => {
+        if (res.code == "000000") {
+          this.orgCourseInfo = res.data;
+        }
+      });
     },
 
     // 自定义项目--选择课程个数限制(-1表示不限制)
@@ -267,17 +297,20 @@ export default {
     },
 
     // 获取所有标签（一级及二级）,交做相应处理
-    // TODO
+    // 先将所有的标签添加checked字段
     getLabelList() {
       vm.GET("contents/diseases/labelList", {}).then(res => {
         if (res.code == "000000") {
-          // 先将所有的标签添加checked字段
-          let labelList = res.data;
-          // let labelListOrg = res.data;
+          this.storeLables(JSON.parse(JSON.stringify(res.data)));
+          this.storeLablesOrg(JSON.parse(JSON.stringify(res.data)));
+        }
+      });
+    },
+
+    // 设置公共课程的相关查询
+    storeLables(labelList) {
       let allSubList = [];
-          let allSubListOrg = [];
       let labelIdList = [];
-          let labelIdListOrg = [];
       labelList.forEach((item, index) => {
         item.checked = false;
         item.subList.forEach((sub, subIndex) => {
@@ -306,8 +339,6 @@ export default {
 
       this.setAllLabelList(labelList);
       this.setSubLabelList(allSubList);
-          this.setAllLabelListOrg(JSON.parse(JSON.stringify(labelList)));
-          this.setSubLabelListOrg(JSON.parse(JSON.stringify(allSubList)));
 
       let searchParam = {
         kind: 0,
@@ -318,11 +349,52 @@ export default {
         pageSize: 10,
         labelIdList: labelIdList || []
       };        
-          this.setSearchParam(Object.assign({}, searchParam));
-          searchParam.kind = 1;
-          this.setSearchParamOrg(Object.assign({}, searchParam));
+      this.setSearchParam(searchParam);
+    },
+
+    // 设置机构的相关查询
+    storeLablesOrg(labelList) {
+      let allSubList = [];
+      let labelIdList = [];
+      labelList.forEach((item, index) => {
+        item.checked = false;
+        item.subList.forEach((sub, subIndex) => {
+          sub.parentIndex = index;
+          sub.checked = true;
+          if (subIndex == 0) {
+            sub.id = `subid-${index}`;  // 将二级中的“全部”id改为可以识别的
+          } else {
+            allSubList.push(sub);
+            labelIdList.push(sub.id);
           }
         });
+      });
+      // 构建其子标签
+      allSubList.unshift({
+        name: "全部",
+        checked: true,
+        id: 'parentid-0'
+      });
+      // 添加一级的“全部”标签，并构建其子标签
+      labelList.unshift({
+        name: "全部",
+        checked: true,
+        subList: allSubList
+      });
+
+      this.setAllLabelListOrg(labelList);
+      this.setSubLabelListOrg(allSubList);
+
+      let searchParam = {
+        kind: 1,
+        orderBy: 2,
+        dir: 1,
+        grade: 0,
+        pageNo: 1,
+        pageSize: 10,
+        labelIdList: labelIdList || []
+      };        
+      this.setSearchParamOrg(searchParam);
     },
 
     // （根据条件）查询课程
@@ -369,7 +441,6 @@ export default {
     nextStep() {
       if (vm.active == 0) {
         vm.checkSelectCustomCourse();
-        // vm.checkSelectTemplate()
         return;
       }
       if (vm.active == 1) {
@@ -523,56 +594,32 @@ export default {
         });
     },
 
-    //选中模板后点击下一步时检测(机构和进行中的项目)
-    checkSelectTemplate() {
-      openLoading(vm);
-      vm.GET(
-        `portal/openTemplateProject/checkAfterSelectOneOpenTemplate/${vm.openTemplateId}`
-      )
-        .then(res => {
-          closeLoading(vm);
-          if (res.code == "000000") {
-            if (res.data.status == 0) {
-              vm.active = 1;
-              return;
-            } else {
-              vm.dialogObj = Object.assign(
-                vm.dialogObj,
-                vm.statusObj[`status_${res.data.status}`]
-              );
-              vm.dialogObj.visible = true;
-              return;
-            }
-          } else {
-            vm.$message.info(res.message);
-          }
-        })
-        .catch(err => {
-          closeLoading(vm);
-          vm.$message.warning("请稍后重试");
-        });
-    },
     // 隐藏弹框
     hide() {
       vm.dialogObj.visible = false;
     },
+
     // 获取行政范围
     setRegion() {
       vm.getOrganizationList(vm.$refs.selectRegion.getScope());
     },
+
     // 查询行政范围的设定机构列表
     getOrganizationList(r) {
       vm.$refs.setOrganization.init();
       vm.$refs.setOrganization.getOrganization(r);
     },
+
     // 返回选择模板页
     backSelectVue() {
       vm.active = 0;
     },
+
     // 是否隐藏暂存按钮
     hideSave(num) {
       this.projectStatus = num;
     },
+
     // 从子组件（项目信息）获取项目状态是否为上架
     setStatus4Flag(s) {
       vm.status4Flag = s;
@@ -584,13 +631,11 @@ export default {
       如果没有加入机构，则直接弹出提示（我知道了）
     */
     showOrgCourse(addOrUpdate) {
-      // this.checkProtocol();
       this.checkHospital();
       this.addOrUpdate = addOrUpdate
     },
 
     // 创建机构课程前校验机构
-    // TODO 各个状态与数据结构
     checkHospital() {
       openLoading(vm);
       let req = {
@@ -623,14 +668,12 @@ export default {
     // 判断用户是否签署了最新版协议
     // 如果没有签署，则打开协议签署弹框
     checkProtocol() {
-      // openLoading(vm);
       let req = {
         setEntry: true,
         type: this.protocolId
       }
       vm.GET(`smartcontract/protocol/sign/check`, req)
         .then(res => {
-          // closeLoading(vm);
           if (res.code == "000000") {
             if(!res.data) { // 没有签署，打开协议签署弹框
               this.getProtocolInfoById();   
@@ -642,7 +685,6 @@ export default {
           }
         })
         .catch(err => {
-          closeLoading(vm);
           vm.$message.warning("请稍后重试");
         });
     },
@@ -652,10 +694,8 @@ export default {
       let req = {
         type: this.protocolId
       };
-      // this.GET("smartcontract/protocolManage/protocol", req).then(res => {
       this.GET("smartcontract/protocol/content", req).then(res => {
         if (res.code == "000000") {
-          // this.protocolContent = res.data.contents;
           this.protocolContent = res.data;
           this.isPreviewProtocol = true;
         } else {

src/views/education/external-resource-manage.vue

@@ -22,7 +22,7 @@
           <el-form-item label="创建日期：" class="search-item">
             <el-date-picker
               v-model="searchForm.createdTime"
-              type="datetime"
+              type="date"
               size="small"
               class="form-width"
               value-format="yyyy-MM-dd"
@@ -176,9 +176,17 @@
 
       // 查询列表
       search() {
-        this.GET("contents/course/custom/check/v1/list", this.searchForm).then(res => {
+        let searchForm = Object.assign({}, this.searchForm);
+        let createdTime = searchForm.createdTime;
+        if(createdTime) {
+          searchForm.createdTime = new Date(searchForm.createdTime).getTime();
+        } else {
+          searchForm.createdTime = '';
+        }
+        this.GET("contents/course/custom/check/v1/list", searchForm).then(res => {
           if (res.code == "000000") {
-            this.tableList = res.data || [{}];
+            this.tableList = res.data && res.data.courseList || [];
+            this.totalRows = res.data.totalSize || 0;
             // this.protocolInfo = res.data;
           }
         });