协议需求处理

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -273,11 +273,10 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="是否启用" prop="validStatus">
-                    <el-select v-model="agreement.validStatus" placeholder="请选择是否启用" style="width: 100%">
-                      <el-option label="禁用" value="0"></el-option>
-                      <el-option label="启用" value="1"></el-option>
-                    </el-select>
+                  <el-form-item label="合作公司" prop="partnerCompaniesId">
+                    <el-cascader style="width: 100%" v-model="agreement.partnerCompaniesId" :show-all-levels="false"
+                      :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable
+                      filterable></el-cascader>
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -290,12 +289,14 @@
                   </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                  <el-form-item label="合作公司" prop="partnerCompaniesId">
-                    <el-cascader style="width: 100%" v-model="agreement.partnerCompaniesId" :show-all-levels="false"
-                      :options="ztreeNodes" :props="optionProps" @change="handleChange" clearable
-                      filterable></el-cascader>
+                  <el-form-item label="是否启用" prop="validStatus">
+                    <el-select v-model="agreement.validStatus" placeholder="请选择是否启用" style="width: 100%">
+                      <el-option label="禁用" value="0"></el-option>
+                      <el-option label="启用" value="1"></el-option>
+                    </el-select>
                   </el-form-item>
                 </el-col>
+
               </el-row>
               <el-row>
                 <el-col :span="12">
@@ -1325,14 +1326,23 @@
         <el-button size="small" type="primary" @click="batchCostsubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="批量修改" :visible.sync="agreementSelectionVisible" width="30%">
+    <el-dialog title="批量修改" :visible.sync="agreementSelectionVisible" width="40%">
       <div class="tab-panestyle">
-        <div class="tab-panecent">
-          <span>选择协议状态</span>
-          <el-select :size="overSize" v-model="agreementvalidStatus" placeholder="请选择" clearable>
-            <el-option label="禁用" :value="0"></el-option>
-            <el-option label="启用" :value="1"></el-option>
-          </el-select>
+        <div class="tab-panecent flex a-c ">
+          <div>
+            <span>协议状态</span>
+            <el-select :size="overSize" v-model="agreementvalidStatus" placeholder="请选择" clearable>
+              <el-option label="禁用" :value="0"></el-option>
+              <el-option label="启用" :value="1"></el-option>
+            </el-select>
+          </div>
+          <div style="margin-left: 15px;">
+            <span>审核方式</span>
+            <el-select :size="overSize" v-model="auditType" placeholder="请选择" clearable>
+              <el-option label="人工审核" :value="1"></el-option>
+              <el-option label="自动审核" :value="2"></el-option>
+            </el-select>
+          </div>
         </div>
       </div>
       <span slot="footer" class="dialog-footer">
@@ -2330,6 +2340,7 @@ export default {
       trajectoryTable: [],
       agreementSelectionList: [],//批量修改id集合
       agreementvalidStatus: "",
+      auditType: "",
       agreementSelectionVisible: false,
 
     };
