1\协议录入-产品费用添加轨迹

2\协议费用审核添加批量审核
3\车险录单国任报价 +意外险名称：goodsName

config/dev.env.js

@@ -6,11 +6,11 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   ENV_CONFIG:'"dev"',
   // BASE_URL: '"https://test.baoxianzhanggui.com/web-api"',//测试服务器
-  BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
+  // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL:'"https://sxzgkj.baoxianzhanggui.com/web-api"'//正式服务器
   // BASE_URL: '"http://192.168.0.115:8080/"' //凯森
   // BASE_URL: '"http:///192.168.0.106:8080/"',//屈晨
-  // BASE_URL: '"http:///192.168.0.253:8080/"',//田智
+  BASE_URL: '"http:///192.168.0.253:8080/"',//田智
   // BASE_URL: '"http:///192.168.0.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇

src/components/Form/ProductCostForm.vue

@@ -110,7 +110,7 @@
                 <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                   :value="dict.name"></el-option>
               </el-select>
-              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前6位
+              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
 "></el-input>
               <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                 @change="checkboxChange($event, formItems.id, 'min')">
@@ -172,7 +172,7 @@
                 <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                   :value="dict.name"></el-option>
               </el-select>
-              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前6位
+              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
 "></el-input>
               <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                 @change="checkboxChange($event, formItems.id, 'min')">
@@ -234,7 +234,7 @@
                 <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
                   :value="dict.name"></el-option>
               </el-select>
-              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前6位
+              <el-input v-if="formItems.attrType == 'input'" v-model="formItems.min" placeholder="身份证前2位或前6位
 "></el-input>
               <el-checkbox-group v-if="formItems.attrType == 'checkbox'" v-model="formItems.list"
                 @change="checkboxChange($event, formItems.id, 'min')">

src/http/moudules/insCompany.js

@@ -516,5 +516,19 @@ export const agreementHistory = (data) => {
     data
   })
 }
-
-
+// 费用因子轨迹
+export const trajectoryGet = (params) => {
+  return axios({
+    url: '/plt/new/agreement/costs/trajectory/get' ,
+    method: "get",
+    params
+  })
+}
+// 费用批量审核
+export const auditBatch = (data) => {
+  return axios({
+    url: '/plt/new/agreement/costs/auditBatch',
+    method: "post",
+    data
+  })
+}

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -56,6 +56,13 @@
                 ref="area"></el-cascader>
             </el-form-item>
           </el-col>
+          <el-col :span="6">
+            <el-form-item label="费用描述">
+              <el-input :size="overSize" clearable v-model.trim="queryForm.costsDescription" placeholder="请输入"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
           <el-col :span="6">
             <el-form-item label="录入时间">
               <el-date-picker value-format="yyyy-MM-dd" v-model="queryForm.date" style="width: 215px" :size="overSize"
@@ -63,8 +70,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="6">
             <el-form-item label="修改时间">
               <el-date-picker value-format="yyyy-MM-dd" v-model="queryForm.updateData" style="width: 215px"
@@ -422,11 +427,32 @@
       </el-form>
       <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="250" :showOperation="true"
         :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="productPageResult"
-        :columns="productColumns" @findPage="productCostFindPage" button2Name="编辑" button2Background="#E6A23C"
-        @handleButton2="productUpdate" button2Icon="" button3Name="删除" permsButton2="agreement:input:productCost"
-        permsButton3="agreement:input:productCost" button3Background="#F56C6C" @handleButton3="productDelete"
+        :columns="productColumns" @findPage="productCostFindPage" 
+        button2Name="编辑"  permsButton2="agreement:input:productCost" @handleButton2="productUpdate" 
+         button3Name="删除"  permsButton3="agreement:input:productCost"  @handleButton3="productDelete"
+         button5Name="轨迹"    @handleButton5="trajectory"
         button3Icon="">
       </kt-common-table>
