Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/api/ecw/order.js

@@ -789,10 +789,6 @@ export function batchCanShipment(orderIdList){
     data: {orderIdList}
   })
 }
-// 批量转异
-export function batchException(ids){
-  throw new Error('接口未出，待完善，以下代码是copilot生成')
-}
 
 // 导出备货订单
 export function exportReadyStock(params){
@@ -803,3 +799,37 @@ export function exportReadyStock(params){
     responseType: 'blob'
   })
 }
+
+// 无需打包
+export function noNeedPack(orderItemId){
+  return request({
+    url: '/order/order-warehouse-in/no-need-to-pack',
+    method: 'get',
+    params: {orderItemId}
+  })
+}
+
+// 完成打包
+export function finishPacked(data){
+  return request({
+    url: '/order/order-warehouse-in/finish-packed',
+    method: 'post',
+    data
+  })
+}
+// 完成备货
+export function finishStock(data){
+  return request({
+    url: '/order/order-warehouse-in/finish-stocked',
+    method: 'put',
+    data
+  })
+}
+// 批量转异
+export function batchException(data){
+  return request({
+    url: '/air/order/manual-exception/batch',
+    method: 'put',
+    data
+  })
+}

src/utils/dict.js

@@ -120,6 +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', // 备货异常类型,
+  ORDER_ITEM_PACK_STATUS: 'order_item_pack_status', // 空运备货打包状态
   //--------ecw---------
   CUSTOMER_STATUS: 'customer_status',
   CUSTOMER_SOURCE: 'customer_source',

src/views/ecw/order/index.vue

@@ -172,7 +172,7 @@
             <span>{{ scope.row.orderNo }}</span>
           </router-link>
           <div style="display: flex;flex-wrap: wrap;" v-if="scope.row.advanceType">
-            <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.label[0]}}</el-button>
+            <el-button @click="deleteSpecial(item.value,scope.row.orderId)" size="mini" style="margin-left: 20px" type="danger" circle v-for="(item,index) in specialRendering(scope.row.advanceType)" :key="index">{{item.symbol}}</el-button>
           </div>
         </template>
       </el-table-column>
@@ -895,10 +895,15 @@ export default {
     moleculeChange() { },
     denominatorChange() { },
     specialRendering(val){
+      console.log('val', val)
       if(val !== undefined){
         let i = val.split(',')
         return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
            return i.indexOf(e.value) > -1
+        }).map(item => {
+          // 打字开头的用最后一个字，否则取第一个字
+          item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
+           return item
         })
       }
     },

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/prepayDeal.vue

@@ -697,6 +697,7 @@
       },
     },
     methods: {
+      getDictData,
       onTableMounted(e){
           // console.warn('onTableMounted', e)
       },

src/views/ecw/order/stockingList.vue

@@ -192,7 +192,7 @@ import { getProductAttrList } from '@/api/ecw/productAttr'
 import CustomerSelector from '@/components/CustomerSelector'
 import specialNeeds from '@/views/ecw/order/components/specialNeeds';
 
-import {canReadyStockShipmentPage, exportReadyStock, getOrderPage} from "@/api/ecw/order";
+import {canReadyStockShipmentPage, exportReadyStock, getOrderPage, orderSpecialNeed} from "@/api/ecw/order";
 import PrintTag from './components/PrintTag'
 import PrintWarehouseReceipt from './components/PrintWarehouseReceipt'
 import PrintLadingBill from './components/PrintLadingBill'
@@ -220,6 +220,8 @@ export default {
   },
   data() {
     return {
+      // 导出中状态
+      exporting: false,
       // 选中数组
       ids: [],
       // 非单个禁用
@@ -280,7 +282,7 @@ export default {
         }
         let queryParams = Object.assign({}, this.queryParams, timeParams)
         return queryParams
-    }
+    },
   },
   activated(){
     this.getList()
@@ -345,7 +347,29 @@ export default {
       }).finally(() => {
         this.exporting = false
       })
