@@ -127,7 +135,7 @@
v-if="!val.g"
v-for="(val,indexTwo) in item.data[0]">
-
{{ val.name }}
+
{{ val.name }}
@@ -309,10 +317,19 @@
],
startTime: undefined,
endTime: undefined,
- handlingTime: ''
+ handlingTime: '',
+ num:0,
}
},
mounted() {
+ let boxContentTextColor = document.getElementsByClassName('box-header-text-color')
+ if (boxContentTextColor && boxContentTextColor.length > 0) {
+ boxContentTextColor[0].classList.remove('box-header-text-color')
+ }
+ let boxContentTextText = document.getElementsByClassName('box-header-text-text')
+ if (boxContentTextText && boxContentTextText.length > 0) {
+ boxContentTextText[0].classList.add('box-header-text-color')
+ }
this.getList()
this.getTimeline()
this.handlingTime = moment(new Date()).format('YYYY-MM-DD')
@@ -581,6 +598,17 @@
},
statusClick(val) {
this.$refs.statisticsRef.getData(val)
+ },
+ boxContentClick(num) {
+ let boxContentTextColor = document.getElementsByClassName('box-header-text-color')
+ if (boxContentTextColor && boxContentTextColor.length > 0) {
+ boxContentTextColor[0].classList.remove('box-header-text-color')
+ }
+ let boxContentTextText = document.getElementsByClassName('box-header-text-text')
+ if (boxContentTextText && boxContentTextText.length > 0) {
+ boxContentTextText[num].classList.add('box-header-text-color')
+ }
+ this.num = num
}
}
}
@@ -876,6 +904,7 @@
font-weight: 400;
color: #6F7385;
position: absolute;
+ cursor: pointer;
background: #fff;
left: 50%;
top: 36px;
@@ -950,4 +979,38 @@
margin-top: 8px !important;
}
+ .box-header-text {
+ height: 30px;
+ background: #F5F6F7;
+ border-radius: 4px;
+ position: absolute;
+ right: 88px;
+ top: -9px;
+ display: flex;
+ z-index: 116;
+ justify-content: space-between;
+ padding: 0 2px 0 2px;
+
+ .box-header-text-text {
+ display: inline-block;
+ font-size: 12px;
+ color: #6F7385;
+ line-height: 30px;
+ margin-right: 10px;
+ cursor: pointer;
+ margin-left: 10px;
+ }
+
+ .box-header-text-color {
+ box-shadow: 0px 1px 2px rgba(0, 0, 60, 0.01), 0px 2px 4px rgba(0, 22, 60, 0.02), 0px 4px 6px rgba(0, 22, 60, 0.0229458);
+ border-radius: 4px;
+ padding: 4px 6px;
+ background: #FFFFFF;
+ border: 1px solid #E6E7EC;
+ color: #01A0AC;
+ line-height: normal;
+ margin-right: 0;
+ margin-left: 0;
+ }
+ }
\ No newline at end of file
From 4746e623a85f6cfd18bf6ff8fbd7626bbce77917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Wed, 10 May 2023 14:21:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9UAT=E6=8F=90=E5=87=BA?=
=?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/listOfRegulations.vue | 32 ++++++++++++-------
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index d790d21fa..44a5febf8 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -2862,12 +2862,16 @@
}
if (dataList[i].designFlowStatus == 'List to be checked' || dataList[i].designFlowStatus == 'Duty Person Rejected') {
if (dataList[i].designDeliverableType && dataList[i].designDutyId && dataList[i].designDueDate) {
- this.requestsNum++
- this.startProcessList.push({
- dataList: dataList[i],
- type: 2,
- requestsNum: this.requestsNum
- })
+ if (dataList[i].designDeliverableType == '1645667531513237506'){
+
+ }else{
+ this.requestsNum++
+ this.startProcessList.push({
+ dataList: dataList[i],
+ type: 2,
+ requestsNum: this.requestsNum
+ })
+ }
// _this.startProcess(dataList[i], 2, this.requestsNum)
}
} else {
@@ -2876,12 +2880,16 @@
}
if (dataList[i].verifyFlowStatus == 'List to be checked' || dataList[i].verifyFlowStatus == 'Duty Person Rejected') {
if (dataList[i].verifyDeliverableType && dataList[i].verifyDutyId && dataList[i].verifyDueDate) {
- this.requestsNum++
- this.startProcessList.push({
- dataList: dataList[i],
- type: 4,
- requestsNum: this.requestsNum
- })
+ if (dataList[i].verifyDeliverableType == '1645667531513237506'){
+
+ }else{
+ this.requestsNum++
+ this.startProcessList.push({
+ dataList: dataList[i],
+ type: 4,
+ requestsNum: this.requestsNum
+ })
+ }
// _this.startProcess(dataList[i], 4, this.requestsNum)
}
} else {