1、产品费用批量 2、结算新增检索字段

src/components/Form/retrievalForm.vue

@@ -1,7 +1,7 @@
 <template>
   <el-form ref="form" :model="formData" :inline="true" :label-width="labelWidth" size="small">
     <el-row>
-      <div>
+      <div  >
         <el-col :span="6" v-for="field in formFields" :key="field.label">
           <el-form-item :label="field.label" v-show="field.Retained !== false">
             <template v-if="field.type === 'input'">
@@ -16,7 +16,7 @@
               </el-select>
             </template>
             <template v-else-if="field.type === 'date'">
-              <el-date-picker type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
+              <el-date-picker  type="daterange" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期"
                 end-placeholder="结束日期" v-model="formData[field.list]" style="width: 100%;"
                 @change="dateChange($event, field.name)"></el-date-picker>
             </template>

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -385,10 +385,11 @@
     </el-dialog>
     <el-dialog title="产品录入" :visible.sync="productCostVehicleFactorVisible" width="60%" :fullscreen="true">
       <div class="flex a-c" style="margin-bottom: 20px">
-        <el-radio-group v-model="roductList1">
-          <el-radio v-for="item in productsTypeoptions" :label="item.dictValue" :key="item.dictValue"
-            @change="(event) => pruductChange(event, item)">{{ item.dictTag }}</el-radio>
-        </el-radio-group>
+        <el-checkbox-group v-model="roductList1" @change="pruductChange">
+          <el-checkbox v-for="city in productsTypeoptions" :label="city.dictValue" :key="city.dictValue">{{ city.dictTag
+          }}</el-checkbox>
+        </el-checkbox-group>
+        <el-button type="success" size="small" style="margin-left: 20px" @click="productAdd">产品录入</el-button>
         <el-button type="success" size="small" style="margin-left: 20px" @click="productHistory">历史记录</el-button>
       </div>
       <el-form :inline="true" :model="productpageRequest" class="demo-form-inline" size="small">
@@ -450,7 +451,10 @@
       <el-collapse accordion>
         <div class="productstitle flex j-s" style="margin-top: 10px">
           <div>
-            <span>{{ productCostForm.productName }}费用</span>
+            <span v-for="(item, index) in productCostForm.productName" :key="index">
+              {{ item }}-
+            </span>
+            <span>费用</span>
           </div>
         </div>
         <el-button class="mrgin-1" size="small" type="warning"
@@ -674,43 +678,37 @@
     </el-dialog>
     <el-dialog :title="underwritingRulesAddDialogTitle" :visible.sync="underwritingRulesAddVehicleFactorVisible"
       :close-on-click-modal="false" :fullscreen="true" width="70%" top="6vh" @close="underwritingRulescloseDialog">
-      <el-form ref="form"  :model="underwritingRulesForm" label-width="80px" size="small">
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="是否有效">
-          <el-select v-model="underwritingRulesForm.validInd" placeholder="请选择活动区域">
-            <el-option label="有效" value="1"></el-option>
-            <el-option label="无效" value="0"></el-option>
-            <el-option label="待审核" value="2"></el-option>
-          </el-select>
-        </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="规则起期">
-                <el-date-picker
-                  v-model="underwritingRulesForm.rulesStartDate"
-                  type="date"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="规则止期">
-                <el-date-picker
-                  v-model="underwritingRulesForm.rulesEndDate"
-                  type="date"
-                  @change="rulesEndDateChange"
-                  placeholder="选择日期">
-                </el-date-picker>
-              </el-form-item>
-        </el-col>
-        <el-col :span="24">
-          <el-form-item label="规则描述">
-                <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述"
-                  maxlength="100" show-word-limit></el-input>
-              </el-form-item>
-        </el-col>
-      </el-row>
+      <el-form ref="form" :model="underwritingRulesForm" label-width="80px" size="small">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="是否有效">
+              <el-select v-model="underwritingRulesForm.validInd" placeholder="请选择活动区域">
+                <el-option label="有效" value="1"></el-option>
+                <el-option label="无效" value="0"></el-option>
+                <el-option label="待审核" value="2"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规则起期">
+              <el-date-picker v-model="underwritingRulesForm.rulesStartDate" type="date" placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="规则止期">
+              <el-date-picker v-model="underwritingRulesForm.rulesEndDate" type="date" @change="rulesEndDateChange"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="规则描述">
+              <el-input type="textarea" v-model="underwritingRulesForm.ruleDescription" placeholder="请输入承保规则描述"
+                maxlength="100" show-word-limit></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <Product-Cost-Form v-if="underwritingRulesAddVehicleFactorVisible" :form="dynamicFormArray" :operator="operatorlist"
         over-size="small" @saveForm="underwritingRulesSaveForm"
