From 9aa04afc183ec77fadfa4fa70c4af7aca4669d1f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Wed, 8 Sep 2021 19:56:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chooseFlowElementCondition.html                        | 1 +
 .../property/newOaWorkflowDetail/newOaWorkflowDetail.html  | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/public/components/property/chooseFlowElementCondition/chooseFlowElementCondition.html b/public/components/property/chooseFlowElementCondition/chooseFlowElementCondition.html
index 23957e1ad..9b781e6e4 100644
--- a/public/components/property/chooseFlowElementCondition/chooseFlowElementCondition.html
+++ b/public/components/property/chooseFlowElementCondition/chooseFlowElementCondition.html
@@ -25,6 +25,7 @@
                     <option value="${auditCode=='1100'}">同意</option>
                     <option value="${auditCode=='1200'}">退回上一节点</option>
                     <option value="${auditCode=='1400'}">退回至提交者</option>
+                    <option value="${auditCode=='1500'}">结束</option>
                   </select>
                 </div>
               </div>
diff --git a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
index 3560ca32e..1f28dddc1 100644
--- a/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
+++ b/public/pages/property/newOaWorkflowDetail/newOaWorkflowDetail.html
@@ -101,10 +101,12 @@
                             <div class="col-sm-10">
                                 <select class="custom-select" v-model="newOaWorkflowDetailInfo.audit.auditCode">
                                     <option selected disabled value="">请选择</option>
-                                    <option value="1100">办理</option>
+                                    <option value="1100" v-if="newOaWorkflowDetailInfo.nextAudit.next">办理</option>
                                     <option value="1200" v-if="newOaWorkflowDetailInfo.nextAudit.back">退回</option>
                                     <option value="1400" v-if="newOaWorkflowDetailInfo.nextAudit.backIndex">退回至提交者
                                     </option>
+                                    <option value="1500" v-if="newOaWorkflowDetailInfo.nextAudit.exit">结束
+                                    </option>
                                     <option value="1300">转单</option>
                                 </select>
                             </div>
@@ -118,7 +120,8 @@
                             </div>
                         </div>
                         <!-- 办理时 判断是否指定 委托人 如果指定了 则不显示 -->
-                        <div class="form-group row" v-if="newOaWorkflowDetailInfo.audit.auditCode == '1100' && !newOaWorkflowDetailInfo.nextAudit.assignee">
+                        <div class="form-group row"
+                            v-if="newOaWorkflowDetailInfo.audit.auditCode == '1100' && newOaWorkflowDetailInfo.nextAudit.assignee == '-2'">
                             <label class="col-sm-2 col-form-label text-right">下一处理人</label>
                             <div class="col-sm-8">
                                 <input type="text" class="form-control" placeholder="必填，请选择下一处理人" disabled