Merge branch 'dev' of http://www.baoxianzhanggui.com:8090/sxzgd/vue-insagent-pc into dev

config/dev.env.js

@@ -8,13 +8,13 @@ module.exports = merge(prodEnv, {
 
   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.42: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.250:8080/"',//

src/assets/css/common.css

@@ -155,3 +155,6 @@
 .themeColor{
 	color: var(--themeColor) ;
 }
+.el-table .flagRow{
+    background:rgba(64,158,255,.1) !important; 
+  }

src/views/Core/KtCommonTable.vue

@@ -19,7 +19,6 @@
       :size="size"
       :align="align"
       :header-cell-style="{
-        background: '#F2F7FC',
         fontWeight: '900',
         color: '#606266',
       }"
@@ -555,6 +554,7 @@ export default {
         pageNum: 1,
         pageSize: 20,
       },
+      taskPool:false
     };
   },
   methods: {
@@ -564,6 +564,14 @@ export default {
       // } else if (!!row.fieldName24 && row.fieldName24.indexOf("已") >= 0) {
       // return "successRow";
       // }
+      if(!!this.taskPool){
+        if(row.row.isExternal===1){
+            return "flagRow";
+        }
+        else{
+          return ''
+        }
+      }
       this.$emit("tableRowClassName", row);
       // return '';
     },
@@ -876,6 +884,7 @@ export default {
 </script>
 
 <style scoped>
+
 /* 底部固定分页 */
 .bottomFixed {
   height: 40px;
@@ -886,7 +895,9 @@ export default {
   /* margin-top: 10px; */
   /* box-shadow: 0 -2px 0 0 #efefef; */
 }
-
+/deep/.el-table .el-table__row--striped {
+  background-color: inherit;
+}
 .el-table .warningRow {
   background: oldlace;
 }
@@ -899,4 +910,5 @@ export default {
   color: var(--themeColor);
   font-size: 12px;
 }
+
 </style>

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -4,7 +4,7 @@
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns1" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
-      @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
+      @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"  ref="commonTable" :stripe="false"
       button6Name="批单" button6Type="text" @handleButton6="batchOrder"
       @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
       @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
@@ -122,6 +122,7 @@ export default {
           if (res.code == 200) {
             this.loading = false;
             this.pageResult = res.data;
+            this.$refs.commonTable.taskPool=true
           } else {
             this.loading = false;
             this.$message.error(res.msg);

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -3,7 +3,7 @@
     <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"></retrievalForm>
     <kt-common-table :data="pageResult" :columns="columns1" element-loading-text="加载中..." v-loading="loading"
-      :showBatchDelete="false" @findPage="findPage"
+      :showBatchDelete="false" @findPage="findPage" ref="commonTable" :stripe="false"
        button3Name="转发" button3Type="text" @handleButton3="transmit"
         button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory"
       button6Name="批单" button6Type="text" @handleButton6="batchOrder"
@@ -261,6 +261,7 @@ export default {
           if (res.code == 200) {
             this.loading = false;
             this.pageResult = res.data;
+            this.$refs.commonTable.taskPool=true
           } else {
             this.loading = false;
             this.$message.error(res.msg);

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -2,9 +2,9 @@
   <div>
     <retrievalForm :fields="retrievalFields" @submit="handleFormSubmit" @toggleCollapse="toggleCollapse"
       @areaSelectChange="areaSelectChange"></retrievalForm>
-    <kt-common-table :data="pageResult" :columns="columns1" element-loading-text="加载中..." v-loading="loading"
-      :showBatchDelete="false" @findPage="findPage" 
-      button3Name="转发" button3Type="text" @handleButton3="transmit"
+    <kt-common-table :data="pageResult" ref="commonTable" :columns="columns1" element-loading-text="加载中..." v-loading="loading"
+      :showBatchDelete="false" @findPage="findPage"  
+      button3Name="转发" button3Type="text" @handleButton3="transmit" :stripe="false"
       button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory"
       button6Name="批单" button6Type="text" @handleButton6="batchOrder"
       button5Name="详情" button5Type="text" @handleButton5="detailFun"
@@ -119,6 +119,7 @@ export default {
           if (res.code == 200) {
             this.loading = false;
             this.pageResult = res.data;
+            this.$refs.commonTable.taskPool=true
           } else {
             this.loading = false;
             this.$message.error(res.msg);
@@ -246,7 +247,9 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 /deep/ {
+
   .el-step__description.is-finish,
   .el-step__head.is-finish {
     color: #333;
@@ -278,4 +281,6 @@ export default {
     box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.1);
   }
 }
+
+ 
 </style>

src/views/Task/daikeComponents/KtOrder.vue

@@ -45,6 +45,15 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="6">
+          <el-form-item label="险种">
+              <el-select v-model="pageRequest.product" multiple placeholder="选择险种" style="width: 100%"
+                >
+                <el-option v-for="item in productsTypeoptions" :key="item.dictValue" :label="item.dictTag"
+                  :value="item.dictValue"></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
         <el-col :span="3">
           <el-button type="primary" size="small" @click="onSubmit">查询</el-button>
         </el-col>
@@ -211,7 +220,7 @@
       <el-table-column label="操作" align="center" min-width="100">
         <template slot-scope="scope">
           <el-button v-if="scope.row.orderstatus != '3'" size="mini" type="text" style="color:#2D4D89 "
-            @click="CloseEdit(scope.$index, scope.row)">编辑</el-button>
+            @click="CloseEdit(scope.$index, scope.row)">重新报价</el-button>
           <el-button size="mini" style="color:#2D4D89 " type="text"
             @click="onoffQuotationHistory(scope.row)">报价历史</el-button>
           <!-- <el-button size="mini" type="text" v-if="['0', '5'].includes(scope.row.orderstatus)"
@@ -506,7 +515,8 @@ export default {
       userid: "",
       downloadstatus: 0,
       expands: [],
-      institutionOptions: [],
+      productsTypeoptions: [],
+      InsInsuranceKindoptions:[],
       width: document.documentElement.clientWidth,
       insAreaCompanyList: [], //子订单list
       companyList: [], //保险公司
@@ -532,6 +542,8 @@ export default {
     this.getDicType("energyType"); //能源种类
     this.getDicType("businessVehicleUse"); //（车辆用途）营业
     this.getDicType("outOfBusinessVehicleUse"); //（车辆用途）非营业
+    this.getDicType("productsType"); //（车辆用途）非营业
+    
     this.$api.letter.gainTopList().then(res => {
       this.companyList = res.data;
     });

src/views/Task/mixin.js

@@ -40,19 +40,19 @@ export const mixin = { // 导出混入对象
           label: '订单号',
           type: 'input',
         },
-        {
-          name: 'companyId',
-          label: '保险公司',
-          type: 'select',
-          options: []
-        },
-        {
-          name: 'agreeId',
-          label: '协议选择',
-          type: 'select',
-          options: [],
-          optionsIabel: "agreementName",
-        },
+        // {
+        //   name: 'companyId',
+        //   label: '保险公司',
+        //   type: 'select',
+        //   options: []
+        // },
+        // {
+        //   name: 'agreeId',
+        //   label: '协议选择',
+        //   type: 'select',
+        //   options: [],
+        //   optionsIabel: "agreementName",
+        // },
         {
           name: 'licenseNo',
           label: '车牌号',
@@ -126,9 +126,9 @@ export const mixin = { // 导出混入对象
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "机构来源", minWidth: 160, formatter: this.managementSourceFormatter },
-        { prop: "insCompany", label: "保险公司", minWidth: 120 },
+        // { prop: "insCompany", label: "保险公司", minWidth: 120 },
         { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
-        { prop: "agreementName", label: "协议", minWidth: 160 },
+        // { prop: "agreementName", label: "协议", minWidth: 160 },
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         { prop: "product", label: "投保险种", minWidth: 100 },
@@ -138,9 +138,13 @@ export const mixin = { // 导出混入对象
         { prop: "subOrderId", label: "订单号", minWidth: 180 },
         { prop: "userid", label: "业务员", minWidth: 160, formatter: this.useridFormatter },
         { prop: "managementSource", label: "机构来源", minWidth: 160, formatter: this.managementSourceFormatter },
-        { prop: "insCompany", label: "保险公司", minWidth: 120 },
-        { prop: "partnerCompaniesName", label: "合作公司", minWidth: 120 },
-        { prop: "agreementName", label: "协议", minWidth: 160 },
+        // { prop: "insCompany", label: "保险公司", minWidth: 120 },
+        { prop: "partnerCompaniesName", label: "已承保公司", minWidth: 120 },
+        // { prop: "agreementName", label: "协议", minWidth: 160 },
+        { prop: "jqpremium", label: "交强险保费", minWidth: 160 },
+        { prop: "sypremium", label: "商业险保费", minWidth: 160 },
+        { prop: "jypremium", label: "驾意险保费", minWidth: 160 },
+        
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
         { prop: "isExternal", label: "外部订单", formatter: this.isExternalFormatter},
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },