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

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,15 +240,36 @@ 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/order/detail.vue

@@ -7,8 +7,7 @@
         <template v-else-if="order.containerNumber"> - {{order.containerNumber}}</template>
       </div>
       <el-row :gutter="24">
-        <el-col :span="12" v-if="order.consignorVO" style="position: relative;">
-           <span style="color:#409EFF;position: absolute;left:160px;top:0;font-size:16px" @click="consigneeChange">{{consigneeText}}</span>
+        <el-col :span="12" v-if="order.consignorVO">
           <el-descriptions class="margin-top" border :title="$t('发货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('中文名称')">{{order.consignorVO.name}}</el-descriptions-item>
              <!-- v1.7新增 -->
@@ -32,7 +31,8 @@
               </el-descriptions-item>
             </el-descriptions>
         </el-col>
-        <el-col :span="12" v-if="order.consigneeVO">
+        <el-col :span="12" v-if="order.consigneeVO" style="position: relative;">
+          <span style="color:#409EFF;position: absolute;right:40px;top:0;font-size:16px;cursor: pointer;" @click="consigneeChange">{{consigneeText}}</span>
           <el-descriptions class="margin-top" border :title="$t('收货人')" :column="3" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
             <el-descriptions-item :label="$t('中文名称')">{{order.consigneeVO.name}}</el-descriptions-item>
              <!-- v1.7新增 -->
@@ -64,7 +64,7 @@
       </el-row>
     </el-card>
     <el-card class="card">
-      <el-descriptions border :title="$t('物流信息')" :column="4">
+      <el-descriptions border :title="$t('物流信息')" :column="4" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('始发仓')">{{$l(order.logisticsInfoDto, 'startTitle')}}</el-descriptions-item>
         <el-descriptions-item :label="$t('目的仓')">{{$l(order.logisticsInfoDto, 'destTitle')}}</el-descriptions-item>
         <!-- <el-descriptions-item :label="$t('地址')" :span="2">{{order.logisticsInfoDto.startAddressZh}}</el-descriptions-item> -->
@@ -76,7 +76,7 @@
     </el-card>
 
     <el-card class="card">
-      <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2">
+      <el-descriptions class="mr-10" border :title="$t('基础信息')" :column="2" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('唛头')">{{order.marks}}</el-descriptions-item>
         <el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{order.deliveryDate}}</el-descriptions-item>
         <el-descriptions-item :label="$t('是否控货')">
@@ -107,9 +107,7 @@
           <dict-tag :type="DICT_TYPE.ECW_CUSTOMS_TYPE" :value="order.customsType" />
         </el-descriptions-item>
       </el-descriptions>
-      <el-collapse v-model="activeNames" @change="handleChange" >
-        <el-collapse-item  :title="showText" name="1">
-          <el-descriptions class="mr-10" border :column="2">
+      <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('出单方式')">
             <dict-tag :type="DICT_TYPE.ECW_SUING_METHOD" :value="order.issuingMethod" />
           </el-descriptions-item>
@@ -145,8 +143,6 @@
             {{order.createTime|parseTime}}
           </el-descriptions-item>
         </el-descriptions>
-          </el-collapse-item>
-        </el-collapse>
 
     </el-card>
     <el-card class="card">
@@ -467,7 +463,7 @@ export default {
       activeNames: [],//显示隐藏订单基本信息
       showText:this.$t('显示更多'),
       showMore:false,
-      consigneeText:this.$t('展示'),
+      consigneeText:this.$t('更多'),
     }
   },
   computed:{
@@ -552,7 +548,7 @@ export default {
     //订单信息显示更多
     consigneeChange(){
       this.showMore = !this.showMore;
-      this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('展示')
+      this.consigneeText = this.showMore? this.$t('隐藏') : this.$t('更多')
     },
     // 显示费用详情
     showFeeDetail(row, type){