@@ -1653,7 +1651,7 @@ export default {
       underwritingRulesAddVehicleFactorVisible: false, //承保规则录入    显示/隐藏
       productCostCopyDialogVisible: false,//费用复制弹窗
       //产品list获取
-      roductList1: "", //产品绑定list
+      roductList1: [], //产品绑定list
       treedata: [], //授权结构树
       defaultProps: {
         //自定义参数
@@ -1705,8 +1703,8 @@ export default {
       },
       //产品费用
       productCostForm: {
-        agreementId: "",
-        productName: "",
+        agreementId: [],
+        productName: [],
         productId: "",
         costsDescription: "", //费用描述
         costsStartDate: "", //费用起期
@@ -2652,7 +2650,7 @@ export default {
     cleanEndDate() {
       this.productCostForm.costsEndDate = null;
     },
-    rulesEndDateChange(){
+    rulesEndDateChange() {
       let tempStartDate = this.underwritingRulesForm.rulesStartDate;
       let tempEndDate = this.underwritingRulesForm.rulesEndDate;
       if (!tempStartDate) {
@@ -2797,9 +2795,15 @@ export default {
         });
     },
     //添加产品
-    pruductChange(event, item) {
-      this.productCostForm.productName = item.dictTag;
-      this.productCostForm.productId = item.dictValue;
+    pruductChange(event) {
+      this.productCostForm.productName = [];
+      this.productCostForm.productId = event;
+      event.map(val => {
+        let list = this.productsTypeoptions.find(item => item.dictValue == val).dictTag;
+        this.productCostForm.productName.push(list)
+      })
+    },
+    productAdd() {
       this.productCostAddDialogTitle = "产品录入";
       this.productCostAddDialogType = "add";
       this.productCostAddVehicleFactorVisible = true;
@@ -2810,7 +2814,7 @@ export default {
         if (valid) {
           if (this.productCostAddDialogType == "add") {
             this.$api.insCompany
-              .productCostSave(this.productCostForm)
+              .productCostSave([this.productCostForm])
               .then((res) => {
                 if (res.code == "200") {
                   this.$message({
@@ -2860,8 +2864,10 @@ export default {
           this.productCostForm[key] = "";
         }
       }
+      this.productCostForm.agreementId = [];
+      this.productCostForm.productName = [];
       this.getFactorTemplate();
-      this.roductList1 = null;
+      this.roductList1 = [];
     },
     underwritingRulescloseDialog() {
       for (let key in this.underwritingRulesForm) {
@@ -3422,4 +3428,5 @@ export default {
 
 .el-icon-arrow-down {
   font-size: 12px;
-}</style>
+}
+</style>

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue

@@ -18,6 +18,7 @@
           <el-tag v-if=" scope.row.managementSource=='电销'" type="warning">电销</el-tag>
         </template>
       </el-table-column>
+      <el-table-column prop="agreementName" label="协议名称" align="center"></el-table-column>
       <el-table-column prop="insCompany" label="承保公司" width="180" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.insCompany ? scope.row.insCompany : '--' }}</span>
@@ -38,7 +39,10 @@
           <el-tag v-if="scope.row.auditStatus == '2'" type="danger" size="small">审核驳回</el-tag>
         </template>
       </el-table-column>
+      <el-table-column prop="auditUser" label="审核人" align="center" width="200"></el-table-column>
       <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
+      <el-table-column prop="signingTime" label="签单时间" align="center" width="200"></el-table-column>
+      <el-table-column prop="payDate" label="支付时间" align="center" width="200"></el-table-column>
       <el-table-column label="操作" align="center" min-width="100" fixed="right">
         <template slot-scope="scope">
           <kt-button label="查看详情" type="text" perms="carInsurance:expenseVerification:pendingReview:review"
@@ -120,6 +124,14 @@ export default {
           type: 'select',
           options: []
         },
+        {
+          name: 'managementSource',
+          label: '机构来源',
+          type: 'select',
+          options: [],
+          optionsIabel: "dictTag",
+          optionsValue: "dictValue",
+        },
         {
           name: 'taskNo',
           label: '任务池号',
@@ -210,6 +222,18 @@ export default {
           type: 'date',
           list: 'attachList'
         },
+        {
+          name: ["signStartDateStr", "signEndDateStr"],
+          label: '签单时间',
+          type: 'date',
+          list: 'signList'
+        },
+          {
+          name: ["payStartDateStr", "payEndDateStr"],
+          label: '支付时间',
+          type: 'date',
+          list: 'payList'
+        },
       ],
       orderInfo: {
         //选中的订单
@@ -265,6 +289,11 @@ export default {
         this.selectDataMatching(this.retrievalFields, 'riskCode', res.data.ddList);
       }
     });
+    this.$api.insCompany.dicType('organizationSource').then(res => {
+      if (res.code == 200) {
+        this.selectDataMatching(this.retrievalFields, 'managementSource', res.data.ddList);
+      }
+    });
     this.getDicType("natureOfVehicleUse");//车辆使用性质
     this.getDicType("businessVehicleUse"); //（车辆用途）营业
     this.getDicType("outOfBusinessVehicleUse"); //（车辆用途）非营业

src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue

@@ -18,6 +18,7 @@
           <el-tag v-if=" scope.row.managementSource=='电销'" type="warning">电销</el-tag>
         </template>
       </el-table-column>
+      <el-table-column prop="agreementName" label="协议名称" align="center"></el-table-column>
       <el-table-column prop="insCompany" label="承保公司" width="180" align="center">
         <template slot-scope="scope">
           <span>{{ scope.row.insCompany ? scope.row.insCompany : '--' }}</span>
@@ -39,6 +40,8 @@
         </template>
       </el-table-column>
       <el-table-column prop="createtime" label="录单日期" align="center" width="200"></el-table-column>
+      <el-table-column prop="signingTime" label="签单时间" align="center" width="200"></el-table-column>
+      <el-table-column prop="payDate" label="支付时间" align="center" width="200"></el-table-column>
       <el-table-column label="操作" align="center" min-width="100" fixed="right">
         <template slot-scope="scope">
           <kt-button label="审核" type="text" perms="carInsurance:expenseVerification:pendingReview:review"
@@ -120,14 +123,7 @@ export default {
           type: 'select',
           options: []
         },
-        {
-          name: 'managementSource',
-          label: '机构来源',
-          type: 'select',
-          options: [],
-          optionsIabel: "dictTag",
-          optionsValue: "dictValue",
-        },
+
         {
           name: 'taskNo',
           label: '任务池号',
@@ -140,6 +136,14 @@ export default {
           type: 'input',
 
         },
+        {
+          name: 'managementSource',
+          label: '机构来源',
+          type: 'select',
+          options: [],
+          optionsIabel: "dictTag",
+          optionsValue: "dictValue",
+        },
         {
           name: 'companyId',
           label: '保险公司',
@@ -218,6 +222,18 @@ export default {
           type: 'date',
           list: 'attachList'
         },
+        {
+          name: ["signStartDateStr", "signEndDateStr"],
+          label: '签单时间',
+          type: 'date',
+          list: 'signList'
+        },
+          {
+          name: ["payStartDateStr", "payEndDateStr"],
+          label: '支付时间',
+          type: 'date',
+          list: 'payList'
+        },
       ],
       orderInfo: {
         //选中的订单