Merge branch 'dev_v3.3.0' of http://git.qmth.com.cn/teachcloud/teachcloud-print-web into dev_v3.3.0

src/modules/mark/components/markDetail/MarkDetailIssue.vue

@@ -27,8 +27,8 @@
         </el-form-item>
         <el-form-item label="状态">
           <el-select v-model="filter.status" placeholder="状态" clearable>
-            <el-option :value="1" label="已处理"></el-option>
-            <el-option :value="0" label="未处理"></el-option>
+            <el-option value="BACK" label="已处理"></el-option>
+            <el-option value="WAITING" label="未处理"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="密号">

src/modules/print/views/PrintTaskManage.vue

@@ -317,14 +317,25 @@
         >
           <template slot-scope="scope">
             <el-button
-              v-if="checkPrivilege('link', 'download')"
+              v-if="
+                checkPrivilege('link', 'download') &&
+                (scope.row.status === 'READY' ||
+                  scope.row.status === 'WAITING' ||
+                  scope.row.status === 'PRINTING' ||
+                  scope.row.status === 'FINISH' ||
+                  scope.row.status === 'CANCEL')
+              "
               class="btn-primary"
               type="text"
               @click="toViewPdf(scope.row)"
               >查看pdf</el-button
             >
             <el-button
-              v-if="scope.row.taskId && checkPrivilege('link', 'createpdf')"
+              v-if="
+                scope.row.taskId &&
+                checkPrivilege('link', 'createpdf') &&
+                (scope.row.status === 'READY' || scope.row.status === 'CANCEL')
+              "
               class="btn-primary"
               type="text"
               @click="toRebuildPdf(scope.row)"