瀏覽代碼

入库审核表修改成附件

zhangjie 3 年之前
父節點
當前提交
6bcd2f0931

+ 1 - 1
card/views/CardPreview.vue

@@ -174,7 +174,7 @@ export default {
       document.getElementById("preview-frame").appendChild(iframeDom);
       const wwidth = window.innerWidth - 10;
       const wheight = window.innerHeight - 10;
-      iframeDom.style.cssText = `width: ${wwidth}px;height: ${wheight}px;`;
+      iframeDom.style.cssText = `width: ${wwidth}px;height: ${wheight}px;border:none;outline:none;`;
       const iframeDoc = iframeDom.contentDocument;
       iframeDoc.open();
       iframeDoc.write(htmlTemp);

+ 1 - 0
src/assets/styles/pages.scss

@@ -112,6 +112,7 @@
   }
   .image-list-none {
     color: $--color-text-gray-2;
+    margin-bottom: 10px;
   }
 }
 // apply-audit-history

+ 21 - 18
src/modules/exam/components/ApplyContent.vue

@@ -123,22 +123,7 @@
         </el-form-item>
       </el-form>
 
-      <h4 class="mb-2">备注说明:</h4>
-      <el-input
-        class="mb-2"
-        v-model="curTaskApply.remark"
-        type="textarea"
-        resize="none"
-        :rows="2"
-        :maxlength="100"
-        clearable
-        show-word-limit
-        placeholder="建议不超过100个字"
-        :disabled="!IS_APPLY"
-      ></el-input>
-
-      <h4 class="mb-2" v-if="IS_APPLY">上传入库审核表(最多4张)</h4>
-      <h4 class="mb-2" v-else>入库审核表</h4>
+      <h4 class="mb-2">附件<span v-if="IS_APPLY">(最多4张)</span>:</h4>
       <div class="image-list">
         <div
           class="image-item"
@@ -161,7 +146,7 @@
         <div
           v-if="paperConfirmAttachments.length < 4 && IS_APPLY"
           class="image-item image-add"
-          title="上传入库审核表"
+          title="上传附件"
           @click="toUploadPaperConfirm"
         >
           <i class="el-icon-plus"></i>
@@ -174,6 +159,24 @@
         暂无数据
       </div>
 
+      <h4 class="mb-2">附件说明:</h4>
+      <el-input
+        v-if="IS_APPLY"
+        class="mb-2"
+        v-model="curTaskApply.remark"
+        type="textarea"
+        resize="none"
+        :rows="2"
+        :maxlength="100"
+        clearable
+        show-word-limit
+        placeholder="建议不超过100个字"
+      ></el-input>
+      <div class="color-gray-2" v-else>
+        <p v-if="curTaskApply.remark">{{ curTaskApply.remark }}</p>
+        <p v-else>暂无</p>
+      </div>
+
       <!-- audit -->
       <div v-if="IS_AUDIT" class="task-audit">
         <el-form
@@ -755,7 +758,7 @@ export default {
         return;
       }
       // if (!this.paperConfirmAttachments.length) {
-      //   this.$message.error("请上传入库审核表!");
+      //   this.$message.error("请上传附件!");
       //   return;
       // }
 

+ 16 - 16
src/modules/exam/components/CreateTaskApply.vue

@@ -204,20 +204,7 @@
           </el-form-item>
         </el-form>
 
-        <h4 class="mb-2">备注说明:</h4>
-        <el-input
-          class="mb-2"
-          v-model="examTaskDetail.remark"
-          type="textarea"
-          resize="none"
-          :rows="2"
-          :maxlength="100"
-          clearable
-          show-word-limit
-          placeholder="建议不超过100个字"
-        ></el-input>
-
-        <h4 class="mb-2">上传入库审核表(最多4张)</h4>
+        <h4 class="mb-2">附件:<span>(最多4张)</span></h4>
         <div class="image-list">
           <div
             class="image-item"
@@ -240,12 +227,25 @@
           <div
             v-if="paperConfirmAttachments.length < 4"
             class="image-item image-add"
-            title="上传入库审核表"
+            title="上传附件"
             @click="toUploadPaperConfirm"
           >
             <i class="el-icon-plus"></i>
           </div>
         </div>
+
+        <h4 class="mb-2">附件说明:</h4>
+        <el-input
+          class="mb-2"
+          v-model="examTaskDetail.remark"
+          type="textarea"
+          resize="none"
+          :rows="2"
+          :maxlength="100"
+          clearable
+          show-word-limit
+          placeholder="建议不超过100个字"
+        ></el-input>
       </div>
       <div class="task-action">
         <el-button type="primary" :disabled="isSubmit" @click="submit"
@@ -661,7 +661,7 @@ export default {
         return;
       }
       // if (!this.paperConfirmAttachments.length) {
-      //   this.$message.error("请上传入库审核表!");
+      //   this.$message.error("请上传附件!");
       //   return;
       // }
 

+ 1 - 1
src/modules/exam/components/UploadPaperDialog.vue

@@ -69,7 +69,7 @@ export default {
           uploadData: { type: "PAPER" }
         },
         paperConfirm: {
-          title: "入库审核表",
+          title: "附件",
           format: ["jpg", "png"],
           uploadData: { type: "UPLOAD" }
         }

+ 15 - 15
src/modules/exam/components/createExamAndPrintTask/InfoExamTask.vue

@@ -163,20 +163,7 @@
           </el-form-item>
         </el-form>
 
-        <h4 class="mb-2">备注说明:</h4>
-        <el-input
-          class="mb-2"
-          v-model="examTaskDetail.remark"
-          type="textarea"
-          resize="none"
-          :rows="2"
-          :maxlength="100"
-          clearable
-          show-word-limit
-          placeholder="建议不超过100个字"
-        ></el-input>
-
-        <h4 class="mb-2">上传入库审核表(最多4张)</h4>
+        <h4 class="mb-2">附件:<span>(最多4张)</span></h4>
         <div class="image-list">
           <div
             class="image-item"
@@ -205,6 +192,19 @@
             <i class="el-icon-plus"></i>
           </div>
         </div>
+
+        <h4 class="mb-2">附件说明:</h4>
+        <el-input
+          class="mb-2"
+          v-model="examTaskDetail.remark"
+          type="textarea"
+          resize="none"
+          :rows="2"
+          :maxlength="100"
+          clearable
+          show-word-limit
+          placeholder="建议不超过100个字"
+        ></el-input>
       </div>
     </div>
 
@@ -356,7 +356,7 @@ export default {
         return;
       }
       // if (!this.paperConfirmAttachments.length) {
-      //   this.$message.error("请上传入库审核表!");
+      //   this.$message.error("请上传附件!");
       //   return;
       // }