不可出

src/api/ecw/order.js

@@ -1007,3 +1007,11 @@ export function getWaitingShipmentCount(){
     method: 'get'
   })
 }
+
+// 空运订单不可出
+export function setCanNotShipment(orderId){
+  return request({
+    url: '/air/order/not/can/shipment/' + orderId,
+    method: 'put',
+  })
+}

src/views/ecw/order/index.vue

@@ -268,7 +268,8 @@
               'ecw:order:reduce',
               'ecw:order:commission',
               'ecw:order:heavy',
-              'ecw:order:bulky'
+              'ecw:order:bulky',
+              'ecw:order:setCanNotShipment'
             ]" >
               <el-button type="text">{{$t('操作')}}</el-button>
               <el-dropdown-menu slot="dropdown">
@@ -370,6 +371,11 @@
                 )">
                   <el-dropdown-item @click.native="handleUpdate(scope.row, true)"  v-hasPermi="['ecw:order:update_channel']">{{$t('变更出货渠道')}}</el-dropdown-item>
                 </template>
+
+                <!--不可出-->
+                <template  v-if="include(scope.row.airShipment, [2,3,4])">
+                  <el-dropdown-item @click.native="setCanNotShipment(scope.row)"  v-hasPermi="['ecw:order:setCanNotShipment']">{{$t('不可出')}}</el-dropdown-item>
+                </template>
               </el-dropdown-menu>
             </el-dropdown>
 
@@ -550,7 +556,7 @@ import {
   exportCustomsDatas,
   exportShippingDatas,
   exportShipFee,
-  exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment
+  exportUnload, splitCancelApply, orderSplitRevoke, setCanShipment, setCanNotShipment
 } from "@/api/ecw/order";
 /* import { getDictDatas, DICT_TYPE } from '@/utils/dict'; */
 import PrintTag from './components/PrintTag'
@@ -992,6 +998,14 @@ export default {
         return false
       }
       return true
+    },
+    // 设置空运订单不可出
+    async setCanNotShipment(order){
+      await this.$confirm(this.$t("确定设置订单{orderNo}不可出么？", {orderNo: order.orderNo}))
+      setCanNotShipment(order.orderId).then(res => {
+        this.$message(this.$t('操作成功'))
+        this.getList()
+      })
     }
   }
 };

src/views/ecw/order/stockingList.vue

@@ -179,7 +179,8 @@
 
       <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width actions" width="150px">
         <template slot-scope="scope">
-            <el-button type="text" @click="$router.push('stocking?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:stockingList:stocking']">{{$t('备货')}}</el-button>
+          <el-button type="text" @click="setCanNotShipment(scope.row)"  v-hasPermi="['ecw:order:setCanNotShipment']">{{$t('不可出')}}</el-button>
+          <el-button type="text" @click="$router.push('stocking?id=' + scope.row.orderId)"  v-hasPermi="['ecw:order:stockingList:stocking']">{{$t('备货')}}</el-button>
             <el-button type="text" @click="printTagOrderId=scope.row.orderId" v-hasPermi="['ecw:order:stockingList:print_tag']">{{$t('打印标签')}}</el-button>
         </template>
       </el-table-column>
@@ -204,7 +205,7 @@ import {
   exportReadyStock,
   canShipmentPage,
   orderSpecialNeed,
-  exportCanShipment
+  exportCanShipment, setNotCanShipment, setCanNotShipment
 } from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
@@ -391,6 +392,14 @@ export default {
         this.getList()
       })
     },
+    // 设置空运订单不可出
+    async setCanNotShipment(order){
+      await this.$confirm(this.$t("确定设置订单{orderNo}不可出么？", {orderNo: order.orderNo}))
+      setCanNotShipment(order.orderId).then(res => {
+        this.$message(this.$t('操作成功'))
+        this.getList()
+      })
+    }
   }
 };
 </script>