From 2f8dc8c9a44512291cf8710a482ea5b8f32b119c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 24 Apr 2022 16:36:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=89=8D=E6=AE=B5=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../property/selectStaff/selectStaff.html     | 22 ++++++++++++-------
 .../workflowSettingManage.html                | 14 +++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/public/components/property/selectStaff/selectStaff.html b/public/components/property/selectStaff/selectStaff.html
index 1aecfb5d2..cfcdc9217 100755
--- a/public/components/property/selectStaff/selectStaff.html
+++ b/public/components/property/selectStaff/selectStaff.html
@@ -7,9 +7,11 @@
                 </button>
                 <div class="row">
                     <div class="col-md-4 border-right padding-0">
-                        <div class="text-center"><vc:i18n name="公司信息" namespace="selectStaff"></vc:i18n></div>
-vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')<divvc.i18n(' ','selectStaff')class="vc.i18n(' ','selectStaff')staffvc.i18n(' ','selectStaff')paddingvc.i18n(' ','selectStaff')padding-top-xs">
-vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')<divvc.i18n(' ','selectStaff')class="vc.i18n(' ','selectStaff')paddingvc.i18n(' ','selectStaff')overflow-hidden"vc.i18n(' ','selectStaff'):class="{'select':selectStaffInfo.curCompanyIdvc.i18n(' ','selectStaff')==vc.i18n(' ','selectStaff')item.orgId}"vc.i18n(' ','selectStaff')v-for="(item,index)vc.i18n(' ','selectStaff')invc.i18n(' ','selectStaff')selectStaffInfo.companys"vc.i18n(' ','selectStaff')@click="_changeCompany(item)"vc.i18n(' ','selectStaff')style="cursor:pointer">
+                        <div class="text-center">
+                            <vc:i18n name="公司信息" namespace="selectStaff"></vc:i18n>
+                        </div>
+                        <div class=" staff padding padding-top-xs">
+                            <div class=" padding overflow-hidden" :class="{'select':selectStaffInfo.curCompanyId == item.orgId}" v-for="(item,index) in selectStaffInfo.companys" @click="_changeCompany(item)" style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-building-o margin-right-xs" aria-hidden="true"></i>
                                     {{item.orgName}}
@@ -18,9 +20,11 @@ vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc
                         </div>
                     </div>
                     <div class="col-md-4 border-right padding-0">
-                        <div class="text-center"><vc:i18n name="部门信息" namespace="selectStaff"></vc:i18n></div>
+                        <div class="text-center">
+                            <vc:i18n name="部门信息" namespace="selectStaff"></vc:i18n>
+                        </div>
                         <div class="padding-left staff padding  padding-top-xs">
-vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')<divvc.i18n(' ','selectStaff')class="vc.i18n(' ','selectStaff')paddingvc.i18n(' ','selectStaff')overflow-hidden"vc.i18n(' ','selectStaff'):class="{'select':selectStaffInfo.curDepartmentIdvc.i18n(' ','selectStaff')==vc.i18n(' ','selectStaff')item.orgId}"vc.i18n(' ','selectStaff')v-for="(item,index)vc.i18n(' ','selectStaff')invc.i18n(' ','selectStaff')selectStaffInfo.departments"vc.i18n(' ','selectStaff')@click="_changeDepartment(item)"vc.i18n(' ','selectStaff')style="cursor:pointer">
+                            <div class=" padding overflow-hidden" :class="{'select':selectStaffInfo.curDepartmentId == item.orgId}" v-for="(item,index) in selectStaffInfo.departments" @click="_changeDepartment(item)" style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-sitemap margin-right-xs" aria-hidden="true"></i>
                                     {{item.orgName}}
@@ -29,9 +33,11 @@ vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc
                         </div>
                     </div>
                     <div class="col-md-4 padding-0">