-    }
+    },
+    // 特需标识处理
+    specialRendering(val){
+      console.log('val', val)
+      if(val !== undefined){
+        let i = val.split(',')
+        return this.getDictDatas(this.DICT_TYPE.ORDER_SPECIAL_NEEDS).filter(e => {
+          return i.indexOf(e.value) > -1
+        }).map(item => {
+          // 打字开头的用最后一个字，否则取第一个字
+          item.symbol = item.label[0] == '打' ? item.label[item.label.length-1]: item.label[0]
+          return item
+        })
+      }
+    },
+    // 删除特需
+    deleteSpecial(id,orderId){
+      this.$confirm(this.$t('确定删除此特需么?')).then(() => {
+        return orderSpecialNeed({orderId:orderId,advanceType:id})
+      }).then(() => {
+        this.getList()
+      })
+    },
   }
 };
 </script>

src/views/ecw/order/warehousing/components/Warehouse.vue

@@ -202,6 +202,16 @@
 
             </el-form>
           </el-card>
+
+
+          <el-card style="margin-top: 15px;">
+            <div slot="header" class="clearfix">
+              <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+            </div>
+            <div>
+              <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.pictureUrls" ></image-and-video-upload>
+            </div>
+          </el-card>
         </el-tab-pane>
 
 
@@ -407,6 +417,15 @@
             </el-form>
           </el-card>
 
+
+          <el-card style="margin-top: 15px;">
+            <div slot="header" class="clearfix">
+              <span style="font-size: 18px">{{$t('入仓影像')}}</span>
+            </div>
+            <div>
+              <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form1.pictureUrls" ></image-and-video-upload>
+            </div>
+          </el-card>
         </el-tab-pane>
       </el-tabs>
 
@@ -474,11 +493,13 @@ import {orderWarehouseIn, orderWarehouseInUpdateApply} from "@/api/ecw/order"
 import {getProductAttrList} from "@/api/ecw/productAttr"
 import {getProductTypeList} from "@/api/ecw/productType"
 import {addProduct} from "@/api/ecw/product"
+import ImageAndVideoUpload from "@/components/ImageAndVideoUpload/index.vue"
 
 export default {
   name: "Warehouse",
 
   components: {
+    ImageAndVideoUpload,
     ProductSelector,
     WarehouseAreaSelect,
     WorkFlow
@@ -624,7 +645,8 @@ export default {
         prodType: undefined,
         type: undefined,
         feeType: undefined,
-        recordMode: undefined
+        recordMode: undefined,
+        pictureUrls: []
       },
       form1: {
         table: [],
@@ -642,7 +664,8 @@ export default {
         prodType: undefined,
         type: 1,
         feeType: undefined,
-        recordMode: undefined
+        recordMode: undefined,
+        pictureUrls: []
       },
       brandList: [],
       brandList1: [],
@@ -712,6 +735,7 @@ export default {
       this.form.prodType = this.warehousing.prodType
       this.form.type = this.warehousing.type
       this.form.feeType = this.warehousing.feeType
+      this.form.pictureUrls = this.warehousing.pictureUrls
 
       this.warehousing.orderWarehouseInBackItemDoList.forEach(e => {
         let bg = {}

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

@@ -158,15 +158,6 @@
           <span slot="append">kg</span>
         </el-input>
       </el-form-item>
-
-      <el-card style="margin-top: 15px;">
-        <div slot="header" class="clearfix">
-          <span style="font-size: 18px">{{$t('入仓影像')}}</span>
-        </div>
-        <div>
-          <image-and-video-upload :fileSize="50" :isShowTip="true" v-model="form.urls" ></image-and-video-upload>
-        </div>
-      </el-card>
       <div style="text-align: center;margin-top: 15px" v-if="!(order.status !== 3 && isEdit)">
         <el-button @click="escapeBol = true;" type="primary">{{$t('转异')}}</el-button>
         <el-button type="primary" @click="finishVisible = true">{{$t('完成入仓')}}</el-button>
@@ -231,7 +222,6 @@ import PrintTag from "@/views/ecw/order/components/PrintTag"
 import PrintWarehouseReceipt from "@/views/ecw/order/components/PrintWarehouseReceipt"
 import imageUpload from "@/components/ImageUpload";
 import {parseTime} from "@/utils/ruoyi"
-import ImageAndVideoUpload from '@/components/ImageAndVideoUpload'
 import Warehouse from "@/views/ecw/order/warehousing/components/Warehouse"
 export default {
   name: "Warehousing",
@@ -242,7 +232,6 @@ export default {
     PrintTag,
     PrintWarehouseReceipt,
     imageUpload,
-    ImageAndVideoUpload,
     Warehouse
   },