diff --git a/src/api/warehouse/warehouseUpdownGoodsLog.js b/src/api/warehouse/warehouseUpdownGoodsLog.js index b107151b..15f807ef 100644 --- a/src/api/warehouse/warehouseUpdownGoodsLog.js +++ b/src/api/warehouse/warehouseUpdownGoodsLog.js @@ -12,6 +12,29 @@ export const getpage = (current, size, params) => { }) } +export const getinventorypage = (current, size, params) => { + return request({ + url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/inventorypage', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} +export const gettruckloadpage = (current, size, params) => { + return request({ + url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/truckloadpage', + method: 'get', + params: { + ...params, + current, + size, + } + }) +} + export const getDetail = (id) => { return request({ url: '/api/logpm-warehouse/warehouseUpdownGoodsLog/detail', diff --git a/src/page/index/tags.vue b/src/page/index/tags.vue index af4b6617..ff781386 100644 --- a/src/page/index/tags.vue +++ b/src/page/index/tags.vue @@ -39,6 +39,10 @@ + + + + {{ $t('tagsView.menu') }} @@ -189,6 +193,14 @@ export default { }); }); }, + replace(){ + location.replace(location.href) + } }, }; + \ No newline at end of file diff --git a/src/views/basicdata/brand/basicClient.vue b/src/views/basicdata/brand/basicClient.vue index ea5a83aa..4e5baf54 100644 --- a/src/views/basicdata/brand/basicClient.vue +++ b/src/views/basicdata/brand/basicClient.vue @@ -345,6 +345,7 @@ import { getSelect, getLazyTree, getLazyList, getLazyTreeAll } from '@/api/base/ import { getToken } from '@/utils/auth'; import globalc from '@/api/basicdata/globalc'; import { Base64 } from 'js-base64'; +import dayjs from 'dayjs'; export default { @@ -389,7 +390,7 @@ export default { { prop: 'clientTypeName', label: '客户类型', - type: 2, + type: 3, values: '', width: '150', checkarr: [], @@ -400,7 +401,7 @@ export default { { prop: 'typeServiceName', label: '服务类型', - type: 2, + type: 1, values: '', width: '180', checkarr: [], @@ -628,6 +629,70 @@ export default { } }, methods: { + showdrawer(value){ + this.drawerShow=value + }, + /** + * 弹窗的勾选回调，用于更改头部数组 + * 固定搭配，只需要更换 columnList + */ + setnewcolum(newarr, headarr,type) { + // console.log(newarr,'+++++++++++') + if(type==1){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'checkList', headarr); + }else if(type==2){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'flexList', headarr); + }else if(type==3){ + this.columnList = newarr; + this.$functions.setStorage(window.location.pathname+'sortlist', headarr); + } + + }, + selectionsc(value) { + console.log(value); + }, + delectsolt(scope) { + const { row } = scope; + console.log(row); + }, + editsolt(scope) { + const { row } = scope; + console.log(row); + }, + btnsc(index, row) { + console.log(index, row); + }, + selectsc(index, row) { + console.log("123123123",index, row); + if(row.prop ==='clientTypeName'){ + this.query['clientType'] = index; + }else{ + this.query[row.prop] = index; + } + this.onLoad(this.page); + }, + timesc(index, row) { + console.log(index, row); + if (!!index){ + index = dayjs(index).format('YYYY-MM-DD'); + } + this.query[row.prop] = index + if (!index){ + delete this.query[row.prop] + } + this.onLoad(this.page); + }, + inputsc(index, row) { + console.log(index, row); + // console.log(index, row.prop); + this.query[row.prop] = index; + this.onLoad(this.page); + }, + + + handleCommand(command,row){ console.log(command,row) switch (Number(command)) { @@ -807,6 +872,11 @@ export default { getDictionaryBiz('client_type').then(res => { // console.log("字典》》》",res); this.clientType = res.data.data; + this.$functions.checkcColumnList("clientTypeName", this.columnList).checkarr=res.data.data.map(item=>{ + item.value=item.dictKey + item.label=item.dictValue + return item + }); }); //字典 getDictionaryBiz('basic_freight_type').then(res => { diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue index d336e472..a96ac54b 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelfView.vue @@ -374,7 +374,7 @@ - + - + diff --git a/src/views/distribution/inventory/distributionStockArticleDetails.vue b/src/views/distribution/inventory/distributionStockArticleDetails.vue index c9eb2fc9..64b4271a 100644 --- a/src/views/distribution/inventory/distributionStockArticleDetails.vue +++ b/src/views/distribution/inventory/distributionStockArticleDetails.vue @@ -726,8 +726,11 @@ export default { '$route.query.id': { handler(newVal, oldVal) { // console.log(newVal, oldVal); - this.onLoad(this.page); - this.onLoadOwn(this.page); + if(!!this.$route.query.id){ + this.onLoad(this.page); + this.onLoadOwn(this.page); + } + }, deep: true, immediate: true, @@ -1367,7 +1370,7 @@ export default { }, onLoad(page, params = {}) { this.loading = true; - this.query.id = this.$route.query.id; + this.query.ids = this.$route.query.id; getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const data = res.data.data; // this.page.total = data.total; @@ -1377,10 +1380,10 @@ export default { }); }, onLoadOwn(page, params = {}) { - this.loading = true; + // this.loading = true; this.dataMaterial = false; params = { - stockArticleId: this.$route.query.id, + stockArticleIds: this.$route.query.id, }; getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.queryPage)).then( res => { diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 6505dedd..97ec06c4 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2319,7 +2319,7 @@ export default { } }, selectionChangeStock(list) { - console.log('执行了啦啦啦', list); + // console.log('执行了啦啦啦', list); this.selectionListStock = list; }, selectionClear() { @@ -2345,7 +2345,7 @@ export default { onLoad(page, params = {}) { this.loading = true; - params.id = this.$route.query.id; + params.ids = this.$route.query.id; this.orderAdd = false; getListOne(page.currentPage, page.pageSize, params).then(res => { const data = res.data.data; @@ -2396,7 +2396,7 @@ export default { //包件信息 onLoadOwn(page, params = {}) { this.loading = true; - this.query.stockArticleId = this.$route.query.id; + this.query.stockArticleIds = this.$route.query.id; getListOwn(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { console.log('包件信息>>>>', res.data.data); const dataList = res.data.data; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 590b1324..83edf040 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -105,8 +105,8 @@ @@ -856,7 +856,7 @@ export default { for(let a = 0;a < clientType.length;a++){ // console.log("进来了",clientType[a].dictKey , costListName[i]); if(clientType[a].dictKey == costListName[i]){ - console.log("进来了",clientType[a].dictKey , costListName[i]); + // console.log("进来了",clientType[a].dictKey , costListName[i]); let zhi = costList[costListName[i]]; if(!zhi){ this.pan = true; diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index 7fa36266..de5153a7 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -153,6 +153,49 @@ export default { columnListarrs:{ //入库明细 ordoption:[ + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '客户车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'sendWarehouseName', + label: '始发仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, { prop: 'orderCode', label: '订单自编号', @@ -164,6 +207,7 @@ export default { sortable: true, head: false, }, + { prop: 'descriptionGoods', label: '货物名称', @@ -352,6 +396,49 @@ export default { // checkarr: [], // fixed: true, // }, + { + prop: 'serviceNumber', + label: '服务号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + }, + { + prop: 'waybillNumber', + label: '客户车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, { prop: 'orderPackageCode', label: '包条码', diff --git a/src/views/distribution/reservation/atlas1.vue b/src/views/distribution/reservation/atlas1.vue index 42035294..dc34661b 100644 --- a/src/views/distribution/reservation/atlas1.vue +++ b/src/views/distribution/reservation/atlas1.vue @@ -9,7 +9,9 @@
{{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里 + {{item.content}}--时间:{{item.time}}--距离:{{item.distance}}公里({{item.items.handQuantity}}件) +
@@ -109,7 +111,7 @@ function init(data) { details.mapLoc.setCenter([result.geocodes[0].location.lng, result.geocodes[0].location.lat]) geocodess.push({ pontion: result.geocodes[0].location, - content: item.customerName + '--' + item.customerAddress + '--' + item.customerTelephone, + content: item.customerName + '--' + item.customerAddress+'' + '--' + item.customerTelephone, items: item, }); if (index + 1 == data.length) { @@ -132,7 +134,7 @@ function maker(geocodess) { }); marker.setMap(details.mapLoc); marker.setLabel({ - offset: new AMap.Pixel(0, -30), //设置文本标注偏移量 + offset: new AMap.Pixel(0, -5), //设置文本标注偏移量 content: `
${item.content}
`, //设置文本标注内容 direction: 'top', //设置文本标注方位 }); @@ -156,6 +158,7 @@ function Driving(geocodess) { // console.log(result.routes[0]); item.time=formatSeconds(result.routes[0].time) item.distance=result.routes[0].distance/1000 + // item.distance=result.routes[0].distance/1000 details.datalists.push(item) } else { console.log('获取驾车数据失败：'+ result) @@ -205,6 +208,8 @@ const { datalists } = toRefs(details); .mbx { display: flex; flex-direction: column; + align-items: flex-start; + } } } @@ -214,5 +219,6 @@ const { datalists } = toRefs(details); .txbx { padding: 5px 0px; box-sizing: border-box; + width: 100%; } diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index d41ca065..538b162b 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -599,6 +599,10 @@ export default { //配送类型 this.distributionType = res.data.data; }); + // 费用类型字典 + getDictionaryBiz('delivery_cost').then(res => { + this.clientType = res.data.data; + }); // console.log("配送方式123", this.deliveryWayList); getDictionaryBiz('delivery_way').then(res => { //配送方式 @@ -832,6 +836,38 @@ export default { let a = await billStockList(page.currentPage, page.pageSize, { id: this.$route.query.id }); this.data3 = a.data.data.records; console.log("自提任务》》》》》》",this.data3); + console.log("费用类型lll",this.clientType); + this.data3.forEach(i =>{ + if(!!i.list){ + i.collectFee = 0; + i.storageFee = 0; + i.transport = 0; + i.forklift = 0; + i.otherFee = 0; + i.list.forEach(a =>{ + const { cost, money } = a; // 对象解构，获取a对象的cost和money属性 + switch (cost) { + case '1': // 到付 + i.collectFee = money ? parseInt(money) : 0; + break; + case '2': // 仓储费用 + i.storageFee = money ? parseInt(money) : 0; + break; + case '3': // 搬运费 + console.log("0=-0-="); + i.transport = money ? parseInt(money) : 0; + break; + case '4': // 叉车费 + i.forklift = money ? parseInt(money) : 0; + break; + case '5': // 其他增值费 + i.otherFee = money ? parseInt(money) : 0; + break; + } + }) + } + }); + // if (!!this.data3 && this.data3.length > 0) { // this.data3.forEach(i => { diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 5a5ab14b..8a125284 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -355,14 +355,14 @@ export default { values: '', width: '150', checkarr: [ - { - label: '未指派', - value: '1', - }, - { - label: '已指派', - value: '2', - }, + // { + // label: '未指派', + // value: '1', + // }, + // { + // label: '已指派', + // value: '2', + // }, ], fixed: false, sortable: true, @@ -893,17 +893,17 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }) + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }) getDictionaryBiz('stock_assign_status').then(res => { //指派 - // console.log("8908098080",res.data.data); - this.distributionType = res.data.data; + console.log("8908098080",res.data.data); + // this.distributionType = res.data.data; this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr =res.data.data.map(item=>{ item.value=item.dictKey item.label=item.dictValue diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 508ccf01..1f8d26d9 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -831,14 +831,14 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }); + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }); this.onLoad(this.page); }, searchHide () { diff --git a/src/views/distribution/stockup/distributionStockupSelf.vue b/src/views/distribution/stockup/distributionStockupSelf.vue index 028ef25c..67989128 100644 --- a/src/views/distribution/stockup/distributionStockupSelf.vue +++ b/src/views/distribution/stockup/distributionStockupSelf.vue @@ -837,14 +837,14 @@ export default { return item }); }); - getDictionaryBiz('stock_allocation').then(res => { - this.stockAllocation = res.data.data; - this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { - item.value = item.dictKey - item.label = item.dictValue - return item - }); - }); + // getDictionaryBiz('stock_allocation').then(res => { + // this.stockAllocation = res.data.data; + // this.$functions.checkcColumnList("assignStatusName", this.columnList).checkarr = res.data.data.map(item => { + // item.value = item.dictKey + // item.label = item.dictValue + // return item + // }); + // }); this.onLoad(this.page); }, searchHide () { diff --git a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue index 6d88afba..856a6536 100644 --- a/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue +++ b/src/views/warehouse/updownGoods/warehouseUpdownGoodsLog.vue @@ -1,42 +1,121 @@