md

src/views/oms/dashboard.vue

@@ -108,13 +108,13 @@
                               </el-col>
                               <el-col :span="3">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:4})">{{ omsOrderState.dispatchCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:5})">{{ omsOrderState.dispatchCount }}</span>
                                   </div>
                                   <div class="title">派送中</div>
                               </el-col>
                               <el-col :span="4">
                                   <div class="count">
-                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:5})">{{ omsOrderState.signCount }}</span>
+                                      <span @click="goRouter('/OrderMgnt/SendOrderbillList',{statQueryType:6})">{{ omsOrderState.signCount }}</span>
                                   </div>
                                   <div class="title">已签收</div>
                               </el-col>

src/views/oms/emisWaybill/OrderRecord.vue

@@ -1165,7 +1165,6 @@ created() {
     this.form.sendSiteCode=postForm.sendSiteCode;
     this.form.dispatchUnderlingSiteCode=postForm.dispatchUnderlingSiteCode;
 
-
     this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
 
   }
@@ -1201,6 +1200,9 @@ methods: {
           if(this.action=='copyOrder'){
             this.billCode=null;
             this.form.billCode=null;
+            this.sendDate=null;
+             // 加载产品列表
+             this.preCalcFee();
           }
           else if(this.action=='modify'){
             // 加载产品列表
@@ -1318,12 +1320,18 @@ methods: {
                 type: "success",
                 distinguishCancelAndClose: true,
                 closeOnClickModal: false,
-                showCancelButton: false,
+                showCancelButton: true,
                 showClose: false
       }).then(() => {
         this.billCode=null;
         this.form.billCode=null;
         // this.initData();
+        this.jumpToNewOrder();
+      })
+      .catch(action => {
+         if (action === 'cancel'){
+            this.jumpToSendOrderList();
+         }
      });
   },
   jumpToNewOrder(){

src/views/oms/emisWaybill/SendOrderbillList.vue

@@ -110,16 +110,16 @@
             </el-form-item>
 
             <el-form-item label="订单状态" prop="orderStatus">
-              <el-select clearable v-model="queryParams.orderStatus" placeholder="请选择">
+              <el-select v-model="queryParams.orderStatus" clearable placeholder="请选择">
-                <el-option label="未接单" :value="0"></el-option>
+                <el-option
-                <el-option label="已转单" :value="1"></el-option>
+                  v-for="dict in dict.type.emis_order_status"
-                <el-option label="未指派" :value="2"></el-option>
+                  :key="dict.value"
-                <el-option label="已指派" :value="3"></el-option>
+                  :label="dict.label"
-                <el-option label="未揽收" :value="4"></el-option>
+                  :value="dict.value"
-                <el-option label="已揽收" :value="5"></el-option>
+                ></el-option>
-                <el-option label="订单取消" :value="6"></el-option>
               </el-select>
             </el-form-item>
+
             <!-- <el-form-item label="确认状态" prop="blSign">
               <el-select clearable v-model="queryParams.orderStatus" placeholder="请选择">
                 <el-option label="未确认" :value="0"></el-option>
@@ -206,6 +206,8 @@
           storageName="sendWaybillList_main_240702"
            v-loading="loading"
 
+           border
+
            size="mini"
            :data="emisWaybillList"
            :showSearch.sync="showSearch"
@@ -344,7 +346,7 @@
             </template>
       </el-table-column>
       <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/>
-      <el-table-column :label="$t('进仓预报单')" align="center" prop="intoWarehouseBillCode" width="100" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseBillCode" width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" width="100" >
           <template slot-scope="scope">
             <dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
@@ -381,10 +383,10 @@
        </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="intoWarehouseContact" min-width="100" :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="intoWarehousePhone" min-width="100" :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="pickStartDate" min-width="170" :show-overflow-tooltip="true"/>
 
 
        <!-- <el-table-column :label="$t('发件人')" align="center" prop="fjr" width="180" :show-overflow-tooltip="true">
@@ -541,14 +543,14 @@
 
     </XdTable>
 
-    <!-- <el-dialog title="快件跟踪" :visible.sync="openTraceInfo" width="70%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <TraceWaybillDetailView  :key="currentTraceBillCode" :scanBillCode="currentTraceBillCode" :billDetail="currentTraceBillItem"></TraceWaybillDetailView>
-    </el-dialog> -->
 
     <el-dialog title="查看" :visible.sync="openTraceInfo" width="80%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <WaybillDetailReadOnly  :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></WaybillDetailReadOnly>
+      <!-- <WaybillDetailReadOnly  :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></WaybillDetailReadOnly> -->
+      <OrderDetailReadOnly  :key="currentTraceBillCode" :billCode="currentTraceBillCode" ></OrderDetailReadOnly>
     </el-dialog>
 
+
+
     <div>
       <el-image-viewer
              v-if="showViewer"
@@ -613,6 +615,7 @@ import EmisMonthpayAccountPicker from '@/views/oms/EmisBaseTools/EmisMonthpayAcc
 import TraceDetail from '@/views/oms/emisWaybill/TraceDetail.vue';
 
 import WaybillDetailReadOnly from '@/views/oms/emisWaybill/WaybillDetailReadOnly.vue';
+import OrderDetailReadOnly from '@/views/oms/emisWaybill/OrderDetailReadOnly.vue';
 
 // import TraceWaybillDetailView from '@/views/oms/customerService/traceWaybillDetailView.vue';
 // TraceWaybillDetailView,
@@ -645,6 +648,7 @@ export default {
     TraceDetail,
 
     WaybillDetailReadOnly,
+    OrderDetailReadOnly
 
   },
   dicts: ['emis_order_status','emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
@@ -861,18 +865,33 @@ export default {
     };
   },
   created() {
-    // if(this.$store.getters.ownerSiteCode!='88888'){
-    //   this.queryParams.sendSiteCode=this.$store.getters.ownerSiteCode;
-    // }
     const end = new Date()
     const start = new Date()
     start.setHours(0,0,0,0)
     end.setHours(23,59,59,0)
     this.dateRange=[timeFormat(start), timeFormat(end)]
 
+    let statQueryType=this.$route.query.statQueryType;
+    if(statQueryType==1){
+      this.queryParams.blIsQuestion=1;
+    }
+    else if(statQueryType==3){
+      this.queryParams.orderStatus='0';
+    }
+    else if(statQueryType==4){
+      this.queryParams.orderStatus='1';
+      this.queryParams.blSign=0;
+    }
+    else if(statQueryType==5){
+      this.queryParams.waybillStatus='40';
+      this.queryParams.blSign=0;
+    }
+    else if(statQueryType==6){
+      this.queryParams.blSign=1;
+    }
+
     this.queryOrderType="1";
     this.queryOrderDateType="1";
-    // this.queryExpireNotSign="1"
 
     this.getList();
   },