From c0d4f2ed780af4fc92756fd6b6618063029bf65d Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: Tue, 2 Jan 2024 23:45:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=B7=A5=E4=BD=9C=E5=8D=95?=
 =?UTF-8?q?=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           | 25 +++++++++++--------
 .../components/oa/addWorkType/addWorkType.js  |  8 +++---
 .../oa/editWorkType/editWorkType.html         | 11 +++++---
 .../oa/editWorkType/editWorkType.js           |  8 +++---
 .../oa/workDetailType/workDetailType.html     |  6 +++--
 public/pages/oa/workDetail/workDetail.html    |  2 +-
 public/pages/oa/workPool/workPool.html        |  8 +++++-
 public/pages/oa/workPool/workPool.js          | 14 +++++++----
 public/pages/oa/workType/workType.html        |  6 +++--
 9 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/public/components/oa/addWorkType/addWorkType.html b/public/components/oa/addWorkType/addWorkType.html
index 385a7c8dc..ebc076a5c 100644
--- a/public/components/oa/addWorkType/addWorkType.html
+++ b/public/components/oa/addWorkType/addWorkType.html
@@ -17,12 +17,20 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label">
-                            <vc:i18n name='超时时间' namespace='addWorkType'></vc:i18n>
+                            <vc:i18n name='通知方式' namespace='addWorkType'></vc:i18n>
                         </label>
                         <div class="col-sm-10">
-                            <input v-model="addWorkTypeInfo.timeout" type="number"
-                                :placeholder="vc.i18n('必填，请填写超时时间','addWorkType')" class="form-control">
+                            <select class="custom-select" v-model="addWorkTypeInfo.smsWay">
+                                <option selected disabled value="">
+                                    {{vc.i18n('必填，请选择通知方式','addWorkType')}}
+                                </option>
+                                <option value="WECHAT">微信</option>
+                                <option value="ALI_SMS">阿里短信</option>
+                            </select>
+                            <span v-if="addWorkTypeInfo.smsWay == 'WECHAT'">需要在系统下公众号中配置公众号，公众号为认证过的服务号，并且员工做了员工认证</span>
+                            <span v-if="addWorkTypeInfo.smsWay == 'ALI_SMS'">需要在系统下小区配置中配置阿里云短信信息，模版为工单待处理模版和工单完成模版</span>
                         </div>
+                        
                     </div>
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label">
@@ -35,17 +43,12 @@
                     </div>
 
                     <div class="ibox-content">
-                        <button class="btn btn-primary float-right" type="button" v-on:click="saveWorkTypeInfo()"><i
-                                class="fa fa-check"></i>&nbsp;
-                            <span>
-                                <vc:i18n name="保存"></vc:i18n>
-                            </span>
+                        <button class="btn btn-primary float-right" type="button" v-on:click="saveWorkTypeInfo()">
+                            <vc:i18n name="保存"></vc:i18n>
                         </button>
                         <button type="button" class="btn btn-warning float-right" style="margin-right:20px;"
                             data-dismiss="modal">
-                            <span>
-                                <vc:i18n name="取消"></vc:i18n>
-                            </span>
+                            <vc:i18n name="取消"></vc:i18n>
                         </button>
                     </div>
                 </div>
diff --git a/public/components/oa/addWorkType/addWorkType.js b/public/components/oa/addWorkType/addWorkType.js
index 158f9b1e7..c82130e82 100644
--- a/public/components/oa/addWorkType/addWorkType.js
+++ b/public/components/oa/addWorkType/addWorkType.js
@@ -5,7 +5,7 @@
             addWorkTypeInfo: {
                 wtId: '',
                 typeName: '',
-                timeout: '',
+                smsWay: '',
                 remark: '',
 
             }
@@ -35,11 +35,11 @@
                             errInfo: "类型名称不能超过200"
                         },
                     ],
