From 7c6f0c13be699751184433d68859869f2546e2c2 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Fri, 20 Oct 2023 00:40:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=85=8D=E9=80=81=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=B8=E6=9C=BA=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distribution/deliverylist/distributionDeliveryListdis.vue | 1 + .../distribution/deliverylist/distributionDeliveryListedt.vue | 3 +++ vite.config.js | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 7bfd4a5d..1a61539f 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -439,6 +439,7 @@ export default { fixed: false, sortable: true, }, + { prop: 'vehicleName', label: '配送车辆', diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index a3daf98d..62b805ef 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -26,6 +26,9 @@ 装车班组：{{ deliverydata.loadingTeamName }} + + + 司机电话:{{ deliverydata.driverPhone }} diff --git a/vite.config.js b/vite.config.js index 528ccce5..cf6e5b91 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 edcea2d6b50985eb59534b3e44573bac6e636afc Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 20 Oct 2023 17:23:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=87=AA=E6=8F=90?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionStockArticleMarket.vue | 2 +- .../inventory/distrilbutionBillLadingList.vue | 19 ++++++++++--------- .../inventory/distrilbutionBillLadingView.vue | 4 ++-- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index b14e96cd..89a8cf69 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1105,7 +1105,7 @@ export default { // 返回false,说明全都相等 if (!notEqualFlag) { this.$router.push({ - path: '/distribution/inventory/distributionStockArticleFrom', + path: '/distribution/reservation/reservationSubmitFrom', query: { id: this.ids, name: '转预约单', diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index ecc34f5b..a1072fd2 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -943,16 +943,17 @@ export default { }, //签收 handleSign(row, num) { - if (this.selectionList.length == 0) { - this.$message.warning('至少选择一条数据！！'); - return; - } - let a = this.selectionList.find(i => i.conditions > 6); - if (!!a) { - this.$message.warning('有已签收的数据，请勿重复签收！！'); - return; + if(num === 2){ + if (this.selectionList.length == 0) { + this.$message.warning('至少选择一条数据！！'); + return; + } + let a = this.selectionList.find(i => i.conditions > 20); + if (!!a) { + this.$message.warning('有已签收的数据，请勿重复签收！！'); + return; + } } - this.$confirm('确定签收吗?', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/distribution/inventory/distrilbutionBillLadingView.vue b/src/views/distribution/inventory/distrilbutionBillLadingView.vue index 6a1f5d71..4b89e330 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingView.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingView.vue @@ -318,7 +318,7 @@ export default { head: false, }, { - prop: 'deliveryNumber', + prop: 'quantity', label: '备货数', type: 2, values: '', @@ -329,7 +329,7 @@ export default { head: false, }, { - prop: 'readyStock', + prop: 'preparedQuantity', label: '已备数量', type: 2, values: '', From 26020256d668ccb6f48a2373e73984ad9070ed94 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 20 Oct 2023 19:05:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A2=84=E7=BA=A6?= =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=E7=AD=9B=E9=80=89?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reservation/reservationAddFrom.vue | 61 +++---------------- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 2c27db0e..8ef46d18 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -1906,6 +1906,7 @@ let page = this.page; let params = {}; this.query.serviceType = '2'; + console.log('this.marketName :>> ', this.marketName); params.marketName = this.marketName console.log('params :>> ', params); getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then( @@ -1917,15 +1918,9 @@ }); this.page.total = inventoryList.total; console.log('res :>> ', res); - // this.inventoryInfo = inventoryList.records.filter(value=>{ - // if(this.marketName === '')return value - // return value.marketName === this.marketName - // }); + this.inventoryInfo = inventoryList.records - this.inventoryInfo = inventoryList.records.filter(value => { - if (this.marketName === '') return value; - return value.marketName === this.marketName; - }); + //存在库存品，需要将库存品进行回显勾选 if (this.inventoryData) { this.inventoryInfo.forEach((item, index) => { @@ -2657,7 +2652,7 @@ * 增加订单提交 */ onSubmitOrder() { - console.log('-------------》', this.orderList); + console.log('orderList-------------》', this.orderList); if (this.orderList.length === 0) return this.$message.warning('最少选择一条数据!!!') const list = this.orderList; let _name = list[0].customerName; @@ -2682,56 +2677,16 @@ // 设置商场名称 if (this.marketName === '') this.marketName = _marketName - this.marketName = list[0].marketName; + // this.marketName = list[0].marketName; this.form.consignee = _name; this.form.deliveryAddress = _address; this.form.deliveryPhone = _phone; + //这里需要对选择的订单进行筛选 - const info = []; - this.stockArticleInfo.forEach((item, index) => { - this.orderList.forEach(order => { - // const newDate1 = this.orderData.map(item => { // map遍历本地数据 - // if (this.orderList.find(o => o.id !== item.id)) { // 如果在接口数据中包含本地数据，则返回这条本地数据 - // return item; - // }); - // } info.push(order); - //清理原来订单列表的订单数据 - info.push(order); - this.stockArticleInfo.splice(index, 1); - }); - }); - - - if (this.orderData.length >= 1) { - let newDate1 = this.orderData.map(item => { - // map遍历本地数据 - if (this.orderList.find(o => o.id !== item.id)) { - // 如果在接口数据中包含本地数据，则返回这条本地数据 - return item; - } - }); - console.log('newDate1-------------->', newDate1.length); - if (newDate1.length >= 1) { - console.log('newDate1-------------->', newDate1); - newDate1.forEach(a => { - this.orderData.push(a); - }); - } - console.log('this.orderData------------->', this.orderData); - } else { - - this.orderData = this.orderList; - } - - - this.orderData.forEach(a => { - a.reservationNum = a.handQuantity; - - }); - + const _ids = this.orderData.map(val => val.id) + this.orderData = [...this.orderData, ...this.orderList.filter(item => !_ids.includes(item.id))] - // this.orderData.push(info); this.orderShow = false; }, selectionClear() { From 9adbffe8011db7e571ba48ef974e503f1ad9f625 Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Fri, 20 Oct 2023 19:38:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9B=98=E7=82=B9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LsystemsInventory/LsystemsInventory.js | 18 + .../{basicPdaTTTTT.vue => basicPdaTTTT.vue} | 295 ++++-- .../LsystemsInventory/LsystemsInventory.vue | 941 ++++++++++++++++++ .../turndelivery/deliveryDiscuss.vue | 19 +- vite.config.js | 4 +- 5 files changed, 1197 insertions(+), 80 deletions(-) create mode 100644 src/api/LsystemsInventory/LsystemsInventory.js rename src/views/basic/pda/{basicPdaTTTTT.vue => basicPdaTTTT.vue} (77%) create mode 100644 src/views/distribution/LsystemsInventory/LsystemsInventory.vue diff --git a/src/api/LsystemsInventory/LsystemsInventory.js b/src/api/LsystemsInventory/LsystemsInventory.js new file mode 100644 index 00000000..4e47ccc3 --- /dev/null +++ b/src/api/LsystemsInventory/LsystemsInventory.js @@ -0,0 +1,18 @@ +import request from '@/axios'; +// 同步老系统盘点数据列表接口 +export const $_SyncInventoryList = data => { + return request({ + url: '/logpm-patch/syncInventory/list', + method: 'POST', + data, + }); +}; + +// 新增同步老系统盘点数据 +export const $_SyncInventorySubmit = data => { + return request({ + url: '/logpm-patch/syncInventory/submit', + method: 'POST', + data, + }); +}; diff --git a/src/views/basic/pda/basicPdaTTTTT.vue b/src/views/basic/pda/basicPdaTTTT.vue similarity index 77% rename from src/views/basic/pda/basicPdaTTTTT.vue rename to src/views/basic/pda/basicPdaTTTT.vue index c6362a07..f65b0f48 100644 --- a/src/views/basic/pda/basicPdaTTTTT.vue +++ b/src/views/basic/pda/basicPdaTTTT.vue @@ -38,12 +38,16 @@
@@ -89,14 +93,44 @@ width="280" align="center " > - --> + + @@ -110,13 +144,12 @@ v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="pageList" - :small="small" :disabled="disabled" :background="background" layout="total, sizes, prev, pager, next, jumper" - :total="2" - @size-change="handleSizeChange" - @current-change="handleCurrentChange" + :total="total" + @size-change="PageSizeChange" + @current-change="SizeChange" />
@@ -264,16 +297,20 @@

菜单功能列表

+