zhangjie преди 7 месеца
родител
ревизия
4d13c0e50e

+ 8 - 4
src/modules/exam/components/PreviewTaskPaper.vue

@@ -43,14 +43,18 @@
           <el-row>
           <el-row>
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="已曝光:">
               <el-form-item label="已曝光:">
-                <span>{{ rowData.exposedPaperType | defaultFieldFilter }}</span>
+                <span v-if="rowData.exposedPaperType">
+                  卷{{ rowData.exposedPaperType }}
+                </span>
+                <span v-else>--</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="未曝光:">
               <el-form-item label="未曝光:">
-                <span>{{
-                  rowData.unexposedPaperType | defaultFieldFilter
-                }}</span>
+                <span v-if="rowData.unexposedPaperType">
+                  卷{{ rowData.unexposedPaperType }}
+                </span>
+                <span v-else>--</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>

+ 8 - 5
src/modules/exam/views/DownloadManage.vue

@@ -93,11 +93,14 @@
         >
         >
         <el-table-column prop="paperType" label="全部卷型" width="100">
         <el-table-column prop="paperType" label="全部卷型" width="100">
         </el-table-column>
         </el-table-column>
-        <el-table-column label="未曝光卷型" width="90"
-          ><template slot-scope="scope">
-            {{ scope.row.unexposedPaperType | defaultFieldFilter }}
-          </template></el-table-column
-        >
+        <el-table-column label="未曝光卷型" width="90">
+          <template slot-scope="scope">
+            <span v-if="scope.row.unexposedPaperType"
+              >卷{{ scope.row.unexposedPaperType }}</span
+            >
+            <span v-else>--</span>
+          </template>
+        </el-table-column>
         <el-table-column label="已曝光卷型" width="90"
         <el-table-column label="已曝光卷型" width="90"
           ><template slot-scope="scope">
           ><template slot-scope="scope">
             {{ scope.row.exposedPaperType | defaultFieldFilter }}
             {{ scope.row.exposedPaperType | defaultFieldFilter }}

+ 13 - 8
src/modules/print/components/ModifyPlanPaper.vue

@@ -1,7 +1,7 @@
 <template>
 <template>
   <div>
   <div>
     <el-dialog
     <el-dialog
-      class="modify-plan-paper"
+      class="modify-plan-paper task-detail"
       :visible.sync="modalIsShow"
       :visible.sync="modalIsShow"
       title="关联试卷"
       title="关联试卷"
       top="10px"
       top="10px"
@@ -83,16 +83,18 @@
           <el-row>
           <el-row>
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="已曝光类型:">
               <el-form-item label="已曝光类型:">
-                <span>{{
-                  instance.exposedPaperType | defaultFieldFilter
-                }}</span>
+                <span v-if="instance.exposedPaperType">
+                  卷{{ instance.exposedPaperType }}
+                </span>
+                <span v-else>--</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
             <el-col :span="12">
             <el-col :span="12">
               <el-form-item label="未曝光类型:">
               <el-form-item label="未曝光类型:">
-                <span>{{
-                  instance.unexposedPaperType | defaultFieldFilter
-                }}</span>
+                <span v-if="instance.unexposedPaperType">
+                  卷{{ instance.unexposedPaperType }}
+                </span>
+                <span v-else>--</span>
               </el-form-item>
               </el-form-item>
             </el-col>
             </el-col>
           </el-row>
           </el-row>
@@ -144,7 +146,10 @@
                 >{{ attachment.filename }}
                 >{{ attachment.filename }}
               </el-button>
               </el-button>
             </td>
             </td>
-            <td>
+            <td
+              v-if="index === 0"
+              :rowspan="paperAttachment.paperAttachmentIds.length"
+            >
               <el-button
               <el-button
                 type="text"
                 type="text"
                 class="btn-primary"
                 class="btn-primary"

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

@@ -27,7 +27,7 @@
             v-for="(item, index) in paperTypes"
             v-for="(item, index) in paperTypes"
             :key="index"
             :key="index"
             :value="item"
             :value="item"
-            :label="item"
+            :label="`卷${item}`"
           ></el-option>
           ></el-option>
         </el-select>
         </el-select>
       </el-form-item>
       </el-form-item>

