From 95048d47a9082d5ba3bcf2df94c82b78f2202be5 Mon Sep 17 00:00:00 2001
From: guojuan <2715201989@qq.com>
Date: Tue, 16 Jul 2024 10:50:19 +0800
Subject: [PATCH] fix:优化出入库以及项目填报的功能

---
 frontend/front/src/api/service/current.js                                  |  7 +++++++
 frontend/front/src/api/service/finance.js                                  |  7 +++++++
 frontend/front/src/components/dialog/processingRecordDialog.vue            | 12 ++++++++----
 frontend/front/src/components/tableSlot/current/accountBalanceDl.vue       |  5 +++--
 frontend/front/src/components/tableSlot/current/currentAccountDetail.vue   | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue |  7 +++----
 frontend/front/src/main.js                                                 |  3 ++-
 frontend/front/src/utils/common.js                                         | 40 ++++++++++++++++++++++++++++++++++++++++
 8 files changed, 138 insertions(+), 11 deletions(-)
 create mode 100644 frontend/front/src/components/tableSlot/current/currentAccountDetail.vue
 create mode 100644 frontend/front/src/utils/common.js

diff --git a/frontend/front/src/api/service/current.js b/frontend/front/src/api/service/current.js
index 66084d4..7460919 100644
--- a/frontend/front/src/api/service/current.js
+++ b/frontend/front/src/api/service/current.js
@@ -7,3 +7,10 @@ export function accountBalanceExport(date) {
     responseType: 'arraybuffer',
   })
 }
+export function currentAccountDetailsExport(date) {
+  return request({
+    url: `${context.portal}/wCurrent/v1/curAccBalDetExport?date=${date}`,
+    method: 'get',
+    responseType: 'arraybuffer',
+  })
+}
diff --git a/frontend/front/src/api/service/finance.js b/frontend/front/src/api/service/finance.js
index b705d30..cbca5b2 100644
--- a/frontend/front/src/api/service/finance.js
+++ b/frontend/front/src/api/service/finance.js
@@ -8,4 +8,11 @@ export function transactionDetailsExport(date) {
     responseType: 'arraybuffer',
   })
 }
+export function currentAccountDetailsExport(date) {
+  return request({
+    url: `${context.portal}/wCurrent/v1/curAccBalDetExport?date=${date}`,
+    method: 'get',
+    responseType: 'arraybuffer',
+  })
+}
 
diff --git a/frontend/front/src/components/dialog/processingRecordDialog.vue b/frontend/front/src/components/dialog/processingRecordDialog.vue
index ad7fc9a..a808bc3 100644
--- a/frontend/front/src/components/dialog/processingRecordDialog.vue
+++ b/frontend/front/src/components/dialog/processingRecordDialog.vue
@@ -2,11 +2,15 @@
   <div>
     <el-dialog title="处理记录" :visible.sync="dialogTableVisible" @close="handleClose">
       <el-table :data="gridData">
-        <el-table-column type="index" property="date" label="序号" width="150"></el-table-column>
-        <el-table-column property="f_create_by" label="操作人" width="200"></el-table-column>
+        <el-table-column type="index" property="date" label="序号" width="80" align="center">
+          <template slot-scope="scope">
+            {{ gridData.length - scope.$index }}
+          </template>
+        </el-table-column>
+        <el-table-column property="f_create_by" label="操作人" width="120"></el-table-column>
         <el-table-column property="f_create_time" label="操作时间" width="200"></el-table-column>
-        <el-table-column property="f_event_type" label="事件类型" width="200"></el-table-column>
-        <el-table-column property="fProgressStatus" label="进展情况"></el-table-column>
+        <el-table-column property="f_event_type" label="事件类型" width="200" :show-overflow-tooltip="true"></el-table-column>
+        <el-table-column property="f_progress_status" label="进展情况" :show-overflow-tooltip="true"></el-table-column>
       </el-table>
       <el-row>
         <el-col :span="24" style="display: flex;justify-content: end;margin-top: 10px">
diff --git a/frontend/front/src/components/tableSlot/current/accountBalanceDl.vue b/frontend/front/src/components/tableSlot/current/accountBalanceDl.vue
index 3b690df..bfa8ca9 100644
--- a/frontend/front/src/components/tableSlot/current/accountBalanceDl.vue
+++ b/frontend/front/src/components/tableSlot/current/accountBalanceDl.vue
@@ -1,6 +1,7 @@
 <template>
-  <div>
-    <el-button @click="onClick">正常账户可用余额导出</el-button>
+  <div style="display: inline-block;">
+    <el-button @click="onClick" size="mini">正常账户可用余额导出</el-button>
+<!--    <el-button @click="onClick">活期账户余额明细导出</el-button>-->
     <el-dialog title="正常账户可用余额导出" :visible.sync="dialogVisible" width="30%">
       <el-form>
         <el-form-item label="日期">
