bugs

src/api/ecw/order.js

@@ -346,10 +346,12 @@ export function cancelOrderSpecial(orderApprovalId,data) {
 }
 
 // 获得订单特价申请详情
-export function getOrderSpecial(orderItemId, type = 1) {
+export function getOrderSpecial(orderId, type, params) {
+  console.log(orderId, type, params)
   return request({
-    url: '/ecw/order/special/info/' + orderItemId + '/' + type,
-    method: 'get'
+    url: '/ecw/order/special/info/' + orderId + '/' + type,
+    method: 'get',
+    params
   })
 }
 

src/views/ecw/order/cargoControl.vue

@@ -101,7 +101,8 @@
       </el-table-column>
       <el-table-column :label="$t('控货状态')" align="center" prop="transportId">
         <template slot-scope="{row}">
-          <dict-tag :type="DICT_TYPE.CONTROL_GOODS_STATUS" :value="row.cargoControlStatus" />
+          <template v-if="row.cargoControlStatus == 1 && row.isToReview">放货中</template>
+          <dict-tag v-else :type="DICT_TYPE.CONTROL_GOODS_STATUS" :value="row.cargoControlStatus" />
         </template>
       </el-table-column>
       
@@ -112,23 +113,25 @@
             <el-button type="text"  size="mini" @click="showReleaseOrderId=scope.row.orderId">{{$t('放货')}}</el-button>
             <el-button type="text"  size="mini" @click="showTransferOrder = scope.row" >{{$t('控货权转移')}}</el-button>
           </template>
+
           <!--部分控货-->
           <template v-if="scope.row.cargoControlStatus == 2">
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('修改')}}</el-button>
             <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('取消')}}</el-button>
             <el-button type="text"  size="mini" @click="review(scope.row)" v-if="scope.row.isToReview">{{$t('放货复核')}}</el-button>
           </template>
-          <!--已完成放货-->
-          <template v-if="scope.row.cargoControlStatus == 1">
-            <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button>
-            <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)" >{{$t('调货')}}</el-button>
-            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
+
+          <!--已全部放货，但是未复核-->
+          <template v-if="scope.row.cargoControlStatus == 1 && scope.row.isToReview">
+            <el-button type="text"  size="mini" @click="review(scope.row)">{{$t('放货复核')}}</el-button>
           </template>
 
-          <!-- <el-button type="text"  size="mini" >取消</el-button>
-          
-          <el-button type="text"  size="mini" @click="$router.push('cargo_control/detail?id=' + scope.row.orderId)" >查看</el-button> -->
-          
+          <!--已完成放货,切没有待复核；真正的放货完成-->
+          <template v-if="scope.row.cargoControlStatus == 1 && !scope.row.isToReview">
+            <!-- <el-button type="text"  size="mini" @click="toDetail(scope.row)" >{{$t('查看')}}</el-button> -->
+            <el-button type="text"  size="mini" @click="cargoTransfer(scope.row)" >{{$t('调货')}}</el-button>
+            <el-button type="text"  size="mini" @click="showFallbackOrder=scope.row" v-if="scope.row.isReleaseAfterGoods">{{$t('反复核')}}</el-button>
+          </template>       
           
         </template>
       </el-table-column>

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

@@ -78,6 +78,7 @@ import WorkFlow from '@/components/WorkFlow'
 export default {
   name: "specialDiscount",
   props: {
+    order: Object,
     orderItemId: Number,
   },
   components: {
@@ -128,7 +129,7 @@ export default {
       })
     },
     getOrderSpecial(){
-      getOrderSpecial(this.orderItemId).then(r => {
+      getOrderSpecial(this.order.orderId, 1, {orderItemId: this.orderItemId}).then(r => {
         this.form = r.data
         getProductType(this.form.productType).then(res => {
           this.productType = res.data

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

@@ -115,11 +115,13 @@ export default {
     computed:{
       releaseVolme(){
         return row => {
+          if(!row.releaseNum) return 0
           return new Decimal(row.sumVolume).mul(row.releaseNum).div(row.sumNum).toFixed(2)
         }
       },
       releaseWeight(){
         return row => {
+          if(!row.releaseNum) return 0
           return new Decimal(row.sumWeight).mul(row.releaseNum).div(row.sumNum).toFixed(2)
         }
       }

src/views/ecw/order/index.vue

@@ -253,8 +253,9 @@
               </template>
               <!-- 入仓补充 -->
               <template v-if="
-                include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) ||
-                include(scope.row.abnormalState, [99 ,2 ,3 ,4 ,9 ,10 ,11 ,12 ,14])
+                include(scope.row.inWarehouseState, [201,202, 208, 202, 210, 202, 211, 202, 213, 214, 215, 216]) &&
+                scope.row.abnormalState != 1 &&
+                include(scope.row.status, [2,3,5,10,9,8])
                 ">
                 <el-dropdown-item @click.native="$router.push('/order/warehousing-add?id=' + scope.row.orderId)" v-hasPermi="['ecw:order:update']">{{$t('入仓补充')}}</el-dropdown-item>
               </template>

src/views/ecw/order/special/index.vue

@@ -108,8 +108,7 @@
       </div>
     </el-card>
 
-
-    <special-discount v-if="!!showDiscountItemId" :orderItemId="showDiscountItemId" />
+    <special-discount v-if="!!showDiscountItemId" :order="order" :orderItemId="showDiscountItemId" />
 
   </div>
 </template>