From 62eec951dd8de99972b8897ffb10cce760514b68 Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Tue, 28 May 2024 20:40:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B6=E5=B7=A5=E8=B5=84=E7=95=8C?=
=?UTF-8?q?=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/mes/unitprice/index.vue | 15 +++++++++++----
src/views/mes/unitpriceReport/index.vue | 20 ++++++++++----------
2 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/views/mes/unitprice/index.vue b/src/views/mes/unitprice/index.vue
index be217e0..a57d8c2 100644
--- a/src/views/mes/unitprice/index.vue
+++ b/src/views/mes/unitprice/index.vue
@@ -257,7 +257,7 @@
取 消
-
+
将文件拖到此处,或点击上传
-
-
-
+
+ 是否更新已经存在的单价信息
+
仅允许导入xls、xlsx格式文件。
下载模板
@@ -347,6 +347,7 @@ export default {
}],
value: '',
upload: {
+ loading: false,
// 是否显示弹出层(用户导入)
open: false,
// 弹出层标题(用户导入)
@@ -574,10 +575,14 @@ export default {
},
// 文件上传中处理
handleFileUploadProgress(event, file, fileList) {
+ console.log(1)
this.upload.isUploading = true;
+ console.log(this.upload.isUploading)
},
// 文件上传成功处理
handleFileSuccess(response, file, fileList) {
+ console.log(2)
+ this.upload.loading=false;
this.upload.open = false;
this.upload.isUploading = false;
this.$refs.upload.clearFiles();
@@ -586,6 +591,8 @@ export default {
},
// 提交上传文件
submitFileForm() {
+ console.log(3)
+ this.upload.loading=true;
this.$refs.upload.submit();
},
handleSearch() {
diff --git a/src/views/mes/unitpriceReport/index.vue b/src/views/mes/unitpriceReport/index.vue
index 753125d..0fa0322 100644
--- a/src/views/mes/unitpriceReport/index.vue
+++ b/src/views/mes/unitpriceReport/index.vue
@@ -76,11 +76,11 @@
-
-
+
+
-
+
@@ -98,7 +98,7 @@
工资修改
@@ -128,8 +128,8 @@
-
-
+
+
@@ -166,7 +166,7 @@
@@ -328,10 +328,10 @@ export default {
getReport(picId).then(response => {
this.form = response.data.MesUnitpriceReport;
this.open = true;
- if (response.data.attr1 === null || response.data.attr1 === undefined) {
- this.form.attr1 = row.avgResult;
+ if (response.data.attr2 === null || response.data.attr2 === undefined) {
+ this.form.attr2 = row.result;
} else {
- this.form.attr1 = response.data.attr1;
+ this.form.attr2 = response.data.attr2;
}
this.MesUnitPriceInfo=response.data.MesUnitPriceInfo;
});