提交前台轨迹记录以及统一调用新的保单地址

src/http/moudules/letter.js

@@ -1375,4 +1375,12 @@ export const getProductInfo = (data) => {
      method: 'post',
      data
     })
-   }
+   }
+
+   //子订单轨迹查询
+export const queryBySuborderDetails = (suborder) => {
+  return axios({
+    url: "/insurance/track/queryBySuborderDetails?suborder=" + suborder,
+    method: "get",
+  })
+}

src/http/moudules/readPdf.js

@@ -76,16 +76,16 @@ export const productOrderPdf = (params) => {
 }
 
 // 重新生成pdf路径
-export const udapteOrderDate = (params) => {
+export const updateOrderDate = (params) => {
   return axios({
-   url: '/subOrder/productOrderPdf?udapteOrderDate=' + params,
+   url: '/subOrder/updateOrderDate?subOrderId=' + params,
    method: 'get',
   })
 }
 //更新记录
-export const udapteOrderDateRecord = (params) => {
+export const updateOrderDateRecord = (params) => {
   return axios({
-   url: '/subOrder/productOrderPdf?udapteOrderDateRecord=' + params,
+   url: '/subOrder/updateOrderDateRecord?subOrderId=' + params,
    method: 'get',
   })
 }

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

@@ -222,35 +222,25 @@
       auditStatus="1"
     >
     </detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <div slot="title" class="">
         <span>订单轨迹</span>
       </div>
       <div style="height: 300px; overflow-y: auto">
-        <el-steps
-          direction="vertical"
-          :active="trajectoryTable.length - 1"
-          finish-status="success"
-        >
-          <el-step
-            :title="item.desc"
-            :key="item.id"
-            v-for="item in trajectoryTable"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <template v-if="item.auditstatus == '0'">
+              <template style="margin-top:10px;margin-bottom:10px ;">
                 <div>保险公司：{{ item.insCompany }}</div>
-                <div>创建用户：{{ item.operator }}</div>
-              </template>
-              <template v-else>
-                <span>操作人：{{ item.operator }}</span>
-                <span style="margin-left: 10px"
-                  >操作人工号：{{ item.audituser }}</span
-                >
-                <div v-if="item.operatorTime">
-                  操作时间：{{ item.operatorTime }}
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
                 </div>
-                <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
               </template>
             </template>
           </el-step>
@@ -1020,6 +1010,7 @@ export default {
           let businessList = [];
           let accidentList = [];
           if (res.data.orderstatus == "3") {
+            /** 
             if (res.data.isExternal == 1) {
               this.$api.letter
                 .getPolicyPrintexternalOrder(res.data.id)
@@ -1782,7 +1773,16 @@ export default {
               businessList,
               accidentList,
             };
-            this.$refs.detailsDialog.warrantyFun(obj);
+            */
+            this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
+              console.log(res.data)
+              if (res.code == 200) {
+                this.$refs.detailsDialog.warrantyFun(res.data);
+              } else{
+                this.$message.error(res.msg);
+              } 
+            }); 
+            
           }
           this.feeDetailInfo = res.data.orderFeeResult;
           this.oldFeeInfo = res.data.adjustFeeDescVo;

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

@@ -92,17 +92,26 @@
     <detailsDialog ref="detailsDialog" :orderInfo="orderInfo" :feeOrderNewVoList="feeOrderNewVoList"
       :isrejection="isrejection" @updatedCost="updatedCost" @adusitFUn="adusitFUn" @rejectionFUn="rejectionFUn">
     </detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
-      <div slot="title" class="dialog-title">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
+      <div slot="title" class="">
         <span>订单轨迹</span>
       </div>
       <div style="height: 300px; overflow-y: auto">
-        <el-steps direction="vertical" :active="trajectoryTable.length - 1" finish-status="success">
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
           <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <div>保险公司：{{ item.insCompany }} <span style="margin-left:15px">创建用户：{{ item.operator }}</span></div>
-              <div>创建时间：{{ item.operatorTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -908,6 +917,7 @@ export default {
           let businessList = []
           let accidentList = []
           if (res.data.orderstatus == "3") {
+            /** 
             if (res.data.isExternal == 1) {
               this.$api.letter
                 .getPolicyPrintexternalOrder(res.data.id).then(res1 => {
@@ -1613,6 +1623,16 @@ export default {
               accidentList
             }
             this.$refs.detailsDialog.warrantyFun(obj);
+            */
+            this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
+              console.log(res.data)
+              if (res.code == 200) {
+                this.$refs.detailsDialog.warrantyFun(res.data);
+              } else{
+                this.$message.error(res.msg);
+              } 
+            }); 
+            
           }
           this.feeDetailInfo = res.data.orderFeeResult;
           this.oldFeeInfo = res.data.adjustFeeDescVo;

src/views/OrderMsg/AttrConfig.vue

@@ -56,6 +56,18 @@
                 </el-form-item>  
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="保单类型" prop="readType">
+                  <el-select v-model="pdfForm.type"  placeholder="" filterable  clearable>
+                    <el-option label="交强" value="1"></el-option>
+                    <el-option label="商业" value="2"></el-option>
+                 </el-select>
+               </el-form-item> 
+              </el-col>
+              <el-col :span="8">
+              </el-col>
+            </el-row>
           </el-form>
         </div> 
       <span slot="footer" class="dialog-footer">
@@ -76,6 +88,17 @@
                 </el-form-item>
               </el-col>
             </el-row>
+            <el-row>
+              <el-col :span="24">
+                <el-form-item label="保单类型" prop="readType">
+                  <el-select v-model="readform.type"  placeholder="" filterable  clearable>
+                    <el-option label="交强" value="1"></el-option>
+                    <el-option label="商业" value="2"></el-option>
+                 </el-select>
+               </el-form-item> 
+              </el-col>
+              
+            </el-row>
             <row>
               <el-col :span="24">
                   <el-form-item label="pdf内容">
@@ -135,6 +158,7 @@ export default {
         { prop: "readEnd", label: "字段截取后缀", minWidth: 160 },
         { prop: "readType", label: "截取时间类型", minWidth: 160, formatter: this.dateTypeFormatter},
         { prop: "orderMsg", label: "保单字段配置", minWidth: 160 },
+        { prop: "orderMsg", label: "保单类型", minWidth: 160 , formatter: this.typeFormatter},
       ],
       attrResult: [],
       pageRequest: {
@@ -143,6 +167,7 @@ export default {
         companyId:""
       },
       readform: {
+        type: "",
         companyId: "",
         url: ""
       },
@@ -150,8 +175,12 @@ export default {
         url: [
           { required: true, message: "请填写pdf路径", trigger: "blur" },
         ],
+        type: [
+          { required: true, message: "请选择保单类型", trigger: "blur" },
+        ],
       },
       pdfForm: {
+        type: "",//类型
         companyId: "",//保险公司id
         companyName: "",//保险公司id
         readName: "",//读取pdf字段
@@ -180,6 +209,9 @@ export default {
         readName: [
           { required: true, message: "请输入保单字段设置", trigger: "blur" },
         ],
+        type: [
+          { required: true, message: "请输入保单类型", trigger: "change" },
+        ],
       },
     }
   },
@@ -194,6 +226,17 @@ export default {
   },
   // 方法函数
   methods: {
+    //格式化保单
+    typeFormatter(row, column) {
+      let type = row.type;
+      switch (type) {
+        case '1':
+          return <el-tag type="success">交强</el-tag>
+        case '2':
+          return <el-tag type="warning">商业</el-tag>
+        default:
+      }
+    },
      //获取保单信息
      getPdfMsg() {
       this.readform.url="";
@@ -240,11 +283,13 @@ export default {
     //添加
     addAttr() {
       //清空数据
+      this.pdfForm.id = null;
       this.pdfForm.readName = "";
       this.pdfForm.readBegin = "";
       this.pdfForm.readEnd = "";
       this.pdfForm.readType = "";
       this.pdfForm.orderMsg = "";
+      this.pdfForm.type = "";
       this.attrDialogType = 'add';
       this.attrDialogTitle = '添加'
       this.attrVisible = true;
@@ -263,6 +308,7 @@ export default {
           readType: res.data.readType,
           orderMsg: res.data.orderMsg,
           id: row.id,
+          type: res.data.type,
         } 
       });
       this.attrVisible = true;

src/views/Task/AgentPoolChannel/AgentPoolChannel.vue

@@ -18,18 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -127,7 +135,7 @@ export default {
         });
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/AgentPoolChannel/AgentPoolChannel1.vue

@@ -17,21 +17,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/AgentPoolChannel/AgentPoolChannel2.vue

@@ -22,21 +22,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -259,8 +264,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/AgentPoolChannel/AgentPoolChannel3.vue

@@ -19,21 +19,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders " :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -156,8 +161,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/AgentPoolChannel/AgentPoolChannel4.vue

@@ -18,21 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel.vue

@@ -19,18 +19,26 @@
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing"
       :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+      <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -199,7 +207,7 @@ export default {
         });
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/CompanyPoolChannel/CompanyPoolChannel1.vue

@@ -18,21 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+   <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/CompanyPoolChannel/CompanyPoolChannel2.vue

@@ -58,22 +58,26 @@
       :isAuditing="isAuditing"
       :feeOrderNewVoList="feeOrderNewVoList"
     ></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
-      <div slot="title" class="dialog-title">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
+      <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
-            v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -384,7 +388,7 @@ export default {
         });
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/CompanyPoolChannel/CompanyPoolChannel3.vue

@@ -20,21 +20,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -348,8 +353,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/CompanyPoolChannel/CompanyPoolChannel4.vue

@@ -20,21 +20,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel.vue

@@ -18,18 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -147,7 +155,7 @@ export default {
         });
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/ElectricSales/AgentPoolChannel1.vue

