-
+
+
+
-
+
-
空
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -544,6 +601,8 @@ import {
downloadXml,
getBankSlipPageTime,
} from "@/api/accounting/bankSlip";
+import { getAccessToken, getTenantId } from "@/utils/auth";
+import { listUser } from "@/api/system/user";
export default {
name: "BankSlip",
@@ -565,6 +624,7 @@ export default {
// 是否显示弹出层
open: false,
open1: false,
+ open2: false,
// 查询参数
queryParams: {
pageNo: 1,
@@ -612,15 +672,25 @@ export default {
password: null,
inputPassword: null,
},
+ userOptions: [], //用户数据
// 表单参数
form: {},
+ form1: {},
// 表单校验
rules: {},
+ fileList: [], // 文件列表
+ uploadUrl:
+ process.env.VUE_APP_BASE_API + "/admin-api/archives/flow/upload", // 上传地址地址
+ headers: {
+ Authorization: "Bearer " + getAccessToken(),
+ "tenant-id": getTenantId(),
+ }, // 设置上传的请求头
time: "",
};
},
created() {
this.getList();
+ this.getUserList();
},
methods: {
/** 查询列表 */
@@ -643,6 +713,12 @@ export default {
this.loading = false;
});
},
+ //获取用户
+ getUserList() {
+ listUser().then((response) => {
+ this.userOptions = response.data.list;
+ });
+ },
handleOneMonth() {
this.time = 1;
this.getList2();
@@ -664,6 +740,10 @@ export default {
cancel1() {
this.open1 = false;
},
+ /** 取消按钮 */
+ cancel2() {
+ this.open2 = false;
+ },
/** 表单重置 */
reset() {
this.form = {
@@ -708,6 +788,13 @@ export default {
archiveId: undefined,
archiveState: undefined,
password: undefined,
+ staffId: undefined,
+ staffName: undefined,
+ };
+ this.form1 = {
+ id: undefined,
+ staffId: undefined,
+ staffName: undefined,
};
this.resetForm("form");
},
@@ -737,6 +824,23 @@ export default {
this.title = "修改银行回单";
});
},
+ /** 认款按钮操作 */
+ handleComfirm(val) {
+ this.form1.id = val.id;
+ this.open2 = true;
+ },
+ handleSelectUser(val) {
+ this.form1.staffId = val.id;
+ this.form1.staffName = val.username;
+ },
+ submitForm2() {
+ console.log(this.form1);
+ updateBankSlip(this.form1).then((response) => {
+ this.$modal.msgSuccess("认款成功");
+ this.open2 = false;
+ this.getList();
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
diff --git a/src/views/accounting/flow/index.vue b/src/views/accounting/flow/index.vue
index 6148c18f..fa35c57d 100644
--- a/src/views/accounting/flow/index.vue
+++ b/src/views/accounting/flow/index.vue
@@ -170,14 +170,6 @@
style="margin-top: 20px"
>
-
-
-
-
-
-
-
-
-
-
-
-
@@ -300,7 +285,6 @@ export default {
// 是否显示弹出层
open: false,
open1: false,
- fileList: [],
imgType: ".jpeg, .jpg, .png",
// 查询参数
queryParams: {
diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue
index 7b4bc287..da840549 100644
--- a/src/views/accounting/voucher/index.vue
+++ b/src/views/accounting/voucher/index.vue
@@ -313,6 +313,7 @@
width: 240px;
height: 220px;
cursor: pointer;
+ margin: 0 10px;
"
>
@@ -328,6 +329,7 @@
width: 240px;
height: 220px;
cursor: pointer;
+ margin: 0 10px;
"
>
@@ -365,6 +367,7 @@
width: 240px;
height: 220px;
cursor: pointer;
+ margin: 0 10px;
"
>
From ed156c4be3fcda32111887edcb791d265af436f2 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Tue, 10 Oct 2023 15:25:52 +0800
Subject: [PATCH 08/15] =?UTF-8?q?=E9=A1=B5=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/accounting/bankSlip/index.vue | 11 ++++++++---
src/views/accounting/flow/index.vue | 5 +++--
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/views/accounting/bankSlip/index.vue b/src/views/accounting/bankSlip/index.vue
index e9720d3b..23470e89 100644
--- a/src/views/accounting/bankSlip/index.vue
+++ b/src/views/accounting/bankSlip/index.vue
@@ -282,7 +282,6 @@
:on-success="handleSuccess"
name="multipartFile"
:multiple="false"
- :accept="imgType"
>
将文件拖到此处,或点击上传
@@ -739,10 +738,12 @@ export default {
/** 取消按钮 */
cancel1() {
this.open1 = false;
+ this.reset();
},
/** 取消按钮 */
cancel2() {
this.open2 = false;
+ this.reset();
},
/** 表单重置 */
reset() {
@@ -788,8 +789,6 @@ export default {
archiveId: undefined,
archiveState: undefined,
password: undefined,
- staffId: undefined,
- staffName: undefined,
};
this.form1 = {
id: undefined,
@@ -814,6 +813,10 @@ export default {
this.open = true;
this.title = "添加银行回单";
},
+ // 上传成功的函数
+ handleSuccess(res) {
+ console.log(res);
+ },
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
@@ -826,6 +829,7 @@ export default {
},
/** 认款按钮操作 */
handleComfirm(val) {
+ this.reset();
this.form1.id = val.id;
this.open2 = true;
},
@@ -866,6 +870,7 @@ export default {
},
//下载元数据
handleDownloadData() {
+ this.reset();
this.open1 = true;
this.queryParams.inputPassword = null;
},
diff --git a/src/views/accounting/flow/index.vue b/src/views/accounting/flow/index.vue
index fa35c57d..b3902ed0 100644
--- a/src/views/accounting/flow/index.vue
+++ b/src/views/accounting/flow/index.vue
@@ -94,7 +94,6 @@
-
Date: Tue, 10 Oct 2023 15:55:52 +0800
Subject: [PATCH 09/15] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E5=9C=A8=E7=BA=BF=E9=A2=84=E8=A7=88=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.local | 7 +-
.env.prod | 3 +
src/views/accounting/attachment/index.vue | 8 +-
src/views/accounting/book/index.vue | 16 +-
src/views/accounting/invoices/index.vue | 6 +-
src/views/accounting/other/index.vue | 6 +-
src/views/ea/electronicContracts/index.vue | 597 ++++++++++++++-------
7 files changed, 433 insertions(+), 210 deletions(-)
diff --git a/.env.local b/.env.local
index 3e21c0ed..44c09a2f 100644
--- a/.env.local
+++ b/.env.local
@@ -5,8 +5,8 @@ ENV = 'development'
VUE_APP_TITLE = 链友融财务数字一体化信息系统
# 芋道管理系统/本地环境
-# VUE_APP_BASE_API = '/proxy-api'
-VUE_APP_BASE_API = 'http://127.0.0.1:48080'
+VUE_APP_BASE_API = '/proxy-api'
+# VUE_APP_BASE_API = 'http://127.0.0.1:48080'
# 路由懒加载
VUE_CLI_BABEL_TRANSPILE_MODULES = true
@@ -22,3 +22,6 @@ VUE_APP_DOC_ENABLE = true
# 百度统计
VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+
+#线上预览
+VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
diff --git a/.env.prod b/.env.prod
index 4d5d31e8..68059cd2 100644
--- a/.env.prod
+++ b/.env.prod
@@ -23,3 +23,6 @@ VUE_APP_DOC_ENABLE = false
# 百度统计
VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
+
+#线上预览
+VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
diff --git a/src/views/accounting/attachment/index.vue b/src/views/accounting/attachment/index.vue
index 8acf8d42..c21ac4c6 100644
--- a/src/views/accounting/attachment/index.vue
+++ b/src/views/accounting/attachment/index.vue
@@ -310,9 +310,11 @@ export default {
* @param fileUrl
*/
openLink(fileUrl) {
- const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
- this.base64Encode(fileUrl)
- )}`;
+ console.log(process.env.VUE_APP_ONLINE_API);
+ // const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
+ const url =
+ process.env.VUE_APP_ONLINE_API +
+ `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
window.open(url);
},
/** 取消按钮 */
diff --git a/src/views/accounting/book/index.vue b/src/views/accounting/book/index.vue
index f3b0d706..14ee386d 100644
--- a/src/views/accounting/book/index.vue
+++ b/src/views/accounting/book/index.vue
@@ -79,11 +79,11 @@
-
+
@@ -359,12 +359,12 @@ export default {
// * 文件预览
// * @param fileUrl
// */
- // openLink(fileUrl) {
- // const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
- // this.base64Encode(fileUrl)
- // )}`;
- // window.open(url);
- // },
+ openLink(fileUrl) {
+ const url =
+ process.env.VUE_APP_ONLINE_API +
+ `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
+ window.open(url);
+ },
/** 查询列表 */
getList() {
this.loading = true;
diff --git a/src/views/accounting/invoices/index.vue b/src/views/accounting/invoices/index.vue
index 51f8222e..2f7545f1 100644
--- a/src/views/accounting/invoices/index.vue
+++ b/src/views/accounting/invoices/index.vue
@@ -918,9 +918,9 @@ export default {
* @param fileUrl
*/
openLink(fileUrl) {
- const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
- this.base64Encode(fileUrl)
- )}`;
+ const url =
+ process.env.VUE_APP_ONLINE_API +
+ `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
window.open(url);
},
handleClick(tab) {
diff --git a/src/views/accounting/other/index.vue b/src/views/accounting/other/index.vue
index 2664ef6a..6519d207 100644
--- a/src/views/accounting/other/index.vue
+++ b/src/views/accounting/other/index.vue
@@ -340,9 +340,9 @@ export default {
* @param fileUrl 地址
*/
openLink(fileUrl) {
- const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
- this.base64Encode(fileUrl)
- )}`;
+ const url =
+ process.env.VUE_APP_ONLINE_API +
+ `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
window.open(url);
},
/** 查询列表 */
diff --git a/src/views/ea/electronicContracts/index.vue b/src/views/ea/electronicContracts/index.vue
index fa104aa6..c4ebb880 100644
--- a/src/views/ea/electronicContracts/index.vue
+++ b/src/views/ea/electronicContracts/index.vue
@@ -1,67 +1,121 @@
-
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
+
+
-
+
-
+
-
-
+
+
-
-
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
- 搜索
+ 搜索
重置
@@ -116,70 +190,116 @@
- 新增
+ 新增
- 导出
+ 导出
-
+
-
-
-
+
+
{{ parseTime(scope.row.createTime) }}
-
+
-
-
-
+
+
+
-
+
-
-
+
+
{{ parseTime(scope.row.signDate) }}
-
-
+
+
-
+
{{ parseTime(scope.row.effectiveDate) }}
-
-
+
-
+
{{ parseTime(scope.row.expiryDate) }}
-
-
+
-
+
-
-
+
+
-
+
{{ scope.row.contractAttachment }}
@@ -202,42 +322,73 @@
-
+
-
-
+
+
-
+
-
-
+
-
-
+
+
-
+
-
+
-
- 修改
+ 修改
- 删除
+ 删除
-
+
@@ -272,49 +423,67 @@
-
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -322,53 +491,81 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
+
+
@@ -401,34 +598,52 @@
-
-
+
+
-
+
-
+
-
+
-
+
@@ -450,11 +665,11 @@ import {
deleteElectronicContracts,
getElectronicContracts,
getElectronicContractsPage,
- exportElectronicContractsExcel
+ exportElectronicContractsExcel,
} from "@/api/ea/electronicContracts/electronicContracts";
-import FileUpload from '@/components/FileUpload';
+import FileUpload from "@/components/FileUpload";
import ImagePreview from "@/components/ImagePreview";
-import Video from "@/components/VideoUpload"
+import Video from "@/components/VideoUpload";
import WxVideoPlayer from "@/views/mp/components/wx-video-play/main";
export default {
@@ -522,7 +737,7 @@ export default {
// 表单参数
form: {},
// 表单校验
- rules: {}
+ rules: {},
};
},
created() {
@@ -534,11 +749,11 @@ export default {
getList() {
this.loading = true;
// 执行查询
- getElectronicContractsPage(this.queryParams).then(response => {
+ getElectronicContractsPage(this.queryParams).then((response) => {
this.list = response.data.list;
this.total = response.data.total;
this.loading = false;
- console.log(this.list)
+ console.log(this.list);
});
},
/**
@@ -546,44 +761,43 @@ export default {
* @param fileUrl
*/
openLink(fileUrl) {
- const url = `http://139.224.253.31:48012/onlinePreview?url=${encodeURIComponent(
- this.base64Encode(fileUrl)
- )}`;
+ const url =
+ process.env.VUE_APP_ONLINE_API +
+ `/onlinePreview?url=${encodeURIComponent(this.base64Encode(fileUrl))}`;
window.open(url);
},
isImg(url) {
- let suffix = url.substring(url.lastIndexOf("."))
- let typeList = ['.jpg', '.png', '.gif', '.jpeg']
+ let suffix = url.substring(url.lastIndexOf("."));
+ let typeList = [".jpg", ".png", ".gif", ".jpeg"];
for (let type of typeList) {
-
if (suffix == type) {
- return true
+ return true;
}
}
return false;
},
isVideo(url) {
- let suffix = url.substring(url.lastIndexOf("."))
- let typeList = ['.mp3', '.mp4', '.mov', '.avi']
+ let suffix = url.substring(url.lastIndexOf("."));
+ let typeList = [".mp3", ".mp4", ".mov", ".avi"];
for (let type of typeList) {
- debugger
+ debugger;
if (suffix == type) {
- return true
+ return true;
}
}
return false;
},
cutFile(url) {
- let path = url.substring(url.lastIndexOf("/"))
- return path
+ let path = url.substring(url.lastIndexOf("/"));
+ return path;
},
- dateArray(list){
- if (list == null){
- return ""
+ dateArray(list) {
+ if (list == null) {
+ return "";
}
- let date = list[0]+"-"+list[1]+"-"+list[2]
- debugger
- return date
+ let date = list[0] + "-" + list[1] + "-" + list[2];
+ debugger;
+ return date;
},
/** 取消按钮 */
cancel() {
@@ -641,33 +855,30 @@ export default {
/* 预览按钮*/
handlePreview() {
this.preview = true;
- this.previewtitle = "附件预览"
-
+ this.previewtitle = "附件预览";
},
-
/** 修改按钮操作 */
handleUpdate(row) {
this.reset();
const id = row.id;
- getElectronicContracts(id).then(response => {
+ getElectronicContracts(id).then((response) => {
this.form = response.data;
- this.form.signDate =
- this.form.effectiveDate
- this.form.expiryDate
+ this.form.signDate = this.form.effectiveDate;
+ this.form.expiryDate;
this.open = true;
this.title = "修改合同档案";
});
},
/** 提交按钮 */
submitForm() {
- this.$refs["form"].validate(valid => {
+ this.$refs["form"].validate((valid) => {
if (!valid) {
return;
}
// 修改的提交
if (this.form.id != null) {
- updateElectronicContracts(this.form).then(response => {
+ updateElectronicContracts(this.form).then((response) => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -675,8 +886,7 @@ export default {
return;
}
// 添加的提交
- createElectronicContracts(this.form).then(response => {
-
+ createElectronicContracts(this.form).then((response) => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
@@ -686,30 +896,35 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const id = row.id;
- this.$modal.confirm('是否确认删除合同档案编号为"' + id + '"的数据项?').then(function () {
- return deleteElectronicContracts(id);
- }).then(() => {
- this.getList();
- this.$modal.msgSuccess("删除成功");
- }).catch(() => {
- });
+ this.$modal
+ .confirm('是否确认删除合同档案编号为"' + id + '"的数据项?')
+ .then(function () {
+ return deleteElectronicContracts(id);
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("删除成功");
+ })
+ .catch(() => {});
},
/** 导出按钮操作 */
handleExport() {
// 处理查询参数
- let params = {...this.queryParams};
+ let params = { ...this.queryParams };
params.pageNo = undefined;
params.pageSize = undefined;
- this.$modal.confirm('是否确认导出所有合同档案数据项?').then(() => {
- this.exportLoading = true;
- return exportElectronicContractsExcel(params);
- }).then(response => {
- this.$download.excel(response, '合同档案.xls');
- this.exportLoading = false;
- }).catch(() => {
- });
+ this.$modal
+ .confirm("是否确认导出所有合同档案数据项?")
+ .then(() => {
+ this.exportLoading = true;
+ return exportElectronicContractsExcel(params);
+ })
+ .then((response) => {
+ this.$download.excel(response, "合同档案.xls");
+ this.exportLoading = false;
+ })
+ .catch(() => {});
},
-
- }
+ },
};
From 6a8c427336c5420a8e88ddcd1556d962001ccfe8 Mon Sep 17 00:00:00 2001
From: chiyilin <2449182606@qq.com>
Date: Tue, 10 Oct 2023 16:37:33 +0800
Subject: [PATCH 10/15] =?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/electronicEmployee/index.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/views/ea/electronicEmployee/index.vue b/src/views/ea/electronicEmployee/index.vue
index d1f7d7ed..68d3e4fb 100644
--- a/src/views/ea/electronicEmployee/index.vue
+++ b/src/views/ea/electronicEmployee/index.vue
@@ -1,6 +1,5 @@
-
From 74e3cc02785686464a7c935b5eaffcd033fa83e4 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Tue, 10 Oct 2023 17:25:06 +0800
Subject: [PATCH 11/15] =?UTF-8?q?=E5=8F=96=E6=B6=88=E8=AE=A4=E6=AC=BE?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=EF=BC=8C=E6=96=B0=E5=A2=9E=E8=AE=A4=E6=AC=BE?=
=?UTF-8?q?=E7=8A=B6=E6=80=81=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 | 2 +
src/views/accounting/bankSlip/index.vue | 53 +++++++++++++++++++------
2 files changed, 43 insertions(+), 12 deletions(-)
diff --git a/src/utils/dict.js b/src/utils/dict.js
index 4ea6c05d..5294adea 100644
--- a/src/utils/dict.js
+++ b/src/utils/dict.js
@@ -143,6 +143,8 @@ export const DICT_TYPE = {
BORROW_STATUS: 'borrow_status',
//会计凭证类型
ACCOUNTING_VOUCHER_TYPE: 'accounting_voucher_type',
+ //银行回单认款状态
+ BANK_CONFIRM_STATUS: 'bank_confirm_status',
}
diff --git a/src/views/accounting/bankSlip/index.vue b/src/views/accounting/bankSlip/index.vue
index 23470e89..3e9abf81 100644
--- a/src/views/accounting/bankSlip/index.vue
+++ b/src/views/accounting/bankSlip/index.vue
@@ -234,9 +234,21 @@
size="mini"
type="text"
icon="el-icon-s-check"
+ v-if="
+ scope.row.subscriptionStatus == 0 ||
+ scope.row.subscriptionStatus == null
+ "
@click="handleComfirm(scope.row)"
>认款
+ 取消认款
+
-
+
@@ -676,7 +683,9 @@ export default {
form: {},
form1: {},
// 表单校验
- rules: {},
+ rules: {
+ staffName: [{ required: true, message: "请选择", trigger: "blur" }],
+ },
fileList: [], // 文件列表
uploadUrl:
process.env.VUE_APP_BASE_API + "/admin-api/archives/flow/upload", // 上传地址地址
@@ -794,6 +803,7 @@ export default {
id: undefined,
staffId: undefined,
staffName: undefined,
+ subscriptionStatus: undefined,
};
this.resetForm("form");
},
@@ -838,13 +848,32 @@ export default {
this.form1.staffName = val.username;
},
submitForm2() {
- console.log(this.form1);
- updateBankSlip(this.form1).then((response) => {
- this.$modal.msgSuccess("认款成功");
- this.open2 = false;
- this.getList();
+ this.form1.subscriptionStatus = 1;
+ this.$refs["form1"].validate((valid) => {
+ if (!valid) {
+ return;
+ }
+ updateBankSlip(this.form1).then((response) => {
+ this.$modal.msgSuccess("认款成功");
+ this.open2 = false;
+ this.getList();
+ });
});
},
+ /** 取消认款按钮操作 */
+ handleUnComfirm(val) {
+ this.reset();
+ const data = { id: val.id, subscriptionStatus: 0 };
+ this.$modal
+ .confirm('是否确认取消银行回单编号为"' + val.id + '"的认款?')
+ .then(function () {
+ updateBankSlip(data).then((response) => {});
+ })
+ .then(() => {
+ this.getList();
+ this.$modal.msgSuccess("取消成功");
+ });
+ },
/** 提交按钮 */
submitForm() {
this.$refs["form"].validate((valid) => {
From 1acf8f1cdbd5983c44657d7be419ffe4361ebae5 Mon Sep 17 00:00:00 2001
From: MO <448233645@qq.com>
Date: Thu, 12 Oct 2023 15:18:14 +0800
Subject: [PATCH 12/15] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=85=8D=E7=BD=AE?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.env.local | 3 +++
.env.prod | 3 +++
src/components/iFrame/index.vue | 9 ++++++---
src/views/accounting/book/index.vue | 4 ++--
src/views/report/jmreport/index.vue | 7 +++++--
5 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/.env.local b/.env.local
index 44c09a2f..1ca2ba93 100644
--- a/.env.local
+++ b/.env.local
@@ -25,3 +25,6 @@ VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
#线上预览
VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
+
+#线上预览
+VUE_APP_BIAO_API = 'http://139.224.253.31:48080'
diff --git a/.env.prod b/.env.prod
index 68059cd2..d75352ba 100644
--- a/.env.prod
+++ b/.env.prod
@@ -26,3 +26,6 @@ VUE_APP_BAIDU_CODE = fadc1bd5db1a1d6f581df60a1807f8ab
#线上预览
VUE_APP_ONLINE_API = 'http://139.224.253.31:48012'
+
+#线上预览
+VUE_APP_BIAO_API = 'http://139.224.253.31:48080'
diff --git a/src/components/iFrame/index.vue b/src/components/iFrame/index.vue
index 426857fb..3ce6e79e 100644
--- a/src/components/iFrame/index.vue
+++ b/src/components/iFrame/index.vue
@@ -13,16 +13,19 @@ export default {
props: {
src: {
type: String,
- required: true
+ required: true,
},
},
data() {
return {
height: document.documentElement.clientHeight - 94.5 + "px;",
loading: true,
- url: this.src
+ url: this.src,
};
},
+ created() {
+ console.log(this.url);
+ },
mounted: function () {
setTimeout(() => {
this.loading = false;
@@ -31,6 +34,6 @@ export default {
window.onresize = function temp() {
that.height = document.documentElement.clientHeight - 94.5 + "px;";
};
- }
+ },
};
diff --git a/src/views/accounting/book/index.vue b/src/views/accounting/book/index.vue
index 14ee386d..5bcfba5c 100644
--- a/src/views/accounting/book/index.vue
+++ b/src/views/accounting/book/index.vue
@@ -106,14 +106,14 @@
class-name="small-padding fixed-width"
>
- 修改
+ > -->