瀏覽代碼

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

lihongxiao 2 年之前
父節點
當前提交
987e6b9911
共有 25 個文件被更改,包括 507 次插入 和 207 次删除
  1. 2 2
      config/dev.env.js
  2. 45 42
      src/components/Form/retrievalForm.vue
  3. 2 2
      src/components/TemplateTable/index.vue
  4. 7 0
      src/http/moudules/letter.js
  5. 102 102
      src/views/AgreementManage/CarInsurance/AgreementEntry.vue
  6. 2 6
      src/views/Core/KtCommonTable.vue
  7. 9 8
      src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue
  8. 42 11
      src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyintasks.vue
  9. 34 17
      src/views/FinancialManagement/CarInsurance/Verifytasks/Verifyuntasks.vue
  10. 17 2
      src/views/Task/AgentPoolChannel/AgentPoolChannel.vue
  11. 16 1
      src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue
  12. 16 1
      src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue
  13. 16 1
      src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue
  14. 16 1
      src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue
  15. 16 1
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue
  16. 16 1
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue
  17. 16 1
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue
  18. 16 1
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue
  19. 16 1
      src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue
  20. 16 1
      src/views/Task/TaskPoolChannel/TaskPoolChannel.vue
  21. 16 1
      src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue
  22. 16 1
      src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue
  23. 16 1
      src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue
  24. 16 1
      src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue
  25. 21 1
      src/views/Task/mixin.js

+ 2 - 2
config/dev.env.js

@@ -11,10 +11,10 @@ module.exports = merge(prodEnv, {
   // 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.42:8080/"',//武鸿鹏
   // BASE_URL: '"http://192.168.1.101:8080/"',
   // BASE_URL: '"http:///192.168.0.22:8080/"',//郝宇
-  // BASE_URL: '"http:///192.168.0.103:8080/"',//
+  BASE_URL: '"http:///192.168.0.103:8080/"',//
 })
 
 

+ 45 - 42
src/components/Form/retrievalForm.vue

@@ -1,45 +1,43 @@
 <template>
   <el-form ref="form" :model="formData" :inline="true" :label-width="labelWidth" size="small">
     <el-row>
-      <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'">
-              <el-input v-model="formData[field.name]" :placeholder="'请输入' + field.label"></el-input>
-            </template>
-            <template v-else-if="field.type === 'select'">
-              <el-select v-model="formData[field.name]" filterable clearable :placeholder="'请选择' + field.label"
-                @change="selectChange($event, field.name)">
-                <el-option v-for="(option, index) in field.options" :key="index"
-                  :label="field.optionsIabel ? option[field.optionsIabel] : option.name"
-                  :value="field.optionsValue ? option[field.optionsValue] : option.id"></el-option>
-              </el-select>
-            </template>
-            <template v-else-if="field.type === 'date'">
-              <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>
-            <template v-else-if="field.type === 'switch'">
-              <el-switch v-model="formData[field.name]"></el-switch>
-            </template>
-            <template v-else-if="field.type === 'checkbox'">
-              <el-checkbox-group v-model="formData[field.name]">
-                <el-checkbox v-for="(option, index) in field.options" :key="index" :label="option.label"
-                  :name="field.name"></el-checkbox>
-              </el-checkbox-group>
-            </template>
-            <template v-else-if="field.type === 'radio'">
-              <el-radio-group v-model="formData[field.name]">
-                <el-radio v-for="(option, index) in field.options" :key="index" :label="option.label"></el-radio>
-              </el-radio-group>
-            </template>
-            <template v-else-if="field.type === 'textarea'">
-              <el-input type="textarea" v-model="formData[field.name]"></el-input>
-            </template>
-          </el-form-item>
-        </el-col>
-      </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'">
+            <el-input v-model="formData[field.name]" :placeholder="'请输入' + field.label"></el-input>
+          </template>
+          <template v-else-if="field.type === 'select'">
+            <el-select v-model="formData[field.name]" filterable clearable :placeholder="'请选择' + field.label"
+              @change="selectChange($event, field.name)">
+              <el-option v-for="(option, index) in field.options" :key="index"
+                :label="field.optionsIabel ? option[field.optionsIabel] : option.name"
+                :value="field.optionsValue ? option[field.optionsValue] : option.id"></el-option>
+            </el-select>
+          </template>
+          <template v-else-if="field.type === 'date'">
+            <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>
+          <template v-else-if="field.type === 'switch'">
+            <el-switch v-model="formData[field.name]"></el-switch>
+          </template>
+          <template v-else-if="field.type === 'checkbox'">
+            <el-checkbox-group v-model="formData[field.name]">
+              <el-checkbox v-for="(option, index) in field.options" :key="index" :label="option.label"
+                :name="field.name"></el-checkbox>
+            </el-checkbox-group>
+          </template>
+          <template v-else-if="field.type === 'radio'">
+            <el-radio-group v-model="formData[field.name]">
+              <el-radio v-for="(option, index) in field.options" :key="index" :label="option.label"></el-radio>
+            </el-radio-group>
+          </template>
+          <template v-else-if="field.type === 'textarea'">
+            <el-input type="textarea" v-model="formData[field.name]"></el-input>
+          </template>
+        </el-form-item>
+      </el-col>
       <el-col :span="2" :offset="1" style="margin-top: 10px;" class="fold">
         <span @click="toggleCollapse">折叠筛选信息</span>
         <img src="../../../src/icon/Arrow.png" alt