@@ -2456,6 +2467,7 @@ export default {
       this.$api.insCompany.agreementSelection({
         agreementIds: this.agreementSelectionList,
         validStatus: this.agreementvalidStatus,
+        auditType: this.auditType,
       }).then((res) => {
         if (res.code == '200') {
           this.agreementSelectionVisible = false;

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -19,17 +19,20 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
+        <!-- <el-col :span="6">
           <el-form-item label="费用起期">
-            <el-date-picker style="width: 100%;" v-model="productpageRequest.costStartDate" type="date"
+            <el-date-picker style="width: 100%;" v-model="productpageRequest.costStartDate" type="daterange"
               placeholder="选择费用开始日期" value-format="yyyy-MM-dd">
             </el-date-picker>
           </el-form-item>
-        </el-col>
+        </el-col> -->
+        <!-- <el-date-picker v-model="productpageRequest.costsEndDate" type="daterange"
+              placeholder="选择费用结束日期"  value-format="yyyy-MM-dd">
+            </el-date-picker> -->
         <el-col :span="6">
-          <el-form-item label="费用止期">
-            <el-date-picker style="width: 100%;" v-model="productpageRequest.costsEndDate" type="date"
-              placeholder="选择费用结束日期" @change="costsEndDateChange" value-format="yyyy-MM-dd">
+          <el-form-item label="费用日期">
+            <el-date-picker style="width: 100%;" v-model="productDate" type="daterange" value-format="yyyy-MM-dd"
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="costsEndDateChange">
             </el-date-picker>
           </el-form-item>
         </el-col>
@@ -128,9 +131,9 @@
                 </el-col>
                 <el-col :span="10" v-show="!!$route.query.isExternal">
                   <el-form-item label="是否现询">
-                      <el-select v-model="productCostForm.isInquiryNow" placeholder="请选择">
-                        <el-option value="1" label="是"></el-option>
-                        <el-option value="0" label="否"></el-option>
+                    <el-select v-model="productCostForm.isInquiryNow" placeholder="请选择">
+                      <el-option value="1" label="是"></el-option>
+                      <el-option value="0" label="否"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>
@@ -139,19 +142,21 @@
               <el-row v-if="productjqincludes">
                 <h4>交强险费用</h4>
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal?'交强入口手续费比例 ' :'费用比例'" prop="jqCarCostsProportion">
+                  <el-form-item :label="$route.query.isExternal ? '交强入口手续费比例 ' : '费用比例'" prop="jqCarCostsProportion">
                     <el-input v-model="productCostForm.jqCarCostsProportion"
                       @blur="costRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input disabled v-model="productCostForm.jqCarOtherCostsProportion"
                       placeholder="请输入其他费用比例"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="jqCostsProportion">
                     <el-input v-model="productCostForm.jqCostsProportion"
                       @blur="totalCostRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
@@ -193,21 +198,23 @@
                 <h4>商业险费用</h4>
 
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal? '商业入口手续费比例' :'费用比例'" prop="syCarCostsProportion">
+                  <el-form-item :label="$route.query.isExternal ? '商业入口手续费比例' : '费用比例'" prop="syCarCostsProportion">
                     <el-input v-model="productCostForm.syCarCostsProportion"
                       @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.syCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="syCostsProportion">
                     <el-input v-model="productCostForm.syCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"></el-input>
@@ -247,21 +254,23 @@
               <el-row>
                 <h4>非车费用</h4>
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal? '非车入口手续费比例' : '费用比例'" prop="noCarCostsProportion">
+                  <el-form-item :label="$route.query.isExternal ? '非车入口手续费比例' : '费用比例'" prop="noCarCostsProportion">
                     <el-input v-model="productCostForm.noCarCostsProportion"
                       @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1"  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.noCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
                   </el-form-item>
                 </el-col>
 
-                <el-col :span="5" :offset="1" v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                <el-col :span="5" :offset="1"
+                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="noCostsProportion">
                     <el-input v-model="productCostForm.noCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"></el-input>
@@ -324,9 +333,8 @@
               <template slot="description">
                 <div class="tab-panecent1">
                   <div>{{ item.readme }}</div>
-                  <span>提交人：{{ item.createBy }}</span>
+                  <span>提交人：{{ item.userName }}</span>
                 </div>
-
               </template>
             </el-step>
           </el-steps>
@@ -419,15 +427,10 @@
               <el-option label="有效" value="2"></el-option>
             </el-select>
           </el-form-item>
-          <el-form-item label="费用起期">
-            <el-date-picker style="width: 100%" v-model="productcopyItemPageRequest.costStartDate" type="date"
-              placeholder="选择费用开始日期" value-format="yyyy-MM-dd">
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item label="费用止期">
-            <el-date-picker style="width: 100%" v-model="productcopyItemPageRequest.costsEndDate" type="date"
-              placeholder="选择费用结束日期" @change="costsEndDateChange1" :picker-options="productcopypickerOptions"
-              value-format="yyyy-MM-dd">
+
+          <el-form-item label="费用日期">
+            <el-date-picker style="width: 100%;" v-model="productcopyDate" type="daterange" value-format="yyyy-MM-dd"
+              range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" @change="costsEndDateChange1">
             </el-date-picker>
           </el-form-item>
           <el-form-item label="费用描述">
@@ -465,6 +468,8 @@ export default {
   },
   data() {
     return {
+      productDate: [],
+      productcopyDate: [],
       protocolpageResult: [],
       productcopyItemResult: [],//协议费用列表
       productcopyItemPageRequest: {
@@ -1043,7 +1048,7 @@ export default {
   },
   // 生命周期函数
   created() {
-    console.log(this.$route.query.isExternal,888888);
+    console.log(this.$route.query.isExternal, 888888);
     this.insuranceCompanyId = this.$route.query.insuranceCompanyId;
     this.productpageRequest.agreementId = this.$route.query.id;
     this.productCostForm.agreementId = this.$route.query.id;
@@ -1060,7 +1065,7 @@ export default {
     this.$api.insCompany.shutdown().then((res) => {
       this.permissions = res.data;
     });
-    this.$api.insCompany.getAllAgreement( this.productpageRequest.agreementId).then((res) => {
+    this.$api.insCompany.getAllAgreement(this.productpageRequest.agreementId).then((res) => {
       if (res.code == 200) {
         this.protocolpageResult = res.data;
       } else {
@@ -1123,15 +1128,8 @@ export default {
         });
     },
     costsEndDateChange1(e) {
-      let tempStartDate = this.productcopyItemPageRequest.costStartDate;
-      let tempEndDate = this.productcopyItemPageRequest.costsEndDate;
-      if (!tempStartDate) {
-        this.productcopyItemPageRequest.costsEndDate = null;
-        this.$message({
-          message: "起期不能为空",
-          type: "error",
-        });
-      }
+      this.productcopyItemPageRequest.costsStartDate = e[0];
+      this.productcopyItemPageRequest.costsEndDate = e[1];
     },
     //产品历史记录详情
     productHistoryDetails({ row, column }) {
@@ -1285,8 +1283,8 @@ export default {
       });
     },
     productCostAddSubmit(formName) {
-      const Arraydata = this.$refs.ProductRef && this.$refs.ProductRef.localForm ?this.$refs.ProductRef.localForm:{};
-      this.productCostForm.costsAttrLinks = Arraydata.myArray ?Arraydata.myArray:[];
+      const Arraydata = this.$refs.ProductRef && this.$refs.ProductRef.localForm ? this.$refs.ProductRef.localForm : {};
+      this.productCostForm.costsAttrLinks = Arraydata.myArray ? Arraydata.myArray : [];
       this.$refs[formName].validate((valid) => {
         if (valid) {
           // productUpdateObj
@@ -1432,19 +1430,27 @@ export default {
       });
     },
     batchDelete(data) {
-      this.$api.insCompany.deleteBatch(data).then((res) => {
-        if (res.code == '200') {
-          this.productCostFindPage();
-          this.$message({
-            type: 'success',
-            message: res.msg,
-          });
-        } else {
-          this.$message({
-            type: 'error',
-            message: res.msg,
-          });
-        }
+      this.$confirm('此操作将永久删除, 是否继续?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'error'
+      }).then(() => {
+        this.$api.insCompany.deleteBatch(data).then((res) => {
+          if (res.code == '200') {
+            this.productCostFindPage();
+            this.$message({
+              type: 'success',
+              message: res.msg,
+            });
+          } else {
+            this.$message({
+              type: 'error',
+              message: res.msg,
+            });
+          }
+        });
+      }).catch(() => {
+
       });
     },
     checkStartDate1() {
@@ -1518,14 +1524,8 @@ export default {
       }
     },
     costsEndDateChange(e) {
-      let tempStartDate = this.productpageRequest.costStartDate;
-      if (!tempStartDate) {
-        this.productpageRequest.costsEndDate = null;
-        this.$message({
-          message: "起期不能为空",
-          type: "error",
-        });
-      }
+      this.productpageRequest.costStartDate = e[0];
+      this.productpageRequest.costsEndDate = e[1];
     },
     //产品分页json
     productCostFindPage(data) {
@@ -1558,7 +1558,7 @@ export default {
             if (ele.attrName == '车牌地区') {
               ele.dictLabal = this.licenseAreaList;
             }
-            
+
           })
           // this.productCostForm.costsAttrLinks = data;
           this.dynamicFormArray = data;
@@ -1577,7 +1577,7 @@ export default {
         })
         this.areanumberplateList = data;
       });
-      // 
+      //
       this.$api.insCompany.getAreaLicense("0").then((res) => {
         let data = [];
         res.data.map(val => {
@@ -1622,12 +1622,26 @@ export default {
       let a = ['单交', '交三', '交商', '兜底配置'];
       let b = this.productCostForm.productName;
       let contains = b.every(item => a.includes(item));
+      if (!contains) {
+        Object.keys(this.productCostForm).forEach(key => {
+          if (key.startsWith('jq')) {
+            this.productCostForm[key] = "";
+          }
+        });
+      }
       return contains
     },
     productsyincludes() {
       let a = ['单商', '单三', '交商', '交三', '兜底配置'];
       let b = this.productCostForm.productName;
       let contains = b.every(item => a.includes(item));
+      if (!contains) {
+        Object.keys(this.productCostForm).forEach(key => {
+          if (key.startsWith('sy')) {
+            this.productCostForm[key] = "";
+          }
+        });
+      }
       return contains
     },
     productcopypickerOptions() {