Browse Source

业务层次学习顺序逻辑修改

Tang 3 years ago
parent
commit
0dc0f3d754

+ 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;

+ 33 - 10
src/views/resource/baseManageInfos/resource/businessLevel/index.vue

@@ -179,7 +179,7 @@
     </el-dialog>
     <el-dialog
       :visible.sync="dialogVisibleSet"
-      width="360px"
+      width="430px"
       :show-close="false"
       @closed="loadingClose"
       :close-on-click-modal="false"
@@ -197,11 +197,18 @@
       <div>
         <p>注:该配置只适用于视频商品</p>
         <el-radio-group v-model="learningOrder">
-          <el-radio :label="1">不限制顺序</el-radio>
-          <el-radio :label="0">限制顺序</el-radio>
+          <el-radio :label="0">不限制顺序</el-radio>
+          <el-radio :label="1">限制顺序1</el-radio>
+          <el-radio :label="2">限制顺序2</el-radio>
         </el-radio-group>
-        <p v-if="learningOrder === 0" style="color: red">
-          单个章对应的【所有节视频】学完才可以【测试】
+        <p v-if="learningOrder === 1 || learningOrder === 2" style="color: red">
+          {{
+            learningOrder === 1
+              ? "单个章对应的【所有节视频】学完才可以【测试】"
+              : learningOrder === 2
+              ? "必须要按照【目录顺序】进行学习,不可以乱序学习"
+              : ""
+          }}
         </p>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -270,11 +277,15 @@ export default {
           options: [
             {
               label: "不限制顺序",
+              value: 0,
+            },
+            {
+              label: "限制顺序1",
               value: 1,
             },
             {
-              label: "限制顺序",
-              value: 0,
+              label: "限制顺序2",
+              value: 2,
             },
           ],
         },
@@ -365,7 +376,7 @@ export default {
         status: [{ required: true, message: "请选择状态", trigger: "change" }],
       },
       dialogVisibleSet: false,
-      learningOrder: "", //1限制 0不限制
+      learningOrder: "", //0不限制,1限制1,2限制2
     };
   },
   mounted() {
@@ -384,7 +395,11 @@ export default {
         this.disabledBtn = false;
         return;
       }
-      if (this.learningOrder !== 0 && this.learningOrder !== 1) {
+      if (
+        this.learningOrder !== 0 &&
+        this.learningOrder !== 1 &&
+        this.learningOrder !== 2
+      ) {
         this.$message.warning("请选择是否限制顺序");
         this.disabledBtn = false;
         return;
@@ -413,7 +428,15 @@ export default {
         this.$message.warning("请勾选需要配置的业务层次");
         return;
       }
-      this.dialogVisibleSet = true;
+      const EXAMSORT = this.$refs.tableList.allCheckData.every((item) => {
+        return item.goodsLearningOrder === 0;
+      });
+      if (EXAMSORT) {
+        this.dialogVisibleSet = true;
+      } else {
+        this.$message.warning("只允许设置当前学习顺序为不限制顺序的列表");
+        return;
+      }
     },
     closeOptions() {
       this.dialogVisibleSet = false;