From 833f68e4b29e99ce7dfb4d6f96434d21c8d79e93 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 31 Oct 2023 14:12:45 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E6=97=B6,=20=E6=8B=BF=E4=B8=8D?= =?UTF-8?q?=E5=88=B0=E5=BA=93=E5=AD=98=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/inventory/distrilbutionBillLading.vue | 9 ++++++++- vite.config.js | 4 ++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index d76a73d6..9327b03e 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -2848,6 +2848,7 @@ export default { }, //库存品 onLoadList(page, params = {}) { + console.log('111 :>> ', 111); this.loading = true; let a = {}; if (this.$route.query.type == '1') { @@ -2855,8 +2856,10 @@ export default { } else if (this.$route.query.type === '2') { a = this.dataList[0]; } else if (this.$route.query.type == '3') { - a = this.dataOrder[0]; + a = this.dataList[0]; } + console.log('a :>> ', a); + console.log(' this.dataOrder :>> ', this.dataOrder); // let a = this.dataList[0]; if (!!a.mallId) { params.marketId = a.mallId; @@ -2872,6 +2875,10 @@ export default { this.selectionClear(); }); } else { + this.$message({ + type: 'warning', + message: '无法获取商场信息', + }); this.loading = false; this.pageStock.total = 0; } diff --git a/vite.config.js b/vite.config.js index cf6e5b91..528ccce5 100644 --- a/vite.config.js +++ b/vite.config.js @@ -22,8 +22,8 @@ export default ({ mode, command }) => { // cyz // target: 'http://192.168.10.75:8777', // tjj - target: 'http://192.168.10.29:13000', - // target: 'http://test.api.huitongys.com', + // target: 'http://192.168.10.29:13000', + target: 'http://test.api.huitongys.com', // target: 'http://h5uapi.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), From b03d088923c558e796ad872d1c718c34ccd5d8be Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Tue, 31 Oct 2023 15:03:11 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E8=B4=A7=E5=8D=95=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=8C=85=E4=BB=B6,=20=E6=96=B0=E5=A2=9E=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventory/distrilbutionBillLading.vue | 111 +----------------- 1 file changed, 1 insertion(+), 110 deletions(-) diff --git a/src/views/distribution/inventory/distrilbutionBillLading.vue b/src/views/distribution/inventory/distrilbutionBillLading.vue index 9327b03e..660bd481 100644 --- a/src/views/distribution/inventory/distrilbutionBillLading.vue +++ b/src/views/distribution/inventory/distrilbutionBillLading.vue @@ -1615,39 +1615,6 @@ export default { sortable: true, head: false, }, - { - label: '主键', - prop: 'id', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '租户号', - prop: 'tenantId', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '创建人', - prop: 'createUser', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { label: '创建时间', prop: 'createTime', @@ -1659,61 +1626,6 @@ export default { sortable: true, head: false, }, - { - label: '更新人', - prop: 'updateUser', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '更新时间', - prop: 'updateTime', - type: 4, - values: '', - width: '180', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '状态', - prop: 'status', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '是否已删除', - prop: 'isDeleted', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - { - label: '创建部门', - prop: 'createDept', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { label: '仓库', prop: 'warehouse', @@ -1813,17 +1725,6 @@ export default { sortable: true, head: false, }, - { - label: '转库存品数量', - prop: 'inventoryQuantity', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, { label: '车次号', prop: 'trainNumber', @@ -1835,17 +1736,6 @@ export default { sortable: true, head: false, }, - { - label: '在库订单ID', - prop: 'stockArticleId', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, ], // 列表数据 orderDetails: [], @@ -2308,6 +2198,7 @@ export default { return { parceListId: val.id, stockArticleId: val.stockArticleId, + packetBarCode: val.orderPackageCode, }; }); this.dialogChooseOrderVisible = false; From 9ad589a34a767af2a2e214eb55592f0a658cf83d Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Wed, 1 Nov 2023 20:22:45 +0800 Subject: [PATCH 3/4] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/distributionReservation.js | 8 +- src/api/work/work.js | 13 + src/page/index/index.vue | 24 +- src/page/index/top/index.vue | 38 +- .../signfor/distributionSignfortreat.vue | 55 ++- .../distribution/turndelivery/devtmp.vue | 381 +++++++++++++----- vite.config.js | 6 +- 7 files changed, 394 insertions(+), 131 deletions(-) diff --git a/src/api/distribution/distributionReservation.js b/src/api/distribution/distributionReservation.js index b51c3787..5c9b647a 100644 --- a/src/api/distribution/distributionReservation.js +++ b/src/api/distribution/distributionReservation.js @@ -234,7 +234,13 @@ export const getDeliveryZeroOrderDetail = (deliveryId,orderId) => { params: { deliveryId,orderId } }); } - +export const $_getDeliveryZeroOrderDetail = params => { + return request({ + url: '/api/logpm-distribution/deliveryList/getDeliveryZeroOrderDetail', + method: 'get', + params, + }); +}; /** * 查询预约计划零担详情 * @param ids diff --git a/src/api/work/work.js b/src/api/work/work.js index 586231a9..58b06d95 100644 --- a/src/api/work/work.js +++ b/src/api/work/work.js @@ -86,6 +86,19 @@ export const getMyWarehouseList = data => { }); }; +; + +export const getMyCurrentWarehouse = data => { + return request({ + url: '/api/logpm-basicdata/warehouse/client/getMyCurrentWarehouse', + method: 'get', + data, + }); +}; + + + + export const preserveCurrentWarehouse = data => { return request({ url: '/api/logpm-basicdata/warehouse/preserveCurrentWarehouse', diff --git a/src/page/index/index.vue b/src/page/index/index.vue index 16c38d5c..1f38e098 100644 --- a/src/page/index/index.vue +++ b/src/page/index/index.vue @@ -8,7 +8,7 @@
- + @@ -36,7 +36,7 @@ import search from './search.vue'; import logo from './logo.vue'; import top from './top/index.vue'; import sidebar from './sidebar/index.vue'; - +import { getMyCurrentWarehouse } from '@/api/work/work'; export default { mixins: [index], components: { @@ -51,6 +51,7 @@ export default { provide() { return { index: this, + }; }, computed: { @@ -70,6 +71,18 @@ export default { ); }, }, + data(){ + return{ + TabName:null, + } + }, + created() { + getMyCurrentWarehouse().then(res=>{ + console.log(res,'初始化请求参数'); + console.log(res.data.name,'仓库名称'); + localStorage.setItem('WarehouseName', res.data.name); + }) + }, mounted() { if (this.userInfo.tenant_id == '000000') { let obj = JSON.parse(JSON.stringify(this.setting)); @@ -84,6 +97,7 @@ export default { }, props: [], methods: { + //打开菜单 openMenu(item = {}) { this.$store.dispatch('GetMenu', item.id).then(data => { @@ -117,8 +131,8 @@ export default { }; - diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue index a55e24b8..ad77ab11 100644 --- a/src/page/index/top/index.vue +++ b/src/page/index/top/index.vue @@ -29,9 +29,12 @@
+ +
- {{ datalist[checkwarehousevalue]?.name||'' }} + {{ datalist[checkwarehousevalue]?.name || '' }}
+
@@ -112,20 +115,33 @@ export default { isshow: false, datalist: [], warehousevalue: '', - checkwarehousevalue:0, + checkwarehousevalue: 0, + dataName: null, }; }, mounted() { getMyWarehouseList().then(res => { - console.log(res.data.data, 'getMyWarehouseList'); - let arr = [{ name: '全部', id: '0' }]; - this.datalist = arr.concat(res.data.data); - }); - this.checkwarehousevalue=Number(localStorage.getItem('checkwarehousevalue')) - console.log(this.checkwarehousevalue) + console.log(res.data.data, 'getMyWarehouseList'); + let arr = [{ name: this.dataName?this.dataName:'', id: '0' }]; + this.datalist = arr.concat(res.data.data); + }); + this.checkwarehousevalue = Number(localStorage.getItem('checkwarehousevalue')); + }, filters: {}, - created() {}, + + created() { + this.dataName=null + let warehouseName = localStorage.getItem('WarehouseName'); + let modifiedName = warehouseName.replace(/"/g, ''); + if (modifiedName == 'undefined') { + this.dataName = ''; + console.log('当前暂时没有参数',this.dataName); + } else { + this.dataName = modifiedName; + console.log(this.dataName,'当前参数存在值'); + } + }, computed: { ...mapGetters([ 'setting', @@ -152,7 +168,7 @@ export default { let res = await getclearWarehouseCache({}); if (res.data.code == 200) { this.$message({ message: '切换成功', type: 'success' }); - localStorage.setItem('checkwarehousevalue',this.warehousevalue) + localStorage.setItem('checkwarehousevalue', this.warehousevalue); this.$router.push({ path: '/', }); @@ -166,7 +182,7 @@ export default { let res = await preserveCurrentWarehouse(this.datalist[this.warehousevalue]); if (res.data.code == 200) { this.$message({ message: '切换成功', type: 'success' }); - localStorage.setItem('checkwarehousevalue',this.warehousevalue) + localStorage.setItem('checkwarehousevalue', this.warehousevalue); this.$router.push({ path: '/', }); diff --git a/src/views/distribution/signfor/distributionSignfortreat.vue b/src/views/distribution/signfor/distributionSignfortreat.vue index 554aad29..b15df3a1 100644 --- a/src/views/distribution/signfor/distributionSignfortreat.vue +++ b/src/views/distribution/signfor/distributionSignfortreat.vue @@ -82,14 +82,17 @@
- - - 司机待签收数：{{ statistics.driverNub }} - - - 文员待审核数：{{ statistics.clerkNub }} - - + +
+
    +
  • + 司机待签收数：{{ statistics.driverNub }} +
    • +
  • + 文员待审核数：{{ statistics.clerkNub }} +
    • +
+
@@ -1610,4 +1613,40 @@ export default { align-items: flex-end } } +.order-info { + margin-right: 3%; + ul { + list-style: none; + display: flex; + padding: 0; + + li { + color: #172e60; + position: relative; + padding: 0 20px; + display: flex; + align-items: center; + font-weight: 500; + img { + margin-right: 4px; + } + } + li::after { + content: ''; + display: block; + width: 0.10417vw; + height: 18px; + background-color: #dddbdb; + position: absolute; + top: 2px; + left: 0px; + } + } + li:first-child::after { + content: none; + } + li:first-child { + padding-left: 0; + } +} diff --git a/src/views/distribution/turndelivery/devtmp.vue b/src/views/distribution/turndelivery/devtmp.vue index eaf6dcca..61771c93 100644 --- a/src/views/distribution/turndelivery/devtmp.vue +++ b/src/views/distribution/turndelivery/devtmp.vue @@ -274,7 +274,6 @@ -