修改强制到仓逻辑修改

src/api/ecw/order.js

@@ -1088,8 +1088,9 @@ export function copyOrder(orderId) {
 // 强制到仓
 export function order_warehouse_check_force(data) {
   return request({
-    url: "/order/order-warehouse-check/force/" + data.orderId,
-    method: "post"
+    url: "/order/order-warehouse-check/force/",
+    method: "post",
+    data
   })
 }
 

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -146,7 +146,7 @@
               <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
               <el-button v-if="pageData.boxCustomsBackVO && pageData.boxCustomsBackVO.overMachineStatus == 2 && pageData.boxCustomsBackVO.overMachineAbnormalStatus == 2" plain type="primary" size="small" @click="$router.push('/order/warehousing-update?id=' + scope.row.orderId)">{{ $t("入仓修改 ") }}</el-button>
               <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
-              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
               <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
             </div>
           </template>
@@ -308,8 +308,15 @@ export default {
       })
     },
     order_warehouse_check_force(orderId) {
+      if (!this.ulWarehouseTime) {
+        this.$message.error(this.$t("请选择到仓时间"))
+        return
+      }
       this.$confirm(this.$t("确定要强制到仓么？")).then(async () => {
-        let r = await order_warehouse_check_force({ orderId })
+        let params = {}
+        params.orderId = orderId
+        params.unloadTime = this.ulWarehouseTime
+        let r = await order_warehouse_check_force(params)
         this.getLoadGoodsList()
       })
     },

src/views/ecw/box/shippingSea/nodePage/unloading/startUnloading.vue

@@ -136,7 +136,7 @@
             <div class="btns">
               <el-button type="danger" size="small" @click="openError(scope.row)">{{ $t("异常") }}</el-button>
               <el-button type="primary" size="small" @click="order_warehouse_check_revoke(scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("撤销到仓") }}</el-button>
-              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
+              <el-button type="primary" size="small" @click="order_warehouse_check_force(scope.row.orderId)" v-if="scope.row.inWarehouseState == 0 && scope.row.unloadNum > 0 && scope.row.installNum > scope.row.unloadNum">{{ $t("强制到仓") }}</el-button>
               <el-button type="primary" size="small" @click="$router.push('/order/warehousingTo-update?id=' + scope.row.orderId)" v-if="scope.row.inWarehouseState == 218">{{ $t("到仓修改") }}</el-button>
             </div>
           </template>
@@ -290,8 +290,15 @@ export default {
       })
     },
     order_warehouse_check_force(orderId) {
+      if (!this.ulWarehouseTime) {
+        this.$message.error(this.$t("请选择到仓时间"))
+        return
+      }
       this.$confirm(this.$t("确定要强制到仓么？")).then(async () => {
-        let r = await order_warehouse_check_force({ orderId })
+        let params = {}
+        params.orderId = orderId
+        params.unloadTime = this.ulWarehouseTime
+        let r = await order_warehouse_check_force(params)
         this.getLoadGoodsList()
       })
     },