Merge remote-tracking branch 'origin/main'

main
JilingLee 1 year ago
commit 5b03925213

@ -0,0 +1,54 @@
import request from '@/utils/request'
// 创建审批流程
export function createFlow(data) {
return request({
url: '/archives/flow/create',
method: 'post',
data: data
})
}
// 更新审批流程
export function updateFlow(data) {
return request({
url: '/archives/flow/update',
method: 'put',
data: data
})
}
// 删除审批流程
export function deleteFlow(id) {
return request({
url: '/archives/flow/delete?id=' + id,
method: 'delete'
})
}
// 获得审批流程
export function getFlow(id) {
return request({
url: '/archives/flow/get?id=' + id,
method: 'get'
})
}
// 获得审批流程分页
export function getFlowPage(query) {
return request({
url: '/archives/flow/page',
method: 'get',
params: query
})
}
// 导出审批流程 Excel
export function exportFlowExcel(query) {
return request({
url: '/archives/flow/export-excel',
method: 'get',
params: query,
responseType: 'blob'
})
}

@ -9,16 +9,6 @@
v-show="showSearch"
label-width="68px"
>
<el-form-item label="会计年度" prop="year">
<el-date-picker
format="yyyy年"
v-model="queryParams.year"
value-format="yyyy"
type="year"
placeholder="请选择会计年度"
>
</el-date-picker>
</el-form-item>
<el-form-item label="会计期间" prop="period">
<el-date-picker
popper-class="due_month"
@ -30,6 +20,15 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="业务组织" prop="company">
<el-input
v-model="queryParams.company"
placeholder="请输入业务组织"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
@ -295,20 +294,9 @@ export default {
{ required: true, message: "请输入会计期间", trigger: "blur" },
],
},
tableData: [
{
type: "总账",
},
{
type: "明细账",
},
{
type: "日记账",
},
],
uploadUrl:
process.env.VUE_APP_BASE_API +
"/admin-api//archives/accounting-book/upload", //
"/admin-api/archives/accounting-book/upload", //
headers: { Authorization: "Bearer " + getAccessToken() }, //
type0: 0,
type1: 1,

