md

src/views/emis/dashboard.vue

@@ -235,7 +235,7 @@
                   </template>
                 </CardWithHeader> -->
 
-                <CardWithHeader header="日单量趋势(最近15天)"  height="400px">
+                <CardWithHeader header="日单量趋势(最近1个月)"  height="400px">
                   <template v-slot:body>
                     <LineOrderChart :chart-data="orderStateData" />
                   </template>
@@ -463,7 +463,9 @@ export default {
       let qParam={
         sendSiteCode:null,
         params:{
-          sendSiteCode:null
+          sendSiteCode:null,
+          problemQueryType:2,
+          problemQueryIds:'173,170,151',
         }
       }
 

src/views/emis/emisWarehouseIn/panel/WarehouseInPanel.vue

@@ -1,6 +1,6 @@
 <template>
   <XdPageContainer >
-    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="10"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="9">
           <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@@ -90,8 +90,22 @@
                   <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.params.salesmen" ></SalemanPicker>
               </el-form-item>
 
+              <el-form-item label="订单状态" prop="orderStatus">
+                      <el-select v-model="queryParams.params.orderStatus" clearable placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_order_status"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+              <el-form-item label="寄件网点" prop="productType">
+                    <EmisSiteSimplePicker1  v-model="queryParams.params.sendSiteCode"></EmisSiteSimplePicker1>
+              </el-form-item>
+
               <el-form-item label="进仓仓库" prop="intoWarehouseCode">
-                  <EmisSiteSimplePicker1  v-model="queryParams.params.intoWarehouseCode"  ></EmisSiteSimplePicker1>
+                  <EmisSiteSimplePicker1  v-model="queryParams.params.intoWarehouseCode"></EmisSiteSimplePicker1>
               </el-form-item>
         </el-col>
       </el-row>
@@ -223,6 +237,13 @@
         </template>
       </el-table-column>
 
+      <el-table-column :label="$t('订单状态')" align="center" prop="waybillDetail.orderStatus" min-width="80"  :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_order_status" :value="scope.row.waybillDetail.orderStatus"/>
+          </template>
+       </el-table-column>
+      <el-table-column :label="$t('寄件网点')" align="center" prop="waybillDetail.sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
       <el-table-column :label="$t('仓库名称')" align="center" prop="waybillDetail.intoWarehouseName" min-width="80" :show-overflow-tooltip="true"/>
        <el-table-column :label="$t('仓库联系人')" align="center" prop="waybillDetail.intoWarehouseContact" min-width="100" :show-overflow-tooltip="true"/>
        <el-table-column :label="$t('仓库联系电话')" align="center" prop="waybillDetail.intoWarehousePhone" min-width="150" :show-overflow-tooltip="true"/>
@@ -275,7 +296,7 @@ import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePick
 export default {
   name: "emisWarehouseIn",
   components: { elDateSimplePicker,elDateAdvPicker,emisWarehouseInForm,SalemanPicker,EmisSiteSimplePicker1 },
-  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear','emis_order_status',
        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
  ],
@@ -342,6 +363,8 @@ export default {
           sendName:null,
           sendMobile:null,
           sendCompany:null,
+          orderStatus:null,
+          sendSiteCode:null,
           blUploadGoodsPic:null,
           intoWarehouseCode:null
         }
@@ -656,6 +679,7 @@ export default {
           return  v['waybillDetail']['receiveCompany'];
         }
 
+
         if (j === 'waybillDetail.receiveCountryName') {
           return  v['waybillDetail']['receiveCountryName'];
         }
@@ -673,6 +697,10 @@ export default {
         }
 
 
+        if (j === 'waybillDetail.sendSiteName') {
+          return  v['waybillDetail']['sendSiteName'];
+        }
+
         if (j === 'waybillDetail.sendMobile') {
           return "";
         }
@@ -681,6 +709,12 @@ export default {
           return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
         }
 
+        if (j === 'waybillDetail.orderStatus') {
+          return this.selectDictLabel(this.dict.type.emis_order_status,v['waybillDetail']['orderStatus']);
+        }
+
+
+
         if (j === 'waybillDetail.paymentStatus') {
           return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
         }