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

src/main/java/com/baosight/hggp/hg/cg/service/ServiceHGCG001.java

@@ -101,6 +101,7 @@ public class ServiceHGCG001 extends ServiceBase {
 			// 写入数据
 			for (int i = 0; i < fCg001s.size(); i++) {
 				HGCG001 hgcg001 = fCg001s.get(i);
+				hgcg001.setPlanDate(DateUtils.formatShort(hgcg001.getPlanDate()));
 				if (hgcg001.getId() == null || hgcg001.getId() == 0) {
 					// 修改数据
 					this.saveData(hgcg001);

src/main/java/com/baosight/hggp/hg/cg/sql/HGCG001.xml

@@ -210,6 +210,19 @@
     </update>
 
     <!-- 修改采购信息 -->
+    <update id="update">
+        UPDATE ${hggpSchema}.HGCG001
+        SET
+        COMPANY_CODE = #companyCode#,
+        COMPANY_NAME = #companyName#,
+        PROJ_CODE = #projCode#,
+        PROJ_NAME = #projName#,
+        PLAN_DATE = #planDate#,
+        <include refid="updateRevise"/>
+        WHERE PLAN_NO = #planNo#
+    </update>
+
+    <!-- 修改采购信息 -->
 	<update id="updatePur">
         UPDATE ${hggpSchema}.HGCG001
         SET

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

@@ -8,22 +8,22 @@ $(function () {
 				pageSize: 20,
 				pageSizes: [20, 50, 70, 100],
 			},
-			columns: [
-				{
-					field: "operator",
-					title: "操作",
-					template: function (item) {
-						let template = '';
-						if (!isBlank(item.id)){
-							template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
-								+ 'onclick="showDetail(' + item.id + ', ' + item.status + ', ' + item.source + ')"  >详情</a>';
-						}
-						return template;
+			columns: [{
+				field: "operator",
+				title: "操作",
+				template: function (item) {
+					let template = '';
+					if (!isBlank(item.id)) {
+						template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;margin:auto 5px" '
+							+ 'onclick="showDetail(' + item.id + ', ' + item.status + ', ' + item.source
+							+ ')"  >详情</a>';
 					}
-				}, {
-					field: "companyCode",
-					title: "公司编码",
-					template: function (dataItem) {
+					return template;
+				}
+			}, {
+				field: "companyCode",
+				title: "公司编码",
+				template: function (dataItem) {
 						for (let i = 0; i < companyCodeBox.length; i++) {
 							if (companyCodeBox[i]['companyCode'] === dataItem['companyCode']) {
 								return companyCodeBox[i]['companyCode'];
@@ -41,9 +41,9 @@ $(function () {
 								return projCodeBox[i]['valueField'];
 							}
 						}
-						return dataItem["projCode"];
+						return dataItem["projCode"] == null ? "" : dataItem["projCode"];
 					},
-					editor: function (container, options) {
+				editor: function (container, options) {
 						let inInfo = new EiInfo();
 						inInfo.set("inqu_status-0-companyCode", options.model["companyCode"]);
 						inInfo.set("inqu_status-0-approvalStatus", 2);

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

@@ -45,11 +45,11 @@
 							  align="center" filter="contains" sort="true">
 				<EF:EFOptions blockId="roleCompany" textField="companyName" valueField="companyCode"/>
 			</EF:EFComboColumn>
-			<EF:EFColumn ename="companyName" cname="公司名称" width="120" enable="false" readonly="true" align="center"/>
-			<EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="120" align="center"  required="true"/>
-			<EF:EFColumn ename="projName" cname="项目名称" width="120" align="center" enable="false"/>
+			<EF:EFColumn ename="companyName" cname="公司名称" width="220" enable="false" readonly="true" align="left"/>
+			<EF:EFColumn ename="projCode" cname="项目编码" enable="true" width="140" align="center" required="true"/>
+			<EF:EFColumn ename="projName" cname="项目名称" width="120" align="left" enable="false"/>
 			<EF:EFColumn ename="planDate" cname="计划日期" width="100" align="center" editType="date"
-			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']"  required="true"/>
+			             dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
 			<EF:EFColumn ename="planNo" cname="计划单号" enable="false" width="120" align="center"/>
 			<EF:EFComboColumn ename="status" cname="状态" enable="false" width="80" align="center">
 				<EF:EFCodeOption codeName="hggp.hgcg.planStatus"/>