法规清单 认证清单高级搜索逻辑修改

jero-web/src/views/projectManagement/components/certificationList/index.vue

@@ -592,18 +592,18 @@
             value: 'serialNumber',
             text: this.$t('standardNo')
           },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'sdt',
+          //   value: 'sdt',
-            valueName: 'sdtName',
+          //   valueName: 'sdtName',
-            text: this.$t('engineeringInterfacePerson')
+          //   text: this.$t('engineeringInterfacePerson')
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'dutyPerson',
+          //   value: 'dutyPerson',
-            valueName: 'dutyPersonName',
+          //   valueName: 'dutyPersonName',
-            text: this.$t('personLiable')
+          //   text: this.$t('personLiable')
-          },
+          // },
           {
             type: 'date',
             value: 'endTime',
@@ -829,6 +829,7 @@
       this.userInfoQuery = this.userInfo()
       this.getProcessStatus()
       this.getDeliverableTree()
+      this.querydreId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -878,6 +879,47 @@
           this.$message.warning(this.$t('selectLeastOne'))
         }
       },
+      querydreId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectCertificationInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'sdt',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            let personLiable = {
+              value: 'dutyPerson',
+              text: this.$t('personLiable'),
+              options: []
+            }
+            if (res.result.interfaceList && res.result.interfaceList.length > 0) {
+              res.result.interfaceList.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            if (res.result.dutyList && res.result.dutyList.length > 0) {
+              res.result.dutyList.forEach(val => {
+                personLiable.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+            this.fieldList.push(personLiable)
+          } else {
+
+          }
+        })
+      },
       getDeliverableTree() {
         getAction('/sys/category/getCertificationDeliverableTree', {}).then((res) => {
           if (res.success) {

jero-web/src/views/projectManagement/components/listOfRegulations.vue

@@ -1249,28 +1249,28 @@
             text: this.$t('certificationLevel'),
             dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
-          {
+          // {
-            type: 'deliverables',
+          //   type: 'deliverables',
-            value: 'designDeliverableType',
+          //   value: 'designDeliverableType',
-            text: this.$t('designaconformancedeliverabletype'),
+          //   text: this.$t('designaconformancedeliverabletype'),
-          },
+          // },
-          {
+          // {
-            type: 'deliverables',
+          //   type: 'deliverables',
-            value: 'verifyDeliverableType',
+          //   value: 'verifyDeliverableType',
-            text: this.$t('verifytheconformancedeliverabletype'),
+          //   text: this.$t('verifytheconformancedeliverabletype'),
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'designDutyId',
+          //   value: 'designDutyId',
-            valueName: 'designDutyIdName',
+          //   valueName: 'designDutyIdName',
-            text: this.$t('responsiblepersonfordesigncompliance')
+          //   text: this.$t('responsiblepersonfordesigncompliance')
-          },
+          // },
-          {
+          // {
-            type: 'Personnel',
+          //   type: 'Personnel',
-            value: 'verifyDutyId',
+          //   value: 'verifyDutyId',
-            valueName: 'verifyDutyIdName',
+          //   valueName: 'verifyDutyIdName',
-            text: this.$t('responsiblepersonforverifyingcompliance')
+          //   text: this.$t('responsiblepersonforverifyingcompliance')
-          },
+          // },
           // {
           //   type: '',
           //   value: 'dutyTerritory',
@@ -1435,6 +1435,8 @@
       this.getHeader()
       this.queryLawEngineerByProjectId()
       this.queryengineeringInterfacePersonId()
+      this.querydesignDutyId()
+      this.queryverifyDutyId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1577,6 +1579,59 @@
           }
         })
       },
+      querydesignDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let designDuty = {
+              value: 'designDutyId',
+              text: this.$t('responsiblepersonfordesigncompliance'),
+              options: []
+            }
+            console.log(res)
+            if (res.result.designDutyList && res.result.designDutyList.length > 0) {
+              res.result.designDutyList.forEach(val => {
+                designDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(designDuty)
+          } else {
+
+          }
+        })
+      },
+      queryverifyDutyId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectLawsInventoryEO/queryDutyPersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let verifyDuty = {
+              value: 'verifyDutyId',
+              text: this.$t('responsiblepersonforverifyingcompliance'),
+              options: []
+            }
+            if (res.result.verifyDutyList && res.result.verifyDutyList.length > 0) {
+              res.result.verifyDutyList.forEach(val => {
+                verifyDuty.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(verifyDuty)
+          } else {
+
+          }
+        })
+      },
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}