打通主要流程（签名，送达，归档）

src/views/awardManagement/components/expressDeliveryDialog.vue

@@ -7,19 +7,28 @@
       center
       :distroy-on-close="true"
     >
-      <div class="deliverName">中通快递 85644454542121</div>
-      <el-divider></el-divider>
-      <el-timeline :reverse="reverse">
-        <el-timeline-item
-          v-for="(activity, index) in activities"
-          :key="index"
-          :timestamp="activity.timestamp"
-        >
-          {{ activity.content }}
-        </el-timeline-item>
-      </el-timeline>
+      <div class="loading" v-if="flagLoading">
+        <i class="el-icon-loading"></i>
+      </div>
+      <div v-else>
+        <div class="deliverName">
+          {{ applicantdelivery.company }} {{ applicantdelivery.no }}
+        </div>
+        <el-divider></el-divider>
+        <el-timeline :reverse="reverse">
+          <el-timeline-item
+            v-for="(activity, index) in activities"
+            :key="index"
+            :timestamp="activity.timestamp"
+          >
+            {{ activity.content }}
+          </el-timeline-item>
+        </el-timeline>
+      </div>
       <div slot="footer" class="dialog-footer">
-         <el-button @click="cancel" class="endbutton"><span>取 消</span></el-button>
+        <el-button @click="cancel" class="endbutton"
+          ><span>取 消</span></el-button
+        >
       </div>
     </el-dialog>
   </div>
@@ -27,43 +36,34 @@
 
 <script>
 export default {
-  props: ["showDelivery"],
+  props: ["showDelivery", "deliveryDataArr", "flagLoading"],
   data() {
     return {
       // key: value
       reverse: true,
-      activities: [  
-        {
-          content: "已下单 08-18 10:11",
-          timestamp: "已下单",
-        },
-        {
-          content: "已接单 08-19 10:11",
-          timestamp: "已接单",
-        },
-        {
-          content: "已发货 08-19 10:11",
-          timestamp: "已发货",
-        },
-        {
-          content: "已揽件 08-20 00:11",
-          timestamp: "已揽件",
-        },
-        {
-          content: "运输中 08-20 02:11",
-          timestamp: "运输中",
-        },
-        {
-          content: "派送中 08-22 10:11",
-          timestamp: "【西安市】快递已到达西安市临潼区",
-        },
-        {
-          content: "待取件 08-23 15:11",
-          timestamp: "【西安市】快递已到达菜鸟驿站",
-        },
-      ],
+      applicantdelivery: {}, //申请人物流信息
+      activities: [],
     };
   },
+  watch: {
+    deliveryDataArr: {
+      handler(val) {
+        if (val) {
+          val.forEach((item) => {
+            if (item.identityType == 1) {
+              let applicantdata = item.logisticsInfo;
+              this.applicantdelivery = JSON.parse(applicantdata);
+              this.activities = this.applicantdelivery.list
+              this.activities.forEach(item=>{
+                item.content = item.datetime;
+                item.timestamp = item.remark;
+              })
+            }
+          });
+        }
+      },
+    },
+  },
   methods: {
     cancel() {
       this.$emit("closeDeliveryModel");
@@ -98,4 +98,14 @@ export default {
     color: #959595;
   }
 }
+.loading {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  .el-icon-loading {
+    font-size: 50px;
+  }
+}
 </style>