소스 검색

去除审核结果

zhangjie 3 년 전
부모
커밋
72ffe802f6

+ 2 - 2
src/assets/styles/element-ui-costom.scss

@@ -16,7 +16,7 @@
 .el-dialog__header {
   padding: 15px 20px;
   .el-dialog__title {
-    color: $--color-text-dark-1;
+    color: $--color-text-dark;
     font-size: 16px;
     line-height: 19px;
   }
@@ -41,9 +41,9 @@
   padding: 30px 40px;
   position: relative;
   border-top: 1px solid $--color-border;
+  color: $--color-text-dark-1;
 
   .el-form-item__label {
-    color: #545454;
     padding-right: 2px;
   }
   .el-input-tips {

+ 5 - 2
src/constants/enumerate.js

@@ -15,8 +15,11 @@ export const BOOLEAN_TYPE = {
 
 // 审核状态
 export const AUDITING_STATUS = {
-  NOT_AUDITED: "未审核",
-  AUDITED: "已审核"
+  START: "待审核",
+  AUDITING: "审核中",
+  REJECT: "已驳回",
+  END: "已终止",
+  FINISH: "已结束"
 };
 
 // 审核结果

+ 2 - 2
src/modules/customer/views/CustomerCard.vue

@@ -2,7 +2,7 @@
   <div class="customer-card">
     <div class="mb-4">
       <el-button
-        v-for="(val, key) in AUDITING_STATUS"
+        v-for="(val, key) in AUDITING_TYPE"
         :key="key"
         :type="filter.status == key ? 'primary' : 'default'"
         @click="selectMenu(key)"
@@ -184,7 +184,7 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       multipleSelection: [],
-      AUDITING_STATUS: {
+      AUDITING_TYPE: {
         STAGE: "待审核",
         SUBMIT: "已审核"
       },

+ 1 - 5
src/modules/exam/components/CreateTaskApply.vue

@@ -247,11 +247,7 @@
         <el-button type="primary" :disabled="isSubmit" @click="submit"
           >确认提交</el-button
         >
-        <el-button
-          type="primary"
-          :disabled="isSubmit"
-          style="width:88px;"
-          @click="toSave"
+        <el-button type="primary" :disabled="isSubmit" @click="toSave"
           >暂存</el-button
         >
         <el-button @click="cancel">取消</el-button>

+ 0 - 15
src/modules/exam/components/ModifyTaskApply.vue

@@ -70,21 +70,6 @@
           <el-col :span="10">
             <el-form-item label="审核状态:">
               <span>{{ modalForm.auditStatus | auditStatusFilter }}</span>
-              <el-button
-                v-if="
-                  instance.auditStatus === 'NOT_AUDITED' &&
-                    instance.status === 'SUBMIT'
-                "
-                type="text"
-                class="btn-primary ml-2"
-                @click="toCancel"
-                ><span class="color-danger">撤销申请</span></el-button
-              >
-            </el-form-item>
-          </el-col>
-          <el-col :span="14">
-            <el-form-item label="审核结果:">
-              <span>{{ modalForm.reviewStatus | reviewStatusFilter }}</span>
             </el-form-item>
           </el-col>
         </el-row>

+ 0 - 21
src/modules/exam/views/TaskApplyManage.vue

@@ -18,21 +18,6 @@
               ></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="审核结果:">
-            <el-select
-              v-model="filter.reviewStatus"
-              style="width: 142px;"
-              placeholder="审核结果"
-              clearable
-            >
-              <el-option
-                v-for="(val, key) in AUDITING_RESULT"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <el-form-item label="题卡规则:">
             <card-rule-select
               ref="CardRuleSelect"
@@ -135,11 +120,6 @@
             {{ scope.row.auditStatus | auditStatusFilter }}
           </template>
         </el-table-column>
-        <el-table-column prop="reviewStatus" label="审核结果" width="100">
-          <template slot-scope="scope">
-            {{ scope.row.reviewStatus | reviewStatusFilter }}
-          </template>
-        </el-table-column>
         <el-table-column class-name="action-column" label="操作" width="160px">
           <template slot-scope="scope">
             <el-button
@@ -240,7 +220,6 @@ export default {
       total: 0,
       editType: "APPLY",
       AUDITING_STATUS,
-      AUDITING_RESULT: { NOT_PASS: "未通过" },
       examTasks: [],
       curExamTask: {},
       curUserId: this.$ls.get("user", { id: "" }).id,

+ 5 - 19
src/modules/exam/views/TaskReviewManage.vue

@@ -2,7 +2,7 @@
   <div class="task-review-manage">
     <div class="mb-4">
       <el-button
-        v-for="(val, key) in AUDITING_STATUS"
+        v-for="(val, key) in AUDITING_TYPE"
         :key="key"
         :type="auditStatus == key ? 'primary' : 'default'"
         @click="selectMenu(key)"
@@ -84,21 +84,6 @@
             >
             </el-date-picker>
           </el-form-item>
-          <el-form-item label="审核结果:" v-if="AUDITED">
-            <el-select
-              v-model="filter.reviewStatus"
-              style="width: 142px;"
-              placeholder="审核结果"
-              clearable
-            >
-              <el-option
-                v-for="(val, key) in AUDITING_RESULT"
-                :key="key"
-                :value="key"
-                :label="val"
-              ></el-option>
-            </el-select>
-          </el-form-item>
         </template>
 
         <el-form-item label-width="0px">
@@ -268,7 +253,6 @@
 
 <script>
 import ModifyTaskApply from "../components/ModifyTaskApply";
-import { AUDITING_RESULT, AUDITING_STATUS } from "@/constants/enumerate";
 import pickerOptions from "@/constants/datePickerOptions";
 import {
   taskReviewAuditedListPage,
@@ -301,8 +285,10 @@ export default {
       size: this.GLOBAL.pageSize,
       total: 0,
       editType: "AUDIT",
-      AUDITING_RESULT,
-      AUDITING_STATUS,
+      AUDITING_TYPE: {
+        NOT_AUDITED: "未审核",
+        AUDITED: "已审核"
+      },
       caches: {},
       examTasks: [],
       curExamTask: {},