From 7a183c3f1d2ebf073d370e4df0289c6a8b708010 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Thu, 23 Dec 2021 16:53:55 +0800 Subject: [PATCH 1/3] commit --- .../pages/creatProcess/bzdy/step7.vue | 2 +- .../pages/creatProcess/zcch/step2.vue | 71 ++++++++++++++++++- .../pages/creatProcess/zcch/step3.vue | 71 ++++++++++++++++++- .../pages/creatProcess/zchh/step2.vue | 71 ++++++++++++++++++- .../pages/creatProcess/zcrh/step2.vue | 71 ++++++++++++++++++- .../pages/creatProcess/zcrh/step3.vue | 71 ++++++++++++++++++- .../pages/creatProcess/zcrh/step4.vue | 71 ++++++++++++++++++- 7 files changed, 421 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue index 536d2f62d..836fcb971 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step7.vue @@ -112,7 +112,7 @@ - +
法规部部长审批
-
基础信息
+
基础信息
+
人员信息
@@ -209,6 +210,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -368,6 +436,7 @@ }, mounted() { this.getData() + this.getHistoryData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue index e282e2226..5e3e82d31 100644 --- a/src/pages/processCenter/pages/creatProcess/zcch/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcch/step3.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -209,6 +210,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, getData() { return new Promise((resolve, reject) => { inboundLiaisonDetail({ @@ -342,6 +410,7 @@ }, }, mounted() { + this.getHistoryData() this.getData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue index 33a994a10..46def0a2d 100644 --- a/src/pages/processCenter/pages/creatProcess/zchh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zchh/step2.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -246,6 +247,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, updataFj (item) { window.location.href = '/api/att/attFile/downloadFile?fileId=' + item.id }, @@ -405,6 +473,7 @@ }, }, mounted() { + this.getHistoryData() this.getData() } }; diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue index c6f415184..5ddf8e5dd 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step2.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue index 5035bd5bb..8b3de2982 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step3.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } diff --git a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue index 4a3e36791..d8220c590 100644 --- a/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/zcrh/step4.vue @@ -5,7 +5,8 @@
-
基础信息
+
基础信息
+
人员信息
@@ -184,6 +185,65 @@
+
+ + + + + + + + + + + + + + + + + + +
{ + this.histortData = res + }, e => {}) + }, handleSubmit() { this.isSubmit = true var json = this.json @@ -300,6 +368,7 @@ }, }, mounted () { + this.getHistoryData() this.getData() } } From d739c31cecd1e1d39f45d06185b2c7b45d32444c Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Thu, 23 Dec 2021 17:17:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=97=A5=E5=8E=86=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4=E3=80=81=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E7=AB=AF=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=81=E6=9C=AA?= =?UTF-8?q?=E7=AC=A6=E5=90=88=E9=A1=B9=E6=B5=81=E7=A8=8B=E5=B8=A6=E5=85=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA=E8=B0=83=E6=95=B4=E3=80=81?= =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E5=AE=A1=E6=89=B9=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standCalendar/index.vue | 41 +++-- .../pages/creatProcess/wfhxzg/step1.vue | 142 +++++++++++++----- .../pages/creatProcess/wfhxzg/step2.vue | 13 +- .../pages/creatProcess/wfhxzg/step3.vue | 7 +- .../pages/creatProcess/wfhxzg/step4.vue | 7 +- .../pages/creatProcess/wfhxzg/step5-1.vue | 3 +- .../pages/creatProcess/wfhxzg/step5.vue | 3 +- .../pages/phone/bzhHd-ch/step2.vue | 6 +- .../pages/phone/bzhHd-ch/step4.vue | 6 +- .../pages/phone/bzhHd-ch/step6.vue | 6 +- .../pages/phone/bzhHd-hh/step2.vue | 6 +- .../pages/phone/bzhHd-rh/step2.vue | 6 +- .../pages/phone/bzhHd-rh/step4.vue | 6 +- .../pages/phone/bzhHd-rh/step6.vue | 6 +- .../pages/phone/wfhxzg/step2.vue | 10 +- .../pages/phone/wfhxzg/step3.vue | 10 +- .../pages/phone/wfhxzg/step5.vue | 9 +- 17 files changed, 184 insertions(+), 103 deletions(-) diff --git a/src/pages/localTool/standCalendar/index.vue b/src/pages/localTool/standCalendar/index.vue index 60be276ca..2aebcb0ad 100644 --- a/src/pages/localTool/standCalendar/index.vue +++ b/src/pages/localTool/standCalendar/index.vue @@ -32,9 +32,11 @@ - + - + + +
@@ -59,7 +61,9 @@ 会议 - 会议 + + + 会议 编辑会议内容 @@ -69,7 +73,7 @@
会议时间 : {{ $moment(item.date).format('YYYY-MM-DD HH:mm:ss') }}
-
+
参与人 : {{ item.partPeople.join('、') }}
@@ -101,6 +105,7 @@
@@ -128,7 +133,6 @@ border ref="entryTable" @selection-change="selectedDelete" - height="49%" style="width: 100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', height: '20px'}"> @@ -334,7 +338,7 @@ export default { }, // 议题选中时储存数组 deleteTable: [], - loading: false + loading: false, } }, mounted() { @@ -446,14 +450,25 @@ export default { * 并在日历上显示出标记*/ dealMyDate(v) { let len = this.resDate.length - let res = '' + let res = [] for (let i = 0; i < len; i++) { if (this.resDate[i].date.slice(0, 10) === v) { - res = this.resDate[i].attend - break + res = res.concat(this.resDate[i].attend) } } - return res + + // 去除当天重复的人员 + let map = new Map(); + let array = new Array(); // 数组用于返回结果 + for (let i = 0; i < res.length; i++) { + if(map.has(res[i].fillPeopleId)) { // 如果有该key值 + map.set(res[i].fillPeopleId, true); + } else { + map.set(res[i].fillPeopleId, false); // 如果没有该key值 + array.push(res[i]); + } + } + return array }, // 头部时间改变事件 handleDate() { @@ -502,13 +517,11 @@ export default { /** 每个会议对应的编辑按钮 */ edit_meeting(item) { - this.editMeetForm.contents = [] - console.log(item) localStorage.setItem('objs', JSON.stringify(item)) this.fileListData = item this.reData = item.files + console.log(item) this.editMeetForm = item - this.editMeetForm.contents this.editMeetForm.contents = [] if (this.editMeetForm.content !== '') { this.editMeetForm.content.split(';').forEach(item => { @@ -863,8 +876,6 @@ export default { overflow: hidden; text-overflow: ellipsis; display: -webkit-box; - -webkit-line-clamp: 4; - line-clamp: 4; -webkit-box-orient: vertical; line-height: normal; margin-top: 10px; diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 9d794af6a..006476cef 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -47,8 +47,8 @@ {{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }} - - + +
@@ -59,7 +59,7 @@ :rows="3" resize="none" placeholder="请输入意见" - v-model="textarea"> + v-model="commentText">
@@ -161,20 +161,11 @@ :maxlength="100"> - - - +
+ 数据获取中.... - - + > + + + - + - - - - + + + + + + + + + + + + + + + + + + + + + - - - 数据获取中
取消 确认 @@ -274,7 +333,7 @@ export default { data() { return { loading: false, - textarea: '', // 意见 + commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 active: '1', // 默认显示 @@ -432,6 +491,9 @@ export default { }, //选择标准取消事件 closeDrawer() { + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.responsibleUnit = '' + this.queryUnqualidiedData.productName = '' this.standModel = false }, //未符合项整合确定事件 @@ -456,6 +518,9 @@ export default { this.$refs.searchTable.clearSelection() } }) + this.queryUnqualidiedData.standSerialNumber = '' + this.queryUnqualidiedData.responsibleUnit = '' + this.queryUnqualidiedData.productName = '' this.standModel = false; } else { this.$message.warning("请选择至少一条数据进行带入"); @@ -500,6 +565,7 @@ export default { prcCreateUserName: this.$store.getters.userInfo.userName, engineer: this.roleForm.dockUser, standardInfoList: this.dataList, + commentText: this.commentText } if (this.dataList[0].standId === '') { this.$message.warning('请选择基础信息进行添加') @@ -595,7 +661,7 @@ export default { @import '~@/assets/styles/style'; .wfhxzgStep1 { /deep/.el-table--scrollable-y .el-table__body-wrapper { - height: calc(100% - 80px) !important; + height: calc(100% - 57px) !important; } /deep/.el-drawer__container { .prc-content-border { diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index d381a84b2..6e5e77e15 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -51,8 +51,8 @@ {{ scope.row.planCloseTime ? $moment(scope.row.planCloseTime).format('YYYY-MM-DD') : '' }} - - + + - - + + - + + - + + - + + - - + + - - + + - + +