Merge remote-tracking branch 'origin/dev' into dev

src/main/webapp/HP/SC/HPSC003.js

@@ -121,6 +121,28 @@ $(function () {
         }
 
     }
+
+    //产品类型下拉联动
+    $('input[name="inqu_status-0-prdtType"]').change(function () {
+        var inInfo=new EiInfo();
+        var prdtType=$("#inqu_status-0-prdtType").val();
+        inInfo.set("inventType",prdtType);
+        EiCommunicator.send("HPPZ004", "queryComboBox", inInfo, {
+            onSuccess: function (ei) {
+                var input=$("#inqu_status-0-prdtCode");
+                dataEdition=ei.getBlock("invent_name_block_id").getMappedRows();
+                input.kendoDropDownList({
+                    valuePrimitive: true,
+                    dataTextField: "textField",
+                    dataValueField: "valueField",
+                    optionLabel:"请选择",
+                    dataSource: dataEdition,
+                    template: "#=textField#"
+                });
+            }, onFail: function (ei) {
+            }
+        }, {async: false});
+    });
 });
 
 function showUploadFile(id) {

src/main/webapp/HP/SC/HPSC003.jsp

@@ -11,17 +11,23 @@
 
     <EF:EFRegion id="inqu" title="查询条件" align-item="center"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
 
-        <div class="row" > <%--    blockId="inqu_status" row="0"   --%>
-            <EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="prdtCode" colWidth="3" cname="产品编码:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="prdtName" colWidth="3" cname="产品名称:" row="0"/>
-        </div>
-        <div class="row">
-            <EF:EFInput blockId="inqu_status" ename="planInfoNo" colWidth="3" cname="生产计划单号:" row="0"/>
+        <div class="row" > <%--    blockId="inqu_status"    --%>
+            <EF:EFInput blockId="inqu_status" ename="projCode" colWidth="3" cname="项目编号:" />
+            <EF:EFInput blockId="inqu_status" ename="projName" colWidth="3" cname="项目名称:" />
+            <EF:EFSelect ename="inqu_status-0-prdtType" cname="产品类型" colWidth="3" filter="contains"
+                         template="#=textField#" valueTemplate="#=textField#">
+                <EF:EFOption label="全部" value=""/>
+                <EF:EFCodeOption codeName="hpjx.hpkc.inventType" condition="ITEM_CODE IN ('3','4')"/>
+            </EF:EFSelect>
+            <EF:EFSelect ename="inqu_status-0-prdtCode" cname="产品名称" filter="contains" required="false" colWidth="3"
+                         template="#=textField#" valueTemplate="#=valueField#" defaultValue="请选择">
+                <EF:EFOption label="请选择" value=""/>
+                <EF:EFOptions blockId="invent_name_block_id" textField="textField" valueField="valueField"/>
+            </EF:EFSelect>
+            <EF:EFInput blockId="inqu_status" ename="planInfoNo" colWidth="3" cname="生产计划单号:" />
             <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" colWidth="3" cname="计划完成日期:"
                              format="yyyy-MM-dd"/>
-            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" row="0">
+            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" >
                 <EF:EFOption label="未审核" value="0"/>
                 <EF:EFOption label="已审核" value="1"/>
             </EF:EFSelect>