修改显示

src/views/accompanyManager/accompanys.vue

@@ -153,7 +153,7 @@
                           value-format="yyyy-MM-dd"
                           placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <div style="padding-left: 15px; color: red;">课程结束时间不得晚于，{{ expireForm.tempCoursesExpireDate }}</div>
+        <div style="padding-left: 15px; color: red;">课程结束时间不得早于，{{ expireForm.tempCoursesExpireDate }}</div>
       </el-form>
       <div slot="footer"
            class="dialog-footer">

src/views/contentManager/contentOperation.vue

@@ -337,7 +337,7 @@ export default {
     const query = this.$route.query
     let url = ''
     // let url = query.type == 7 ? vaildStudentUrl() + "/#/knowledge" : vaildStudentUrl() + "/#/specialdetail"
-    console.log(query.type)
+    // console.log(query.type)
     if (query.type == 7) {
       url = vaildStudentUrl() + "/#/knowledge"
     } else if (query.type == 8 || query.type == 5) {
@@ -576,7 +576,7 @@ export default {
         if (valid) {
           let form = Object.assign({}, this.form)
           let actionTime = form.actionTime
-          console.log(actionTime)
+          // console.log(actionTime)
           if(actionTime && actionTime.length > 0) {
             form.onlineTime = dayjs(actionTime[0]).format('YYYY-MM-DD HH:mm:ss')
             form.offlineTime = dayjs(actionTime[1]).format('YYYY-MM-DD HH:mm:ss')
@@ -616,7 +616,7 @@ export default {
         this.$router.push({
           path: "/contentManager/contentManager",
           query: {
-            type: this.typeIndex(this.type)
+            tabrouter: this.typeIndex(this.type)
           }
         });
       } else {
@@ -627,7 +627,7 @@ export default {
       this.$router.push({
         path: "/contentManager/contentManager",
         query: {
-          type: this.typeIndex(this.type)
+          tabrouter: this.typeIndex(this.type)
         }
       });
     },

src/views/teamDetail/components/studentList.vue

@@ -15,16 +15,21 @@
         <span>{{ studentListInfo.add }}</span>
       </statistic-item>
       <statistic-item>
+        <span>VIP&网管转化率</span>
+        <span>{{ studentListInfo.courseRate }}</span>
+      </statistic-item>
+    </statistic>
+    <!-- <statistic-item>
         <div style="display: flex;">
           <div>
             <div class="newStudent"
               style="margin-bottom:10px;"
               v-permission="'studentRegistration/insertStudent'"
               @click="addStudentVisible = true">新增学员</div>
-          <!-- <div class="newStudent"
+          <div class="newStudent"
               style="margin-bottom:10px;"
               v-permission="'teamDetails/studentList/QRCode/822'"
-              @click="onCreateQRCode">报名连接</div> -->
+              @click="onCreateQRCode">报名连接</div>
             <div class="newStudent"
               v-permission="'/studentSignin'"
               @click="gotoSignin">点名总览</div>
@@ -36,9 +41,15 @@
               @click="viewTimer">剩余时长明细</div>
           </div>
         </div>
-      </statistic-item>
-    </statistic>
-
+      </statistic-item> -->
+    <div style="margin-bottom: 15px;">
+      <el-button type="primary" v-permission="'studentRegistration/insertStudent'"
+              @click="addStudentVisible = true">新增学员</el-button>
+      <el-button type="primary" v-permission="'/studentSignin'"
+              @click="gotoSignin">点名总览</el-button>
+      <el-button type="primary" v-permission="'studentManage/queryStudentSubTotalCourseTimes'"
+              @click="viewTimer">剩余时长明细</el-button>
+    </div>
     <!-- 搜索类型 -->
     <save-form
     ref='searchForm'
@@ -122,6 +133,16 @@
           <el-option label="否" value="0"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item prop="hasCourse">
+        <el-select
+          v-model.trim="searchForm.hasCourse"
+          clearable
+          placeholder="VIP/网管是否有课"
+        >
+          <el-option label="是" value="true"></el-option>
+          <el-option label="否" value="false"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button native-type="submit" type="danger">搜索</el-button>
         <el-button type="primary" native-type="reset">重置</el-button>
@@ -221,6 +242,11 @@
             <div>{{ scope.row.isActive ? "是" : "否" }}</div>
           </template>
         </el-table-column>
+        <el-table-column align="center" label="VIP/网管是否有课">
+          <template slot-scope="scope">
+            <div>{{ scope.row.hasCourse ? "是" : "否" }}</div>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="欠费金额(元)">
           <template slot-scope="scope">
             <div :class="[scope.row.noPaymentAmount > 0 ? 'error' : null]">{{ scope.row.noPaymentAmount | moneyFormat }}
@@ -684,6 +710,7 @@ export default {
         search: "",
         isActive: "",
         classGroupId: null,
+        hasCourse: null
       },
       organizationCourseUnitPriceSettings: [],
       quitForm: {
@@ -710,6 +737,7 @@ export default {
         add: "",
         quit: "",
         studying: "",
+        courseRate: "",
       },
       signList: [],
       mixList: [],
@@ -852,9 +880,9 @@ export default {
       return template[val];
     },
   },
-  activated() {
-    this.init();
-  },
+  // activated() {
+  //   this.init();
+  // },
   async mounted() {
     try {
       const res = await getOrganizationCourseUnitPriceSettings({
@@ -969,6 +997,7 @@ export default {
         search: this.searchForm.search || null,
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
+        hasCourse: this.searchForm.hasCourse || null
       };
       const options = {
         method: "get",
@@ -1043,6 +1072,7 @@ export default {
         search: this.searchForm.search || null,
         isActive: this.searchForm.isActive || null,
         classGroupId: this.searchForm.classGroupId || null,
+        hasCourse: this.searchForm.hasCourse || null
       };
       getTeamStudentList(obj).then((res) => {
         if (res.code == 200) {