@@ -17,21 +17,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/ElectricSales/AgentPoolChannel2.vue

@@ -22,21 +22,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -259,8 +264,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/ElectricSales/AgentPoolChannel3.vue

@@ -19,21 +19,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders " :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -156,8 +161,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/ElectricSales/AgentPoolChannel4.vue

@@ -18,21 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel.vue

@@ -18,21 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -129,8 +134,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/TaskPoolChannel/TaskPoolChannel1.vue

@@ -18,18 +18,26 @@
     </el-dialog>
     <detailsDialog ref="detailsDialog" :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing"
       :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+      <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/TaskPoolChannel/TaskPoolChannel2.vue

@@ -23,21 +23,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -262,8 +267,8 @@ export default {
           }
         });
     },
-    trajectory(row){
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+    trajectory(row) {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/TaskPoolChannel/TaskPoolChannel3.vue

@@ -20,18 +20,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable" :key="item.id" :title="getStatusText(item.orderStatus)">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -154,7 +162,7 @@ export default {
         });
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;

src/views/Task/TaskPoolChannel/TaskPoolChannel4.vue

@@ -18,21 +18,26 @@
       </span>
     </el-dialog>
     <detailsDialog ref="detailsDialog"  :isTaskPool="true" :orderInfo="queryOrders" :isAuditing="isAuditing" :feeOrderNewVoList="feeOrderNewVoList"></detailsDialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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 v-for="item in trajectoryTable"
