Przeglądaj źródła

Revert "上传养老金excel文件解析"

This reverts commit 7a89c9e197106817ed0128dd14f45e71ca9b19e2.
lzj 1 rok temu
rodzic
commit
45e73706cb
2 zmienionych plików z 20 dodań i 115 usunięć
  1. 0 7
      src/api/user.js
  2. 20 108
      src/views/mvGzcLog/index.vue

+ 0 - 7
src/api/user.js

@@ -94,13 +94,6 @@ export function createMerchant(data) {
94 94
   return request.post(`/mv-merchant/createObj`, data)
95 95
 }
96 96
 /**
97
- * @description 上传养老金excel
98
- */
99
-export function uploadPension(data) {
100
-  return request.post(`/mv-gzc-logs/uploadPension`, data , {timeout:24*60*60*1000});
101
-  // return request.post(`/mv-gzc-logs/uploadPension`, data);
102
-}
103
-/**
104 97
  * @description 查询入账公证处明细列表
105 98
  */
106 99
 export function getMvGzcLogsList(data) {

+ 20 - 108
src/views/mvGzcLog/index.vue

@@ -44,17 +44,8 @@
44 44
          >
45 45
             搜索
46 46
          </el-button>
47
-
48
-              <el-button
49
-                class="filter-item"
50
-                type="primary"
51
-                icon="el-icon-upload"
52
-                @click="onUpload()"
53
-              >
54
-                养老金excel文件上传
55
-              </el-button>
56 47
             </el-form-item>
57
-
48
+            
58 49
           </el-form>
59 50
         </div>
60 51
       </div>
@@ -96,7 +87,7 @@
96 87
                <span>{{ row.password }}</span>
97 88
             </template>
98 89
          </el-table-column> -->
99
-
90
+         
100 91
          <el-table-column label="单号"  align="center">
101 92
             <template slot-scope="{ row }">
102 93
                <span>{{ row.outTradeNo }}</span>
@@ -167,11 +158,11 @@
167 158
                <span>{{ row.wxpayAccount }}</span>
168 159
             </template>
169 160
          </el-table-column>
170
-
171
-
161
+        
162
+         
172 163
         <el-table-column prop="createTime" label="创建时间" min-width="150" />
173 164
         <el-table-column prop="updateTime" label="修改时间" min-width="100" />
174
-
165
+        
175 166
          <!-- <el-table-column label="最后登录时间" width="150px" align="center">
176 167
             <template slot-scope="{ row }">
177 168
                <span>{{
@@ -188,7 +179,7 @@
188 179
             fixed="right"
189 180
          >
190 181
             <template slot-scope="{ row }">
191
-
182
+              
192 183
 
193 184
                <el-button
194 185
                   type="primary"
@@ -213,7 +204,7 @@
213 204
                      </el-button>
214 205
                   </el-popconfirm>
215 206
                </template>
216
-
207
+               
217 208
             </template>
218 209
          </el-table-column>     -->
219 210
             </el-table>
@@ -239,7 +230,7 @@
239 230
             label-width="120px"
240 231
             style="width: 400px; margin-left: 50px"
241 232
          >
242
-
233
+            
243 234
             <el-form-item label="姓名" prop="realname">
244 235
                <el-input v-model="temp.realname" />
245 236
             </el-form-item>
@@ -276,60 +267,13 @@
276 267
             </el-button>
277 268
          </div>
278 269
       </el-dialog>
279
-
280
-      <!-- 上传页面 -->
281
-      <el-dialog :title="'养老金excel文件上传'" :visible.sync="dialogUploadFormVisible">
282
-        <el-form
283
-          ref="dataUploadForm"
284
-          :model="temp"
285
-          label-position="left"
286
-          label-width="120px"
287
-          style="width: 400px; margin-left: 50px"
288
-        >
289
-          <el-form-item label="文件" prop="fileList">
290
-            <el-upload
291
-              ref="upload"
292
-              action="/admin/mv-gzc-logs/uploadPension"
293
-              :file-list="fileList"
294
-              :auto-upload="false"
295
-              :on-change="handleChange"
296
-              :limit="1"
297
-              :accept="'.xlsx,.xls'"
298
-            >
299
-              <el-button slot="trigger" size="small" type="primary">选择文件</el-button>
300
-              <div slot="tip" class="el-upload__tip">只能上传.xlsx和.xls文件</div>
301
-            </el-upload>
302
-          </el-form-item>
303
-        </el-form>
304
-
305
-        <!-- 弹窗底部按钮 -->
306
-        <div slot="footer" class="dialog-footer">
307
-          <el-button @click="dialogUploadFormVisible = false">
308
-            取消
309
-          </el-button>
310
-          <el-button
311
-            type="primary"
312
-            @click="submitUpload()"
313
-          >
314
-            确定
315
-          </el-button>
316
-        </div>
317
-      </el-dialog>
318 270
     </div>
319 271
   </template>
320
-
272
+  
321 273
   <script>
322
-  import {
323
-    getMvMerchantList,
324
-    getMvMerchantDetail,
325
-    delMerchant,
326
-    createMerchant,
327
-    getMvGzcLogsList,
328
-    uploadPension
329
-  } from "@/api/user";
274
+  import { getMvMerchantList,getMvMerchantDetail,delMerchant,createMerchant,getMvGzcLogsList } from "@/api/user";
330 275
   import { roterPre } from "@/settings";
331
-  import { Loading } from 'element-ui';
332
-
276
+  
333 277
   export default {
334 278
     filters: {
335 279
       showAccountType(e){
@@ -342,16 +286,13 @@
342 286
          } else {
343 287
           return "";
344 288
          }
345
-      },
289
+      },    
346 290
     },
347 291
     data() {
348 292
       return {
349 293
         temp:{},
350 294
         dialogStatus:'add',
351 295
         dialogFormVisible:false,
352
-        dialogUploadFormVisible:false,
353
-        loadingInstance:null,
354
-        fileList: [],
355 296
         //  日期选择限制
356 297
         pickerOptions0: {
357 298
             disabledDate: (time) => {
@@ -418,7 +359,7 @@
418 359
       };
419 360
     },
420 361
     mounted() {
421
-
362
+        
422 363
 
423 364
         // this.getUserList();
424 365
         // this.getRefundData();
@@ -460,7 +401,7 @@
460 401
         this.$message.info(res.message);
461 402
       }).catch(res => {
462 403
             this.$message.error(res.message);
463
-
404
+           
464 405
       });
465 406
     },
466 407
       // 表格退货
@@ -534,36 +475,6 @@
534 475
             this.listLoading = false;
535 476
           });
