From 826760e15781df7c8d085ed154ee96aa1a5f4715 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 20 Sep 2022 17:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=84=E7=BB=87=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=EF=BC=8C=E9=9A=90=E8=97=8F=E4=B8=BB=E7=AE=A1=E4=BA=BA?=
 =?UTF-8?q?=E5=91=98=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E7=AE=80=E7=A7=B0=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=B0=86=E9=83=A8=E9=97=A8=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=B9=E4=B8=BA=E5=8F=AA=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=80=E7=BA=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../organizationManage/organizationManage.vue | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/anrui-system-ui/src/views/organizationManage/organizationManage.vue b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
index 0c354650ea..7a4264e05c 100644
--- a/anrui-system-ui/src/views/organizationManage/organizationManage.vue
+++ b/anrui-system-ui/src/views/organizationManage/organizationManage.vue
@@ -1,7 +1,7 @@
 <template xmlns="" xmlns="" xmlns="">
   <div class="container" style="display: flex;">
     <div class="org-tree">
-      <el-tree :data="treedata" node-key="sid" :props="props" default-expand-all @node-click="handleNodeClick" :expand-on-click-node="false">
+      <el-tree :data="treedata" node-key="sid" :props="props" @node-click="handleNodeClick" :expand-on-click-node="false">
 				<span class="custom-tree-node" slot-scope="{ node, data }" @mouseenter="mouseenter(data)" @mouseleave="mouseleave(data)" @click.stop.native>
 					<span>{{ node.label || $store.getters.userInfo.Orgname }}</span>
 					<span v-show="data.del" class="handle">
@@ -42,14 +42,17 @@
           <td class="td_left"/>
         </tr>
         <tr>
-          <td>主管人员</td>
+<!--          <td>主管人员</td>-->
+<!--          <td>-->
+<!--            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>-->
+<!--              <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
+<!--              </el-option>-->
+<!--            </el-select>-->
+<!--          </td>-->
+          <td>组织简称</td>
           <td>
-            <el-select v-model="form.zgStaffSid" style="width:300px" clearable>
-              <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
-              </el-option>
-            </el-select>
+            <el-input v-model="form.orgAbbre" style="width: 30%"></el-input>
           </td>
-
           <td>分管人员</td>
           <td>
             <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
@@ -104,7 +107,7 @@
         <el-form ref="form" :inline="true" :model="form" label-width="80px">
           <el-row :gutter="20">
             <el-col :span="24">
-              <el-form-item label="部门名称">
+              <el-form-item label="组织名称">
                 <el-input v-model="page.params.name" clearable></el-input>
               </el-form-item>
               <el-form-item>
@@ -130,9 +133,9 @@
           </template>
         </el-table-column>
 
-        <el-table-column prop="name" label="部门名称" align="center"></el-table-column>
-        <el-table-column prop="orgCode" label="部门编码" align="center"></el-table-column>
-        <el-table-column prop="zgNames" label="主管" align="center"></el-table-column>
+        <el-table-column prop="name" label="组织名称" align="center"></el-table-column>
+        <el-table-column prop="orgCode" label="组织编码" align="center"></el-table-column>
+<!--        <el-table-column prop="zgNames" label="主管" align="center"></el-table-column>-->
         <el-table-column prop="fgNames" label="分管" align="center"></el-table-column>
         <!--<el-table-column prop="contactMan" label="联系人" align="center" width="100px"></el-table-column>-->
         <el-table-column prop="linkPhone" label="联系人手机号" width="110" align="center">
@@ -215,14 +218,17 @@
             <td class="td_left"/>
           </tr>
           <tr>
-            <td>主管人员</td>
+<!--            <td>主管人员</td>-->
+<!--            <td>-->
+<!--              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">-->
+<!--                <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">-->
+<!--                </el-option>-->
+<!--              </el-select>-->
+<!--            </td>-->
+            <td>组织简称</td>
             <td>
-              <el-select v-model="form.zgStaffSid" clearable style="width:300px" @change="zgStaffSidChange">
-                <el-option v-for="(item, i) in staffdata" :key="i" :label="item.name" :value="item.sid">
-                </el-option>
-              </el-select>
+              <el-input v-model="form.orgAbbre" style="width: 300px"></el-input>
             </td>
-
             <td>分管人员</td>
             <td>
               <el-select v-model="fgStaffSid" style="width:300px" filterable multiple>
@@ -310,7 +316,8 @@ export default {
         linkPerson: '',
         linkPhone: '',
         sort: '',
-        isDept: ''
+        isDept: '',
+        orgAbbre: ''
       },
       fgStaffSid: [],
       formBackup: Object.assign({}, this.form),
@@ -551,8 +558,8 @@ export default {
     querySearchAsync(queryString, cb) {
       console.log('查询条件：', queryString)
       if (
-        queryString != null &&
-        queryString != undefined &&
+        queryString !== null &&
+        queryString !== undefined &&
         queryString !== ''
       ) {
         // this.searchData({ name: queryString })