xiaofei 1 年之前
父节点
当前提交
5fe9f84d19

+ 7 - 0
src/modules/admin/components/ModifySchool.vue

@@ -41,6 +41,12 @@
           <el-radio :label="true">是</el-radio>
           <el-radio :label="true">是</el-radio>
         </el-radio-group>
         </el-radio-group>
       </el-form-item>
       </el-form-item>
+      <el-form-item label="学校是否有固定试卷编号">
+        <el-radio-group v-model="modalForm.hasPaperNumber">
+          <el-radio :label="false">否</el-radio>
+          <el-radio :label="true">是</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item prop="logo" label="学校logo:">
       <el-form-item prop="logo" label="学校logo:">
         <UploadFetchFile
         <UploadFetchFile
           ref="UploadFetchFile"
           ref="UploadFetchFile"
@@ -83,6 +89,7 @@ const initModalForm = {
   logoMd5: "",
   logoMd5: "",
   initPassword: "",
   initPassword: "",
   defaultSchool: false,
   defaultSchool: false,
+  hasPaperNumber: false,
 };
 };
 
 
 export default {
 export default {

+ 7 - 0
src/modules/base/views/CourseSimpleManage.vue

@@ -46,6 +46,13 @@
         ></el-table-column>
         ></el-table-column>
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="courseName" label="课程名称"></el-table-column>
         <el-table-column prop="courseCode" label="课程编码"></el-table-column>
         <el-table-column prop="courseCode" label="课程编码"></el-table-column>
+        <el-table-column prop="createTime" label="创建人" width="170">
+          <template slot-scope="scope">
+            {{ scope.row.userName | defaultFieldFilter }}({{
+              scope.row.userLoginName | defaultFieldFilter
+            }})
+          </template>
+        </el-table-column>
         <el-table-column prop="createTime" label="创建时间" width="170">
         <el-table-column prop="createTime" label="创建时间" width="170">
           <span slot-scope="scope">{{
           <span slot-scope="scope">{{
             scope.row.createTime | timestampFilter
             scope.row.createTime | timestampFilter

+ 1 - 1
src/modules/exam/components/createExamAndPrintTask/ModifyExamStudent.vue

@@ -92,7 +92,7 @@ import { uploadOrFindExamTaskStudent } from "../../api";
 
 
 const EXAM_OBJECT_TYPE = {
 const EXAM_OBJECT_TYPE = {
   TEACH_CLAZZ_STUDENT: "我教课程选择",
   TEACH_CLAZZ_STUDENT: "我教课程选择",
-  BASIC_CLAZZ_STUDENT: "生库选择",
+  BASIC_CLAZZ_STUDENT: "生库选择",
 };
 };
 
 
 export default {
 export default {

+ 1 - 1
src/modules/print/components/PreviewBusinessDetail.vue

@@ -77,7 +77,7 @@
               <el-button type="primary" @click="toPage(1)">查询</el-button>
               <el-button type="primary" @click="toPage(1)">查询</el-button>
             </el-form-item>
             </el-form-item>
           </el-form>
           </el-form>
-          <el-button type="primary" @click="toAdd">新增</el-button>
+          <!-- <el-button type="primary" @click="toAdd">新增</el-button> -->
         </div>
         </div>
         <el-table border ref="TableList" :data="dataList">
         <el-table border ref="TableList" :data="dataList">
           <el-table-column
           <el-table-column