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

src/api/ecw/boxAir.js

@@ -360,4 +360,19 @@ export function updateAllOrderClearance(data) {
     method: "post",
     data: data
   });
+}
+
+/**
+ * 获取线路配置
+ *
+ * @export
+ * @param {*} data
+ * @return {*}
+ */
+export function getLineInfoList(params) {
+  return request({
+    url: `/ecw/warehouse/getLineInfoList`,
+    method: "get",
+    params
+  });
 }
\ No newline at end of file

src/layout/components/Sidebar/SidebarItem.vue

@@ -56,7 +56,7 @@ export default {
   },
   computed:{
     badge(){
-      return this.$store.getters.badgeData[this.item.meta.badgeField]
+      return this.$store.getters.badgeData[this.item.meta?.badgeField]
     }
   },
   methods: {

src/layout/components/Sidebar/index.vue

@@ -55,11 +55,7 @@ export default {
     }
   },
   created() {
-    // 查询待出订单数量 waitingShipment
-    getWaitingShipmentCount().then(res => {
-      console.log('getWaitingShipmentCount', res.data)
-      this.$store.commit('SET_BADGE_DATA', { waitingShipment: res.data}, )
-    })
+    this.$store.dispatch('getBadgeData')
   }
 };
 </script>

src/store/modules/user.js

@@ -2,6 +2,7 @@ import {login, logout, getInfo, socialLogin, socialLogin2} from '@/api/login'
 import { getToken, setToken, removeToken } from '@/utils/auth'
 import {getNotReadInternalMessageTotal,} from '@/api/system/internalMessage'
 import {taskTodoCount, userMark} from "@/api/bpm/task";
+import {getWaitingShipmentCount} from "@/api/ecw/order";
 
 const user = {
   state: {
@@ -202,6 +203,14 @@ const user = {
           reject(err)
         })
       })
+    },
+    // 获取菜单角标数据，当前只有空运待出
+    getBadgeData({commit}){
+      // 查询待出订单数量 waitingShipment
+      getWaitingShipmentCount().then(res => {
+        console.log('getWaitingShipmentCount', res.data)
+        commit('SET_BADGE_DATA', { waitingShipment: res.data}, )
+      })
     }
   }
 }

src/utils/dict.js

