From a910e1b6217c880024a38443f5663ddbd074055d Mon Sep 17 00:00:00 2001
From: st <zhangzhiping@zoneland.net>
Date: Wed, 21 Oct 2020 13:57:27 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=80=83=E5=8B=A4=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E3=80=91=E4=BF=AE=E5=A4=8D=E7=94=B3=E8=AF=89=E6=89=93=E5=BC=80?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../source/x_component_Attendance/MyAppeal.js | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/o2web/source/x_component_Attendance/MyAppeal.js b/o2web/source/x_component_Attendance/MyAppeal.js
index 1ed2a15074..9ae36c0568 100644
--- a/o2web/source/x_component_Attendance/MyAppeal.js
+++ b/o2web/source/x_component_Attendance/MyAppeal.js
@@ -69,12 +69,12 @@ MWF.xApplication.Attendance.MyAppeal = new Class({
                         "selectText" :["","临时请假","出差","因公外出","其他"]
                     },
                     action : { "value" : "查询", type : "button", className : "filterButton", event : {
-                        click : function(){
-                            var result = this.form.getResult(true,",",true,true,false);
-                            if( !result )return;
-                            this.loadView( result );
-                        }.bind(this)
-                    }}
+                            click : function(){
+                                var result = this.form.getResult(true,",",true,true,false);
+                                if( !result )return;
+                                this.loadView( result );
+                            }.bind(this)
+                        }}
                 }
             }, this.app, this.css);
             this.form.load();
@@ -285,14 +285,17 @@ MWF.xApplication.Attendance.MyAppeal.View = new Class({
 
     },
     _openDocument: function( documentData ){
-        if(!!documentData.appealAuditInfo){
-            var workid = documentData.appealAuditInfo.workId;
-            var options = {"workId":workid, "appId": "process.Work"+workid};
-            this.app.desktop.openApplication(null, "process.Work", options);
-        }else{
-            var appeal = new MWF.xApplication.Attendance.MyAppeal.Appeal(this.explorer, documentData );
-            appeal.open();
+
+        if(documentData.appealAuditInfo){
+            if(documentData.appealAuditInfo.workId){
+                var workid = documentData.appealAuditInfo.workId;
+                var options = {"workId":workid, "appId": "process.Work"+workid};
+                this.app.desktop.openApplication(null, "process.Work", options);
+                return;
+            }
         }
+        var appeal = new MWF.xApplication.Attendance.MyAppeal.Appeal(this.explorer, documentData );
+        appeal.open();
 
     }
 
@@ -450,15 +453,15 @@ MWF.xApplication.Attendance.MyAppeal.Appeal = new Class({
                 offDutyTime : { text:"下班打卡时间",  type : "innertext"},
                 statusShow : {  text:"考勤状态", type : "innertext" },
                 appealStatusShow : { text:"审批状态",type : "innertext"},
-                processPerson1Show : {text:"审核人",type:"innertext", value : this.data.processPerson1.split("@")[0] },
+                processPerson1Show : {text:"审核人",type:"innertext", value : this.data.processPerson1?this.data.processPerson1.split("@")[0] :""},
                 appealReason : {
                     notEmpty : true,
                     text:"申述原因",
                     type : "select",
                     selectValue : ["","临时请假","出差","因公外出","其他"],
                     event : { change : function(mdi){
-                        _self.switchFieldByAppealReason(mdi.getValue());
-                    }}
+                            _self.switchFieldByAppealReason(mdi.getValue());
+                        }}
                 },
                 address : { text:"地点" },
                 selfHolidayType : {
-- 
GitLab