Selaa lähdekoodia

增加班级管理搜索选项

谢杰标 2 vuotta sitten
vanhempi
commit
96ee6d61ba

+ 1 - 1
src/views/Marketing/goods/commodityManageMent/add/courseContent/playPhoto.vue

@@ -146,7 +146,7 @@ export default {
         );
       } else {
         this.photoVideoList.playConfig = {
-          autoPlay: 0,
+          autoPlay: 1,
           drag: 0,
           speed: 0,
         };

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

@@ -146,7 +146,7 @@ export default {
         );
       } else {
         this.photoVideoList.playConfig = {
-          autoPlay: 0,
+          autoPlay: 1,
           drag: 0,
           speed: 0,
         };

+ 111 - 66
src/views/education/classManageMent/studentMenu/index.vue

@@ -45,6 +45,82 @@
         >
       </div>
     </div>
+
+    <div style="margin-bottom: 20px">
+      筛选:
+      <el-button :size="size" type="success" @click="moreActive(1)"
+        >学完</el-button
+      >
+      <!-- <el-button :size="size" type="warning" @click="moreActive(3)"
+          >移除</el-button
+        > -->
+      <el-select
+        v-model="formData.studyCountMore"
+        placeholder="请选择"
+        style="margin: 0px 10px"
+        size="medium"
+      >
+        <el-option
+          v-for="item in options"
+          :key="item.value"
+          :label="item.label"
+          :value="item.value"
+        >
+        </el-option>
+      </el-select>
+      <el-button
+        v-if="formData.studyCountMore === 2"
+        :size="size"
+        type="primary"
+        @click="moreActive(2)"
+        >选班</el-button
+      >
+      <el-input
+        clearable
+        style="width: 230px"
+        v-model="formData.companyName"
+        placeholder="所在公司"
+        ></el-input>
+      <el-select
+        clearable
+        v-model="formData.hasBindWx"
+        placeholder="是否绑定微信"
+        style="margin: 5px 10px"
+        size="medium"
+      >
+        <el-option label="是" :value="1"> </el-option>
+        <el-option label="否" :value="0"> </el-option>
+      </el-select>
+      <el-select
+        clearable
+        v-model="formData.hasFollowWx"
+        placeholder="是否关注公众号"
+        style="margin: 5px 10px"
+        size="medium"
+      >
+        <el-option label="是" :value="1"> </el-option>
+        <el-option label="否" :value="0"> </el-option>
+      </el-select>
+      <el-input
+        clearable
+        style="width: 230px;margin: 5px 10px"
+        v-model.trim="formData.realname"
+        placeholder="学员名称"
+      ></el-input>
+      <el-input
+        clearable
+        style="width: 230px;margin: 5px 10px"
+        v-model.trim="formData.idCard"
+        placeholder="学员身份证"
+      ></el-input>
+      <el-input
+        clearable
+        style="width: 230px;margin: 5px 10px"
+        v-model.trim="formData.telphone"
+        placeholder="学员手机号码"
+      ></el-input>
+      <el-button type="primary" @click="search(3)">搜索</el-button>
+    </div>
     <table-list
       ref="tableList"
       :tableSets="tableSet"
@@ -56,68 +132,6 @@
       @editInfo="editInfo"
     >
       <template slot="customize">
-        <el-button :size="size" type="success" @click="moreActive(1)"
-          >学完</el-button
-        >
-        <!-- <el-button :size="size" type="warning" @click="moreActive(3)"
-          >移除</el-button
-        > -->
-        <el-select
-          @change="search(3)"
-          v-model="formData.studyCountMore"
-          placeholder="请选择"
-          style="margin: 0px 10px"
-          size="medium"
-        >
-          <el-option
-            v-for="item in options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
-          </el-option>
-        </el-select>
-        <el-button
-          v-if="formData.studyCountMore === 2"
-          :size="size"
-          type="primary"
-          @click="moreActive(2)"
-          >选班</el-button
-        >
-        <el-input
-          clearable
-          style="width: 230px"
-          v-model="formData.companyName"
-          placeholder="所在公司"
-          @clear="search(3)"
-          ><el-button
-            @click="search(3)"
-            slot="append"
-            icon="el-icon-search"
-          ></el-button
-        ></el-input>
-        <el-select
-          clearable
-          @change="search(3)"
-          v-model="formData.hasBindWx"
-          placeholder="是否绑定微信"
-          style="margin: 0px 10px"
-          size="medium"
-        >
-          <el-option label="是" :value="1"> </el-option>
-          <el-option label="否" :value="0"> </el-option>
-        </el-select>
-        <el-select
-          clearable
-          @change="search(3)"
-          v-model="formData.hasFollowWx"
-          placeholder="是否关注公众号"
-          style="margin: 0px 10px"
-          size="medium"
-        >
-          <el-option label="是" :value="1"> </el-option>
-          <el-option label="否" :value="0"> </el-option>
-        </el-select>
         <el-button size="medium" @click="exportGrade" :loading="exportLoading"
           >导出学员数据</el-button
         >
@@ -808,10 +822,41 @@ export default {
           scope: "chance",
         },
         {
-          label: "复购-学时冲突",
-          prop: "rebuy",
-          hidden: false,
-          scope: "rebuy",
+          label: "学员身份证",
+          prop: "idCard",
+          hidden: true,
+        },
+        {
+          label: "上报注册中心",
+          prop: "userBindWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "已上报",
+              value: 1,
+            },
+            {
+              label: "未上报",
+              value: 0,
+            },
+          ],
+        },
+        {
+          label: "学时申报",
+          prop: "userBindWx",
+          hidden: true,
+          scope: "isOptions",
+          options: [
+            {
+              label: "已上报",
+              value: 1,
+            },
+            {
+              label: "未上报",
+              value: 0,
+            },
+          ],
         },
       ],
       listData: {},

+ 12 - 12
src/views/education/studentManageMent/studentList/index.vue

@@ -137,6 +137,18 @@ export default {
           prop: "companyName",
           placeholder: "请输入公司名称",
         },
+        {
+          prop: "realname",
+          placeholder: "请输入学员名称",
+        },
+        {
+          prop: "idCard",
+          placeholder: "学员身份证",
+        },
+        {
+          prop: "telphone",
+          placeholder: "学员手机号码",
+        },
         {
           prop: "gradeName",
           placeholder: "请输入所属班级",
@@ -187,18 +199,6 @@ export default {
           scope: "moreDataPicker",
           Diszing: true,
         },
-        {
-          prop: "realname",
-          placeholder: "请输入学员名称",
-        },
-        {
-          prop: "idCard",
-          placeholder: "学员身份证",
-        },
-        {
-          prop: "telphone",
-          placeholder: "学员手机号码",
-        },
       ],
       formData: {
         status: "0,1",