Merge branch 'dev' of http://gitlab.jdshangmen.com/jiedao-app/jiedao-app-operator into dev

src/views/ecw/order/edit.vue

@@ -88,19 +88,6 @@
                     <dict-selector :type="DICT_TYPE.ECW_TRANSPORT_TYPE" v-model="form.transportId" formatter="number"
                                    clearable/>
                 </el-form-item>
-
-                <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'">
-                  <!--嵌套一个form来脱离disabled控制-->
-                  <el-form>
-                    <selector
-                      v-model="form.channelId"
-                      :options="channelList"
-                      value-field="channelId"
-                      :label-field="$l(null, 'name')"
-                      clearable
-                      ></selector>
-                  </el-form>
-                </el-form-item>
             </div>
             <div class="form-section">
                 <el-form-item :label="$t('始发城市')" prop="departureId" :disabled="false">
@@ -126,6 +113,20 @@
                     </option>
                 </select>
             </div>
+            <div class="form-section mt-10">
+              <el-form-item :label="$t('出货渠道')" prop="channelId" v-if="getDictData(DICT_TYPE.ECW_TRANSPORT_TYPE, form.transportId).cssClass == 'channel'">
+                <!--嵌套一个form来脱离disabled控制-->
+                <el-form>
+                  <selector
+                    v-model="form.channelId"
+                    :options="channelList"
+                    value-field="channelId"
+                    :label-field="$l(null, 'name')"
+                    clearable
+                  ></selector>
+                </el-form>
+              </el-form-item>
+            </div>
             <!--目的港清关：选择专线空运才显示，默认选中我司
             我司选中后，按钮下方显示“多票”和“单票”的操作，默认选中多票。
             客户选中后，按钮下方显示“单票”的操作，默认选中，无需点击-->

src/views/ecw/order/stocking/components/ChooseOrderProducts.vue

@@ -121,9 +121,9 @@ export default {
       // 如果某条入仓记录下的箱明细被全部选中了，则需要将他的快递单号和影像带过去
       const expressNos = []
       const pictureUrls = []
-      this.orderItemDetails.forEach(warehouseIn => {
+      this.orderItemDetails.forEach((warehouseIn, index) => {
         // 本条入仓记录被选中的明细数
-        const selectedCount = arr.filter(item => item.warehouseInId == warehouseIn.id).length
+        const selectedCount = this.multipleSelection.filter(item => item.warehouseInId == warehouseIn.id).length
         if(selectedCount == warehouseIn.orderWarehouseInCommonAttrVOList?.length){
           if(warehouseIn.expressNo){
             expressNos.push(warehouseIn.expressNo)

src/views/ecw/order/stocking/components/Package.vue

@@ -727,8 +727,9 @@ export default {
       if(window.ChooseOrderProductsExpressNos?.length){
         // 去重追加
         window.ChooseOrderProductsExpressNos?.forEach(no => {
-          if(row.expressNo.indexOf(no) === -1){
-            row.expressNo += "," + no
+          if(!row.expressNo || row.expressNo.indexOf(no) === -1){
+            if(row.expressNo?.length) row.expressNo += ","
+            row.expressNo += no
           }
         })
 

src/views/ecw/productPrice/batchEditAir.vue

@@ -313,7 +313,12 @@ export default {
         item[data.field] = data.value
         if(item.packagingList?.length){
           item.packagingList.forEach(p => {
-            p[data.field] = data.value
+            if(data.field.indexOf("PriceUnit") > -1){
+              p['packagingPriceUnit'] = data.value
+            }
+            if(data.field.indexOf("VolumeUnit") > -1){
+              p['packagingVolumeUnit'] = data.value
+            }
           })
         }
         if(item.specialList?.length){