重货泡货异常添加标准

src/views/ecw/order/weightDeal.vue

@@ -65,6 +65,12 @@
               <span style="margin-right:10px">{{(orderData.vweight||0)+'kg  '}}</span>
               <span>{{(orderData.sumQuantity||0) +$t('个')}}</span>
             </el-descriptions-item>
+            <el-descriptions-item :label="$t('重货标准')" v-if="type=='order_heavy_cargo_exception'">
+                {{orderData.orgWeightUnit||$t('无')}}
+            </el-descriptions-item>
+            <el-descriptions-item :label="$t('泡货标准')" v-else>
+                {{orderData.orgVolumeUnit||$t('无')}}
+            </el-descriptions-item>
         </el-descriptions>
     </el-card>
     <el-card class="card">
@@ -134,7 +140,11 @@
           <el-descriptions-item :label="$t('处理时间')">
               {{parseTime(handlerParams.handlerTime)}}
           </el-descriptions-item>
-          <el-descriptions-item :label="$t('处理结果')">
+          <el-descriptions-item :label="$t('处理结果')" v-if="type=='order_heavy_cargo_exception'">
+              <span v-if="handlerParams.handlerResult=='general_cargo'">{{$t('设为普货')}}</span>
+              <span v-else-if="handlerParams.handlerResult=='process'">{{$t('设为已处理')}}</span>
+          </el-descriptions-item>
+          <el-descriptions-item :label="$t('处理结果')" v-if="type!='order_heavy_cargo_exception'">
               <span v-if="handlerParams.handlerResult=='general_cargo'">{{$t('设为免泡')}}</span>
               <span v-else-if="handlerParams.handlerResult=='process'">{{$t('设为全泡')}}</span>
               <span v-else>{{$t('设为半抛')}}</span>
@@ -146,9 +156,16 @@
     </el-card>
       <div slot="footer" class="dialog-footer">
         <div v-if="list.orderExceptionStatus!=2">
-          <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>
-          <el-button plain type="primary" @click="submit('process')">{{$t('设为全泡')}}</el-button>
-          <el-button v-if="type!='order_heavy_cargo_exception'" plain type="primary" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
+          <div v-if="type=='order_heavy_cargo_exception'">
+            <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为普货')}}</el-button>
+            <el-button plain type="primary" @click="submit('process')">{{$t('设为已处理')}}</el-button>
+          </div>
+          <div v-else>
+            <el-button  type="primary" @click="submit('general_cargo')">{{$t('设为免泡')}}</el-button>
+            <el-button plain type="primary" @click="submit('process')">{{$t('设为全泡')}}</el-button>
+            <el-button  plain type="primary" @click="submit('half_throw')">{{$t('设为半抛')}}</el-button>
+          </div>
+          
         </div>
         <div v-else>
           <el-button plain type="primary" @click="$store.dispatch('tagsView/delCurrentView')">{{$t('返回')}}</el-button>