工作室合伙人

src/components/Form/ProductCostForm.vue

@@ -112,11 +112,51 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <div v-if="formItems.attrType == 'select'" style="display: flex;">
                   <el-select multiple v-model="formItems.minArray" placeholder="请选择" style="width: 100%;"
                     @change="selectChange($event, formItems.id, 'min')">
                     <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
-                      :value="dict.name"></el-option>
+                    :value="formItems.attrName == '车辆类型' ? dict.code : dict.name"></el-option>
                   </el-select>
                   <el-checkbox style="margin-left: 10px;" v-if="formItems.attrCode == 'LicenseNo'"
                     v-model="LicenseNoChecked"
@@ -190,6 +230,47 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
+
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -209,6 +290,7 @@
                   <el-button v-if="formItems.attrType == 'radio'" size="mini" style="margin-left: 20px;"
                     @click="radiouncheck(formItems)">取消选择</el-button>
                 </div>
+
               </el-form-item>
             </el-col>
           </div>
@@ -255,6 +337,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -320,6 +442,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -386,6 +548,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 170px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -451,6 +653,46 @@
                       :value="operatoritem.value"></el-option>
                   </el-select>
                 </template>
+                <template v-if="formItems.attrType == 'datetime'">
+                  <template v-if="formItems.operator == '1' || formItems.operator == null">
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                    <span>~</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '2'">
+                    <span>＜</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '3'">
+                    <span>≤</span>
+                    <el-date-picker v-model="formItems.min" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '4'">
+                    <span>＞</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <template v-if="formItems.operator == '5'">
+                    <span>≥</span>
+                    <el-date-picker v-model="formItems.max" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
+                      placeholder="选择日期时间" style="width: 175px;">
+                    </el-date-picker>
+                  </template>
+                  <el-select v-model="formItems.operator" @change="selectoperatorChange($event, formItems.id)"
+                    placeholder="请选择" style="width: 120px;margin-left: 20px;">
+                    <el-option v-for="operatoritem in operator" :key="operatoritem.id" :label="operatoritem.label"
+                      :value="operatoritem.value"></el-option>
+                  </el-select>
+                </template>
                 <el-select v-if="formItems.attrType == 'select'" multiple v-model="formItems.list" placeholder="请选择"
                   style="width: 100%;" @change="selectChange($event, formItems.id, 'min')">
                   <el-option v-for="dict in formItems.dictLabal" :key="dict.code" :label="dict.name"
@@ -694,6 +936,10 @@ export default {
 }
 
 /deep/ {
+  .el-input--suffix .el-input__inner {
+    padding-right: 0 !important;
+  }
+
   .el-card__body {
     padding: 0;
   }

src/http/moudules/insCompany.js

@@ -1202,4 +1202,13 @@ export const getProportionConfig = (params) => {
     method: "get",
     params,
   })
-}
+}
+
+// 方案轨迹 
+export const ruleTrajectory = (data) => {
+  return axios({
+    url: '/plt/scheme/trajectory/ruleTrajectory',
+    method: "post",
+    data,
+  })
+}

src/http/moudules/letter.js

@@ -1366,4 +1366,21 @@ export const getProductInfo = (data) => {
      method: 'post',
      data
     })
-   }
+   }
+   
+  // 获取交强出口费用  商业出口费用  非车出口费用  
+  export const externalOrderFee = (data) => {
+    return axios({
+     url: '/api/externalOrder/externalOrderFee',
+     method: 'post',
+     data
+    })
+   }
+
+   //子订单轨迹查询
+export const queryBySuborderDetails = (suborder) => {
+  return axios({
+    url: "/insurance/track/queryBySuborderDetails?suborder=" + suborder,
+    method: "get",
+  })
+}

src/http/moudules/readPdf.js

@@ -52,3 +52,40 @@ export const readPdfContent = (data) => {
     data
   })
 }
+//查询已承保的保单数据
+export const queryPageOrder = (data) => {
+  return axios({
+    url: "/insOrderReadPdf/queryPageOrder",
+    method: 'post',
+    data
+  })
+}
+// 获取统一的pdf路径
+export const readPdfUrlList = (params) => {
+  return axios({
+   url: '/subOrder/readPdfUrlList?subOrderId=' + params,
+   method: 'get',
+  })
+ }
+// 重新生成pdf路径
+export const productOrderPdf = (params) => {
+    return axios({
+     url: '/subOrder/productOrderPdf?subOrderId=' + params,
+     method: 'get',
+    })
+}
+
+// 重新生成pdf路径
+export const updateOrderDate = (params) => {
+  return axios({
+   url: '/subOrder/updateOrderDate?subOrderId=' + params,
+   method: 'get',
+  })
+}
+//更新记录
+export const updateOrderDateRecord = (params) => {
+  return axios({
+   url: '/subOrder/updateOrderDateRecord?subOrderId=' + params,
+   method: 'get',
+  })
+}

src/views/AgreementManage/CarInsurance/AgreementEntry.vue

@@ -1399,7 +1399,25 @@
         <div v-show="!trajectoryTable1.length">暂无轨迹</div>
       </div>
     </el-dialog>
+    <el-drawer
 
+    :visible.sync="drawer"
+    :direction="'rtl'"
+    size="90%"
+    :before-close="handleClose"
+    :destroy-on-close="true">
+
+    <div class="drawer-main">
+      <agreementHistoryRecord :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==1"/>
+
+      <agreementProductFee :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==2"/>
+
+      <agreementUnderwritingRule :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==3"/>
+
+      <agreementNonVehicleConfig :messageInfo="agreementActiveInfo" v-if="operationTypeBtn==4"/>
+
+    </div>
+  </el-drawer>
   </div>
 </template>
 <script>
@@ -1411,15 +1429,25 @@ import KtButton from "@/views/Core/KtButton";
 import CommonUtil from "@/utils/comutil.js";
 import citydata from "@/assets/js/citydata.js";
 import { formatWithSeperator, format } from "@/utils/datetime.js";
