zhangjie 2 роки тому
батько
коміт
6e431ef540

+ 1 - 1
src/modules/paper/components/AuditPaperWait.vue

@@ -28,7 +28,7 @@
         <el-table-column label="课程" prop="courseName"> </el-table-column>
         <el-table-column label="提交人" prop="creator" width="150">
         </el-table-column>
-        <el-table-column label="提交时间" prop="updateTime" width="153">
+        <el-table-column label="提交时间" prop="creationTime" width="153">
         </el-table-column>
         <el-table-column label="操作" width="170" fixed="right">
           <template slot-scope="scope">

+ 38 - 2
src/modules/paper/components/SelectQuestionDialog.vue

@@ -89,7 +89,25 @@
           </el-table-column>
           <el-table-column label="创建人" prop="creator" width="120">
           </el-table-column>
-          <el-table-column label="创建时间" width="170" prop="creationTime">
+          <el-table-column label="属性" min-width="150">
+            <div
+              v-if="scope.row.quesProperties"
+              slot-scope="scope"
+              class="edit-cont-props"
+            >
+              <p
+                v-for="(content, propIndex) in scope.row.quesProperties"
+                :key="propIndex"
+              >
+                {{ content.courseProperty && content.courseProperty.name }}
+                <span style="margin: 0 3px">/</span>
+                {{ content.firstProperty && content.firstProperty.name }}
+                <span v-if="content.secondProperty" style="margin: 0 3px"
+                  >/</span
+                >
+                {{ content.secondProperty && content.secondProperty.name }}
+              </p>
+            </div>
           </el-table-column>
           <el-table-column label="操作" width="90" fixed="right">
             <div v-if="!scope.row.disabled" slot-scope="scope">
@@ -158,7 +176,25 @@
           </el-table-column>
           <el-table-column label="创建人" prop="creator" width="120">
           </el-table-column>
-          <el-table-column label="创建时间" width="170" prop="creationTime">
+          <el-table-column label="属性" min-width="150">
+            <div
+              v-if="scope.row.quesProperties"
+              slot-scope="scope"
+              class="edit-cont-props"
+            >
+              <p
+                v-for="(content, propIndex) in scope.row.quesProperties"
+                :key="propIndex"
+              >
+                {{ content.courseProperty && content.courseProperty.name }}
+                <span style="margin: 0 3px">/</span>
+                {{ content.firstProperty && content.firstProperty.name }}
+                <span v-if="content.secondProperty" style="margin: 0 3px"
+                  >/</span
+                >
+                {{ content.secondProperty && content.secondProperty.name }}
+              </p>
+            </div>
           </el-table-column>
           <!-- <el-table-column
             v-if="IS_PAPER_MODE"