@@ -193,6 +193,7 @@ export const DICT_TYPE = {
   MANUAL_EXCEPTION_TYPE:'manual_exception_type',
   APPLY_STATUS:'apply_status',//特价申请审核状态
   WAREHOUSING_SPECIFICATION_TYPE: 'warehousing_specification_type',
+  WAREHOUSING_RECORD_DETAIL_USAGE: 'warehousing_record_detail_usage', // 入仓规格类型
   ECW_AUTH_TYPE:'auth_type',//品牌授权
   OREER_ITEM_USAGE:'order_item_usage',//用途
 

src/views/ecw/box/indexAir.vue

@@ -206,6 +206,7 @@ import {
   dealCustomsSplitNotify,
   exportPreloadGoodsList, downloadReceivableList, getAirNoticeList, zipDownload, downloadAirReceivableList
 } from '@/api/ecw/box'
+import { getLineInfoList } from '@/api/ecw/boxAir'
 import { getChannelList } from '@/api/ecw/channel'
 import { getWarehouseList } from '@/api/ecw/warehouse'
 import costForm from './costForm.vue'
@@ -393,6 +394,14 @@ export default {
       getboxPage(params).then((response) => {
         this.list = response.data.list
         this.total = response.data.total
+        // var lineParams = []
+        // this.list.forEach(item=>{
+        //   let line = lineParams.findIndex(li=>li.startWarehouseId==item.startWarehouseId&&li.destWarehouseId==item.destWarehouseId&&li.transportType==item.transportType)
+        //   if(line == -1){
+        //     lineParams.push({startWarehouseId:item.startWarehouseId,destWarehouseId:item.destWarehouseId,transportType:item.transportType})
+        //   }
+        // })
+        // getLineInfoList(lineParams)
         this.loading = false
       })
     },

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

@@ -287,6 +287,7 @@ export default {
       remove(params).then((res) => {
         serviceMsg(res, this).then(() => {
           this.getSecGoods();
+          this.getPreLoad();
         });
       }).catch((res) => {
         if (res.code === 666) {
@@ -300,6 +301,7 @@ export default {
                   remove({ ...params, deleteType: 2 }).then((res) => {
                     serviceMsg(res, this).then(() => {
                       this.getSecGoods();
+                      this.getPreLoad();
                     });
                   });
                 })
@@ -308,6 +310,7 @@ export default {
                     remove({ ...params, deleteType: 1 }).then((res) => {
                       serviceMsg(res, this).then(() => {
                         this.getSecGoods();
+                        this.getPreLoad();
                       });
                     });
                   }

src/views/ecw/box/shippingAir/nodePage/preinstall.vue

@@ -46,6 +46,18 @@
         <el-input v-model="queryParams.weightRatioMin" :placeholder="$t('请输入 小')" clearable />
       </el-form-item>
 
+      <el-form-item :label="$t('出货渠道')" prop="shippingChannelId">
+        <el-select v-model="queryParams.shippingChannelId" :placeholder="$t('请选择出货渠道')" @change="selectChannel">
+          <el-option v-for="item in channelList" :label="$l(item, 'name')" :value="item.channelId" :key="item.channelId"></el-option>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item :label="$t('特性')" prop="attrId">
+        <el-select v-model="queryParams.attrId" :placeholder="$t('特性')">
+          <el-option v-for="item in attrIdList" :label="item" :value="item*1" :key="item"></el-option>
+        </el-select>
+      </el-form-item>
+
       <el-form-item prop="airShipment">
         <el-checkbox v-model="queryParams.airShipment" :true-label="4" @change="changeAirShipment">{{$t('已完成备货')}}</el-checkbox>
         <!-- <el-radio v-model="queryParams.airShipment" :label="4">{{$t('已完成备货')}}</el-radio> -->
@@ -157,7 +169,11 @@
                         {{$l(row,'prodTitle')}}
                       </template>
                     </el-table-column>
-                    <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
+                    <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
+                      <template slot-scope="scope">
+                        {{scope.row.warehouseInInfoVO.cartonsNum}}
+                      </template>
+                    </el-table-column>
                     <el-table-column :label="$t('体积') + '/' + $t('重量') + '/' + $t('重货比')" align="center" width="140" prop="volumeWeight">
                       <template slot-scope="scope">
                         <p v-if="scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
@@ -270,7 +286,14 @@
                     <dict-tag :type="DICT_TYPE.BRAND_CUSTOMER_CHARGING_MODEL" :value="row.feeType" />{{ $t('）') }}
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum" />
+                <el-table-column :label="$t('箱数')" align="center" prop="warehouseInInfoVO.cartonsNum">
+                  <template slot-scope="scope">
+                    <span style="color: bule" v-if="scope.row.mixStatus == 1">{{scope.row.warehouseInInfoVO.cartonsNum}}{{$t('(混箱)')}}</span>
+                    <template v-else>
+                      {{scope.row.warehouseInInfoVO.cartonsNum}}
+                    </template>
+                  </template>
+                </el-table-column>
                 <el-table-column :label="$t('体积') +'/' + $t('重量')" align="center" prop="volumeWeight">
                   <template slot-scope="scope">
                     <p v-if="scope.row.warehouseInInfoVO && scope.row.warehouseInInfoVO.volume">{{getTotlContent(scope.row.warehouseInInfoVO,['volume'])}}</p>
@@ -485,6 +508,17 @@ export default {
         }
       };
     },
+    /** 特性 */
+    attrIdList() {
+      let data = []
+      if(this.queryParams.shippingChannelId){
+        let attrs = this.channelList.find(item=>this.queryParams.shippingChannelId == item.channelId)
+        if(attrs){
+          data = attrs.attrId.split(',')
+        }
+      }
+      return data
+    }
   },
   created() {
     // 查询待分拣
@@ -497,6 +531,9 @@ export default {
   methods: {
     formatDate,
     getTotlContent,
+    selectChannel(){
+      this.$set(this.queryParams,'attrId',null)
+    },
     /* 获取城市 */
     importCityName(id) {
       var arr = this.$attrs.warehouseList.filter((item) => item.id == id);

src/views/ecw/box/shippingAir/nodePage/unloading/startUnloading.vue

@@ -82,7 +82,7 @@
         <el-table-column :label="$t('重量')" align="center" prop="weight" />
         <el-table-column :label="$t('订单状态')" align="center" prop="">
           <template slot-scope="scope">
-            {{getOrderError(scope.row, 'orderStatus')}}
+            {{scope.rowstatusMsg}}
           </template>
         </el-table-column>
         <el-table-column :label="$t('异常状态')" align="center" prop="">
@@ -313,7 +313,7 @@ export default {
             copyUserId: this.selectedUsers,
           }).then((res) => {
             serviceMsg(res, this).then(() => {
-              this.cancel();
+              this.cancel("submit");
             });
         });
       }else{

src/views/ecw/order/penddingList.vue

@@ -363,6 +363,7 @@ export default {
   },
   activated(){
     this.getList()
+    this.$store.dispatch('getBadgeData')
   },
   created() {
     this.getList();
@@ -371,6 +372,8 @@ export default {
 
     getCurrencyPage(this.params).then(res => this.currencyList = res.data.list)
     getChannelList().then(res => this.channelList = res.data)
+
+    this.$store.dispatch('getBadgeData')
   },
   methods: {
     /** 查询列表 */

src/views/ecw/order/warehousing/components/WarehouseRecordDetail.vue

@@ -122,6 +122,7 @@ export default {
     },
     handleSave() {
       this.$emit('input', this.dataList)
+      this.dialogVisible = false
     }
   },
 

src/views/ecw/order/warehousing/components/WarehouseRecordDetailItem.vue

@@ -40,6 +40,12 @@
       </el-col>
       <el-col :span="12">
         <el-form-item :label="$t('用途')">
+          <dict-selector
+            v-model="value.usageIds"
+            :type="DICT_TYPE.WAREHOUSING_RECORD_DETAIL_USAGE"
+            multiple
+            form-type="checkbox"
+          ></dict-selector>
         </el-form-item>
       </el-col>
     </el-row>
@@ -70,6 +76,23 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row :gutter="10">
+      <el-col :span="4">
+        <el-form-item :label="$t('快递单号')">
+          <el-input v-model="value.expressNo" />
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item :label="$t('包装类型')">
+          <dict-selector :type="DICT_TYPE.ECW_PACKAGING_TYPE" v-model="value.unit"></dict-selector>
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item :label="$t('数量')">
+          <el-input v-model="value.quantityAll" />
+        </el-form-item>
+      </el-col>
+    </el-row>
   </el-card>
 </template>
 

src/views/ecw/productPrice/edit.vue

@@ -576,7 +576,7 @@ export default {
       let res = await getProductPrice(this.$route.query.id)
       this.$set(this, 'form', res.data)
       // 显示渠道
-      if(this.readonly && this.form.shippingChannelId){
+      if(this.form.shippingChannelId){
         getChannel(this.form.shippingChannelId).then(res => {
           this.channel = res.data
         })