EP ECN问题修改

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.js

-var gridManager = null,stockGridManager = null;
+var gridManager = null,stockGridManager = null,orgRoot = null;
 
 $(document).ready(function () {
     initialize();
@@ -56,8 +56,8 @@ function bindEvent(){
         },
         onChange: function (value, data) {
             $('#process').val(data.process);
-            $('#material').val(value.material);
-            $('#productionSolutionId').val(value.productionSolutionId);
+            $('#material').val(data.material);
+            $('#productionSolutionId').val(data.productionSolutionId);
         }
     });
 
@@ -83,32 +83,43 @@ function loadGrid() {
     });
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
-            {display : "部门",name : "deptName",width : 200,minWidth : 100,type : "string",align : "left",
-                editor: { required : true,  type: "dynamic",
-                    getEditor:function (row) {
-                        var org =  "return { type:'tree',data:{name:'org',filter:'ogn',getParam:function(){return {orgRoot:'orgRoot',orgKindId:'ogn'};}},textField:'deptName',valueField:'deptId' }";
-                        org = (new Function(org))();
-                        return org;
-                    }
-                }
-            },
+            // {display : "部门",name : "deptName",width : 200,minWidth : 100,type : "string",align : "left",
+            //     editor: { required : true,  type: "dynamic",
+            //         getEditor:function (row) {
+            //             var org =  "return { type:'tree',data:{name:'org',filter:'ogn',getParam:function(){return {orgRoot:'orgRoot',orgKindId:'ogn'};}},textField:'deptName',valueField:'deptId' }";
+            //             org = (new Function(org))();
+            //             return org;
+            //         }
+            //     }
+            // },
             {
-                display: "部门", name: "deptId", width: 200, minWidth: 60, type: "string", align: "left",
+                display: "部门", name: "deptName", width: 200, minWidth: 60, type: "string", align: "left",
+                // editor: {
+                //     type: 'tree',
+                //     required: true,
+                //     data: {
+                //         name: 'org',
+                //         filter: 'dpt',
+                //         minWidth: 250,
+                //         getParam:function(){
+                //                 return {
+                //                     orgRoot: "orgRoot",
+                //                     orgKindId: "ogn,dpt"
+                //                 }
+                //             },
+                //         },
+                //     textField: 'deptName'
+                // }
                 editor: {
                     type: 'tree',
                     required: true,
                     data: {
                         name: 'org',
-                        filter: 'ogn,dpt',
+                        filter: 'dpt',
                         minWidth: 250,
-                        getParam:function(){
-                                return {
-                                    orgRoot: "orgRoot",
-                                    orgKindId: "ogn,dpt"
-                                }
-                            },
-                        },
-                    textField: 'deptId'
+                    },
+                    textField: 'deptName',
+                    valueField: 'deptId'
                 }
             },
             {
@@ -120,7 +131,10 @@ function loadGrid() {
                     data: {
                         name: 'org',
                         filter: 'psm',
-                        minWidth: 250
+                        minWidth: 250,
+                        param: {
+                            orgRoot: "18FFF477AEEE4609B798015231B400C3"
+                        }
                     },
                     textField: 'executor',
                     valueField: 'executorId'

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormDetail.jsp

@@ -25,7 +25,7 @@
     <x:hidden name="statusId"/>
     <div class="hg-form-cols">
         <div class="hg-form-row">
-            <x:inputC name="fillinDate" required="false" readonly="true" label="日期" labelCol="2" maxLength="64" fieldCol="2"/>
+            <x:inputC name="fillinDate" required="false" readonly="true" label="日期" labelCol="2" maxLength="64" fieldCol="2" wrapper="dateTime"/>
             <x:inputC name="brandName" required="true" label="品牌名称" labelCol="2" fieldCol="2" wrapper="select"/>
             <x:hidden name="brandCode"/>
             <x:inputC name="deptNameAndPersonName" required="false" readonly="true" label="变更申请部门/姓名" labelCol="2" fieldCol="2"/>

topsun-xt/src/main/webapp/biz/topsun/ep/change/epChangeFormList.js

@@ -15,12 +15,14 @@ function loadGrid() {
     gridManager = UICtrl.grid("#maingrid", {
         columns: [
             {display: "单据编号", name: "billCode", width: 150, minWidth: 60, type: "string", align: "left"},
-            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "string", align: "left"},
+            {display: "创建日期", name: "fillinDate", width: 120, minWidth: 60, type: "date", align: "left"},
             {display: "申请人", name: "personMemberName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "申请部门", name: "deptName", width: 120, minWidth: 60, type: "string", align: "left"},
             {display: "产品代号", name: "pd", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "产品名称", name: "productName", width: 200, minWidth: 60, type: "string", align: "left"},
             {display: "审批状态", name: "statusTextView", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "状态码", name: "code", width: 100, minWidth: 60, type: "string", align: "left"},
+            {display: "消息", name: "msg", width: 300, minWidth: 60, type: "string", align: "left"},
         ],
         dataAction: "server",
         url: web_app.name + '/epChangeForm/slicedEpChangeFormList.ajax',

topsun/src/main/java/com/huigou/topsun/ep/change/application/impl/EpChangeFormApplicationImpl.java

@@ -171,7 +171,7 @@ public class EpChangeFormApplicationImpl extends FlowBroker implements EpChangeF
         //日志记录
         Map<String, Object> resultMap = new HashMap<>();
         try {
-            String execute = httpClient.executeForEp(map, "/api/pro/productionSolution/openEcn?productionSolutionId="+epChangeForm.getProductionSolutionId());
+            String execute = httpClient.executeForEp(map, "pro/productionSolution/openEcn?productionSolutionId="+epChangeForm.getProductionSolutionId());
             EpResult epResult = JSONObject.parseObject(execute, EpResult.class);
             resultMap.put("TYPE", epResult.getCode());
             resultMap.put("message", epResult.getMsg());