fix:优化出入库以及项目填报的功能

郭娟
1 parent 5554c00a
Showing 8 changed files with 138 additions and 11 deletions Show diff stats
frontend/front/src/api/service/current.js
frontend/front/src/api/service/finance.js
frontend/front/src/components/dialog/processingRecordDialog.vue
frontend/front/src/components/tableSlot/current/accountBalanceDl.vue
frontend/front/src/components/tableSlot/current/currentAccountDetail.vue
frontend/front/src/components/tableSlot/projectSubmission/exportRecord.vue
frontend/front/src/main.js
frontend/front/src/utils/common.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',
+  })
+}
@@ -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',
+  })
+}
@@ -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">
 <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="日期">
@@ -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>
 <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)
     },
   }
@@ -12,6 +12,7 @@ import &#39;moment/locale/zh-cn&#39;
 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(&#39;HtKanban&#39;, HtKanban)
 // const { mockXHR } = require('@/utils/static')
 // mockXHR()
 // }
-
+Vue.prototype.parseTime = parseTime;
 Vue.config.productionTip = false
 Object.defineProperty(Vue.prototype, '$http', {
@@ -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
+}
	@@ -7,3 +7,10 @@ export function accountBalanceExport(date) {		@@ -7,3 +7,10 @@ export function accountBalanceExport(date) {
7	responseType: 'arraybuffer',	7	responseType: 'arraybuffer',
8	})	8	})
9	}	9	}
		10	+export function currentAccountDetailsExport(date) {
		11	+ return request({
		12	+ url: `${context.portal}/wCurrent/v1/curAccBalDetExport?date=${date}`,
		13	+ method: 'get',
		14	+ responseType: 'arraybuffer',
		15	+ })
		16	+}
	@@ -8,4 +8,11 @@ export function transactionDetailsExport(date) {		@@ -8,4 +8,11 @@ export function transactionDetailsExport(date) {
8	responseType: 'arraybuffer',	8	responseType: 'arraybuffer',
9	})	9	})
10	}	10	}
		11	+export function currentAccountDetailsExport(date) {
		12	+ return request({
		13	+ url: `${context.portal}/wCurrent/v1/curAccBalDetExport?date=${date}`,
		14	+ method: 'get',
		15	+ responseType: 'arraybuffer',
		16	+ })
		17	+}
11		18
@@ -0,0 +1,68 @@		@@ -0,0 +1,68 @@
	1	+<template>
	2	+ <div style="display: inline-block;">
	3	+ <el-button @click="onClick" size="mini">活期账户余额明细导出</el-button>
	4	+ <el-dialog title="活期账户余额明细导出" :visible.sync="dialogVisible" width="30%">
	5	+ <el-form>
	6	+ <el-form-item label="日期">
	7	+ <el-date-picker v-model="date" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
	8	+ style="width: calc(100% - 80px);"></el-date-picker>
	9	+ </el-form-item>
	10	+ </el-form>
	11	+ <span slot="footer">
	12	+ <el-button @click="dialogVisible = false">取消</el-button>
	13	+ <el-button type="primary" @click="onSubmit">导出</el-button>
	14	+ </span>
	15	+ </el-dialog>
	16	+ </div>
	17	+</template>
	18	+<script>
	19	+
	20	+import { currentAccountDetailsExport } from '@/api/service/current'
	21	+
	22	+export default {
	23	+ data() {
	24	+ return {
	25	+ dialogVisible: false,
	26	+ date: null
	27	+ };
	28	+ },
	29	+ created() {
	30	+ let today = new Date();
	31	+ today.setDate(today.getDate() - 1);
	32	+ let year = today.getFullYear();
	33	+ let month = ("0" + (today.getMonth() + 1)).slice(-2);
	34	+ let day = ("0" + today.getDate()).slice(-2);
	35	+ this.date = year + '-' + month + '-' + day;
	36	+ },
	37	+ methods: {
	38	+ onClick() {
	39	+ this.dialogVisible = true;
	40	+ },
	41	+ onSubmit() {
	42	+ if (!this.date) {this.$message.error('请选择日期！');return false;}
	43	+ currentAccountDetailsExport(this.date).then(_ref => {
	44	+ let {data, headers} = _ref;
	45	+ // 附件下载
	46	+ const blob = new Blob([data]);
	47	+ // 附件下载
	48	+ const fileName = decodeURIComponent(headers['content-disposition'].split(';')[1].split('filename=')[1]);
	49	+ saveAs(blob, fileName);
	50	+ }).catch(err => {
	51	+ this.$message.error(`模板下载失败：${err}`);
	52	+ });
	53	+ }
	54	+ }
	55	+}
	56	+</script>
	57	+
	58	+<style scoped lang='scss'>
	59	+::v-deep {
	60	+ .el-dialog__footer {
	61	+ text-align: center !important;
	62	+
	63	+ .el-button {
	64	+ margin-left: 20px;
	65	+ }
	66	+ }
	67	+}
	68	+</style>
@@ -0,0 +1,40 @@		@@ -0,0 +1,40 @@
	1	+// 日期格式化
	2	+export function parseTime(time, pattern) {
	3	+ if (arguments.length === 0 \|\| !time) {
	4	+ return null
	5	+ }
	6	+ const format = pattern \|\| '{y}-{m}-{d} {h}:{i}:{s}'
	7	+ let date
	8	+ if (typeof time === 'object') {
	9	+ date = time
	10	+ } else {
	11	+ if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
	12	+ time = parseInt(time)
	13	+ } else if (typeof time === 'string') {
	14	+ time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
	15	+ }
	16	+ if ((typeof time === 'number') && (time.toString().length === 10)) {
	17	+ time = time * 1000
	18	+ }
	19	+ date = new Date(time)
	20	+ }
	21	+ const formatObj = {
	22	+ y: date.getFullYear(),
	23	+ m: date.getMonth() + 1,
	24	+ d: date.getDate(),
	25	+ h: date.getHours(),
	26	+ i: date.getMinutes(),
	27	+ s: date.getSeconds(),
	28	+ a: date.getDay()
	29	+ }
	30	+ const time_str = format.replace(/{(y\|m\|d\|h\|i\|s\|a)+}/g, (result, key) => {
	31	+ let value = formatObj[key]
	32	+ // Note: getDay() returns 0 on Sunday
	33	+ if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
	34	+ if (result.length > 0 && value < 10) {
	35	+ value = '0' + value
	36	+ }
	37	+ return value \|\| 0
	38	+ })
	39	+ return time_str
	40	+}