diff --git a/frontend/front/src/components/tableSlot/current/currentAccountDetail.vue b/frontend/front/src/components/tableSlot/current/currentAccountDetail.vue
new file mode 100644
index 0000000..e8e1d63
--- /dev/null
+++ b/frontend/front/src/components/tableSlot/current/currentAccountDetail.vue
@@ -0,0 +1,68 @@
+<template>
+  <div style="display: inline-block;">
+    <el-button @click="onClick" size="mini">活期账户余额明细导出</el-button>
+    <el-dialog title="活期账户余额明细导出" :visible.sync="dialogVisible" width="30%">
+      <el-form>
+        <el-form-item label="日期">
+          <el-date-picker v-model="date" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
+                          style="width: calc(100% - 80px);"></el-date-picker>
+        </el-form-item>
+      </el-form>
+      <span slot="footer">
+        <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="onSubmit">导 出</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+
+import { currentAccountDetailsExport }  from '@/api/service/current'
+
+export default {
+  data() {
+    return {
+      dialogVisible: false,
+      date: null
+    };
+  },
+  created() {
+    let today = new Date();
+    today.setDate(today.getDate() - 1);
+    let year = today.getFullYear();
+    let month = ("0" + (today.getMonth() + 1)).slice(-2);
+    let day = ("0" + today.getDate()).slice(-2);
+    this.date = year + '-' + month + '-' + day;
+  },
+  methods: {
+    onClick() {
+      this.dialogVisible = true;
+    },
+    onSubmit() {
+      if (!this.date) {this.$message.error('请选择日期！');return false;}
+      currentAccountDetailsExport(this.date).then(_ref => {
+        let {data, headers} = _ref;
+        // 附件下载
+        const blob = new Blob([data]);
+        // 附件下载
+        const fileName = decodeURIComponent(headers['content-disposition'].split(';')[1].split('filename=')[1]);
+        saveAs(blob, fileName);
+      }).catch(err => {
+        this.$message.error(`模板下载失败：${err}`);
+      });
+    }
+  }
+}
+</script>
+
+<style scoped lang='scss'>
+::v-deep {
+  .el-dialog__footer {
+    text-align: center !important;
+
+    .el-button {
+      margin-left: 20px;
+    }
+  }
+}
+</style>
diff --git a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
index 1ce7f01..a07dd4c 100644
--- a/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
+++ b/frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div style="display: inline-block;">
     <el-button icon="el-icon-upload2" size="mini" @click="handleExport" :loading="loading">导出</el-button>
   </div>
 </template>
@@ -29,12 +29,12 @@ export default {
         fProjectName:this.searchForms.project_name?this.searchForms.project_name:'',
         fProjectCategory:this.searchForms.project_category?this.searchForms.project_category:'',
         fProjectState:this.searchForms.project_state?this.searchForms.project_state:'',
-        createTime:this.searchForms.create_time?this.searchForms.create_time:'',
+        createTime:this.searchForms.create_time?this.parseTime(this.searchForms.create_time,"{y}-{m}-{d}"):'',
         fProjectNature:this.searchForms.project_nature?this.searchForms.project_nature:'',
         fBusinessScenarios:this.searchForms.business_scenarios?this.searchForms.business_scenarios:'',
         fBusinessModel:this.searchForms.business_model?this.searchForms.business_model:'',
         fProjectRating:this.searchForms.project_rating?this.searchForms.project_rating:'',
-        updateTime:this.searchForms.update_time?this.searchForms.update_time:''
+        updateTime:this.searchForms.update_time?this.parseTime(this.searchForms.update_time,"{y}-{m}-{d}"):''
       }
        exportRecordData(params).then((res)=>{
         console.log('打印res',res);
@@ -46,7 +46,6 @@ export default {
          saveAs(blob, fileName);
          this.loading = false;
       })
-      console.log('打印this.rows',this.searchForms,this.selectRows)
 
     },
   }
diff --git a/frontend/front/src/main.js b/frontend/front/src/main.js
index 9c2489b..6bf9a96 100644
--- a/frontend/front/src/main.js
+++ b/frontend/front/src/main.js
@@ -12,6 +12,7 @@ import 'moment/locale/zh-cn'
 import '@/assets/iconfont/iconfont.css'
 import htProcessForecast from '@/views/matter/processForecast/processForecastPage.vue'
 import HtKanban from '@/components/layouts/HtKanban/index.vue'
+import {parseTime}  from '@/utils/common.js'
 import './plugs/tableSlot'
 
 Vue.component('HtProcessForecast', htProcessForecast)
@@ -20,7 +21,7 @@ Vue.component('HtKanban', HtKanban)
 // const { mockXHR } = require('@/utils/static')
 // mockXHR()
 // }
-
+Vue.prototype.parseTime = parseTime;
 Vue.config.productionTip = false
 
 Object.defineProperty(Vue.prototype, '$http', {
diff --git a/frontend/front/src/utils/common.js b/frontend/front/src/utils/common.js
new file mode 100644
index 0000000..33af9b7
--- /dev/null
+++ b/frontend/front/src/utils/common.js
@@ -0,0 +1,40 @@
+// 日期格式化
+export function parseTime(time, pattern) {
+  if (arguments.length === 0 || !time) {
+    return null
+  }
+  const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
+  let date
+  if (typeof time === 'object') {
+    date = time
+  } else {
+    if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
+      time = parseInt(time)
+    } else if (typeof time === 'string') {
+      time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
+    }
+    if ((typeof time === 'number') && (time.toString().length === 10)) {
+      time = time * 1000
+    }
+    date = new Date(time)
+  }
+  const formatObj = {
+    y: date.getFullYear(),
+    m: date.getMonth() + 1,
+    d: date.getDate(),
+    h: date.getHours(),
+    i: date.getMinutes(),
+    s: date.getSeconds(),
+    a: date.getDay()
+  }
+  const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
+    let value = formatObj[key]
+    // Note: getDay() returns 0 on Sunday
+    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
+    if (result.length > 0 && value < 10) {
+      value = '0' + value
+    }
+    return value || 0
+  })
+  return time_str
+}
--
libgit2 0.21.2