1.可查询删除的数据

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC005.xml

@@ -34,7 +34,6 @@
     </sql>
 
 	<sql id="condition">
-        AND DELETE_FLAG = 0
 		<isNotEmpty prepend=" AND " property="id">
 			ID = #id#
 		</isNotEmpty>
@@ -83,6 +82,9 @@
 		<isNotEmpty prepend=" AND " property="depCode">
 			DEP_CODE = #depCode#
 		</isNotEmpty>
+        <isNotEmpty prepend=" AND " property="deleteFlag">
+            DELETE_FLAG = #deleteFlag#
+        </isNotEmpty>
 	</sql>
 
     <sql id="customCondition">
@@ -97,6 +99,12 @@
                 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
             </isNotEqual>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateFrom">
+            A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateTo">
+            A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
+        </isNotEmpty>
     </sql>
 
     <sql id="order">

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC006.xml

@@ -28,7 +28,6 @@
     </sql>
 
     <sql id="condition">
-        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -62,6 +61,9 @@
         <isNotEmpty prepend=" AND " property="inventRecordId">
             INVENT_RECORD_ID = #inventRecordId#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="deleteFlag">
+            DELETE_FLAG = #deleteFlag#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -79,6 +81,12 @@
                 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
             </isNotEqual>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateFrom">
+            A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateTo">
+            A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
+        </isNotEmpty>
     </sql>
 
     <sql id="order">

src/main/java/com/baosight/hpjx/hp/kc/sql/HPKC007.xml

@@ -29,7 +29,6 @@
     </sql>
 
     <sql id="condition">
-        AND DELETE_FLAG = 0
         <isNotEmpty prepend=" AND " property="id">
             ID = #id#
         </isNotEmpty>
@@ -63,6 +62,9 @@
         <isNotEmpty prepend=" AND " property="oldOuterNo">
             OLD_OUTER_NO = #oldOuterNo#
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="deleteFlag">
+            DELETE_FLAG = #deleteFlag#
+        </isNotEmpty>
     </sql>
 
     <sql id="customCondition">
@@ -77,6 +79,12 @@
                 INVENT_RECORD_ID IN (SELECT ID FROM ${hpjxSchema}.T_HPPZ006 WHERE SPEC = #spec#)
             </isNotEqual>
         </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateFrom">
+            A.CREATED_TIME &gt;= CONCAT(REPLACE(#createdDateFrom#, '-', ''), '000000')
+        </isNotEmpty>
+        <isNotEmpty prepend=" AND " property="createdDateTo">
+            A.CREATED_TIME &lt;= CONCAT(REPLACE(#createdDateTo#, '-', ''), '235959')
+        </isNotEmpty>
     </sql>
 
     <sql id="order">

src/main/webapp/HP/KC/HPKC005.jsp

@@ -29,6 +29,14 @@
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
+			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+			</EF:EFDateSpan>
+			<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 

src/main/webapp/HP/KC/HPKC006.jsp

@@ -29,6 +29,16 @@
 				<EF:EFOption label="全部" value=""/>
 				<EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 			</EF:EFSelect>
+			<EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
+			               startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+			               format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+			</EF:EFDateSpan>
+		</div>
+		<div class="row">
+			<EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
+				<EF:EFOption label="全部" value=""/>
+				<EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+			</EF:EFSelect>
 		</div>
 	</EF:EFRegion>
 
@@ -51,7 +61,7 @@
 			             sumType="all" required="true" readonly="true"/>
 			<EF:EFColumn ename="remark" cname="备注" width="150" maxLength="255" readonly="true"/>
 			<EF:EFColumn ename="createdBy" cname="创建人" enable="false" width="100" align="center"/>
-			<EF:EFColumn ename="createdTime" cname="创建时刻" enable="false" width="140" align="center"
+			<EF:EFColumn ename="createdTime" cname="创建日期" enable="false" width="140" align="center"
 			             editType="datetime" parseFormats="['yyyyMMddHHmmss']"/>
 		</EF:EFGrid>
 	</EF:EFRegion>

src/main/webapp/HP/KC/HPKC007.jsp

@@ -29,6 +29,16 @@
 			    <EF:EFOption label="全部" value=""/>
 			    <EF:EFOptions blockId="spec_name_block_id" textField="textField" valueField="valueField"/>
 		    </EF:EFSelect>
+		    <EF:EFDateSpan startCname="创建日期(从)" endCname="至" blockId="inqu_status"
+		                   startName="createdDateFrom" endName="createdDateTo" row="0" role="date"
+		                   format="yyyy-MM-dd" ratio="3:3" satrtRatio="4:8" endRatio="4:8" readonly="true">
+		    </EF:EFDateSpan>
+	    </div>
+	    <div class="row">
+		    <EF:EFSelect cname="是否删除" ename="inqu_status-0-deleteFlag" colWidth="3" defaultValue="0">
+			    <EF:EFOption label="全部" value=""/>
+			    <EF:EFCodeOption codeName="hpjx.hpjx.deleteFlag"/>
+		    </EF:EFSelect>
 	    </div>
     </EF:EFRegion>
 

src/main/webapp/HP/ZL/HPZL001.js

@@ -62,6 +62,8 @@ function openUploadFile(id) {
 			EiCommunicator.send('HPZL001', 'bindDocIdById', inEiInfo, {
 				onSuccess(response) {
 					resultGrid.dataSource.page(1);
+					// 关闭弹窗
+					JSColorbox.close();
 				},
 				onFail(errorMessage, status, e) {
 					NotificationUtil("执行失败！", "error");