Merge branch 'master' of http://git.xdadan.com/tanex/emis-frontend

src/components/CardWithHeader/index.vue

@@ -2,7 +2,7 @@
   <div>
     <!-- { height: height } -->
       <el-card shadow="hover" :style="{ height: height }" v-if="isLinearBg == 'true'" class="home-card linear-background">
-          <div class="header">
+          <div class="header" v-if="header">
               <span>{{ header }}</span>
               <slot name="header-r" />
           </div>
@@ -13,7 +13,7 @@
       </el-card>
 
       <el-card shadow="hover" :style="{ height: height }" v-else class="home-card">
-          <div class="header">
+          <div class="header" v-if="header">
               <span>{{ header }}</span>
               <slot name="header-r" />
           </div>

src/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue

@@ -27,6 +27,14 @@
         type: String,
         required: false
       },
+      payee: {
+        type: String,
+        required: false
+      },
+      salesmen: {
+        type: String,
+        required: false
+      },
       postCode:{
         type: String,
         required: false
@@ -84,7 +92,12 @@
 
      initData() {
        this.loading = true;
-       let queryParams = {pageNumber:1,pageSize:1300};
+       let queryParams = {
+        pageNumber:1,
+        pageSize:1300,
+        payee:this.payee,
+        salesmen:this.salesmen
+      };
        this.bakOptionItems=[];
        this.optionItems=[];
        listSimpleEmisMonthpayAccount(queryParams).then(response => {

src/views/emis/customerService/traceRecordList.vue

@@ -17,6 +17,8 @@
           <span v-text="getIndex(scope.$index)"> </span>
         </template>
       </el-table-column>
+
+
       <el-table-column :label="$t('扫描时间')" align="center" prop="scanDate" min-width="170" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.scanDate) }}</span>
@@ -35,7 +37,7 @@
       </el-table-column>
       <el-table-column :label="$t('扫描网点')" align="center" prop="scanSite" min-width="120" />
       <el-table-column :label="$t('操作人')" align="center" prop="scanMan" min-width="80" />
-
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
       <el-table-column :label="$t('重量')" align="center" prop="scanWeight" min-width="80" />
       <el-table-column :label="$t('上传时间')" align="center" prop="createTime" min-width="170" >
         <template slot-scope="scope">
@@ -108,19 +110,59 @@ export default {
 快件到达[金边],上一站是[],扫描员是[卿卿];网点:金边联系人:王荣联系电话:0888621888网点:联系人:王荣联系电话:0888621888扫描员:卿卿电话:095588368
 [金边]已做派件扫描,扫描员是[卿卿],派件员是[卿卿];网点:金边联系人:王荣联系电话:0888621888扫描员:卿卿电话:095588368派件员:卿卿电话:095588368
 快件已[签收],签收网点是[金边],')}签收人是[本人];网点:金边联系人:王荣联系电话:0888621888签收人:本人
+
+10 揽收扫描（揽收，接口 2.1 揽收扫描 ）
+20 发件扫描 （收，接口 2.1 揽收扫描 ）
+30 到件扫描
+40 派件扫描
+50 签收扫描
+51 签收异常
+52 拒收
+60 退回件
+70 留仓扫描
+80 转件扫描
+-1 问题件
+100 入库扫描
+101 出库扫描
+200 合包扫描
+201 拆包扫描
+301 装车扫描
+302 卸车扫描
+700 报关扫描
+701 报关放行
+702 清关失败
+800 清关扫描
+801 清关放行
+802 清关失败
+999 其它
          */
 
          let content='';
          const scanType=scanRecord.scanType;
-
          // 揽收扫描
          if(scanType=="10"){
              content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已做收件扫描,收件员是<span class="siteOrManHighlight" >['+scanRecord.dispatchOrSendMan+']</span>';
          }
+         // 合包扫描
+         else if(scanType=="200"){
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>合包，合包号[<span class="siteOrManHighlight" >['+scanRecord.bagNo+']</span>';
+         }
+          // 拆包扫描
+         else if(scanType=="201"){
+             content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已拆包';
+         }
          // 发件扫描
          else if(scanType=="20"){
              content='快件已离开<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
+        // 装车扫描
+         else if(scanType=="301"){
+             content='快件已装车<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>,车牌号:'+scanRecord.carNo;
+         }
+        // 卸车扫描
+          else if(scanType=="302"){
+             content='快件已卸车<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,车牌号:'+scanRecord.carNo;
+         }
          // 到件扫描
          else if(scanType=="30"){
              content='快件已到达 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>上一站是[<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
@@ -134,12 +176,16 @@ export default {
              content='快件在<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>已签收，签收人<span class="siteOrManHighlight" >['+scanRecord.signMan+']</span>';
          }
          // 留仓
-         else if(scanType=="60"){
-          content='快件[留仓],停留在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>';
+         else if(scanType=="70"){
+          content='快件[留仓],停留在网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,'+scanRecord.remark;
          }
          // 转单扫描
-         else if(scanType=="70"){
-          content='快件[转单],转件网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
+         else if(scanType=="80"){
+          content='快件[转件],转件网点 <span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,转件人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
+         }
+         // 转件第三方物流信息,拼接三方公司物流轨迹
+         else if(scanType=="81"){
+          content=''+scanRecord.remark+'';
              // 查询转单轨迹
              // 拼接三方公司物流轨迹
          }
@@ -148,11 +194,11 @@ export default {
           content='已登记问题件,登记网点【<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>,登记人<span class="siteOrManHighlight" >['+scanRecord.scanMan+']</span>';
          }
          // 报关扫描
-         else if(scanType=="800"){
+         else if(scanType=="700"){
              content='报关扫描，快件已报关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
          // 清关扫描
-         else if(scanType=="900"){
+         else if(scanType=="800"){
              content='清关扫描，快件已清关<span class="siteOrManHighlight" >['+scanRecord.scanSite+']</span>下一站发往<span class="siteOrManHighlight" >['+scanRecord.preOrNextStation+']</span>';
          }
         //  content='<span style="color: #C53144;">'+content+'</span>';

src/views/emis/customerService/traceWaybillDetailView.vue

@@ -126,6 +126,8 @@ export default {
     }
     else if(this.billDetail.waybillStatus=='50'){
       this.active=5;
+    }else{
+      this.active=2;
     }
 
   },

src/views/emis/emisWaybill/sendWaybillList.vue

@@ -310,6 +310,7 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+           @row-dblclick="handleShowTraceInfo"
 
            >
 
@@ -339,10 +340,9 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!-- <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" /> -->
       <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" >
             <template slot-scope="scope">
-              <div  class="link-type" @click="handleView(scope.row)">{{scope.row.billCode}}</div>
+              {{scope.row.billCode}}
             </template>
       </el-table-column>
 
@@ -574,13 +574,13 @@
     </XdTable>
 
 
-    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <TraceDetail :billCode="currentTraceBillCode"></TraceDetail>
+    <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="100%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+      <TraceWaybillDetailView :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
     </el-dialog>
-
+<!--
     <el-dialog title="查看运单" :visible.sync="openView" width="100%" :destroy-on-close="true"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
       <WaybillDetailReadOnly :billCode="currentTraceBillCode"></WaybillDetailReadOnly>
-    </el-dialog>
+    </el-dialog> -->
 
 
   </XdPageContainer>
@@ -622,7 +622,7 @@ import TraceDetail from '@/views/emis/customerService/traceDetail.vue';
 
 import WaybillDetailReadOnly from '@/views/emis/emisWaybill/waybillDetailReadOnly.vue';
 
-
+import TraceWaybillDetailView from '@/views/emis/customerService//traceWaybillDetailView.vue';
 
 
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@@ -633,6 +633,7 @@ export default {
   // name: "DispatchWaybillList",
 
   components: {
+    TraceWaybillDetailView,
     EmisMonthpayAccountPicker,
     elDateAdvPicker,emisWaybillForm,
     CountryPicker1,
@@ -683,6 +684,7 @@ export default {
       billCode:null,
 
       openTraceInfo:false,
+      currentTraceBillItem:null,
       currentTraceBillCode:null,
 
       queryOrderType:null,
@@ -891,6 +893,7 @@ export default {
     },
     handleShowTraceInfo(row){
         this.currentTraceBillCode=row.billCode;
+        this.currentTraceBillItem=row;
         this.openTraceInfo=true;
     },
     handleView(row){

src/views/emis/emisWaybill/waybillPreCalcFee.vue

@@ -63,7 +63,13 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="6">
+            <el-form-item label="月结账号" prop="custNo" >
+              <EmisMonthpayAccountPicker v-model="form.custNo" :salesmen="$store.getters.empName" :payee="$store.getters.empName"></EmisMonthpayAccountPicker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+
           </el-col>
           <el-col :span="6">
               <el-form-item label="实际重量" prop="billWeight" >
@@ -75,7 +81,7 @@
           <el-col :span="6">
             <el-form-item label="总体积" 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;" placeholder="体积" >
                   <span slot="suffix">(m³)</span>
                 </el-input>
               </div>
@@ -91,7 +97,7 @@
 
     <el-row :gutter="10" style="display: flex;flex-wrap: wrap;">
       <el-col :span="6" v-for="(item,index) in productFeeList" :key="index" >
-        <CardWithHeader :header="item.productTypeName" :isLinearBg="true" >
+        <CardWithHeader :header="item.productTypeName" >
             <template v-slot:body>
               <div style="font-size: 13px;display:inline-flex;width: 100%;">
                   <div style="width:40%;color:gray">{{ item.agingDesc }}</div>
@@ -113,6 +119,7 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
 import CardWithHeader from '@/components/CardWithHeader/index.vue';
+import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 
 export default {
   name: "WaybillPreCalcFee.vue",
@@ -122,7 +129,8 @@ export default {
     TransLinePicker,
     CountryPicker0,
     ProvincePicker2,
-    CardWithHeader
+    CardWithHeader,
+    EmisMonthpayAccountPicker
   },
   dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
           'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
@@ -286,6 +294,7 @@ export default {
     },
       /** 提交按钮 */
     submitCalcFee() {
+      this.productFeeList=[];
         this.form.sendDate =this.sendDate;
         this.$refs["form"].validate(valid => {
           if (valid) {
@@ -345,6 +354,7 @@ export default {
             dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
             billWeight: this.form.billWeight,
             totalVolume: this.form.totalVolume,
+            custNo: this.form.custNo,
             customsClear:this.form.customsClear,
             customsEclaration:this.form.customsEclaration
           }
@@ -354,6 +364,9 @@ export default {
                   console.log(response);
 
                   this.productFeeList = response.data;
+                  if(!this.productFeeList || this.productFeeList.length==0){
+                    this.$message.error(`无报价`);
+                  }
           });
         }
     },