法规清单高级搜索修改

jero-web/src/common/lang/en-us.js

@@ -1796,4 +1796,8 @@ module.exports = {
   verify:'Verify',
   inventoryVerifyEndTime:'Inventory Verify End Time',
   taskConfirmEndTime:'Task Confirm End Time',
+  responsiblepersonfordesigncompliance:'Responsible person for design compliance',
+  responsiblepersonforverifyingcompliance:'Responsible person for verifying compliance',
+  verifytheconformancedeliverabletype:'Verify the conformance deliverable type',
+  designaconformancedeliverabletype:'Design a conformance deliverable type',
 }

jero-web/src/common/lang/zh-cn.js

@@ -1898,4 +1898,8 @@ module.exports = {
   verify:'验证',
   inventoryVerifyEndTime:'清单校核截止时间',
   taskConfirmEndTime:'责任确认截止时间',
+  responsiblepersonfordesigncompliance:'设计符合性责任人',
+  responsiblepersonforverifyingcompliance:'验证符合性责任人',
+  verifytheconformancedeliverabletype:'验证符合性交付物类型',
+  designaconformancedeliverabletype:'设计符合性交付物类型',
 }

jero-web/src/components/globalAdvancedQuery/index.vue

@@ -141,7 +141,20 @@
                   :tree-data="item.tree"
                   :placeholder="$t('PleaseSelect')"
                 />
-
+<!--                交付物类型-->
+                <template v-else-if="item.type === 'deliverables'">
+                  <a-tree-select
+                    tree-node-filter-prop="title"
+                    v-model="item.val"
+                    :maxTagCount="1"
+                    :getPopupContainer="triggerNode=> triggerNode.parentNode"
+                    class="box-input"
+                    style="width: 100%"
+                    :tree-data="DeliverableTreeList"
+                    tree-checkable
+                    :placeholder="$t('PleaseSelect')"
+                  />
+                </template>
                 <PersonnelSelection
                   v-else-if="item.type == 'Personnel'"
                   :query="{db_field_name:'valueId',db_field_txt:'',subscript:index}"
@@ -283,6 +296,7 @@
   import moment from 'moment'
   import * as utils from '@/utils/util'
   import { mixinDevice } from '@/utils/mixin'
+  import { getAction, postAction } from '@/api/manage'
   import JDate from '@/components/jero/JDate.vue'
   import JSelectDepart from '@/components/jerobiz/JSelectDepart'
   import JSelectMultiUser from '@/components/jerobiz/JSelectMultiUser'
@@ -338,6 +352,7 @@
       return {
         moment,
         fieldTreeData: [],
+        DeliverableTreeList:[],
 
         prompt: {
           visible: false,
@@ -386,6 +401,7 @@
         deep: true,
         immediate: true,
         handler(val) {
+          console.log(val,'11')
           let mainData = [], subData = []
           val.forEach(item => {
             let data = { ...item }
@@ -412,8 +428,16 @@
         }
       }
     },
-
     methods: {
+      getDeliverableTree() {
+        getAction('/sys/category/getDeliverableTree', {}).then((res) => {
+          if (res.success) {
+            this.DeliverableTreeList = res.result
+          } else {
+            this.DeliverableTreeList = []
+          }
+        })
+      },
       show() {
         if (!this.queryParamsModel || this.queryParamsModel.length === 0) {
           this.resetLine()
@@ -484,6 +508,7 @@
       },
       handleSelected(node, item) {
         console.log(node)
+        console.log(item)
         let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef
         item['type'] = type
         item['options'] = options
@@ -498,6 +523,9 @@
         this.$set(item, 'val', undefined)
         this.$set(item, 'valueName', undefined)
         this.$set(item, 'valueId', undefined)
+        if(item.type == 'deliverables'){
+          this.getDeliverableTree()
+        }
       },
       handleOpen() {
         this.show()

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

@@ -1251,18 +1251,40 @@
             text: this.$t('certificationLevel'),
             dictCode: 'attestation_rank'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           },
+          {
+            type: 'deliverables',
+            value: 'designDeliverableType',
+            text: this.$t('designaconformancedeliverabletype'),
+          },
+          {
+            type: 'deliverables',
+            value: 'verifyDeliverableType',
+            text: this.$t('verifytheconformancedeliverabletype'),
+          },
+          {
+            type: 'Personnel',
+            value: 'designDutyId',
+            valueName: 'designDutyIdName',
+            text: this.$t('responsiblepersonfordesigncompliance')
+          },
+          {
+            type: 'Personnel',
+            value: 'verifyDutyId',
+            valueName: 'verifyDutyIdName',
+            text: this.$t('responsiblepersonforverifyingcompliance')
+          },
           // {
           //   type: '',
           //   value: 'dutyTerritory',
           //   text: this.$t('areaOfResponsibility'),
           //   dictCode: 'duty_territory'//只要 dictCode 有值，无论 type 是什么，都显示为字典下拉框
           // },
-          {
-            type: 'Personnel',
-            value: 'engineeringInterfacePerson',
-            valueName: 'engineeringInterfacePersonName',
-            text: this.$t('engineeringInterfacePerson')
-          }
+          // {
+          //   type: 'Personnel',
+          //   value: 'engineeringInterfacePerson',
+          //   valueName: 'engineeringInterfacePersonName',
+          //   text: this.$t('engineeringInterfacePerson')
+          // }
         ],
         listOptions: [
           {
@@ -1414,6 +1436,7 @@
       this.JLoading = true
       this.getHeader()
       this.queryLawEngineerByProjectId()
+      this.queryengineeringInterfacePersonId()
       this.getRoleByUserId(() => {
         this.getAndUserId()
       })
@@ -1530,6 +1553,32 @@
           }
         })
       },
+      queryengineeringInterfacePersonId() {
+        let query = {
+          projectLibraryId: this.$route.query.id
+        }
+        getAction('/project/projectRelatedPersonnel/queryEngineeringInterfacePersonByProjectId', query).then((res) => {
+          if (res.success) {
+            let engineeringInterfacePerson = {
+              value: 'engineeringInterfacePerson',
+              text: this.$t('engineeringInterfacePerson'),
+              options: []
+            }
+            if (res.result && res.result.length > 0) {
+              res.result.forEach(val => {
+                engineeringInterfacePerson.options.push({
+                  value: val.id,
+                  key: val.id,
+                  label: val.userName
+                })
+              })
+            }
+            this.fieldList.push(engineeringInterfacePerson)
+          } else {
+
+          }
+        })
+      },
       //流程状态点击事件
       designFlowStatusClick(row, name) {
         let query = {}