@ -0,0 +1,372 @@
<template>
<div class="app-container">
<!-- 搜索工作栏 -->
<el-form
:model="queryParams"
ref="queryForm"
size="small"
:inline="true"
v-show="showSearch"
label-width="128px"
>
<el-form-item label="OA/ERP流程编号" prop="flowCode">
<el-input
v-model="queryParams.flowCode"
placeholder="请输入OA/ERP流程编号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="凭证号" prop="voucherNum">
<el-input
v-model="queryParams.voucherNum"
placeholder="请输入凭证号"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
>
<el-button icon="el-icon-refresh" @click="resetQuery"></el-button>
</el-form-item>
</el-form>
<!-- 操作工具栏 -->
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="el-icon-plus"
size="mini"
@click="handleAdd"
v-hasPermi="['archives:flow:create']"
>新增</el-button
>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="el-icon-download"
size="mini"
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['archives:flow:export']"
>导出</el-button
>
</el-col>
<right-toolbar
:showSearch.sync="showSearch"
@queryTable="getList"
></right-toolbar>
</el-row>
<!-- 列表 -->
<el-table v-loading="loading" :data="list">
<!-- <el-table-column label="主键Id" align="center" prop="id" /> -->
<el-table-column label="OA/ERP流程编号" align="center" prop="flowCode" />
<el-table-column label="凭证号" align="center" prop="voucherNum" />
<el-table-column label="业务类型" align="center" prop="businessType" />
<el-table-column label="业务实体" align="center" prop="company" />
<el-table-column label="删除状态" align="center" prop="delStatus" />
<el-table-column label="文件后缀" align="center" prop="suffix" />
<el-table-column label="文件地址" align="center" prop="fileUrl" />
<el-table-column label="绝对路径" align="center" prop="fileAp" />
<el-table-column label="流程号" align="center" prop="flowId" />
<el-table-column label="摘要" align="center" prop="note" />
<el-table-column label="部门名称" align="center" prop="deptName" />
<el-table-column label="归档状态" align="center" prop="archiveState" />
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template v-slot="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<el-table-column
label="操作"
align="center"
class-name="small-padding fixed-width"
>
<template v-slot="scope">
<el-button
size="mini"
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
v-hasPermi="['archives:flow:update']"
>修改</el-button
>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
v-hasPermi="['archives:flow:delete']"
>删除</el-button
>
</template>
</el-table-column>
</el-table>
<!-- 分页组件 -->
<pagination
v-show="total > 0"
:total="total"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
<!-- 对话框(添加 / 修改) -->
<el-dialog
:title="title"
:visible.sync="open"
width="500px"
v-dialogDrag
append-to-body
>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="OA/ERP流程编号" prop="flowCode">
<el-input
v-model="form.flowCode"
placeholder="请输入OA/ERP流程编号"
/>
</el-form-item>
<el-form-item label="凭证号" prop="voucherNum">
<el-input v-model="form.voucherNum" placeholder="请输入凭证号" />
</el-form-item>
<el-form-item label="业务类型" prop="businessType">
<el-select v-model="form.businessType" placeholder="请选择业务类型">
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
<el-form-item label="业务实体" prop="company">
<el-input v-model="form.company" placeholder="请输入业务实体" />
</el-form-item>
<el-form-item label="删除状态" prop="delStatus">
<el-radio-group v-model="form.delStatus">
<el-radio label="1">请选择字典生成</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="文件后缀" prop="suffix">
<el-input v-model="form.suffix" placeholder="请输入文件后缀" />
</el-form-item>
<el-form-item label="文件地址" prop="fileUrl">
<el-input v-model="form.fileUrl" placeholder="请输入文件地址" />
</el-form-item>
<el-form-item label="绝对路径" prop="fileAp">
<el-input v-model="form.fileAp" placeholder="请输入绝对路径" />
</el-form-item>
<el-form-item label="流程号" prop="flowId">
<el-input v-model="form.flowId" placeholder="请输入流程号" />
</el-form-item>
<el-form-item label="摘要" prop="note">
<el-input v-model="form.note" placeholder="请输入摘要" />
</el-form-item>
<el-form-item label="部门名称" prop="deptName">
<el-input v-model="form.deptName" placeholder="请输入部门名称" />
</el-form-item>
<el-form-item label="归档状态" prop="archiveState">
<el-input v-model="form.archiveState" placeholder="请输入归档状态" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
<el-button @click="cancel"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import {
createFlow,
updateFlow,
deleteFlow,
getFlow,
getFlowPage,
exportFlowExcel,
} from "@/api/accounting/flow";
export default {
name: "Flow",
components: {},
data() {
return {
//
loading: true,
//
exportLoading: false,
//
showSearch: true,
//
total: 0,
//
list: [],
//
title: "",
//
open: false,
//
queryParams: {
pageNo: 1,
pageSize: 10,
flowCode: null,
voucherId: null,
voucherNum: null,
businessId: null,
businessType: null,
createTime: [],
companyId: null,
company: null,
delStatus: null,
suffix: null,
fileUrl: null,
fileAp: null,
flowId: null,
note: null,
deptId: null,
deptName: null,
archiveId: null,
archiveState: null,
},
//
form: {},
//
rules: {},
};
},
created() {
this.getList();
},
methods: {
/** 查询列表 */
getList() {
this.loading = true;
//
getFlowPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
});
},
/** 取消按钮 */
cancel() {
this.open = false;
this.reset();
},
/** 表单重置 */
reset() {
this.form = {
id: undefined,
flowCode: undefined,
voucherId: undefined,
voucherNum: undefined,
businessId: undefined,
businessType: undefined,
companyId: undefined,
company: undefined,
delStatus: undefined,
suffix: undefined,
fileUrl: undefined,
fileAp: undefined,
flowId: undefined,
note: undefined,
deptId: undefined,
deptName: undefined,
archiveId: undefined,
archiveState: undefined,
};
this.resetForm("form");
},
/** 搜索按钮操作 */
handleQuery() {
this.queryParams.pageNo = 1;
this.getList();
},
/** 重置按钮操作 */
resetQuery() {
this.resetForm("queryForm");
this.handleQuery();
},
/** 新增按钮操作 */
handleAdd() {
this.reset();
this.open = true;
this.title = "添加审批流程";
},
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
getFlow(id).then((response) => {
this.form = response.data;
this.open = true;
this.title = "修改审批流程";
});
},
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (!valid) {
return;
}
//
if (this.form.id != null) {
updateFlow(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
});
return;
}
//
createFlow(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
});
},
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
this.$modal
.confirm('是否确认删除审批流程编号为"' + id + '"的数据项?')
.then(function () {
return deleteFlow(id);
})
.then(() => {
this.getList();
this.$modal.msgSuccess("删除成功");
})
.catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
//
let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
this.$modal
.confirm("是否确认导出所有审批流程数据项?")
.then(() => {
this.exportLoading = true;
return exportFlowExcel(params);
})
.then((response) => {
this.$download.excel(response, "审批流程.xls");
this.exportLoading = false;
})
.catch(() => {});
},
},
};
</script>

