Merge branch 'dev' of http://git.pseer.com:8800/platform/hg-smart into dev-ly

src/main/webapp/HG/SC/HGSC002.js

@@ -50,7 +50,7 @@ $(function () {
                     if(item.projCode){
                         for(let i=0;i<globalProjList.length;i++){
                             if(item.projCode === globalProjList[i]['valueField']){
-                                item['projName'] = globalProjList[i]['textField'];
+                                // item['projName'] = globalProjList[i]['textField'];
                                 template = globalProjList[i]['valueField'];
                             }
                         }
@@ -59,10 +59,10 @@ $(function () {
                 },
                 editor: function (container, options) {
                     var companyCode = options.model["companyCode"];
-                    // if(!companyCode){
-                    //     message("请先选择公司！")
-                    //     return;
-                    // }
+                    if(!companyCode){
+                        message("请先选择公司！")
+                        return;
+                    }
                     let inInfo = new EiInfo();
                     inInfo.set("inqu_status-0-companyCode", companyCode);
                     inInfo.set("field", options.field);
@@ -96,6 +96,20 @@ $(function () {
                         'onclick="showUploadFile(' + item.id + ')" >附件详情</a>';
                     return template;
                 }
+            }, {
+                field: "projName",
+                editor: function (container, options) {
+                    var companyCode = options.model["companyCode"];
+                    if (!companyCode) {
+                        message("请先选择公司！")
+                        return;
+                    }
+                    var projCode = options.model["projCode"];
+                    if (!companyCode) {
+                        message("请先选择项目编码！")
+                        return;
+                    }
+                }
             }
         ],
         loadComplete: function(grid) {
@@ -104,7 +118,14 @@ $(function () {
             grid.dataSource.bind("change", function(e) {
                 // 判断父级节点是否发生变化
                 if (e.field == "projCode") {
-                    loadChange(grid,e,"projName");
+                    // loadChange(grid,e,"projName");
+                    if(e.items[0].projCode) {
+                        for (let i = 0; i < globalProjList.length; i++) {
+                            if (e.items[0].projCode === globalProjList[i]['valueField']) {
+                                resultGrid.setCellValue(e.items[0],"projName",globalProjList[i]['textField']);
+                            }
+                        }
+                    }
                 }
                 if (e.field == "companyCode") {
                     e.items[0].projCode = "";

src/main/webapp/HG/SC/HGSC002.jsp

@@ -21,7 +21,7 @@
         </div>
     </EF:EFRegion>
     <EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" checkMode="single">
+        <EF:EFGrid blockId="result" autoDraw="override" isFloat="true" >
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <EF:EFColumn ename="createdBy" cname="创建人" hidden="true"/>
             <EF:EFColumn ename="updatedBy" cname="修改人" hidden="true"/>
@@ -30,7 +30,7 @@
             <EF:EFColumn ename="operator" cname="操作" locked="true" enable="true" width="100" align="center"/>
             <EF:EFColumn ename="companyCode" cname="公司名称" enable="true" width="120" align="center" required="true"/>
             <EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center" required="true"/>
-            <EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" readonly="true" required="true"/>
+            <EF:EFColumn ename="projName" cname="项目名称" enable="false" width="120" align="center" readonly="true"/>
             <EF:EFColumn ename="personDepName" cname="所属部门" enable="true" width="120" align="center" required="true"/>
             <EF:EFColumn ename="personName" cname="姓名" enable="true" width="120" align="center" required="true"/>
             <EF:EFColumn ename="personPhone" cname="电话" enable="true" width="120" align="center" required="true"/>