From 7262a8291b3aba3d1149b836a1cb71ea2bfad62e Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sun, 9 Jun 2024 21:18:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E6=89=B9?=
 =?UTF-8?q?=E6=AC=A1=E9=A1=B5=E9=9D=A2=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emisTmsSiteBatch/centerGenBatchMgnt.vue   | 69 ++++++++++---------
 1 file changed, 35 insertions(+), 34 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
index 6545a370..f632635a 100644
--- a/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/centerGenBatchMgnt.vue
@@ -49,11 +49,11 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="寄件国" prop="destCountry">
+          <el-form-item label="寄件国" prop="sendCountry">
               <CountryPicker :placeholder="$t('寄件国')" v-model="queryParams.sendCountry" ></CountryPicker>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8"> 经确认：这张表不用付款方式，列表中去除
           <el-form-item label="付款方式" prop="paymentType" >
             <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
               <el-option
@@ -64,7 +64,7 @@
               ></el-option>
             </el-select>
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <!-- <el-form-item label="签收时间" prop="dateTimeRange">
             <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
@@ -150,7 +150,7 @@
             <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
             <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
             <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
-            <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
+            <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
             <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@@ -227,7 +227,7 @@
             <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
             <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
             <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100" />
-            <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
+            <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
             <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
             <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
             <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@@ -305,9 +305,9 @@
             <el-table-column :label="$t('报关资料状态')" align="center" prop="declareResStatus" min-width="170" />
             <el-table-column :label="$t('清关资料状态')" align="center" prop="clearanceResStatus" min-width="170" />
             <el-table-column :label="$t('航空提单号')" align="center" prop="airBilllNo" min-width="170" />
-            <el-table-column :label="$t('异常信息')" align="center" prop="xxx" min-width="170">
+            <el-table-column :label="$t('异常信息')" align="center" prop="remark" min-width="170">
               <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.xxx }}</span>
+                <span class="ellipsis">{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('目的国家')" align="center" prop="destCountryName" min-width="100">
@@ -325,7 +325,7 @@
                 <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
               </template>
             </el-table-column>
-            <el-table-column :label="$t('操作员')" align="center" prop="createBy" min-width="150" />
+            <el-table-column :label="$t('操作员')" align="center" prop="createByName" min-width="150" />
             <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -357,7 +357,7 @@
             </el-col>
             <el-col :span="8">
               <el-form-item label="运输方式" prop="transType">
-                <el-select v-model="coData.transType" placeholder="运输方式" clearable filterable>
+                <el-select v-model="coData.transType" placeholder="运输方式" clearable filterable >
                   <el-option
                     v-for="item in dict.type.emis_biz_shipping_method"
                     v-bind:key="item.value"
@@ -372,8 +372,9 @@
                 <span slot="label">
                   <span style="color: red">{{ $t('起始网点') }}</span>
                 </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect"  v-model="coData.startSiteCode" v-if="$store.getters.ownerSiteCode== '88888'" ></EmisSiteSimplePicker>
-                <el-input v-else  v-model="coData.startSiteName" placeholder="" disabled />
+                <!-- <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect"  v-model="coData.startSiteCode" v-if="$store.getters.ownerSiteCode== '88888'" ></EmisSiteSimplePicker>
+                <el-input v-else  v-model="coData.startSiteName" placeholder="" disabled /> -->
+                <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect"  v-model="coData.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -384,12 +385,12 @@
                 <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="coData.transType == 2">
               <el-form-item :label="$t('航空单号')" prop="airBilllNo">
                 <el-input v-model="coData.airBilllNo" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="coData.transType == 2">
               <el-form-item label="起飞时间" prop="airTime">
                 <el-date-picker clearable
                   v-model="coData.airTime"
@@ -399,27 +400,12 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('车牌号')" prop="carNo">
-                <el-input v-model="coData.carNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="发车时间" prop="carTime">
-                <el-date-picker clearable
-                  v-model="coData.carTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="请选择发车时间">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="coData.transType == 4">
               <el-form-item :label="$t('船次号')" prop="shipNo">
                 <el-input v-model="coData.shipNo" />
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="coData.transType == 4">
               <el-form-item label="开船时间" prop="shipTime">
                 <el-date-picker clearable
                   v-model="coData.shipTime"
@@ -429,14 +415,29 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
+              <el-form-item :label="$t('车牌号')" prop="carNo">
+                <el-input v-model="coData.carNo" />
+              </el-form-item>
+            </el-col>
+            <el-col :span="8"  v-if="['1','3','5'].indexOf(coData.transType) > -1">
+              <el-form-item label="发车时间" prop="carTime">
+                <el-date-picker clearable
+                  v-model="coData.carTime"
+                  type="date"
+                  value-format="yyyy-MM-dd"
+                  placeholder="请选择发车时间">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+            <!-- <el-col :span="8">
               <el-form-item :label="$t('配载文件')" prop="loadingFile">
                 <span slot="label">
                   <span style="color: red">{{ $t('配载文件') }}</span>
                 </span>
                 <ImageUpload v-model="coData.loadingFile" :isShowTip="false" ></ImageUpload>
               </el-form-item>
-            </el-col>
+            </el-col> -->
           </el-col>
           <el-col :span="8">
             <el-col :span="24">
@@ -543,7 +544,7 @@
             <dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
+        <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
         <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
@@ -705,7 +706,7 @@
             <dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" />
+        <!-- <el-table-column :label="$t('物流信息')" align="center" prop="xxx" min-width="100" /> -->
         <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
         <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
         <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">

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 2/2] =?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>