Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-web-admin

src/modules/print/view/ProjectTemplate.vue

@@ -85,6 +85,30 @@
                   :disabled="!hasPermit"
                   >上传</el-button
                 >
+                <span
+                  class="el-upload__tip"
+                  style="margin-left: 10px"
+                  v-show="
+                    scope.row.templateType == 1 || scope.row.templateType == 2
+                  "
+                  >请上传xls/xlsx文件，且不超过50M</span
+                >
+                <span
+                  class="el-upload__tip"
+                  style="margin-left: 10px"
+                  v-show="scope.row.templateType == 8"
+                  >请上传jpg/png文件，且不超过50M</span
+                >
+                <span
+                  class="el-upload__tip"
+                  style="margin-left: 10px"
+                  v-show="
+                    scope.row.templateType != 1 &&
+                      scope.row.templateType != 2 &&
+                      scope.row.templateType != 8
+                  "
+                  >请上传pdf文件，且不超过50M</span
+                >
               </el-upload>
             </template>
           </el-table-column>