控货详情列表

src/api/ecw/orderCargoControl.js

@@ -190,6 +190,7 @@ export function getReleaseTypeUpdateInfo(orderId) {
   })
 }
 
+//获得控货订单列表查询订单分页
 export function getCargoControlDetailListPage(params) {
   return request({
     url: "/ecw/order-cargo-control-pick/cargo/control/orderDetail",
@@ -197,3 +198,12 @@ export function getCargoControlDetailListPage(params) {
     params
   })
 }
+
+//查询控货订单列表统计
+export function statisticsOrderControl(params) {
+  return request({
+    url: "/ecw/order-cargo-control-pick/cargo/control/statistics",
+    method: "get",
+    params
+  })
+}

src/views/ecw/order/cargoControlDetailList.vue

@@ -23,7 +23,7 @@
           @input="replaceSpace(noParam2, 'value')"
           @keyup.enter.native="getList">
           <template slot="prepend">
-            <dict-selector :type="DICT_TYPE.ORDER_QUERY_NO_FIELD" defaultable v-model="noParam2.key" />
+            <dict-selector :type="DICT_TYPE.ORDER_QUERY_PROD_FIELD" defaultable v-model="noParam2.key" />
           </template>
         </el-input>
       </el-form-item>
@@ -33,58 +33,60 @@
       <el-form-item :label="$t('收货人')" prop="consigneeKey">
         <el-input v-model.trim="queryParams.consigneeKey" :placeholder="$t('收货人')" clearable @keyup.enter.native="getList" class="w-200"/>
       </el-form-item>
-      <el-form-item :label="$t('状态')" prop="status">
-        <dict-selector :type="DICT_TYPE.ECW_RELEASE_STATUS" multiple v-model="queryParams.status" @keyup.enter.native="getList" clearable class="w-200" />
+      <el-form-item :label="$t('状态')" prop="pickStateList">
+        <dict-selector :type="DICT_TYPE.ECW_RELEASE_STATUS" multiple v-model="queryParams.pickStateList" @keyup.enter.native="getList" clearable class="w-200" />
       </el-form-item>
       <el-form-item :label="$t('放货日期')">
         <el-date-picker v-model="dateCreateTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item :label="$t('发货人电话')" prop="consignorPhone">
+      <el-form-item :label="$t('发货人电话')" prop="consignorPhone" v-show="showSearch">
         <el-input v-model.trim="queryParams.consignorPhone" :placeholder="$t('发货人电话')" clearable @keyup.enter.native="getList" @input="queryParams.consignorPhone = queryParams.consignorPhone.replace(/\s+/g, '')" class="w-200"/>
       </el-form-item>
-      <el-form-item :label="$t('收货人电话')" prop="consignorPhone">
+      <el-form-item :label="$t('收货人电话')" prop="consignorPhone" v-show="showSearch">
         <el-input v-model.trim="queryParams.consigneePhone" :placeholder="$t('收货人电话')" clearable @keyup.enter.native="getList" @input="queryParams.consigneePhone = queryParams.consigneePhone.replace(/\s+/g, '')" class="w-200"/>
       </el-form-item>
-      <el-form-item :label="$t('复核日期')">
+      <el-form-item :label="$t('复核日期')" v-show="showSearch">
         <el-date-picker v-model="checkTime" style="width: 240px" value-format="yyyy-MM-dd"
                         type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
-      <el-form-item :label="$t('控货状态')" prop="cargoControlStatusList">
+      <el-form-item :label="$t('控货状态')" prop="cargoControlStatusList" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.CONTROL_GOODS_STATUS" multiple v-model="queryParams.cargoControlStatusList" clearable class="w-200" />
       </el-form-item>
-      <el-form-item :label="$t('订单状态')" prop="statusList">
+      <el-form-item :label="$t('订单状态')" prop="statusList" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ORDER_STATUS" multiple v-model="queryParams.statusList" clearable class="w-200" />
       </el-form-item>
-      <el-form-item :label="$t('运输方式')" prop="dynamicTransportIdList">
+      <el-form-item :label="$t('运输方式')" prop="dynamicTransportIdList" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" multiple v-model="queryParams.dynamicTransportIdList" clearable class="w-200" />
       </el-form-item>
-      <el-form-item :label="$t('始发仓')" prop="consignorPhone">
+      <el-form-item :label="$t('始发仓')" prop="consignorPhone" v-show="showSearch">
         <el-select v-model="queryParams.startWarehouseIds" multiple :placeholder="$t('请选择始发仓')" clearable>
           <el-option v-for="item in exportWarehouseList" :label="$l(item, 'title')" :value="item.id" :key="item.id"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('目的国')" prop="destCountryIds">
+      <el-form-item :label="$t('目的国')" prop="destCountryIds" v-show="showSearch">
         <el-select v-model="queryParams.destCountryIds" multiple :placeholder="$t('请选择目的国')" clearable>
           <el-option v-for="item in AddressProvince" :key="item.guojia" :label="item.guojiaName" :value="item.guojia"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('目的城市')" prop="destCityIds">
+      <el-form-item :label="$t('目的城市')" prop="destCityIds" v-show="showSearch">
         <el-select v-model="queryParams.destCityIds" multiple :placeholder="$t('请选择目的城市')" style="width: 200px" clearable>
           <el-option v-for="item in AddressCity" :key="item.shi" :label="item.shiName" :value="item.shi"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item :label="$t('出货渠道')" prop="shippingChannelIdList">
+      <el-form-item :label="$t('出货渠道')" prop="shippingChannelIdList" v-show="showSearch">
         <el-select v-model="queryParams.shippingChannelIdList" multiple :placeholder="$t('请选择出货渠道')" clearable>
           <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
         </el-select>
       </el-form-item>
-      <div class="flex pb-20">
+      <div class="flex pb-20" v-show="showSearch">
         <dict-selector :type="DICT_TYPE.ECW_BEGINTIME_TYPE_ENDTIME"  v-model="dateFilterType" defaultable class="w-200 mr-5" />
         <el-date-picker v-model="dateFilter" type="datetimerange" range-separator="-" :start-placeholder="$t('开始日期')" :end-placeholder="$t('结束日期')" value-format="yyyy-MM-dd HH:mm:ss" @change="getList"> </el-date-picker>
+      </div>
+      <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="getList" :loading="loading" class="ml-10">{{ $t("搜索") }}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{ $t("重置") }}</el-button>
-      </div>
+      </el-form-item>
     </el-form>
 
     <!-- 操作工具栏 -->
@@ -180,7 +182,8 @@ import {
   cancel,
   cancelApproval,
   getCargoControlDetailListPage,
-  getPickRleaseInfo
+  getPickRleaseInfo,
+  statisticsOrderControl
 } from "@/api/ecw/orderCargoControl"
 import { parseTime } from "@/utils/ruoyi"
 import Fallback from "./components/Fallback"
@@ -296,6 +299,9 @@ export default {
         this.total = response.data.total;
         this.loading = false;
       });
+      statisticsOrderControl(params).then(response => {
+        this.statistics = response.data
+      });
     },
     sortChange(obj) {
       if(obj.order==null) {
@@ -316,6 +322,8 @@ export default {
       }
       this.noParam.value = ""
       this.noParam2.value = ""
+      this.dateFilter = []
+      this.checkTime = []
       this.getList()
     },
     review(id) {