@@ -85,19 +83,19 @@ export default {
       if (field.label === '报价时间' && !this.formData[field.list]) {
         this.$set(this.formData, field.list, [this.currentDate, this.currentDate]);
         this.$set(this.formData, field.name[0], this.currentDate);
-        this.$set(this.formData, field.name[1],this.currentDate );
+        this.$set(this.formData, field.name[1], this.currentDate);
       }
     });
     this.formFields = this.fields;
     this.resetForm();
-    this.defaultTime=this.currentDate;
+    this.defaultTime = this.currentDate;
   },
 
   methods: {
     selectChange(id, filed) {
       switch (filed) {
         case 'provinceId':
-            console.log(this.formData)
+          console.log(this.formData)
           break;
         case 'cityId':
 
@@ -142,6 +140,11 @@ export default {
 };
 </script>
 <style scoped lang="scss">
+.el-row{
+  display: flex;
+  flex-wrap: wrap;
+  align-content: flex-start;
+}
 .el-form-item>>>.el-input {
   width: 250px;
 }

+ 2 - 2
src/components/TemplateTable/index.vue

@@ -292,11 +292,11 @@ export default {
     handleSizeChange(value) {
       this.pagination.pageSize = value;
       this.pagination.pageNum = 1;
-      this.$emit('getList',this.pagination);
+      this.$emit('getList',{...this.pagination,...this.searchDataClone});
     },
     handleCurrentChange(val) {
       this.pagination.pageNum = val;
-      this.$emit('getList',this.pagination);
+      this.$emit('getList',{...this.pagination,...this.searchDataClone});
     },
     // 搜索
     handleSearchList() {

+ 7 - 0
src/http/moudules/letter.js

@@ -891,3 +891,10 @@ export const getTaskByCompanyId = (data) => {
     data
   })
 }
+//转发接口
+    export const findForwardingListBySubOrderId = (subOrderId) => {
+      return axios({
+        url: "/order/taskPools/findForwardingListBySubOrderId?subOrderId="+subOrderId,
+        method: "get",
+      })
+    }

+ 102 - 102
src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -61,11 +61,6 @@
               <el-input :size="overSize" clearable v-model.trim="queryForm.modifiedBy" placeholder="请输入"></el-input>
             </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-col :span="6">
             <el-form-item label="录入时间">
               <el-date-picker value-format="yyyy-MM-dd" v-model="queryForm.date" style="width: 215px" :size="overSize"
@@ -385,10 +380,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">
@@ -414,6 +410,9 @@
             value-format="yyyy-MM-dd">
           </el-date-picker>
         </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="productExpenseSearch">查询</el-button>
         </el-form-item>
@@ -450,7 +449,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"
@@ -485,10 +487,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="['单交', '交三', '交商', '兜底配置'].includes(
-            productCostForm.productName
-          )
-            ">
+
+          <el-row v-if="productjqincludes">
             <h4 style="color: tomato">交强险费用</h4>
             <el-col :span="5" :offset="1">
               <el-form-item label="费用比例" prop="jqCarCostsProportion">
@@ -540,10 +540,7 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row v-if="['单商', '单三', '交商', '交三', '兜底配置'].includes(
-            productCostForm.productName
-          )
-            ">
+          <el-row v-if="productsyincludes">
             <h4 style="color: tomato">商业险费用</h4>
 
             <el-col :span="5" :offset="1">
@@ -674,43 +671,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"
@@ -855,6 +846,9 @@
               :value="item.dictValue"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="费用描述">
+          <el-input v-model="productcopyItemPageRequest.costsDescription" clearable placeholder="费用描述"></el-input>
+        </el-form-item>
         <el-form-item>
           <el-button type="primary" @click="productcopyItemQuery">查询</el-button>
         </el-form-item>
@@ -1245,11 +1239,6 @@ export default {
           label: "交强出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "jqExportInvestmentRadio",
-          label: "交强出口加投比例",
-          minWidth: 160,
-        },
         {
           prop: "syCarCostsProportion",
           label: "费用比例(商业)",
@@ -1290,11 +1279,6 @@ export default {
           label: "商业出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "syExportInvestmentRadio",
-          label: "商业出口加投比例",
-          minWidth: 160,
-        },
         {
           prop: "noCarCostsProportion",
           label: "费用比例(非车)",
@@ -1388,11 +1372,6 @@ export default {
           label: "交强出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "jqExportInvestmentRadio",
-          label: "交强出口加投比例",
-          minWidth: 160,
-        },
         {
           prop: "syCarCostsProportion",
           label: "费用比例(商业)",
@@ -1433,11 +1412,7 @@ export default {
           label: "商业出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "syExportInvestmentRadio",
-          label: "商业出口加投比例",
-          minWidth: 160,
-        },
+
         {
           prop: "noCarCostsProportion",
           label: "费用比例(非车)",
@@ -1527,11 +1502,7 @@ export default {
           label: "交强出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "jqExportInvestmentRadio",
-          label: "交强出口加投比例",
-          minWidth: 160,
-        },
+
         {
           prop: "syCarCostsProportion",
           label: "费用比例(商业)",
@@ -1572,11 +1543,6 @@ export default {
           label: "商业出口比例五级",
           minWidth: 160,
         },
-        {
-          prop: "syExportInvestmentRadio",
-          label: "商业出口加投比例",
-          minWidth: 160,
-        },
         {
           prop: "noCarCostsProportion",
           label: "费用比例(非车)",
@@ -1653,7 +1619,7 @@ export default {
       underwritingRulesAddVehicleFactorVisible: false, //承保规则录入    显示/隐藏
       productCostCopyDialogVisible: false,//费用复制弹窗
       //产品list获取
-      roductList1: "", //产品绑定list
+      roductList1: [], //产品绑定list
       treedata: [], //授权结构树
       defaultProps: {
         //自定义参数
@@ -1705,9 +1671,9 @@ export default {
       },
       //产品费用
       productCostForm: {
-        agreementId: "",
-        productName: "",
-        productId: "",
+        agreementId: '',
+        productName: [],
+        productId: [],
         costsDescription: "", //费用描述
         costsStartDate: "", //费用起期
         costsEndDate: "", //费用止期
@@ -1758,12 +1724,14 @@ export default {
         productCode: "",
         costStartDate: "",
         costsEndDate: "",
+        costsDescription: "",
         pageNum: 1,
         pageSize: 20,
       },
       productcopyItemPageRequest: {
         productCode: "",
         agreementId: "",
+        costsDescription:"",
         pageNum: 1,
         pageSize: 20,
       },
@@ -2030,6 +1998,18 @@ export default {
     };
   },
   computed: {
+    productjqincludes() {
+      let a = ['单交', '交三', '交商', '兜底配置'];
+      let b = this.productCostForm.productName;
+      let contains = b.every(item => a.includes(item));
+      return contains
+    },
+    productsyincludes() {
+      let a = ['单商', '单三', '交商', '交三', '兜底配置'];
+      let b = this.productCostForm.productName;
+      let contains = b.every(item => a.includes(item));
+      return contains
+    },
     // 机构列表转属性数据
     companyListTree() {
       let cloneData = JSON.parse(JSON.stringify(this.companyList)); // 对源数据深度克隆
@@ -2206,7 +2186,17 @@ export default {
       this.productcopyItemFindPage();
     },
     productExpenseSearch() {
-      this.productCostFindPage();
+      let tempStartDate = this.productpageRequest.costStartDate;
+      let tempEndDate = this.productpageRequest.costsEndDate;
+      if (tempStartDate && !tempEndDate) {
+        this.$message({
+          message: "止期必传!",
+          type: "error",
+        });
+      } else {
+        this.productCostFindPage();
+
+      }
     },
     dateUpdateChange(e) {
       if (e == null) {
@@ -2559,6 +2549,8 @@ export default {
           })
           this.$nextTick(() => {
             this.dynamicFormArray = obj.costsAttrLinks;
+            obj.productId = [obj.productId]
+            obj.productName = [obj.productName]
             this.productCostForm = obj;
           });
           this.productCostAddDialogType = "edit";
@@ -2652,7 +2644,8 @@ export default {
     cleanEndDate() {
       this.productCostForm.costsEndDate = null;
     },
-    rulesEndDateChange(){
+
+    rulesEndDateChange() {
       let tempStartDate = this.underwritingRulesForm.rulesStartDate;
       let tempEndDate = this.underwritingRulesForm.rulesEndDate;
       if (!tempStartDate) {
@@ -2797,9 +2790,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;
@@ -2860,8 +2859,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) {
@@ -3054,12 +3055,10 @@ export default {
           return '删除'
       }
     },
-    auditTypeFormation(row) {
-      for (var i = 0; i < this.expenseAuditlist.length; i++) {
-        if (row.isAudit == parseInt(this.expenseAuditlist[i].value)) {
-          return this.expenseAuditlist[i].label;
-        }
-      }
+    auditTypeFormation(row, column) {
+      let expenseAudit = row.isAudit;
+      let expense = this.expenseAuditlist.find(val => val.value == expenseAudit).label;
+      return expense;
     },
     agreementtypeFormatter(row, column) {
       //协议类型
@@ -3422,4 +3421,5 @@ export default {
 
 .el-icon-arrow-down {
   font-size: 12px;
-}</style>
+}
+</style>

+ 2 - 6
src/views/Core/KtCommonTable.vue

@@ -92,13 +92,9 @@
             @click="handleButton3(scope.$index, scope.row)"
           />
           <kt-button
-            :style="{
-              background: button4Background,
-              border: '1px solid ' + button4Background,
-              color: '#ffffff',
-            }"
             v-if="button4Name"
             :icon="button4Icon"
+            :type="button4Type"
             :label="button4Name"
             :perms="permsButton4"
             :size="size"
@@ -247,7 +243,7 @@ export default {
     },
     button4Icon: {
       type: String,
-      default: "fa fa-trash",
+      default: "",
     },
     button5Icon: {
       type: String,

+ 9 - 8
src/views/FinancialManagement/CarInsurance/CompanySettlement/CarInsurance/HandlingFees.vue

@@ -55,8 +55,8 @@
               <el-input v-model="formDataList.allFeeValue" class="inputType"></el-input>
             </el-form-item>
         </el-col>
-        
-      </el-row> 
+
+      </el-row>
     </el-form>
     <span slot="footer" class="dialog-footer">
     <el-button size="small" @click="dialogVisible = false">取消</el-button>
@@ -142,7 +142,7 @@ export default {
           prop: "companyName",
           type: "company",
         },
-       
+
         {
           label: "险种",
           prop: "riskcode",
@@ -153,7 +153,7 @@ export default {
           prop: "partnerCompaniesName",
           type: "input",
         },
-       
+
         {
           label: "交强保单号",
           prop: "policyno",
@@ -185,8 +185,8 @@ export default {
               value:'0'
             }
           ],
-          
-        }, 
+
+        },
         {
           label: "创建日期",
           prop: "createTime",
@@ -356,7 +356,7 @@ export default {
         agreementType: '2',
         isNotCar: '0',
         isOther:'0',
-        // handlingFeesStatus:'0',
+        handlingFeesStatus:'0',
         isNotDocumentary:'0'
       },
       formData:{},
@@ -425,6 +425,7 @@ export default {
         signDateStart=''
         signDateEnd=''
       }
+      console.log({...this.pageData,...data,signDateStart,signDateEnd})
       this.$api.task
           .bxTotalAmount({...this.pageData,...data,signDateStart,signDateEnd})
           .then(res => {
@@ -544,7 +545,7 @@ export default {
     },
     handleClose(){
       this.dialogVisible=false
-    },  
+    },
     onSubmit(){
       this.$api.task.plyFeeUpdate({...this.formDataList,id:this.formDataId})
           .then(res => {

+ 42 - 11
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"
@@ -95,7 +99,7 @@ export default {
         userId: "",
       },
       retrievalFields: [
-        {
+      {
           name: 'provinceId',
           label: '省机构名称',
           type: 'select',
@@ -120,6 +124,7 @@ export default {
           type: 'select',
           options: []
         },
+
         {
           name: 'taskNo',
           label: '任务池号',
@@ -127,23 +132,31 @@ export default {
 
         },
         {
-          name: 'subOrderId',
+          name: 'orderNo',
           label: '订单号',
           type: 'input',
 
         },
+        {
+          name: 'managementSource',
+          label: '机构来源',
+          type: 'select',
+          options: [],
+          optionsIabel: "dictTag",
+          optionsValue: "dictValue",
+        },
         {
           name: 'companyId',
           label: '保险公司',
           type: 'select',
           options: []
         },
+
         {
-          name: 'agreeId',
-          label: '协议选择',
-          type: 'select',
-          options: [],
-          optionsIabel: "agreementName",
+          name: 'insuredName',
+          label: '被保险人',
+          type: 'input',
+          Retained: true,
         },
         {
           name: 'licenseNo',
@@ -193,10 +206,11 @@ export default {
           Retained: true,
         },
         {
-          name: 'insuredName',
-          label: '被保险人',
-          type: 'input',
-          Retained: true,
+          name: 'agreeId',
+          label: '协议选择',
+          type: 'select',
+          options: [],
+          optionsIabel: "agreementName",
         },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],
@@ -210,6 +224,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 +291,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"); //(车辆用途)非营业

+ 34 - 17
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,18 +136,26 @@ export default {
           type: 'input',
 
         },
+        {
+          name: 'managementSource',
+          label: '机构来源',
+          type: 'select',
+          options: [],
+          optionsIabel: "dictTag",
+          optionsValue: "dictValue",
+        },
         {
           name: 'companyId',
           label: '保险公司',
           type: 'select',
           options: []
         },
+
         {
-          name: 'agreeId',
-          label: '协议选择',
-          type: 'select',
-          options: [],
-          optionsIabel: "agreementName",
+          name: 'insuredName',
+          label: '被保险人',
+          type: 'input',
+          Retained: true,
         },
         {
           name: 'licenseNo',
@@ -201,10 +205,11 @@ export default {
           Retained: true,
         },
         {
-          name: 'insuredName',
-          label: '被保险人',
-          type: 'input',
-          Retained: true,
+          name: 'agreeId',
+          label: '协议选择',
+          type: 'select',
+          options: [],
+          optionsIabel: "agreementName",
         },
         {
           name: ["quoteStartDateStr", "quoteEndDateStr"],
@@ -218,6 +223,18 @@ export default {
           type: 'date',
           list: 'attachList'
         },
+        {
+          name: ["signStartDateStr", "signEndDateStr"],
+          label: '签单时间',
+          type: 'date',
+          list: 'signList'
+        },
+          {
+          name: ["payStartDateStr", "payEndDateStr"],
+          label: '支付时间',
+          type: 'date',
+          list: 'payList'
+        },
       ],
       orderInfo: {
         //选中的订单

+ 17 - 2
src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
       button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory" button5Name="详情" button5Type="text"
-      @handleButton5="detailFun"></kt-common-table>
+      @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -33,6 +34,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -58,7 +73,6 @@ export default {
         orderStatus: 0,
         userId: "",
       },
-
       ddgjdialogVisible: false,
       trajectoryTable: [],
       optionsStatus: [],
@@ -73,6 +87,7 @@ export default {
   },
 
   methods: {
+
     getStatusText(code) {
       return this.optionsStatus.find(val => val.dictValue == code).dictTag;;
     },

+ 16 - 1
src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"  button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable  placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text" @handleButton3="transmit"
       button2Name="报价轨迹" button2Type="text" @handleButton2="trajectory" button5Name="详情" button5Type="text"
-      @handleButton5="detailFun"></kt-common-table>
+      @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable  placeholder="请选择">
@@ -33,6 +34,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 16 - 1
src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -5,7 +5,8 @@
     <kt-common-table :data="pageResult" :columns="columns" element-loading-text="加载中..." v-loading="loading"
       :showBatchDelete="false" @findPage="findPage" button3Name="转发" button3Type="text"
       @handleButton3="transmit" button2Name="报价轨迹" button2Type="text"
-      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun"></kt-common-table>
+      @handleButton2="trajectory" button5Name="详情" button5Type="text" @handleButton5="detailFun" button4Name="转发记录" button4Type="text"
+      @handleButton4="forwardingRecords" :operationWidth="300"></kt-common-table>
     <el-dialog title="转发" :visible.sync="dialogVisible" width="30%">
       转发人:
       <el-select v-model="transmitValue" filterable clearable   placeholder="请选择">
@@ -36,6 +37,20 @@
         </el-steps>
       </div>
     </el-dialog>
+    <el-dialog :visible.sync="forwardingRecordsdialogVisible"  title="转发记录" width="70%">
+      <el-table :data="gridData"  height="400" border  v-loading="loading" highlight-current-row stripe
+        :header-cell-style="{
+          background: '#F2F7FC',
+          fontWeight: '700',
+          color: '#606266',
+        }">
+        <el-table-column property="subOrderId" align="center" label="订单号" width="200"></el-table-column>
+        <el-table-column property="oldOperatorId" align="center" label="转发人" width="200"></el-table-column>
+        <el-table-column property="newOperatorId" align="center" label="接收人"></el-table-column>
+        <el-table-column property="remark"  align="center" label="转发信息"></el-table-column>
+        <el-table-column property="createTime" align="center" label="转发时间"></el-table-column>
+      </el-table>
+    </el-dialog>
   </div>
 </template>
 <script>

+ 21 - 1
src/views/Task/mixin.js

@@ -1,4 +1,5 @@
 import CommonUtil from "@/utils/comutil.js";
+
 export const mixin = { // 导出混入对象
   data() {
     return {
@@ -131,7 +132,7 @@ export const mixin = { // 导出混入对象
         { prop: "licenseno", label: "车牌号", minWidth: 160 },
         { prop: "insuredname", label: "投保人姓名", minWidth: 120 },
         { prop: "product", label: "投保险种", minWidth: 100 },
-        { prop: "createtime", label: "录单日期", minWidth: 160, },
+        { prop: "createtime", label: "录单日期", minWidth: 160},
       ],
       statusoptions: "",
       dialogVisible: false,
@@ -150,6 +151,8 @@ export const mixin = { // 导出混入对象
       quoteno: "",
       oldfileList: [],
       orderInfo: {},
+      forwardingRecordsdialogVisible:false,
+      gridData:[],
     }
   },
   computed: {
@@ -176,6 +179,23 @@ export const mixin = { // 导出混入对象
     this.getDicType("productsType"); //车船税类型
   },
   methods: {
+    forwardingRecords(row){
+      let id=row.row.subOrderId;
+      this.forwardingRecordsQuery(id);
+    },
+    forwardingRecordsQuery(id) {
+      this.$api.letter.findForwardingListBySubOrderId(id).then((res) => {
+        if (res.code == '200' && res.data.length) {
+          this.gridData=res.data;
+          this.forwardingRecordsdialogVisible=true;
+        } else {
+          this.$message({
+            type: 'error',
+            message: "没有转发记录",
+          });
+        }
+      });
+    },
     detailFun(row) {
       let params = {
         companyId: row.row.subOrderId