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

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1221,12 +1221,18 @@
       </span>
     </el-dialog>
     <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="30%">
-      <div class="dis">
-        <span>费用止期:</span>
-        <el-date-picker size="small" style="width: 300px" v-model="batchCostEndDate" type="date" placeholder="选择结束日期"
-          value-format="yyyy-MM-dd">
-        </el-date-picker>
-      </div>
+      <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>
+        </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>
+        </el-form-item>
+      </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="batchdialogVisible = false">取 消</el-button>
         <el-button size="small" type="primary" @click="batchCostsubmit">确 定</el-button>
@@ -1257,8 +1263,11 @@ export default {
         productId: "",
         productName: "",
       },
-      batchCostEndDate: '',
-      batchCostIds: [],
+      batchUpdateForm: {
+        ids: [],
+        costsEndDate: null,
+        costsStartDate: null,
+      },
       batchdialogVisible: false,//批量弹窗
       nonVehicleRuleObject: {
         parentId: "",
@@ -2872,14 +2881,11 @@ export default {
     },
     //产品批量编辑
     batchUpdate(data) {
-      this.batchCostIds = data;
+      this.batchUpdateForm.ids = data;
       this.batchdialogVisible = true;
     },
     batchCostsubmit() {
-      this.$api.insCompany.endDateBatch({
-        ids: this.batchCostIds,
-        costsEndDate: this.batchCostEndDate,
-      }).then((res) => {
+      this.$api.insCompany.endDateBatch(this.batchUpdateForm).then((res) => {
         if (res.code == '200') {
           this.batchdialogVisible = false;
           this.productCostFindPage();

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -342,6 +342,7 @@ export default {
         { prop: "costsEndDate", label: "费用止期", minWidth: 160 },
         { prop: "costsDescription", label: "费用描述", minWidth: 220 },
         { prop: "desc", label: "费用因子描述", minWidth: 520 },
+        { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
         {
           prop: "jqCarCostsProportion",
           label: "费用比例（交强）",
@@ -472,7 +473,7 @@ export default {
           label: "非车出口比例五级",
           minWidth: 160,
         },
-        { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
+
       ],
       batchSizeList: [],
       isBatch: false,