md

src/views/oms/dashboard.vue

@@ -78,13 +78,13 @@
                           <el-row>
                             <el-col :span="4" style="    border-right: 1px solid #ebebeb;">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.issueCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.issueCount }}</span>
                                   </div>
                                   <div class="title" style="color:red">异常件</div>
                               </el-col>
                               <el-col :span="4">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.totalCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.totalCount }}</span>
                                   </div>
                                   <div class="title">总订单量</div>
                               </el-col>
@@ -96,25 +96,25 @@
                               </el-col> -->
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.waitGotCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.waitGotCount }}</span>
                                   </div>
                                   <div class="title">待接单</div>
                               </el-col>
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.transCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.transCount }}</span>
                                   </div>
                                   <div class="title">运输中</div>
                               </el-col>
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.dispatchCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.dispatchCount }}</span>
                                   </div>
                                   <div class="title">派送中</div>
                               </el-col>
                               <el-col :span="4">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsOrderState.signCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList')">{{ omsOrderState.signCount }}</span>
                                   </div>
                                   <div class="title">已签收</div>
                               </el-col>
@@ -242,13 +242,13 @@
                         <el-row>
                             <el-col :span="12" >
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.waitPayMoney||0}}</span>
+                                      <span >{{ omsBillFeeState.waitPayMoney||0}}</span>
                                   </div>
                                   <div class="title" style="color:red">未付款</div>
                               </el-col>
                               <el-col :span="12">
                                   <div class="count">
-                                      <span @click="goRouter('/websites')">{{ omsBillFeeState.totalRecedMoney||0}}</span>
+                                      <span >{{ omsBillFeeState.totalRecedMoney||0}}</span>
                                   </div>
                                   <div class="title">已付款</div>
                               </el-col>

src/views/oms/emisWaybill/OrderRecord.vue

@@ -373,9 +373,9 @@
                             </el-form-item>
                         </el-col>
                         <el-col :span="12">
-                            <el-form-item  :label="$t('总体积')"  prop="totalVolume" @blur="preCalcFee" @keyup.enter.native="preCalcFee"  >
+                            <el-form-item  :label="$t('总体积')"  prop="totalVolume" >
                               <div style="">
-                                <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
+                                <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积"  @blur="handleCalcVolumeWeight" @keyup.enter.native="handleCalcVolumeWeight">
                                   <span slot="suffix">(m³)</span>
                                 </el-input>
                               </div>
@@ -668,7 +668,7 @@
         </div>
         <div style="font-size:12px;    margin-bottom: 30px;">
           运费预估:￥<span style="font-size:15px;color:red;font-weight:500">{{form.freight}}</span>
-          <div>温馨提示：具体费用以快递小哥核实为准哦</div>
+          <div>温馨提示：具体运价时效以快递小哥核实为准！</div>
         </div>
         <el-button type="primary" @click="submitForm">{{$t('立即下单')}}</el-button>
         <!-- <el-button @click="initData">{{$t('重置')}}</el-button> -->
@@ -1550,7 +1550,6 @@ methods: {
 
     },
 
-
     handleCargoQtyChangeDebounce(row){
         // 控制触发频率
         debounce(250, this.handleCargoQtyChange(row))
@@ -1657,6 +1656,26 @@ methods: {
         }
     },
 
+    // 计算体积重量
+  handleCalcVolumeWeight(){
+
+    if( this.form.totalVolume
+    ){
+      let postData={
+        transLine: this.form.transLine,
+        totalVolume: this.form.totalVolume,
+      }
+
+      calcVolumeWeight(postData).then(response => {
+            this.form.volumeWeight = response.data.volumeWeight;
+            // 计算结算重量
+             this.preCalcFee();
+      });
+    }
+
+},
+
+
 }
 };
 </script>

src/views/oms/emisWaybill/SendOrderbillList.vue

@@ -372,6 +372,14 @@
             <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
           </template>
        </el-table-column>
+
+       <el-table-column :label="$t('仓库名称')" align="center" prop="intoWarehouseName" min-width="80" :show-overflow-tooltip="true"/>
+       <el-table-column :label="$t('仓库联系人')" align="center" prop="intoWarehouseContact" min-width="80" :show-overflow-tooltip="true"/>
+       <el-table-column :label="$t('仓库联系电话')" align="center" prop="intoWarehousePhone" min-width="150" :show-overflow-tooltip="true"/>
+       <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="fjr" width="180" :show-overflow-tooltip="true">
           <template slot-scope="scope">
             <span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>