From 34fb763fbf6cde642f5ccf9378a5b4c6e84eb087 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Fri, 13 Oct 2023 14:32:29 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E5=A4=87=E8=B4=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../stockup/distributionStockupDetailsSelf.vue | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue index 3022f513..246cfa82 100644 --- a/src/views/distribution/stockup/distributionStockupDetailsSelf.vue +++ b/src/views/distribution/stockup/distributionStockupDetailsSelf.vue @@ -1541,13 +1541,14 @@ export default { }); }, //备货id - handleStockUp(row, type) { - getListUser().then(res => { - //查询当前人信息 - console.log('res>>>', res.data.data); - this.deptId = res.data.data.deptId; - this.getStorageArea(); - }); + async handleStockUp(row, type) { + // const a = await getListUser().then( res => { + // //查询当前人信息 + // console.log('res>>>', res.data.data); + // this.deptId = res.data.data.deptId; + // + // }); + await this.getStorageArea(); console.log('备货数据！！', row); switch (type) { case '1': @@ -1576,7 +1577,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 = { From 08a74d41ff57d4339c2bfda179190badc9665c40 Mon Sep 17 00:00:00 2001 From: "0.0" <1092404103.qq.com> Date: Fri, 13 Oct 2023 14:36:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?1.=E5=8F=B8=E6=9C=BA=E5=A7=93=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../driverArtery/basicdataDriverArtery.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue index c82d8c57..e9734e73 100644 --- a/src/views/basicdata/driverArtery/basicdataDriverArtery.vue +++ b/src/views/basicdata/driverArtery/basicdataDriverArtery.vue @@ -193,16 +193,16 @@ export default { } }, }, - // { - // label: "姓名", - // prop: "name", - // type: "input", - // search: true, - // labelWidth:'150', - // width:"100px", - // align:'center', - // span:11, - // }, + { + label: "姓名", + prop: "name", + type: "input", + search: true, + labelWidth:'150', + width:"100px", + align:'center', + span:11, + }, { label: '手机号码', prop: 'phone', @@ -815,7 +815,7 @@ export default { } :deep(.avue-form__group--flex){ justify-content: space-between; - + } .avue-form__row{ margin-left:0 !important; From 8eb5996436ed759a2eb70bd02c5e9d1c1fd080ba Mon Sep 17 00:00:00 2001 From: 13208366016 <47278630@qq.com> Date: Fri, 13 Oct 2023 15:31:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../deliverylist/distributionDeliveryList.vue | 7 ++++++- .../deliverylist/distributionDeliveryListdis.vue | 7 ++++++- .../deliverylist/distributionDeliveryListmar.vue | 9 +++++++-- 3 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/views/distribution/deliverylist/distributionDeliveryList.vue b/src/views/distribution/deliverylist/distributionDeliveryList.vue index 863112ee..b5bd2434 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryList.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryList.vue @@ -1198,7 +1198,7 @@ export default { } .avue-crud__right { display: flex; - align-items: flex-end; + align-items: center; } .el-form-item__content { height: 30px; @@ -1209,4 +1209,9 @@ export default { height:30px !important; } } +:deep(.avue-crud__header){ + .avue-crud__left{ + margin-top:0 !important; + } +} diff --git a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue index 67d7d2ba..7bfd4a5d 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListdis.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListdis.vue @@ -1243,7 +1243,7 @@ export default { } .avue-crud__right { display: flex; - align-items: flex-end; + align-items: center; } .fr-fm { width: 100%; @@ -1257,4 +1257,9 @@ export default { } } } +:deep(.avue-crud__header){ + .avue-crud__left{ + margin-top:0 !important; + } +} diff --git a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue index 2e205b5b..46ffa4b3 100644 --- a/src/views/distribution/deliverylist/distributionDeliveryListmar.vue +++ b/src/views/distribution/deliverylist/distributionDeliveryListmar.vue @@ -1184,7 +1184,7 @@ export default { } } .avue-crud__header { - align-items: flex-end !important; + // align-items: flex-end !important; } // 日期选择框 .el-times { @@ -1202,9 +1202,14 @@ export default { } .avue-crud__right{ display: flex; - align-items: flex-end; + align-items: center; } .fr-fo{ display:flex; } +:deep(.avue-crud__header){ + .avue-crud__left{ + margin-top:0 !important; + } +} From 1a18c35eed198ec775b9071d687adf964724227e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 13 Oct 2023 15:36:26 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=96=B0=E5=A2=9Eelement=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E8=87=AA=E9=80=82=E5=BA=94=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/distribution/distributionStockList.js | 2 +- src/components/tablecmt/tablecmt.vue | 7 ++-- .../delivery/distributionStockArticle.vue | 4 ++ .../distributionStockArticleDiscuss.vue | 11 ++--- .../distributionStockArticleMarket.vue | 4 ++ .../delivery/distributionStockArticleSelf.vue | 4 ++ .../distributionStockArticleWhole.vue | 4 ++ .../reservation/reservationSubmitFrom.vue | 40 ++++++------------- .../warehouseWarehouseingAddReceipt.vue | 3 +- vite.config.js | 4 +- 10 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/api/distribution/distributionStockList.js b/src/api/distribution/distributionStockList.js index 7df11aee..dd47c52c 100644 --- a/src/api/distribution/distributionStockList.js +++ b/src/api/distribution/distributionStockList.js @@ -131,7 +131,7 @@ export const update = (row) => { */ export const getInventoryList = (current, size, params) => { return request({ - url: '/api/logpm-distribution/distributionStockList/page', + url: '/api/logpm-distribution/distributionStockList/getLnventoryList', method: 'get', params: { ...params, diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index 66b2fd1c..c1083cd1 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -204,10 +204,11 @@ onMounted(() => { // return windowHight; return document.documentElement.clientHeight; } - // alert(getWinHight()); var bodyContent = document.getElementById('bodys'); - bodyContent.setAttribute('style', 'height.500px'); + const _height = getWinHight(); + // 设置列表的高度 + bodyContent.style.height = _height - bodyContent.getBoundingClientRect().top - 80 + 'px'; }); interface TableColumnType { /** 表格列的key */ @@ -557,7 +558,7 @@ function copyContent(content: string) { // } .maboxhi { width: 100%; - min-height: 950px; + // min-height: 950px; // height: 841px; // flex:1; // min-height: 100%; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index c1d6f1e1..3bacd1ae 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -1531,6 +1531,10 @@ export default { ); }, handleAdd() { + return this.$message({ + type: "error", + message: '功能还在开发中' + }) this.title = '新增'; this.form = {}; this.box = true; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 6cb8a25f..32589668 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -1413,9 +1413,10 @@ export default { ); }, handleAdd() { - this.title = '新增'; - this.form = {}; - this.box = true; + return this.$message({ + type: 'error', + message: '功能还在开发中', + }); }, handleEdit(row) { this.title = '编辑'; @@ -1598,7 +1599,7 @@ export default { height: 30px !important; } } -:deep(.el-form-item__label){ - padding:0; +:deep(.el-form-item__label) { + padding: 0; } diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue index c6907b6d..8a7f7d57 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleMarket.vue @@ -1448,6 +1448,10 @@ export default { ); }, handleAdd() { + return this.$message({ + type: "error", + message: '功能还在开发中' + }) this.title = '新增'; this.form = {}; this.box = true; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue index 98e583c6..c175ac44 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleSelf.vue @@ -1751,6 +1751,10 @@ export default { ); }, handleAdd() { + return this.$message({ + type: "error", + message: '功能还在开发中' + }) this.title = '新增'; this.form = {}; this.box = true; diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue index bf8d88e0..60fb3ff8 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleWhole.vue @@ -1467,6 +1467,10 @@ export default { }); }, handleAdd () { + return this.$message({ + type: "error", + message: '功能还在开发中' + }) this.title = '新增' this.form = {} this.box = true diff --git a/src/views/distribution/reservation/reservationSubmitFrom.vue b/src/views/distribution/reservation/reservationSubmitFrom.vue index c59ffe7a..0597e58a 100644 --- a/src/views/distribution/reservation/reservationSubmitFrom.vue +++ b/src/views/distribution/reservation/reservationSubmitFrom.vue @@ -40,7 +40,6 @@ :value="item.dictKey">{{item.dictValue}}  - @@ -83,16 +82,9 @@ - - - - - - - @@ -599,6 +591,8 @@ // ], }, obj:{}, + // 商场名称, 订单或库存品新增在同一商场下 + marketName: '' }; }, created() { @@ -826,11 +820,12 @@ } else { return true; } - return false; }, handleAddInventory() { let page = this.page; let params = {}; + // params.marketName = this. + if(this.marketName) params.marketName = this.marketName this.query.serviceType = '2'; getInventoryList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { const inventoryList = res.data.data; @@ -1389,6 +1384,7 @@ }); } this.query.orderIds = a.join(','); + if(this.marketName) params.mallName = this.marketName console.log('-------------->', this.query); selectStockArticleInfoList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { console.log('res------------>', res); @@ -1427,25 +1423,13 @@ getStockArticleList(this.orderIds).then(res => { console.log(res.data.data); const data = res.data.data; - let name = ''; - let phone = ''; - let address = ''; - let typeService = ''; - console.log('>>>>>>>>>>>>>', data); - for (let i = 0; i < data.length; i++) { - if (i === 0) { - name = data[0].customerName; - phone = data[0].customerTelephone; - address = data[0].customerAddress; - typeService = data[0].typeService.toString(); - // typeName = data[0].typeName; - } - } - this.form.consignee = name; - this.form.deliveryPhone = phone; - this.form.deliveryType = typeService; - this.form.deliveryAddress = address; + if (data.length === 0) return + this.form.consignee = data[0].customerName || ''; + this.form.deliveryPhone = data[0].customerTelephone || ''; + this.form.deliveryType = data[0].typeService.toString() || ''; + this.form.deliveryAddress = data[0].customerAddress || ''; this.orderData = data; + if (!this.marketName) this.marketName = data[0].mallName }); } if (this.reservationId) { @@ -1455,7 +1439,7 @@ // stockArticleListInfo.forEach(item=>{ // // }) - console.log('>>>>>>>>', reservation); + console.log('reservation >>>>>>>>', reservation); this.orderData = reservation.stockArticleList; this.inventoryData = reservation.inventoryList; this.inventoryData.forEach(item => { diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue index a45ab285..0e7f1064 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue @@ -507,7 +507,7 @@ export default { optionCodes: [], //客户编号 rules: { sku: [ - { required: true, message: '请输入SKU', trigger: 'blur' }, + { requirwarehouseIded: true, message: '请输入SKU', trigger: 'blur' }, // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } ], productName: [ @@ -533,6 +533,7 @@ export default { trainNumber: [{ required: true, message: '请填写物流单号', trigger: 'blur' }], licensePlate: [{ required: true, message: '请填写入库车牌', trigger: 'change' }], warehouseId: [{ required: true, message: '请选择所在仓库', trigger: 'blur' }], + orderNumber: [{ required: true, message: '请输入订单自编号', trigger: 'blur' }], serviceType: [{ required: true, message: '请选择服务类型', trigger: 'blur' }], customerCode: [{ required: true, message: '请选择客户编码', trigger: 'blur' }], }, diff --git a/vite.config.js b/vite.config.js index da3c6fa8..204695e7 100644 --- a/vite.config.js +++ b/vite.config.js @@ -16,14 +16,14 @@ export default ({ mode, command }) => { // hy // target: 'http://192.168.10.48:8888', // lmy - target: 'http://192.168.10.123:8889', + // target: 'http://192.168.10.123:8889', // caoge // target: 'http://192.168.10.101:8888', // cyz // target: 'http://192.168.10.75:8777', // tjj // target: 'http://192.168.10.29:13000', - // target: 'http://test.api.huitongys.com', + target: 'http://test.api.huitongys.com', changeOrigin: true, rewrite: path => path.replace(/^\/api/, ''), }, From 38a43d92ed2081527d30d0c5392f7648fc9e9498 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Fri, 13 Oct 2023 15:43:47 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9element=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/tablecmt/tablecmt.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tablecmt/tablecmt.vue b/src/components/tablecmt/tablecmt.vue index c1083cd1..ceff5233 100644 --- a/src/components/tablecmt/tablecmt.vue +++ b/src/components/tablecmt/tablecmt.vue @@ -208,7 +208,7 @@ onMounted(() => { var bodyContent = document.getElementById('bodys'); const _height = getWinHight(); // 设置列表的高度 - bodyContent.style.height = _height - bodyContent.getBoundingClientRect().top - 80 + 'px'; + bodyContent.style.height = _height - bodyContent.getBoundingClientRect().top - 65 + 'px'; }); interface TableColumnType { /** 表格列的key */