zhangjie 3 gadi atpakaļ
vecāks
revīzija
0ed7157237

+ 12 - 5
card/components/ElementPropEdit.vue

@@ -11,15 +11,17 @@
     append-to-body
   >
     <component
+      ref="ElementPropEditComp"
       :is="curEditComponent"
       :instance="curElement"
-      @modified="modified"
       :key="curElement.id"
-      ref="CompositionDialog"
+      @modified="modified"
     ></component>
 
     <div slot="footer">
-      <el-button type="primary" @click="submit">确认</el-button>
+      <el-button type="primary" :disabled="loading" @click="submit"
+        >确认</el-button
+      >
       <el-button @click="cancel">取消</el-button>
     </div>
   </el-dialog>
@@ -52,7 +54,7 @@ export default {
     EditGrids
   },
   data() {
-    return {};
+    return { loading: false };
   },
   computed: {
     ...mapState("card", ["curElement", "openElementEditDialog"]),
@@ -83,7 +85,12 @@ export default {
       this.setOpenElementEditDialog(true);
     },
     submit() {
-      this.$refs.CompositionDialog.submit();
+      if (this.loading) return;
+      this.loading = true;
+      setTimeout(() => {
+        this.loading = false;
+      }, 500);
+      this.$refs.ElementPropEditComp.submit();
     },
     modified(element) {
       // 编辑试题

+ 3 - 0
src/modules/base/views/FlowManage.vue

@@ -40,6 +40,9 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="name" label="流程名称"></el-table-column>
+        <el-table-column prop="type" label="流程类型" width="160">
+          <span slot-scope="scope">{{ scope.row.type | flowTypeFilter }}</span>
+        </el-table-column>
         <el-table-column class-name="action-column" label="操作" width="160">
           <template slot-scope="scope">
             <el-button

+ 6 - 3
src/modules/exam/components/createExamAndPrintTask/CreateExamAndPrintTask.vue

@@ -8,6 +8,7 @@
     append-to-body
     fullscreen
     @open="visibleChange"
+    @closed="disalogClosed"
   >
     <div slot="title">
       <span class="el-dialog__title">新增命题申请</span>
@@ -169,7 +170,7 @@ export default {
         this.flowList[0].type = "success";
       }
     },
-    async initData() {
+    initData() {
       const examTaskDetail = Object.assign({}, initExamTaskDetail, {
         includePaper: this.examRule.includePaper,
         review: this.examRule.review,
@@ -186,11 +187,13 @@ export default {
       this.dataReady = true;
     },
     visibleChange() {
-      this.dataReady = false;
-      this.loading = false;
       if (!this.flowList.length) this.getFlowList();
       this.initData();
     },
+    disalogClosed() {
+      this.dataReady = false;
+      this.loading = false;
+    },
     dataChange(data) {
       // console.log(data);
       Object.entries(data).forEach(([key, val]) => {

+ 2 - 2
src/modules/exam/components/createExamAndPrintTask/InfoPrintTask.vue

@@ -49,7 +49,7 @@
         <el-table-column prop="studentCount" label="人数" width="60">
         </el-table-column>
         <el-table-column prop="backupCount" label="备份数量" width="90">
-          <template slot-scope="scope">
+          <!-- <template slot-scope="scope">
             <el-input-number
               v-model="scope.row.backupCount"
               style="width:60px"
@@ -60,7 +60,7 @@
               :controls="false"
               @change="backupCountChange"
             ></el-input-number>
-          </template>
+          </template> -->
         </el-table-column>
         <el-table-column prop="examPlace" label="考点名称">
           <template slot-scope="scope">

+ 5 - 1
src/plugins/filters.js

@@ -18,7 +18,8 @@ import {
   EXAM_TYPE,
   CARD_TYPE,
   CARD_CREATE_METHOD_TYPE,
-  FLOW_APPROVE_OPERATION_TYPE
+  FLOW_APPROVE_OPERATION_TYPE,
+  FLOW_TYPE
 } from "../constants/enumerate";
 import { formatDate } from "../plugins/utils";
 
@@ -104,3 +105,6 @@ Vue.filter("cardCreateMethodTypeFilter", function(val) {
 Vue.filter("flowApproveOperationTypeFilter", function(val) {
   return FLOW_APPROVE_OPERATION_TYPE[val] || "";
 });
+Vue.filter("flowTypeFilter", function(val) {
+  return FLOW_TYPE[val] || "";
+});