Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -15,10 +15,10 @@ module.exports = merge(prodEnv, {
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
-  BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
+  // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
-  // BASE_URL: '"http:///192.168.0.103:8、080/"',//霍续亮
+  BASE_URL: '"http:///192.168.0.103:8080/"',//霍续亮
 })
 
 

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -140,7 +140,7 @@
                   </el-dropdown-item>
                   <el-dropdown-item>
                     <kt-button label="非车配置" :size="overSize" type="text" perms="agreement:input:underwritingRules"
-                      @click="nonVehicleConfigButton(scope.$index, scope.row)" />
+                      @click="nonVehicleConfigButton(scope.$index, scope.row)"/>
                   </el-dropdown-item>
                 </el-dropdown-menu>
               </el-dropdown>
@@ -1225,13 +1225,13 @@
     <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
       <el-form :inline="true" :model="batchUpdateForm" class="demo-form-inline">
         <el-form-item label="费用起期：">
-          <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="date"
-            placeholder="选择结束日期" value-format="yyyy-MM-dd">
+          <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsStartDate" type="datetime"
+            placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="费用止期：">
-          <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsEndDate" type="date"
-            placeholder="选择结束日期" value-format="yyyy-MM-dd">
+          <el-date-picker size="small" style="width: 300px" v-model="batchUpdateForm.costsEndDate" type="datetime"
+            placeholder="选择结束日期" value-format="yyyy-MM-dd HH:mm:ss" @change="checkStartDate1">
           </el-date-picker>
         </el-form-item>
       </el-form>
@@ -3007,6 +3007,8 @@ export default {
               agreementId: obj.agreementId, //协议id
               ruleDescription: obj.ruleDescription, //规则描述
               validInd: obj.validInd, //是否有效
+              rulesStartDate:obj.rulesStartDate,
+              rulesEndDate:obj.rulesEndDate,
               rulesAttrList: [],//规则属性
             };
           });
@@ -3100,7 +3102,24 @@ export default {
         });
       }
     },
-
+    checkStartDate1(){
+      let tempStartDate = this.batchUpdateForm.costsStartDate;
+      let tempEndDate = this.batchUpdateForm.costsEndDate;
+      if (!tempStartDate) {
+        this.batchUpdateForm.costsEndDate = null;
+        this.$message({
+          message: "请先选择费用起期！",
+          type: "error",
+        });
+      }
+      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
+        this.batchUpdateForm.costsEndDate = null;
+        this.$message({
+          message: "费用止期不能小于/等于费用起期！",
+          type: "error",
+        });
+      }
+    },
     disabledDate(time) {
       if (this.operType == "EDIT") {
         return time.getTime() < Date.now() - 8.64e7;