2024-04-12 设备管理功能开发

src/main/java/com/baosight/hpjx/hp/sb/sql/HPSB003.xml

@@ -117,7 +117,7 @@
 				$orderBy$
 			</isNotEmpty>
 			<isEmpty property="orderBy">
-				CREATED_TIME desc
+				FACTORY_CODE,GROUP_CODE,PURCHASE_DATE DESC,CREATED_TIME DESC
 			</isEmpty>
 		</dynamic>
 

src/main/webapp/HP/SB/HPSB003.js

@@ -60,7 +60,7 @@ $(function () {
                     }
                 }, {
                     field: "factoryCode",
-                    title: "公司名称",
+                    title: "工厂",
                     /*filter: function (options) {
                         return factoryCode;
                     },*/

src/main/webapp/HP/SB/HPSB003.jsp

@@ -22,7 +22,7 @@
 <EF:EFPage  title="设备管理">
     <EF:EFRegion id="inqu" title="查询条件">
         <div class="row">
-            <EF:EFSelect blockId="inqu_status" row="0" ename="factoryCode" cname="公司名称" colWidth="3" filter="contains">
+            <EF:EFSelect blockId="inqu_status" row="0" ename="factoryCode" cname="工厂" colWidth="3" filter="contains">
                 <EF:EFOption label="全部" value=""/>
                 <EF:EFOptions blockId="factoryCodeBox_block_id" textField="textField" valueField="valueField"/>
             </EF:EFSelect>