+    </el-dialog>
+     <!-- 订单轨迹 -->
+     <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+      <div slot="title" class=" dialog-title">
+        <span>订单轨迹</span>
+      </div>
+      <div style="height: 300px; overflow-y: auto">
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1" >
+          <el-step
+            :title="item.readme "
+            :key="item.id"
+            v-for="item in trajectoryTable"
+          >
+            <template slot="description">
+              <span>提交人：{{ item.createBy }}</span>
+              <div>创建时间：{{ item.createTime }}</div>
+            </template>
+          </el-step>
+        </el-steps>
+      </div>
     </el-dialog>
     <el-dialog :title="productCostAddDialogTitle" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
       @close="productcloseDialog">
@@ -1356,6 +1382,7 @@ export default {
         { prop: "productName", label: " 产品名称", minWidth: 160 },
         { prop: "costsStartDate", label: "费用起期", minWidth: 160 },
         { prop: "costsEndDate", label: "费用止期", minWidth: 160 },
+        { prop: "costsDescription", label: "费用描述", minWidth: 220 },
         { prop: "desc", label: "费用因子描述", minWidth: 520 },
         { prop: "isAudit", label: "审核状态", minWidth: 160 ,formatter:this.auditTypeFormation},
         {
@@ -1488,7 +1515,6 @@ export default {
           label: "非车出口比例五级",
           minWidth: 160,
         },
-        { prop: "costsDescription", label: "费用描述", minWidth: 220 },
 
         { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
       ],
@@ -2031,7 +2057,10 @@ export default {
       underwritingRulesHistoryRecordResult: [],
       productpageRequestForm:{},
       productHistoryRecordForm:{},
-      underwritingRulesHistoryCostFindForm:{}
+      underwritingRulesHistoryCostFindForm:{},
+      // 轨迹
+      ddgjdialogVisible:false,
+      trajectoryTable:[]
     };
   },
   computed: {
@@ -2135,6 +2164,20 @@ export default {
           break;
       }
     },
+    // 费用因子轨迹
+    trajectory(item){
+        this.$api.insCompany.trajectoryGet({costsId:item.row.id}).then((res) => {
+        if (res.code == 200 && res.data.length > 0) {
+          this.ddgjdialogVisible = true;
+          this.trajectoryTable = res.data;
+        } else {
+          this.$message({
+            message: res.msg || "暂无数据！",
+            type: "warning",
+          });
+        }
+      });
+    },
     productFilterListChange(e){
       let productstring=e.join(",")
       this.agreement.productsCode=productstring;
@@ -3297,6 +3340,45 @@ export default {
     }
   }
 
+  .el-step__title,.el-step__icon-inner{
+    color:var(--themeColor)
+  }
+  .el-step__description.is-finish, .el-step__head.is-finish{
+    color: #333;
+    border:none
+  }
+  .el-step__icon.is-text{
+    border:none;
+    box-shadow: 0px 2px 2px 0px rgba(0,0,0,0.1);
+  }
+  .el-step__icon.is-text{
+    font-size: 22px;
+  }
+  .el-step__icon{
+    width:28px;
+    height:28px;
+  }
+  .el-step.is-vertical .el-step__main{
+    padding-left:20px
+  }
+  .el-step__line,.el-step.is-vertical .el-step__line{
+    left: 14px;
+    background-color:#E2E5EB;
+    width:1px
+  }
+  .el-step__line-inner{
+      height:0;
+      display:none
+    }
+  .is-flex{
+
+    .el-step__icon{
+      background: var(--themeColor)
+    }
+    .el-step__icon-inner{
+      color: #fff;
+    }
+  }
 
 }
 

src/views/AgreementManage/CarInsurance/ProductCostExamine.vue

@@ -37,9 +37,9 @@
         <el-button type="primary" @click="costPage">查询</el-button>
       </el-form-item>
     </el-form>
