From da2d3ade8cedc09f65dd7b4bb1ad8132498d372e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Mon, 4 Mar 2024 12:01:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=91=98=E5=B7=A5=E5=B7=A5?=
 =?UTF-8?q?=E7=89=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oa/addWorkType/addWorkType.html           |   1 +
 .../oa/editWorkType/editWorkType.html         |   1 +
 public/pages/oa/workType/workType.html        | 185 ++++++++----------
 3 files changed, 87 insertions(+), 100 deletions(-)

diff --git a/public/components/oa/addWorkType/addWorkType.html b/public/components/oa/addWorkType/addWorkType.html
index 2677176b8..74c987164 100644
--- a/public/components/oa/addWorkType/addWorkType.html
+++ b/public/components/oa/addWorkType/addWorkType.html
@@ -26,6 +26,7 @@
                                 </option>
                                 <option value="WECHAT">微信</option>
                                 <option value="ALI_SMS">阿里短信</option>
+                                <option value="WORK_LICENSE">员工工牌</option>
                             </select>
                             <span v-if="addWorkTypeInfo.smsWay == 'WECHAT'">
                                 需要在系统下公众号中配置公众号，公众号为认证过的服务号，并且员工做了员工认证
diff --git a/public/components/oa/editWorkType/editWorkType.html b/public/components/oa/editWorkType/editWorkType.html
index 1b1aa76be..b32bd4166 100644
--- a/public/components/oa/editWorkType/editWorkType.html
+++ b/public/components/oa/editWorkType/editWorkType.html
@@ -26,6 +26,7 @@
                                 </option>
                                 <option value="WECHAT">微信</option>
                                 <option value="ALI_SMS">阿里短信</option>
+                                <option value="WORK_LICENSE">员工工牌</option>
                             </select>
                         </div>
                     </div>
diff --git a/public/pages/oa/workType/workType.html b/public/pages/oa/workType/workType.html
index 2f7f71775..29cbee709 100644
--- a/public/pages/oa/workType/workType.html
+++ b/public/pages/oa/workType/workType.html
@@ -1,111 +1,96 @@
 <div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox ">
-                <div class="ibox-title">
-                    <h5>
-                        <vc:i18n name="查询条件"></vc:i18n>
-                    </h5>
-                    <div class="ibox-tools" style="top:10px;"></div>
-                </div>
-                <div class="ibox-content">
-                    <div class="row">
-                        <div class="col-sm-2">
-                            <div class="form-group">
-                                <input type="text" :placeholder="vc.i18n('类型名称','workType')"
-                                       v-model.trim="workTypeInfo.conditions.typeName" class=" form-control">
-                            </div>
-                        </div>
-                        <div class="col-sm-2" style="margin-top: 5px;">
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryWorkTypeMethod()">
-                                <i class="fa fa-search"></i>
-                                <vc:i18n name="查询"></vc:i18n>
-                            </button>
-                            <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetWorkTypeMethod()">
-                                <i class="fa fa-repeat"></i>
-                                <vc:i18n name="重置"></vc:i18n>
-                            </button>
-                        </div>
+    <div class="ibox ">
+        <div class="ibox-title">
+            <h5>
+                <vc:i18n name="查询条件"></vc:i18n>
+            </h5>
+            <div class="ibox-tools" style="top:10px;"></div>
+        </div>
+        <div class="ibox-content">
+            <div class="row">
+                <div class="col-sm-2">
+                    <div class="form-group">
+                        <input type="text" :placeholder="vc.i18n('类型名称','workType')"
+                            v-model.trim="workTypeInfo.conditions.typeName" class=" form-control">
                     </div>
                 </div>
+                <div class="col-sm-2" style="margin-top: 5px;">
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_queryWorkTypeMethod()">
+                        <i class="fa fa-search"></i>
+                        <vc:i18n name="查询"></vc:i18n>
+                    </button>
+                    <button type="button" class="btn btn-primary btn-sm" v-on:click="_resetWorkTypeMethod()">
+                        <i class="fa fa-repeat"></i>
+                        <vc:i18n name="重置"></vc:i18n>
+                    </button>
+                </div>
             </div>
         </div>
     </div>
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="ibox">
-                <div class="ibox-title">
-                    <h5>
-                        <vc:i18n name="工作单类型" namespace="workType"></vc:i18n>
-                    </h5>
-                    <div class="ibox-tools" style="top:10px;">
-                        <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWorkTypeModal()">
-                            <i class="fa fa-plus"></i>
-                            <vc:i18n name="添加" namespace="workType"></vc:i18n>
-                        </button>
-                    </div>
-                </div>
-                <div class="ibox-content">
-                    <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
-                        <thead>
-                        <tr>
-                            <!-- <th class="text-center">
+
+    <div class="ibox">
+        <div class="ibox-title">
+            <h5>
+                <vc:i18n name="工作单类型" namespace="workType"></vc:i18n>
+            </h5>
+            <div class="ibox-tools" style="top:10px;">
+                <button type="button" class="btn btn-primary btn-sm" v-on:click="_openAddWorkTypeModal()">
+                    <i class="fa fa-plus"></i>
+                    <vc:i18n name="添加" namespace="workType"></vc:i18n>
+                </button>
+            </div>
+        </div>
+        <div class="ibox-content">
+            <table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
+                <thead>
+                    <tr>
+                        <!-- <th class="text-center">
                                 <vc:i18n name='编号' namespace='workType'></vc:i18n>
                             </th> -->
