Tang 3 년 전
부모
커밋
b36f470e51

+ 9 - 0
src/newApi/applicationData.js

@@ -137,4 +137,13 @@ export default {
             data
         })
     },
+    //导入前检查身份证是否存在
+    inquiresystemsubscribecheckIdCardData(data) {
+        return request({
+            url: '/system/subscribe/checkIdCardData',
+            method: 'post',
+            data
+        })
+    },
+    
 }

+ 9 - 3
src/views/education/classManageMent/learningHoursRecordList/hoursTimesRecord.vue

@@ -225,9 +225,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;

+ 9 - 3
src/views/education/classManageMent/learningHoursRecordList/studyTimesRecord.vue

@@ -1141,9 +1141,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;

+ 36 - 3
src/views/education/examManagement/applicationData/bulkImportPlan/newRegister.vue

@@ -347,12 +347,45 @@ export default {
         });
     },
     advanced() {
+      if (!this.formData.applyId || !this.formData.applySiteAddress) {
+        this.$message.warning("请先选择考试计划和考试地点");
+        return;
+      }
       this.dialogPLS = true;
       this.idcordList = this.formData.idCards;
     },
     submitChecksPals() {
-      this.formData.idCards = this.idcordList;
-      this.dialogPLS = false;
+      if (this.idcordList) {
+        let as = this.idcordList.split("\n") || [];
+        let newArr = [];
+        var reg = /(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/;
+        for (let i = 0; i < as.length; i++) {
+          if (newArr.indexOf(as[i]) === -1 && reg.test(as[i])) {
+            newArr.push(as[i]);
+          }
+        }
+        if (newArr.length) {
+          let idCardObj = newArr.map((item) => {
+            return { idCard: item };
+          });
+          let data = {
+            applyId: this.formData.applyId,
+            applySiteAddress: this.formData.applySiteAddress,
+            list: idCardObj,
+          };
+          this.$api.inquiresystemsubscribecheckIdCardData(data).then((res) => {
+            this.formData.idCards = newArr.join("\n");
+            this.dialogPLS = false;
+          });
+        } else {
+          this.idcordList = ''
+          this.$message.warning("已删除重复身份证号码和无效身份证号码,请重新输入有效身份证号码")
+          return
+        }
+      } else {
+        this.formData.idCards = this.idcordList;
+        this.dialogPLS = false;
+      }
     },
     /**
      * 窗口下载模板
@@ -376,7 +409,7 @@ export default {
       let formData = new FormData();
       formData.append("file", file);
       this.$api
-        .inquiresystemsubscribeimportIdsDataFilter(formData)
+        .editsystemimportIdsData(formData)
         .then((res) => {
           if (!res.data.length) {
             this.$message.warning("未检测到上传学员数据,请检查上传文件");

+ 13 - 13
src/views/education/qaManagement/qaList/reply.vue

@@ -70,9 +70,9 @@ export default {
       ],
       formData: {
         status: 1,
-          pageSize: 10,
-          pageNum: 1,
-          msgType: 2,
+        pageSize: 10,
+        pageNum: 1,
+        msgType: 2,
       },
       // 表单
       tableSet: [
@@ -113,7 +113,7 @@ export default {
           label: "回复内容",
           prop: "answerText",
           hidden: true,
-          width:"250px"
+          width: "250px",
         },
         {
           label: "回复人",
@@ -131,7 +131,7 @@ export default {
       total: 0, //一共多少条
     };
   },
-  activated(){
+  activated() {
     this.search();
   },
   methods: {
@@ -175,14 +175,14 @@ export default {
         }
       )
         .then(() => {
-        //   var data = {
-        //     goodsId: v.goodsId,
-        //     status: -1,
-        //   };
-        //   this.$api.editGoods(data).then((res) => {
-        //     this.$message.success("删除成功");
-        //     this.search();
-        //   });
+          var data = {
+            answerId: v.answerId,
+            status: -1,
+          };
+          this.$api.editcourseanswer(data).then((res) => {
+            this.$message.success("删除成功");
+            this.search();
+          });
         })
         .catch(() => {
           this.$message({