-            :key="item.id"
-            :title="getStatusText(item.orderStatus)"
-          >
+        <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>

src/views/Task/UpdateOrderData/Index.vue

@@ -60,13 +60,10 @@
       <el-table-column prop="payDate" label="支付时间" align="center"></el-table-column>
       <el-table-column label="操作" align="center" min-width="170">
         <template slot-scope="scope">
-          <kt-button label="保单时间更新" type="text" 
-            @click="updateDate(scope.row)" />
-          <kt-button label="保单Pdf详情" type="text"  
-            @click="cpolicy(scope.row)" />
+          <kt-button label="保单Pdf详情" type="text"    @click="cpolicy(scope.row)" />
           <kt-button label="重新生成保单" type="text" @click="regenerate(scope.row)" />
-          @click="cpolicy(scope.row)" />
-          <kt-button label="更新时间记录" type="text" @click="udapteOrderDateRecord(scope.row)" />
+          <kt-button label="保单时间更新" type="text"  @click="updateDate(scope.row)" />  
+          <kt-button label="更新时间记录" type="text" @click="udapteOrderDateRecord(scope.row)" />  
         </template>
       </el-table-column>
     </el-table>
@@ -103,6 +100,20 @@
           </el-row>
         </div>
     </el-dialog>
+    <!--  跟新记录  -->
+    <el-dialog title="时间更新记录" ref="detailsUpdateDialog" width="500"  height="500"  :visible.sync="updateFlag" :close-on-click-modal="false" @close="closeUpdeteDialog">
+      <div>
+        <el-table :size="overSize"  ref="productTable" :data="updateDateRecord"  height="500"  highlight-current-row  stripe
+          :header-cell-style="{ background: '#F2F7FC', fontWeight: '700',color: '#606266',}">
+            <el-table-column prop="subOrderNo"  label="子订单号"  align="center" width="180"></el-table-column>
+            <el-table-column  prop="createTime"  label="创建时间"  align="center"  width="150"></el-table-column>
+            <el-table-column  prop="oldPayDate"  label="旧缴费时间"  align="center"  width="150"></el-table-column>
+            <el-table-column  prop="oldSignTime"  label="旧签单时间"  align="center"  width="150"></el-table-column>
+            <el-table-column  prop="newPayDate"  label="新缴费时间"  align="center"  width="150"></el-table-column>
+            <el-table-column  prop="newSignTime"  label="新签单时间"  align="center"  width="150"></el-table-column>
+        </el-table>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -119,6 +130,8 @@ export default {
   },
   data() {
     return {
+      updateDateRecord:[],
+      updateFlag:false,
       orderInfo:{},
       cpolicyFlag:false,
       isrejection: false,
@@ -177,13 +190,6 @@ export default {
           type: 'select',
           options: []
         },
-
-
-        // {
-        //   name: 'taskNo',
-        //   label: '任务池号',
-        //   type: 'input',
-        // },
         {
           name: 'orderNo',
           label: '订单号',
@@ -378,20 +384,6 @@ export default {
     window.removeEventListener('resize', this.getDimensions);
   },
   methods: {
-    auditstatusCap(val) {
-      if (val == "0") {
-        return "未审核";
-      }
-      if (val == "1") {
-        return "审核通过";
-      }
-      if (val == "2") {
-        return "审核驳回";
-      }
-      if (val == "3") {
-        return "已承保";
-      }
-    },
     //获取机构数据
     areaqueryList(level, parentId, filed) {
       this.$api.task.queryListByParentId(level, parentId).then((res) => {
@@ -605,20 +597,31 @@ export default {
     },
     //重新生成
     regenerate(row) {
-      this.cpolicyFlag =true;
-       this.$api.readPdf.productOrderPdf(row.subOrderId).then((res) => {
-        console.log(res.data)
-        if (res.code == 200) {
-          this.$message.info(res.msg);
-        } else{
-          this.$message.error(res.msg);
-        } 
-      }); 
+      this.$confirm("确定要重新生成吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+           this.$api.readPdf.productOrderPdf(row.subOrderId).then((res) => {
+              if (res.code == 200) {
+                this.$message.info("重新生成成功");
+              } else{
+                this.$message.error("重新生成失败");
+              } 
+            }); 
+        })
+        .catch(() => {
+          this.$message({
+            type: "info",
+            message: "取消",
+          });
+        });
+      
     },
     //更新订单的签单和缴费时间
     updateDate(row) {
-      this.cpolicyFlag =true;
-       this.$api.readPdf.productOrderPdf(row.subOrderId).then((res) => {
+       this.$api.readPdf.updateOrderDate(row.subOrderId).then((res) => {
         if (res.code == 200) {
           this.$message.info(res.msg);
         } else{
@@ -628,10 +631,10 @@ export default {
     },
     //更新记录
     udapteOrderDateRecord(row) {
-      this.cpolicyFlag =true;
-       this.$api.readPdf.udapteOrderDateRecord(row.subOrderId).then((res) => {
+      this.updateFlag =true;
+       this.$api.readPdf.updateOrderDateRecord(row.subOrderId).then((res) => {
         if (res.code == 200) {
-          this.$message.info(res.data);
+          this.updateDateRecord =res.data;
         } else{
           this.$message.error(res.msg);
         } 
@@ -733,6 +736,10 @@ export default {
       link.download = filename;
       link.click();
     },
+    //关闭更新时间记录
+    closeUpdeteDialog(){
+       this.updateFlag = flase;
+    },
   }
 }
 </script>

src/views/Task/daikeComponents/KtOrder.vue

@@ -389,18 +389,26 @@
     <!-- 车辆报价新页面 -->
     <detailsDialog ref="detailsDialog" :orderInfo.sync="orderInfo" :Feepermissions="false"></detailsDialog>
     <!-- 订单轨迹 -->
-    <el-dialog :visible.sync="ddgjdialogVisible" width="430px">
+    <el-dialog :visible.sync="ddgjdialogVisible" width="500px">
       <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.orderStatus | caps" :key="item.id" v-for="item in trajectoryTable">
+          <el-step :title="item.desc" :key="item.id" v-for="item in trajectoryTable">
             <template slot="description">
-              <span>保险公司：{{ item.insCompany }}</span>
-              <span>提交人：{{ item.operator }}</span>
-              <div>创建时间：{{ item.createTime }}</div>
-              <div v-if="item.remark">状态更新：{{ item.remark }}</div>
+              <template style="margin-top:10px;margin-bottom:10px ;">
+                <div>保险公司：{{ item.insCompany }}</div>
+                <div>车牌号：{{ item.licenseNo }}</div>
+                <div>被保人：{{ item.insuredname }}</div>
+                <div>
+                  <span >操作人：{{ item.operator }}</span>
+                  <span style="margin-left: 10px">操作人工号：{{ item.audituser }}</span>
+                </div>
+                <span v-if="item.operatorTime">
+                  操作时间：{{ item.operatorTime }}
+                </span>
+              </template>
             </template>
           </el-step>
         </el-steps>
@@ -1866,7 +1874,7 @@ export default {
       });
     },
     orderTrajectory(row, item) {
-      this.$api.letter.queryBySuborder(item.id).then((res) => {
+      this.$api.letter.queryBySuborderDetails(item.id).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;
@@ -2058,6 +2066,7 @@ export default {
           let businessList = [];
           let accidentList = [];
           if (res.data.orderstatus == "3") {
+            /**
             if (res.data.isExternal == 1) {
               this.$api.letter
                 .getPolicyPrintexternalOrder(res.data.id)
@@ -2926,6 +2935,15 @@ export default {
             };
 
             this.$refs.detailsDialog.warrantyFun(obj);
+            */
+            this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
+              console.log(res.data)
+              if (res.code == 200) {
+                this.$refs.detailsDialog.warrantyFun(res.data);
+              } else{
+                this.$message.error(res.msg);
+              } 
+            }); 
           }
           console.log(this.orderInfo)
           this.showInsureList = false;

src/views/Task/mixin.js

@@ -389,7 +389,8 @@ export const mixin = { // 导出混入对象
         if (res.code == "200") {
           var data = res.data;
           this.orderInfo = res.data;
-          this.cpolicy();
+          //this.cpolicy();
+          this.cpolicyNew();
           this.ImageList();
           data.kindinfo.map((ele, index) => {
             switch (ele.kindCode) {
@@ -1162,6 +1163,19 @@ export const mixin = { // 导出混入对象
         this.$refs.detailsDialog.warrantyFun(obj);
       }
     },
+    cpolicyNew() {
+      if (this.orderInfo.orderstatus == "3") {
+        this.$api.readPdf.readPdfUrlList(this.orderInfo.id).then((res) => {
+          console.log(res.data)
+          if (res.code == 200) {
+            this.$refs.detailsDialog.warrantyFun(res.data);
+          } else{
+            this.$message.error(res.msg);
+          } 
+        }); 
+        
+      }
+    },
     ImageList() {
       this.carImageList = [];
       this.ownerImageList = []; //车主影像
@@ -1301,7 +1315,7 @@ export const mixin = { // 导出混入对象
       }
     },
     trajectory(row) {
-      this.$api.letter.queryBySuborder(row.subOrderId).then((res) => {
+      this.$api.letter.queryBySuborderDetails(row.subOrderId).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           this.ddgjdialogVisible = true;
           this.trajectoryTable = res.data;