diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index 543d27b0..0eaabce6 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -128,6 +128,17 @@
               v-hasPermi="['emis:emisQuotePrice:edit']"
             >修改报价</el-button>
           </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button
+              type="success"
+              plain
+              icon="el-icon-edit"
+              size="mini"
+              :disabled="single"
+              @click="handleBatchUpdate"
+              v-hasPermi="['emis:emisQuotePrice:edit']"
+            >批量修改</el-button>
+          </el-col> -->
           <el-col :span="1.5">
             <el-button
               type="danger"
diff --git a/src/views/emis/emisWaybill/UserOrderList.vue b/src/views/emis/emisWaybill/UserOrderList.vue
index ec7a0fa8..9d7cc8b5 100644
--- a/src/views/emis/emisWaybill/UserOrderList.vue
+++ b/src/views/emis/emisWaybill/UserOrderList.vue
@@ -91,7 +91,7 @@
             </el-row>
 
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-              <el-col span="24">
+              <el-col :span="24">
                 <el-form-item label="收件人" prop="receiveName">
                     <el-input
                       v-model="queryParams.receiveName"
@@ -268,8 +268,17 @@
                   plain
                   size="mini"
                   :disabled="single"
-                  @click="handleDownWarehouseIn"
-                >下载进仓单</el-button>
+                  @click="handleDownWarehouseInPDF"
+                >下载进仓单(PDF)</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleDownWarehouseInWORD"
+                >下载进仓单(WORD)</el-button>
               </el-col>
 
               <el-col :span="1.5">
@@ -430,7 +439,6 @@
        <el-table-column :label="$t('仓库地址')" align="center" prop="intoWarehouseAddress" min-width="80" :show-overflow-tooltip="true"/>
        <el-table-column :label="$t('预计入仓时间')" align="center" prop="pickStartDate" min-width="150" :show-overflow-tooltip="true"/>
 
-
         <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
 
@@ -478,6 +486,8 @@
         <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
 
       <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+      <el-table-column :label="$t('下单人电话')" align="center" prop="orderTel" min-width="150" />
+
 
       <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
@@ -812,11 +822,24 @@ export default {
         this.loading = false;
       });
     },
-    handleDownWarehouseIn() {
+    handleDownWarehouseInPDF() {
       if(this.selectionList&&this.selectionList.length>0){
         this.selectionList.forEach(item=>{
           this.download('emis/emisWaybill/exportWarehouseInTpl', {
-            orderSn:item.orderSn
+            orderSn:item.orderSn,
+            fileType:'pdf'
+          }, `${item.intoWarehouseBillCode}.pdf`)
+
+        });
+     }
+   },
+
+   handleDownWarehouseInWORD() {
+      if(this.selectionList&&this.selectionList.length>0){
+        this.selectionList.forEach(item=>{
+          this.download('emis/emisWaybill/exportWarehouseInTpl', {
+            orderSn:item.orderSn,
+            fileType:'docx'
           }, `${item.intoWarehouseBillCode}.pdf`)
 
         });
diff --git a/src/views/emis/emisWaybill/waybillGot.vue b/src/views/emis/emisWaybill/waybillGot.vue
index 956ad85c..72e8ae95 100644
--- a/src/views/emis/emisWaybill/waybillGot.vue
+++ b/src/views/emis/emisWaybill/waybillGot.vue
@@ -1054,10 +1054,15 @@ created() {
   }
   else if(this.action=='got'){
       this.billCode=this.$route.query.billCode;
+      let timestamp=this.$route.query.billCode;
+
       const title = '接单:'+this.billCode;
       const route = Object.assign({}, this.$route, { title: `${title}` })
-      this.$store.dispatch('tagsView/updateVisitedView', route)
-      this.initData();
+      if(this.lastTimestamp!=timestamp){
+        this.lastTimestamp=timestamp;
+        this.$store.dispatch('tagsView/updateVisitedView', route)
+        this.initData();
+      }
 
   }
   else if(this.action=='modify'){