@ -9,24 +9,6 @@
v-show="showSearch"
label-width="98px"
>
<el-form-item label="报表文件名称" prop="name">
<el-input
v-model="queryParams.name"
placeholder="请输入报表文件名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="会计年度" prop="year">
<el-date-picker
format="yyyy年"
v-model="queryParams.year"
value-format="yyyy"
type="year"
placeholder="请选择会计年度"
>
</el-date-picker>
</el-form-item>
<el-form-item label="会计期间" prop="period">
<el-date-picker
popper-class="due_month"
@ -38,6 +20,22 @@
>
</el-date-picker>
</el-form-item>
<el-form-item label="业务组织" prop="company">
<el-input
v-model="queryParams.company"
placeholder="请输入业务组织"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="报表类型" prop="type">
<el-input
v-model="queryParams.type"
placeholder="请输入报表类型"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" @click="handleQuery"
>搜索</el-button
@ -178,6 +176,65 @@
</el-date-picker>
</el-form-item>
</el-form>
<table id="table_order">
<thead>
<tr>
<th>类型</th>
<th>文件</th>
</tr>
</thead>
<tbody>
<tr>
<td>资产负债表</td>
<td>
<el-upload
ref="upload"
:multiple="false"
:action="uploadUrl + '?type=' + type0"
:headers="headers"
:file-list="fileList"
:auto-upload="false"
:on-success="test"
>
<div class="el-upload__text">点击上传或将文件拖拽到此处</div>
</el-upload>
</td>
</tr>
<tr>
<td>现金流量表</td>
<td>
<el-upload
ref="upload1"
:multiple="false"
:action="uploadUrl + '?type=' + type1"
:headers="headers"
:file-list="fileList1"
:auto-upload="false"
:on-success="test1"
>
<div class="el-upload__text">点击上传或将文件拖拽到此处</div>
</el-upload>
</td>
</tr>
<tr>
<td>利润表</td>
<td>
<el-upload
ref="upload2"
:multiple="false"
:action="uploadUrl + '?type=' + type2"
:headers="headers"
:file-list="fileList2"
:auto-upload="false"
:on-success="test2"
>
<div class="el-upload__text">点击上传或将文件拖拽到此处</div>
</el-upload>
</td>
</tr>
</tbody>
</table>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm"> </el-button>
@ -190,12 +247,13 @@
<script>
import {
createAccountingReport,
updateAccountingReport,
deleteAccountingReport,
getAccountingReport,
getAccountingReportPage,
exportAccountingReportExcel,
} from "@/api/accounting/report";
import { getAccessToken } from "@/utils/auth";
import { getOrganizationPage } from "@/api/setting/organization";
export default {
name: "AccountingReport",
@ -214,6 +272,9 @@ export default {
list: [],
//
title: "",
fileList: [],
fileList1: [],
fileList2: [],
//
open: false,
//
@ -238,11 +299,28 @@ export default {
//
form: {},
//
rules: {},
rules: {
// company: [
// { required: true, message: "", trigger: "blur" },
// ],
year: [{ required: true, message: "请输入会计年度", trigger: "blur" }],
period: [
{ required: true, message: "请输入会计期间", trigger: "blur" },
],
},
uploadUrl:
process.env.VUE_APP_BASE_API +
"/admin-api//archives/accounting-report/upload", //
headers: { Authorization: "Bearer " + getAccessToken() }, //
type0: 0,
type1: 1,
type2: 2,
organizationList: [],
};
},
created() {
this.getList();
this.getOrganizationList();
},
methods: {
/** 查询列表 */
@ -279,6 +357,9 @@ export default {
deptName: undefined,
};
this.resetForm("form");
this.fileList = [];
this.fileList1 = [];
this.fileList2 = [];
},
/** 搜索按钮操作 */
handleQuery() {
@ -306,6 +387,12 @@ export default {
this.title = "修改会计报表";
});
},
//
getOrganizationList() {
getOrganizationPage().then((response) => {
this.organizationList = response.data.list;
});
},
//
handleCompanyChange(val) {
var data = this.organizationList.find((item) => item.id == val);
@ -316,24 +403,34 @@ export default {
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
if (!valid) {
return;
if (valid) {
//
this.$refs.upload.submit();
this.$refs.upload1.submit();
this.$refs.upload2.submit();
}
//
if (this.form.id != null) {
updateAccountingReport(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
});
},
test(response, file, fileList) {
console.log(response, file, fileList);
createAccountingReport(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
return;
}
//
},
test1(response, file, fileList) {
console.log(response, file, fileList);
createAccountingReport(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
});
},
test2(response, file, fileList) {
console.log(response, file, fileList);
createAccountingReport(this.form).then((response) => {
this.open = false;
this.getList();
});
},
/** 删除按钮操作 */
@ -371,3 +468,21 @@ export default {
},
};
</script>
<style scoped>
table {
border: 1px solid #000;
border-collapse: collapse;
text-align: center;
margin: auto;
width: 500px;
}
table tr td {
border: 1px solid #000;
padding: 10px;
}
table tr th {
border: 1px solid #000;
background-color: #cccccc;
}
</style>

Loading…
Cancel
Save