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

src/main/webapp/HP/CG/HPCG004.jsp

@@ -49,7 +49,7 @@
                         align="center" filter="contains" sort="true">
         <EF:EFOptions blockId="user_block_id" textField="textField" valueField="valueField"/>
       </EF:EFComboColumn>
-      <EF:EFComboColumn ename="inquiryType" cname="询价单类型" width="80" align="center" readonly="true">
+      <EF:EFComboColumn ename="inquiryType" cname="询价类型" width="80" align="center" readonly="true">
         <EF:EFCodeOption codeName="hpjx.hpcg.inquiryType"/>
       </EF:EFComboColumn>
       <EF:EFComboColumn ename="proApplyStatus" cname="提交状态" width="80" align="center" enable="false" defaultValue="0">

src/main/webapp/HP/XT/HPXT002A.js

@@ -103,12 +103,12 @@ let save = function (btnNode) {
             flag = false;
             return false;
         }
-        let insuranceCompany= item.get("insuranceCompany");
-        if(isBlank(insuranceCompany)){
-            message("选中的第"+(index+1)+"行\"保险公司\"，不能为空!");
-            flag = false;
-            return false;
-        }
+        // let insuranceCompany= item.get("insuranceCompany");
+        // if(isBlank(insuranceCompany)){
+        //     message("选中的第"+(index+1)+"行\"保险公司\"，不能为空!");
+        //     flag = false;
+        //     return false;
+        // }
 
         let insuranceAmount= item.get("insuranceAmount");
         if(isBlank(insuranceAmount)){
@@ -119,7 +119,7 @@ let save = function (btnNode) {
         let insuranceStartDate= item.get("insuranceStartDate");
         let insuranceEndDate= item.get("insuranceEndDate");
         if (new Date(insuranceStartDate) > new Date(insuranceEndDate)){
-            message("投保时间\"不能大于\"\"结束时间\"!");
+            message("投保开始时间\"不能大于\"\"结束时间\"!");
             flag = false;
             return false;
         }