Merge branch 'DK_dev' into dev

src/components/Form/retrievalForm.vue

@@ -26,6 +26,7 @@
               v-model="formData[field.name]"
               filterable
               clearable
+              :multiple="field.multiple"
               :placeholder="'请选择' + field.label"
               @change="selectChange($event, field.name)"
             >

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -990,7 +990,7 @@
       <el-form :inline="true" :model="productcopyItemPageRequest" class="demo-form-inline" size="small"
         label-width="80px">
         <el-form-item label="选择协议">
-          <el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
+          <el-select v-model="productcopyItemPageRequest.agreementId" filterable clearable  placeholder="请选择协议">
             <el-option v-for="(item, index) in pageResult" :key="index" :label="item.agreementAbbreviation"
               :value="item.id"></el-option>
           </el-select>

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -572,7 +572,7 @@
         <el-form :inline="true" :model="productcopyItemPageRequest" class="demo-form-inline" size="small"
           label-width="80px">
           <el-form-item label="选择协议">
-            <el-select v-model="productcopyItemPageRequest.agreementId" placeholder="请选择协议">
+            <el-select v-model="productcopyItemPageRequest.agreementId" filterable clearable placeholder="请选择协议">
               <el-option v-for="(item, index) in protocolpageResult" :key="index"
                 :label="`${item.agreementName}-${item.businessDescription}-${item.jobDescription}`"
                 :value="item.id"></el-option>
@@ -1258,7 +1258,6 @@ export default {
   },
   // 生命周期函数
   created() {
-    console.log(this.messageInfo, 888888);
     this.lineData = this.messageInfo
     this.insuranceCompanyId = this.messageInfo.insuranceCompanyId;
     this.productpageRequest.agreementId = this.messageInfo.id;
@@ -1285,7 +1284,6 @@ export default {
             item.businessDescription == null ? item.businessDescription = '' : item.businessDescription,
             item.jobDescription == null ? item.jobDescription = '' : item.jobDescription
         });
-        console.log(this.protocolpageResult);
       } else {
         this.$message.error(res.msg);
       }