-                            <th class="text-center">
-                                <vc:i18n name='类型名称' namespace='workType'></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name='通知方式' namespace='workType'></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name='创建时间' namespace='workType'></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name='备注' namespace='workType'></vc:i18n>
-                            </th>
-                            <th class="text-center">
-                                <vc:i18n name='操作'></vc:i18n>
-                            </th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        <tr v-for="workType in workTypeInfo.workTypes">
-                            <!-- <td class="text-center">{{workType.wtId}}</td> -->
-                            <td class="text-center">{{workType.typeName}}</td>
-                            <td class="text-center" v-if="workType.smsWay == 'WECHAT'">微信</td>
-                            <td class="text-center" v-else-if="workType.smsWay == 'ALI_SMS'">阿里短信</td>
-                            <td class="text-center" v-else>未知</td>
-                            <td class="text-center">{{workType.createTime}}</td>
-                            <td class="text-center">{{workType.remark || '-'}}</td>
-                            <td class="text-center">
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openEditWorkTypeModel(workType)">
-                                        <vc:i18n name='修改'></vc:i18n>
-                                    </button>
-                                </div>
-                                <div class="btn-group">
-                                    <button class="btn-white btn btn-xs"
-                                            v-on:click="_openDeleteWorkTypeModel(workType)">
-                                        <vc:i18n name='删除'></vc:i18n>
-                                    </button>
-                                </div>
-                            </td>
-                        </tr>
-                        </tbody>
-                        <tfoot>
-                        <tr>
-                            <td colspan="5">
-                                <ul class="pagination float-right"></ul>
-                            </td>
-                        </tr>
-                        </tfoot>
-                    </table>
-                    <!-- 分页 -->
-                    <vc:create path="frame/pagination"></vc:create>
-                </div>
-            </div>
+                        <th class="text-center">
+                            <vc:i18n name='类型名称' namespace='workType'></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name='通知方式' namespace='workType'></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name='创建时间' namespace='workType'></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name='备注' namespace='workType'></vc:i18n>
+                        </th>
+                        <th class="text-center">
+                            <vc:i18n name='操作'></vc:i18n>
+                        </th>
+                    </tr>
+                </thead>
+                <tbody>
+                    <tr v-for="workType in workTypeInfo.workTypes">
+                        <!-- <td class="text-center">{{workType.wtId}}</td> -->
+                        <td class="text-center">{{workType.typeName}}</td>
+                        <td class="text-center" v-if="workType.smsWay == 'WECHAT'">微信</td>
+                        <td class="text-center" v-else-if="workType.smsWay == 'ALI_SMS'">阿里短信</td>
+                        <td class="text-center" v-else-if="workType.smsWay == 'WORK_LICENSE'">员工工牌</td>
+                        <td class="text-center" v-else>未知</td>
+                        <td class="text-center">{{workType.createTime}}</td>
+                        <td class="text-center">{{workType.remark || '-'}}</td>
+                        <td class="text-center">
+                            <div class="btn-group">
+                                <button class="btn-white btn btn-xs" v-on:click="_openEditWorkTypeModel(workType)">
+                                    <vc:i18n name='修改'></vc:i18n>
+                                </button>
+                            </div>
+                            <div class="btn-group">
+                                <button class="btn-white btn btn-xs" v-on:click="_openDeleteWorkTypeModel(workType)">
+                                    <vc:i18n name='删除'></vc:i18n>
+                                </button>
+                            </div>
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+            <!-- 分页 -->
+            <vc:create path="frame/pagination"></vc:create>
         </div>
     </div>
     <vc:create path="oa/addWorkType" callBackListener="" callBackFunction=""></vc:create>