拆单和撤销拆单审核

src/views/ecw/box/shippingSea/nodePage/cabinet/splitOrder.vue

@@ -77,7 +77,8 @@
               </el-row>
               <el-row>
                 <span>{{$t('品牌')}}：
-                  <dict-tag :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
+                  <template v-if="scope.row.brandName">{{scope.row.brandName}}</template>
+                  <dict-tag v-else :type="DICT_TYPE.ECW_IS_BRAND" :value="scope.row.brandType" />
                 </span>
                 <span style="margin-left: 10px;">{{$t('箱数')}}：{{scope.row.warehouseInInfoVO ? scope.row.warehouseInInfoVO.cartonsNum : 0 }}</span>
                 <span style="margin-left: 10px;">{{$t('体积')}}：{{scope.row.warehouseInInfoVO ? scope.row.warehouseInInfoVO.volume : 0 }}m³</span>
@@ -285,7 +286,7 @@ export default {
   name: "splitOrder",
   inheritAttrs: false,
   components: {
-    WorkFlow,
+    WorkFlow
   },
   props: {
     currRow: Object,

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

@@ -21,6 +21,11 @@
           {{row.sumNum}}{{$t('箱')}}<br/>{{row.sumVolume}}m³<br/>{{row.sumWeight}}kg
         </template>
       </el-table-column>
+      <el-table-column :label="$t('收费统计')">
+        <template slot-scope="{row}">
+          {{row.sumNum}}{{$t('箱')}}<br/>{{row.wvolume}}m³<br/>{{row.vweight}}kg
+        </template>
+      </el-table-column>
       <el-table-column :label="$t('入仓时间')">
         <template slot-scope="{row}">
           {{row.rucangTime|parseTime}}

src/views/ecw/order/splitApply.vue

@@ -242,10 +242,10 @@
              </el-select>
         </el-form-item>
         <el-form-item :label2="$t('剩余箱数')" v-if="mainOrderItem.orderItemId">
-          剩余箱数{{ shopForm.sum || 0 }}，可放入箱数：{{ mainOrderItem.num - 1 }}
+          剩余箱数{{ shopForm.sum || 0 }}<!--，可放入箱数：{{ mainOrderItem.num - 1 }}-->
         </el-form-item>
         <el-form-item :label="$t('放入箱数')">
-           <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right"  :min="1" :max="mainOrderItem.num-1"></el-input-number>
+           <el-input-number v-model="shopForm.num" @change="numChange" controls-position="right"  :min="1" :max="mainOrderItem.num"></el-input-number>
         </el-form-item>
         <el-form-item v-if="quantityshow" :label="$t('放入数量')+'('+$t('个')+')'">
            <el-input-number v-model="shopForm.quantity" controls-position="right" :min="1" :max="mainOrderItem.quantity-1" :placeholder="$t('最多可放入{quantity}', {
@@ -253,24 +253,24 @@
            })"></el-input-number>
         </el-form-item>
         <el-form-item v-if="mainOrderItem.orderItemId">
-          <div>{{ $t('剩余入仓方数') }}：{{ mainOrderItem.volume || 0 }}m³，{{$t('可放入仓方数')}}：{{ (mainOrderItem.volume - 0.01).toFixed(2) }}m³</div>
-          <div>{{$t('剩余收费方数')}}：{{ mainOrderItem.chargeVolume || 0 }}m³，{{$t('可放入收费方数')}}：{{ (mainOrderItem.chargeVolume - 0.01).toFixed(2) }}m³</div>
+          <div>{{ $t('剩余入仓方数') }}：{{ mainOrderItem.volume || 0 }}m³<!--，{{$t('可放入仓方数')}}：{{ (mainOrderItem.volume - 0.01).toFixed(2) }}m³--></div>
+          <div>{{$t('剩余收费方数')}}：{{ mainOrderItem.chargeVolume || 0 }}m³<!--，{{$t('可放入收费方数')}}：{{ (mainOrderItem.chargeVolume - 0.01).toFixed(2) }}m³--></div>
         </el-form-item>
         <el-form-item :label="$t('入仓方数')">
-          <el-input-number v-model="shopForm.volume" controls-position="right"  :min="0" :max="(mainOrderItem.volume - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.volume" controls-position="right"  :min="0" :max="mainOrderItem.volume"></el-input-number>
         </el-form-item>
         <el-form-item :label="$t('收费方数')">
-          <el-input-number v-model="shopForm.chargeVolume" controls-position="right" :min="0" :max="(mainOrderItem.chargeVolume - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.chargeVolume" controls-position="right" :min="0" :max="mainOrderItem.chargeVolume"></el-input-number>
         </el-form-item>
        <el-form-item v-if="mainOrderItem.orderItemId">
-         <div>{{$t('剩余入仓重量')}}：{{ mainOrderItem.weight || 0 }}kg，{{$t('可放入重量')}}：{{ (mainOrderItem.weight - 0.01).toFixed(2) }}kg</div>
-         <div>{{$t('剩余收费重量')}}：{{ mainOrderItem.chargeWeight || 0 }}kg，{{$t('可放入收费重量')}}：{{ (mainOrderItem.chargeWeight - 0.01).toFixed(2) }}kg</div>
+         <div>{{$t('剩余入仓重量')}}：{{ mainOrderItem.weight || 0 }}kg<!--，{{$t('可放入重量')}}：{{ mainOrderItem.weight }}kg--></div>
+         <div>{{$t('剩余收费重量')}}：{{ mainOrderItem.chargeWeight || 0 }}kg<!--，{{$t('可放入收费重量')}}：{{ mainOrderItem.chargeWeight }}kg--></div>
        </el-form-item>
         <el-form-item :label="$t('入仓重量')">
-          <el-input-number v-model="shopForm.weight" controls-position="right"  :min="0" :max="(mainOrderItem.weight - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.weight" controls-position="right"  :min="0" :max="mainOrderItem.weight"></el-input-number>
         </el-form-item>
         <el-form-item :label="$t('收费重量')">
-          <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="(mainOrderItem.chargeWeight - 0.01).toFixed(2)"></el-input-number>
+          <el-input-number v-model="shopForm.chargeWeight" controls-position="right"  :min="0" :max="mainOrderItem.chargeWeight"></el-input-number>
         </el-form-item>
 
         <el-form-item :label="$t('备注信息')+':'">