diff --git a/src/components/processNodeInformation/index.vue b/src/components/processNodeInformation/index.vue index ab3f8ffce..9ae507fb3 100644 --- a/src/components/processNodeInformation/index.vue +++ b/src/components/processNodeInformation/index.vue @@ -17,7 +17,14 @@ :style="backdrop(item.taskStatus)" :class="{'flow-group-process-content-dis':!leftArrow(index + 1)}">
- {{item.taskKeyName}} + +
+ {{item.taskKeyName}} +
+
+ {{item.taskKeyName}} +
+
@@ -30,7 +37,7 @@ v-if="item.userNames && item.userNames.length > 0">
-
{{val}}
+
{{val}}
@@ -103,6 +110,16 @@ {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + { this.histortData = res + if (this.$route.query.oldAndNew == 'new') { + this.getProcessList() + } else { + this.processNum() + } this.loading = false }, e => { }) @@ -267,6 +284,29 @@ val.userNames = val.userNames.split(',') } }) + if (this.$route.query.prcType == 'buss1'){ + if (this.histortData && this.histortData.length > 0){ + if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC3'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary3') { + val.taskStatus = 'todo' + } + }) + }else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC1'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary1') { + val.taskStatus = 'todo' + } + }) + }else if (this.histortData[this.histortData.length - 1].taskKey == 'BussLibraryC6'){ + this.nameList.forEach(val => { + if (val.taskKey == 'BussLibrary6') { + val.taskStatus = 'todo' + } + }) + } + } + } this.$nextTick(() => { let flowGroupProcess = document.getElementsByClassName('flow-group-process') let num = (flowGroupProcess[0].offsetWidth - 100) / 248 @@ -415,7 +455,7 @@ line-height: 40px; font-weight: 600; float: inline-start; - margin-top: 18px; + margin-top: 28px; } .flow-group-process-end { @@ -430,7 +470,7 @@ line-height: 40px; font-weight: 600; float: inline-end; - margin-top: 20px; + margin-top: 28px; } .flow-group-process-end-left { @@ -529,21 +569,31 @@ .flow-group-process-content-top { width: 100%; - height: 40px; - line-height: 40px; + margin-top: 10px; + margin-bottom: 10px; font-size: 12px; + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; } .flow-group-process-content-bottom { width: 100%; font-size: 12px; line-height: 1.4; - word-break: break-all; - text-overflow: ellipsis; - display: -webkit-box; - -webkit-box-orient: vertical; - -webkit-line-clamp: 2; /* 超出几行省略 */ + height: 54px; overflow: hidden; + .flow-group-process-content-bottom-text{ + word-break: break-all; + text-overflow: ellipsis; + display: -webkit-box; + -webkit-box-orient: vertical; + -webkit-line-clamp: 1; /* 超出几行省略 */ + overflow: hidden; + } } .flow-group-process-arrow-dis { diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 31dfe68d3..29f266d95 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -188,6 +188,16 @@ export default { } break case 'buss1': + let oldAndNewBuss = '' + const currentDateBuss = new Date('2024-01-25 23:59:59').getTime(); + const dateBuss = new Date(row.creatTime); + const timestampBuss = dateBuss.getTime(); + if (currentDateBuss > timestampBuss){ + oldAndNewBuss = 'old' + }else{ + oldAndNewBuss = 'new' + } + query.oldAndNew = oldAndNewBuss if (row.taskInfo === '企标编写') { name = 'bussLibrary2' }else if (row.taskInfo === '企标编写汇总'){ @@ -219,6 +229,7 @@ export default { }else if (row.taskInfo === '发布'){ name = 'bussLibrary13' } + break case 'buss2': name = 'bussLibraryProduct' @@ -317,6 +328,16 @@ export default { } break; case '3': + let oldAndNewBuss1 = '' + const currentDateBuss1 = new Date('2024-01-25 23:59:59').getTime(); + const dateBuss1 = new Date(row.creatTime); + const timestampBuss1 = dateBuss1.getTime(); + if (currentDateBuss1 > timestampBuss1){ + oldAndNewBuss1 = 'old' + }else{ + oldAndNewBuss1 = 'new' + } + query.oldAndNew = oldAndNewBuss1 if (row.taskInfo === '任务分发') { name = 'bzzqyjStep2' } else if (row.taskInfo === '意见反馈'){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index ac4580933..993b41a38 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -186,9 +186,9 @@
{{ item.name }} - - - + + +
@@ -212,19 +212,37 @@ clearable />
-
-
- {{ item.name }} - - - +
+
+ {{ item.name }} + + + + + + +
-
+ +
+
+ {{ item.name }} + + + +
+
+
{{ item.name }} - - - + + +
@@ -290,9 +308,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -577,9 +595,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -745,9 +763,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -775,9 +793,9 @@ class="fileClass" > {{ item.name }} - - - + + +
@@ -802,6 +820,7 @@