Merge branch 'pre-release' into 'jd_dev'

Pre Release合并到jd分支20241220

See merge request !109

src/views/ecw/box/shippingAir/nodePage/cabinet/supplementOrder.vue

@@ -278,6 +278,7 @@ export default {
       let params = {
         secId: this.partData.id,
         shipmentId: this.$attrs.shipmentObj.id,
+        isTally: this.$attrs.shipmentObj.isTally,
         orderId: item.orderId,
       };
       if (type === "all") {

src/views/ecw/box/shippingAir/nodePage/tally/index.vue

@@ -132,7 +132,6 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="supplementClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
                   <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
                   <el-button :disabled="shipmentObj.approvaling" type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
                   <el-button type="text" size="small" @click="currentTurnExceptionOrder=scope.row">{{$t('转异')}}</el-button>
@@ -143,6 +142,7 @@
         </el-row>
 
         <el-row style="margin-top: 15px" class="operate-button">
+          <el-button size="small" type="primary" @click="supplementClick('supplementOrder',$t('补单'))">{{$t('补单')}}</el-button>
           <el-button :disabled="shipmentObj.approvaling" size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
           <el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
         </el-row>

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

@@ -303,6 +303,7 @@ export default {
         secId: this.partData.id,
         shipmentId: this.$attrs.shipmentObj.id,
         orderId: item.orderId,
+        isTally: this.$attrs.shipmentObj.isTally,
         isCover: 1
       };
       if (type === "all") {

src/views/ecw/box/shippingSea/nodePage/tally/index.vue

@@ -120,7 +120,6 @@
               </el-table-column>
               <el-table-column :label="$t('操作')" align="center" width="160" class-name="small-padding fixed-width" fixed="right">
                 <template slot-scope="scope">
-                  <el-button type="text" size="small" @click="supplementClick('supplementOrder',scope.row)">{{$t('补单')}}</el-button>
                   <el-button type="text" size="small" @click="tallyClick('single',scope.row)">{{$t('理货')}}</el-button>
                   <el-button type="text" size="small" @click="removeClick('single',scope.row)">{{$t('移出')}}</el-button>
                 </template>
@@ -130,6 +129,7 @@
         </el-row>
 
         <el-row style="margin-top: 15px" class="operate-button">
+          <el-button type="small" size="primary" @click="supplementClick('supplementOrder')">{{$t('补单')}}</el-button>
           <el-button size="small" type="primary" @click="tallyFinish">{{$t('完成理货')}}</el-button>
           <el-button size="small" @click="cancel">{{$t('取消')}}</el-button>
         </el-row>

src/views/ecw/order/edit.vue

@@ -1560,7 +1560,6 @@ export default {
               newItem.num = item.num
               newItem.worth = item.worth
               newItem.boxGauge = item.boxGauge
-              newItem.brand = item.brand
               newItem.brandType = item.brandType
             }else {
               newItem = item

src/views/ecw/order/index.vue

@@ -340,7 +340,7 @@
               <el-dropdown-menu slot="dropdown">
                 <!--出货订单编辑,shipmentState > 0表示出货后，inWarehouseState == 0 表示预装未审核或者是卸柜到仓 ， shipmentState==307 表示已预装，待封柜， shipmentState==407 表示已预装，待封柜）-->
                 <template
-                  v-if="scope.row.abnormalState > 0 && scope.row.shipmentState > 0 &&
+                  v-if="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])"
@@ -357,7 +357,6 @@
                     (scope.row.status < 12 ||
                       (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])