From c2134f4b252488326dfcaf0c7550b8244bf953e6 Mon Sep 17 00:00:00 2001
From: zhaomeijing <zhaomeijing@syxysoft.com>
Date: Tue, 24 May 2022 12:03:56 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E9=83=A8=E9=97=A8=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9-=E6=96=B0=E5=A2=9E=E2=80=98=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=B8=8B?=
 =?UTF-8?q?=E7=BA=A7=EF=BC=8C=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E2=80=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/views/system/DepartList.vue | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/jero-web/src/views/system/DepartList.vue b/jero-web/src/views/system/DepartList.vue
index ed56fdabc..b518cefa8 100644
--- a/jero-web/src/views/system/DepartList.vue
+++ b/jero-web/src/views/system/DepartList.vue
@@ -4,13 +4,13 @@
       <a-card :bordered="false" style="padding: 12px 0;">
         <!-- 按钮操作区域 -->
         <a-row style="margin-left: 14px">
-          <!--          <a-button @click="handleAdd(1)" type="primary">{{$t('AddDepartment')}}</a-button>-->
-          <!--          <a-button @click="handleAdd(2)" type="primary">{{$t('AddSubordinate')}}</a-button>-->
+                    <a-button @click="handleAdd(1)" type="primary">{{$t('AddDepartment')}}</a-button>
+                    <a-button @click="handleAdd(2)" type="primary">{{$t('AddSubordinate')}}</a-button>
           <!--          <a-button type="primary" icon="download" @click="handleExportXls($t('DepartmentInformation'))">{{$t('export')}}</a-button>-->
           <!--          <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
           <!--            <a-button type="primary" icon="import">{{$t('import')}}</a-button>-->
           <!--          </a-upload>-->
-          <!--          <a-button :title="$t('DeleteMultiplePiecesData')" @click="batchDel" type="default">{{$t('BatchDelete')}}</a-button>-->
+                    <a-button :title="$t('DeleteMultiplePiecesData')" @click="batchDel" type="default">{{$t('BatchDelete')}}</a-button>
           <!--<a-button @click="refresh" type="default" icon="reload" :loading="loading">刷新</a-button>-->
         </a-row>
         <div style="padding-left:16px;height: 100%;">
@@ -36,6 +36,7 @@
               :selectedKeys="selectedKeys"
               :checkedKeys="checkedKeys"
               :treeData="departTree"
+              checkable
               :checkStrictly="checkStrictly"
               :autoExpandParent="false"
               @expand="onExpand"/>
@@ -95,7 +96,7 @@
                 :labelCol="labelCol"
                 :wrapperCol="wrapperCol"
                 :label="$t('OrganizationCode')">
-                <a-input :disabled="disable"
+                <a-input :disabled="disablecode"
                          :placeholder="$t('enterOrganizationCode')"
                          v-decorator="['orgCode', validatorRules.orgCode ]"/>
               </a-form-item>
@@ -159,11 +160,11 @@
               <!--                            v-decorator="['memo', {'initialValue':''}]"/>-->
               <!--              </a-form-item>-->
             </a-form>
-            <!--            <div class="anty-form-btn">-->
-            <!--              <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
-            <!--              <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}-->
-            <!--              </a-button>-->
-            <!--            </div>-->
+                        <div class="anty-form-btn">
+<!--                          <a-button @click="emptyCurrForm" type="default" htmlType="button" icon="sync">{{$t('reset')}}</a-button>-->
+                          <a-button @click="submitCurrForm" type="primary" htmlType="button" icon="form">{{$t('preservation')}}
+                          </a-button>
+                        </div>
           </a-card>
           <a-card v-else :bordered="false" style="height:248px !important;">
             <a-empty>
@@ -206,7 +207,8 @@
         loading: false,
         currFlowId: '',
         currFlowName: '',
-        disable: true,
+        disable: false,
+        disablecode: true,
         treeData: [],
         visible: false,
         departTree: [],