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

src/views/ecw/currency/index.vue

@@ -214,6 +214,7 @@ export default {
         fuhao: undefined,
         status: undefined,
         huilv: undefined,
+        exchangeToFc: undefined,
         aorder: undefined,
         createAt: undefined,
         updateAt: undefined,

src/views/ecw/order/components/TransferCargo.vue

@@ -152,15 +152,15 @@ export default {
             if(!valid){
               return false
             }
-            // 放货箱数不能大于总控货箱数
+            // 放货箱数不能大于可放货箱数
             let errNos = []
             this.selectedOrders.forEach(item => {
-              if(item.releaseNum > item.sumNum){
+              if(item.releaseNum > item.sumNum - item.releaseNum){
                 errNos.push(item.orderNo)
               }
             })
             if(errNos.length){
-              return this.$message.error(this.$t("订单{no}的放货箱数不能大于控货箱数", {no: errNos.join(",")}))
+              return this.$message.error(this.$t("订单{no}的放货箱数不能大于可放货箱数", {no: errNos.join(",")}))
             }
             updateApply(Object.assign({
               cargoControlPickId: this.cargoControlPickId,

src/views/ecw/order/index.vue

@@ -311,7 +311,7 @@
                 </template>
 
                 <!-- 合单，拆单 -->
-                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206])">
+                <template v-if=" (scope.row.status < 12 || (scope.row.status == 12 && scope.row.shipmentState == 314)) && !scope.row.abnormalState && scope.row.status > 3 && exclude(scope.row.inWarehouseState, [204,205,206,212,213])">
                   <el-dropdown-item @click.native="$router.push(`/order/singleApply?orderNo=${scope.row.orderNo}`)"  v-hasPermi="['ecw:order:merge']">{{$t('合单申请')}}</el-dropdown-item>
                   <el-dropdown-item @click.native="$router.push(`/order/splitApply?orderId=${scope.row.orderId}`)"   v-hasPermi="['ecw:order:split']">{{$t('拆单申请')}}</el-dropdown-item>
                 </template>
@@ -347,7 +347,7 @@
                   </template>
                   <!-- 入仓补充 -->
                   <template v-if="
-                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
+                    include(scope.row.inWarehouseState, [201,202, 202, 210, 202, 211, 202, 214, 215, 216]) &&
                     scope.row.abnormalState != 1 &&
                     include(scope.row.status, [2,3,5,10,9,8])
                     ">
@@ -356,7 +356,7 @@
                   <!-- 入仓修改 -->
                   <template v-if="
                       (
-                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 212, 202, 213, 214, 215, 216, 204, 205]) &&
+                        include(scope.row.inWarehouseState, [201, 202, 207, 202, 209, 210, 202, 211, 202, 214, 215, 216, 204, 205]) &&
                         scope.row.status != 11 && exclude(scope.row.shipmentState, [314,315,317,318])
                       )
                     ">