Commit c6fe0274 by liuyang

1.合同管理添加销售计划单号

parent a2324515
...@@ -66,6 +66,11 @@ ...@@ -66,6 +66,11 @@
<EF:EFCodeOption codeName="hggp.cw.balanceStatus"/> <EF:EFCodeOption codeName="hggp.cw.balanceStatus"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput cname="创建人" ename="createdName" blockId="inqu_status" row="0" colWidth="3" /> <EF:EFInput cname="创建人" ename="createdName" blockId="inqu_status" row="0" colWidth="3" />
<EF:EFSelect ename="inqu_status-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div> </div>
</EF:EFRegion> </EF:EFRegion>
...@@ -76,6 +81,8 @@ ...@@ -76,6 +81,8 @@
sort="false"/> sort="false"/>
<EF:EFColumn ename="companyName" cname="所属公司" enable="false" width="160" align="left" <EF:EFColumn ename="companyName" cname="所属公司" enable="false" width="160" align="left"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/> hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/>
<EF:EFColumn ename="planSalesCode" cname="销售计划单号" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#planSalesCode#')? false: true}"/>
<EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false" width="140" <EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false" width="140"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#projCode#')? false: true}"/> hidden="${fn:contains(requestScope.dynamicColumnAlias, '#projCode#')? false: true}"/>
<EF:EFColumn ename="projName" cname="项目名称" enable="false" width="160" align="left" <EF:EFColumn ename="projName" cname="项目名称" enable="false" width="160" align="left"
......
...@@ -25,15 +25,16 @@ ...@@ -25,15 +25,16 @@
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="false" /> <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/> <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" required="true"/>
<EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/> <EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="4" readonly="true"/> <EF:EFInput ename="contractCategory" cname="合同类别" colWidth="3" readonly="true"/>
<%-- <EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" required="true">--%> <EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
<%-- <EF:EFOption label="-- 请选择 --" value=""/>--%> textField="textField" valueField="valueField">
<%-- <EF:EFCodeOption codeName="hggp.cw.contractCategory"/>--%> <EF:EFOption label="全部" value=""/>
<%-- </EF:EFSelect>--%> <EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div> </div>
<div class="row"> <div class="row">
<EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3" <EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3"
......
...@@ -27,15 +27,16 @@ ...@@ -27,15 +27,16 @@
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="false" /> <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="false" />
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" required="true"/> <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" required="true"/>
<EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/> <EF:EFInput ename="result-0-contractCategory" cname="合同类别" type="hidden"/>
<EF:EFInput ename="contractCategory" cname="合同类别" colWidth="4" readonly="true"/> <EF:EFInput ename="contractCategory" cname="合同类别" colWidth="3" readonly="true"/>
<%-- <EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" required="true">--%> <EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
<%-- <EF:EFOption label="-- 请选择 --" value=""/>--%> textField="textField" valueField="valueField">
<%-- <EF:EFCodeOption codeName="hggp.cw.contractCategory"/>--%> <EF:EFOption label="全部" value=""/>
<%-- </EF:EFSelect>--%> <EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div> </div>
<div class="row"> <div class="row">
<EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3" <EF:EFPopupInput ename="popupInputPartyA" cname="甲方名称" colWidth="3"
......
...@@ -22,12 +22,13 @@ ...@@ -22,12 +22,13 @@
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="4" readonly="true"/> <EF:EFInput ename="result-0-contractName" cname="合同名称" colWidth="3" readonly="true"/>
<EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="4" readonly="true" /> <EF:EFInput ename="result-0-contractNumber" cname="合同号" colWidth="3" readonly="true" />
<EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="4" filter="contains" readonly="true" enable="false"> <EF:EFSelect cname="合同类别" ename="result-0-contractCategory" colWidth="3" filter="contains" readonly="true" enable="false">
<EF:EFOption label="-- 请选择 --" value=""/> <EF:EFOption label="-- 请选择 --" value=""/>
<EF:EFCodeOption codeName="hggp.cw.contractCategory"/> <EF:EFCodeOption codeName="hggp.cw.contractCategory"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFInput ename="result-0-planSalesCode" cname="销售计划单号" colWidth="3" readonly="true"/>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="result-0-partyA" cname="甲方名称" colWidth="3" readonly="true"/> <EF:EFInput ename="result-0-partyA" cname="甲方名称" colWidth="3" readonly="true"/>
......
...@@ -47,11 +47,6 @@ ...@@ -47,11 +47,6 @@
<EF:EFOption label="全部" value=""/> <EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="customer_record_block_id" valueField="valueField" textField="textField"/> <EF:EFOptions blockId="customer_record_block_id" valueField="valueField" textField="textField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="inqu_status-0-planSalesCode" cname="销售计划单号" colWidth="3" required="false" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div> </div>
<div class="row" id="more"> <div class="row" id="more">
<EF:EFDatePicker blockId="inqu_status" row="0" ename="permissStartDate" cname="准许开工日期" <EF:EFDatePicker blockId="inqu_status" row="0" ename="permissStartDate" cname="准许开工日期"
...@@ -68,8 +63,6 @@ ...@@ -68,8 +63,6 @@
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center" <EF:EFColumn ename="operator" cname="操作" locked="true" enable="false" width="100" align="center"
sort="false"/> sort="false"/>
<EF:EFColumn ename="planSalesCode" cname="销售计划单号" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#planSalesCode#')? false: true}"/>
<EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="120" align="center" <EF:EFColumn ename="companyName" cname="公司名称" enable="false" width="120" align="center"
hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/> hidden="${fn:contains(requestScope.dynamicColumnAlias, '#companyName#')? false: true}"/>
<EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="120" align="center" <EF:EFColumn ename="projCode" cname="项目编码" enable="false" width="120" align="center"
......
...@@ -17,11 +17,6 @@ ...@@ -17,11 +17,6 @@
textField="textField" valueField="valueField"> textField="textField" valueField="valueField">
<EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/> <%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/>
<EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode" type="hidden" <EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode" type="hidden"
colWidth="4" required="true" filter="contains" defaultValue="" colWidth="4" required="true" filter="contains" defaultValue=""
......
...@@ -13,11 +13,6 @@ ...@@ -13,11 +13,6 @@
<EF:EFOption label="-- 请选择 --" value="" /> <EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/> <EF:EFOptions blockId="roleCompany" valueField="companyCode" textField="companyName"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/> <%--<EF:EFInput ename="result-0-depName" cname="部门名称" type="hidden"/>
<EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode" <EF:EFCascadeSelect cascadeFrom="result-0-companyCode" cname="部门" ename="result-0-depCode"
colWidth="4" required="true" filter="contains" defaultValue="" colWidth="4" required="true" filter="contains" defaultValue=""
......
...@@ -26,11 +26,6 @@ ...@@ -26,11 +26,6 @@
textField="textField" valueField="valueField"> textField="textField" valueField="valueField">
<EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/> <EF:EFOptions blockId="customer1_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect> </EF:EFSelect>
<EF:EFSelect ename="result-0-planSalesCode" cname="销售计划单号" colWidth="4" filter="contains"
textField="textField" valueField="valueField">
<EF:EFOption label="-- 请选择 --" value="" />
<EF:EFOptions blockId="planSalesCode_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
</div> </div>
<div class="row"> <div class="row">
<EF:EFInput ename="result-0-subcontractName" cname="乙方" colWidth="4" required="true" readonly="true"/> <EF:EFInput ename="result-0-subcontractName" cname="乙方" colWidth="4" required="true" readonly="true"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment