放行条调整和流程配置

huigou-xt/src/main/webapp/javaScript/common.js

@@ -2,7 +2,7 @@
 Public.isReadOnly = false;//判断当前页面是否只读(查看模式)
 Public.manageTypeParmName = 'sys_Manage_Type';//系统业务管理权限参数名称
 /**只读方法匹配正则表达式**/
-Public.readOnlyAttributes = ['save*', 'update*', 'delete*', 'add*', 'insert*', 'edit*', 'remove*', 'batchUpdate*'];
+Public.readOnlyAttributes = ['save*', 'update*', 'delete*', 'add*', 'insert*', 'edit*', 'remove*', 'batchUpdate*','copy*'];
 //页面初始化方法
 $(document).ready(function () {
 	 //从参数中读取只读参数

huigou-xt/src/main/webapp/system/configtool/approvalRule/ApprovalHandlerDetailConfig.js

@@ -202,7 +202,7 @@ function initAddUIElementPermissionHandler() {
         type: 'opm',
         name: 'uiElement',
         dataIndex: 'id',
-        width: 400,
+        width: 650,
         lock: false,
         checkbox: true,
         onChoose: function () {

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

@@ -6,7 +6,7 @@ $(document).ready(function () {
     bindEvent();
 });
 function initialize(){
-
+    //if (typeof(getSubProcUnitId) =='function'&&"10" === getSubProcUnitId()) {
     UICtrl.layout("#layout", {leftWidth: 3});
 }
 
@@ -61,7 +61,7 @@ function bindEvent(){
 
 function loadGrid() {
     var toolbarOptions =null;
-    if ($("#statusId").val()==0){
+    //if ($("#statusId").val()==0){
        toolbarOptions = UICtrl.getDefaultToolbarOptions({
         addHandler: function () {
             UICtrl.addGridRow(gridManager);
@@ -82,7 +82,7 @@ function loadGrid() {
        // 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",
@@ -90,10 +90,11 @@ function loadGrid() {
             },
 
             { display: "数量", name: "quantity", width: 140, minWidth: 60, type: "string", align: "left",
-                editor: {  type: "text",mask: 'nnnn',required: true }
+                editor: {  type: "text",mask: 'nnnnnn.nn',required: true }
             },
-            { display: "单位", name: "unitTextView", width: 120, minWidth: 60, type: "string", align: "left",
-                editor: {
+            {display: "unit", name: "unit", width: "140", align: "left", type: "string", hide: true},
+            { display: "单位", name: "unitName", width: 120, minWidth: 60, type: "string", align: "left",
+                /*editor: {
                     type: 'dictionary',
                     data: {name: 'sapPermitUnit'},
                     textField: 'unitTextView',
@@ -102,6 +103,20 @@ function loadGrid() {
                     render: function (item) {
                         return item.unitTextView;
                     },required: true
+                }*/
+                editor: {
+                    required: true, type: "select",
+                    data: {
+                        type: 'system',
+                        name: "dictionary",
+                        getParam: function (item) {
+                            return {fieldName: "MEINS"}
+                        },
+                        back: {
+                            MSEHI: "unit",
+                            MSEHL: "unitName",
+                        }
+                    }
                 }
             },
             {
@@ -193,7 +208,7 @@ function copyHandler() {
         var row=rows[i];
        gridManager.addRows({
            belongings: row.belongings,
-           unitTextView: row.unitTextView,
+           unitName: row.unitName,
            unit: row.unit,
            quantity: row.quantity,
            remark: row.remark

topsun-xt/src/main/webapp/biz/topsun/sap/suppliers/suppliersDataDetail.js

@@ -24,7 +24,7 @@ function initialize(){
         UICtrl.setDisable($("#submitForm"));
         canEdit=false;
     }
-}
+ }
 
 /**
  * 流程引擎回调设置打样的id

topsun-xt/src/main/webapp/template/fxt.ftl

@@ -83,7 +83,7 @@
                     </td>
                     <td style="border-bottom-color:#000000; border-bottom-style:solid; border-bottom-width:0.75pt; border-right-color:#000000; border-right-style:solid; border-right-width:0.75pt; border-top-color:#000000; border-top-style:solid; border-top-width:0.75pt;  vertical-align:top; width:30pt">
                         <p style="margin:5pt; orphans:0; widows:0;text-align: center;width:80pt">
-                            <span style="font-family:SimSun;">${(list.unit)!''}</span>
+                            <span style="font-family:SimSun;">${(list.unitName)!''}</span>
                         </p>
                     </td>
 

topsun/src/main/java/com/huigou/topsun/sap/permit/domain/SapPermitItem.java

@@ -41,7 +41,11 @@ public class SapPermitItem extends AbstractEntity {
      */
     @Column(name = "unit")
     private String  unit;
-
+    /**
+     * 单位名称
+     */
+    @Column(name = "unit_name")
+    private String  unitName;
 
     /**
      * 备注