放行条调整

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.js

@@ -60,7 +60,9 @@ function bindEvent(){
 }
 
 function loadGrid() {
-    var toolbarOptions = UICtrl.getDefaultToolbarOptions({
+    var toolbarOptions =null;
+    if ($("#statusId").val()==0){
+       toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function () {
             UICtrl.addGridRow(gridManager);
         },
@@ -79,7 +81,8 @@ function loadGrid() {
         copyHandler: copyHandler
        // impExcelDataHandler:{id:'impExcelData',img:'fa-table',text:'导入数据',click:impExcelDataHandler},
 
-    });
+     });
+    }
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             { display: "携出物品名称", name: "belongings", width: 380, minWidth: 200, type: "string", align: "left",
@@ -181,8 +184,8 @@ function getExtendedData(processAction) {
 //复制新增
 function copyHandler() {
    // var g = this;
-    var rows = gridManager.getSelectedRows();
-    if (!rows) {
+     var rows = gridManager.getSelectedRows();
+    if (rows.length == 0) {
         Public.tip('请选择数据!');
         return;
     }

topsun-xt/src/main/webapp/biz/topsun/sap/permit/sapPermitDetail.jsp

@@ -12,6 +12,7 @@
 <form class="hg-form" method="post" action="" id="submitForm">
     <x:hidden name="id"/>
     <x:hidden name="billCode"/>
+    <x:hidden name="statusId"/>
 
     <x:hidden name="fillinDate" type="datetime"/>
     <x:hidden name="fullId"/>
@@ -23,6 +24,7 @@
     <x:hidden name="positionName"/>
     <x:hidden name="personMemberId"/>
     <x:hidden name="personMemberName"/>
+
     <div class="hg-form-cols">
     <c:if test="${statusId==3}">
         <div style="float: right; margin-right: 10px;" class="btn-group" id="buttonBox">

topsun/src/main/resources/config/topsun/base/syncOrg.xml

@@ -3,7 +3,7 @@
     <query name="slicedSapPersonVoList" label="构建SAP人员结构">
         <sql-query>
             SELECT
-             o.FULL_NAME AS PARENT_FULL_NAME,
+            o.FULL_NAME AS PARENT_FULL_NAME,
             p.CODE,
             p.ID,
             p.NAME,