From 4669540d772a1b012d4bc33b6e9a4f754607ca82 Mon Sep 17 00:00:00 2001 From: zhangsiyu Date: Tue, 20 Jun 2023 09:14:28 +0800 Subject: [PATCH] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit dc43cb86f64f6e379b8026c75383bf03581813bb Merge: efa5a97 e2769fd Author: caoyizhong <1270296080@qq.com> Date: Mon Jun 19 18:10:14 2023 +0800 Merge remote-tracking branch 'origin/dev' into dev # Conflicts: # src/router/views/index.js commit efa5a9716d38ba2707840c8cc4736797cf28fdf7 Author: caoyizhong <1270296080@qq.com> Date: Mon Jun 19 18:09:23 2023 +0800 修改客户信息 commit e2769fdcac9e9c8ff2e4ee6cf137e8d1202c791d Author: 0.0 <1092404103.qq.com> Date: Mon Jun 19 18:02:43 2023 +0800 1.配送车次数量 commit 83d07b76e578c83e564327d9e78e05ac1fa306ce Author: kilo Date: Mon Jun 19 15:47:24 2023 +0800 批量转配送任务 commit 8e081406038becf243c6f88990331c8563ca622c Author: caoyizhong <1270296080@qq.com> Date: Mon Jun 19 09:20:30 2023 +0800 修改库存管理 commit bb113255a52311851d736d12ba1b974b939c6dff Author: 0.0 <1092404103.qq.com> Date: Fri Jun 16 18:04:10 2023 +0800 1.生成预约列表.2.隐藏资产操作 # Conflicts: # src/option/distribution/distributionDeliveryList.js # src/views/distribution/stockup/distributionStockup.vue --- .../distribution/distributionDeliveryList.js | 174 ------------------ .../stockup/distributionStockup.vue | 40 +--- 2 files changed, 1 insertion(+), 213 deletions(-) diff --git a/src/option/distribution/distributionDeliveryList.js b/src/option/distribution/distributionDeliveryList.js index a1516e29..303c3d2f 100644 --- a/src/option/distribution/distributionDeliveryList.js +++ b/src/option/distribution/distributionDeliveryList.js @@ -172,177 +172,3 @@ export default { }, ] } -export default { - expand: false, - index: true, - border: true, - selection: true, - column: [ - { - label: "主键", - prop: "id", - display: false, - hide: true, - }, - { - label: "租户号", - prop: "tenantId", - display: false, - hide: true, - }, - { - label: "创建人", - prop: "createUser", - display: false, - hide: true, - }, - { - label: "创建时间", - prop: "createTime", - display: false, - hide: true, - }, - { - label: "更新人", - prop: "updateUser", - display: false, - hide: true, - }, - { - label: "更新时间", - prop: "updateTime", - display: false, - hide: true, - }, - { - label: "状态", - prop: "status", - display: false, - hide: true, - }, - { - label: "是否已删除", - prop: "isDeleted", - display: false, - hide: true, - }, - { - label: "创建部门", - prop: "createDept", - display: false, - hide: true, - }, - { - label: "预留1", - prop: "reserve1", - display: false, - hide: true, - }, - { - label: "预留2", - prop: "reserve2", - display: false, - hide: true, - }, - { - label: "预留3", - prop: "reserve3", - display: false, - hide: true, - }, - { - label: "预留4", - prop: "reserve4", - display: false, - hide: true, - }, - { - label: "预留5", - prop: "reserve5", - display: false, - hide: true, - }, - { - label: "车次", - prop: "trainNumber", - width:"150px" - }, - { - label: "仓库", - prop: "warehouse", - width:"150px" - }, - { - label: "配送类型", - prop: "type", - width:"150px" - }, - { - label: "配送种类", - prop: "kind", - width:"150px" - }, - { - label: "配送车辆", - prop: "vehicle", - width:"150px" - }, - { - label: "配送司机", - prop: "driver", - width:"150px" - }, - { - label: "配送公司", - prop: "distributionCompany", - width:"150px" - }, - { - label: "配送状态", - prop: "state", - width:"150px" - }, - { - label: "配送客户数", - prop: "customersNumber", - width:"150px" - }, - { - label: "配送价格", - prop: "price", - width:"150px" - }, - { - label: "增值服务表id", - prop: "addedServicesId", - display: false, - hide: true, - }, - { - label: "订单总数", - prop: "orderNumber", - width:"150px" - }, - { - label: "配送件数", - prop: "deliveryNumber", - width:"150px" - }, - { - label: "扫描件数", - prop: "scannedNumber", - width:"150px" - }, - { - label: "装卸班组", - prop: "loadingTeam", - width:"150px" - }, - { - label: "预约表id", - prop: "reservationId", - display: false, - hide: true, - }, - ] -} diff --git a/src/views/distribution/stockup/distributionStockup.vue b/src/views/distribution/stockup/distributionStockup.vue index e98f13e7..01e64438 100644 --- a/src/views/distribution/stockup/distributionStockup.vue +++ b/src/views/distribution/stockup/distributionStockup.vue @@ -270,26 +270,6 @@ export default { } }, methods: { - //查询备货 - getStockUp(row){ - console.log("row",row); - let params = {}; - switch (row) { - case '1': - params.stockupStatus = '2' - break; - case '2': - params.stockupStatus = '3' - break; - } - getList(this.page.currentPage, this.page.pageSize, params).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; - this.loading = false; - this.selectionClear(); - }); - }, //查询备货 getStockUp(row){ console.log("row",row); @@ -354,20 +334,6 @@ export default { let params ={ department: this.deptId } - getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res =>{ - // console.log(">><><",res.data.data.records); - let fo= []; - res.data.data.records.forEach(i =>{ - let a= { - dictKey: i.id, - dictValue: i.name +'-'+i.groupName - } - fo.push(a); - }); - this.loaderData = fo; - }) let params ={ - department: this.deptId - } getListTeam(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res =>{ // console.log(">><><",res.data.data.records); let fo= []; @@ -387,7 +353,7 @@ export default { department: this.deptId } stockUp(params).then(res =>{ - // // console.log("res>>>",res.data.data); + // console.log("res>>>",res.data.data); let fo =[]; res.data.data.forEach(i =>{ let v = { @@ -404,10 +370,6 @@ export default { this.$message.warning("请选择至少一条数据"); return; } - if (this.selectionList.length === 0) { - this.$message.warning("请选择至少一条数据"); - return; - } this.dialogFormCustomer = true; this.getFork(); this.getTeam()