-    <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="150" :showOperation="true" button1Name="查看"
-      button1Background="#409EFF" permsButton1="agreement:input:productCost" @handleButton1="viewDetails" button1Icon=""
-      :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="costAudit" :columns="costColumns"
+    <kt-common-table  :SerialShow="false" :operationWidth="150" :showOperation="true" button1Name="查看"
+       permsButton1="agreement:input:productCost" @handleButton1="viewDetails"
+       :showBatchDelete="true"   deleteName="批量审核" @handleDelete="handleDelete"  :data="costAudit" :columns="costColumns"
       @findPage="costPage">
     </kt-common-table>
     <el-dialog title="详情" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh">
@@ -289,7 +289,7 @@ export default {
       operatorlist: [],
       expenseAudit: { "pageNum": 1, "pageSize": 10, "columnFilters": { "label": { "name": "label", "value": "agreement_audit_status" } } },
       expenseAuditlist: [],
-      costAudit: [],
+      costAudit: {},
       dynamicFormArray: [],
       //操作符字典
       //产品费用
@@ -470,6 +470,8 @@ export default {
 
         { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
       ],
+      batchSizeList:[],
+      isBatch:false
     }
   },
   // 生命周期函数
@@ -497,8 +499,18 @@ export default {
   },
   // 方法函数
   methods: {
+    handleDelete(ids){
+      this.isBatch=true
+      this.batchSizeList = ids;
+      this.productCostAddVehicleFactorVisible = true;
+  },
     approval() {
-      this.$api.insCompany.productcostAudit({ isAudit: "1", costsId: this.productCostForm.id }).then((res) => {
+      let data={
+        costsIds: this.isBatch ?this.batchSizeList :[this.productCostForm.id],
+        isAudit:'1',
+      }
+     
+      this.$api.insCompany.auditBatch(data).then((res) => {
         if (res.code == '200') {
           this.productCostAddVehicleFactorVisible = false;
           this.costPage();
@@ -513,6 +525,7 @@ export default {
           });
         }
       });
+
     },
     //保险公司选择后刷新协议列表
     refreshAgreement(e){
@@ -532,7 +545,12 @@ export default {
           type: 'warning'
         });
       }
-      this.$api.insCompany.productcostAudit({ isAudit: "2", costsId: this.productCostForm.id,reject:this.reject }).then((res) => {
+      let data={
+        costsIds: this.isBatch ?this.batchSizeList :[this.productCostForm.id],
+        isAudit:'2',
+          reject:this.reject
+      }
+      this.$api.insCompany.auditBatch(data).then((res) => {
         if (res.code == '200') {
           this.productCostAddVehicleFactorVisible = false;
           this.costPage();
@@ -572,6 +590,7 @@ export default {
     },
     //查看详情
     viewDetails({ row, column }) {
+      this.isBatch=false
       this.$api.insCompany.productcostFactorQuery(row.id).then((res) => {
         if (res.code == '200') {
           let obj = Object.assign({}, res.data);
@@ -613,7 +632,12 @@ export default {
       this.$api.insCompany
         .getCostsAuditList(this.productpageRequest)
         .then((res) => {
-          this.costAudit = res;
+          if(res.code==200){
+            this.costAudit = res.data;
+          }
+          else{
+            this.$message.error(res.msg)
+          }
         });
     },
   },

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

@@ -33,11 +33,12 @@
         </el-col>
         <el-col :xs="24" :sm="24" :md="12" :lg="8" :xl="6">
           <el-form-item label="订单状态">
-            <el-select v-model="pageRequest.orderStatus" disabled class="widths" clearable>
-              <el-option v-for="val in optionsStatus" :key='val.dictValue' :label="val.dictTag"
-                v-model="val.dictValue"></el-option>
-              <!-- <el-option label="未审核" value="0"></el-option>
-              <el-option label="审核通过" value="1"></el-option> -->
+            <el-select v-model="pageRequest.auditStatus"  class="widths" clearable>
+              <!-- <el-option v-for="val in optionsStatus" :key='val.dictValue' :label="val.dictTag"
+                v-model="val.dictValue"></el-option> -->
+              <el-option label="未审核" value="0"></el-option>
+              <el-option label="审核通过" value="1"></el-option>
+              <el-option label="审核驳回" value="2"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -73,6 +74,7 @@
           <span>{{ scope.row.username }}({{ scope.row.userid }})</span>
         </template>
       </el-table-column>
+      <el-table-column prop="managementSource" 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>
@@ -81,13 +83,11 @@
       <el-table-column prop="licenseno" label="车牌号" width="180" align="center"></el-table-column>
       <el-table-column prop="insuredname" label="投保人姓名" align="center" width="150"></el-table-column>
       <el-table-column prop="product" label="投保险种" align="center" width="200"></el-table-column>
-      <el-table-column prop="orderstatus" label="状态" align="center">
+      <el-table-column prop="auditStatus" label="状态" align="center">
         <template slot-scope="scope">
-          <el-tag v-if="scope.row.orderstatus == '0'" type="success" size="small">报价中</el-tag>
-          <el-tag v-if="scope.row.orderstatus == '1'" type="warning" size="small">待核保</el-tag>
-          <el-tag v-if="scope.row.orderstatus == '2'" type="danger" size="small">已核保待缴费</el-tag>
-          <el-tag v-if="scope.row.orderstatus == '3'" type="danger" size="small">已承保</el-tag>
-          <el-tag v-if="scope.row.orderstatus == '4'" type="danger" size="small">核保退回</el-tag>
+          <el-tag v-if="scope.row.auditStatus == '0'" type="success" size="small">未审核</el-tag>
+          <el-tag v-if="scope.row.auditStatus == '1'" type="warning" size="small">审核通过</el-tag>
+          <el-tag v-if="scope.row.auditStatus == '2'" type="danger" size="small">审核驳回</el-tag>
         </template>
       </el-table-column>
 
@@ -153,12 +153,11 @@ export default {
       peopleid: "",//工号
       pageResult: [],//列表
       pageRequest: {  //查询的默认条件
-        auditStatus: "0",
+        auditStatus: "",
         orderNo: "",
         frameNo: "",
         insuredName: "",
         licenseNo: "",
-        orderStatus: "",
         userId: "",
         endDate: "",
         startDate: "",
@@ -180,7 +179,6 @@ export default {
       feeDetailInfo: [],//费用明细信息
       inscompany: "", //保险公司名称
       licenseNo: "", //车牌号
-      orderstatus: "", //订单状态
       sumpremium: "", //保费合计
       jqpremium: "",//交强
       sypremium: "",//商业
@@ -202,15 +200,15 @@ export default {
     this.$api.letter.gainTopList().then(res => {
       this.companyList = res.data
     })
-    this.$api.insCompany.dicType('insOrderStatus').then(res => {
-      this.optionsStatus = res.data.ddList
-      let filterArr = res.data.ddList.filter(item => {
-        return item.dictTag == '已承保'
-      })
-      if (filterArr.length) {
-        this.pageRequest.orderStatus = filterArr[0].dictValue
-      }
-    })
+    // this.$api.insCompany.dicType('insOrderStatus').then(res => {
+    //   this.optionsStatus = res.data.ddList
+    //   let filterArr = res.data.ddList.filter(item => {
+    //     return item.dictTag == '已承保'
+    //   })
+    //   if (filterArr.length) {
+    //     this.pageRequest.orderStatus = filterArr[0].dictValue
+    //   }
+    // })
     this.peopleid = Cookies.get('user');
     this.pageRequest.deptId = JSON.parse(localStorage.getItem('user_data')).deptId;
     this.$api.dept.findDeptTree().then((res) => {

src/views/FinancialManagement/ExpenseManagement/ViewExpenseReport.vue

@@ -30,7 +30,20 @@
                 </el-select>
                 </el-form-item> 
                 <el-form-item label="费用类型" prop="fundUse">
-                    <el-cascader
+                    <el-select
+                    v-model="queryFrom.fundUse"
+                    filterable
+                    placeholder="费用类型"
+                    >
+                    <el-option
+                        v-for="(item, index) in fundFlowData"
+                        :key="index"
+                        :label="item.category"
+                        :value="item.category"
+                    >
+                  </el-option>
+                </el-select>
+                    <!-- <el-cascader
                     v-model="queryFrom.fundUse"
                     :show-all-levels="true"
                     :clearable="true"
@@ -45,7 +58,7 @@
                         value: 'category',
                         checkStrictly: false,
                     }"
-                    ></el-cascader>
+                    ></el-cascader> -->
                 </el-form-item> 
                  <el-form-item label="支出金额" prop="applyAmount">
                     <el-input v-model="queryFrom.applyAmount" placeholder="请输入支出账户" class="widths" clearable></el-input>

src/views/Task/daikeComponents/KtLetter.vue

@@ -4727,8 +4727,8 @@ export default {
 
     //--订单编辑回显--
     // this.paramsEdit = this.$route.query.data; //接收参数
-    this.editingWay(this.$route.query.data)
     this.obtainProtocol(this.$route.query.data);
+    this.editingWay(this.$route.query.data)
   },
   mounted() {
     this.onScroll();
@@ -4800,12 +4800,14 @@ export default {
         paramsEdit.risk.map(ele => {
           if (ele.riskCode == "0507") {
             _this.jqchecked = true;
+            this.protocolJudge('0507',true)
             // _this.jqstartDate = ele.startDate;
             // _this.jqendDate = ele.endDate;
             _this.jqstartDate = this.transformTime1();
             _this.jqendDate = this.oneYearPast1(this.jqstartDate);
           } else if (ele.riskCode == "0510") {
             _this.sychecked = true;
+            this.protocolJudge('0510',true)
             // _this.systartDate = ele.startDate;
             // _this.syendDate = ele.endDate;
             _this.systartDate = this.transformTime1();
@@ -4823,6 +4825,8 @@ export default {
                     case "MJ3":
                     case "MJ4":
                       eleA.amount = eleB.deductibleRate;
+                    case "A":
+                      this.protocolJudge('A', true)
                       break;
                     default:
                       eleA.amount = JSON.stringify(eleB.amount);
@@ -5430,25 +5434,18 @@ export default {
     protocolJudge(val,val1){
       if(val1){
         this.totalCompanyList.forEach(e=>{
-          e.agreement.find(el=>el.productsCode && el.productsCode.includes(val)).disabled=true
+          if(e.agreement.find(el=>el.productsCode && el.productsCode.includes(val))){
+            e.agreement.find(el=>el.productsCode && el.productsCode.includes(val)).disabled=true
+          }
       })
       }
       else{
         this.totalCompanyList.forEach(e=>{
-            e.agreement.find(el=>el.productsCode &&el.productsCode.includes(val)).disabled=false
+          if(e.agreement.find(el=>el.productsCode && el.productsCode.includes(val))){
+            e.agreement.find(el=>el.productsCode && el.productsCode.includes(val)).disabled=false
+          }
         })
       }
-      
-      // let a= this.insureList.find(e=>e.kindName=='机动车损失险').amount
-
-      // if(val && val.length>0){
-      //   if(this.jqchecked && !val.includes('0507')){
-      //     return true
-      //   }
-      //   if(this.sychecked && this.insureList.find(e=>e.kindName=='机动车损失险').amount=='1' && !val.includes('A')){
-      //     return true
-      //   }
-      // }
     },
    async obtainProtocol(data) {
       let res={}
@@ -5496,6 +5493,9 @@ export default {
           });
         }
       }
+      res.data.forEach(e=>{
+            e.agreement.forEach(el=>el.disabled=false)
+        })
       this.totalCompanyList = res.data;
      
     },
@@ -6875,8 +6875,10 @@ export default {
       });
       let accidentalDrivingVo = {};
       if (this.guoRenaccidentForm.goodsCode) {
+       let goodsName=this.guoRenaccidentDataList.find(val=>val.goodId==this.guoRenaccidentForm.goodsCode).goodDesc
         accidentalDrivingVo = {
-          ...this.guoRenaccidentForm
+          ...this.guoRenaccidentForm,
+          goodsName
         };
       }
       let params = {