From c1099b9763114d96e85d2700af2e88bf8f85b7d4 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 17 May 2024 08:50:17 +0800
Subject: [PATCH] md

---
 src/views/emis/emisWaybill/orderList.vue      |  26 ++-
 src/views/emis/emisWaybill/orderRecord.vue    |  17 +-
 .../emis/emisWaybill/waybillIsPrinted.vue     | 201 ++++++++++++++----
 src/views/emis/emisWaybill/waybillList.vue    |  77 +++----
 4 files changed, 226 insertions(+), 95 deletions(-)

diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue
index 150c3ed7..94a11ca3 100644
--- a/src/views/emis/emisWaybill/orderList.vue
+++ b/src/views/emis/emisWaybill/orderList.vue
@@ -171,7 +171,7 @@
               </el-col>
               <el-col :span="1.5">
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
                   size="mini"
                   :disabled="single"
@@ -181,7 +181,7 @@
               </el-col>
               <el-col :span="1.5">
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
                   size="mini"
                   :disabled="single"
@@ -273,14 +273,18 @@
       <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
        <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
 
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-      <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" >
+      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="150"  :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('下单日期')" align="center" prop="orderDate" min-width="170" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="80"  :show-overflow-tooltip="true">
         <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
           </template>
        </el-table-column> -
 
       <el-table-column label="发货信息"  align="center" >
+        <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="150"  :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('进仓单')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/>
+
         <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
           <template slot-scope="scope">
               <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
@@ -289,7 +293,7 @@
           </template>
         </el-table-column> -->
         <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/> -->
 
         <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
           <template slot-scope="scope">
@@ -351,7 +355,7 @@
 
       <el-table-column label="货物信息" align="center">
 
-        <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('货物')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
@@ -365,8 +369,10 @@
 
         <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
-              <el-tag v-else type="info">自提</el-tag>
+              <!-- <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
+              <el-tag v-else type="info">自提</el-tag> -->
+              <span v-if="scope.row.dispatchMethod==1" type="info">派送</span>
+              <span v-else type="info">自提</span>
           </template>
         </el-table-column>
 