+import agreementProductFee from "./AgreementProductFee.vue"
+import agreementHistoryRecord from "./AgreementHistoryRecord.vue"
+import agreementUnderwritingRule from "./AgreementUnderwritingRule.vue"
+import agreementNonVehicleConfig from "./AgreementNonVehicleConfig.vue"
 export default {
   components: {
     tree,
     KtCommonTable,
     KtButton,
-    ProductCostForm
+    ProductCostForm,
+    agreementProductFee,
+    agreementHistoryRecord,
+    agreementUnderwritingRule,
+    agreementNonVehicleConfig
   },
   data() {
     return {
+      operationTypeBtn:0,
+      drawer:false,
       apiTypelist: [
         {
           id: 1,
@@ -2789,6 +2817,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -2824,6 +2853,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -2861,6 +2891,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }
@@ -2925,28 +2956,44 @@ export default {
     },
     //协议历史
     historyRecord() {
-      this.$router.push({
-        path: "agreementHistoryRecord",
-        query: this.agreementActiveInfo,
-      });
+      // this.$router.push({
+      //   path: "agreementHistoryRecord",
+      //   query: this.agreementActiveInfo,
+      // });
+      this.drawer=true
+      this.operationTypeBtn=1
+
     },
+    //产品费用按钮点击
     productCost1() {
-      this.$router.push({
-        path: "agreementProductFee",
-        query: this.agreementActiveInfo,
-      });
+      this.drawer=true
+      this.operationTypeBtn=2
+
+      // this.$router.push({
+      //   path: "agreementProductFee",
+      //   query: this.agreementActiveInfo,
+      // });
     },
+    //承保规则
     underwritingRulesButton1() {
-      this.$router.push({
-        path: "agreementUnderwritingRule",
-        query: this.agreementActiveInfo,
-      });
+      // this.$router.push({
+      //   path: "agreementUnderwritingRule",
+      //   query: this.agreementActiveInfo,
+      // });
+      this.drawer=true
+      this.operationTypeBtn=3
+
+
     },
+    //非车配置
     nonVehicleConfigButton1() {
-      this.$router.push({
-        path: "agreementNonVehicleConfig",
-        query: this.agreementActiveInfo,
-      });
+      // this.$router.push({
+      //   path: "agreementNonVehicleConfig",
+      //   query: this.agreementActiveInfo,
+      // });
+      this.drawer=true
+      this.operationTypeBtn=4
+
     },
     //非车规则分页查询
     accidentalInsuranceFindPage(data) {
@@ -3190,6 +3237,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -3251,6 +3299,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -3401,7 +3450,7 @@ export default {
     apiChange(id) {
       this.attributionform.apiType = id;
       let params = {
-        insCompanyId: this.agreement.partnerCompaniesId,
+        insCompanyId: this.queryForm.partnerCompaniesId,
         apiType: id,
         agreementId:this.agreementId,
       };
@@ -3477,6 +3526,7 @@ export default {
       this.operType = "EDIT";
       this.dialogTitle = "协议编辑";
       this.productFilterList = []
+
       this.$api.insCompany.agreementId(row.id).then((res) => {
         if (res.code == "200") {
           let scheme = res.data.scheme;
@@ -3623,10 +3673,10 @@ export default {
     closeDialog() {
       //不管新增，还是编辑  关闭窗口后，都清空临时数据 以免编辑后新增默认带出上一次打开协议中信息
       for (let key in this.agreement) {
-        // if (key != "partnerCompaniesId") {
+        if (key != "partnerCompaniesId") {
         this.agreement[key] = "";
 
-        // }
+        }
       }
       this.labelData = null;
       this.attributionform = JSON.parse(
@@ -3771,7 +3821,7 @@ export default {
       let parmas = {
         pageNum: this.pageNum,
         pageSize: this.pageSize,
-        partnerCompaniesId: this.agreement.partnerCompaniesId,
+        partnerCompaniesId:this.queryForm.partnerCompaniesId,
         companiesType: this.supplierType,
         startDate: this.queryForm.startDate,
         endDate: this.queryForm.endDate,
@@ -3924,6 +3974,7 @@ export default {
       }
       this.agreement.partnerCompaniesId = value[value.length - 1];
       this.agreement.insuranceCompanyId = value[0];
+      this.queryForm.partnerCompaniesId=value[value.length - 1];
       if (this.supplierType == "1") {
         this.agreement.agreementType = "1";
       } else if (this.supplierType == "0") {
@@ -4078,6 +4129,10 @@ export default {
       this.pageNum = val;
       this.findPage();
     },
+    //关闭抽屉
+    handleClose(){
+      this.drawer=false
+    }
   },
 };
 </script>

src/views/AgreementManage/CarInsurance/AgreementHistoryRecord.vue

@@ -32,7 +32,7 @@
       :showBatchSettled="false" :showBatchPrint="false" :data="agreementHistoryRecordResult"
       :columns="agreementHistoryRecordColumns" @findPage="agreementHistoryCostFindPage">
     </kt-common-table>
-    <el-dialog title="协议历史记录详情" :visible.sync="agreementsHistoryDialogVisible" width="60%" top="6vh"
+    <el-dialog :append-to-body="true" title="协议历史记录详情" :visible.sync="agreementsHistoryDialogVisible" width="60%" top="6vh"
       @close="agreementsHistorycloseDialog">
       <el-tabs v-model="activeTabs" type="card" @tab-click="handleClickTab">
         <el-tab-pane label="协议信息" name="first" class="tab-panestyle">
@@ -284,6 +284,11 @@ export default {
   components: {
     KtCommonTable
   },
+  props:{
+    messageInfo:{
+      default:{}
+    }
+  },
   data() {
     return {
       apiTypelist:[
@@ -417,7 +422,7 @@ export default {
   },
   // 生命周期函数
   created() {
-    this.productpageRequest.agreementId = this.$route.query.id;
+    this.productpageRequest.agreementId = this.messageInfo.id;
     this.getDicType("InsInsuranceKind"); //险种类型
     this.getDicType("agreementType"); //协议类型
     this.getDicType("matchType"); //保单日期类型

src/views/AgreementManage/CarInsurance/AgreementNonVehicleConfig.vue

@@ -28,7 +28,7 @@
       button3Type="text" button2Type="text" :button2style="{ color: '#2D4D89' }" :button3style="{ color: '#D42426' }"
       button3Background="#F56C6C" @handleButton3="accidentalInsuranceDelete" button3Icon="">
     </kt-common-table>
-    <el-dialog title="规则配置" :visible.sync="nonVehicleRuledialogVisible" width="60%" top="6vh">
+    <el-dialog :append-to-body="true" title="规则配置" :visible.sync="nonVehicleRuledialogVisible" width="60%" top="6vh">
       <div class="tab-panestyle">
         <el-form :model="nonVehicleRuleObject" class="demo-form-inline tab-panecent" size="small" label-width="100px">
           <el-form-item label="意外险大类">
@@ -119,6 +119,11 @@ export default {
     KtCommonTable,
     ProductCostForm
   },
+  props:{
+    messageInfo:{
+      default:{}
+    }
+  },
   data() {
     return {
       accidentalInsuranceCategoryList: [],
@@ -158,7 +163,7 @@ export default {
   },
   // 生命周期函数
   created() {
-    this.agreementId = this.$route.query.id;
+    this.agreementId = this.messageInfo.id;
     this.$api.insCompany.getDrivingInsurance({ agreementId: this.agreementId }).then((res) => {
       if (res.code == '200') {
         this.accidentalInsuranceCategoryList = res.data;

src/views/AgreementManage/CarInsurance/AgreementProductFee.vue

@@ -69,7 +69,7 @@
     </el-form>
     <div style="padding:0 10px 10px 10px ;" class=" flex j-s a-c">
       <span style="font-weight: bold;font-size: 15px;color: #242833;">
-        {{ lineData.agreementName }} - {{ lineData.businessDescription }} - {{ lineData.jobDescription }} - 
+        {{ lineData.agreementName }} - {{ lineData.businessDescription }} - {{ lineData.jobDescription }} -
         产品详情
       </span>
       <div class="flex a-c ">
@@ -94,7 +94,7 @@
       customToolName="批量删除" button3Name="删除"  permsButton3="agreement:input:productCost" @handleButton3="productDelete"
       button5Name="轨迹" @handleButton5="trajectory" button3Icon="">
     </kt-common-table>
-    <el-dialog :title="productCostAddDialogTitle" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
+    <el-dialog  :append-to-body="true" :title="productCostAddDialogTitle" :visible.sync="productCostAddVehicleFactorVisible" width="80%" top="6vh"
       @close="productcloseDialog">
       <el-tabs v-model="activeName" type="card">
         <el-tab-pane :label="tabtitle + '费用'" name="feiyong" class="tab-panestyle">
@@ -139,7 +139,7 @@
                       onkeyup="value=value.replace(/\D/g,'')" placeholder="输入数字"></el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="10" v-show="!!$route.query.isExternal">
+                <el-col :span="10" v-show="!!messageInfo.isExternal">
                   <el-form-item label="是否现询">
                     <el-select v-model="productCostForm.isInquiryNow" placeholder="请选择">
                       <el-option value="1" label="是"></el-option>
@@ -152,21 +152,21 @@
               <el-row v-if="productjqincludes">
                 <h4>交强险费用</h4>
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal ? '交强入口手续费比例 ' : '费用比例'" prop="jqCarCostsProportion">
+                  <el-form-item :label="messageInfo.isExternal ? '交强入口手续费比例 ' : '费用比例'" prop="jqCarCostsProportion">
                     <el-input v-model="productCostForm.jqCarCostsProportion"
                       @blur="costRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input disabled v-model="productCostForm.jqCarOtherCostsProportion"
                       placeholder="请输入其他费用比例"></el-input>
                   </el-form-item>
                 </el-col>
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="jqCostsProportion">
                     <el-input v-model="productCostForm.jqCostsProportion"
                       @blur="totalCostRatioInput('jqCostsProportion', 'jqCarCostsProportion', 'jqCarOtherCostsProportion')"
@@ -208,7 +208,7 @@
                 <h4>商业险费用</h4>
 
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal ? '商业入口手续费比例' : '费用比例'" prop="syCarCostsProportion">
+                  <el-form-item :label="messageInfo.isExternal ? '商业入口手续费比例' : '费用比例'" prop="syCarCostsProportion">
                     <el-input v-model="productCostForm.syCarCostsProportion"
                       @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
@@ -216,7 +216,7 @@
                 </el-col>
 
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.syCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
@@ -224,7 +224,7 @@
                 </el-col>
 
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="syCostsProportion">
                     <el-input v-model="productCostForm.syCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('syCostsProportion', 'syCarCostsProportion', 'syCarOtherCostsProportion')"></el-input>
@@ -264,7 +264,7 @@
               <el-row>
                 <h4>非车费用</h4>
                 <el-col :span="5" :offset="1">
-                  <el-form-item :label="$route.query.isExternal ? '非车入口手续费比例' : '费用比例'" prop="noCarCostsProportion">
+                  <el-form-item :label="messageInfo.isExternal ? '非车入口手续费比例' : '费用比例'" prop="noCarCostsProportion">
                     <el-input v-model="productCostForm.noCarCostsProportion"
                       @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"
                       placeholder="请输入费用比例"></el-input>
@@ -272,7 +272,7 @@
                 </el-col>
 
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="其他费用比例">
                     <el-input v-model="productCostForm.noCarOtherCostsProportion" placeholder="请输入其他费用比例"
                       disabled></el-input>
@@ -280,7 +280,7 @@
                 </el-col>
 
                 <el-col :span="5" :offset="1"
-                  v-if="(permissions && !$route.query.isExternal) || productCostForm.isInquiryNow === '0'">
+                  v-if="(permissions && !messageInfo.isExternal) || productCostForm.isInquiryNow === '0'">
                   <el-form-item label="总费用比例" prop="noCostsProportion">
                     <el-input v-model="productCostForm.noCostsProportion" placeholder="请输入总费用比例"
                       @blur="totalCostRatioInput('noCostsProportion', 'noCarCostsProportion', 'noCarOtherCostsProportion')"></el-input>
@@ -321,7 +321,7 @@
           </div>
 
         </el-tab-pane>
-        <el-tab-pane label="产品费用因子" name="yinzi" class="tab-panestyle" v-if="!$route.query.isExternal">
+        <el-tab-pane label="产品费用因子" name="yinzi" class="tab-panestyle" v-if="!messageInfo.isExternal">
           <div class="tab-panecent2">
             <Product-Cost-Form ref="ProductRef" v-if="productCostAddVehicleFactorVisible" :form="dynamicFormArray"
               :operator="operatorlist" over-size="small"></Product-Cost-Form>
@@ -335,7 +335,7 @@
           @click="productCostAddSubmit('productCostForm')">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="ddgjdialogVisible" width="25%" title="订单轨迹">
+    <el-dialog  :append-to-body="true" :visible.sync="ddgjdialogVisible" width="25%" title="订单轨迹">
       <div class="tab-panestyle">
         <div style="height: 400px; overflow-y: auto;padding: 6px;">
           <el-steps direction="vertical" :active="trajectoryTable.length - 1">
@@ -351,7 +351,7 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog title="产品历史记录" :visible.sync="productHistoryRecordDialogVisible" width="70%" :fullscreen="true">
+    <el-dialog  :append-to-body="true" title="产品历史记录" :visible.sync="productHistoryRecordDialogVisible" width="70%" :fullscreen="true">
       <div class="p-2">
         <el-row class="queryFrom">
           <el-form ref="queryFormRef" :model="productHistoryRecordForm" label-width="80px">
@@ -393,7 +393,7 @@
       </div>
 
     </el-dialog>
-    <el-dialog title="批量操作" :visible.sync="batchdialogVisible" width="50%">
+    <el-dialog  :append-to-body="true" title="批量操作" :visible.sync="batchdialogVisible" width="50%">
       <div class="tab-panestyle">
         <el-form :inline="true" :model="batchUpdateForm" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
           <!-- <el-row>
@@ -552,7 +552,7 @@
           @click="batchCostsubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="费用复制窗口" :visible.sync="productCostCopyDialogVisible" :close-on-click-modal="false"
+    <el-dialog  :append-to-body="true" title="费用复制窗口" :visible.sync="productCostCopyDialogVisible" :close-on-click-modal="false"
       :fullscreen="true">
       <div class="p-2">
         <el-form :inline="true" :model="productcopyItemPageRequest" class="demo-form-inline" size="small"
@@ -597,7 +597,7 @@
         </kt-common-table>
       </div>
     </el-dialog>
-    <el-dialog title="产品费用历史记录详情" :visible.sync="productHistoryDetailsDialogVisible" width="80%" top="6vh">
+    <el-dialog  :append-to-body="true" title="产品费用历史记录详情" :visible.sync="productHistoryDetailsDialogVisible" width="80%" top="6vh">
       <div class="tab-panestyle">
         <Product-Cost-Form v-if="productHistoryDetailsDialogVisible" :form="dynamicFormArray" :operator="operatorlist"
           over-size="small" @cancelForm="productHistoryDetailsDialogVisible = false" :disabled="true"></Product-Cost-Form>
@@ -605,7 +605,7 @@
     </el-dialog>
 
 
-    <el-dialog title="批量修改起止时间" :visible.sync="showUpdate1" width="30%" top="6vh">
+    <el-dialog  :append-to-body="true" title="批量修改起止时间" :visible.sync="showUpdate1" width="30%" top="6vh">
       <div class="tab-panestyle">
         <el-form :inline="true" :model="batchUpdateForm1" id="bulkOperation" class="demo-form-inline  tab-panecent" style="padding: 20px;">
           <el-row>
@@ -645,6 +645,11 @@ export default {
     KtCommonTable,
     ProductCostForm
   },
+  props:{
+    messageInfo:{
+      default:{}
+    }
+  },
   data() {
     return {
       productDate: [],
@@ -969,14 +974,14 @@ export default {
       productsTypeoptions: [],
       productColumns: [
         //数据列
-        { prop: "id", label: " ID", minWidth: 160 },
-        { prop: "productName", label: " 产品名称", minWidth: 160 },
+        { prop: "id", label: " ID", minWidth: 100 },
+        { prop: "productName", label: " 产品名称", minWidth: 80 },
         { prop: "costsStartDate", label: "费用起期", minWidth: 160 },
         { prop: "costsEndDate", label: "费用止期", minWidth: 160 },
         { prop: "costsDescription", label: "费用描述", minWidth: 220 },
         { prop: "desc", label: "费用因子描述", minWidth: 520 },
-        { prop: "priorityLevel", label: "方案优先级", minWidth: 120 },
-        { prop: "isAudit", label: "审核状态", minWidth: 160, formatter: this.auditTypeFormation },
+        { prop: "priorityLevel", label: "方案优先级", minWidth: 100 },
+        { prop: "isAudit", label: "审核状态", minWidth: 120, formatter: this.auditTypeFormation },
         {
           prop: "jqCarCostsProportion",
           label: "费用比例（交强）",
@@ -985,12 +990,12 @@ export default {
         {
           prop: "jqCarOtherCostsProportion",
           label: "其他费用比例（交强）",
-          minWidth: 160,
+          minWidth: 150,
         },
         {
           prop: "jqCostsProportion",
           label: "总费用比例（交强）",
-          minWidth: 160,
+          minWidth: 150,
         },
         {
           prop: "jqExportRadioLevel1",
@@ -1233,11 +1238,11 @@ export default {
   },
   // 生命周期函数
   created() {
-    console.log(this.$route.query.isExternal, 888888);
-    this.lineData = this.$route.query
-    this.insuranceCompanyId = this.$route.query.insuranceCompanyId;
-    this.productpageRequest.agreementId = this.$route.query.id;
-    this.productCostForm.agreementId = this.$route.query.id;
+    console.log(this.messageInfo, 888888);
+    this.lineData = this.messageInfo
+    this.insuranceCompanyId = this.messageInfo.insuranceCompanyId;
+    this.productpageRequest.agreementId = this.messageInfo.id;
+    this.productCostForm.agreementId = this.messageInfo.id;
     this.licenseQuery();
     this.getFactorTemplate();
     this.getDicType("productsType"); //车险产品
@@ -1332,6 +1337,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -1420,7 +1426,7 @@ export default {
       this.roductList1 = [];
     },
     costRatioInput(total, partial, other) {
-      if (!this.$route.query.isExternal) {
+      if (!this.messageInfo.isExternal) {
         //参数1为总费用，参数2为费用
         let pay1 = this.productCostForm[total]; //总
         let pay2 = this.productCostForm[partial]; //费用
@@ -1717,6 +1723,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -1800,6 +1807,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }
@@ -1809,6 +1817,9 @@ export default {
             if (ele.attrName == '车牌地区') {
               ele.dictLabal = this.licenseAreaList;
             }
+            if (ele.attrName == '车辆类型') {
+              ele.dictLabal = this.carClassList
+            }
 
           })
           // this.productCostForm.costsAttrLinks = data;

src/views/AgreementManage/CarInsurance/AgreementUnderwritingRule.vue

@@ -20,7 +20,7 @@
       button2Background="#E6A23C" @handleButton2="underwritingRulesUpdate" button2Icon="" button3Name="删除"
       button3Background="#F56C6C" @handleButton3="underwritingRulesDelete" button3Icon="">
     </kt-common-table>
-    <el-dialog :title="underwritingRulesAddDialogTitle" :visible.sync="underwritingRulesAddVehicleFactorVisible"
+    <el-dialog :append-to-body="true" :title="underwritingRulesAddDialogTitle" :visible.sync="underwritingRulesAddVehicleFactorVisible"
       :close-on-click-modal="false" width="80%" top="6vh" @close="underwritingRulescloseDialog">
       <div class="tab-panestyle">
         <Product-Cost-Form ref="ProductRef" v-if="underwritingRulesAddVehicleFactorVisible" :form="dynamicFormArray"
@@ -33,7 +33,7 @@
           @click="underwritingAddSubmit">确 定</el-button>
       </span>
     </el-dialog>
-    <el-dialog title="承保规则历史记录" :visible.sync="underwritingRulesHistoryRecordDialogVisible" :fullscreen="true">
+    <el-dialog :append-to-body="true" title="承保规则历史记录" :visible.sync="underwritingRulesHistoryRecordDialogVisible" :fullscreen="true">
       <div class="p-2">
         <el-row class="queryFrom">
           <el-form ref="queryFormRef" :model="underwritingRulesHistoryCostFindForm" label-width="80px">
@@ -75,7 +75,7 @@
         </kt-common-table>
       </div>
     </el-dialog>
-    <el-dialog title="承保规则历史记录详情" :visible.sync="underwritingRulesHistoryDetailsDialogVisible" width="80%">
+    <el-dialog :append-to-body="true" title="承保规则历史记录详情" :visible.sync="underwritingRulesHistoryDetailsDialogVisible" width="80%">
       <div class="tab-panestyle">
         <Product-Cost-Form v-if="underwritingRulesHistoryDetailsDialogVisible" :form="dynamicFormArray"
           :operator="operatorlist" over-size="small"  :underwritingRulesForm="underwritingRulesForm"
@@ -83,7 +83,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog title="协议承保规则复制" :visible.sync="showCopyDialog" width="60%" @closed="closeCopyDialog">
+    <el-dialog :append-to-body="true" title="协议承保规则复制" :visible.sync="showCopyDialog" width="60%" @closed="closeCopyDialog">
       <div style="padding: 30px;">
         <el-form>
           <el-form-item label="协议选择">
@@ -126,6 +126,11 @@ export default {
     KtCommonTable,
     ProductCostForm
   },
+  props:{
+    messageInfo:{
+      default:{}
+    }
+  },
   data() {
     return {
       underwritingRulesHistoryOperatorTime: "",
@@ -204,9 +209,9 @@ export default {
   },
   // 生命周期函数
   created() {
-    this.insuranceCompanyId = this.$route.query.insuranceCompanyId;
-    this.pageRequest.agreementId = this.$route.query.id;
-    this.underwritingRulesForm.agreementId = this.$route.query.id;
+    this.insuranceCompanyId = this.messageInfo.insuranceCompanyId;
+    this.pageRequest.agreementId = this.messageInfo.id;
+    this.underwritingRulesForm.agreementId = this.messageInfo.id;
     this.licenseQuery();
     this.getFactorTemplate();
     this.$api.dict.findPage(this.operator).then(res => {
@@ -293,6 +298,7 @@ export default {
           obj.costsAttrLinkList.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -347,6 +353,7 @@ export default {
           obj.costsAttrLinks.map(val => {
             switch (val.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 if (!val.operator) {
                   val.operator = '1';
                 }
@@ -515,6 +522,7 @@ export default {
           data.map(ele => {
             switch (ele.attrType) {
               case 'inputNumber':
+              case 'datetime':
                 ele.operator = '1';
                 break;
             }

src/views/AgreementManage/CarInsurance/SourceManagement.vue

@@ -286,9 +286,9 @@ export default {
           // 数据列
           { prop: "id", label: "保险公司编号", type: "text" },
           { prop: "name", label: "保险公司名称", type: "text" },
-          { name: "pcStart", label: "pc是否启用", type: "slot" },
-          { name: "appStart", label: "app是否启用", type: "slot" },
-          { name: "productsCode", label: "险种", type: "slot", },
+          // { name: "pcStart", label: "pc是否启用", type: "slot" },
+          // { name: "appStart", label: "app是否启用", type: "slot" },
+          // { name: "productsCode", label: "险种", type: "slot", },
         ],
         loading: true,
         isPaginationShow: true,
@@ -313,13 +313,13 @@ export default {
               return this.excludeDepartment(row);
             },
           },
-          {
-            label: "配置",
-            type: "text",
-            click: (row, index) => {
-              return this.configuration(row);
-            },
-          },
+          // {
+          //   label: "配置",
+          //   type: "text",
+          //   click: (row, index) => {
+          //     return this.configuration(row);
+          //   },
+          // },
           {
             label: "排序",
             type: "text",

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {
@@ -358,5 +390,41 @@ export default {
   padding: 20px;
   background: #F2F2F2;
 }
+
+.tab-panecent {
+  background: #fff;
+  border-radius: 4px;
+  padding: 15px;
+  box-sizing: border-box;
+  max-height: 600px;
+  overflow-y: auto;
+}
+>>> .el-step__description {
+  padding-right: 0;
+}
+.tab-panecent2 {
+  border-radius: 4px;
+  box-sizing: border-box;
+}
+
+.tab-panecent1 {
+  background: #fff;
+  border-radius: 4px;
+  padding: 10px;
+  box-sizing: border-box;
+  margin-bottom: 20px;
+
+  >div {
+    font-size: 15px;
+    color: #2D4D89;
+    font-weight: bold;
+  }
+
+  >span {
+    color: rgba(51, 51, 51, 0.8);
+    font-size: 13px;
+  }
+}
+
 </style>
 

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

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

@@ -9,7 +9,7 @@
     <kt-common-table :tableHeights="700" :SerialShow="false" :operationWidth="200" :showOperation="true"
       :showBatchDelete="false" :showBatchSettled="false" :showBatchPrint="false" :data="attrResult" button2Name="编辑"
       button2Type="text" @handleButton2="attrUpdate" button3Name="删除" button3Type="text" @handleButton3="attrDel"
-      :columns="attrColumns" @findPage="attrFindPage">
+      :columns="attrColumns" @findPage="attrFindPage" button4Name="轨迹" button4Type="text" @handleButton4="historyBth">
     </kt-common-table>
     <el-dialog v-dialogDrag :title="attrDialogTitle" :visible.sync="attrVisible" width="80%" top="6vh" @close="attrcloseDialog">
       <el-tabs v-model="activeName" type="card">
@@ -55,6 +55,22 @@
           @click="productCostAddSubmit('ruleForm')">确 定</el-button>
       </span>
     </el-dialog>
+    <el-dialog :visible.sync="showDialogHistory" width="25%" title="轨迹">
+      <div class="tab-panestyle">
+        <div style="max-height: 400px; overflow-y: auto;padding: 6px;">
+          <el-steps direction="vertical" :active="trajectoryTable.length - 1">
+            <el-step :title="item.operatorTypeName" :key="item.id" v-for="item in trajectoryTable">
+              <template slot="description">
+                <div class="tab-panecent1">
+                  <div>操作时间：{{ item.operatorTime }}</div>
+                  <span>操作人：{{ item.operatorUserName }}</span>
+                </div>
+              </template>
+            </el-step>
+          </el-steps>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <!-- 行为区域 -->
@@ -114,6 +130,9 @@ export default {
         ],
       },
       productsTypeoptions: [],
+      // 轨迹
+      showDialogHistory: false,
+      trajectoryTable: [],
     }
   },
   // 生命周期函数
@@ -130,6 +149,19 @@ export default {
   },
   // 方法函数
   methods: {
+    // 轨迹
+    historyBth(data) {
+      this.$api.insCompany.ruleTrajectory({
+        ruleId: data.row.id
+      }).then((res) => {
+        if (res.code == 200) {
+          this.trajectoryTable = res.data
+          this.showDialogHistory = true
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+    },
     attrcloseDialog() {
       for (const key in this.ruleform) {
         if (key !== "companyId") {

src/views/Core/components/detailsDialogPro.vue

@@ -1418,7 +1418,7 @@ export default {
     //预览文件
     viewfile(index) {
       if (this.orderInfo.isExternal == 1) {
-        let url = process.env.BASE_URL + index.fileurl; // 3.创建一个临时的url指向blob对象
+        let url = index.fileurl; // 3.创建一个临时的url指向blob对象
         fetch(url)
           .then((response) => response.blob())
           .then((blob) => {

src/views/Core/components/quotationDialog.vue

@@ -67,9 +67,10 @@
       </div>
       <div class="tableInfo">
         <div class="header">
-          <span class="title">投保信息</span>
+          <span class="title">保险期限</span>
           <div class="line"></div>
         </div>
+        <div style="margin-top: 6px;">投保明细</div>
         <el-descriptions :column="2" style="margin-top: 6px;">
           <el-descriptions-item v-if="queryOrders.jqstartdate && queryOrders.jqenddate" label-class-name="my-label"
             content-class-name="my-content" label="车辆交强险保险期间">{{

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/NavBar/NavBar.vue

@@ -25,7 +25,7 @@
                 src="@/assets/image/new_logo.png"
                 style="width: 30px; height: 30px; margin-right: 5px"
               />
-              <span>{{ appName }}</span>
+              <span>{{ "掌柜核心系统" }}</span>
             </div>
           </el-dropdown-item>
           <el-dropdown-item v-if="showConfig">

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,11 +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="updateOrder(scope.row)" />
-          <kt-button label="保单Pdf详情" type="text"  
-            @click="cpolicy(scope.row)" />
-          <kt-button label="重新生成保单" type="text" @click="trajectory(scope.row)" />
+          <kt-button label="保单Pdf详情" type="text"    @click="cpolicy(scope.row)" />
+          <kt-button label="重新生成保单" type="text" @click="regenerate(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>
@@ -78,8 +77,8 @@
     <el-dialog title="保单信息" ref="detailsDialog" width="500"  height="500"  :visible.sync="cpolicyFlag" :close-on-click-modal="false" @close="closeCpolicyDialog">
           <div>
           <el-row class="premium-style " :gutter="20">
-            <el-col :span="12"><span>交强险保单号：</span>{{ warrantObj.jqPolicyNo }}</el-col>
-            <el-col v-if="orderInfo.sypolicyno" :span="12"><span>商业险保单号：</span>{{ warrantObj.syPolicyNo }}</el-col>
+            <el-col v-if="warrantObj.jqPolicyNo" :span="12"><span>交强险保单号：</span>{{ warrantObj.jqPolicyNo }}</el-col>
+            <el-col v-if="warrantObj.syPolicyNo" :span="12"><span>商业险保单号：</span>{{ warrantObj.syPolicyNo }}</el-col>
             <el-col :span="12" v-for="(oldfileItem, oldfileIndex) in warrantObj.oldfileList" :key="oldfileIndex">
               <span>{{ oldfileItem.fileTitle }} ：</span>{{ orderInfo.licenseno }}
               <el-button style="margin-left:30px" type="text" @click="viewfile(oldfileItem)">下载
@@ -101,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>
@@ -117,6 +130,8 @@ export default {
   },
   data() {
     return {
+      updateDateRecord:[],
+      updateFlag:false,
       orderInfo:{},
       cpolicyFlag:false,
       isrejection: false,
@@ -175,13 +190,6 @@ export default {
           type: 'select',
           options: []
         },
-
-
-        // {
-        //   name: 'taskNo',
-        //   label: '任务池号',
-        //   type: 'input',
-        // },
         {
           name: 'orderNo',
           label: '订单号',
@@ -376,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) => {
@@ -591,12 +585,59 @@ export default {
     },
     cpolicy(row) {
       this.cpolicyFlag =true;
-       this.$api.letter.readPdfUrlList(row.subOrderId).then((res) => {
+       this.$api.readPdf.readPdfUrlList(row.subOrderId).then((res) => {
         console.log(res.data)
         if (res.code == 200) {
           console.log(res.data)
            this.warrantObj =res.data; 
-        }  
+        } else{
+          this.$message.error(res.msg);
+        } 
+      }); 
+    },
+    //重新生成
+    regenerate(row) {
+      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.$api.readPdf.updateOrderDate(row.subOrderId).then((res) => {
+        if (res.code == 200) {
+          this.$message.info(res.msg);
+        } else{
+          this.$message.error(res.msg);
+        } 
+      }); 
+    },
+    //更新记录
+    udapteOrderDateRecord(row) {
+      this.updateFlag =true;
+       this.$api.readPdf.updateOrderDateRecord(row.subOrderId).then((res) => {
+        if (res.code == 200) {
+          this.updateDateRecord =res.data;
+        } else{
+          this.$message.error(res.msg);
+        } 
       }); 
     },
     // 设置每页条数
@@ -637,7 +678,7 @@ export default {
     //数据
     findPage() {
       this.loading = true;
-      this.$api.task.queryPageOrder(this.pageRequest).then((res) => {
+      this.$api.readPdf.queryPageOrder(this.pageRequest).then((res) => {
         if (res.code == "200") {
           this.loading = false;
           this.pageResult = res.data.content;
@@ -688,6 +729,17 @@ export default {
         })
         .catch((error) => { });
     },
+    saveAs(blob, filename) {
+      var link = document.createElement("a");
+      link.href = window.URL.createObjectURL(blob);
+      link.target = "_ blank";
+      link.download = filename;
+      link.click();
+    },
+    //关闭更新时间记录
+    closeUpdeteDialog(){
+       this.updateFlag = flase;
+    },
   }
 }
 </script>

src/views/Task/daikeComponents/KtLetter.vue

@@ -860,6 +860,21 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="交强出口费用">
+              <el-input placeholder="请输入交强出口费用" disabled v-model="policyNumberForm.JqExportFee" type="text"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="商业出口费用">
+              <el-input placeholder="请输入商业出口费用" disabled v-model="policyNumberForm.syExportFee" type="text"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="非车出口费用">
+              <el-input placeholder="请输入非车出口费用" disabled v-model="policyNumberForm.noExportFee" type="text"></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
     </div>
@@ -5943,6 +5958,31 @@ export default {
     Payment(id, item) {
       this.carcode(id, item);
     },
+    // 获取出口费用
+    getExternalOrderFee(agreementId, riskList, kindList) {
+      let data = {
+        agreementId: agreementId,
+        risks: riskList,
+        kinds: kindList,
+        userId: this.userId,
+        jqPremium: this.policyNumberForm.jqpremium,
+        jqRadio: this.policyNumberForm.jqCostsProportion,
+        syPremium: this.policyNumberForm.sypremium,
+        syRadio: this.policyNumberForm.syCostsProportion,
+        jyPremium: this.policyNumberForm.jypremium,
+        jyRadio: this.policyNumberForm.noCostsProportion,
+      }
+      this.$api.letter.externalOrderFee(data).then((res) => {
+        if (res.code == 200) {
+          this.policyNumberForm.JqExportFee = res.data.JqExportFee
+          this.policyNumberForm.syExportFee = res.data.syExportFee
+          this.policyNumberForm.noExportFee = res.data.noExportFee
+        } else {
+          this.$message.error(res.msg)
+        }
+      })
+      
+    },
     // 现询
     getInquiryNowList(agreementId, riskList, kindList) {
       let productId = ''
@@ -5986,6 +6026,7 @@ export default {
     //选择协议  val:协议id  row：协议列表  index：下标  item：保险公司数据集合
     agreementChange(val, row, index, item) {
       this.getInquiryNowList(val, this.riskList, this.kindList)
+      this.getExternalOrderFee(val, this.riskList, this.kindList)
       this.kindListFun();
       if (this.isLetter == "3") {
         this.isLetter3agreementId = "";
@@ -6018,69 +6059,70 @@ export default {
           })
           return
         }
-      this.$api.letter
-        .getDrivingInsuranceRule({
-          companyCode: item.id,
-          agreementId: item.agreementId,
-          seatNum:
-            item.namesimple == "永诚财险" || item.namesimple == "中煤财险"
-              ? Number(this.carInfo.seatCount)
-              : "",
-          ruleUseNature: this.carInfo.carnature,
-          ruleSeatNum: Number(this.carInfo.seatCount),
-          risk: this.riskList,
-          kind: this.kindList,
-          ruleThirdPartyInsurance: this.insureList[1].amount,
-
-        })
-        .then((res) => {
-          if (res.code == 200) {
-            this.nonVehicle(res.data, item.cnName);
-            switch (item.namesimple) {
-              case "永诚财险":
-                this.yongchengaccidentDataList = res.data;
-                break;
-              case "国任财险":
-                this.guoRenaccidentDataList = res.data;
-                break;
-              case "渤海财险":
-                this.boHaiaccidentDataList = res.data;
-                break;
-              case "中煤财险":
-                this[item.cnName + +"InsuranceData"] = res.data;
-                break;
-              case "紫金财险":
-                let data = res.data;
-                data.map((ele) => {
-                  ele.quantity = 1;
-                  return ele;
-                });
-                this.ziJinInsuranceData = data;
-                break;
-              case "大家财险":
-                this.dajiaInsuranceData = res.data;
-                break;
-              case "泰康财险":
-                this.taikangaccidentDataList = res.data;
-                break;
-              case "诚泰财险":
-              case "中国人寿":
-              case "恒邦财险":
-              case "太平财险":
-              case "安盛天平":
-              case "华农财险":
-              case "众安财险":
-                res.data.map((ele) => {
-                  ele.quantity = 1;
-                  return ele;
-                });
-                this[item.cnName + "InsuranceData"] = res.data;
-                break;
-            }
-          } else {
-            this.$message.error(res.msg);
-          }
-        });
+      // this.$api.letter
+      //   .getDrivingInsuranceRule({
+      //     companyCode: item.id,
+      //     agreementId: item.agreementId,
+      //     seatNum:
+      //       item.namesimple == "永诚财险" || item.namesimple == "中煤财险"
+      //         ? Number(this.carInfo.seatCount)
+      //         : "",
+      //     ruleUseNature: this.carInfo.carnature,
+      //     ruleSeatNum: Number(this.carInfo.seatCount),
+      //     risk: this.riskList,
+      //     kind: this.kindList,
+      //     ruleThirdPartyInsurance: this.insureList[1].amount,
+
+      //   })
+      //   .then((res) => {
+      //     if (res.code == 200) {
+      //       this.nonVehicle(res.data, item.cnName);
+      //       switch (item.namesimple) {
+      //         case "永诚财险":
+      //           this.yongchengaccidentDataList = res.data;
+      //           break;
+      //         case "国任财险":
+      //           this.guoRenaccidentDataList = res.data;
+      //           break;
+      //         case "渤海财险":
+      //           this.boHaiaccidentDataList = res.data;
+      //           break;
+      //         case "中煤财险":
+      //           this[item.cnName + +"InsuranceData"] = res.data;
+      //           break;
+      //         case "紫金财险":
+      //           let data = res.data;
+      //           data.map((ele) => {
+      //             ele.quantity = 1;
+      //             return ele;
+      //           });
+      //           this.ziJinInsuranceData = data;
+      //           break;
+      //         case "大家财险":
+      //           this.dajiaInsuranceData = res.data;
+      //           break;
+      //         case "泰康财险":
+      //           this.taikangaccidentDataList = res.data;
+      //           break;
+      //         case "诚泰财险":
+      //         case "中国人寿":
+      //         case "恒邦财险":
+      //         case "太平财险":
+      //         case "安盛天平":
+      //         case "华农财险":
+      //         case "众安财险":
+      //           res.data.map((ele) => {
+      //             ele.quantity = 1;
+      //             return ele;
+      //           });
+      //           this[item.cnName + "InsuranceData"] = res.data;
+      //           break;
+      //       }
+      //     } else {
+      //       this.$message.error(res.msg);
+      //     }
+      //   });
+      
       // switch (item.namesimple) {
       //   case "永诚财险":
       //     this.accidentForm.agreementId = item.agreementId;
@@ -6449,84 +6491,84 @@ export default {
         this.totalCompanyList[index].checked = e;
         this.totalCompanyList[index].underwritingDescription =
           this.totalCompanyList[index].agreement[0].underwritingDescription;
-        if (this.$route.path != "/task/external/externalOrders")
-          this.$api.letter
-            .getDrivingInsuranceRule({
-              agreementId: this.totalCompanyList[index].agreement[0].id,
-              seatNum:
-                ins == "永诚财险" || ins == "中煤财险"
-                  ? Number(this.carInfo.seatCount)
-                  : "",
-              ruleUseNature: this.carInfo.carnature,
-              ruleSeatNum: Number(this.carInfo.seatCount),
-              risk: this.riskList,
-              kind: this.kindList,
-              ruleThirdPartyInsurance: this.insureList[1].amount,
-              cimodelclass: ins == "平安财险"
-                ? this.carInfo.cimodelclass
-                : "",
-              isUseCombine: ins == "平安财险"
-                ? 'Y'
-                : "",
-              tonNumber: ins == "平安财险"
-                ? this.carInfo.limitLoad
-                : "",
-              ownAttribute: ins == "平安财险"
-                ? '03'
-                : "",
-              useAttribute: ins == "平安财险"
-                ? this.carInfo.carnature
-                : "",
-            })
-            .then((res) => {
-              if (res.code == 200) {
-                switch (ins) {
-                  case "永诚财险":
-                    this.yongchengaccidentDataList = res.data;
-                    break;
-                  case "国任财险":
-                    this.guoRenaccidentDataList = res.data;
-                    break;
-                  case "泰康财险":
-                    this.taikangaccidentDataList = res.data;
-                    break;
-                  case "渤海财险":
-                    this.boHaiaccidentDataList = res.data;
-                    break;
-                  case "中煤财险":
-                  case "平安财险":
-                    this[name + "InsuranceData"] = res.data;
-                    break;
-                  case "紫金财险":
-                    let data = res.data;
-                    data.map((ele) => {
-                      ele.quantity = 1;
-                      return ele;
-                    });
-                    this.ziJinInsuranceData = data;
-                    break;
-                  case "大家财险":
-                    this.dajiaInsuranceData = res.data;
-                    break;
-                  case "诚泰财险":
-                  case "中国人寿":
-                  case "恒邦财险":
-                  case "太平财险":
-                  case "华农财险":
-                  case "安盛天平":
-                  case "众安财险":
-                    res.data.map((ele) => {
-                      ele.quantity = 1;
-                      return ele;
-                    });
-                    this[name + "InsuranceData"] = res.data;
-                    break;
-                }
-                this.nonVehicle(res.data, name);
-              } else {
-                this.$message.error(res.msg);
-              }
-            });
+        // if (this.$route.path != "/task/external/externalOrders")
+          // this.$api.letter
+          //   .getDrivingInsuranceRule({
+          //     agreementId: this.totalCompanyList[index].agreement[0].id,
+          //     seatNum:
+          //       ins == "永诚财险" || ins == "中煤财险"
+          //         ? Number(this.carInfo.seatCount)
+          //         : "",
+          //     ruleUseNature: this.carInfo.carnature,
+          //     ruleSeatNum: Number(this.carInfo.seatCount),
+          //     risk: this.riskList,
+          //     kind: this.kindList,
+          //     ruleThirdPartyInsurance: this.insureList[1].amount,
+          //     cimodelclass: ins == "平安财险"
+          //       ? this.carInfo.cimodelclass
+          //       : "",
+          //     isUseCombine: ins == "平安财险"
+          //       ? 'Y'
+          //       : "",
+          //     tonNumber: ins == "平安财险"
+          //       ? this.carInfo.limitLoad
+          //       : "",
+          //     ownAttribute: ins == "平安财险"
+          //       ? '03'
+          //       : "",
+          //     useAttribute: ins == "平安财险"
+          //       ? this.carInfo.carnature
+          //       : "",
+          //   })
+          //   .then((res) => {
+          //     if (res.code == 200) {
+          //       switch (ins) {
+          //         case "永诚财险":
+          //           this.yongchengaccidentDataList = res.data;
+          //           break;
+          //         case "国任财险":
+          //           this.guoRenaccidentDataList = res.data;
+          //           break;
+          //         case "泰康财险":
+          //           this.taikangaccidentDataList = res.data;
+          //           break;
+          //         case "渤海财险":
+          //           this.boHaiaccidentDataList = res.data;
+          //           break;
+          //         case "中煤财险":
+          //         case "平安财险":
+          //           this[name + "InsuranceData"] = res.data;
+          //           break;
+          //         case "紫金财险":
+          //           let data = res.data;
+          //           data.map((ele) => {
+          //             ele.quantity = 1;
+          //             return ele;
+          //           });
+          //           this.ziJinInsuranceData = data;
+          //           break;
+          //         case "大家财险":
+          //           this.dajiaInsuranceData = res.data;
+          //           break;
+          //         case "诚泰财险":
+          //         case "中国人寿":
+          //         case "恒邦财险":
+          //         case "太平财险":
+          //         case "华农财险":
+          //         case "安盛天平":
+          //         case "众安财险":
+          //           res.data.map((ele) => {
+          //             ele.quantity = 1;
+          //             return ele;
+          //           });
+          //           this[name + "InsuranceData"] = res.data;
+          //           break;
+          //       }
+          //       this.nonVehicle(res.data, name);
+          //     } else {
+          //       this.$message.error(res.msg);
+          //     }
+          //   });
         // switch (ins) {
         //   case "永诚财险":
         //     this.accidentForm.agreementId = this.totalCompanyList[
@@ -6658,7 +6700,7 @@ export default {
         //   default:
         //     break;
         // }
-      } else {
+      // } else {
       }
     },
 
@@ -7251,6 +7293,7 @@ export default {
           policyHolderInfo: this.policyHolderInfo,
           isExternal: "1",
           vehicleAndVesselTax: this.vehicleAndVesselTaxForm,
+          nowCostsId: this.nowCostsId
         };
 
         // debugger;

src/views/Task/daikeComponents/KtLetter1.vue

@@ -1012,7 +1012,7 @@
                   <div class="card-mingxi">
                     <div class="card-mingxi-title">险种明细：
                       <span v-show="reslistitem.checkedProgramme != 99" @click="showDetailJiaYi(reslistitem, reslistindex)">查看详情</span>
-                      <span v-show="reslistitem.checkedProgramme == 99" @click="showTypeDialog(reslistitem, reslistindex)">调整险种</span>
+                      <!-- <span v-show="reslistitem.checkedProgramme == 99" @click="showTypeDialog(reslistitem, reslistindex)">调整险种</span> -->
                     </div>
                     <div class="card-table" v-show="reslistitem.programme.description != '单商' && reslistitem.programme.description != '单三'">
                       <div class="table-title">交强险</div>
@@ -3652,7 +3652,7 @@
                   <div v-for="(dataItem, dataIndex) in item.tableData" :key="dataIndex">
                     <el-col :span="6">
                       份数
-                      <el-input v-model="dataItem.quantity" style="width: 120px;" size="small">
+                      <el-input v-model="dataItem.quantity" type="number" style="width: 120px;" size="small">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',dataItem.minQuantity, dataIndex)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',dataItem.minQuantity, dataIndex)"></i></template>
                       </el-input>
@@ -3700,7 +3700,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3720,7 +3720,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" label="描述文字" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3839,7 +3839,7 @@
                     <el-col :span="6" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -3859,7 +3859,7 @@
                     <el-col :span="9" v-if="item.tableData">
                       份数
                       <!-- <el-input-number v-model="item.tableData.quantity" :step="1" :min="1" :max="10" @change="numberChange(listIndex, index)" label="描述文字" size="small"></el-input-number> -->
-                      <el-input v-model="item.tableData.quantity" style="width: 120px;" size="small">
+                      <el-input v-model="item.tableData.quantity" type="number" style="width: 120px;" size="small">
                         <template slot="prepend"><i class="el-icon-minus" @click="numberChange(listIndex, index, 'minus',item.tableData.minQuantity)"></i></template>
                         <template slot="append"><i class="el-icon-plus" @click="numberChange(listIndex, index, 'plus',item.tableData.minQuantity)"></i></template>
                       </el-input>
@@ -6083,7 +6083,7 @@ export default {
     numberChange(listIndex, index, type,minquantity, dataIndex) {
       if (dataIndex >= 0) {
         if (type == 'plus') {
-          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity < 10) {
+          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity < 100) {
             this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData[dataIndex].quantity += 1
           }
         } else {
@@ -6093,7 +6093,7 @@ export default {
         }
       } else {
         if (type == 'plus') {
-          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity < 10) {
+          if (this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity < 100) {
             this.jiayiDialogData.drivingTypeList[listIndex].children[index].tableData.quantity += 1
           }
         } else {
@@ -7121,6 +7121,7 @@ export default {
       this.$api.letter.queryRenewal(this.attributionform).then((res) => {
         if (res.code == "200") {
           this.carInfo = res.data.carInfo;
+          this.carInfo.frameNo = res.data.carInfo.vinNo
           this.ownerInfo = res.data.ownerInfo;
           this.policyHolderInfo = res.data.policyHolderInfo;
           this.insuredPersonInfo = res.data.insuredPersonInfo;
@@ -9943,6 +9944,9 @@ export default {
     quoteInsurance(num, id, namesimple, apiType) {
       console.log(apiType, 'apiType')
       let api = apiType == 2 ? "pythonquote" : "";
+      if (namesimple ==  '诚泰财险') {
+        api = "pythonquote"
+      }
       let ccidenttype = this.totalCompanyList[num].cnName;
       let isTaxSource = this.totalCompanyList[num].isTaxSource;
       // accidentalDrivingVo = this.totalCompanyList[num].programme.drivingList[0] || {}
@@ -11445,6 +11449,7 @@ export default {
           if (res.code == 200) {{
             this.carInfo.engineNo = res.data.engineNo
             this.carInfo.vinNo = res.data.vinNo
+            this.carInfo.frameNo = res.data.vinNo
             this.carInfo.registerDate = res.data.registerDate
             this.$forceUpdate()
           }}
@@ -13213,6 +13218,8 @@ export default {
 
   .el-input-group__append {
     vertical-align: baseline;
+    border-color: #D42426;
+    background: #D42426;
   }
   .pinganTable .el-table__header-wrapper .el-checkbox {
     display: none;

src/views/Task/daikeComponents/KtOrder.vue

@@ -92,7 +92,7 @@
               {{ item.inscompany }}
               <!-- <span style="color: #d42426">（{{ item.agreementName }}）</span> -->
             </div>
-            <div class="flex a-c j-s demo-table-expand-time">
+            <div v-show="item.orderstatus != '10' && item.orderstatus != '11'" style="width: 800px;" class="flex a-c j-s demo-table-expand-time">
               <div>
                 总价：
                 <span style="color: #d42426">{{ item.sumpremium }}</span>
@@ -115,6 +115,7 @@
               </div>
               <div>{{ item.createtime }}</div>
             </div>
+            <div v-show="item.orderstatus == '10' || item.orderstatus == '11'" style="width: 800px;">{{ item.quoteErrMsg }}</div>
             <div slot="reference" class="name-wrapper flex a-c j-c">
               <el-tag style="
                   color: #33a08d;
@@ -388,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>
@@ -1865,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;
@@ -2057,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)
@@ -2076,11 +2086,11 @@ export default {
                         fileurl: res1.data.jqSign,
                       });
                     }
-                    if (res1.data.jqSign) {
-                      accidentList.push({
+                    if (res1.data.syPolicy) {
+                      businessList.push({
                         fileTitle: "商业电子保单",
-                        filename: this.orderInfo.sypolicyno,
-                        fileurl: res1.data.jqSign,
+                        filename: "商业电子保单",
+                        fileurl: res1.data.syPolicy,
                       });
                     }
                     if (res1.data.noPolicy) {
@@ -2925,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;