diff --git a/src/views/accounting/voucher/index.vue b/src/views/accounting/voucher/index.vue index f778a171..5e19fe6b 100644 --- a/src/views/accounting/voucher/index.vue +++ b/src/views/accounting/voucher/index.vue @@ -169,7 +169,7 @@ >查看 修改 - - - - - - - @@ -246,17 +239,19 @@ - - + + @@ -322,16 +317,26 @@ /> + + + + 记账凭证 + - - + + + + + + + @@ -347,6 +352,9 @@ + + + - - @@ -376,7 +382,6 @@ /> - 记账凭证 @@ -387,6 +392,9 @@ + + + 凭证详情 { - if (!valid) { - return; - } - // 处理查询参数 - let params = { ...this.queryParams }; - downloadXml(params) - .then((response) => { - console.log(response.size); - if (response.size == 39) { - this.$modal.msgError("密码错误"); - return false; - } else { - this.$download.excel(response, "会计凭证元数据.xml"); - this.open1 = false; - } - }) - .catch(() => {}); - }); - }, - //下载元数据 - handleDownloadData() { - this.open1 = true; - this.queryParams.inputPassword = null; - }, /** 查询列表 */ getList() { this.loading = true; @@ -862,12 +841,6 @@ export default { this.resetForm("queryForm"); this.handleQuery(); }, - //获取用户 - getUserList() { - listUser().then((response) => { - this.userOptions = response.data.list; - }); - }, /** 新增按钮操作 */ handleAdd() { this.reset(); @@ -963,6 +936,32 @@ export default { }) .catch(() => {}); }, + //下载元数据 + handleDownloadData() { + this.open1 = true; + this.queryParams.inputPassword = null; + }, + submitForm1() { + this.$refs["queryForm"].validate((valid) => { + if (!valid) { + return; + } + // 处理查询参数 + let params = { ...this.queryParams }; + downloadXml(params) + .then((response) => { + console.log(response.size); + if (response.size == 39) { + this.$modal.msgError("密码错误"); + return false; + } else { + this.$download.excel(response, "会计凭证元数据.xml"); + this.open1 = false; + } + }) + .catch(() => {}); + }); + }, // 人员选择弹窗 handleSelectUser1() { this.$refs.UserSelect1.showFlag = true; @@ -975,7 +974,6 @@ export default { }, // 审核人选择 onUserSelected1(obj) { - console.log(obj); if (obj != undefined && obj != null) { this.form.audit = obj.username; } diff --git a/src/views/archives/prefile/index.vue b/src/views/archives/prefile/index.vue index b1e09d9a..88d481d9 100644 --- a/src/views/archives/prefile/index.vue +++ b/src/views/archives/prefile/index.vue @@ -275,7 +275,7 @@ @@ -413,7 +413,7 @@ @@ -617,7 +617,7 @@ @@ -742,7 +742,7 @@ diff --git a/src/views/ea/electronicAssets/index.vue b/src/views/ea/electronicAssets/index.vue index 6b65212a..a66d0fa5 100644 --- a/src/views/ea/electronicAssets/index.vue +++ b/src/views/ea/electronicAssets/index.vue @@ -1,35 +1,81 @@ - + - + @@ -102,27 +179,47 @@ - + - + - + - + - - - -
将文件拖到此处，或点击上传
- + + + +
将文件拖到此处，或点击上传
+ - + - - - + + + - + @@ -179,54 +337,83 @@ - - - + - + - + - - + + - + - + - + @@ -236,7 +423,13 @@ - + @@ -244,15 +437,27 @@ - + - + @@ -268,7 +473,9 @@
- 确 定 + 确 定 取 消
@@ -343,7 +550,7 @@ export default { queryParams: { pageNo: 1, pageSize: 10, - contractAttachment:null, + contractAttachment: null, companyId: null, company: null, deptId: null, @@ -372,7 +579,14 @@ export default { // 表单参数 form: {}, // 表单校验 - rules: {}, + rules: { + company: [ + { required: true, message: "业务实体不能为空", trigger: "change" }, + ], + assetCode: [ + { required: true, message: "资产编号不能为空", trigger: "change" }, + ], + }, organizationList: [], siteOptions: [], //归档位置数据 siteArray: [], //归档位置选中值 @@ -403,9 +617,9 @@ export default { this.form.contractAttachment = res.data.url; }, /** - * 文件预览 - * @param fileUrl - */ + * 文件预览 + * @param fileUrl + */ openLink(fileUrl) { const url = process.env.VUE_APP_ONLINE_API + @@ -497,7 +711,7 @@ export default { deptName: undefined, assetCode: undefined, assetName: undefined, - contractAttachment:undefined, + contractAttachment: undefined, assetDescription: undefined, assetType: undefined, purchaseDate: undefined, @@ -597,6 +811,7 @@ export default { return; } // 添加的提交 + this.form.cherks = 0; createElectronicAssets(this.form).then((response) => { this.$modal.msgSuccess("新增成功"); this.open = false; @@ -616,7 +831,7 @@ export default { this.getList(); this.$modal.msgSuccess("删除成功"); }) - .catch(() => { }); + .catch(() => {}); }, /** 导出按钮操作 */ handleExport() { @@ -634,7 +849,7 @@ export default { this.$download.excel(response, "资产档案.xls"); this.exportLoading = false; }) - .catch(() => { }); + .catch(() => {}); }, }, }; diff --git a/src/views/ea/electronicAttachment/index.vue b/src/views/ea/electronicAttachment/index.vue index 0a02cad9..0dea0b68 100644 --- a/src/views/ea/electronicAttachment/index.vue +++ b/src/views/ea/electronicAttachment/index.vue @@ -165,7 +165,7 @@ >