Merge branch 'pre-release' into 'jd_dev'

Pre release合并到jd分支20241219

See merge request !108

src/views/ecw/order/detail.vue

@@ -124,6 +124,8 @@
         <el-descriptions-item :label="$t('特殊要求备注')">
           {{ order.packageRemarks }}
         </el-descriptions-item>
+      </el-descriptions>
+      <el-descriptions class="mr-10" border :column="2" :class="showMore?'showInfo':'hiddenInfo'" :labelStyle="{width:'110px'}" :contentStyle="{width:'150px'}">
         <el-descriptions-item :label="$t('到仓数据')"> {{ order.checkNum }}{{ $t("箱") }} {{ order.checkWeight }}Kg {{ order.checkVolume }}m³ {{ order.checkQuantity }}{{ $t("个") }} </el-descriptions-item>
         <el-descriptions-item :label="$t('提货数据')"> {{ order.pickNum }} {{ $t("箱") }} {{ order.pickRatio }}% </el-descriptions-item>
         <el-descriptions-item :label="$t('送货时间')" v-if="!order.isExternalWarehouse">{{ order.deliveryDate }}</el-descriptions-item>

src/views/ecw/order/index.vue

@@ -340,7 +340,10 @@
               <el-dropdown-menu slot="dropdown">
                 <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核或者是卸柜到仓 ， shipmentState==307 表示已预装，待封柜， shipmentState==407 表示已预装，待封柜）-->
                 <template
-                  v-if="scope.row.shipmentState > 0 && scope.row.inWarehouseState == 0 && exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409,411])"
+                  v-if="scope.row.abnormalState > 0 && scope.row.shipmentState > 0 &&
+                  scope.row.inWarehouseState == 0  &&
+                  exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32])  &&
+                  exclude(scope.row.shipmentState, [305, 307, 309, 310, 311, 313, 407,409,411])"
                 >
                   <el-dropdown-item
                     @click.native="handleUpdate(scope.row)"
@@ -355,6 +358,7 @@
                       (scope.row.status == 12 &&
                         scope.row.shipmentState == 314)) &&
                     !scope.row.abnormalState &&
+                    exclude(scope.row.auditType, [1, 2, 3, 4, 5, 6, 11, 23, 28, 31, 32])  &&
                     exclude(scope.row.inWarehouseState, [204, 205, 206]) &&
                     exclude(scope.row.shipmentState, [305, 307, 407])
                   "