536 477
       },
537
-      // 上传
538
-      onUpload() {
539
-        this.fileList = [];
540
-        this.dialogUploadFormVisible = true;
541
-      },
542
-      handleChange(file, fileList) {
543
-        this.fileList = fileList;
544
-      },
545
-      submitUpload() {
546
-       // console.log('submitUpload',this.fileList);
547
-        // 显示加载状态
548
-        this.loadingInstance = Loading.service({
549
-          lock: true,
550
-          text: '正在解析中...',
551
-          background: 'rgba(0, 0, 0, 0.7)'
552
-        });
553
-        const formData = new FormData();
554
-        formData.append('file', this.fileList[0].raw); // 假设 `file` 是你的文件对象
555
-        uploadPension(formData).then(() => {
556
-          this.dialogUploadFormVisible = false;
557
-          this.$notify({
558
-            title: "成功",
559
-            message: "上传成功",
560
-            type: "success",
561
-            duration: 2000,
562
-          });
563
-          // 文件处理完成后,隐藏加载状态
564
-          this.loadingInstance.close();
565
-        });
566
-      },
567 478
       pageChange(page) {
568 479
         this.tableFrom.pageNum = page;
569 480
         this.getList();
@@ -575,18 +486,18 @@
575 486
     }
576 487
   };
577 488
   </script>
578
-
489
+  
579 490
   <style lang="scss" scoped>
580
-
491
+     
581 492
   p{
582 493
     margin: 0;
583 494
     padding: 0;
584 495
   }
585 496
   .daada{
586
-
497
+   
587 498
   margin-bottom: 30px;
588 499
     display: flex;
589
-
500
+   
590 501
   }
591 502
   .contain-count{
592 503
     display: flex;
@@ -600,7 +511,7 @@
600 511
   /deep/ .el-table tr{
601 512
     height: 50px;
602 513
   }
603
-
514
+  
604 515
   .all_box {
605 516
     margin-left: 30px;
606 517
     width: 240px;
@@ -794,3 +705,4 @@
794 705
     max-width: 180px;
795 706
   }
796 707
   </style>
708
+