From bf55267b1ecb2b3d3854c734eb9f8bb3272816ad Mon Sep 17 00:00:00 2001
From: "@zhu-yuefeng" <761784171@qq.com>
Date: Thu, 12 Oct 2023 17:12:58 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E5=85=B6=E4=BB=96=E6=A1=A3=E6=A1=88?=
=?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ea/electronicOther/index.vue | 64 ++++++++++++++++++++++++--
1 file changed, 59 insertions(+), 5 deletions(-)
diff --git a/src/views/ea/electronicOther/index.vue b/src/views/ea/electronicOther/index.vue
index 56496c19..2b1b2772 100644
--- a/src/views/ea/electronicOther/index.vue
+++ b/src/views/ea/electronicOther/index.vue
@@ -6,6 +6,9 @@
+
+
+
@@ -27,14 +30,17 @@
+
-
+
+
@@ -44,12 +50,24 @@
+
+
+
+
+
+
@@ -76,6 +94,7 @@
+
@@ -86,13 +105,18 @@
+
+
+
+
+
@@ -113,6 +137,9 @@
+
+
+
@@ -130,14 +157,17 @@
+
-
+
@@ -147,12 +177,24 @@
+
+
+
+
+
+
@@ -193,19 +235,25 @@ export default {
pageNo: 1,
pageSize: 10,
name: null,
+ flowCode: null,
source: null,
year: null,
period: null,
businessType: null,
createTime: [],
createBy: null,
+ companyId: null,
company: null,
delStatus: null,
suffix: null,
fileUrl: null,
fileAp: null,
+ flowId: null,
note: null,
+ deptId: null,
deptName: null,
+ recordId: null,
+ userId: null,
archiveState: null,
},
// 表单参数
@@ -239,18 +287,24 @@ export default {
this.form = {
id: undefined,
name: undefined,
+ flowCode: undefined,
source: undefined,
year: undefined,
period: undefined,
businessType: undefined,
createBy: undefined,
+ companyId: undefined,
company: undefined,
delStatus: undefined,
suffix: undefined,
fileUrl: undefined,
fileAp: undefined,
+ flowId: undefined,
note: undefined,
+ deptId: undefined,
deptName: undefined,
+ recordId: undefined,
+ userId: undefined,
archiveState: undefined,
};
this.resetForm("form");
From 1b083f322ce3ef11e1e98ac1d5ba1ac37bef1ab5 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Thu, 12 Oct 2023 17:52:19 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=93=B6=E8=A1=8C?=
=?UTF-8?q?=E5=9B=9E=E5=8D=95=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/common/index.js | 11 +-
src/components/UploadBankSlip/index.vue | 218 ++++++++++++++++++++++++
src/views/accounting/bankSlip/index.vue | 41 +++--
3 files changed, 259 insertions(+), 11 deletions(-)
create mode 100644 src/components/UploadBankSlip/index.vue
diff --git a/src/api/common/index.js b/src/api/common/index.js
index ba7f73d6..ab2d1be3 100644
--- a/src/api/common/index.js
+++ b/src/api/common/index.js
@@ -18,11 +18,20 @@ export function uploadFileApi(data) {
})
}
-// 文件上传
+// 发票上传
export function uploadInvoiceApi(data) {
return request({
url: '/accounting/invoices/identify',
method: 'post',
data: data
})
+}
+
+// 银行回单上传
+export function uploadBankSlipApi(data) {
+ return request({
+ url: '/archives/bank-slip/bankReceipt/identify',
+ method: 'post',
+ data: data
+ })
}
\ No newline at end of file
diff --git a/src/components/UploadBankSlip/index.vue b/src/components/UploadBankSlip/index.vue
new file mode 100644
index 00000000..daf2bd80
--- /dev/null
+++ b/src/components/UploadBankSlip/index.vue
@@ -0,0 +1,218 @@
+
+
+
+
+
+
+
+
+
+
{{ pdfName }}
+
+
+
+
+
{{ ofdName }}
+
+
+
+
+
+
+
+
+
+
+
支持.jpeg, .jpg, .png格式上传
+
+ 银行回单识别
+
+
+
+
+
+
+
+
+
diff --git a/src/views/accounting/bankSlip/index.vue b/src/views/accounting/bankSlip/index.vue
index 3e9abf81..8e0b02ae 100644
--- a/src/views/accounting/bankSlip/index.vue
+++ b/src/views/accounting/bankSlip/index.vue
@@ -284,7 +284,7 @@
width="1000px"
append-to-body
>
-
将文件拖到此处,或点击上传
-
-
+ -->
+
+
+
+
+
+
+ 银行回单信息
@@ -612,7 +616,7 @@ import { listUser } from "@/api/system/user";
export default {
name: "BankSlip",
- components: {},
+ components: { UploadBankSlip: () => import("@/components/UploadBankSlip") },
data() {
return {
// 遮罩层
@@ -701,6 +705,22 @@ export default {
this.getUserList();
},
methods: {
+ // 上传文件事件
+ handleImg(list) {
+ this.fileList = list;
+ this.reset();
+ },
+ handleScan(form) {
+ console.log(form);
+ this.form = form;
+ this.form.adverseCompany = form.adverseCompany.slice(9, -2);
+ this.form.bank = form.bank.slice(9, -2);
+ this.form.digest = form.digest.slice(9, -2);
+ this.form.myCompany = form.myCompany.slice(9, -2);
+ this.form.purpose = form.purpose.slice(9, -2);
+ this.form.receiptNum = form.receiptNum.slice(9, -2);
+ this.form.serialNum = form.serialNum.slice(9, -2);
+ },
/** 查询列表 */
getList() {
this.loading = true;
@@ -822,6 +842,7 @@ export default {
this.reset();
this.open = true;
this.title = "添加银行回单";
+ this.fileList = [];
},
// 上传成功的函数
handleSuccess(res) {
From a599fe20a276177f5577793ea6196b42ba1a3aca Mon Sep 17 00:00:00 2001
From: chiyilin <2449182606@qq.com>
Date: Fri, 13 Oct 2023 09:38:57 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?=
=?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/utils/dict.js | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 5294adea..1661d5f0 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -145,6 +145,9 @@ export const DICT_TYPE = {
ACCOUNTING_VOUCHER_TYPE: 'accounting_voucher_type',
//银行回单认款状态
BANK_CONFIRM_STATUS: 'bank_confirm_status',
+ //业务类型
+ BUSINESS_TYPE: 'business_type',
+
}
From 44881935e30272d91e13686d9f439f5ae93729f5 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Fri, 13 Oct 2023 09:39:28 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=A4=B1=E8=B4=A5?=
=?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/UploadBankSlip/index.vue | 23 +++++++++++++++++------
src/components/UploadInvoice/index.vue | 17 +++++++++++------
2 files changed, 28 insertions(+), 12 deletions(-)
diff --git a/src/components/UploadBankSlip/index.vue b/src/components/UploadBankSlip/index.vue
index daf2bd80..f11ab463 100644
--- a/src/components/UploadBankSlip/index.vue
+++ b/src/components/UploadBankSlip/index.vue
@@ -8,6 +8,7 @@
:file-list="fileList"
:on-change="onUploadChange"
:before-upload="beforeFileUpload"
+ :on-error="handleUploadError"
action="#"
:accept="imgType"
list-type="picture-card"
@@ -161,12 +162,18 @@ export default {
let FormDatas = new FormData();
FormDatas.append("multipartFile", file.raw);
this.$modal.loading("正在上传,请稍候...");
- uploadBankSlipApi(FormDatas).then((res) => {
- this.invoiceForm = res.data;
- this.fileList.push({ name: file.name, url: res.data.fileUrl }); //成功过后手动将文件添加到展示列表里
- this.$emit("onConfirm", this.fileList);
- this.$modal.closeLoading();
- });
+ uploadBankSlipApi(FormDatas)
+ .then((res) => {
+ this.invoiceForm = res.data;
+ this.fileList.push({ name: file.name, url: res.data.fileUrl }); //成功过后手动将文件添加到展示列表里
+ this.$emit("onConfirm", this.fileList);
+ this.$modal.closeLoading();
+ })
+ .catch(() => {
+ this.fileList = [];
+ this.$modal.closeLoading();
+ this.$message.error("上传失败");
+ });
},
closeImgViewer() {
this.dialogVisible = false;
@@ -181,6 +188,10 @@ export default {
this.dialogVisible = true;
}
},
+ handleUploadError() {
+ this.$modal.closeLoading();
+ this.$message.error("上传失败");
+ },
// 发票识别
handleScan() {
if (this.fileList.length) {
diff --git a/src/components/UploadInvoice/index.vue b/src/components/UploadInvoice/index.vue
index 3d48e152..eea67420 100644
--- a/src/components/UploadInvoice/index.vue
+++ b/src/components/UploadInvoice/index.vue
@@ -164,12 +164,17 @@ export default {
let FormDatas = new FormData();
FormDatas.append("multipartFile", file.raw);
this.$modal.loading("正在上传,请稍候...");
- uploadInvoiceApi(FormDatas).then((res) => {
- this.invoiceForm = res.data;
- this.fileList.push({ name: file.name, url: res.data.fileUrl }); //成功过后手动将文件添加到展示列表里
- this.$emit("onConfirm", this.fileList);
- this.$modal.closeLoading();
- });
+ uploadInvoiceApi(FormDatas)
+ .then((res) => {
+ this.invoiceForm = res.data;
+ this.fileList.push({ name: file.name, url: res.data.fileUrl }); //成功过后手动将文件添加到展示列表里
+ this.$emit("onConfirm", this.fileList);
+ this.$modal.closeLoading();
+ })
+ .catch(() => {
+ this.fileList = [];
+ this.$modal.closeLoading();
+ });
},
closeImgViewer() {
this.dialogVisible = false;
From 5080b740e282b05762b1837101cc8f4ce00c6ea9 Mon Sep 17 00:00:00 2001
From: chiyilin <2449182606@qq.com>
Date: Fri, 13 Oct 2023 09:39:45 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/ea/electronicAttachment/index.vue | 416 ++++++++++++++++
src/views/ea/electronicConsultation/index.vue | 425 +++++++++++------
src/views/ea/electronicContracts/index.vue | 2 +-
.../ea/electronicCustomerComplaint/index.vue | 443 ++++++++++++------
4 files changed, 1001 insertions(+), 285 deletions(-)
create mode 100644 src/views/ea/electronicAttachment/index.vue
diff --git a/src/views/ea/electronicAttachment/index.vue b/src/views/ea/electronicAttachment/index.vue
new file mode 100644
index 00000000..871700b9
--- /dev/null
+++ b/src/views/ea/electronicAttachment/index.vue
@@ -0,0 +1,416 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+ 新增
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.fileUrl }}
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ 将文件拖到此处,或点击上传
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/ea/electronicConsultation/index.vue b/src/views/ea/electronicConsultation/index.vue
index 5a000135..5ba16fca 100644
--- a/src/views/ea/electronicConsultation/index.vue
+++ b/src/views/ea/electronicConsultation/index.vue
@@ -2,72 +2,105 @@
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
+
+
+
+
+
-
+
+
+
+
-
+
+
+
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
@@ -80,129 +113,226 @@
新增
+ v-hasPermi="['ea:electronic-consultation:create']">新增
+
- 导出
+ 导出
+
-
-
-
+
+
+
{{ parseTime(scope.row.createTime) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
{{ parseTime(scope.row.consultationTime) }}
-
-
+
+
{{ parseTime(scope.row.handleTime) }}
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.recordTime) }}
+
+
+
+
+
+
+
+
+
修改
+ v-hasPermi="['ea:electronic-consultation:update']">修改
+
删除
+ v-hasPermi="['ea:electronic-consultation:delete']">删除
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 请选择字典生成
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+