ly 1 ano atrás
pai
commit
e344e6c0d6

+ 0 - 0
src/views/business/production/IndividualIncomeTaxIs/dragUpload.vue → src/components/dragUpload.vue


+ 1 - 1
src/views/business/production/IndividualIncomeTaxIs/FormDialog.vue

@@ -208,7 +208,7 @@
     getDetail,
     getInfo,
   } from "@/api/business/production/detail";
-  import dragUpload from "./dragUpload"
+  import dragUpload from "@/components/dragUpload"
   import { ref } from "vue";
   // import { de } from "element-plus/es/locale";
   // import { de } from "element-plus/es/locale";

+ 12 - 4
src/views/business/production/IndividualIncomeTaxIsZero/FormDialog.vue

@@ -40,7 +40,15 @@
             <el-col :span="24">
               <div class="details-btns-container">
                 <el-form-item label="凭证文件" prop="evidenceFile" required>
-                  <el-upload
+                  <dragUpload :accept="accept" style="width:100%" @file="upload"
+                  v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
+                <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
+                  class="avatar" @click="openEvidience('evidenceFile')" />
+                  <el-icon v-if=" emptyForm.evidenceFile != null ||   emptyForm.evidenceFile !== '' " @click="emptyForm.evidenceFile = ''"
+                  class="delete-button">
+                  <Delete />
+                </el-icon>
+                  <!-- <el-upload
                     v-if="!isView"
                     action="#"
                     :http-request="upload"
@@ -70,7 +78,7 @@
                     :src="`${baseUrl}/${emptyForm.evidenceFile}`"
                     class="avatar"
                     @click="openEvidience('evidenceFile')"
-                  />
+                  /> -->
                 </el-form-item>
               </div>
             </el-col>
@@ -173,7 +181,7 @@ import {
   addIndividualIncomeTaxDetail,
   updateIndividualIncomeTaxDetail,
 } from "@/api/business/production/detailIsZero";
-
+  import dragUpload from "@/components/dragUpload"
 import { getInfo, getDetail } from "@/api/business/production/detail";
 
 import { ref } from "vue";
@@ -304,7 +312,7 @@ function upload(param) {
   handleDelFile();
 
   const formData = new FormData();
-  formData.append("file", param.file);
+  formData.append("file", param);
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       const file = {};

+ 14 - 5
src/views/business/production/financialReportTax/FormDialog.vue

@@ -240,7 +240,15 @@
             <el-col :span="24">
               <div class="details-btns-container">
                 <el-form-item label="凭证文件" prop="evidenceFile" required>
-                  <el-upload
+                  <dragUpload :accept="accept" style="width:100%" @file="upload"
+                  v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
+                <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
+                  class="avatar" @click="openEvidience('evidenceFile')" />
+                  <el-icon v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null " @click="emptyForm.evidenceFile = ''"
+                  class="delete-button">
+                  <Delete />
+                </el-icon>
+                  <!-- <el-upload
                     v-if="!isView"
                     action="#"
                     :http-request="upload"
@@ -270,7 +278,7 @@
                     :src="`${baseUrl}/${emptyForm.evidenceFile}`"
                     class="avatar"
                     @click="openEvidience('evidenceFile')"
-                  />
+                  /> -->
                 </el-form-item>
               </div>
             </el-col>
@@ -443,6 +451,7 @@ watch(addType, (value) => {
 
 import { saveDetail, updateTax, getTax } from "@/api/business/production/tax";
 import { uploadFile } from "@/api/tool/file";
+  import dragUpload from "@/components/dragUpload"
 // import { de } from "element-plus/es/locale";
 import { ref } from "vue";
 
@@ -622,7 +631,7 @@ function uploadextFile(param) {
 /** 文件上传 */
 function upload(param) {
   const formData = new FormData();
-  formData.append("file", param.file);
+  formData.append("file", param);
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       console.log(res);
@@ -632,8 +641,8 @@ function upload(param) {
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;
       files.value.push(file);
-      file.fileType = param.file.type;
-      file.fileSize = param.file.size;
+      file.fileType = param.type;
+      file.fileSize = param.size;
       emptyForm.value.evidenceFile = file.fileUrl;
     }
   });

+ 14 - 6
src/views/business/production/financialReportTaxIsZero/FormDialog.vue

@@ -44,7 +44,15 @@
             <el-col :span="24">
               <div class="details-btns-container">
                 <el-form-item label="凭证文件" prop="evidenceFile" required>
-                  <el-upload
+                  <dragUpload :accept="accept" style="width:100%" @file="upload"
+                  v-if="emptyForm.evidenceFile == null || emptyForm.evidenceFile == ''" />
+                <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${emptyForm.evidenceFile}`"
+                  class="avatar" @click="openEvidience('evidenceFile')" />
+                  <el-icon v-if="emptyForm.evidenceFile !== '' ||emptyForm.evidenceFile == null " @click="emptyForm.evidenceFile = ''"
+                  class="delete-button">
+                  <Delete />
+                </el-icon>
+                  <!-- <el-upload
                     v-if="!isView"
                     action="#"
                     :http-request="upload"
@@ -74,7 +82,7 @@
                     :src="`${baseUrl}/${emptyForm.evidenceFile}`"
                     class="avatar"
                     @click="openEvidience('evidenceFile')"
-                  />
+                  /> -->
                 </el-form-item>
               </div>
             </el-col>
@@ -246,7 +254,7 @@ import {
 import { uploadFile } from "@/api/tool/file";
 // import { de } from "element-plus/es/locale";
 import { ref } from "vue";
-
+  import dragUpload from "@/components/dragUpload"
 const baseUrl = import.meta.env.VITE_APP_BASE_API;
 
 const { form, rules } = toRefs(data);
@@ -428,7 +436,7 @@ function uploadextFile(param) {
 /** 文件上传 */
 function upload(param) {
   const formData = new FormData();
-  formData.append("file", param.file);
+  formData.append("file", param);
   uploadFile(formData).then((res) => {
     if (res.code === 200) {
       console.log(res);
@@ -438,8 +446,8 @@ function upload(param) {
       file.originalFileName = res.originalFilename;
       file.fileUrl = res.fileName;
       files.value.push(file);
-      file.fileType = param.file.type;
-      file.fileSize = param.file.size;
+      file.fileType = param.type;
+      file.fileSize = param.size;
       emptyForm.value.evidenceFile = file.fileUrl;
     }
   });