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/3] =?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/3] =?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/3] =?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; + } +}