试用会员延长提测

1

src/views/main/cloudDate/allDate.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-card>
-      <headers title="数据总览" />
+      <headers title="数据总览"  :hidenOrgan="true"/>
       <div
         class="wall"
         style="height: 68px"

src/views/studentManager/studentList.vue

@@ -65,6 +65,17 @@
             ></el-option>
           </el-select> -->
         </el-form-item>
+                <el-form-item prop="hasMember">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.hasMember"
+            clearable
+            placeholder="是否是会员"
+          >
+            <el-option label="是" value="1"></el-option>
+            <el-option label="否" value="0"></el-option>
+          </el-select>
+        </el-form-item>
 
         <el-form-item prop="isActive">
           <el-select
@@ -153,46 +164,78 @@
         >
           <el-table-column type="expand">
             <template slot-scope="props">
-              <el-form label-position="left" inline class="demo-table-expand">
-                <el-form-item label="所属学校">
-                  <span>{{ cooperationOrganName }}</span>
-                </el-form-item>
-                <el-form-item label="指导老师">
-                  <span>{{ props.row.teacherName }}</span>
-                </el-form-item>
-                <el-form-item>
-                  <span slot="label"
-                    >是否激活
-                    <el-tooltip placement="top" popper-class="mTooltip">
-                      <div slot="content">学员是否设置密码</div>
-                      <i
-                        class="el-icon-question"
-                        style="font-size: 18px; color: #f56c6c"
-                      ></i> </el-tooltip
-                  ></span>
-                  <span>{{ props.row.isActive ? "是" : "否" }}</span>
-                </el-form-item>
-                <el-form-item label="网管课剩余课时">
-                  <span>{{ props.row.noStartPracticeCourseNum }}</span>
-                </el-form-item>
-                <el-form-item label="vip课剩余课时">
-                  <span>{{ props.row.noStartVipCourseNum }}</span>
-                </el-form-item>
-                <el-form-item label="是否运营">
-                  <span>{{ props.row.operatingTag ? "是" : "否" }}</span>
-                </el-form-item>
-                <el-form-item label="课程余额(元)">
-                  <span>{{ props.row.courseBalance | moneyFormat }}</span>
-                </el-form-item>
-                <el-form-item label="账户余额(元)">
-                  <span>{{ props.row.balance | moneyFormat }}</span>
-                </el-form-item>
-                <el-form-item label="关心包">
-                  <span> {{ props.row.carePackage | studentPackage }} </span>
-                </el-form-item>
-                <el-form-item label="加油包">
-                  <span>{{ props.row.comeOnPackage | studentPackage }}</span>
-                </el-form-item>
+              <el-form label-position="left" class="demo-table-expand">
+                <el-row>
+                  <el-col :span="4">
+                    <el-form-item label="所属学校">
+                      <div class="schoolWrap">
+                        <overflow-text
+                          width="100%"
+                          :text="props.row.cooperationOrganName"
+                        ></overflow-text>
+                      </div> </el-form-item
+                  ></el-col>
+                  <el-col  :span="4">
+                    <el-form-item>
+                      <span slot="label"
+                        >是否激活
+                        <el-tooltip placement="top" popper-class="mTooltip">
+                          <div slot="content">学员是否设置密码</div>
+                          <i
+                            class="el-icon-question"
+                            style="font-size: 18px; color: #f56c6c"
+                          ></i> </el-tooltip
+                      ></span>
+                      <span>{{ props.row.isActive ? "是" : "否" }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col  :span="4">
+                    <el-form-item label="课程余额(元)">
+                      <span>{{ props.row.courseBalance | moneyFormat }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col  :span="4">
+                    <el-form-item label="网管课剩余课时">
+                      <span>{{ props.row.noStartPracticeCourseNum }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col  :span="4">
+                    <el-form-item label="关心包">
+                      <span>
+                        {{ props.row.carePackage | studentPackage }}
+                      </span>
+                    </el-form-item></el-col
+                  >
+                </el-row>
+                <el-row>
+                  <el-col :span="4">
+                    <el-form-item label="指导老师">
+                      <span>{{ props.row.teacherName }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="是否运营">
+                      <span>{{ props.row.operatingTag ? "是" : "否" }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="账户余额(元)">
+                      <span>{{ props.row.balance | moneyFormat }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="vip课剩余课时">
+                      <span>{{ props.row.noStartVipCourseNum }}</span>
+                    </el-form-item></el-col
+                  >
+                  <el-col :span="4">
+                    <el-form-item label="加油包">
+                      <span>{{
+                        props.row.comeOnPackage | studentPackage
+                      }}</span>
+                    </el-form-item></el-col
+                  >
+                </el-row>
               </el-form>
             </template>
           </el-table-column>
@@ -1261,9 +1304,18 @@ export default {
 .demo-table-expand .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
-  width: 400px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-right: 10px;
 }
 /deep/.el-table__expanded-cell[class*="cell"] {
-  padding: 20px 110px;
+  padding: 20px 0 20px 110px;
+}
+.schoolWrap {
+  // width: calc(100% - 75px) !important;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 </style>

src/views/teamDetail/components/studentList.vue

@@ -208,35 +208,57 @@
         ></el-table-column>
         <el-table-column type="expand">
           <template slot-scope="props">
-            <el-form label-position="left" inline class="demo-table-expand">
-              <el-form-item label="性别">
-                <span>{{ props.row.gender | sex }}</span>
-              </el-form-item>
-              <el-form-item label="入团年份">
-                <span>{{
-                  props.row.registerTime | dayjsFormat("YYYY年")
-                }}</span>
-              </el-form-item>
-              <el-form-item label="报名专业">
-                <copy-text>
-                  {{ props.row.regSubjectName }}
-                </copy-text>
-              </el-form-item>
-              <el-form-item label="是否激活">
-                <span>{{ props.row.isActive ? "是" : "否" }}</span>
-              </el-form-item>
-              <el-form-item label="关心包">
-                <span> {{ props.row.carePackage | studentPackage }} </span>
-              </el-form-item>
-              <el-form-item label="加油包">
-                <span>{{ props.row.comeOnPackage | studentPackage }}</span>
-              </el-form-item>
-              <el-form-item label="VIP/网管是否有课">
-                <span>{{ props.row.hasCourse ? "是" : "否" }}</span>
-              </el-form-item>
-              <el-form-item label="退团原因">
-                <Tooltip :content="props.row.quitReason" />
-              </el-form-item>
+            <el-form label-position="left" class="demo-table-expand">
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="入团年份">
+                    <span>{{
+                      props.row.registerTime | dayjsFormat("YYYY年")
+                    }}</span>
+                  </el-form-item></el-col
+                >
+                <el-col :span="6">
+                  <el-form-item label="性别">
+                    <span>{{ props.row.gender | sex }}</span>
+                  </el-form-item></el-col
+                >
+
+                <el-col :span="6">
+                  <el-form-item label="关心包">
+                    <span> {{ props.row.carePackage | studentPackage }} </span>
+                  </el-form-item></el-col
+                >
+                <el-col :span="6">
+                  <el-form-item label="报名专业">
+                    <copy-text>
+                      {{ props.row.regSubjectName }}
+                    </copy-text>
+                  </el-form-item></el-col
+                >
+              </el-row>
+              <el-row>
+                <el-col :span="6">
+                  <el-form-item label="是否激活">
+                    <span>{{ props.row.isActive ? "是" : "否" }}</span>
+                  </el-form-item></el-col
+                >
+                <el-col :span="6">
+                  <el-form-item label="VIP/网管是否有课">
+                    <span>{{ props.row.hasCourse ? "是" : "否" }}</span>
+                  </el-form-item></el-col
+                >
+                <el-col :span="6">
+                  <el-form-item label="加油包">
+                    <span>{{ props.row.comeOnPackage | studentPackage }}</span>
+                  </el-form-item></el-col
+                >
+                <el-col :span="6">
+                  <el-form-item label="退团原因">
+                    <overflow-text
+                      :text="props.row.quitReason"
+                    ></overflow-text> </el-form-item
+                ></el-col>
+              </el-row>
             </el-form>
           </template>
         </el-table-column>
@@ -1998,9 +2020,12 @@ export default {
 .demo-table-expand .el-form-item {
   margin-right: 0;
   margin-bottom: 0;
-  width: 400px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  padding-right: 10px;
 }
 /deep/.el-table__expanded-cell[class*="cell"] {
-  padding: 20px 110px;
+  padding: 20px 0 20px 110px;
 }
 </style>