2024-06-20 修复工序复制bug

src/main/java/com/baosight/hggp/common/DdynamicEnum.java

@@ -204,7 +204,7 @@ public enum DdynamicEnum {
 	 * 用途：组管理下拉框
      * 编写：songx
      */
-    GROUP_RECORD_BLOCK_ID("group_record_block_id","orgId","orgCname","HGXSOrg.queryGroupComboBox"),
+    GROUP_RECORD_BLOCK_ID("group_record_block_id","orgId","orgCname","companyCode","companyName","HGXSOrg.queryGroupComboBox"),
 
     /**
      * 模块：组管理

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB001.java

@@ -43,19 +43,23 @@ public class ServiceHGSB001 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
             qarma.put(Org.FIELD_PARENT_ORG_ID,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
         qarma.clear();
 
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        if (orgList.size() > 0) {
+            String companyCode = com.baosight.hggp.util.StringUtils.isEmpty(orgList.get(0).getCompanyCode())?orgList.get(0).getOrgId():orgList.get(0).getCompanyCode();
+            outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, HGSB001.FIELD_FACTORY_CODE,companyCode);
+        }
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB002.java

@@ -6,6 +6,7 @@ import com.baosight.hggp.core.constant.CommonConstant;
 import com.baosight.hggp.core.dao.DaoUtils;
 import com.baosight.hggp.core.security.UserSessionUtils;
 import com.baosight.hggp.hg.constant.HGConstant;
+import com.baosight.hggp.hg.sb.domain.HGSB001;
 import com.baosight.hggp.hg.sb.domain.HGSB002A;
 import com.baosight.hggp.hg.sb.tools.HGSBTools;
 import com.baosight.hggp.hg.xs.domain.Org;
@@ -43,17 +44,21 @@ public class ServiceHGSB002 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();
         qarma.put(HGSB002.FIELD_COMPANY_CODE,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
         qarma.clear();
 
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        if (orgList.size() > 0) {
+            String companyCode = com.baosight.hggp.util.StringUtils.isEmpty(orgList.get(0).getCompanyCode())?orgList.get(0).getOrgId():orgList.get(0).getCompanyCode();
+            outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "companyStr",companyCode);
+        }
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB003.java

@@ -48,7 +48,7 @@ public class ServiceHGSB003 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
@@ -70,7 +70,11 @@ public class ServiceHGSB003 extends ServiceEPBase {
             }
         }
         qarma.put(HGSB003.FIELD_DELETE_FLAG,CommonConstant.YesNo.NO_0);
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID), qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID));
+        if (orgList.size() > 0) {
+            String companyCode = com.baosight.hggp.util.StringUtils.isEmpty(orgList.get(0).getCompanyCode())?orgList.get(0).getOrgId():orgList.get(0).getCompanyCode();
+            outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "companyStr",companyCode);
+        }
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004.java

@@ -47,7 +47,7 @@ public class ServiceHGSB004 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
         /*Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
@@ -58,6 +58,10 @@ public class ServiceHGSB004 extends ServiceEPBase {
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.USER_ID_BOX_BLOCK_ID),qarma);
+        if (orgList.size() > 0) {
+            String companyCode = com.baosight.hggp.util.StringUtils.isEmpty(orgList.get(0).getCompanyCode())?orgList.get(0).getOrgId():orgList.get(0).getCompanyCode();
+            outInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0, "companyStr",companyCode);
+        }
         return outInfo;
     }
 

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB004B.java

@@ -41,13 +41,13 @@ public class ServiceHGSB004B extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
             qarma.put(Org.FIELD_PARENT_ORG_ID,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
         }
-        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
+        CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
         qarma.clear();
         List<String> orgIds = HGSBTools.getOrgId();
         qarma.put(Org.FIELD_ORG_ID,orgIds);

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB005.java

@@ -44,14 +44,14 @@ public class ServiceHGSB005 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         qarma.clear();
 
         Map userCompany = HGSBTools.getUserCompany();
         if (!userCompany.isEmpty()) {
             qarma.put(Org.FIELD_PARENT_ORG_ID,userCompany.get(HGSB002.FIELD_COMPANY_CODE));
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.GROUP_RECORD_BLOCK_ID));
         qarma.clear();
 
         List<String> orgIds = HGSBTools.getOrgId();

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB006.java

@@ -37,7 +37,7 @@ public class ServiceHGSB006 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         //outInfo.getBlock(EiConstant.queryBlock).removeCol(HGSB004.FIELD_CHECK_STATUS);
         return outInfo;

src/main/java/com/baosight/hggp/hg/sb/service/ServiceHGSB007.java

@@ -40,7 +40,7 @@ public class ServiceHGSB007 extends ServiceEPBase {
         if (orgList.size()>0) {
             qarma.put(Org.FIELD_ORG_ID,orgList.get(0).getOrgId());
         }
-        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_RECORD_BOX_BLOCK_ID),qarma);
+        CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.COMPANY_BOX_BLOCK_ID));
         CommonMethod.initBlock(outInfo, Arrays.asList(DdynamicEnum.DEVICE_CODE_BOX_BLOCK_ID),null);
         return outInfo;
     }

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB001.xml

@@ -116,9 +116,9 @@
 		<isNotEmpty prepend=" AND " property="companyName">
 			COMPANY_NAME LIKE CONCAT('%', #companyName#, '%')
 		</isNotEmpty>
-		<isNotEmpty prepend=" AND " property="factoryCode">
+		<!--<isNotEmpty prepend=" AND " property="factoryCode">
 			FACTORY_CODE = #factoryCode#
-		</isNotEmpty>
+		</isNotEmpty>-->
 		<isNotEmpty prepend=" AND " property="factoryName">
 			FACTORY_NAME LIKE CONCAT('%', #factoryName#, '%')
 		</isNotEmpty>

src/main/java/com/baosight/hggp/hg/xs/sql/HGXSOrg.xml

@@ -165,8 +165,9 @@
     <!-- 查询子集组信息，仅包括生产组和下料组(递归) -->
     <select id="queryGroupComboBox" parameterClass="java.util.HashMap" resultClass="java.util.HashMap">
         SELECT
-        T2.LEVEL AS "level", T3.ORG_ID AS "orgId", CONCAT('[',T5.FACTORY_NAME,']',T3.ORG_CNAME) AS "orgCname",
-        T3.FACTORY_CODE AS "factoryCode", T5.FACTORY_NAME AS "factoryName"
+        T2.LEVEL AS "level", T3.ORG_ID AS "orgId", CONCAT(T3.ORG_CNAME,'[',T3.COMPANY_NAME,']') AS "orgCname",
+        T3.FACTORY_CODE AS "factoryCode", T5.FACTORY_NAME AS "factoryName",T3.COMPANY_CODE AS "companyCode",
+        T3.COMPANY_NAME AS "companyName"
         FROM (
             SELECT
                 @CODES AS CODES,

src/main/webapp/HG/SB/HGSB001.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");
@@ -66,6 +66,15 @@ $(function () {
                 }, {
                     field: "companyCode",
                     title: "公司名称",
+                    filter: function (option) {
+                        let companyCode = $("#inqu_status-0-factoryCode").val();
+                        if (companyCode){
+                            return _.filter(option.values, function (item) {
+                                return item["valueField"]==companyCode;
+                            })
+                        }
+                        return option.values;
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < companyCodeBox.length; i++) {
                             if (companyCodeBox[i]['valueField'] === dataItem['companyCode']){
@@ -78,11 +87,24 @@ $(function () {
                 },{
                     field: "groupCode",
                     title: "设备区域",
+                    filter: function (option) {
+                        let companyCode = option.model['companyCode'];
+                        if (companyCode){
+                            return _.filter(groupCodeBox, function (item) {
+                                return item["param1Field"]==companyCode;
+                            })
+                        }else {
+                            companyCode = $("#inqu_status-0-factoryCode").val();
+                            return _.filter(groupCodeBox, function (item) {
+                                return item["param1Field"]==companyCode;
+                            })
+                        }
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < groupCodeBox.length; i++) {
                             if (groupCodeBox[i]['valueField'] === dataItem['groupCode']) {
-                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("]")[1]
-                                return groupCodeBox[i]['textField'].split("]")[1];
+                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("[")[0]
+                                return groupCodeBox[i]['textField'].split("[")[0];
                             }
                         }
                         return dataItem["groupCode"]

src/main/webapp/HG/SB/HGSB001.jsp

@@ -21,7 +21,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
             <%--<EF:EFSelect blockId="inqu_status" row="0" ename="groupCode" cname="设备区域" colWidth="3" filter="contains">
@@ -35,6 +35,7 @@
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="purchaseDate" cname="购置日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceCode" cname="设备编码" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="factoryCode" cname="公司名称" type="hidden" colWidth="3"/>
         </div>
     </EF:EFRegion>
 
@@ -46,21 +47,21 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="false" width="120" required="false"
+                              maxLength="16" readonly="false" width="210" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="false" width="120" required="true"
+                              maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="deviceType" cname="设备类型"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="80" readonly="false" required="true"
+                              maxLength="16" width="100" readonly="false" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFCodeOption codeName="hpjx.hpsb.deviceType" />
             </EF:EFComboColumn>

src/main/webapp/HG/SB/HGSB002.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
     var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
@@ -82,6 +82,15 @@ $(function () {
                 }, {
                     field: "companyCode",
                     title: "公司名称",
+                    filter: function (option) {
+                        let companyCode = $("#inqu_status-0-companyStr").val();
+                        if (companyCode){
+                            return _.filter(option.values, function (item) {
+                                return item["valueField"]==companyCode;
+                            })
+                        }
+                        return option.values;
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < companyCodeBox.length; i++) {
                             if (companyCodeBox[i]['valueField'] === dataItem['companyCode']){
@@ -94,23 +103,24 @@ $(function () {
                 }, {
                     field: "groupCode",
                     title: "设备区域",
-                    /*filter: function (options) {
-                        var companyCode = options.model['companyCode'];
-                        if(companyCode) {
-                            // 返回我们过滤后的数据集
+                    filter: function (options) {
+                        let companyCode = options.model['companyCode'];
+                        if (companyCode){
                             return _.filter(groupCodeBox, function (item) {
-                                return item["param3Field"] === companyCode;
+                                return item["param1Field"]==companyCode;
+                            })
+                        }else {
+                            companyCode = $("#inqu_status-0-companyStr").val();
+                            return _.filter(groupCodeBox, function (item) {
+                                return item["param1Field"]==companyCode;
                             })
                         }
-                        return groupCodeBox;
-                    },*/
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < groupCodeBox.length; i++) {
                             if (groupCodeBox[i]['valueField'] === dataItem['groupCode']) {
-                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("]")[1]
-                                //dataItem['factoryCode'] = groupCodeBox[i]['param1Field']
-                                //dataItem['factoryName'] = groupCodeBox[i]['param2Field']
-                                return groupCodeBox[i]['textField'].split("]")[1];
+                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("[")[0]
+                                return groupCodeBox[i]['textField'].split("[")[0];
                             }
                         }
                         return dataItem["groupCode"]

