改bug

src/api/ecw/orderCargoControl.js

@@ -108,11 +108,11 @@ export function batchReview(data){
 }
 
 // 获得可调货的控货订单列表
-export function seasoningCondimentsSelect(data){
+export function seasoningCondimentsSelect(params){
   return request({
     url: '/ecw/order-cargo-control-pick/seasoning-condiments/cargo-control/order/select',
-    method: 'put',
-    data
+    method: 'get',
+    params
   })
 }
 

src/views/ecw/order/cargoControl.vue

@@ -118,7 +118,7 @@
           <template v-if="scope.row.cargoControlStatus == 1">
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >查看</el-button>
             <el-button type="text"  size="mini" @click="showTransferCargoOrderId=scope.row.orderId" >调货</el-button>
-            <el-button type="text"  size="mini" @click="$alert('//TODO')">反复核</el-button>
+            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row">反复核</el-button>
           </template>
 
           <!-- <el-button type="text"  size="mini" >取消</el-button>
@@ -136,6 +136,7 @@
     <transfer v-if="showTransferOrder" v-bind="showTransferOrder" @close="showTransferOrder=null" />
     <release  v-if="showReleaseOrderId"  :order-id="showReleaseOrderId"  @close="showReleaseOrderId=null" @success="onReleaseSuccess" />
     <transfer-cargo v-if="showTransferCargoOrderId"     :order-id="showTransferCargoOrderId"     @close="showTransferCargoOrderId=null" />
+    <fallback v-if="showFallbackOrder !== null" :order="showFallbackOrder" :index="null" @close="showFallbackOrder=null" @success="onFallbackSuccess"  />
   </div>
 </template>
 
@@ -150,11 +151,12 @@ import Release from './components/Release'
 import CargoControlEdit from './components/CargoControlEdit'
 import { getCargoControlOrderPage, batchReview } from "@/api/ecw/orderCargoControl"
 import TransferCargo from '@/views/ecw/order/components/TransferCargo'
+import Fallback from './components/Fallback'
 
 export default {
   name: "OrderCargonControl",
   components: {
-    CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo
+    CustomerSelector, ProductSelector, Selector, Transfer, Release,CargoControlEdit, TransferCargo, Fallback
   },
   data() {
     return {
@@ -190,6 +192,7 @@ export default {
       showTransferOrder: null, // 控制权转移操作订单
       showReleaseOrderId: null, // 放货ID
       showTransferCargoOrderId: null, // 调货ID
+      showFallbackOrder: null, // 调货订单
     };
   },
   computed: {
@@ -275,15 +278,22 @@ export default {
     // 批量复核
     batchReview(){
       this.$confirm('确定复核选中的订单么？').then(() => {
-        return batchReview({orderIds: this.ids.join(',')})
+        return batchReview("orderIds=" + this.ids.join(','))
       }).then(() => {
-        this.$message.error('操作成功')
+        this.$message.success('操作成功')
         this.handleQuery()
       })
+    },
+    // 反复核
+    unReview(row){
+      
     },
     onReleaseSuccess(){
       this.showReleaseOrderId = null
       this.handleQuery()
+    },
+    onFallbackSuccess(){
+      this.showFallbackOrder = null
     }
   }
 };

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

@@ -25,7 +25,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="原放货箱数">
-                {{info.pickNum}}
+                {{index == null ? order.releaseNum : info.pickNum}}
             </el-form-item>
           </el-col>
         </el-row>
@@ -37,7 +37,13 @@
         </el-form-item>
 
         <el-form-item label="控货手机号">
-           +{{info.countryCode}} {{info.phone}}
+            <template v-if="index !== null">
+                + {{info.countryCode}} {{info.phone}}
+            </template>
+            <template v-else>
+              +{{order.cargoControlCountryCode}} {{order.cargoControlPhone}}
+            </template>
+           
         </el-form-item>
         <el-form-item label="手机验证码" prop="code">
             <el-input v-model="formData.code" placeholder="" style="width: 100px; margin-right:10px"></el-input>
@@ -82,7 +88,9 @@ export default {
             return t
         },
         info(){
-            return this.order.cargoControlPickBackVOList[this.index]
+            if(this.index !== null)
+                return this.order.cargoControlPickBackVOList[this.index]
+            return this.order
         }
     },
     watch:{