Merge branch 'dev' of http://129.211.46.84:8800/platform/hg-smart into master-dc

src/main/java/com/baosight/hggp/hg/sb/sql/HGSB010.xml

@@ -183,7 +183,7 @@
         <isNotEmpty prepend=" AND " property="factoryCode">
             B.FACTORY_CODE = #factoryCode#
         </isNotEmpty>
-        INNER join (
+        left join (
             select EQUIPMENT_CODE, LOG_VALUE
             from ${hggpSchema}.HGSB010 where EQUIPMENT_TYPE = 'STARUS_TYPE'
             and CREATED_TIME =(
@@ -200,7 +200,7 @@
                 ACCOUNT_CODE = #accountCode#
             </isNotEmpty>
         ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-        where a.DELETE_FLAG = 0  and a.DEVICE_STATUS = 1
+        where a.DELETE_FLAG = 0  and a.DEVICE_STATUS = 1 and a.REVEAL = 1
             <isNotEmpty prepend=" AND " property="accountCode">
                 a.ACCOUNT_CODE = #accountCode#
             </isNotEmpty>
@@ -230,7 +230,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                     B.FACTORY_CODE = #factoryCode#
                 </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -247,7 +247,7 @@
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
             where
-                a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+                a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -268,7 +268,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -284,7 +284,7 @@
                 </isNotEmpty>
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -305,7 +305,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -322,7 +322,7 @@
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
             where
-                a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+                a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -343,7 +343,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -359,7 +359,7 @@
                 </isNotEmpty>
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -380,7 +380,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -396,7 +396,7 @@
                 </isNotEmpty>
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -417,7 +417,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -433,7 +433,7 @@
                 </isNotEmpty>
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>
@@ -454,7 +454,7 @@
             <isNotEmpty prepend=" AND " property="factoryCode">
                 B.FACTORY_CODE = #factoryCode#
             </isNotEmpty>
-            join (
+            left join (
                 select
                     EQUIPMENT_CODE, count(1) as NUM
                 from ${hggpSchema}.HGSB010
@@ -470,7 +470,7 @@
                 </isNotEmpty>
                 group by EQUIPMENT_CODE
             ) c on a.DEVICE_CODE = c.EQUIPMENT_CODE
-            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1
+            where a.DELETE_FLAG = 0 and DEVICE_STATUS = 1 and REVEAL = 1
                 <isNotEmpty prepend=" AND " property="accountCode">
                     a.ACCOUNT_CODE = #accountCode#
                 </isNotEmpty>

src/main/webapp/HG/BI/HGBI003.jsp

@@ -172,6 +172,7 @@
                                 placeholder="选择日期"
                                 @change="handledataPicker"
                                 value-format="yyyyMMdd"
+                                :picker-options='pickerOptions'
                                 style="width: 11vw"
                         >
                         </el-date-picker>
@@ -311,7 +312,13 @@
                 querySbYesDate:[],
                 querySbNoList:[],
                 querySbNODate:[],
-                currentTime:dayjs().format("YYYY-MM-DD HH:mm:ss")
+                currentTime:dayjs().format("YYYY-MM-DD HH:mm:ss"),
+                maxDate:dayjs().format("YYYY-MM-DD"),
+                pickerOptions:{
+                    disabledDate(time) {
+                        return time.getTime() > Date.now();
+                    }
+                }
             };
         },
         mounted() {
@@ -506,7 +513,7 @@
                                     str = dayjs().format('YYYY') + _this.querySbYesDate[_this.querySbYesDate.length-1];
                                     dateArr.unshift(_this.querySbYesDate[_this.querySbYesDate.length-1])
                                     for (let i = 0; i < 6; i++){
-                                        dateArr.unshift(dayjs(str).subtract(i,'day').format('MMDD'));
+                                        dateArr.unshift(dayjs(str).subtract(i+1,'day').format('MMDD'));
                                     }
                                 }else{
                                     for (let i = 0; i < 7; i++){
@@ -658,7 +665,7 @@
                                     str = dayjs().format('YYYY') +  _this.querySbNODate[ _this.querySbNODate.length-1];
                                     dateArr.unshift( _this.querySbNODate[ _this.querySbNODate.length-1])
                                     for (let i = 0; i < 6; i++){
-                                        dateArr.unshift(dayjs(str).subtract(i,'day').format('MMDD'));
+                                        dateArr.unshift(dayjs(str).subtract(i+1,'day').format('MMDD'));
                                     }
                                 }else{
                                     for (let i = 0; i < 7; i++){

src/main/webapp/HG/CW/HGCW004.jsp

@@ -57,7 +57,7 @@
             <EF:EFColumn ename="contractContent" cname="签证事由及内容" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="含税金额" width="120" enable="true" format="{0:N2}" align="right" required="true"/>
             <EF:EFColumn ename="signingDate" cname="签订日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd', 'yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd']" required="true"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center" required="true"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >
                 <EF:EFCodeOption codeName="hggp.cw.reviewStatus"/>

src/main/webapp/HG/CW/HGCW005.jsp

@@ -53,7 +53,7 @@
             <EF:EFColumn ename="contractContent" cname="扣款事由" width="120" enable="true"  align="center" required="true"/>
             <EF:EFColumn ename="totalContractPriceIncluding" cname="扣款金额" width="120" enable="true"  format="{0:N2}" align="right" required="true"/>
             <EF:EFColumn ename="signingDate" cname="扣款日期" width="120" enable="true"  align="center" editType="date"
-                         dateFormat="yyyy-MM-dd" parseFormats="['yyyy-MM-dd', 'yyyyMMdd']" required="true"/>
+                         dateFormat="yyyy-MM-dd" parseFormats="['yyyyMMdd', 'yyyy-MM-dd']" required="true"/>
             <EF:EFColumn ename="deliveryCode" cname="发货单号" enable="false" width="130" align="center"/>
             <EF:EFComboColumn ename="reviewStatus" cname="审批状态" width="100" align="center"
                               columnTemplate="#=textField#" itemTemplate="#=textField#" enable="false" >

src/main/webapp/HG/CW/HGCW010F.jsp

@@ -29,7 +29,7 @@
     </EF:EFRegion>
 
     <EF:EFRegion id="result" title="记录集">
-        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false" sort="all">
+        <EF:EFGrid blockId="result" autoDraw="no" isFloat="true" autoBind="false">
             <EF:EFColumn ename="id" cname="主键" hidden="true"/>
             <%--<EF:EFComboColumn ename="companyCode" cname="公司名称"
                               columnTemplate="#=textField#" itemTemplate="#=textField#"