Merge branch 'feature/attendancece_js_0104' into 'wrdp'

考勤，前端-修复前端申述审批列表打开问题,调整弹出框显示

See merge request o2oa/o2oa!2725

o2web/source/x_component_Attendance/$Main/navi.json

@@ -82,7 +82,7 @@
       },
       {
         "access": "admin",
-        "title": "导入错误信息",
+        "title": "移动端接入错误信息",
         "id": "20.4",
         "action": "openImportedInvalidInfor"
       },

o2web/source/x_component_Attendance/$MyAppeal/listItem.json

@@ -5,7 +5,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "function(d){ return d.empName.split('@')[0] }",
     "name" : "empName",
-    "width" : "10%"
+    "width" : "20%"
   },
   {
     "title" : "考勤日期",
@@ -13,7 +13,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "recordDateString",
     "name" : "recordDateString",
-    "width" : "10%"
+    "width" : "20%"
   },
   //  {
   //    "title": "考勤状态",
@@ -29,7 +29,7 @@
     "contentStyles" : "normalTdNode",
     "item" : "appealReason",
     "name" : "appealReason",
-    "width" : "15%"
+    "width" : "20%"
   },
   {
     "title": "申述日期",
@@ -37,7 +37,7 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){ var date = d.appealDateString.split(' '); return date[0] }",
     "name" : "appealDateString",
-    "width" : "10%"
+    "width" : "20%"
   },
   {
     "title": "审批状态",
@@ -45,16 +45,16 @@
     "contentStyles": "normalTdNode",
     "item": "function( d ){  if(d.status==0){ return '待处理' }else if(d.status==-1){ return '未通过' }else if(d.status==1){ return '通过' }else{ return '' } }",
     "name" : "status",
-    "width" : "10%"
-  },
-  {
-    "title" : "审批意见",
-    "headStyles" : "normalThNode",
-    "contentStyles" : "normalTdNode",
-    "item" : "opinion1",
-    "name" : "opinion1",
-    "width" : "15%"
+    "width" : "20%"
   }
+  //{
+  //  "title" : "审批意见",
+   // "headStyles" : "normalThNode",
+   // "contentStyles" : "normalTdNode",
+   // "item" : "opinion1",
+   // "name" : "opinion1",
+   // "width" : "15%"
+  //}
   //  {
   //    "title" : "操作",
   //    "headStyles" : "normalThNode",

o2web/source/x_component_Attendance/AppealExplorer.js

@@ -337,7 +337,7 @@ MWF.xApplication.Attendance.AppealExplorer.View = new Class({
     },
     _openDocument: function( documentData ){
 
-        if(!!documentData.appealAuditInfo){
+        /*if(!!documentData.appealAuditInfo){
             var workid = documentData.appealAuditInfo.workId;
             var options = {"workId":workid, "appId": "process.Work"+workid};
             this.app.desktop.openApplication(null, "process.Work", options);
@@ -348,7 +348,17 @@ MWF.xApplication.Attendance.AppealExplorer.View = new Class({
             }else{
                 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.AppealExplorer.Appeal(this.explorer, documentData );
+        appeal.open();
 
     }
 
@@ -509,8 +519,8 @@ MWF.xApplication.Attendance.AppealExplorer.Appeal = new Class({
             "    <td styles='formTableValue' item='endTime' colspan='3'></td></tr>" +
             "<tr contain='appealDescription'><td styles='formTableTitle' lable='appealDescription'></td>"+
             "    <td styles='formTableValue' item='appealDescription' colspan='3'></td></tr>" +
-            "<tr contain='opinion1'><td styles='formTableTitle' lable='opinion1'></td>"+
-            "    <td styles='formTableValue' item='opinion1' colspan='3'></td></tr>" +
+            /*"<tr contain='opinion1'><td styles='formTableTitle' lable='opinion1'></td>"+
+            "    <td styles='formTableValue' item='opinion1' colspan='3'></td></tr>" +*/
             "</table>"
         this.createTableArea.set("html",html);
 
@@ -535,8 +545,8 @@ MWF.xApplication.Attendance.AppealExplorer.Appeal = new Class({
                 },
                 startTime : {  text:"开始日期", type : "innertext" },
                 endTime : {  text:"结束日期", type : "innertext" },
-                appealDescription : { text:"事由", type : "innertext" },
-                opinion1 : { text :"审批意见",type : "textarea" }
+                appealDescription : { text:"事由", type : "innertext" }
+                //opinion1 : { text :"审批意见",type : "textarea" }
             }
         }, this.app,this.css);
         this.document.load();

o2web/source/x_component_Attendance/MyAppeal.js

@@ -447,7 +447,7 @@ MWF.xApplication.Attendance.MyAppeal.Appeal = new Class({
             appealStatus = "申诉不通过"
         }
         this.data.appealStatusShow = appealStatus;
-
+debugger
         var html = "<table width='100%' bordr='0' cellpadding='5' cellspacing='0' styles='formTable'>"+
             "<tr><td colspan='4' styles='formTableHead'>申诉申请单</td></tr>" +
             "<tr><td styles='formTableTitle'>员工姓名</td>"+
@@ -474,8 +474,8 @@ MWF.xApplication.Attendance.MyAppeal.Appeal = new Class({
             "    <td styles='formTableValue' item='endTime' colspan='3'></td></tr>" +
             "<tr contain='appealDescription'><td styles='formTableTitle' lable='appealDescription'></td>"+
             "    <td styles='formTableValue' item='appealDescription' colspan='3'></td></tr>" +
-            "<tr contain='opinion1'><td styles='formTableTitle' lable='opinion1'></td>"+
-            "    <td styles='formTableValue' item='opinion1' colspan='3'></td></tr>" +
+            /*"<tr contain='opinion1'><td styles='formTableTitle' lable='opinion1'></td>"+
+            "    <td styles='formTableValue' item='opinion1' colspan='3'></td></tr>" +*/
             "</table>";
         this.createTableArea.set("html",html);
 
@@ -488,7 +488,7 @@ 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?this.data.processPerson1.split("@")[0] :""},
+                processPerson1Show : {text:"审核人",type:"innertext", value : this.data.appealAuditInfo?this.data.appealAuditInfo.currentProcessor.split("@")[0] :""},
                 appealReason : {
                     notEmpty : true,
                     text:"申述原因",
@@ -506,8 +506,8 @@ MWF.xApplication.Attendance.MyAppeal.Appeal = new Class({
                 },
                 startTime : {  text:"开始日期", tType : "datetime" },
                 endTime : {  text:"结束日期", tType : "datetime" },
-                appealDescription : { text:"事由" },
-                opinion1 : { text :"审批意见" }
+                appealDescription : { text:"事由" }
+                //opinion1 : { text :"审批意见" }
             }
         }, this.app,this.css);
         this.document.load();