-                    'addWorkTypeInfo.timeout': [
+                    'addWorkTypeInfo.smsWay': [
                         {
                             limit: "required",
                             param: "",
-                            errInfo: "超时时间不能为空"
+                            errInfo: "通知方式不能为空"
                         },
                     ],
                     'addWorkTypeInfo.remark': [
@@ -90,7 +90,7 @@
             clearAddWorkTypeInfo: function () {
                 $that.addWorkTypeInfo = {
                     typeName: '',
-                    timeout: '',
+                    smsWay: '',
                     remark: '',
 
                 };
diff --git a/public/components/oa/editWorkType/editWorkType.html b/public/components/oa/editWorkType/editWorkType.html
index 4b2edd400..6b781b819 100644
--- a/public/components/oa/editWorkType/editWorkType.html
+++ b/public/components/oa/editWorkType/editWorkType.html
@@ -17,11 +17,16 @@
                     </div>
                     <div class="form-group row">
                         <label class="col-sm-2 col-form-label">
-                            <vc:i18n name='超时时间' namespace='editWorkType'></vc:i18n>
+                            <vc:i18n name='通知方式' namespace='editWorkType'></vc:i18n>
                         </label>
                         <div class="col-sm-10">
-                            <input v-model="editWorkTypeInfo.timeout" type="number"
-                                :placeholder="vc.i18n('必填，请填写超时时间','editWorkType')" class="form-control">
+                            <select class="custom-select" v-model="editWorkTypeInfo.smsWay">
+                                <option selected disabled value="">
+                                    {{vc.i18n('必填，请选择通知方式','editWorkType')}}
+                                </option>
+                                <option value="WECHAT">微信</option>
+                                <option value="ALI_SMS">阿里短信</option>
+                            </select>
                         </div>
                     </div>
                     <div class="form-group row">
diff --git a/public/components/oa/editWorkType/editWorkType.js b/public/components/oa/editWorkType/editWorkType.js
index b36b0b8f4..939ffef9a 100644
--- a/public/components/oa/editWorkType/editWorkType.js
+++ b/public/components/oa/editWorkType/editWorkType.js
@@ -5,7 +5,7 @@
             editWorkTypeInfo: {
                 wtId: '',
                 typeName: '',
-                timeout: '',
+                smsWay: '',
                 remark: '',
 
             }
@@ -38,11 +38,11 @@
                             errInfo: "类型名称不能超过200"
                         },
                     ],
-                    'editWorkTypeInfo.timeout': [
+                    'editWorkTypeInfo.smsWay': [
                         {
                             limit: "required",
                             param: "",
-                            errInfo: "超时时间不能为空"
+                            errInfo: "通知方式不能为空"
                         },
                     ],
                     'editWorkTypeInfo.remark': [
@@ -94,7 +94,7 @@
                 $that.editWorkTypeInfo = {
                     wtId: '',
                     typeName: '',
-                    timeout: '',
+                    smsWay: '',
                     remark: '',
 
                 }
diff --git a/public/components/oa/workDetailType/workDetailType.html b/public/components/oa/workDetailType/workDetailType.html
index 50b04bd64..c4ae8c5df 100644
--- a/public/components/oa/workDetailType/workDetailType.html
+++ b/public/components/oa/workDetailType/workDetailType.html
@@ -6,7 +6,7 @@
                     <vc:i18n name='类型名称' namespace='workDetailType'></vc:i18n>
                 </th>
                 <th class="text-center">
-                    <vc:i18n name='超时时间' namespace='workDetailType'></vc:i18n>
+                    <vc:i18n name='通知方式' namespace='workDetailType'></vc:i18n>
                 </th>
                 <th class="text-center">
                     <vc:i18n name='创建时间' namespace='workDetailType'></vc:i18n>
@@ -20,7 +20,9 @@
             <tr v-for="type in workDetailTypeInfo.types">
                 <!-- <td class="text-center">{{workDetailType.wtId}}</td> -->
                 <td class="text-center">{{type.typeName}}</td>
-                <td class="text-center">{{type.timeout}}</td>
+                <td class="text-center" v-if="type.smsWay == 'WECHAT'">微信</td>
+                <td class="text-center" v-else-if="type.smsWay == 'ALI_SMS'">阿里短信</td>
+                <td class="text-center" v-else>未知</td>
                 <td class="text-center">{{type.createTime}}</td>
                 <td class="text-center">{{type.remark || '-'}}</td>
             </tr>
diff --git a/public/pages/oa/workDetail/workDetail.html b/public/pages/oa/workDetail/workDetail.html
index 60ca49601..d35cedac6 100644
--- a/public/pages/oa/workDetail/workDetail.html
+++ b/public/pages/oa/workDetail/workDetail.html
@@ -158,7 +158,7 @@
                     <vc:i18n name="工作单类型" namespace="workDetail"></vc:i18n>
                 </a>
             </li>
-            <li class="nav-item">
+            <li class="nav-item" v-if="workDetailInfo.workCycle == '2002'">
                 <a class="nav-link" v-bind:class="{active:workDetailInfo._currentTab == 'workDetailCycle'}"
                    v-on:click="changeTab('workDetailCycle')">
                     <vc:i18n name="工作单周期" namespace="workDetail"></vc:i18n>
diff --git a/public/pages/oa/workPool/workPool.html b/public/pages/oa/workPool/workPool.html
index 6fab6c113..0d699ff85 100644
--- a/public/pages/oa/workPool/workPool.html
+++ b/public/pages/oa/workPool/workPool.html
@@ -111,6 +111,9 @@
                                         <th class="text-center">
                                             <vc:i18n name='创建时间' namespace='workPool'></vc:i18n>
                                         </th>
+                                        <th class="text-center">
+                                            <vc:i18n name='完成时间' namespace='workPool'></vc:i18n>
+                                        </th>
                                         <th class="text-center">
                                             <vc:i18n name='操作'></vc:i18n>
                                         </th>
@@ -127,8 +130,11 @@
                                         <td class="text-center">{{work.startTime}}</br>
                                             ~{{work.endTime}}
                                         </td>
-                                        <td class="text-center">{{work.stateName}}</td>
+                                        <td class="text-center">{{work.stateName}}
+                                            <span v-if="work.state == 'C' && work.taskTimeout == 'Y'">(超时)</span>
+                                        </td>
                                         <td class="text-center">{{work.createTime}}</td>
+                                        <td class="text-center">{{work.finishTime||'-'}}</td>
                                         <td class="text-center">
                                             <div class="btn-group">
                                                 <button class="btn-white btn btn-xs"
diff --git a/public/pages/oa/workPool/workPool.js b/public/pages/oa/workPool/workPool.js
index 676a2f50c..634e0e72b 100644
--- a/public/pages/oa/workPool/workPool.js
+++ b/public/pages/oa/workPool/workPool.js
@@ -14,12 +14,12 @@
                 },{
                     name:'待处理',
                     state:'W'
-                },{
-                    name:'处理中',
-                    state:'D'
                 },{
                     name:'处理完成',
                     state:'C'
+                },{
+                    name:'超时工作单',
+                    state:'timeout'
                 }],
                 total: 0,
                 records: 1,
@@ -58,9 +58,13 @@
             _listWorkPools: function (_page, _rows) {
                 $that.workPoolInfo.conditions.page = _page;
                 $that.workPoolInfo.conditions.row = _rows;
-                var param = {
-                    params: $that.workPoolInfo.conditions
+                let param = {
+                    params: JSON.parse(JSON.stringify($that.workPoolInfo.conditions))
                 };
+                if(param.params.state == 'timeout'){
+                    param.params.state = 'C';
+                    param.params.taskTimeout = 'Y'
+                }
                 //发送get请求
                 vc.http.apiGet('/work.listWorkTask',
                     param,
diff --git a/public/pages/oa/workType/workType.html b/public/pages/oa/workType/workType.html
index 4dd58c6da..ea242c7f3 100644
--- a/public/pages/oa/workType/workType.html
+++ b/public/pages/oa/workType/workType.html
@@ -54,7 +54,7 @@
                                     <vc:i18n name='类型名称' namespace='workType'></vc:i18n>
                                 </th>
                                 <th class="text-center">
-                                    <vc:i18n name='超时时间' namespace='workType'></vc:i18n>
+                                    <vc:i18n name='通知方式' namespace='workType'></vc:i18n>
                                 </th>
                                 <th class="text-center">
                                     <vc:i18n name='创建时间' namespace='workType'></vc:i18n>
@@ -71,7 +71,9 @@
                             <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">{{workType.timeout}}</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">