待出备货和异常列表增加特需筛选

src/views/ecw/order/exception/index.vue

@@ -108,6 +108,13 @@
             <el-option :label="$t('自有仓')" :value="0"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item :label="$t('特需')" prop="packageType">
+          <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
+            <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
+              <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
+            </template>
+          </el-select>
+        </el-form-item>
       </el-row>
       <el-row>
         <el-form-item label="">
@@ -254,7 +261,7 @@
           <el-button v-else-if="scope.row.orderExceptionType=='in_warehousing_diff_exception'" v-hasPermi="['ecw:exception:inWarehousingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='stock_up_exception'" v-hasPermi="['ecw:exception:stockUpException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
           <el-button v-else-if="scope.row.orderExceptionType=='channel_exception'" v-hasPermi="['ecw:exception:channelException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
-          <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>        
+          <el-button v-else-if="scope.row.orderExceptionType=='channel_packaging_overweight_exception'" v-hasPermi="['ecw:exception:channelPackagingException']" size="mini" type="text" icon="el-icon-edit" @click="handEdit(scope.row.orderId)">{{$t('处理')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -273,10 +280,12 @@ import {listServiceUser,userList} from "@/api/system/user"
 import CustomerSelector from '@/components/CustomerSelector'
 import ProductSelector from '@/components/ProductSelector'
 import {getWarehouseList} from '@/api/ecw/warehouse'
+import Template from "@/views/cms/template/index.vue";
 
 export default {
   name: "EcwOrderException",
   components: {
+    Template,
     CustomerSelector,ProductSelector
   },
   data() {
@@ -343,6 +352,10 @@ export default {
       this.list = []
       // 处理查询参数
       let params = {...this.queryParams}
+      if(params.packageTypeArr && params.packageTypeArr.length){
+        params.packageType = params.packageTypeArr.join(',')
+        delete params.packageTypeArr
+      }
       // 执行查询
       getOrderExceptionPage(params).then(response => {
         this.list = response.data.list;

src/views/ecw/order/penddingList.vue

@@ -95,6 +95,13 @@
       <el-form-item :label="$t('出货渠道')" prop="number">
         <selector :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector>
       </el-form-item>
+      <el-form-item :label="$t('特需')" prop="packageType">
+        <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
+          <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
+            <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -369,8 +376,12 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      const query = {...this.combinedQueryParams}
+      if(query.packageTypeArr && query.packageTypeArr.length){
+        query.packageType = query.packageTypeArr.join(',')
+      }
       // 执行查询
-      waitingShipmentPage(this.combinedQueryParams).then(response => {
+      waitingShipmentPage(query).then(response => {
         // 部分情况下，订单后面的操作下拉菜单会显示按钮，但是下来没有选项，在elTable组件更新的时候会导致渲染错误，所以要在更新渲染前清空一次list让table彻底重新渲染，避免部分更新导致异常
         this.list = []
         this.$nextTick(() => {

src/views/ecw/order/stockingList.vue

@@ -95,6 +95,13 @@
       <el-form-item :label="$t('出货渠道')" prop="number">
         <selector :options="channelList" :label-field="$l('name')" value-field="channelId" v-model="queryParams.channelId"></selector>
       </el-form-item>
+      <el-form-item :label="$t('特需')" prop="packageType">
+        <el-select v-model="queryParams.packageTypeArr" multiple :placeholder="$t('请选择')" clearable >
+          <template v-for="item in getDictDatas(DICT_TYPE.ORDER_SPECIAL_NEEDS)">
+            <el-option :label="$l(item, 'label')" :value="item.value"></el-option>
+          </template>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{$t('搜索')}}</el-button>
         <el-button icon="el-icon-refresh" @click="resetQuery">{{$t('重置')}}</el-button>
@@ -213,9 +220,11 @@ import {getWarehouseList} from '@/api/ecw/warehouse'
 import { getCurrencyPage } from "@/api/ecw/currency";
 import SplitRevoke from "@/views/ecw/order/components/SplitRevoke";
 import {getChannelList} from "@/api/ecw/channel";
+import Template from "@/views/cms/template/index.vue";
 export default {
   name: "EcwOrderStockinglist",
   components: {
+    Template,
     UserSelector,
     FeeApplication,
     BatchSingleApplication,
@@ -305,8 +314,12 @@ export default {
     /** 查询列表 */
     getList() {
       this.loading = true;
+      const query = {...this.combinedQueryParams}
+      if(query.packageTypeArr && query.packageTypeArr.length){
+        query.packageType = query.packageTypeArr.join(',')
+      }
       // 执行查询
-      canShipmentPage(this.combinedQueryParams).then(response => {
+      canShipmentPage(query).then(response => {
         // 部分情况下，订单后面的操作下拉菜单会显示按钮，但是下来没有选项，在elTable组件更新的时候会导致渲染错误，所以要在更新渲染前清空一次list让table彻底重新渲染，避免部分更新导致异常
         this.list = []
         this.$nextTick(() => {