Skip to content

H
hg-smart
Commit ce7c9135 by liuyang
Options

2024-07-18 结算单管理新增需求： 

1.结算单管理在操作增加附件上传
2.结算单选择增加可选签证单数据
parent 472f8a9f
Showing with 238 additions and 68 deletions
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW008.java
...@@ -118,6 +118,7 @@ public class ServiceHGCW008 extends ServiceBase { ...@@ -118,6 +118,7 @@ public class ServiceHGCW008 extends ServiceBase {
} else { } else {
HGCW008.setContractDate(DateUtils.formatShort(HGCW008.getContractDate())); HGCW008.setContractDate(DateUtils.formatShort(HGCW008.getContractDate()));
this.modify(HGCW008); this.modify(HGCW008);
HGCWTools.HgCw009.update(detail1Rows);
} }
// 更新合同结算状态 // 更新合同结算状态
HGCWTools.HgCw002.updateBalanceStatus(HGCW008.getContractNumber(),HGCW008.getSettlementType() + 1); HGCWTools.HgCw002.updateBalanceStatus(HGCW008.getContractNumber(),HGCW008.getSettlementType() + 1);
......
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW008D.java
package com.baosight.hggp.hg.cw.service; package com.baosight.hggp.hg.cw.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation; import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.hg.cw.domain.HGCW003; import com.baosight.hggp.hg.cw.domain.*;
import com.baosight.hggp.hg.cw.domain.HGCW006;
import com.baosight.hggp.hg.cw.domain.HGCW007;
import com.baosight.hggp.hg.cw.domain.HGCW999;
import com.baosight.hggp.hg.cw.tools.HGCWTools; import com.baosight.hggp.hg.cw.tools.HGCWTools;
import com.baosight.hggp.util.LogUtils; import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.StringUtils; import com.baosight.hggp.util.StringUtils;
...@@ -32,6 +29,7 @@ public class ServiceHGCW008D extends ServiceBase { ...@@ -32,6 +29,7 @@ public class ServiceHGCW008D extends ServiceBase {
public EiInfo initLoad(EiInfo inInfo) { public EiInfo initLoad(EiInfo inInfo) {
try { try {
inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW003().eiMetadata); inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HGCW003().eiMetadata);
inInfo.addBlock("result3").addBlockMeta(new HGCW003().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
} }
...@@ -64,4 +62,25 @@ public class ServiceHGCW008D extends ServiceBase { ...@@ -64,4 +62,25 @@ public class ServiceHGCW008D extends ServiceBase {
return inInfo; return inInfo;
} }
@OperationLogAnnotation(operModul = "签证单",operType = "查询",operDesc = "查询")
public EiInfo query3(EiInfo inInfo) {
try {
List<String> ids = new ArrayList<>();
String appentIds = inInfo.getString("inqu_status-0-appentIds");
if (StringUtils.isNotEmpty(appentIds)) {
String[] appentIdsArr = appentIds.split(",");
for (String id : appentIdsArr) {
ids.add(id);
}
inInfo.set("inqu_status-0-ids", ids);
}
inInfo = super.query(inInfo, HGCW004.QUERY, new HGCW004(),new HGCW004().eiMetadata,"","","result3",false);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
} }
src/main/java/com/baosight/hggp/hg/cw/service/ServiceHGCW008E.java
...@@ -2,9 +2,11 @@ package com.baosight.hggp.hg.cw.service; ...@@ -2,9 +2,11 @@ package com.baosight.hggp.hg.cw.service;
import com.baosight.hggp.aspect.annotation.OperationLogAnnotation; import com.baosight.hggp.aspect.annotation.OperationLogAnnotation;
import com.baosight.hggp.hg.cw.domain.HGCW003; import com.baosight.hggp.hg.cw.domain.HGCW003;
import com.baosight.hggp.hg.cw.domain.HGCW004;
import com.baosight.hggp.hg.cw.domain.HGCW005; import com.baosight.hggp.hg.cw.domain.HGCW005;
import com.baosight.hggp.util.LogUtils; import com.baosight.hggp.util.LogUtils;
import com.baosight.hggp.util.StringUtils; import com.baosight.hggp.util.StringUtils;
import com.baosight.hggp.util.contants.ACConstants;
import com.baosight.iplat4j.core.ei.EiConstant; import com.baosight.iplat4j.core.ei.EiConstant;
import com.baosight.iplat4j.core.ei.EiInfo; import com.baosight.iplat4j.core.ei.EiInfo;
import com.baosight.iplat4j.core.exception.PlatException; import com.baosight.iplat4j.core.exception.PlatException;
...@@ -30,6 +32,7 @@ public class ServiceHGCW008E extends ServiceBase { ...@@ -30,6 +32,7 @@ public class ServiceHGCW008E extends ServiceBase {
try { try {
inInfo.addBlock("result1").addBlockMeta(new HGCW003().eiMetadata); inInfo.addBlock("result1").addBlockMeta(new HGCW003().eiMetadata);
inInfo.addBlock("result2").addBlockMeta(new HGCW003().eiMetadata); inInfo.addBlock("result2").addBlockMeta(new HGCW003().eiMetadata);
inInfo.addBlock("result3").addBlockMeta(new HGCW003().eiMetadata);
} catch (PlatException e) { } catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败"); LogUtils.setDetailMsg(inInfo, e, "初始化失败");
} }
...@@ -90,4 +93,25 @@ public class ServiceHGCW008E extends ServiceBase { ...@@ -90,4 +93,25 @@ public class ServiceHGCW008E extends ServiceBase {
return inInfo; return inInfo;
} }
@OperationLogAnnotation(operModul = "签证单",operType = "查询",operDesc = "查询")
public EiInfo query3(EiInfo inInfo) {
try {
List<String> ids = new ArrayList<>();
String appentIds = inInfo.getString("inqu_status-0-appentIds");
if (StringUtils.isNotEmpty(appentIds)) {
String[] appentIdsArr = appentIds.split(",");
for (String id : appentIdsArr) {
ids.add(id);
}
inInfo.set("inqu_status-0-ids", ids);
}
inInfo.setCell(EiConstant.queryBlock, ACConstants.ROW_CODE_0,HGCW004.FIELD_REVIEW_STATUS,"3");
inInfo = super.query(inInfo, HGCW004.QUERY, new HGCW004(),new HGCW004().eiMetadata,"","","result3",false);
} catch (Exception e) {
LogUtils.setDetailMsg(inInfo, e, "查询失败");
}
return inInfo;
}
} }
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW004.xml
...@@ -98,6 +98,9 @@ ...@@ -98,6 +98,9 @@
<isNotEmpty prepend=" AND " property="companyCodes"> <isNotEmpty prepend=" AND " property="companyCodes">
COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate> COMPANY_CODE IN <iterate close=")" open="(" conjunction="," property="companyCodes">#companyCodes[]#</iterate>
</isNotEmpty> </isNotEmpty>
<isNotEmpty prepend=" AND " property="ids">
ID NOT IN <iterate close=")" open="(" conjunction="," property="ids">#ids[]#</iterate>
</isNotEmpty>
</sql> </sql>
<select id="query" parameterClass="java.util.HashMap" <select id="query" parameterClass="java.util.HashMap"
...@@ -132,7 +135,7 @@ ...@@ -132,7 +135,7 @@
$orderBy$ $orderBy$
</isNotEmpty> </isNotEmpty>
<isEmpty property="orderBy"> <isEmpty property="orderBy">
ID asc SIGNING_DATE DESC, ID DESC
</isEmpty> </isEmpty>
</dynamic> </dynamic>
......
src/main/java/com/baosight/hggp/hg/cw/sql/HGCW009.xml
...@@ -212,29 +212,32 @@ ...@@ -212,29 +212,32 @@
<insert id="insert"> <insert id="insert">
INSERT INTO ${hggpSchema}.HGCW009 (ID, INSERT INTO ${hggpSchema}.HGCW009 (ID,
ACCOUNT_CODE, <!-- 企业编码 --> ACCOUNT_CODE, <!-- 企业编码 -->
COMPANY_CODE, <!-- 公司编码 --> COMPANY_CODE, <!-- 公司编码 -->
COMPANY_NAME, <!-- 公司名称 --> COMPANY_NAME, <!-- 公司名称 -->
SETTLEMENT_NUMBER, <!-- 结算编号 --> SETTLEMENT_NUMBER, <!-- 结算编号 -->
SETTLEMENT_BASIS, <!-- 结算依据 --> SETTLEMENT_BASIS, <!-- 结算依据 -->
TASK_NAME, <!-- 任务名称 --> TASK_NAME, <!-- 任务名称 -->
ENGINEERING_CONTENT, <!-- 工程内容 --> ENGINEERING_CONTENT, <!-- 工程内容 -->
THIS_ENGINEERING_QUANTITY, <!-- 本次结算工程量 --> THIS_ENGINEERING_QUANTITY, <!-- 本次结算工程量 -->
CUMULATIVE_ENGINEERING_QUANTITY, <!-- 至本次累计结算工程量 --> CUMULATIVE_ENGINEERING_QUANTITY, <!-- 至本次累计结算工程量 -->
UNIT, <!-- 单位 --> UNIT, <!-- 单位 -->
UNIT_PRICE, <!-- 单价 --> UNIT_PRICE, <!-- 单价 -->
TOTAL_PRICE, <!-- 总价 --> TOTAL_PRICE, <!-- 总价 -->
INVENTORY_ID, <!-- 清单ID --> INVENTORY_ID, <!-- 清单ID -->
REMARKS, <!-- 结算依据 --> REMARKS, <!-- 结算依据 -->
CREATED_BY, <!-- 记录创建者 --> CREATED_BY, <!-- 记录创建者 -->
CREATED_NAME, <!-- 记录创建名称 --> CREATED_NAME, <!-- 记录创建名称 -->
CREATED_TIME, <!-- 记录创建时间 --> CREATED_TIME, <!-- 记录创建时间 -->
UPDATED_BY, <!-- 记录修改者 --> UPDATED_BY, <!-- 记录修改者 -->
UPDATED_NAME, <!-- 记录修改名称 --> UPDATED_NAME, <!-- 记录修改名称 -->
UPDATED_TIME, <!-- 记录修改时间 --> UPDATED_TIME, <!-- 记录修改时间 -->
DEP_CODE <!-- 部门编码 --> DEP_CODE <!-- 部门编码 -->
) )
VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #settlementNumber#, #settlementBasis#, #taskName#, #engineeringContent#, #thisEngineeringQuantity#, #cumulativeEngineeringQuantity#, #unit#, #unitPrice#, #totalPrice#, #inventoryId#, #remarks#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#, #updatedTime#, #depCode#) VALUES (#id#, #accountCode#, #companyCode#, #companyName#, #settlementNumber#, #settlementBasis#, #taskName#,
#engineeringContent#, #thisEngineeringQuantity#, #cumulativeEngineeringQuantity#, #unit#, #unitPrice#,
#totalPrice#, #inventoryId#, #remarks#, #createdBy#, #createdName#, #createdTime#, #updatedBy#, #updatedName#,
#updatedTime#, #depCode#)
</insert> </insert>
<delete id="delete"> <delete id="delete">
...@@ -245,29 +248,29 @@ ...@@ -245,29 +248,29 @@
<update id="update"> <update id="update">
UPDATE ${hggpSchema}.HGCW009 UPDATE ${hggpSchema}.HGCW009
SET SET
ACCOUNT_CODE = #accountCode#, <!-- 企业编码 --> ACCOUNT_CODE = #accountCode#, <!-- 企业编码 -->
COMPANY_CODE = #companyCode#, <!-- 公司编码 --> COMPANY_CODE = #companyCode#, <!-- 公司编码 -->
COMPANY_NAME = #companyName#, <!-- 公司名称 --> COMPANY_NAME = #companyName#, <!-- 公司名称 -->
SETTLEMENT_NUMBER = #settlementNumber#, <!-- 结算编号 --> SETTLEMENT_NUMBER = #settlementNumber#, <!-- 结算编号 -->
SETTLEMENT_BASIS = #settlementBasis#, <!-- 结算依据 --> SETTLEMENT_BASIS = #settlementBasis#, <!-- 结算依据 -->
TASK_NAME = #taskName#, <!-- 任务名称 --> TASK_NAME = #taskName#, <!-- 任务名称 -->
ENGINEERING_CONTENT = #engineeringContent#, <!-- 工程内容 --> ENGINEERING_CONTENT = #engineeringContent#, <!-- 工程内容 -->
THIS_ENGINEERING_QUANTITY = #thisEngineeringQuantity#, <!-- 本次结算工程量 --> THIS_ENGINEERING_QUANTITY = #thisEngineeringQuantity#, <!-- 本次结算工程量 -->
CUMULATIVE_ENGINEERING_QUANTITY = #cumulativeEngineeringQuantity#, <!-- 至本次累计结算工程量 --> CUMULATIVE_ENGINEERING_QUANTITY = #cumulativeEngineeringQuantity#, <!-- 至本次累计结算工程量 -->
UNIT = #unit#, <!-- 单位 --> UNIT = #unit#, <!-- 单位 -->
UNIT_PRICE = #unitPrice#, <!-- 单价 --> UNIT_PRICE = #unitPrice#, <!-- 单价 -->
TOTAL_PRICE = #totalPrice#, <!-- 总价 --> TOTAL_PRICE = #totalPrice#, <!-- 总价 -->
INVENTORY_ID = #inventoryId#, <!-- 清单ID --> INVENTORY_ID = #inventoryId#, <!-- 清单ID -->
REMARKS = #remarks#, <!-- 结算依据 --> REMARKS = #remarks#, <!-- 结算依据 -->
CREATED_BY = #createdBy#, <!-- 记录创建者 --> CREATED_BY = #createdBy#, <!-- 记录创建者 -->
CREATED_NAME = #createdName#, <!-- 记录创建名称 --> CREATED_NAME = #createdName#, <!-- 记录创建名称 -->
CREATED_TIME = #createdTime#, <!-- 记录创建时间 --> CREATED_TIME = #createdTime#, <!-- 记录创建时间 -->
UPDATED_BY = #updatedBy#, <!-- 记录修改者 --> UPDATED_BY = #updatedBy#, <!-- 记录修改者 -->
UPDATED_NAME = #updatedName#, <!-- 记录修改名称 --> UPDATED_NAME = #updatedName#, <!-- 记录修改名称 -->
UPDATED_TIME = #updatedTime#, <!-- 记录修改时间 --> UPDATED_TIME = #updatedTime#, <!-- 记录修改时间 -->
DEP_CODE = #depCode# <!-- 部门编码 --> DEP_CODE = #depCode# <!-- 部门编码 -->
WHERE WHERE
ID = #id# ID = #id#
</update> </update>
<select id="queryEngineeringQuantity" resultClass="int"> <select id="queryEngineeringQuantity" resultClass="int">
......
src/main/java/com/baosight/hggp/hg/cw/tools/HGCWTools.java
...@@ -449,6 +449,14 @@ public class HGCWTools { ...@@ -449,6 +449,14 @@ public class HGCWTools {
}); });
} }
public static void update(List<Map> rows) {
rows.forEach(row -> {
HGCW009 hgcw009 = new HGCW009();
hgcw009.fromMap(row);
DaoUtils.insert(HGCW009.UPDATE, hgcw009);
});
}
/** /**
* 根据合同号获取合同清单 * 根据合同号获取合同清单
* @param settlementNumber * @param settlementNumber
......
src/main/webapp/HG/CW/HGCW008.js
...@@ -13,6 +13,8 @@ $(function() { ...@@ -13,6 +13,8 @@ $(function() {
template: function (item) { template: function (item) {
let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" ' let template = '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="contractDetailFunc(' + item.id + ')">结算单详情</a>'; + 'onclick="contractDetailFunc(' + item.id + ')">结算单详情</a>';
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+ 'onclick="fileDetailFunc(' + item.id + ')">附件详情</a>';
return template; return template;
} }
} }
...@@ -154,4 +156,13 @@ function submitFunc() { ...@@ -154,4 +156,13 @@ function submitFunc() {
} }
} }
function fileDetailFunc(id) {
JSColorbox.open({
href: "HGCW999?methodName=initLoad&inqu_status-0-bizType=JSD&inqu_status-0-matId=" + id + "&efParentFormEname=HGCW008",
title: "<div style='text-align: center;'>附件清单</div>",
width: "80%",
height: "80%",
});
}
src/main/webapp/HG/CW/HGCW008.jsp
...@@ -60,7 +60,8 @@ ...@@ -60,7 +60,8 @@
</EF:EFPage> </EF:EFPage>
<%--
<script> <script>
var ctx = "${ctx}"; var ctx = "${ctx}";
</script> </script>
<script src="${ctx}/HG/CW/HGCW008.js"></script> <script src="${ctx}/HG/CW/HGCW008.js"></script>--%>
\ No newline at end of file
src/main/webapp/HG/CW/HGCW008A.js
...@@ -170,13 +170,18 @@ function choiceFunc() { ...@@ -170,13 +170,18 @@ function choiceFunc() {
//获取已经加载的合同清单数据 //获取已经加载的合同清单数据
var inventoryIds = []; var inventoryIds = [];
var deductionIds = []; var deductionIds = [];
let appentIds = [];
let allRows = new Array(); let allRows = new Array();
allRows = detail1Grid.getDataItems(); allRows = detail1Grid.getDataItems();
if (allRows) { if (allRows) {
allRows.forEach(function (row, index) { allRows.forEach(function (row, index) {
if (row.settlementBasis == "合同内") { if (row.settlementBasis == "合同内") {
inventoryIds.push(row.inventoryId); inventoryIds.push(row.inventoryId);
} else { } else if (row.settlementBasis == "签证") {
if (row.inventoryId) {
appentIds.push(row.inventoryId);
}
}else {
if (row.inventoryId) { if (row.inventoryId) {
deductionIds.push(row.inventoryId); deductionIds.push(row.inventoryId);
} }
...@@ -184,10 +189,11 @@ function choiceFunc() { ...@@ -184,10 +189,11 @@ function choiceFunc() {
}) })
} }
if (contractType == "1") { if (contractType == "1" || contractType == "3") {
JSColorbox.open({ JSColorbox.open({
href: "HGCW008D?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber + href: "HGCW008D?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber +
"&inqu_status-0-inventoryIds=" + inventoryIds.join(","), "&inqu_status-0-inventoryIds=" + inventoryIds.join(",")+
"&inqu_status-0-appentIds=" + appentIds.join(","),
title: "<div style='text-align: center;'>合同清单</div>", title: "<div style='text-align: center;'>合同清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -199,7 +205,8 @@ function choiceFunc() { ...@@ -199,7 +205,8 @@ function choiceFunc() {
JSColorbox.open({ JSColorbox.open({
href: "HGCW008E?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber + href: "HGCW008E?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber +
"&inqu_status-0-inventoryIds=" + inventoryIds.join(",") + "&inqu_status-0-inventoryIds=" + inventoryIds.join(",") +
"&inqu_status-0-deductionIds=" + deductionIds.join(","), "&inqu_status-0-deductionIds=" + deductionIds.join(",")+
"&inqu_status-0-appentIds=" + appentIds.join(","),
title: "<div style='text-align: center;'>合同清单</div>", title: "<div style='text-align: center;'>合同清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -214,9 +221,9 @@ function choiceFunc() { ...@@ -214,9 +221,9 @@ function choiceFunc() {
} }
function choiceCallbackFunc(result1, result2) { function choiceCallbackFunc(result1, result2, result3) {
var contractType = $("#contractType").val(); var contractType = $("#contractType").val();
if (contractType == "1") { if (contractType == "1" || contractType == "3") {
$.each(result1, function(index, item) { $.each(result1, function(index, item) {
detail1Grid.dataSource.insert(); detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0); detail1Grid.setCellValue(0, "rowNo", 0);
...@@ -227,6 +234,16 @@ function choiceCallbackFunc(result1, result2) { ...@@ -227,6 +234,16 @@ function choiceCallbackFunc(result1, result2) {
detail1Grid.setCellValue(0, "inventoryId", item.id); detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh(); detail1Grid.refresh();
}) })
$.each(result2, function(index, item) {
detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0);
detail1Grid.setCellValue(0, "settlementBasis", "签证");
detail1Grid.setCellValue(0, "taskName", item.projName);
detail1Grid.setCellValue(0, "unitPrice", item.totalContractPriceIncluding);
detail1Grid.setCellValue(0, "remarks", item.contractContent);
detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh();
})
} else { } else {
$.each(result1, function(index, item) { $.each(result1, function(index, item) {
detail1Grid.dataSource.insert(); detail1Grid.dataSource.insert();
...@@ -248,6 +265,16 @@ function choiceCallbackFunc(result1, result2) { ...@@ -248,6 +265,16 @@ function choiceCallbackFunc(result1, result2) {
detail1Grid.setCellValue(0, "inventoryId", item.id); detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh(); detail1Grid.refresh();
}) })
$.each(result3, function(index, item) {
detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0);
detail1Grid.setCellValue(0, "settlementBasis", "签证");
detail1Grid.setCellValue(0, "taskName", item.projName);
detail1Grid.setCellValue(0, "unitPrice", item.totalContractPriceIncluding);
detail1Grid.setCellValue(0, "remarks", item.contractContent);
detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh();
})
} }
JSColorbox.close(); JSColorbox.close();
......
src/main/webapp/HG/CW/HGCW008A.jsp
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
</EF:EFPage> </EF:EFPage>
<script> <%--<script>
var ctx = "${ctx}"; var ctx = "${ctx}";
</script> </script>
<script src="${ctx}/HG/CW/HGCW008A.js"></script> <script src="${ctx}/HG/CW/HGCW008A.js"></script>--%>
src/main/webapp/HG/CW/HGCW008B.js
...@@ -179,12 +179,17 @@ function choiceFunc() { ...@@ -179,12 +179,17 @@ function choiceFunc() {
//获取已经加载的合同清单数据 //获取已经加载的合同清单数据
var inventoryIds = []; var inventoryIds = [];
var deductionIds = []; var deductionIds = [];
let appentIds = [];
let allRows = new Array(); let allRows = new Array();
allRows = detail1Grid.getDataItems(); allRows = detail1Grid.getDataItems();
if (allRows) { if (allRows) {
allRows.forEach(function (row, index) { allRows.forEach(function (row, index) {
if (row.settlementBasis == "合同内") { if (row.settlementBasis == "合同内") {
inventoryIds.push(row.inventoryId); inventoryIds.push(row.inventoryId);
}else if (row.settlementBasis == "签证") {
if (row.inventoryId) {
appentIds.push(row.inventoryId);
}
} else { } else {
if (row.inventoryId) { if (row.inventoryId) {
deductionIds.push(row.inventoryId); deductionIds.push(row.inventoryId);
...@@ -193,10 +198,11 @@ function choiceFunc() { ...@@ -193,10 +198,11 @@ function choiceFunc() {
}) })
} }
if (contractType == "1") { if (contractType == "1" || contractType == "3") {
JSColorbox.open({ JSColorbox.open({
href: "HGCW008D?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber + href: "HGCW008D?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber +
"&inqu_status-0-inventoryIds=" + inventoryIds.join(","), "&inqu_status-0-inventoryIds=" + inventoryIds.join(",")+
"&inqu_status-0-appentIds=" + appentIds.join(","),
title: "<div style='text-align: center;'>合同清单</div>", title: "<div style='text-align: center;'>合同清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -208,7 +214,8 @@ function choiceFunc() { ...@@ -208,7 +214,8 @@ function choiceFunc() {
JSColorbox.open({ JSColorbox.open({
href: "HGCW008E?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber + href: "HGCW008E?methodName=initLoad&inqu_status-0-contractNumber=" + contractNumber +
"&inqu_status-0-inventoryIds=" + inventoryIds.join(",") + "&inqu_status-0-inventoryIds=" + inventoryIds.join(",") +
"&inqu_status-0-deductionIds=" + deductionIds.join(","), "&inqu_status-0-deductionIds=" + deductionIds.join(",")+
"&inqu_status-0-appentIds=" + appentIds.join(","),
title: "<div style='text-align: center;'>合同清单</div>", title: "<div style='text-align: center;'>合同清单</div>",
width: "80%", width: "80%",
height: "80%", height: "80%",
...@@ -225,7 +232,7 @@ function choiceFunc() { ...@@ -225,7 +232,7 @@ function choiceFunc() {
function choiceCallbackFunc(result1, result2) { function choiceCallbackFunc(result1, result2) {
var contractType = $("#contractType").val(); var contractType = $("#contractType").val();
if (contractType == "1") { if (contractType == "1" || contractType == "3") {
$.each(result1, function(index, item) { $.each(result1, function(index, item) {
detail1Grid.dataSource.insert(); detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0); detail1Grid.setCellValue(0, "rowNo", 0);
...@@ -236,6 +243,16 @@ function choiceCallbackFunc(result1, result2) { ...@@ -236,6 +243,16 @@ function choiceCallbackFunc(result1, result2) {
detail1Grid.setCellValue(0, "inventoryId", item.id); detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh(); detail1Grid.refresh();
}) })
$.each(result2, function(index, item) {
detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0);
detail1Grid.setCellValue(0, "settlementBasis", "签证");
detail1Grid.setCellValue(0, "taskName", item.projName);
detail1Grid.setCellValue(0, "unitPrice", item.totalContractPriceIncluding);
detail1Grid.setCellValue(0, "remarks", item.contractContent);
detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh();
})
} else { } else {
$.each(result1, function(index, item) { $.each(result1, function(index, item) {
detail1Grid.dataSource.insert(); detail1Grid.dataSource.insert();
...@@ -257,6 +274,16 @@ function choiceCallbackFunc(result1, result2) { ...@@ -257,6 +274,16 @@ function choiceCallbackFunc(result1, result2) {
detail1Grid.setCellValue(0, "inventoryId", item.id); detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh(); detail1Grid.refresh();
}) })
$.each(result3, function(index, item) {
detail1Grid.dataSource.insert();
detail1Grid.setCellValue(0, "rowNo", 0);
detail1Grid.setCellValue(0, "settlementBasis", "签证");
detail1Grid.setCellValue(0, "taskName", item.projName);
detail1Grid.setCellValue(0, "unitPrice", item.totalContractPriceIncluding);
detail1Grid.setCellValue(0, "remarks", item.contractContent);
detail1Grid.setCellValue(0, "inventoryId", item.id);
detail1Grid.refresh();
})
} }
JSColorbox.close(); JSColorbox.close();
......
src/main/webapp/HG/CW/HGCW008B.jsp
...@@ -88,7 +88,8 @@ ...@@ -88,7 +88,8 @@
</EF:EFPage> </EF:EFPage>
<%--
<script> <script>
var ctx = "${ctx}"; var ctx = "${ctx}";
</script> </script>
<script src="${ctx}/HG/CW/HGCW008B.js"></script> <script src="${ctx}/HG/CW/HGCW008B.js"></script>--%>
\ No newline at end of file
src/main/webapp/HG/CW/HGCW008D.js
...@@ -6,6 +6,12 @@ $(function () { ...@@ -6,6 +6,12 @@ $(function () {
hidden: true, // true时，不显示功能按钮，但保留setting导出按钮 hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
}, },
columns: [] columns: []
},
"result2": {
toolbarConfig: {
hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
},
columns: []
} }
} }
...@@ -23,9 +29,11 @@ $(function () { ...@@ -23,9 +29,11 @@ $(function () {
*/ */
$('#confirm').on('click', function () { $('#confirm').on('click', function () {
let allRows = new Array(); let allRows = new Array();
let result3Row = new Array();
allRows = resultGrid.getCheckedRows(); allRows = resultGrid.getCheckedRows();
result3Row = result3Grid.getCheckedRows();
if (allRows.length > 0) { if (allRows.length > 0) {
parent.JSColorbox.setValueCallback(allRows); parent.JSColorbox.setValueCallback(allRows,result3Row);
} else { } else {
message("请选择至少一条合同清单！"); message("请选择至少一条合同清单！");
......
src/main/webapp/HG/CW/HGCW008D.jsp
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
<EF:EFPage title="合同清单"> <EF:EFPage title="合同清单">
<EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" /> <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" />
<EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" /> <EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" />
<EF:EFInput cname="AIDS" ename="appentIds" blockId="inqu_status" row="0" type="hidden" />
<EF:EFRegion id="result" title="合同清单"> <EF:EFRegion id="result" title="合同清单">
<EF:EFGrid blockId="result" autoDraw="override" isFloat="true"> <EF:EFGrid blockId="result" autoDraw="override" isFloat="true">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
...@@ -22,6 +23,20 @@ ...@@ -22,6 +23,20 @@
<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/> <EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result3" title="签证单">
<EF:EFGrid blockId="result3" autoDraw="override" isFloat="true" queryMethod="query3">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false"/>
<EF:EFColumn ename="projName" cname="项目名称" align="center" enable="false"/>
<EF:EFColumn ename="contractNumber" cname="主合同号" format="{0:N3}" align="center" enable="false"/>
<EF:EFColumn ename="contractName" cname="主合同名称" align="center" enable="false"/>
<EF:EFColumn ename="partyA" cname="甲方名称" align="center" enable="false"/>
<EF:EFColumn ename="partyB" cname="乙方名称" align="center" enable="false"/>
<EF:EFColumn ename="contractContent" cname="签证事由" enable="false" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" enable="false" align="center"/>
<EF:EFColumn ename="signingDate" cname="签订日期" align="center" enable="false"/>
</EF:EFGrid>
</EF:EFRegion>
<div class="row"> <div class="row">
<EF:EFButton ename="cancel" cname="取消" type="button" class="btn-align-right"/> <EF:EFButton ename="cancel" cname="取消" type="button" class="btn-align-right"/>
<EF:EFButton ename="confirm" cname="确认" type="button" class="btn-align-right"/> <EF:EFButton ename="confirm" cname="确认" type="button" class="btn-align-right"/>
......
src/main/webapp/HG/CW/HGCW008E.js
...@@ -15,6 +15,12 @@ $(function () { ...@@ -15,6 +15,12 @@ $(function () {
hidden: true, // true时，不显示功能按钮，但保留setting导出按钮 hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
}, },
columns: [] columns: []
},
"result3": {
toolbarConfig: {
hidden: true, // true时，不显示功能按钮，但保留setting导出按钮
},
columns: []
} }
} }
...@@ -33,12 +39,14 @@ $(function () { ...@@ -33,12 +39,14 @@ $(function () {
$('#confirm').on('click', function () { $('#confirm').on('click', function () {
let result1Rows = new Array(); let result1Rows = new Array();
let result2Rows = new Array(); let result2Rows = new Array();
let result3Rows = new Array();
result1Rows = result1Grid.getCheckedRows(); result1Rows = result1Grid.getCheckedRows();
result2Rows = result2Grid.getCheckedRows(); result2Rows = result2Grid.getCheckedRows();
result3Rows = result3Grid.getCheckedRows();
if (result1Rows.length > 0 || result2Rows.length > 0) { if (result1Rows.length > 0 || result2Rows.length > 0) {
parent.JSColorbox.setValueCallback(result1Rows,result2Rows); parent.JSColorbox.setValueCallback(result1Rows,result2Rows,result3Rows);
} else { } else {
message("请选择至少一条数据！"); message("请选择至少一条数据！");
return; return;
...@@ -54,6 +62,7 @@ $(function () { ...@@ -54,6 +62,7 @@ $(function () {
function query() { function query() {
result1Grid.dataSource.page(1); result1Grid.dataSource.page(1);
result2Grid.dataSource.page(1); result2Grid.dataSource.page(1);
result3Grid.dataSource.page(1);
} }
......
src/main/webapp/HG/CW/HGCW008E.jsp
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" /> <EF:EFInput cname="合同号" ename="contractNumber" blockId="inqu_status" row="0" type="hidden" />
<EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" /> <EF:EFInput cname="IDS" ename="inventoryIds" blockId="inqu_status" row="0" type="hidden" />
<EF:EFInput cname="DIDS" ename="deductionIds" blockId="inqu_status" row="0" type="hidden" /> <EF:EFInput cname="DIDS" ename="deductionIds" blockId="inqu_status" row="0" type="hidden" />
<EF:EFInput cname="AIDS" ename="appentIds" blockId="inqu_status" row="0" type="hidden" />
<EF:EFRegion id="result1" title="合同清单"> <EF:EFRegion id="result1" title="合同清单">
<EF:EFGrid blockId="result1" autoDraw="override" isFloat="true"> <EF:EFGrid blockId="result1" autoDraw="override" isFloat="true">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
...@@ -23,6 +24,20 @@ ...@@ -23,6 +24,20 @@
<EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/> <EF:EFColumn ename="laborCosts" cname="其中人工费、元" format="{0:N3}" align="center" enable="false"/>
</EF:EFGrid> </EF:EFGrid>
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result3" title="签证单">
<EF:EFGrid blockId="result3" autoDraw="override" isFloat="true" queryMethod="query3">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="projCode" cname="项目编号" align="center" enable="false"/>
<EF:EFColumn ename="projName" cname="项目名称" align="center" enable="false"/>
<EF:EFColumn ename="contractNumber" cname="主合同号" format="{0:N3}" align="center" enable="false"/>
<EF:EFColumn ename="contractName" cname="主合同名称" align="center" enable="false"/>
<EF:EFColumn ename="partyA" cname="甲方名称" align="center" enable="false"/>
<EF:EFColumn ename="partyB" cname="乙方名称" align="center" enable="false"/>
<EF:EFColumn ename="contractContent" cname="签证事由" enable="false" align="center"/>
<EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" enable="false" align="center"/>
<EF:EFColumn ename="signingDate" cname="签订日期" align="center" enable="false"/>
</EF:EFGrid>
</EF:EFRegion>
<EF:EFRegion id="result2" title="扣款单"> <EF:EFRegion id="result2" title="扣款单">
<EF:EFGrid blockId="result2" autoDraw="override" isFloat="true" queryMethod="query2"> <EF:EFGrid blockId="result2" autoDraw="override" isFloat="true" queryMethod="query2">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="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