From d79fa722688977d46be73b1c0e62803aa770b1f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167>
Date: Fri, 7 Apr 2023 09:22:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=95=E8=A7=84?=
=?UTF-8?q?=E6=B8=85=E5=8D=95=E7=AD=9B=E9=80=89=E6=B3=95=E8=A7=84=E5=B7=A5?=
=?UTF-8?q?=E7=A8=8B=E5=B8=88=E6=97=B6=EF=BC=8C=E6=8C=89=E9=A1=B9=E7=9B=AE?=
=?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BA=BA=E5=91=98=E5=86=85=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/listOfRegulations.vue | 80 ++++++++++++-------
1 file changed, 51 insertions(+), 29 deletions(-)
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 3f8dd365c..64086cda2 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -347,22 +347,22 @@
:title="text">{{text}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('total') + ' ' + this.dataSource.length + ' ' + $t('strip') }}
+
@@ -1127,12 +1127,6 @@
text: this.$t('areaOfResponsibility'),
dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
},
- {
- type: 'Personnel',
- value: 'regulationOwnerId',
- valueName: 'regulationOwnerIdName',
- text: this.$t('regulatoryEngineer')
- },
{
type: 'Personnel',
value: 'engineeringInterfacePerson',
@@ -1318,6 +1312,7 @@
mounted() {
this.JLoading = true
this.getHeader()
+ this.queryLawEngineerByProjectId()
this.getRoleByUserId(() => {
this.getAndUserId()
})
@@ -1366,7 +1361,32 @@
handleToggleSearch() {
this.toggleSearchStatus = !this.toggleSearchStatus
},
+ queryLawEngineerByProjectId() {
+ let query = {
+ projectLibraryId: this.$route.query.id
+ }
+ getAction('/project/projectRelatedPersonnel/queryLawEngineerByProjectId', query).then((res) => {
+ if (res.success) {
+ let regulatoryEngineer = {
+ value: 'regulationOwnerId',
+ text: this.$t('regulatoryEngineer'),
+ options:[],
+ }
+ if (res.result && res.result.length > 0){
+ res.result.forEach(val=>{
+ regulatoryEngineer.options.push({
+ value: val.id,
+ key: val.id,
+ label: val.userName
+ })
+ })
+ }
+ this.fieldList.push(regulatoryEngineer)
+ } else {
+ }
+ })
+ },
//流程状态点击事件
designFlowStatusClick(row, name) {
let query = {}
@@ -2081,7 +2101,7 @@
projectLibraryId: this.$route.query.id,
orderBy: this.orderBy,
orderByField: this.orderByField,
- roleCode: roleCode,
+ roleCode: roleCode
// pageNo: this.pageNo,
// pageSize: this.pageSize
}
@@ -3029,15 +3049,17 @@
}
::v-deep .page .ant-select-selection__rendered {
- height: 32px!important;
- line-height: 32px!important;
+ height: 32px !important;
+ line-height: 32px !important;
}
- ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']){
+
+ ::v-deep .ant-table-thead > tr > th[colspan]:not([colspan='1']) {
text-align: left;
- padding-left: 16px!important;
+ padding-left: 16px !important;
}
- .operator-text-title:last-child{
- margin-bottom: 0;
+
+ .operator-text-title:last-child {
+ margin-bottom: 0;
}