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

src/views/ecw/order/prepayDeal.vue

@@ -112,7 +112,11 @@
             <!-- {{orderExceptionData.orderExceptionDescVO?orderExceptionData.orderExceptionDescVO.descZh:'无'}} -->
             {{$l(orderExceptionData.orderExceptionDescVO, 'desc')}}
           </el-form-item>
-          <el-button v-if="orderExceptionData.orderExceptionType=='order_pay_exception'&&orderExceptionData.orderExceptionStatus!=2" type="primary" plain icon="el-icon-plus" style="margin-left: 200px;"  @click="handleAdd">{{ $t('新增收款单') }}</el-button>
+          <div style="display: inline-block;line-height:32px;font-size:14px" v-if="orderExceptionData.orderExceptionType=='order_pay_exception'">
+            <span style="color:red">{{$t('注意:收款后无法修改备货信息,请先联系仓库确认订单备货完成')}}</span>
+            <el-button v-if="orderExceptionData.orderExceptionStatus!=2"  type="primary" plain icon="el-icon-plus" style="margin-left: 20px;"  @click="handleAdd">{{ $t('新增收款单') }}</el-button>
+          </div>
+
         </el-row>
         <el-row v-if="orderExceptionData.orderExceptionDetails">
           <el-form-item :label="$t('详细内容')+':'">