@@ -443,7 +449,7 @@ import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 export default {
   name: "WaybillIsPrinted",
   components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
-  dicts: ['emis_waybill_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
+  dicts: ['emis_waybill_status','emis_order_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
   ],
   data() {
     return {
@@ -801,7 +807,7 @@ export default {
                   excel.export_json_to_excel({
                     header: tHeader,
                     data,
-                    filename: '运单列表',
+                    filename: '订单列表',
                     autoWidth: true
                   })
                   loadingInstance.close()
diff --git a/src/views/emis/emisWaybill/orderRecord.vue b/src/views/emis/emisWaybill/orderRecord.vue
index 793d1064..cb878a00 100644
--- a/src/views/emis/emisWaybill/orderRecord.vue
+++ b/src/views/emis/emisWaybill/orderRecord.vue
@@ -8,11 +8,6 @@
             </template>
             <div>
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-                <el-col :span="6">
-                    <el-form-item :label="$t('发货时间')" prop="sendDate">
-                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
-                    </el-form-item>
-                </el-col>
 
                 <el-col :span="18">
                     <el-form-item label="运单号" prop="billCode"  >
@@ -22,6 +17,12 @@
                       </div>
                     </el-form-item>
                 </el-col>
+                <el-col :span="6">
+                    <el-form-item :label="$t('下单时间')" prop="orderDate">
+                      <el-input v-model="form.orderDate" placeholder="" readonly="" disabled />
+                    </el-form-item>
+                </el-col>
+
 
                   <el-col :span="6">
                     <el-form-item label="目的国" prop="reciever.country">
@@ -830,8 +831,8 @@ data() {
       sendSiteCode: [
         { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
       ],
-      sendDate: [
-        { required: true, message: "发货时间不能为空", trigger: "blur" }
+      orderDate: [
+        { required: true, message: "西单时间不能为空", trigger: "blur" }
       ],
       dispatchUnderlingSiteCode: [
         { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
@@ -982,7 +983,7 @@ methods: {
   },
   initData() {
       this.reset();
-      this.form.sendDate =  parseTime(new Date());
+      this.form.orderDate =  parseTime(new Date());
       this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
       this.form.sendSiteName=this.$store.getters.ownerSiteName;
       console.log(this.form.sendSiteName)
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 2e31f61e..b07447b3 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="5"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="" prop="billCode">
               <div slot="label">
                 <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
@@ -17,6 +17,15 @@
                 @keyup.enter.native="handleQuery"
               />
             </el-form-item>
+            <el-form-item label="" prop="dateTimeRange">
+              <div slot="label">
+                      <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
+                          <el-radio label="1">下单时间</el-radio>
+                          <el-radio label="0">录单时间</el-radio>
+                        </el-radio-group>
+              </div>
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+            </el-form-item>
 
             <el-form-item label="收件人" prop="receiveName">
               <el-input
@@ -119,19 +128,6 @@
                   ></el-option>
                 </el-select>
             </el-form-item>
-
-            <el-form-item label="" prop="dateTimeRange">
-              <div slot="label">
-                      <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
-                          <el-radio label="1">下单时间</el-radio>
-                          <el-radio label="0">录单时间</el-radio>
-                        </el-radio-group>
-              </div>
-              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-            </el-form-item>
-
-
-
     </SearchForm>
 
 
@@ -254,42 +250,169 @@
              </template>
       </el-table-column>
 
+       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+        <template slot-scope="scope">
+            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
+         </template>
+      </el-table-column>
+
       -->
 
       <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-            <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
-              <span>{{ scope.row.billCode }}</span>
-            </router-link>
-         </template>
-      </el-table-column>
-      <el-table-column :label="$t('打印状态')" align="center" prop="blPrint" width="100" >
-          <template slot-scope="scope">
-             <el-tag type="success" v-if="scope.row.blPrint==1">已打印</el-tag>
-             <el-tag type="info" v-else>待打印</el-tag>
-          </template>
-       </el-table-column>
-       <el-table-column :label="$t('打印时间')" align="center" prop="printDate" width="170" />
-       <el-table-column :label="$t('打印次数')" align="center" prop="printCount" width="80" />
-       <el-table-column :label="$t('打印人')" align="center" prop="printManName" width="100" />
 
       <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
-      <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
       <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
-      <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+       <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
+      <!-- <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="打印信息" align="center">
+        <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
+              <el-tag v-else type="danger">未打印</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
+
+        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/>
+      </el-table-column>
+
+      <el-table-column label="发货信息"  align="center" >
+        <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+                <span>{{ scope.row.billCode }}</span>
+              </router-link>
+          </template>
+        </el-table-column> -->
+        <el-table-column :label="$t('收件业务员')" align="center" prop="salesmenName" min-width="100" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
           </template>
-       </el-table-column>
-       <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" />
+       </el-table-column> -->
+        <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
+        <!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> -->
+        <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> -->
+      </el-table-column>
+
+
+      <el-table-column label="寄件信息" align="center" >
+        <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <!-- <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
+              <el-tag v-else type="danger">不发送</el-tag> -->
+              <div v-if="scope.row.blMessage==1" >发送</div>
+              <div v-else>不发送</div>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+
+
+      <el-table-column label="收件信息" align="center">
+        <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"/>
+
+        <!-- <el-table-column :label="$t('收件客户')" align="center" prop="receiveCustomerName" min-width="100" /> -->
+        <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                <!-- <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
+                <el-tag v-else type="danger">不发送</el-tag> -->
+                <div v-if="scope.row.blAcceptMessage==1" >发送</div>
+                <div v-else>不发送</div>
+            </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="货物信息" align="center">
+
+        <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
+        <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="80" />
+        <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="80" />
+        <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
+        <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
+
+        <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
+          <template slot-scope="scope">
+              <!-- <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
+              <el-tag v-else type="info">自提</el-tag> -->
+              <div v-if="scope.row.dispatchMethod==1" >派送</div>
+              <div v-else>自提</div>
+          </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="收费信息" align="center">
+
+        <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('到付款')" align="center" prop="freight" min-width="80" />
+        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
+        <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
+
+      </el-table-column>
+
+      <el-table-column label="签收信息" align="center">
+
+        <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
+              <el-tag v-else type="danger">未签收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="80" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+      </el-table-column>
+
+
+      <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="receiveCountryName" width="100" />
-       <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-      <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-      <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="100" />
-      <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" />
 
     </XdTable>
 
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 744b144b..c8168f44 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -157,34 +157,31 @@
               <el-col :span="1.5">
                 <el-button
                   type="primary"
-                  icon="el-icon-plus"
                   plain
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisWaybill:add']"
-                >去录单</el-button>
+                >开单</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
-                  icon="el-icon-edit"
                   size="mini"
                   :disabled="single"
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisWaybill:edit']"
                 >运单修改</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
-                  type="success"
+                  type="primary"
                   plain
-                  icon="el-icon-edit"
                   size="mini"
                   :disabled="single"
                   @click="handleView"
                 >查看</el-button>
-              </el-col> -->
+              </el-col>
               <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
@@ -212,7 +209,7 @@
                   @click="handleView"
                 >下载打印pdf</el-button>
               </el-col>
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -221,9 +218,9 @@
                   :disabled="single"
                   @click="handleView"
                 >打印</el-button>
-              </el-col>
+              </el-col> -->
 
-              <!-- <el-col :span="1.5">
+              <el-col :span="1.5">
                 <el-button
                   type="warning"
                   plain
@@ -232,7 +229,7 @@
                   @click="handleExport"
                   v-hasPermi="['emis:emisWaybill:export']"
                 >导出</el-button>
-              </el-col> -->
+              </el-col>
           </el-row>
       </div>
 
@@ -259,18 +256,19 @@
       <!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
       <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
        <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
+      <el-table-column :label="$t('运单编号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
 
       <el-table-column label="发货信息"  align="center" >
-        <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
+        <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+              <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
                 <span>{{ scope.row.billCode }}</span>
               </router-link>
           </template>
-        </el-table-column>
-        <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('收件业务员')" align="center" prop="salesmen" min-width="100" :show-overflow-tooltip="true"/>
-
+        </el-table-column> -->
+        <el-table-column :label="$t('收件业务员')" align="center" prop="salesmenName" min-width="100" :show-overflow-tooltip="true"/>
         <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
@@ -297,10 +295,12 @@
         <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
-        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="80" :show-overflow-tooltip="true">
+        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
-              <el-tag v-else type="danger">不发送</el-tag>
+              <!-- <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
+              <el-tag v-else type="danger">不发送</el-tag> -->
+              <div v-if="scope.row.blMessage==1" >发送</div>
+              <div v-else>不发送</div>
           </template>
         </el-table-column>
       </el-table-column>
@@ -322,8 +322,10 @@
         <el-table-column :label="$t('收件地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
         <el-table-column :label="$t('派件短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
           <template slot-scope="scope">
-                <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
-                <el-tag v-else type="danger">不发送</el-tag>
+                <!-- <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
+                <el-tag v-else type="danger">不发送</el-tag> -->
+                <div v-if="scope.row.blAcceptMessage==1" >发送</div>
+                <div v-else>不发送</div>
             </template>
         </el-table-column>
 
@@ -345,8 +347,10 @@
 
         <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
           <template slot-scope="scope">
-              <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
-              <el-tag v-else type="info">自提</el-tag>
+              <!-- <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
+              <el-tag v-else type="info">自提</el-tag> -->
+              <div v-if="scope.row.dispatchMethod==1" >派送</div>
+              <div v-else>自提</div>
           </template>
         </el-table-column>
 
@@ -449,6 +453,7 @@ export default {
       currentId:null,
       openForm: false,
       titleForm: "",
+      billCode:null,
 
       // 弹出展示层
       id:null,
@@ -710,6 +715,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
+      if(selection!=null){
+        this.billCode=selection[0].billCode;
+      }
       this.ids = selection.map(item => item.id)
       this.single = selection.length!==1
       this.multiple = !selection.length
@@ -722,24 +730,17 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
+      // <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+      this.$router.push({ path: '/d24/waybillManagement/WaybillEntry'});
     },
+
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.id;
-       this.openForm = true;
-       this.titleForm = "修改";
+      // const waybill = this.emisWaybillList.find(item => item.id === id)
+       this.$router.push({ path: '/d24/waybillManagement/WaybillModify', query: { billCode: this.billCode }})
     },
     handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/emis/emisWaybill/viewDetail', query: { id: row.id }})
+       this.$router.push({ path: '/d24/waybillManagement/WaybillDetail', query: { billCode: this.billCode }})
     },
     handleFormChanged(){
         this.openForm = false;