更新打包

src/views/reportForm/index.vue

@@ -161,7 +161,7 @@
             v-permission="'export/cloudStudyStudentTrainData'"
           >
             <div class="title">云教练学员统计：</div>
-            <el-select
+            <!-- <el-select
               v-model.trim="trainOrganId"
               class="organSelect"
               style="width: 100%"
@@ -175,7 +175,23 @@
                 :label="item.name"
                 :value="item.id"
               ></el-option>
-            </el-select>
+            </el-select> -->
+            <select-all
+              v-model.trim="trainOrganId"
+              class="organSelect"
+              style="width: 100%"
+              filterable
+              multiple
+              placeholder="请选择分部"
+              clearable
+            >
+              <el-option
+                v-for="(item, index) in selects.branchs"
+                :key="index"
+                :label="item.name"
+                :value="item.id"
+              ></el-option>
+            </select-all>
             <el-date-picker
               v-model.trim="cloudTimer"
               style="width: 360px; margin-left: 15px"
@@ -199,8 +215,8 @@
               ExportEnum="CLOUD_STUDY_STUDENT_TRAIN_DATA"
               :exportData="exportTrain"
               fileName="云教练学员统计"
-              errorMsg="请选择分部"
-              :flag="!this.trainOrganId"
+              errorMsg="请至少选择一个分部"
+              :flag="this.trainOrganId.length < 1"
             />
           </div>
           <!-- 老师使用云教练数据
@@ -1371,7 +1387,7 @@ export default {
       AccountTimer: [],
       AccountDetailOrganId: [],
       AccountDetailTimer: [],
-      trainOrganId: null,
+      trainOrganId: [],
       questionActiveType: "CLOUD_TEACHER_FEEDBACK",
       vipOrganId: [],
       serviceOrganId: [], // 服务报表
@@ -1757,7 +1773,7 @@ export default {
       }
 
       let obj = {
-        organId: this.trainOrganId,
+        organIds: this.trainOrganId.join(","),
         cloudTeacherTrainStartDate,
         cloudTeacherTrainEndDate
       };

src/views/stuRecodeManager/index.vue

@@ -135,11 +135,21 @@
             ></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item prop="qualifiedFlag">
+          <el-select
+            v-model.trim="searchForm.qualifiedFlag"
+            placeholder="请选择是否达标"
+            clearable
+          >
+            <el-option value="1" label="是"></el-option>
+            <el-option value="0" label="否"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item prop="dates">
           <el-date-picker
             v-model="searchForm.dates"
             type="daterange"
-            style="width: 405px"
+            style="width: 370px"
             range-separator="至"
             start-placeholder="课程开始日期"
             end-placeholder="课程结束日期"
@@ -264,6 +274,13 @@
               </div>
             </template>
           </el-table-column>
+          <el-table-column align="center" prop="qualifiedFlag" label="是否达标">
+            <template slot-scope="scope">
+              <div>
+                {{ scope.row.qualifiedFlag ? "是" : "否" }}
+              </div>
+            </template>
+          </el-table-column>
           <el-table-column align="center" label="合并类型">
             <template slot-scope="scope">
               <div>