From fbadae298a292e64c806323b2c267181576c383f Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Tue, 11 Jun 2024 15:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                                  | 2 +-
 .../emisWaybill/orderEntryAndReceiptPictureManagement.vue     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index e2a177cb..66585249 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "vuex": "3.6.0",
     "watermark-dom": "2.3.0",
     "xd-pdf": "./libs/XdPdf",
-    "xd-vue-pdf": "./libs/XdVuePdf",
+    "xd-vue-pdf": "file:libs/XdVuePdf",
     "xlsx": "^0.17.5"
   },
   "devDependencies": {
diff --git a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
index 1cd21cdb..23eb9027 100644
--- a/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
+++ b/src/views/emis/emisWaybill/orderEntryAndReceiptPictureManagement.vue
@@ -102,8 +102,8 @@
           <ImagePreview height="50px" v-for="pic in (scope.row.fileUrl||'').split(',')" :key="pic" :src="pic" ></ImagePreview>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('上传网点')" align="center" prop="createSite" min-width="100" />
-      <el-table-column :label="$t('上传人')" align="center" prop="createBy" min-width="150" />
+      <el-table-column :label="$t('上传网点')" align="center" prop="createSiteName" min-width="100" />
+      <el-table-column :label="$t('上传人')" align="center" prop="createByName" min-width="150" />
       <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>