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

src/main/java/com/baosight/hpjx/hp/sc/sql/HPSC003.xml

@@ -34,19 +34,19 @@
 			PROJ_TYPE = #projType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projCode">
-			PROJ_CODE = #projCode#
+			PROJ_CODE LIKE ('%$projCode$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="projName">
 			PROJ_NAME LIKE ('%$projName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planInfoNo">
-			PLAN_INFO_NO = #planInfoNo#
+			PLAN_INFO_NO LIKE ('%$planInfoNo$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtType">
 			PRDT_TYPE = #prdtType#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtCode">
-			PRDT_CODE = #prdtCode#
+			PRDT_CODE LIKE ('%$prdtCode$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtName">
 			PRDT_NAME = #prdtName#
@@ -99,7 +99,7 @@
 				REMARK	as "remark", <!-- 备注 -->
 				CONCAT((
 				SELECT
-				ifnull( SUM( ACTUAL_COMPLETION_NUM ), 0 ) / ifnull( SUM( NUM ), 0 ) * 100
+				format((ifnull( SUM( ACTUAL_COMPLETION_NUM ), 0 ) / ifnull( SUM( NUM ), 0 ) * 100),2)
 				FROM
 				hpjx.T_HPSC004
 				WHERE
@@ -143,7 +143,7 @@
 			PRDT_CODE = #prdtCode#
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="prdtName">
-			PRDT_NAME = #prdtName#
+			PRDT_NAME LIKE ('%$prdtName$%')
 		</isNotEmpty>
 		<isNotEmpty prepend=" AND " property="planCompletionDate">
 			PLAN_COMPLETION_DATE = #planCompletionDate#

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

@@ -76,8 +76,6 @@ function uploadFileCallback(docId) {
 	}, {
 		async: false
 	});
-	// 关闭弹窗
-	JSColorbox.close();
 }
 
 /**

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

@@ -16,17 +16,30 @@ $(function () {
                 {
                     field: "operator",
                     template: function (item) {
+                        console.log(item)
                         let auditStatus = item.status;
                         let template = '';
                         if (auditStatus == 0) {
                             template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
                                 'onclick="check(' + item.id + ',1)" >审核</a>';
-                        } else {
-                            template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
+                        }
+                        else {
+                            template += '<a hidden="hidden" style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
                                 'onclick="check(' + item.id + ',0)" >反审</a>';
                         }
                         return template;
                     }
+                },
+                {
+                    field: "planCompletionDate",
+                    template: function (item){
+                        let auditStatus = item.status;
+                        let template = '';
+                        if (auditStatus == 1){
+                            template += 'this.blur();';
+                        }
+                        return template;
+                    }
                 }
             ],
             onRowClick : function(e) {

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

@@ -9,14 +9,19 @@
 </head>
 <EF:EFPage title="生产计划">
 
-    <EF:EFRegion id="inqu" title="查询条件"><%-- type="query" efRegionShowClear="true" efRegionSave="true"--%>
+    <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="projName" cname="项目名称:" row="0"/>
-            <EF:EFInput blockId="inqu_status" ename="planInfoNo" cname="生产计划单号:" row="0"/>
-            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" cname="计划完成日期"
+        <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"/>
+            <EF:EFDatePicker blockId="inqu_status" ename="planCompletionDate" colWidth="3" cname="计划完成日期:"
                              format="yyyy-MM-dd" required="true"/>
-            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" ename="status" row="0">
+            <EF:EFSelect cname="状态:" optionLabel="全部" blockId="inqu_status" colWidth="3" ename="status" row="0">
                 <EF:EFOption label="未审核" value="0"/>
                 <EF:EFOption label="已审核" value="1"/>
             </EF:EFSelect>
@@ -36,7 +41,7 @@
             <EF:EFColumn enable="false" ename="prdtCode" cname="产品编码" readonly="true"/>
             <EF:EFColumn enable="false" ename="prdtName" cname="产品名称" readonly="true"/>
             <EF:EFColumn ename="planCompletionDate" cname="计划完成日期" editType="date" dateFormat="yyyy/MM/dd" width="150"
-                         required='true'/>
+                         required='true' readonly="true"/>
             <EF:EFColumn enable="false" ename="schedule" cname="生产完工进度" format="{0:N2}" readonly="true"/>
             <EF:EFComboColumn enable="false" ename="status" cname="状态">
                 <EF:EFOption label="未审核" value="0"/>

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

@@ -4,11 +4,15 @@ $(function () {
     IPLATUI.EFUpload = {
         uploadFile: {
             success: function(e) {
-                $("#fileDocId").val(e.response.docId);
+	            let docId = e.response.docId;
+	            if (isBlank(docId)) {
+		            return;
+	            }
+                $("#fileDocId").val(docId);
                 NotificationUtil("附件上传成功");
                 console.log($("#fileDocId").val())
 	            try {
-		            parent.JSColorbox.setValueCallback(e.response.docId);
+		            parent.JSColorbox.setValueCallback(docId);
 	            } catch (e){
 	            }
             },

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

@@ -4,16 +4,10 @@
 <%@ taglib prefix="EF" tagdir="/WEB-INF/tags/EF" %>
 
 <c:set var="ctx" value="${pageContext.request.contextPath}"/>
-<head>
-    <%--    <link rel="stylesheet" href="${ctx}/css/simulatedOperation.css"/>--%>
-</head>
+
 <EF:EFPage title="附件上传">
     <EF:EFRegion id="result">
         <EF:EFUpload blockId="result" ename="uploadFile" docTag="hk_file11" path="A"/>
     </EF:EFRegion>
     <EF:EFInput ename="fileDocId" cname="" hidden="true"/>
 </EF:EFPage>
-<script>
-    var ctx = "${ctx}";
-</script>
-<script src="${ctx}/HP/SC/HPSC099.js"></script>
\ No newline at end of file