Merge remote-tracking branch 'origin/release' into release

src/views/ecw/deptTarget/allAchievement.vue

@@ -485,10 +485,10 @@
                 // 执行导出
                 this.exportLoading = true;
                 exportDetailExcel(params).then(response => {
-                this.$download.excel(response, `${this.$t('业绩明细')}.xls`);
-
-                this.exportLoading = false;
-                }).catch(() => {
+                  // this.$download.excel(response, `${this.$t('业绩明细')}.xls`);
+                  this.$message.success(this.$t('已加入导出队列，请稍后在下载日志中下载'))
+                }).finally(() => {
+                  this.exportLoading = false;
                 });
             },
             /** 导出按钮操作 */

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

@@ -493,9 +493,9 @@ export default {
         this.$message.success(this.$t('操作成功'))
       })
     },
-    // 退仓
+    // 并箱
     async rollback(orderItem){
-      this.$confirm(this.$l(orderItem, 'prodTitle') + this.$t("退仓后不可恢复，是否确认退仓？"), this.$t('提示')).then(() => {
+      this.$confirm(this.$l(orderItem, 'prodTitle') + this.$t("并箱后不可恢复，是否确认并箱？"), this.$t('提示')).then(() => {
         return rollbackDelete({
           orderId: this.orderId,
           orderItemId: orderItem.orderItemId,

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

@@ -179,11 +179,15 @@ export default {
     handleChooseOrderProducts(data){
       this.showChooseDialog = false
       if(!data?.length) return
-      // 如果第一条是空的，则删除先
-      let firstItem = this.dataList[0]
-      if(!firstItem.prodId && !firstItem.brand && !firstItem.prodAttrIds && !firstItem.material && !firstItem.quantityAll){
-        this.dataList.splice(0, 1)
+      // 如果最后一条是空的，则删除先
+      if(this.dataList?.length){
+        const index = this.dataList.length - 1
+        let lastItem = this.dataList[index]
+        if(!lastItem.prodId && !lastItem.brand && !lastItem.prodAttrIds && !lastItem.material && !lastItem.quantityAll){
+          this.dataList.splice(index, 1)
+        }
       }
+
       data.forEach(item => {
         this.dataList.push({
           "boxGauge": "",