From a67458d58a22501d74d8d91bb86959d6faa3f4db Mon Sep 17 00:00:00 2001
From: jxjgmj <1351094127@qq.com>
Date: Fri, 17 Jun 2022 15:21:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E9=85=B8?=
=?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectFront/buildersDiary/diaryMod.vue | 4 +++-
.../nucleicAcidOvertimePersonnel/index.vue | 22 +++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/views/projectFront/buildersDiary/diaryMod.vue b/src/views/projectFront/buildersDiary/diaryMod.vue
index ab4c5a62..2e5325a1 100644
--- a/src/views/projectFront/buildersDiary/diaryMod.vue
+++ b/src/views/projectFront/buildersDiary/diaryMod.vue
@@ -757,6 +757,7 @@ export default {
created() {
this.uploadUrl = this.$store.state.UPLOADURL;
this.fileUrl = this.$store.state.FILEURL;
+
this.projectSn = this.$store.state.projectSn;
this.type = this.$props.status;
},
@@ -784,6 +785,7 @@ export default {
//上传成功
handleSuccess(file) {
let data = { name: file.data[0].filename, url: file.data[0].imageUrl };
+ console.log(data,'datadatadatadata')
this.fileList.push(data);
},
//删除成功
@@ -803,7 +805,7 @@ export default {
},
//提交保存
submitForm() {
-
+
if(!this.ruleForm.buildName){
this.$message.error("请输入单位工程名称")
return false;
diff --git a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
index 12e4c794..41ee899c 100644
--- a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
+++ b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
@@ -60,17 +60,17 @@
@@ -109,7 +109,7 @@ export default {
classParame: 1,
pageNo: 1,
pageSize: 10,
- total: ''
+ total: 0
}
},
created() {
From b890ba517f141fba4cc308adae9c746c7162d932 Mon Sep 17 00:00:00 2001
From: jxjgmj <1351094127@qq.com>
Date: Fri, 17 Jun 2022 15:23:55 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E9=85=B8?=
=?UTF-8?q?=E8=B6=85=E6=97=B6=E4=BA=BA=E5=91=98=E5=88=97=E8=A1=A8=E5=88=86?=
=?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
index 41ee899c..762c743d 100644
--- a/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
+++ b/src/views/projectFront/nucleicAcidOvertimePersonnel/index.vue
@@ -121,11 +121,13 @@ export default {
this.pageNo = val;
this.getDataList();
},
+ //刷选
screen(v) {
this.classParame = v;
this.pageNo = 1;
this.getDataList();
},
+ //获取数据列表
getDataList() {
selectWorkScheduleListApi({
selectType: this.classParame,
From f1031d60fd60bd5f4d527ae2cb9bad0c4baaedd9 Mon Sep 17 00:00:00 2001
From: jxjgmj <1351094127@qq.com>
Date: Fri, 17 Jun 2022 17:15:07 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
=?UTF-8?q?=E6=98=9F=E5=8F=B7=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../projectFront/buildersDiary/diaryMod.vue | 24 ++++++++++++-------
1 file changed, 15 insertions(+), 9 deletions(-)
diff --git a/src/views/projectFront/buildersDiary/diaryMod.vue b/src/views/projectFront/buildersDiary/diaryMod.vue
index 2e5325a1..f153aac7 100644
--- a/src/views/projectFront/buildersDiary/diaryMod.vue
+++ b/src/views/projectFront/buildersDiary/diaryMod.vue
@@ -49,8 +49,8 @@
-
-
+
+
@@ -68,8 +68,8 @@
-
-
+
+
@@ -87,15 +87,15 @@
-
-
+
+
-
-
+
+
@@ -955,11 +955,17 @@ export default {
};