协议历史操作人 修改人都变成人名

协议审核处新增筛选条件：费用因子描述

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -58,7 +58,7 @@
           </el-col>
           <el-col :span="6">
             <el-form-item label="修改人">
-              <el-input :size="overSize" clearable v-model.trim="queryForm.modifiedBy" placeholder="请输入"></el-input>
+              <el-input :size="overSize" clearable v-model.trim="queryForm.modifiedName" placeholder="请输入"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -113,7 +113,7 @@
               scope.row.validStatus == 1 ? "有效" : "无效" }}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="modifiedBy" label="修改人" align="center" width="130"></el-table-column>
+        <el-table-column prop="modifiedName" label="修改人" align="center" width="130"></el-table-column>
         <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
             <kt-button label="编辑" :size="overSize" type="text" perms="agreement:input:update"
@@ -392,7 +392,7 @@
           @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">
+      <el-form :inline="true" :model="productpageRequest" class="demo-form-inline" size="small" label-width="120px">
         <el-form-item label="产品">
           <el-select v-model="productpageRequest.productCode" placeholder="选择产品" clearable multiple>
             <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
@@ -405,6 +405,12 @@
               :value="item.value"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否有效">
+          <el-select v-model="productpageRequest.isEffective" clearable>
+            <el-option label="失效" value="1"></el-option>
+            <el-option label="有效" value="2"></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="费用起期">
           <el-date-picker style="width: 100%" v-model="productpageRequest.costStartDate" type="date"
             placeholder="选择费用开始日期" value-format="yyyy-MM-dd">
@@ -860,6 +866,12 @@
               :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="是否有效">
+          <el-select v-model="productcopyItemPageRequest.isEffective" clearable>
+            <el-option label="失效" value="1"></el-option>
+            <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">
@@ -1336,7 +1348,7 @@ export default {
           label: " 保险公司账号配置",
           minWidth: 1060,
         },
-        { prop: "operator", label: "操作人", minWidth: 160 },
+        { prop: "operatorName", label: "操作人", minWidth: 160 },
         { prop: "operatorType", label: "操作类型", formatter: this.operatorTypeFormatter },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
       ],
@@ -1361,7 +1373,7 @@ export default {
         //数据列
         { prop: "productName", label: " 产品名称", minWidth: 160 },
         { prop: "costsDescription", label: "费用描述", minWidth: 120 },
-        { prop: "modifier", label: "操作人", minWidth: 120 },
+        { prop: "modifierName", label: "操作人", minWidth: 120 },
         { prop: "operatorTime", label: "操作时间", minWidth: 160 },
         { prop: "operatorType", label: "操作类型", minWidth: 120, formatter: this.operatorTypeFormatter },
         {
@@ -1893,6 +1905,7 @@ export default {
         costStartDate: "",
         costsEndDate: "",
         costsDescription: "",
+        isEffective:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -1901,6 +1914,7 @@ export default {
         agreementId: "",
         costStartDate: "",
         costsEndDate: "",
+        isEffective:"",
         costsDescription: "",
         pageNum: 1,
         pageSize: 20,

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -16,7 +16,7 @@
       </el-form-item>
 
       <el-form-item label="产品名称">
-        <el-select size="small" clearable v-model="productpageRequest.productCode" :placeholder="'请输入'">
+        <el-select size="small" clearable v-model="productpageRequest.productCode" multiple  :placeholder="'请输入'">
           <el-option v-for="(s, i) in insuranceRepertoire" :key="i" :label="s.dictTag" :value="s.dictValue"></el-option>
         </el-select>
       </el-form-item>
@@ -33,6 +33,9 @@
             :value="item.value"></el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="费用描述">
+          <el-input v-model="productpageRequest.costsDescription" clearable placeholder="费用描述"></el-input>
+        </el-form-item>
       <el-form-item>
         <el-button type="primary" @click="costPage">查询</el-button>
       </el-form-item>
@@ -274,7 +277,8 @@ export default {
         pageSize: 20,
         companyId: "",
         agreementId: "",
-        productCode: "",
+        costsDescription:'',
+        productCode: [],
       },
       //保险公司列表
       InsCompanyList:[],