From c3eeadfb5563e9ddec9400dc212bf18c8ff40643 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 10 Jan 2025 16:47:36 +0800
Subject: [PATCH] md

---
 public/index.html                             |  2 +-
 public/manifest.json                          | 45 +++++++++++----
 src/api/emis/emisWaybill.js                   |  8 +++
 .../traceWaybillDetailView.vue                | 55 ++++++++-----------
 4 files changed, 67 insertions(+), 43 deletions(-)

diff --git a/public/index.html b/public/index.html
index d45fcf4f..b7334ae9 100644
--- a/public/index.html
+++ b/public/index.html
@@ -8,7 +8,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"/>
     <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" /> -->
     <!-- <link rel="icon" href="<%= BASE_URL %>shorticon.png"/> -->
-    <link rel="manifest" href="manifest.json" />
+    <!-- <link rel="manifest" href="/manifest.json" /> -->
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
diff --git a/public/manifest.json b/public/manifest.json
index 025bb4f8..96f30c5f 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,17 +1,42 @@
 {
-  "short_name": "XDADAN",
-  "name": "XDADAN",
-  "description": "XDADAN 是一款适合多业务的云平台系统",
-  "start_url": "/",
-  "display": "standalone",
-  "theme_color": "#8888ff",
-  "background_color": "#FFFFFF",
-  "orientation": "portrait",
+  "short_name": "Tanex56 EMIS",
+  "name": "Tanex56 EMIS",
   "icons": [
     {
-      "src": "shorticon1.png",
-      "sizes": "256x256",
+      "src": "/shorticon1.png",
+      "sizes": "122x118",
       "type": "image/png"
     }
+  ],
+  "id": "/?source=pwa",
+  "start_url": "/?source=pwa",
+  "background_color": "#3367D6",
+  "display": "standalone",
+  "scope": "/",
+  "theme_color": "#3367D6",
+  "orientation": "portrait",
+  "shortcuts": [
+    {
+      "name": "Tanex56 EMIS",
+      "short_name": "Tanex56 EMIS",
+      "description": "Tanex56 EMIS is express system",
+      "url": "/?source=pwa",
+      "icons": [{ "src": "/shorticon1.png", "sizes": "122x118" }]
+    }
+  ],
+  "description": "Tanex56 EMIS is express system",
+  "screenshots": [
+    {
+      "src": "/shorticon1.png",
+      "type": "image/png",
+      "sizes": "122x118",
+      "form_factor": "narrow"
+    },
+    {
+      "src": "/shorticon1.png",
+      "type": "image/png",
+      "sizes": "122x118",
+      "form_factor": "wide"
+    }
   ]
 }
diff --git a/src/api/emis/emisWaybill.js b/src/api/emis/emisWaybill.js
index 4ba99e6e..e5558d2e 100644
--- a/src/api/emis/emisWaybill.js
+++ b/src/api/emis/emisWaybill.js
@@ -69,6 +69,14 @@ export function queryPrintListSimple(query) {
   })
 }
 
+export function checkIsCanViewBillDetail(query) {
+  return request({
+    url: '/emis/emisWaybill/checkIsCanViewBillDetail',
+    method: 'get',
+    params: query
+  })
+}
+
 
 export function getLatestMonthCreateOrderMapList(query) {
   return request({
diff --git a/src/views/emis/customerService/traceWaybillDetailView.vue b/src/views/emis/customerService/traceWaybillDetailView.vue
index 9f5765f0..86943faa 100644
--- a/src/views/emis/customerService/traceWaybillDetailView.vue
+++ b/src/views/emis/customerService/traceWaybillDetailView.vue
@@ -75,7 +75,7 @@ import ProblemList from './problemList.vue';
 import BillPicList from './billPicList.vue';
 
 import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
-import { getWaybillDetail } from "@/api/emis/emisWaybill";
+import { getWaybillDetail,checkIsCanViewBillDetail } from "@/api/emis/emisWaybill";
 import {  getNormalLastScanRecord,getTraceListByBillCode } from "@/api/emis/emisTmsScanRecord";
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -137,42 +137,33 @@ export default {
       getWaybillDetail(this.scanBillCode).then(response => {
 
           this.billDetail = Object.assign({},response.data);
-
-
           // console.log("==ownerCountryCode=>",this.ownerCountryCode);
           // console.log("==his.billDetail.reciever.country=>",this.billDetail.reciever.country);
           //bug:848 调整后：与运单号关联的：寄件网点、目的网点、签收网点、总部、销售联系人、回款联系人 允许查看 运单信息；其他网点或员工若不相关则不允许查看；
           //bug- 目的国除中国外的网点能看到目的是该国的运单信息
-          if(
-            ownerSiteCode == this.billDetail.sendSiteCode
-            ||  ownerSiteCode == this.billDetail.dispatchSiteCode
-            ||  ownerSiteCode == this.billDetail.dispatchUnderlingSiteCode
-            ||  ownerSiteCode == this.billDetail.signSiteCode
-            ||  ownerSiteCode == '88888'
-            ||  empName ==this.billDetail.payee
-            ||  empName ==this.billDetail.salesmen
-            ||  (this.billDetail.reciever.country != '0086' && this.billDetail.reciever.country == ownerCountryCode )
-          ){
-            this.canViewDetail=true;
-          }
+          // if(
+          //   ownerSiteCode == this.billDetail.sendSiteCode
+          //   ||  ownerSiteCode == this.billDetail.dispatchSiteCode
+          //   ||  ownerSiteCode == this.billDetail.dispatchUnderlingSiteCode
+          //   ||  ownerSiteCode == this.billDetail.signSiteCode
+          //   ||  ownerSiteCode == '88888'
+          //   ||  empName ==this.billDetail.payee
+          //   ||  empName ==this.billDetail.salesmen
+          //   ||  (this.billDetail.reciever.country != '0086' && this.billDetail.reciever.country == ownerCountryCode )
+          // ){
+          //   this.canViewDetail=true;
+          // }
+
+          // 检查是否可看账单
+          checkIsCanViewBillDetail({billCode:this.billDetail.billCode}).then(response => {
+            if(response.data=='1'){
+              this.canViewDetail=true;
+            }else{
+              this.canViewDetail=false;
+            }
+
+          });
 
-          // if(this.billDetail.waybillStatus=='10'){
-          //   this.active=1;
-          // }
-          // else if(this.billDetail.waybillStatus=='20'){
-          //   this.active=2;
-          // }
-          // else if(this.billDetail.waybillStatus=='30'){
-          //   this.active=3;
-          // }
-          // else if(this.billDetail.waybillStatus=='40'){
-          //   this.active=4;
-          // }
-          // else if(this.billDetail.waybillStatus=='50'){
-          //   this.active=5;
-          // }else{
-          //   this.active=2;
-          // }
           this.setLastStepFlag();
       });
     },