Merge branch 'sit'

src/apis/components/logis-time-line.js

@@ -0,0 +1,7 @@
+import http from "@/apis/axios";
+const api = "admin/";
+export default {
+  // 列表
+  list: (data, params) => http(api + "getlogisticsinformation", data, "post", params),
+};
+   

src/components/globalComponents/logis-time-line/main.vue

@@ -1,40 +1,29 @@
 <template>
-    <div class="logisTimeLine">
+  <div class="logisTimeLine" style="margin: 0 0 0 30px">
     <el-steps
       direction="vertical"
       :active="options.length"
       :space="80"
       :finish-status="finishStatus"
-      :process-status="finishStatus"
+      :process-status="processStatus"
     >
+      <div v-if="status && status !== '0'" class="show-post clear">
+        <img v-if="post_logo" :src="post_logo" alt="" class="fl"/>
+        <div v-if="post_name" class="fl">{{post_name}}</div><div class="fl" v-if="post_code">{{post_code}}</div>
+      </div>
       <el-step
-        icon="el-icon-success"
+        :icon="index === 0 ? 'el-icon-success' : 'el-icon-truck'"
         v-for="(item, index) in options"
         :key="item.time + index"
         :finish-status="finishStatus"
-        :process-status="finishStatus"
-        style="margin: 0 0 0 150px; position: relative"
+        :process-status="processStatus"
       >
-        <div
-          slot="title"
-          style="
-            position: absolute;
-            width: 142px;
-            left: -150px;
-            text-align: right;
-          "
-        >
-          {{ item.status_name }}
-        </div>
         <div slot="description">
           <p class="name">
-           操作人： {{ item.action_name?item.action_name:'未知'}}
+            {{ item.time }}
           </p>
-          <!-- <p class="item">
-            {{ item.action_name?item.action_name:'未知'}}
-          </p> -->
           <p class="time">
-            {{ item.addtime }}
+            {{ item.context }}
           </p>
         </div>
       </el-step>
@@ -43,7 +32,7 @@
 </template>
 
 <script>
-import asyncRequest from "@/apis/components/process-time-line";
+import asyncRequest from "@/apis/components/logis-time-line";
 import resToken from "@/mixins/resToken";
 export default {
   name: "logisTimeLine",
@@ -52,7 +41,13 @@ export default {
   data() {
     return {
       options: [],
+      finishStatus: "",
+      processStatus: "process",
       loading: false,
+      post_logo: "",
+      post_name: "",
+      post_code: "",
+      status: "",
     };
   },
   watch: {
@@ -71,12 +66,16 @@ export default {
       if (!this.loading) {
         this.loading = true;
         this.options = [];
-        const res = await asyncRequest.list({
-          type: this.type,
-          orderCode: this.orderCode,
+        const { code, data, message } = await asyncRequest.list({
+          post_code: this.orderCode,
         });
-        if (res && res.code === 0 && res.data) {
-          this.options = res.data;
+        if (code === 0) {
+          const { status, post_logo, post_name, post_code, post_data } = data;
+          this.status = status + "";
+          this.post_logo = post_logo + "";
+          this.post_name = post_name + "";
+          this.post_code = post_code + "";
+          this.options = post_data;
         } else {
           this.options = [];
         }
@@ -87,7 +86,22 @@ export default {
 };
 </script>
 <style lang="scss">
-.date-picker.el-input {
-  // width: 150px !important;
+.logisTimeLine{
+ .show-post{
+height: 36px;
+margin: 5px  0 15px 0;
+img{
+  width: 32px;
+  height: 32px;
+  border-radius: 50%;
+  margin: 3px 10px 0 0 ;
+}
+div{
+  height: 36px;
+  display: block;
+  line-height: 36px;
+  padding: 0 10px  0 0;
+}
+ } 
 }
 </style>

src/views/purchaseIn/recovery/index.vue

@@ -159,7 +159,7 @@ export default {
       parmValue: {
         infoNo: "",
         bidNo: "",
-        is_own: "1",
+        // is_own: "1",
         page: 1, // 页码
         size: 15, // 每页显示条数
       },

src/views/purchaseIn/wsmInOrder/detail.vue

@@ -4,7 +4,6 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-
       <!-- <div class="detail-page-title">
         <span class="title">入库单编号：{{ queryId }}</span>
       </div> -->
@@ -101,7 +100,7 @@
             <el-collapse-item
               title="入库验收登记"
               name="3"
-              v-if="sitem&&sitem.sendtype === '1'"
+              v-if="sitem && sitem.sendtype === '1'"
             >
               <wsm-in-order-record-form
                 v-if="newTime !== ''"
@@ -114,7 +113,12 @@
             <el-collapse-item
               title="入库验收登记审核"
               name="4"
-              v-if="sitem&&sitem.sendtype === '1' && status !== '0' && status !== '1'"
+              v-if="
+                sitem &&
+                sitem.sendtype === '1' &&
+                status !== '0' &&
+                status !== '1'
+              "
             >
               <wsm-in-order-check-form
                 v-if="newTime !== ''"
@@ -132,7 +136,8 @@
               v-if="
                 status == '3' &&
                 powers.some((item) => item == '031') &&
-                sitem&&sitem.sendtype === '1'
+                sitem &&
+                sitem.sendtype === '1'
               "
             >
               <exam-form
@@ -173,6 +178,15 @@
             :orderCode="queryId"
           />
         </el-tab-pane>
+        <el-tab-pane
+          label="物流进度"
+          name="3"
+          v-if="
+            newTime !== '' && sitem && sitem.sendtype == '1' && status !== '0'
+          "
+        >
+          <logis-time-line v-if="newTime !== ''" :orderCode="sitem.post_code" />
+        </el-tab-pane>
       </el-tabs>
     </div>
     <div v-else>

src/views/sellOut/sellOutOrder/detail.vue

@@ -4,9 +4,7 @@
       style="width: 100%"
       v-if="powers && powers.length > 0 && powers.some((item) => item == '001')"
     >
-      <div
-        class="detail-page-title"
-      >
+      <div class="detail-page-title">
         <span>发货申请单编号：</span
         ><span v-if="sitem">{{ sitem.outCode }}</span>
         <el-button
@@ -285,11 +283,12 @@
             :orderCode="queryId"
           />
         </el-tab-pane>
-          <el-tab-pane label="物流进度" name="3">
-          <logis-time-line
-            v-if="newTime !== ''&&status"
-            :orderCode="sitem.post_code"
-          />
+        <el-tab-pane
+          label="物流进度"
+          name="3"
+          v-if="newTime !== '' && (status === '2' || status === '3')"
+        >
+          <logis-time-line v-if="newTime !== ''" :orderCode="sitem.post_code" />
         </el-tab-pane>
       </el-tabs>
       <div>