Tang 3 år sedan
förälder
incheckning
10c35f0232

+ 1 - 1
src/components/tableList.vue

@@ -1142,7 +1142,7 @@
             class="editInfoSty"
             @click="openBoxData(scope.row)"
           >
-            {{ scope.row[item.prop1] }}/{{ scope.row[item.prop2] }}
+            {{ scope.row[item.prop1] }} / {{ scope.row[item.prop2] }}
           </div>
           <span v-else-if="item.scope === 'statusOrder'">{{
             scope.row[item.prop] === -2

+ 1 - 1
src/views/education/liveLearningManagement/liveLearningRecord/studentStyleList/watchLiveData/index.vue

@@ -14,7 +14,7 @@
       :loading="loading"
     >
       <template slot="btn" slot-scope="props">
-        <el-button type="text" @click="doList(props.scope.row)" :disabled="props.scope.row.sectionType !== 2"
+        <el-button type="text" @click="doList(props.scope.row)"
           >详情</el-button
         >
       </template>

+ 4 - 7
src/views/education/mockTestManagement/mockExamArrangement/addMockExam/index.vue

@@ -237,8 +237,7 @@ export default {
     valCheckFunc() {
       return new Promise((resolve, reject) => {
         if (this.$refs.infoPage.infoData.length <= 0) {
-          this.$message.error("至少添加1个专业");
-          reject();
+          reject("至少添加1个专业");
         } else {
           const checkSubjectNum = this.$refs.infoPage.infoData.every((item) => {
             if (item.mockMajorSubjectList) {
@@ -266,12 +265,10 @@ export default {
                 });
               });
             } catch (error) {
-              this.$message.error(error);
-              reject();
+              reject(error);
             }
           } else {
-            this.$message.error("每个专业里至少添加1个科目");
-            reject();
+            reject("每个专业里至少添加1个科目");
           }
         }
         resolve();
@@ -338,7 +335,7 @@ export default {
           });
         })
         .catch((err) => {
-          console.log("提交失败");
+          this.$message.error(err.toString().replace('Error:',''))
         });
     },
     //返回

+ 4 - 7
src/views/education/mockTestManagement/mockExamArrangement/editMockExam/index.vue

@@ -275,8 +275,7 @@ export default {
     valCheckFunc() {
       return new Promise((resolve, reject) => {
         if (this.$refs.infoPage.infoData.length <= 0) {
-          this.$message.error("至少添加1个专业");
-          reject();
+          reject("至少添加1个专业");
         } else {
           const checkSubjectNum = this.$refs.infoPage.infoData.every((item) => {
             if (item.mockMajorSubjectList) {
@@ -304,12 +303,10 @@ export default {
                 });
               });
             } catch (error) {
-              this.$message.error(error);
-              reject();
+              reject(error);
             }
           } else {
-            this.$message.error("每个专业里至少添加1个科目");
-            reject();
+            reject("每个专业里至少添加1个科目");
           }
         }
         resolve();
@@ -376,7 +373,7 @@ export default {
           });
         })
         .catch((err) => {
-          console.log("提交失败");
+          this.$message.error(err.toString().replace('Error:',''))
         });
     },
     /**

+ 38 - 13
src/views/education/mockTestManagement/mockExamArrangement/index.vue

@@ -98,7 +98,7 @@ export default {
         },
       ],
       formData: {
-        // status: "0,1",
+        status: "0,1",
         pageSize: 10,
         pageNum: 1,
       },
@@ -146,8 +146,8 @@ export default {
         },
         {
           label: "预约/取消",
-          prop1: "subscribeCancelNum",
-          prop2: "subscribeNum",
+          prop1: "subscribeNum",
+          prop2: "subscribeCancelNum",
           hidden: true,
           scope: "reserveFunc",
         },
@@ -174,7 +174,32 @@ export default {
     /**
      * 预约/取消点击触发
      */
-    openBoxFun() {},
+    openBoxFun(row) {
+      const jump = () => {
+        this.$router.push({
+          name: "MockTestData",
+          params: {
+            applyName: row.applyName,
+          },
+        });
+      };
+      const statusPage = this.$store.state.tagsView.visitedViews.some(
+        (item) => {
+          return item.name == "MockTestData";
+        }
+      );
+      if (statusPage) {
+        this.$store
+          .dispatch("tagsView/delCachedView", {
+            name: "MockTestData",
+          })
+          .then((res) => {
+            jump();
+          });
+      } else {
+        jump();
+      }
+    },
     /**
      * 修改
      */
@@ -216,14 +241,14 @@ export default {
         }
       )
         .then(() => {
-          //   var data = {
-          //     goodsId: v.goodsId,
-          //     status: -1,
-          //   };
-          //   this.$api.editGoods(data).then((res) => {
-          //     this.$message.success("删除成功");
-          //     this.search();
-          //   });
+          var data = {
+            applyId: row.applyId,
+            status: -1,
+          };
+          this.$api.editmockapply(data).then((res) => {
+            this.$message.success("删除成功");
+            this.search();
+          });
         })
         .catch(() => {
           this.$message({
@@ -242,7 +267,7 @@ export default {
       }
       if (int === 2) {
         this.formData = {
-          //   status: "0,1",
+            status: "0,1",
           pageSize: 10,
           pageNum: 1,
         };

+ 3 - 0
src/views/education/mockTestManagement/mockTestData/index.vue

@@ -219,6 +219,9 @@ export default {
       );
       this.$refs.searchBox.changeBusinessLevel(this.$route.params.businessId);
     }
+    if(this.$route.params.applyName){
+      this.$set(this.formData, "applyName", this.$route.params.applyName);
+    }
     this.search();
   },
   activated() {