Tang 3 éve
szülő
commit
3e6df95255

+ 1 - 0
src/components/searchBoxNew.vue

@@ -423,6 +423,7 @@
             >查询</el-button
           >
           <el-button :size="size" @click="init">重置</el-button>
+          <slot name="customize"></slot>
         </el-form-item>
       </el-form>
     </div>

+ 9 - 3
src/views/education/classManageMent/classHoursReview/studyTimes.vue

@@ -1112,9 +1112,15 @@ export default {
         .then((res) => {
           if (res.rows[0].keyValue) {
             var data = JSON.parse(res.rows[0].keyValue);
-            this.recent_photos = data.recent_photos.value;
-            this.idcard_face_photo = data.idcard_face_photo.value;
-            this.idcard_national_photo = data.idcard_national_photo.value;
+            this.recent_photos = data.recent_photos
+              ? data.recent_photos.value
+              : "";
+            this.idcard_face_photo = data.idcard_face_photo
+              ? data.idcard_face_photo.value
+              : "";
+            this.idcard_national_photo = data.idcard_national_photo
+              ? data.idcard_national_photo.value
+              : "";
             this.realName = data.name.value;
             this.idCard = data.idcard.value;
             this.telPhone = data.telphone.value;

+ 6 - 8
src/views/education/classManageMent/learningHoursRecordList/index.vue

@@ -6,18 +6,18 @@
       :formList="formList"
       @search="search"
       @init="init"
-    />
+      ><template slot="customize">
+        <el-button size="small" type="success" @click="moreActive"
+          >批量导出</el-button
+        >
+      </template></search-box-new
+    >
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
       :navText="navText"
       :loading="loading"
     >
-      <template slot="customize">
-        <el-button size="small" type="success" @click="moreActive"
-          >批量导出</el-button
-        >
-      </template>
       <template slot="btn" slot-scope="props">
         <el-button type="text" @click="activeHoursRecord(props.scope.row)"
           >学习记录</el-button
@@ -412,8 +412,6 @@ export default {
           this.formData.studyStatus === 2 ? this.formData.learnStatus : "",
       };
       this.exputs(data);
-      return;
-      this.dialogDR = true;
     },
     /**
      *

+ 11 - 2
src/views/education/classManageMent/studentMenu/index.vue

@@ -39,7 +39,7 @@
         <span
           style="font-size: 14px; margin: 0px 6px"
           v-if="statusShow.indexOf(3) !== -1"
-          >已开通:150/300</span
+          >已开通:{{ gfNum }}/{{ total }}</span
         >
       </div>
     </div>
@@ -692,6 +692,7 @@ export default {
       tableData: [], //表单数据
       total: 0, //一共多少条
       gfNum: 0, //官方信息推送
+      zhNum: 0, //账号状态标记
       dialogVisible: false,
       dialogVisibleTable: false,
       dialogVisibleStudent: false,
@@ -749,6 +750,13 @@ export default {
         this.$message.warning("请勾选需要官方信息推送的学员");
         return;
       }
+      let stu = this.$refs.tableList.allCheckData.some((item) => {
+        return item.periodStatus === -1;
+      });
+      if (stu) {
+        this.$message.warning("所勾选学员的学时审批状态不允许为不可审核状态");
+        return;
+      }
       let arr = this.$refs.tableList.allCheckData.map((item) => {
         return {
           userId: item.userId,
@@ -1012,7 +1020,8 @@ export default {
                 gradeId: this.$route.query.id,
               })
               .then((res) => {
-                this.gfNum = res.data;
+                this.gfNum = res.data.officialInfoCount;
+                this.zhNum = res.data.learnStatus;
               });
           }
         })

+ 11 - 9
src/views/education/dataReview/dataConfig/index.vue

@@ -7,7 +7,13 @@
       @search="search"
       @init="init"
       :shType="shType"
-    />
+    >
+      <template slot="customize">
+        <el-button size="small" type="success" @click="moreActive"
+          >批量导出</el-button
+        >
+      </template>
+    </search-box-new>
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -16,11 +22,6 @@
       :loading="loading"
       @editInfo="editInfo"
     >
-      <template slot="customize">
-        <el-button size="small" type="success" @click="moreActive"
-          >批量导出</el-button
-        >
-      </template>
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
@@ -559,6 +560,10 @@ export default {
   },
   methods: {
     exputs(data) {
+      if (!data.businessId) {
+        this.$message.warning("请选择业务层次");
+        return;
+      }
       this.$modal.loading("正在导出数据,请稍后...");
       this.$api
         .inquirebaseprofileExport(data)
@@ -602,9 +607,6 @@ export default {
         searchEndTime: this.formData.searchEndTime / 1000 || "",
       };
       this.exputs(data);
-      return;
-      this.activeDCIndex = 0;
-      this.dialogDR = true;
     },
     changeIndex(v) {
       if (this.activeIndex === v) {

+ 11 - 9
src/views/education/dataReview/stamp/index.vue

@@ -7,7 +7,13 @@
       @search="search"
       @init="init"
       :shType="shType"
-    />
+    >
+      <template slot="customize">
+        <el-button size="small" type="success" @click="moreActive"
+          >批量导出</el-button
+        >
+      </template></search-box-new
+    >
     <table-list
       :tableSets="tableSet"
       :tableData="tableData"
@@ -16,11 +22,6 @@
       :loading="loading"
       @editInfo="editInfo"
     >
-      <template slot="customize">
-        <el-button size="small" type="success" @click="moreActive"
-          >批量导出</el-button
-        >
-      </template>
       <template slot="btn" slot-scope="props">
         <el-button
           type="text"
@@ -467,6 +468,10 @@ export default {
   },
   methods: {
     exputs(data) {
+      if (!data.businessId) {
+        this.$message.warning("请选择业务层次");
+        return;
+      }
       this.$modal.loading("正在导出数据,请稍后...");
       this.$api
         .inquirebaseprofileStampexport(data)
@@ -509,9 +514,6 @@ export default {
         searchEndTime: this.formData.searchEndTime / 1000 || "",
       };
       this.exputs(data);
-      return;
-      this.activeDCIndex = 0;
-      this.dialogDR = true;
     },
     changeIndex(v) {
       if (this.activeIndex === v) {