md

src/components/XdTable/index.vue

@@ -102,9 +102,9 @@
         <div style="width:40%" >
            <div class="pagination-container"><slot name="statInfo" /></div>
         </div>
-        <div style="width:60%;overflow: hidden;"  >
+        <div v-if="showPagination" style="width:60%;overflow: hidden;"  >
           <pagination
-            v-show="total>0 && showPagination"
+            v-show="total>0 "
             :total="total"
             :page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
             :page.sync="queryParams.pageNum"
@@ -116,8 +116,9 @@
       </div>
 
       <div v-else >
+          <div v-if="showPagination">
             <pagination
-            v-show="total>0 && showPagination"
+              v-show="total>0 "
               :total="total"
               :page-sizes="[5,10,20,50,100,300,500,1000,2000,5000]"
               :page.sync="queryParams.pageNum"
@@ -126,6 +127,7 @@
               @pagination="queryTable"
             />
          </div>
+      </div>
 
     </div>
 

src/views/emis/customerService/traceRecordList.vue

@@ -99,10 +99,24 @@ export default {
     },
     getList() {
          this.loading = true;
+         let ownerSiteCode=this.$store.getters.ownerSiteCode;
          getTraceListByBillCode(this.queryParams).then(response => {
           this.scanRecordList = response.rows;
           this.total=response.total;
-          console.log(this.scanRecordList);
+
+
+          // console.log("======>traceRecordListxxxx1=====>",this.scanRecordList);
+          let i=0;
+          let len=this.scanRecordList.length;
+          for(i=0;i<len;i++){
+            let item=this.scanRecordList[i]
+
+            if(item.scanSiteCode==ownerSiteCode){
+                this.$emit("onCanSeeBillDetail",true)
+                break;
+            }
+          }
+
           this.loading = false;
         });
 

src/views/emis/customerService/traceWaybillDetailView.vue

@@ -21,6 +21,7 @@
           <el-step >
             <template slot="title">
               签收(<span >{{billDetail.reciever.countryName}}</span>)
+              <!-- 签收(<span ></span>) -->
             </template>
             <span class="icon iconfont" slot="icon">&#xe819;</span>
           </el-step>
@@ -45,20 +46,20 @@
        </div>
       </div>
     </div>
-    <el-tabs class="center-tabs" style="margin-top: 15px;">
+    <el-tabs v-model="activeTab"  class="center-tabs" style="margin-top: 15px;">
-      <el-tab-pane label="扫描记录" >
+      <el-tab-pane label="扫描记录" name="tab-1">
-        <TraceRecordList :billCode="scanBillCode"></TraceRecordList>
+        <TraceRecordList :billCode="scanBillCode" @onCanSeeBillDetail="onCanSeeBillDetail"></TraceRecordList>
       </el-tab-pane>
-      <el-tab-pane label="运单信息"  v-if="canViewDetail" >
+      <el-tab-pane label="运单信息"  v-if="canViewDetail" name="tab-2">
         <WaybillDetailReadOnly :billCode="scanBillCode"></WaybillDetailReadOnly>
       </el-tab-pane>
-      <el-tab-pane label="查看图片" >
+      <el-tab-pane label="查看图片" name="tab-3">
-        <BillPicList :billCode="scanBillCode"></BillPicList>
+        <BillPicList :billCode="scanBillCode" ></BillPicList>
       </el-tab-pane>
-      <el-tab-pane label="日志记录" >
+      <el-tab-pane label="日志记录" name="tab-4">
 
       </el-tab-pane>
-      <el-tab-pane label="问题件" >
+      <el-tab-pane label="问题件" name="tab-5">
         <ProblemList :billCode="scanBillCode"></ProblemList>
       </el-tab-pane>
     </el-tabs>
@@ -95,10 +96,11 @@ export default {
   dicts: [],
   data() {
     return {
+      activeTab:"tab-1",
       active:1,
       // 遮罩层
       loading: true,
-      billDetail:{},
+      billDetail:null,
       traceInfoList: [],
       scanRecordList:[],
       canViewDetail:false,
@@ -157,35 +159,12 @@ export default {
           }
       });
 
-      // 查看扫描记录是否包含该网点，如果包含则允许查看
-      let qParamTmp={
-        pageNum:1,
-        pageSize:1000,
-        billCode:this.scanBillCode
-      }
-      getTraceListByBillCode(qParamTmp).then(response => {
-        this.scanRecordList = response.rows;
-
-        if(this.scanRecordList&&this.scanRecordList.length>0){
-          let i=0;
-          let len=this.scanRecordList.length;
-
-          for(i=0;i<len;i++){
-            let item=this.scanRecordList[i]
-            console.log("====>item===>",item);
-            if(item.scanSiteCode==ownerSiteCode){
-                this.canViewDetail=true;
-                break;
-            }
-          }
-        }
-
-        // this.loading = false;
-      });
-
-
     },
 
+    onCanSeeBillDetail(isCan){
+      console.log("======>onCanSeeBillDetail=====>",isCan);
+      this.canViewDetail=isCan;
+    },
 
 
     showGotRmk(){