完善待出订单，备货列表，泡货优惠

src/api/ecw/order.js

@@ -751,7 +751,24 @@ export function splitItemUpdate(data){
 // 可出订单列表
 export function canShipmentPage(params){
   return request({
-    url: 'air/order/can/shipment/page',
+    url: '/air/order/can/shipment/page',
+    method: 'get',
+    params
+  })
+}
+// 待出订单列表
+export function waitingShipmentPage(params){
+  return request({
+    url: '/air/order/waiting/shipment/page',
+    method: 'get',
+    params
+  })
+}
+
+// 备货订单列表
+export function canReadyStockShipmentPage(params){
+  return request({
+    url: '/air/order/can-ready-stock/shipment/page',
     method: 'get',
     params
   })
@@ -765,15 +782,24 @@ export function setCanShipment(orderId){
   })
 }
 // 批量可出
-export function batchCanShipment(ids){
-  throw new Error('接口未出，待完善，以下代码是copilot生成')
+export function batchCanShipment(orderIdList){
   return request({
-    url: '/air/order/can/shipment/batch',
+    url: '/air/order/can/shipment/',
     method: 'put',
-    params: {ids}
+    data: {orderIdList}
   })
 }
 // 批量转异
 export function batchException(ids){
   throw new Error('接口未出，待完善，以下代码是copilot生成')
 }
+
+// 导出备货订单
+export function exportReadyStock(params){
+  return request({
+    url: '/ecw/order/export/ready-stock/search',
+    method: 'get',
+    params,
+    responseType: 'blob'
+  })
+}

src/views/ecw/order/index.vue

@@ -427,6 +427,19 @@
                     <el-dropdown-item @click.native="$router.push({path:'/order/transfer-to-warehouse/' + scope.row.orderId + '/'  + 2 })"  v-hasPermi="['ecw:order:warehouse_arrive']">{{$t('调拨到仓')}}</el-dropdown-item>
                   </template>
 
+                  <!--开始备货-->
+                  <template v-if="
+                      include(scope.row.airShipment, [2])
+                    ">
+                    <el-dropdown-item @click.native="$router.push({path:'/order/stocking?id=' + scope.row.orderId})"  v-hasPermi="['ecw:order:stocking']">{{$t('开始备货')}}</el-dropdown-item>
+                  </template>
+                  <!--修改备货-->
+                  <template v-if="
+                      include(scope.row.airShipment, [3, 4, 10])
+                    ">
+                    <el-dropdown-item @click.native="$router.push({path:'/order/stocking?action=update&id=' + scope.row.orderId})"  v-hasPermi="['ecw:order:stocking_update']">{{$t('修改备货')}}</el-dropdown-item>
+                  </template>
+
                 </el-dropdown-menu>
               </el-dropdown>
             </template>

src/views/ecw/order/penddingList.vue

@@ -237,7 +237,7 @@ import {
   exportCustomsDatas,
   exportShippingDatas,
   exportShipFee,
-  exportUnload, setCanShipment, canShipmentPage, batchCanShipment, batchException
+  exportUnload, setCanShipment, canShipmentPage, batchCanShipment, batchException, waitingShipmentPage
 } from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
@@ -362,7 +362,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      canShipmentPage(this.combinedQueryParams).then(response => {
+      waitingShipmentPage(this.combinedQueryParams).then(response => {
         // 部分情况下，订单后面的操作下拉菜单会显示按钮，但是下来没有选项，在elTable组件更新的时候会导致渲染错误，所以要在更新渲染前清空一次list让table彻底重新渲染，避免部分更新导致异常
         this.list = []
         this.$nextTick(() => {

src/views/ecw/order/special/Preferential.vue

 <template>
   <el-dialog visible :close-on-click-modal="false" :before-close="closeDialog" :title="title">
     <el-form ref="form" :model="form" label-width="120px" :rules="rules">
-      
+
       <!-- 海运是重货，空运是泡货 -->
-      <template v-if="order.transportId === 1 || order.transportId === 2">
+      <template v-if="applyType == 4">
         <el-form-item :label="$t('原重货标准')">
           {{form.orgWVolume}} kg/cbm
         </el-form-item>
@@ -11,7 +11,7 @@
           <el-input v-model="form.wvolume" type="number" class="w-100" /> kg/cbm
         </el-form-item>
       </template>
-      <template v-else>
+      <template v-else-if="applyType == 5">
         <el-form-item :label="$t('原泡货标准')">
           {{form.orgVWeight}} kg
         </el-form-item>
@@ -19,9 +19,17 @@
           <el-input v-model="form.vweight" type="number" class="w-100" /> kg
         </el-form-item>
       </template>
+      <template v-else-if="applyType == 29">
+        <el-form-item :label="$t('现订单泡重')">
+          {{form.orgVWeight}} kg
+        </el-form-item>
+        <el-form-item :label="$t('新订单泡重')" style="width: 400px" prop="clearanceFreight">
+          <el-input v-model="form.vweight" type="number" class="w-100" /> kg
+        </el-form-item>
+      </template>
     </el-form>
     <div class="page-title">{{ $t('审批流程') }}</div>
-    <work-flow xmlkey="special_apply" v-model="ccIdArr" />
+    <work-flow :xmlkey="workFlowKey" v-model="ccIdArr" />
     <div v-if="form.applyStatus != 1">
       <el-button type="primary" @click="handleSubmit">{{ $t('提交') }}</el-button>
     </div>
@@ -29,7 +37,7 @@
       <el-button type="primary" @click="$router.push('/bpm/process-instance/detail?id=' + form.formId)">
         <dict-tag :type="DICT_TYPE.APPLY_STATUS" :value="form.applyStatus" />
       </el-button>
-      
+
       <el-button type="primary" @click="cancelAudit">{{ $t('取消审核') }}</el-button>
       <el-button type="default" @click="closeDialog">{{ $t('返回') }}</el-button>
     </div>
@@ -50,7 +58,7 @@ export default {
   props: {
     order: Object,
     orderItem: Object,
-    applyType: Number // 4是重货优惠5是泡货优惠
+    applyType: Number // 4是重货标准优惠5是泡货标准优惠,29泡货优惠
   },
   components: {
     WorkFlow
@@ -65,7 +73,7 @@ export default {
       // applyType: 2, //1是优惠申请2是管理折扣3是佣金设置4是重货优惠5是泡货优惠
       ccIdArr: [],
       form: {
-        
+
       },
       rules:{
 
@@ -79,7 +87,21 @@ export default {
   },
   computed:{
     title(){
-      return this.applyType == 4 ? this.$t('重货优惠申请') : this.$t('泡货优惠申请')
+      return {
+        4: this.$t('重货标准优惠申请'),
+        5: this.$t('泡货标准优惠申请'),
+        29: this.$t('泡货优惠申请')
+      }[this.applyType]
+      // return this.applyType == 4 ? this.$t('重货优惠申请') : this.$t('泡货优惠申请')
+    },
+    // 流程key
+    workFlowKey(){
+      // 泡货优惠申请审核
+      if(this.applyType == 29){
+        return 'shipment_bulky_cargo'
+      }
+      // 订单特价审核
+      return 'special_apply'
     }
   },
   methods: {

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

@@ -48,7 +48,7 @@
           :formatter="(_, __, v) => parseTime(v)"
           :label="$t('最后操作时间')">
         </el-table-column>
-        
+
         <el-table-column
           :label="$t('原价')">
           <template v-slot="{row}">
@@ -111,7 +111,10 @@
           2.空运专线、海空联运显示泡货优惠  3,4
          -->
         <el-button v-hasPermi="['ecw:order:heavy']" type="primary" @click="showPreferentialType=4" v-if="order.transportId === 1 || order.transportId === 2">{{$t('申请重货优惠')}}</el-button>
-        <el-button v-hasPermi="['ecw:order:bulky']" type="primary" @click="showPreferentialType=5" v-else>{{$t('申请泡货优惠')}}</el-button>
+        <template  v-else>
+          <el-button v-hasPermi="['ecw:order:bulky2']" type="primary" @click="showPreferentialType=29">{{$t('申请泡货优惠')}}</el-button>
+          <el-button v-hasPermi="['ecw:order:bulky']" type="primary" @click="showPreferentialType=5">{{$t('申请泡货标准优惠')}}</el-button>
+        </template>
         <el-button type="primary" @click="$tab.closePage()">{{$t('关闭窗口')}}</el-button>
       </div>
     </el-card>
@@ -122,7 +125,7 @@
     <discount v-if="!!showAllowanceItem" :order="order" :orderItem="showAllowanceItem" @close="showAllowanceItem=null" :applyType="2" @success="onDiscountSuccess" />
     <!-- 佣金规则 -->
     <commission v-if="!!showCommissionItem" :order="order" :orderItem="showCommissionItem" @close="showCommissionItem=null" @success="onCommissionSuccess" />
-    <!-- 重泡货优惠 -->
+    <!-- 重泡货(标准)优惠 -->
     <preferential v-if="!!showPreferentialType" :applyType="showPreferentialType" :order="order" @close="showPreferentialType=null" @success="onPreferentialSuccess" />
   </div>
 </template>

src/views/ecw/order/stockingList.vue

@@ -104,8 +104,8 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button :disabled="!multipleSelection.length" type="primary" plain size="mini" @click="$alert('//TODO')" v-hasPermi="['ecw:order:stockingList:export_selected']">{{$t('导出所选')}}</el-button>
-        <el-button :disabled="!multipleSelection.length" type="primary" plain size="mini" @click="$alert('//TODO')" v-hasPermi="['ecw:order:stockingList:export_search']">{{$t('导出搜索')}}</el-button>
+        <el-button :disabled="!multipleSelection.length" type="primary" :loading="exporting" plain size="mini" @click="exportXls(ids)" v-hasPermi="['ecw:order:stockingList:export_selected']">{{$t('导出所选')}}</el-button>
+        <el-button type="primary" :loading="exporting" plain size="mini" @click="exportXls(queryParams)" v-hasPermi="['ecw:order:stockingList:export_search']">{{$t('导出搜索')}}</el-button>
       </el-col>
     </el-row>
 
@@ -192,7 +192,7 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
 import specialNeeds from '@/views/ecw/order/components/specialNeeds';
 
-import { getOrderPage } from "@/api/ecw/order";
+import {canReadyStockShipmentPage, exportReadyStock, getOrderPage} from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -298,7 +298,7 @@ export default {
     getList() {
       this.loading = true;
       // 执行查询
-      getOrderPage(this.combinedQueryParams).then(response => {
+      canReadyStockShipmentPage(this.combinedQueryParams).then(response => {
         // 部分情况下，订单后面的操作下拉菜单会显示按钮，但是下来没有选项，在elTable组件更新的时候会导致渲染错误，所以要在更新渲染前清空一次list让table彻底重新渲染，避免部分更新导致异常
         this.list = []
         this.$nextTick(() => {
@@ -336,6 +336,15 @@ export default {
       this.ids = selection.map(item => item.orderId)
       this.single = selection.length !== 1
       this.multiple = !selection.length
+    },
+    // 导出
+    exportXls(params){
+      this.exporting = true
+      exportReadyStock(params).then(res => {
+        this.$download.excel(res, this.$t('备货订单') + '.xls');
+      }).finally(() => {
+        this.exporting = false
+      })
     }
   }
 };