src/main/webapp/HG/SB/HGSB002.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
                 <%--<EF:EFSelect blockId="inqu_status" row="0" ename="groupCode" cname="设备区域" colWidth="3" filter="contains">
@@ -39,6 +39,7 @@
                            startName="planStartDate" endName="planEndDate" row="0" role="date"
                            format="yyyy-MM-dd" satrtRatio="4:8" endRatio="4:8">
             </EF:EFDateSpan>
+            <EF:EFInput blockId="inqu_status" row="0" ename="companyStr" cname="公司名称" type="hidden" colWidth="3"/>
             <%--<EF:EFDatePicker blockId="inqu_status" row="0" ename="planStartDate" cname="计划开始日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="planEndDate" cname="计划结束日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>--%>
         </div>
@@ -54,12 +55,12 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="false" width="120" required="true"
+                              maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>

src/main/webapp/HG/SB/HGSB002A.js

@@ -37,8 +37,8 @@ $(function () {
                     template: function (dataItem) {
                         for (let i = 0; i < groupCodeBox.length; i++) {
                             if (groupCodeBox[i]['valueField'] === dataItem['groupCode']) {
-                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("]")[1]
-                                return groupCodeBox[i]['textField'].split("]")[1];
+                                dataItem['groupName'] = groupCodeBox[i]['textField'].split("[")[0]
+                                return groupCodeBox[i]['textField'].split("[")[0];
                             }
                         }
                         return dataItem["groupCode"]

src/main/webapp/HG/SB/HGSB002A.jsp

@@ -36,10 +36,10 @@
         <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
             <EF:EFColumn ename="id" cname="内码" hidden="true"/>
             <EF:EFColumn ename="accountCode" cname="账套" hidden="true"/>
-            <EF:EFComboColumn ename="groupCode" cname="设备区域" readonly="true"
+            <EF:EFComboColumn ename="groupCode" cname="设备区域" readonly="true" enable="false"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" width="120" required="true"
+                              maxLength="16" width="220" required="true"
                               align="center" filter="contains" sort="true">
                 <EF:EFOptions blockId="group_record_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>

src/main/webapp/HG/SB/HGSB003.js

 $(function () {
 
     var deviceCodeBox = __eiInfo.getBlock("deviceCodeBox_block_id").getMappedRows();
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
     $(".row").children().attr("class", "col-md-3");
@@ -57,6 +57,15 @@ $(function () {
                 }, {
                     field: "companyCode",
                     title: "公司名称",
+                    filter: function (option) {
+                        let companyCode = $("#inqu_status-0-companyStr").val();
+                        if (companyCode){
+                            return _.filter(option.values, function (item) {
+                                return item["valueField"]==companyCode;
+                            })
+                        }
+                        return option.values;
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < companyCodeBox.length; i++) {
                             if (companyCodeBox[i]['valueField'] === dataItem['companyCode']){

src/main/webapp/HG/SB/HGSB003.jsp

@@ -21,13 +21,14 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="applyDate" cname="申请日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="checkItem" cname="检查项" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="applyUserName" cname="申请人" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="companyStr" cname="公司名称" type="hidden" colWidth="3"/>
         </div>
     </EF:EFRegion>
 
@@ -41,7 +42,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="false" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="applyDate" cname="申请日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("groupCodeBox_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 
@@ -72,6 +72,15 @@ $(function () {
                 }, {
                     field: "companyCode",
                     title: "公司名称",
+                    filter: function (option) {
+                        let companyCode = $("#inqu_status-0-companyStr").val();
+                        if (companyCode){
+                            return _.filter(option.values, function (item) {
+                                return item["valueField"]==companyCode;
+                            })
+                        }
+                        return option.values;
+                    },
                     template: function (dataItem) {
                         for (let i = 0; i < companyCodeBox.length; i++) {
                             if (companyCodeBox[i]['valueField'] === dataItem['companyCode']){

src/main/webapp/HG/SB/HGSB004.jsp

@@ -22,12 +22,13 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="inspecDate" cname="点检日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="planCode" cname="计划单号" placeholder="模糊查询" colWidth="3"/>
             <EF:EFInput blockId="inqu_status" row="0" ename="inspecUserName" cname="点检人" placeholder="模糊查询" colWidth="3"/>
+            <EF:EFInput blockId="inqu_status" row="0" ename="companyStr" cname="公司名称" type="hidden" colWidth="3"/>
         </div>
     </EF:EFRegion>
 
@@ -42,7 +43,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="inspecDate" cname="点检日期" width="120" enable="true" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB004B.js

@@ -16,8 +16,8 @@ $(function () {
                 template: function (dataItem) {
                     for (let i = 0; i < groupCodeBox.length; i++) {
                         if (groupCodeBox[i]['valueField'] === dataItem['groupCode']) {
-                            dataItem['groupName'] = groupCodeBox[i]['textField'].split("]")[1]
-                            return groupCodeBox[i]['textField'].split("]")[1];
+                            dataItem['groupName'] = groupCodeBox[i]['textField'].split("[")[0]
+                            return groupCodeBox[i]['textField'].split("[")[0];
                         }
                     }
                     return dataItem["groupCode"]

src/main/webapp/HG/SB/HGSB004B.jsp

@@ -25,7 +25,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="groupName" cname="设备区域" placeholder="模糊查询" colWidth="3"/>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="planDate" cname="计划日期" role="date" format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -45,9 +45,9 @@
             <EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"
                               textField="textField" valueField="valueField"
-                              maxLength="16" readonly="true" width="120" required="true"
+                              maxLength="16" readonly="true" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFComboColumn ename="groupCode" cname="设备区域"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"

src/main/webapp/HG/SB/HGSB005.js

 $(function () {
 
-    var companyCodeBox = __eiInfo.getBlock("company_record_box_block_id").getMappedRows();
+    var companyCodeBox = __eiInfo.getBlock("companyBox_block_id").getMappedRows();
     //var groupCodeBox = __eiInfo.getBlock("group_record_block_id").getMappedRows();
     var userIdBox = __eiInfo.getBlock("user_block_id").getMappedRows();
 

src/main/webapp/HG/SB/HGSB005.jsp

@@ -22,7 +22,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFDatePicker blockId="inqu_status" row="0" ename="upkeepDate" cname="保养日期" role="date"
                              format="yyyy-MM-dd" parseFormats="['yyyyMMdd']" colWidth="3"/>
@@ -41,7 +41,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="200" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="upkeepDate" cname="保养日期" width="120" enable="true" readonly="false" align="center" editType="date"
                          dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>

src/main/webapp/HG/SB/HGSB006.jsp

@@ -17,7 +17,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="checkStatus" cname="点检状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                                   textField="textField" valueField="valueField"
                                   maxLength="16" readonly="true" width="120" required="true"
                                   align="center" filter="contains" sort="true">
-                    <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                    <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
                 </EF:EFComboColumn>
                 <EF:EFColumn ename="planCode" cname="计划单号" width="100" enable="false" readonly="true" align="center" required="true"/>
                 <EF:EFComboColumn ename="deviceCode" cname="设备名称"

src/main/webapp/HG/SB/HGSB007.jsp

@@ -18,7 +18,7 @@
         <div class="row">
             <EF:EFSelect blockId="inqu_status" row="0" ename="companyCode" cname="公司名称" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>
             <EF:EFInput blockId="inqu_status" row="0" ename="deviceName" cname="设备名称" placeholder="模糊查询" colWidth="3"/>
             <EF:EFSelect blockId="inqu_status" row="0" ename="upkeepStatus" cname="保养状态" colWidth="3" filter="contains">
@@ -37,7 +37,7 @@
                               textField="textField" valueField="valueField"
                               maxLength="16" readonly="true" width="120" required="true"
                               align="center" filter="contains" sort="true">
-                <EF:EFOptions blockId="company_record_box_block_id" textField="textField" valueField="valueField"/>
+                <EF:EFOptions blockId="companyBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFComboColumn>
             <EF:EFColumn ename="planCode" cname="计划单号" width="120" align="center" readonly="true" required="true"/>
             <EF:EFComboColumn ename="deviceCode" cname="设备名称"