From 75f4b3f2df95f2b9ea17e7fe62048cae6127564e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Sat, 16 Dec 2023 20:55:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=B8=85=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../distributionDeliveryListedt.vue | 73 ++++++++++--------- .../stockup/distributionStockupDiscuss.vue | 51 ++++++++++--- .../stockup/distributionStockupMarket.vue | 63 +++++++++++----- vite.config.js | 3 +- 4 files changed, 124 insertions(+), 66 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue index 81527d63..253b0139 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListedt.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListedt.vue @@ -288,7 +288,9 @@ @@ -418,16 +420,12 @@ :width="item.width" :key="index" > - - + - + @@ -457,7 +455,14 @@ - + ',row); + console.log('row------------>', row); // let qr = { // ids: row.id, // }; this.html = ''; - showInventoryPackgeCode(row.reservationId,row.id).then(res => { + showInventoryPackgeCode(row.reservationId, row.id).then(res => { // this.orderPackageCode = res.data console.log(res.data); this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); }); this.dialogVisibleF = true; - }, /** * 查看二维码 @@ -3220,28 +3226,25 @@ export default { console.log('签收>>>>>>>>>>', row); this.loading = true; this.$confirm('确认一键装车？') - .then(_ => { - - let data = {}; - data.reservationId = row.id; - data.deliveryId = this.deliverydata.id; - console.log('------------->data', data); - getOneclick(data).then(res => { - this.$message.success(res.data.msg); - this.onLoad(); + .then(_ => { + let data = {}; + data.reservationId = row.id; + data.deliveryId = this.deliverydata.id; + console.log('------------->data', data); + getOneclick(data).then(res => { + this.$message.success(res.data.msg); + this.onLoad(); + }); + }) + .catch(_ => {}) + .finally(() => { + this.loading = false; }); - }) - .catch(_ => {}) - .finally(()=>{ - this.loading = false; - - }); - }, //一键签收 handleSignone(row) { console.log('一键签收222>>>>>>>>>>', row); - if (row.loadingStatus != '已装车'){ + if (row.loadingStatus != '已装车') { ElMessage({ message: '请先进行装车', type: 'warning', @@ -3465,7 +3468,7 @@ export default { width: 100%; } } -.el_foot{ +.el_foot { overflow: scroll; } diff --git a/src/views/distribution/stockup/distributionStockupDiscuss.vue b/src/views/distribution/stockup/distributionStockupDiscuss.vue index 39a3aea5..c9542ede 100644 --- a/src/views/distribution/stockup/distributionStockupDiscuss.vue +++ b/src/views/distribution/stockup/distributionStockupDiscuss.vue @@ -55,13 +55,15 @@
- 导出 - + + 清单导出 + 指派备货信息 -
@@ -104,7 +106,7 @@ - +
勾选数量: {{ selectionList.length }}
@@ -1043,7 +1045,28 @@ export default { }); }, // 导出功能 - handleExportInfo() { + handleExportInfo() { + let row = {}; + // 查询信息 + // query: {}, + if (this.query) { + for (let prop in this.query) { + row[prop] = this.query[prop]; + } + } + if (!!this.ids) { + row.ids = this.ids; + } else { + row.ids = ''; + } + (row.typeService = '1'), //固定参数代表当前页面 + $_CommercialMarket(row).then(res => { + console.log(res.data); + downloadXls(res.data, '商配备货列表.xlsx'); + }); + }, + /** 导出清单 */ + handleExportDetails() { let row = {}; // 查询信息 // query: {}, @@ -1057,10 +1080,14 @@ export default { } else { row.ids = ''; } - row.typeService='1',//固定参数代表当前页面 - $_CommercialMarket(row).then(res => { + if (row.ids === '') { + this.$message.warning('请选择备货任务!'); + return; + } + console.log('row-------->', row); + $_CommercialDetail(row.ids).then(res => { console.log(res.data); - downloadXls(res.data, '商配备货列表.xlsx'); + downloadXls(res.data, '市配备货列表.xlsx'); }); }, handleDelete() { @@ -1187,9 +1214,9 @@ export default { height: 30px !important; } } -:deep(.el-form-item__label){ - width:auto !important; - padding:0; +:deep(.el-form-item__label) { + width: auto !important; + padding: 0; } :deep(.avue-crud) { display: flex; @@ -1207,6 +1234,6 @@ export default { .el-fy { flex: 1; display: flex; - align-items: flex-end; + align-items: flex-end; } diff --git a/src/views/distribution/stockup/distributionStockupMarket.vue b/src/views/distribution/stockup/distributionStockupMarket.vue index 8a0711fb..ff1f7e8e 100644 --- a/src/views/distribution/stockup/distributionStockupMarket.vue +++ b/src/views/distribution/stockup/distributionStockupMarket.vue @@ -13,21 +13,21 @@ --> -
- - - - - - +
+ + + + + +
@@ -45,6 +45,9 @@ 导出 + 清单导出 + 指派备货信息 @@ -934,6 +937,31 @@ export default { downloadXls(res.data, '市配备货列表.xlsx'); }); }, + /** 导出清单 */ + handleExportDetails() { + let row = {}; + // 查询信息 + // query: {}, + if (this.query) { + for (let prop in this.query) { + row[prop] = this.query[prop]; + } + } + if (!!this.ids) { + row.ids = this.ids; + } else { + row.ids = ''; + } + if (row.ids === '') { + this.$message.warning('请选择备货任务!'); + return; + } + console.log('row-------->', row); + $_CommercialDetail(row.ids).then(res => { + console.log(res.data); + downloadXls(res.data, '市配备货列表.xlsx'); + }); + }, searchReset() { this.query = {}; this.stockupDate = []; @@ -1157,9 +1185,8 @@ export default { .el-fy { flex: 1; display: flex; - align-items: flex-end; + align-items: flex-end; } -.el-input-so{ - +.el-input-so { } diff --git a/vite.config.js b/vite.config.js index eacdd94d..2aa513f9 100644 --- a/vite.config.js +++ b/vite.config.js @@ -22,8 +22,9 @@ export default ({ mode, command }) => { // target: 'http://192.168.10.75:8777', // 新zyc // target: 'http://192.168.6.116:8777', + target: 'http://192.168.10.25:13000', - target: 'http://192.168.6.122:8777', + // target: 'http://192.168.6.122:8777', // target: 'http://192.168.6.116:8777', // tjj // sst