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

src/api/ecw/boxSea.js

@@ -520,10 +520,11 @@ export function deleteSection(id) {
  * @param {*} id
  * @return {*}
  */
-export function deleteGoods(id) {
+export function deleteGoods(params) {
   return request({
-    url: "/ecw/box-preload-goods/delete?ids=" + id.join(","),
+    url: "/ecw/box-preload-goods/delete",
     method: "delete",
+    params
   });
 }
 

src/utils/request.js

@@ -109,6 +109,9 @@ service.interceptors.response.use(res => {
     } else if (code === 566) {
       // 额外情况
       return Promise.reject(res.data)
+    } else if (code === 666) {
+      // 额外情况
+      return Promise.reject(res.data)
     } else if (code !== 200) {
       Notification.error({
         title: msg

src/views/ecw/box/shippingSea/nodePage/cabinet/startPacking.vue

@@ -535,6 +535,26 @@ export default {
         serviceMsg(res, this).then(() => {
           this.getLoadSecGoodsList();
         });
+      }).catch((res) => {
+        if (res.code === 666) {
+              this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  remove({ ...params, deleteType: 2 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.getLoadSecGoodsList();
+                    });
+                  });
+                })
+                .catch((_) => {
+                  remove({ ...params, deleteType: 1 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.getLoadSecGoodsList();
+                    });
+                  });
+                });
+            }
       });
     },
     /* 修改柜信息 */

src/views/ecw/box/shippingSea/nodePage/preinstall.vue

@@ -737,11 +737,33 @@ export default {
       if (type === "row") {
         ids.push(data.id);
       }
-
-      deleteGoods(ids).then((res) => {
+      let param = {
+        ids: ids.join(",")
+      }
+      deleteGoods(param).then((res) => {
         serviceMsg(res, this).then(() => {
           this.queryAllData();
         });
+      }).catch((res) => {
+        if (res.code === 666) {
+              this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  deleteGoods({ ...param, deleteType: 2 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    });
+                  });
+                })
+                .catch((_) => {
+                  deleteGoods({ ...param, deleteType: 1 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.queryAllData();
+                    });
+                  });
+                });
+            }
       });
     },
     /* 查询所有数据 */

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -240,14 +240,35 @@ export default {
         type: "warning",
       })
         .then((_) => {
-          tallyRemove({
+          let param = {
             orderIdLIst: orderIds,
             shipmentId: this.shipmentObj.id,
-          }).then((res) => {
+          }
+          tallyRemove(param).then((res) => {
             serviceMsg(res, this).then(() => {
               this.getList();
             });
-          });
+          }).catch((res) => {
+        if (res.code === 666) {
+              this.$confirm(res.msg+this.$t('是否需要一起移出?'), this.$t("提示"), {
+                type: "warning",
+              })
+                .then((_) => {
+                  tallyRemove({ ...param, deleteType: 2 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.getList();
+                    });
+                  });
+                })
+                .catch((_) => {
+                  tallyRemove({ ...param, deleteType: 1 }).then((res) => {
+                    serviceMsg(res, this).then(() => {
+                      this.getList();
+                    });
+                  });
+                });
+            }
+      });
         })
         .catch((_) => {});
     },

src/views/ecw/offer/create.vue

 <script>
 // 对edit组件复用并更名，防止keepalive缓存数据
 import edit from './edit.vue'
-edit.name = 'OfferCreate'
+edit.name = 'EcwOfferCreate'
 export default edit
-</script>
+</script>
\ No newline at end of file

src/views/ecw/order/create.vue

 <script>
 // 对edit组件复用并更名，防止keepalive缓存数据
 import edit from './edit.vue'
-edit.name = 'OrderCreate'
+edit.name = 'EcwOrderCreate'
 export default edit
-</script>
+</script>
\ No newline at end of file

src/views/ecw/order/splitApply.vue

@@ -426,7 +426,7 @@ export default {
       }
       splitItemUpdate(row).then(() => {
         this.$message.success(this.$t('修改成功'))
-      }).catch(() => {
+      }).finally(() => {
         this.getList()
       })
     },
@@ -537,6 +537,8 @@ export default {
       })
       // 2. 遍历商品项 对比数据是否符合
       let prods = [] // 数据不符合要求的商品
+      // 挂在到window测试
+      window.orderData = this.orderData
       this.orderData.orderItemVOList.forEach(item => {
         if(!item.splitSum){
           prods.push(this.$l(item, 'prodTitle'))