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

src/main/java/com/baosight/hggp/hg/wd/service/ServiceHGWD001C.java

@@ -89,7 +89,7 @@ public class ServiceHGWD001C extends ServiceBase {
 			List<HGWD001C> fWd001cs = MapUtils.toDaoEPBases(inInfo, HGWD001C.class);
 			for (HGWD001C fWd001c : fWd001cs) {
 				// 下载记录+1
-				HGWDTools.HgWd001.previewIncr(fWd001c.getFileId());
+				HGWDTools.HgWd001.downloadIncr(fWd001c.getFileId());
 				// 新增
 				DaoUtils.insert(HGWD001C.INSERT, fWd001c);
 			}

src/main/webapp/HG/CG/HGCG001.jsp

@@ -57,6 +57,7 @@
 			</EF:EFComboColumn>
 			<EF:EFColumn ename="purQty" cname="采购数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
+			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
 			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}" defaultValue="0"/>
 			<EF:EFColumn ename="createdName" cname="创建人" enable="false" width="100" align="center"/>
 			<EF:EFColumn ename="createdTime" cname="创建时间" enable="false" width="140" align="center"

src/main/webapp/HG/CG/HGCG001A.jsp

@@ -46,6 +46,7 @@
 			<EF:EFColumn ename="spec" cname="规格" width="120" align="center" required="true"/>
 			<EF:EFColumn ename="purQty" cname="采购数量" width="120" align="right" format="{0:N3}" required="true"/>
 			<EF:EFColumn ename="purWeight" cname="采购重量" width="120" align="right" format="{0:N3}" required="true"/>
+			<EF:EFColumn ename="planQty" cname="计划数量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="planWeight" cname="计划重量" enable="false" width="120" align="right" format="{0:N3}"/>
 			<EF:EFColumn ename="material" cname="材质" width="80" align="center" required="true"/>
 			<EF:EFColumn ename="unit" cname="单位" enable="false" width="80" align="center"/>

src/main/webapp/HG/CG/HGCG002.js

@@ -21,8 +21,8 @@ $(function () {
 								+ 'onclick="showDetail(' + item.id + ', ' + item.status + ',0, ' + item.source + ')"  >详情</a>';
 						}
 						if (!isBlank(item.id)){
-							//待审核、审核通过的，可以进行合同变更
-							if(item.status == 0 || item.status == 2)
+							//审核通过的，可以进行合同变更
+							if(item.status == 2)
 							template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
 								+ 'onclick="showDetail(' + item.id + ', ' + item.status + ', 1, ' + item.source + ')"  >合同变更</a>';
 						}

src/main/webapp/HG/CG/HGCG002B.js

@@ -102,7 +102,7 @@ $(function () {
 			beforeEdit: function (e) {
 				var status = $("#inqu_status-0-status").val();
 				let updateFlag = $("#updateFlag").val();
-				if(updateFlag == 0){
+				if(status != 0 && status != 2){
 					e.preventDefault();
 				}
 				let item = e.model;
@@ -239,21 +239,24 @@ $(window).load(function () {
 
 	initInventCode();
 	let status = $("#inqu_status-0-status").val();
-	let updateFlag = $("#updateFlag").val();
-	//只有审核的、合同变更的可以修改
-	if(updateFlag == 0){
+	if(status != 0 && status != 2){
 		$(".k-grid-add").hide();
 		$(".k-grid-save-changes").hide();
 		$(".k-grid-cancel-changes").hide();
 		$(".k-grid-delete").hide();
-	}else{
+	}else if(status == 2){
+		//审批通过的，但是点了详情
+		let updateFlag = $("#updateFlag").val();
+		if(updateFlag == 0){
+			$(".k-grid-save-changes").hide();
+		}
+	}
 	//如果不是手动录入的，并且没生成收款单的,不能新增、删除
 	let source = $("#source").val();
 	if(source == 0){
 		$(".k-grid-add").hide();
 		$(".k-grid-delete").hide();
 	}
-	}
 
 });