diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index c1f726b4..e840d071 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -104,7 +104,7 @@ import { getclearWarehouseCache, getMyCurrentWarehouse, } from '@/api/work/work'; - +import { AddressClosed } from '@/utils/util'; export default { components: { topLock, @@ -137,6 +137,7 @@ export default { filters: {}, created() { + getMyCurrentWarehouse().then(res => { if (res.data.data == null) { console.log('当前没有数据'); @@ -149,18 +150,8 @@ export default { }else{ this.dataName = res.data.data.name;//仓库名字 } - // localStorage.setItem('my_data', JSON.stringify(res.data.data)) }); - // let warehouseName = localStorage.getItem('WarehouseName'); - // // let modifiedName = warehouseName.replace(/"/g, ''); - // if (warehouseName == 'undefined') { - // this.dataName = ''; - // console.log('当前暂时没有参数', this.dataName); - // } else { - // this.dataName = warehouseName; - // console.log(this.dataName, '当前参数存在值'); - // } }, computed: { ...mapGetters([ @@ -218,6 +209,8 @@ export default { this.$message({ message: res.data.msg, type: 'error' }); } } + this.$store.commit('DEL_TAG_CURRENT'); + this.$store.commit('DEL_TAG_OTHER'); }, warehouseChange(val) { console.log(val); diff --git a/src/store/modules/tags.js b/src/store/modules/tags.js index 5b20f51a..fceef25f 100644 --- a/src/store/modules/tags.js +++ b/src/store/modules/tags.js @@ -17,6 +17,7 @@ const navs = { state.tagList.push(action); setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭指定标签 DEL_TAG: (state, action) => { state.tagList = state.tagList.filter(item => { return item.fullPath !== action.fullPath; @@ -27,6 +28,7 @@ const navs = { state.tagList = tagList; setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭除了当前页面的所有页面 DEL_TAG_OTHER: state => { state.tagList = state.tagList.filter(item => { console.log("关闭其他111state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item); @@ -35,6 +37,7 @@ const navs = { console.log("2222state.tagList",state.tagList); setStore({ name: 'tagList', content: state.tagList }); }, + // 关闭当前页面 DEL_TAG_CURRENT: state => { state.tagList = state.tagList.filter(item => { console.log("state.tag.fullPath, website.fistPage.path",state.tag.fullPath, website.fistPage.path,item); diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 1b2f10a1..585dd289 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -1706,6 +1706,17 @@ export default { sortable: true, head: false, }, + { + prop: 'signingUser', + label: '签收人', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'signingTime', label: '签收扫描时间', diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index f66e6e18..82faffe5 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -381,7 +381,9 @@ @@ -570,6 +573,7 @@ import { setNodeHeight, removeZeroWidth } from '@/utils/util.js'; export default { data() { return { + Inventoryloading:true,//库存品加载 packageQuery: {}, orderRow: {}, columnList: [ @@ -2099,7 +2103,9 @@ export default { return true; } }, - handleAddInventory() { + handleAddInventory() { + this.loading = true; + this.Inventoryloading=true;//开启加载效果 let page = this.page; let params = {}; this.query.serviceType = '2'; @@ -2135,14 +2141,15 @@ export default { } this.loading = false; this.selectionClear(); + this.stockListShow = true; - this.$nextTick(() => { const _node = document.querySelector('.stockListShow .maboxhi'); _node.style.transition = 'all 0.3s'; setNodeHeight(_node, '500px'); this.setTableHeight(); + this.Inventoryloading=false;//关闭加载效果 }); } ); @@ -3275,4 +3282,5 @@ input[type='number'] { .footer-container { height: 60px; } + diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 0118f06f..8a941e74 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -202,7 +202,6 @@ slotProps.scope.row.sijiSigningStatus == '司机已签收' && slotProps.scope.row.wenyuanSigningStatus == '文员待审核' " --> -