@@ -1981,30 +1979,39 @@ export default {
       return <el-switch value={row.validStatus} active-value={1}
         inactive-value={0} onChange={validStatuschange} ></el-switch>;
       function validStatuschange(value) {
-        _this.$confirm('禁用后今日内可支付的订单将失效, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'danger'
-        }).then(() => {
-          _this.$api.insCompany.productdisable(row.id).then((res) => {
-            if (res.code == '200') {
-              _this.$message({
-                type: 'success',
-                message: res.msg,
-              });
-              _this.productCostFindPage();
-            } else {
-              _this.$message({
-                type: 'error',
-                message: res.msg,
-              });
-            }
+        if (value) {
+          _this.productdisableUP(row.id);
+        } else {
+          _this.$confirm('禁用后今日内可支付的订单将失效, 是否继续?', '提示', {
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'danger'
+          }).then(() => {
+            _this.productdisableUP(row.id);
+          }).catch(() => {
           });
-        }).catch(() => {
-        });
+        }
+
+
       }
     },
-
+    //费用启用/禁用
+    productdisableUP(id) {
+      this.$api.insCompany.productdisable(id).then((res) => {
+        if (res.code == '200') {
+          this.$message({
+            type: 'success',
+            message: res.msg,
+          });
+          this.productCostFindPage();
+        } else {
+          this.$message({
+            type: 'error',
+            message: res.msg,
+          });
+        }
+      });
+    },
     operatorTypeFormatter(row, column) {
       let operatorType = row.operatorType;
       switch (operatorType) {

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -40,11 +40,17 @@
           default-first-option placeholder="费用描述">
         </el-select>
       </el-form-item>
-      <el-form-item label="费用起止期">
-        <el-date-picker value-format="yyyy-MM-dd" v-model="date1" size="small" type="daterange" align="left"
-          range-separator="至" start-placeholder="费用起期" end-placeholder="费用止期">
+      <el-form-item label="费用起期">
+        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="productpageRequest.costStartDate" size="small" type="datetime" align="left"
+          range-separator="至" placeholder="费用起期">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="费用止期">
+        <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="productpageRequest.costsEndDate" @change="costsEndDateChange" size="small" type="datetime" align="left"
+          range-separator="至" placeholder="费用止期">
+        </el-date-picker>
+      </el-form-item>
+
       <el-form-item>
         <el-button type="primary" @click="costQuery">查询</el-button>
       </el-form-item>
@@ -337,6 +343,8 @@ export default {
         agreementIdList: [],
         costsDescription: [],
         productCode: [],
+        costStartDate:"",
+        costsEndDate:"",
       },
       //保险公司列表
       InsCompanyList: [],
@@ -614,6 +622,30 @@ export default {
   },
   // 方法函数
   methods: {
+    costsEndDateChange(){
+      let tempStartDate = this.productpageRequest.costStartDate;
+      let tempEndDate = this.productpageRequest.costsEndDate;
+      if (!tempStartDate) {
+        this.productpageRequest.costsEndDate = null;
+        this.$message({
+          message: "请先选择费用起期！",
+          type: "error",
+        });
+      }
+      if (!this.validateEndDate(tempStartDate, tempEndDate)) {
+        this.productpageRequest.costsEndDate = null;
+        this.$message({
+          message: "费用止期不能小于/等于费用起期！",
+          type: "error",
+        });
+      }
+    },
+    //日期比较
+    validateEndDate(startDateStr, endDateStr) {
+      const startDate = new Date(startDateStr);
+      const endDate = new Date(endDateStr);
+      return endDate.getTime() > startDate.getTime();
+    },
     // 点击展开行
     handleExpandChange(row,rows) {
       if(rows.length>0) {
@@ -812,13 +844,6 @@ export default {
         this.productpageRequest.createStartTime = "";
         this.productpageRequest.createEndTime = "";
       }
-      if (this.date1 != null) {
-        this.productpageRequest.costStartDate = this.date1[0];
-        this.productpageRequest.costsEndDate = this.date1[1];
-      } else {
-        this.productpageRequest.costStartDate = "";
-        this.productpageRequest.costsEndDate = "";
-      }
       this.$api.insCompany
         .getCostsAuditList(this.productpageRequest)
         .then((res) => {
@@ -879,7 +904,7 @@ export default {
             this.$message.warning(res.msg)
           }
         });
-    }
+    },
   },
   // 计算属性
   computed: {},

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/Fuel/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/CargoTruck/BusinessOperation/NewEnergy/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/Fuel/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/CargoTruck/NonBusiness/NewEnergy/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/Fuel/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/PassengerBus/BusinessOperation/NewEnergy/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/Fuel/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/AgreementManage/InsuranceCompany/PassengerBus/NonBusiness/NewEnergy/Company.vue

@@ -1,6 +1,10 @@
 <!-- 模板区域 -->
 <template>
   <div>
+    <div class="flex a-c">
+      <el-input v-model="pageRequest.companyName"  clearable :size="overSize" placeholder="保险公司名称" style="width: 300px;margin: 10px 20px 10px 0;"></el-input>
+      <el-button type="primary" :size="overSize" @click="companyQuery">查询</el-button>
+    </div>
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="300" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="solutionResult" button2Name="规则配置"
       button2Type="text" @handleButton2="attrConfig" button3Name="已配置方案" button3Type="text" @handleButton3="solutionConfig"
@@ -27,6 +31,7 @@ export default {
       solutionResult: [],
       //操作符字典
       pageRequest: {
+        companyName:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -38,6 +43,9 @@ export default {
   },
   // 方法函数
   methods: {
+    companyQuery(){
+      this.companyFindPage();
+    },
     companyFindPage(data) {
       if (data && data.pageRequest) {
         this.pageRequest.pageNum = data.pageRequest.pageNum;

src/views/Core/KtCommonTable.vue

@@ -432,7 +432,7 @@
     </el-table>
     <!--分页栏-->
     <!-- 底部分页 -->
-    <div class="bottomFixed" ref="bottomFixed">
+    <div class="bottomFixed flex a-c" ref="bottomFixed">
       <kt-button
         :label="customToolName"
         :perms="permscustomTool"
@@ -494,6 +494,9 @@
         style="float: left"
         v-if="showBatchPrint"
       />
+      <div v-if="tableSelectedCount" class="tableSelectedCountClass" >已选
+          <span >{{ tableSelectedCount }}</span>
+        条</div>
       <el-pagination
         background
         @size-change="handleSizeChange"
@@ -506,6 +509,7 @@
         style="float: left; margin-left: 20px"
         v-if="isshowpagination"
       >
+
       </el-pagination>
     </div>
   </div>
@@ -809,6 +813,7 @@ export default {
   },
   data() {
     return {
+      tableSelectedCount:"",
       tableHeight: 0,
       loading: false, // 加载标识
       selections: [], // 列表选中列
@@ -1012,6 +1017,7 @@ export default {
     },
     // 选择切换
     selectionChange: function (selections) {
+      this.tableSelectedCount=selections.length;
       this.selections = selections;
       this.$emit("selectionChange", {
         selections: selections,
@@ -1347,6 +1353,15 @@ export default {
 }
 </style>
 <style lang="scss" scoped>
+.tableSelectedCountClass{
+  color: #606266;
+  font-size: 14px;
+  font-weight: bold;
+  margin-left: 10px;
+  span{
+    color:red;
+  }
+}
 /deep/ .el-tag--plain {
   background: rgba(93, 125, 255, 0.1);
   border-radius: 4px;

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

@@ -334,6 +334,7 @@ export default {
           label: "业务来源",
           type: "select",
           options: [],
+          multiple:true,
           optionsIabel: "dictTag",
           optionsValue: "dictValue",
         },

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

@@ -208,6 +208,7 @@ export default {
           label: '业务来源',
           type: 'select',
           options: [],
+          multiple:true,
           optionsIabel: "dictTag",
           optionsValue: "dictValue",
         },
@@ -917,7 +918,7 @@ export default {
           let businessList = []
           let accidentList = []
           if (res.data.orderstatus == "3") {
-            /** 
+            /**
             if (res.data.isExternal == 1) {
               this.$api.letter
                 .getPolicyPrintexternalOrder(res.data.id).then(res1 => {
@@ -1630,9 +1631,9 @@ export default {
                 this.$refs.detailsDialog.warrantyFun(res.data);
               } else{
                 this.$message.error(res.msg);
-              } 
-            }); 
-            
+              }
+            });
+
           }
           this.feeDetailInfo = res.data.orderFeeResult;
           this.oldFeeInfo = res.data.adjustFeeDescVo;
@@ -1717,7 +1718,7 @@ export default {
 
     },
     tableRowColor({ row, rowIndex }) {
-      console.log(row.problemOrder);
+      // console.log(row.problemOrder);
       if (row.problemOrder  == 1) {
         return "blue-row";
       }

src/views/Sys/Deptall.vue

@@ -26,9 +26,8 @@
           </el-form>
         </div>
         <!-- 表格渲染 -->
-        <el-table permsEdit="sys:dept:edit" height="720" permsDelete="sys:dept:delete" row-key="id"
-           v-loading="loading" border :data="ztreeNodes" default-expand-all
-          :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :header-cell-style="{
+        <el-table permsEdit="sys:dept:edit" height="720" permsDelete="sys:dept:delete" row-key="id" v-loading="loading"
+          border :data="ztreeNodes" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :header-cell-style="{
             background: '#F2F7FC',
             fontWeight: '900',
             color: '#606266',
@@ -377,6 +376,7 @@ export default {
     // }
 
     this.findTreeData(); // 获取左边机构树数据
+    // this.generateUniqueKeys(this.ztreeNodes)
     //获取所有下拉框数据
     this.getDictItems("comlevel");
     this.getDictItems("comattribute");
@@ -613,6 +613,15 @@ export default {
     };
   },
   methods: {
+    generateUniqueKeys(nodes, parentKey = '') {
+      return nodes.map((node, index) => {
+        const key = `${parentKey}${node.id}-${index}`; // 结合父节点和当前索引生成一个唯一键
+        if (node.children && node.children.length > 0) {
+          node.children = generateUniqueKeys(node.children, `${key}-`);
+        }
+        return { ...node, uniqueKey: key };
+      });
+    },
     //关闭部门弹框
     closeLeadDialog() {
       this.leadDataForm = {
@@ -651,8 +660,8 @@ export default {
     //点击每一行的事件
     rowClick(row, treeNode) {
       //点每行展开折叠
-      if(row.expanded===undefined){
-        row.expanded=false;
+      if (row.expanded === undefined) {
+        row.expanded = false;
       }
       row.expanded = !row.expanded;
       this.$refs.expandTable.toggleRowExpansion(row, row.expanded);
@@ -855,6 +864,8 @@ export default {
       this.ztreeRightWidth = 100 - (this.ztreeLeftWidth - 0);
     },
     findTreeData() {
+      this.ztreeNodes=[];
+
       // 获取机构树的数据
       this.loading = true;
       this.$api.dept.findDeptTree(this.peopledeptid, "").then((res) => {
@@ -863,10 +874,15 @@ export default {
       });
     },
     managementSourceQuery() {
+      this.ztreeNodes=[];
+      this.loading = true;
+
       this.$api.dept
         .findDeptTree(this.peopledeptid, this.managementSource)
         .then((res) => {
           this.ztreeNodes = res.data;
+        this.loading = false;
+
         });
     },
     // 右边表格Start