zhangjie 3 yıl önce
ebeveyn
işleme
0f1651a7a9

+ 1 - 8
src/modules/base/components/ModifyFlowDetail.vue

@@ -200,12 +200,6 @@
       :users="curAddUsers"
       @modified="userModified"
     ></select-user-dialog>
-    <!-- SelectRoleDialog -->
-    <select-role-dialog
-      ref="SelectRoleDialog"
-      :data="curAddRoles"
-      @modified="roleModified"
-    ></select-role-dialog>
   </div>
 </template>
 
@@ -213,7 +207,6 @@
 import { deepCopy } from "../../../plugins/utils";
 import { flowDetail, updateFlowDetail } from "../api";
 import SelectUserDialog from "./SelectUserDialog";
-import SelectRoleDialog from "./SelectRoleDialog";
 
 const DEFAULT_NODE = {
   id: "",
@@ -236,7 +229,7 @@ const DEFAULT_NODE = {
 
 export default {
   name: "modify-flow-detail",
-  components: { SelectUserDialog, SelectRoleDialog },
+  components: { SelectUserDialog },
   props: {
     instance: {
       type: Object,

+ 1 - 1
src/modules/exam/components/PaperApproveTable.vue

@@ -82,7 +82,7 @@
               <th style="width: 260px;">审批意见</th>
             </tr>
             <tr v-for="(item, index) in approvalInfoList" :key="index">
-              <td>{{ item.levelName }}</td>
+              <td>{{ item.approveOrgName }}</td>
               <td>{{ item.approveName }}</td>
               <td>{{ item.time | timestampFilter }}</td>
               <td style="width: 260px;">{{ item.remark }}</td>

+ 1 - 0
src/modules/print/views/PrintPlanManage.vue

@@ -78,6 +78,7 @@
           :index="indexMethod"
         ></el-table-column>
         <el-table-column prop="semesterName" label="学期"></el-table-column>
+        <el-table-column prop="examName" label="考试"></el-table-column>
         <el-table-column prop="name" label="印刷计划"></el-table-column>
         <el-table-column prop="examStartTime" label="考试开始时间">
           <span slot-scope="scope">{{