-                        <div class="text-center"><vc:i18n name="员工信息" namespace="selectStaff"></vc:i18n></div>
+                        <div class="text-center">
+                            <vc:i18n name="员工信息" namespace="selectStaff"></vc:i18n>
+                        </div>
                         <div class="padding-left staff padding padding-top-xs">
-vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')<divvc.i18n(' ','selectStaff')class="vc.i18n(' ','selectStaff')paddingvc.i18n(' ','selectStaff')overflow-hidden"vc.i18n(' ','selectStaff'):class="{'select':selectStaffInfo.curStaffIdvc.i18n(' ','selectStaff')==vc.i18n(' ','selectStaff')item.staffId}"vc.i18n(' ','selectStaff')v-for="(item,index)vc.i18n(' ','selectStaff')invc.i18n(' ','selectStaff')selectStaffInfo.staffs"vc.i18n(' ','selectStaff')@click="_changeStaff(item)"vc.i18n(' ','selectStaff')style="cursor:pointer">
+                            <div class=" padding overflow-hidden" :class="{'select':selectStaffInfo.curStaffId == item.staffId}" v-for="(item,index) in selectStaffInfo.staffs" @click="_changeStaff(item)" style="cursor:pointer">
                                 <span>
                                     <i class="fa fa-user margin-right-xs" aria-hidden="true"></i>
                                     {{item.name}}
@@ -47,4 +53,4 @@ vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc.i18n(' ','selectStaff')vc
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file
diff --git a/public/pages/property/workflowSettingManage/workflowSettingManage.html b/public/pages/property/workflowSettingManage/workflowSettingManage.html
index 5bbee931b..a8f73c3d4 100755
--- a/public/pages/property/workflowSettingManage/workflowSettingManage.html
+++ b/public/pages/property/workflowSettingManage/workflowSettingManage.html
@@ -2,7 +2,9 @@
     <div class="col-lg-12">
         <div class="ibox">
             <div class="ibox-title">
-                <h5><vc:i18n name="流程设置" namespace="workflowSettingManage"></vc:i18n></h5>
+                <h5>
+                    <vc:i18n name="流程设置" namespace="workflowSettingManage"></vc:i18n>
+                </h5>
                 <div class="ibox-tools" style="top:10px;">
 
                 </div>
@@ -11,13 +13,13 @@
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label"><vc:i18n name="流程名称" namespace="workflowSettingManage"></vc:i18n></label>
                     <div class="col-sm-10">
-                        <input v-model="workflowSettingInfo.flowName" type="text" disabled="disabled" :placeholder="vc.i18n('必填','workflowSettingManage')，请填写标题" class="form-control">
+                        <input v-model="workflowSettingInfo.flowName" type="text" disabled="disabled" :placeholder="vc.i18n('必填，请填写标题','workflowSettingManage')" class="form-control">
                     </div>
                 </div>
                 <div class="form-group row">
                     <label class="col-sm-2 col-form-label"><vc:i18n name="流程说明" namespace="workflowSettingManage"></vc:i18n></label>
                     <div class="col-sm-10">
-                        <textarea v-model="workflowSettingInfo.describle" class="form-control" :placeholder="vc.i18n('选填','workflowSettingManage')，请填写流程说明"></textarea>
+                        <textarea v-model="workflowSettingInfo.describle" class="form-control" :placeholder="vc.i18n('选填，请填写流程说明','workflowSettingManage')"></textarea>
                     </div>
                 </div>
                 <div class="form-group row">
@@ -121,7 +123,9 @@
     <div class="col-lg-12">
         <div class="ibox">
             <div class="ibox-title">
-                <h5><vc:i18n name="说明" namespace="workflowSettingManage"></vc:i18n></h5>
+                <h5>
+                    <vc:i18n name="说明" namespace="workflowSettingManage"></vc:i18n>
+                </h5>
                 <div class="ibox-tools" style="top:10px;">
 
                 </div>
@@ -162,4 +166,4 @@
             </div>
         </div>
     </div>
-</div>
+</div>
\ No newline at end of file