+ 12 - 6
src/modules/print/components/PrintPlanBkDetail.vue

@@ -150,18 +150,24 @@
             label="已曝光类型"
             label="已曝光类型"
             width="100"
             width="100"
           >
           >
-            <span slot-scope="scope">{{
-              scope.row.exposedPaperType | defaultFieldFilter
-            }}</span>
+            <template slot-scope="scope">
+              <span v-if="scope.row.exposedPaperType"
+                >卷{{ scope.row.exposedPaperType }}</span
+              >
+              <span v-else>--</span>
+            </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
             prop="unexposedPaperType"
             prop="unexposedPaperType"
             label="未曝光类型"
             label="未曝光类型"
             width="100"
             width="100"
           >
           >
-            <span slot-scope="scope">{{
-              scope.row.unexposedPaperType | defaultFieldFilter
-            }}</span>
+            <template slot-scope="scope">
+              <span v-if="scope.row.unexposedPaperType"
+                >卷{{ scope.row.unexposedPaperType }}</span
+              >
+              <span v-else>--</span>
+            </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
             class-name="action-column"
             class-name="action-column"

+ 12 - 6
src/modules/print/components/PrintPlanDetail.vue

@@ -110,18 +110,24 @@
             label="已曝光类型"
             label="已曝光类型"
             width="100"
             width="100"
           >
           >
-            <span slot-scope="scope">{{
-              scope.row.exposedPaperType | defaultFieldFilter
-            }}</span>
+            <template slot-scope="scope">
+              <span v-if="scope.row.exposedPaperType"
+                >卷{{ scope.row.exposedPaperType }}</span
+              >
+              <span v-else>--</span>
+            </template>
           </el-table-column>
           </el-table-column>
           <el-table-column
           <el-table-column
             prop="unexposedPaperType"
             prop="unexposedPaperType"
             label="未曝光类型"
             label="未曝光类型"
             width="100"
             width="100"
           >
           >
-            <span slot-scope="scope">{{
-              scope.row.unexposedPaperType | defaultFieldFilter
-            }}</span>
+            <template slot-scope="scope">
+              <span v-if="scope.row.unexposedPaperType"
+                >卷{{ scope.row.unexposedPaperType }}</span
+              >
+              <span v-else>--</span>
+            </template>
           </el-table-column>
           </el-table-column>
           <el-table-column prop="relatePaperType" label="关联卷型" width="100">
           <el-table-column prop="relatePaperType" label="关联卷型" width="100">
             <span slot-scope="scope">{{
             <span slot-scope="scope">{{

+ 12 - 6
src/modules/print/views/PlanLinkPaper.vue

@@ -114,18 +114,24 @@
         <el-table-column prop="userName" label="命题老师" min-width="100">
         <el-table-column prop="userName" label="命题老师" min-width="100">
         </el-table-column>
         </el-table-column>
         <el-table-column prop="exposedPaperType" label="已曝光类型" width="100">
         <el-table-column prop="exposedPaperType" label="已曝光类型" width="100">
-          <span slot-scope="scope">{{
-            scope.row.exposedPaperType | defaultFieldFilter
-          }}</span>
+          <template slot-scope="scope">
+            <span v-if="scope.row.exposedPaperType"
+              >卷{{ scope.row.exposedPaperType }}</span
+            >
+            <span v-else>--</span>
+          </template>
         </el-table-column>
         </el-table-column>
         <el-table-column
         <el-table-column
           prop="unexposedPaperType"
           prop="unexposedPaperType"
           label="未曝光类型"
           label="未曝光类型"
           width="100"
           width="100"
         >
         >
-          <span slot-scope="scope">{{
-            scope.row.unexposedPaperType | defaultFieldFilter
-          }}</span>
+          <template slot-scope="scope">
+            <span v-if="scope.row.unexposedPaperType"
+              >卷{{ scope.row.unexposedPaperType }}</span
+            >
+            <span v-else>--</span>
+          </template>
         </el-table-column>
         </el-table-column>
         <el-table-column prop="relatePaperType" label="关联卷型" width="100">
         <el-table-column prop="relatePaperType" label="关联卷型" width="100">
           <span slot-scope="scope">{{
           <span slot-scope="scope">{{