From 4e6ee68d7e9aa84f3624dd216d02ca1470b740d1 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Mon, 18 Apr 2022 16:35:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E9=A1=B9=E7=9B=AE=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9A=84=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   | 36 ++++++++++++++-----
 .../components/virtualListDetails.vue         |  8 ++---
 .../components/listOfRegulations.vue          | 18 ++++++++--
 .../projectLibrary/index.vue                  |  2 +-
 4 files changed, 48 insertions(+), 16 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 7e6982512..7a7ca0779 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -23,7 +23,8 @@
       @close="handleCancel"
       :visible="visible"
       style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <a-input-search style="margin-bottom: 8px" placeholder="Search" @change="onChange"/>
+      <a-input-search style="margin-bottom: 8px":placeholder="$t('NodeQuickLookup')"
+                      v-model="searchModel" @search="onSearch"/>
       <div class="drawer-content">
         <a-tree
           style="margin-bottom: 60px;height: 600px"
@@ -66,6 +67,7 @@
         departId: '',
         selectedKey: [],
         userIds: [],
+        searchModel:'',
         defaultExpandedKeys: [],
         defaultCheckedKeys: []
       }
@@ -77,6 +79,7 @@
       standardClick() {
         this.treeVisible = false
         this.departId = ''
+        this.searchModel = ''
         this.userIds = []
         this.userName = []
         this.queryDepartUserTreeList()
@@ -91,7 +94,7 @@
         this.userName = []
         if (info.checkedNodes && info.checkedNodes.length > 0) {
           info.checkedNodes.forEach(res => {
-            this.userIds.push(res.data.props.id)
+            this.userIds.push(res.data.props.id || res.data.props.dataRef.key)
             this.userName.push(res.data.props.title)
           })
         }
@@ -120,15 +123,30 @@
       indexclick(event) {
         this.$emit('input', event.target.value)
       },
-      onChange() {
-
+      onSearch(e) {
+        this.gData = []
+        this.departId = ''
+        this.visibleTree = false
+        if (e) {
+          this.getUserAndDepart()
+        } else {
+          this.queryDepartUserTreeList()
+        }
+      },
+      getUserAndDepart() {
+        getAction('sys/user/getUserAndDepart', { name: this.searchModel }).then((res) => {
+          this.gData = res || []
+          this.visibleTree = true
+        })
       },
       onExpand(selectedKeys, val) {
-        if (val.expanded) {
-          if (this.departId == val.node.value) {
-          } else {
-            this.departId = val.node.value
-            this.queryDepartUserTreeList()
+        if (this.searchModel == '' || !this.searchModel) {
+          if (val.expanded) {
+            if (this.departId == val.node.value) {
+            } else {
+              this.departId = val.node.value
+              this.queryDepartUserTreeList()
+            }
           }
         }
       },
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index 825014bf5..a49787aee 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -210,19 +210,19 @@
             title: this.$t('scopeOfApplication'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'shi4Yong4Fan4Wei2'
+            dataIndex: 'shi4Yong4Fan4Wei2_dictText'
           },
           {
             title: this.$t('status'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'state'
+            dataIndex: 'state_dictText'
           },
           {
             title: this.$t('correspondingStandard'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'correspondingStandard'
+            dataIndex: 'correspondingStandard_dictText'
           },
           {
             title: this.$t('zoneOfApplication'),
@@ -234,7 +234,7 @@
             title: this.$t('implementationCategory'),
             align: 'center',
             ellipsis: true,
-            dataIndex: 'implementType'
+            dataIndex: 'implementType_dictText'
           },
           {
             title: this.$t('ImplementationDate'),
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 4423148ce..1f7c5bbbf 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -40,7 +40,7 @@
             </span>
       </a-row>
     </div>
-    <div class="table-operator">
+    <div class="table-operator" v-if="isDisplay">
       <div style="float: left;margin-bottom: 19px;margin-left: 20px">
         <div class="operator-text" @click="initiateListConfirmationcClick">
           <a-icon type="solution"/>
@@ -88,7 +88,12 @@
           {{$t('BatchDelete')}}
         </div>
       </div>
-
+    </div>
+    <div class="table-operator" v-if="!isDisplay" @click="batSettingClick">
+      <div class="operator-text">
+        <a-icon type="setting"/>
+        {{$t('batSetting')}}
+      </div>
     </div>
     <div style="width: 100%">
       <a-table
@@ -149,6 +154,7 @@
   import listEditModel from './listEditModel'
   import { getAction, postAction, downloadFile, deleteAction } from '@/api/manage'
   import moment from 'moment'
+  import { mapGetters } from 'vuex'
 
   export default {
     name: 'listOfRegulations',
@@ -360,6 +366,7 @@
           }
         ],
         confirmLoading: false,
+        isDisplay: true,
         selectedRowKeys: [],
         visible: false,
         formInline: {},
@@ -386,10 +393,17 @@
         dataSource: []
       }
     },
+
     mounted() {
+      if (this.$route.query.studioEngineer == this.userInfo().id) {
+        this.isDisplay = true
+      } else {
+        this.isDisplay = false
+      }
       this.getList()
     },
     methods: {
+      ...mapGetters(['userInfo']),
       handleModule() {
 
       },
diff --git a/jero-web/src/views/projectManagement/projectLibrary/index.vue b/jero-web/src/views/projectManagement/projectLibrary/index.vue
index cd7566a88..3824553c6 100644
--- a/jero-web/src/views/projectManagement/projectLibrary/index.vue
+++ b/jero-web/src/views/projectManagement/projectLibrary/index.vue
@@ -123,7 +123,7 @@
         <span slot="operation" slot-scope="text,record">
             <a class="text-operation" @click="edit(record)">{{$t('edit')}}</a>
             <a class="text-operation" @click="deleteLib(record)">{{$t('deleteLib')}}</a>
-          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>
+<!--          <a class="text-operation" @click="entryNameClick(record)">{{$t('see')}}</a>-->
         </span>
       </a-table>
     </div>