备货打包等

src/utils/dict.js

@@ -120,7 +120,8 @@ export const DICT_TYPE = {
   ECW_CUSTOMER_TRANSPORT_TYPE: 'customer_transport_type', // 客户出货渠道（跟运输方式相同，但是显示全部）
   ECW_ORDER_APPROVAL_TYPE: 'order_approval_type', // 订单相关审批类型
   ECW_FEE_SOURCE: 'fee_source', // 费用来源
-  STOCK_UP_EXCEPTION_TYPE: 'stock_up_exception_type', // 备货异常类型
+  STOCK_UP_EXCEPTION_TYPE: 'stock_up_exception_type', // 备货异常类型,
+  ORDER_ITEM_PACK_STATUS: 'order_item_pack_status', // 空运备货打包状态
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/order/penddingList.vue

@@ -192,7 +192,7 @@
           <dict-selector v-model="batchExceptionForm.manualExceptionType" form-type="checkbox" :type="DICT_TYPE.MANUAL_EXCEPTION_TYPE" multiple ></dict-selector>
         </el-form-item>
         <el-form-item :label="$t('附件')">
-          <image-upload v-model="batchExceptionForm.exceptionUrls"></image-upload>
+          <image-and-video-upload v-model="batchExceptionForm.exceptionUrls"></image-and-video-upload>
         </el-form-item>
         <el-form-item :label="$t('详细信息')">
           <el-input v-model="batchExceptionForm.descZh" type="textarea"></el-input>
@@ -212,33 +212,7 @@ import ProductSelector from '@/components/ProductSelector'
 import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
 import specialNeeds from '@/views/ecw/order/components/specialNeeds';
-import {
-  createOrder,
-  updateOrder,
-  deleteOrder,
-  getOrder,
-  getOrderPage,
-  exportOrderExcel,
-  orderSpecialNeed,
-  cancelOrder,
-  recoveryOrder,
-  getMyOrderPage,
-  deptOrderPage,
-  orderStatistics,
-  orderMyStatistics,
-  orderDeptStatistics,
-  orderExportSearch,
-  orderExportMySearch,
-  orderExportDeptSearch,
-  exportAbnormal,
-  exportHeavyOrder,
-  exportReturnOrder,
-  exportSaleRepay,
-  exportCustomsDatas,
-  exportShippingDatas,
-  exportShipFee,
-  exportUnload, setCanShipment, canShipmentPage, batchCanShipment, batchException, waitingShipmentPage
-} from "@/api/ecw/order";
+import { setCanShipment, canShipmentPage, batchCanShipment, batchException, waitingShipmentPage } from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -253,6 +227,7 @@ 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 ImageAndVideoUpload from "@/components/ImageAndVideoUpload";
 export default {
   name: "EcwPeddingList",
   components: {
@@ -262,6 +237,7 @@ export default {
     MergeLog,
     PickupLog,
     SplitRevoke,
+    ImageAndVideoUpload,
     CustomerSelector, ProductSelector, Selector,specialNeeds,PrintTag, PrintWarehouseReceipt, PrintLadingBill, BatchPickup,withdrawal
   },
   data() {
@@ -432,6 +408,7 @@ export default {
       this.$refs.batchExceptionForm.validate(valid => {
         if (valid) {
           let params = Object.assign({}, this.batchExceptionForm, {orderIds: this.ids})
+          params.manualExceptionType = params.manualExceptionType.join(',')
           batchException(params).then(res =>{
             this.$message.success(res.message || this.$t('操作成功'))
             this.showBatchException = false

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

@@ -78,16 +78,16 @@
         prop="createTime"
         :label="$t('打包状态')">
         <template v-slot="{row}">
-          待完善
+          <dict-tag :type="DICT_TYPE.ORDER_ITEM_PACK_STATUS" :value="wareItemPackStatus(row.orderItemId)" />
         </template>
       </el-table-column>
       <el-table-column
         prop="address"
         :label="$t('操作')">
         <template v-slot="{ row, column, $index }">
-          <el-button size="mini" type="warning" @click="noNeedPack(row)">{{$t('无需打包')}}</el-button>
-          <el-button size="mini" type="primary" @click="package(row, $t('打包'))">{{$t('打包')}}</el-button>
-          <el-button size="mini" type="primary" @click="package(row, $t('修改打包'))">{{$t('修改打包')}}</el-button>
+          <el-button v-if="row.packStatus == 1" size="mini" type="warning" @click="noNeedPack(row)">{{$t('无需打包')}}</el-button>
+          <el-button v-if="row.packStatus == 1" size="mini" type="primary" @click="package(row, $t('打包'))">{{$t('打包')}}</el-button>
+          <el-button v-else size="mini" type="primary" @click="package(row, $t('修改打包'))">{{$t('修改打包')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -354,6 +354,12 @@ export default {
         return this.orderItemList.find(item => item.orderItemId == orderItemId)
       }
     },
+    // 获取打包状态
+    wareItemPackStatus(){
+      return orderItemId => {
+        return this.wareItem(orderItemId)?.packStatus
+      }
+    },
     title() {
       return this.$i18n.locale === 'en_US' ? this.$route.meta.titleEn : this.$route.name
     },

src/views/ecw/order/stockingList.vue

@@ -220,6 +220,8 @@ export default {
   },
   data() {
     return {
+      // 导出中状态
+      exporting: false,
       // 选中数组
       ids: [],
       // 非单个禁用