ly 1 ano atrás
pai
commit
9b404930a5

+ 6 - 6
src/views/business/collect/count/index.vue

@@ -34,11 +34,11 @@
                     format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
                     end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
             </el-form-item>
-            <!-- <el-form-item  label="确认所属时间:" label-width="95px">
+          <el-form-item  label="确认所属时间:" label-width="95px">
                 <el-date-picker v-model="queryParams.actuallyDateFilter" size="small" type="daterange" clearable
                     format="YYYY - MM - DD " value-format="YYYY-MM-DD" range-separator="至" start-placeholder="业务日期"
                     end-placeholder="业务日期" style="width: 100%;"></el-date-picker>
-            </el-form-item> -->
+            </el-form-item>
             <div style="margin-top: 10px;">
                 <el-form-item label="是否是项目:" prop="isProject" label-width="auto">
                     <el-select size="small" v-model="queryParams.isProject" placeholder="是否是项目" clearable
@@ -74,8 +74,8 @@
             </el-table-column>
             <el-table-column label="到账日期" align="center" prop="receiptDate">
             </el-table-column>
-            <!-- <el-table-column label="确认所属时间" align="center" prop="actuallyDate">
-            </el-table-column> -->
+            <el-table-column label="确认所属时间" align="center" prop="actuallyDate">
+            </el-table-column>
             <el-table-column label="提收款金额" align="center" prop="withdrawalAmount">
             </el-table-column>
             <el-table-column label="申请人" align="center" prop="applierName">
@@ -104,8 +104,8 @@
                         {{scope.row.outAmount}}</el-link>
                 </template>
             </el-table-column>
-            <!-- <el-table-column label="审核人" align="center" prop="verifyName" >
-            </el-table-column> -->
+            <el-table-column label="审核人" align="center" prop="verifyName" >
+            </el-table-column>
             <el-table-column label="审核时间" align="center" prop="examineTime" >
             </el-table-column>
         </el-table>

+ 24 - 24
src/views/business/deduction/index.vue

@@ -151,21 +151,21 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="凭证附件:" required>
-              <!-- <dragUpload :accept="accept" style="width:100%" @file="upload"
-                v-if="form.files == null || form.files == ''" />
-              <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.files[0].fileUrl}`"
-                class="avatar" @click="openEvidience('files[0]')" />
-              <div v-if="form.status !== 3">
+              <dragUpload :accept="accept" style="width:100%" @file="upload" multiple
+           />
+              <!-- <img v-else style="height: 148px; width: 148px" :src="`${baseUrl}/${form.files[0].fileUrl}`"
+                class="avatar" @click="openEvidience('files[0]')" /> -->
+              <!-- <div v-if="form.status !== 3">
                 <el-icon :size="20" v-if="form.files !== '' ||form.files == null "
                   @click="form.files = []" class="delete-button">
                   <Delete />
                 </el-icon>
               </div> -->
-              <div class="details-btns-container" style="display: flex">
+              <!-- <div class="details-btns-container" style="display: flex">
                 <el-upload action="#" :http-request="upload" :with-credentials="true" :show-file-list="false" multiple>
                   <el-button size="small" type="primary" icon="Upload">点击上传</el-button>
                 </el-upload>
-              </div>
+              </div> -->
               <el-table ref="filesTable" :data="form.files" size="small" height="200px" border
                 header-row-class-name="list-header-row">
                 <el-table-column type="index" label="序号" width="47" align="center" />
@@ -519,25 +519,9 @@
     });
   }
 
-  // function upload(param) {
-  //   const formData = new FormData();
-  //   formData.append("file", param);
-  //   uploadFile(formData).then((res) => {
-  //     if (res.code === 200) {
-  //       const file = {};
-  //       file.fileName = res.newFileName;
-  //       file.url = res.url;
-  //       file.originalFileName = res.originalFilename;
-  //       file.fileUrl = res.fileName;
-  //       file.masterId = form.value.id;
-  //       file.masterTableName = "biz_deduction";
-  //       form.value.files.push(file);
-  //     }
-  //   });
-  // }
   function upload(param) {
     const formData = new FormData();
-    formData.append("file", param.file);
+    formData.append("file", param);
     uploadFile(formData).then((res) => {
       if (res.code === 200) {
         const file = {};
@@ -551,6 +535,22 @@
       }
     });
   }
+  // function upload(param) {
+  //   const formData = new FormData();
+  //   formData.append("file", param.file);
+  //   uploadFile(formData).then((res) => {
+  //     if (res.code === 200) {
+  //       const file = {};
+  //       file.fileName = res.newFileName;
+  //       file.url = res.url;
+  //       file.originalFileName = res.originalFilename;
+  //       file.fileUrl = res.fileName;
+  //       file.masterId = form.value.id;
+  //       file.masterTableName = "biz_deduction";
+  //       form.value.files.push(file);
+  //     }
+  //   });
+  // }
   function openFollowFile(arg) {
     // console.log(arg)
     const attach = arg;