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

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/KC/HGKC005A.js

@@ -65,11 +65,11 @@ let select = function () {
         return;
     }
     for (let i = 0; i < rows.length; i++) {
-        let entityAmount = rows[i]['entityAmount'];
-        if (!isPositiveInteger(entityAmount)) {
-            message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
-            return;
-        }
+        // let entityAmount = rows[i]['entityAmount'];
+        // if (!isPositiveInteger(entityAmount)) {
+        //     message("勾选的第" + (i + 1) + "行实物数量必须是大于0的整数");
+        //     return;
+        // }
     }
     JSUtils.confirm("确定对勾选中的[" + rows.length + "]条数据生成盘点单吗? ", {
         ok: function () {

src/main/webapp/HG/WD/HGWD001.jsp

@@ -81,7 +81,7 @@
 			</EF:EFRegion>
 			<EF:EFRegion id="result" title="明细信息" fitHeight="true">
 				<EF:EFGrid blockId="result" autoDraw="no" autoBind="false" showCount="true" checkMode="row"
-				           sort="single" serviceName="HGWD099" queryMethod="query" deleteMethod="delete">
+				           height="69vh" sort="single" serviceName="HGWD099" queryMethod="query" deleteMethod="delete">
 					<EF:EFColumn ename="id" cname="ID" hidden="true"/>
 					<EF:EFColumn ename="docId" cname="文件ID" enable="false" width="180" hidden="true"/>
 					<EF:EFColumn ename="operator" cname="操作" enable="false" width="150" align="center" sort="false"/>