diff --git a/pages/NursingNew/component/pleasetake/common/medetails.vue b/pages/NursingNew/component/pleasetake/common/medetails.vue index 94470ab..6fe1ff6 100644 --- a/pages/NursingNew/component/pleasetake/common/medetails.vue +++ b/pages/NursingNew/component/pleasetake/common/medetails.vue @@ -143,9 +143,10 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } justify-content: flex-start; .leftbox { - width: 14.2vw; + width: 15.2vw; height: 100%; border-right: 2px solid #f2f2f2; + padding-left: 0.2vw; .cardfa { width: 100%; margin-top: 0.6vw; @@ -153,20 +154,26 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } align-items: center; flex-wrap: wrap; view { - width: 6vw; height: 2vw; border-radius: 1vw; border: 1px solid #D2D2D2; font-weight: 400; - font-size: 1.1vw; + font-size: 0.9vw; color: #555555; - display: flex; - justify-content: center; - align-items: center; - margin: 0.25vw 0 0 0.3vw; + padding: 0 0.4vw; + margin: 0.5vw 0 0 0.25vw; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; + display: inline-block; + text-align: center; + line-height: 2.1vw; + &:nth-child(1),&:nth-child(2){ + width: 6vw; + } + &:nth-child(3){ + max-width: 8vw; + } } } .img{ @@ -174,8 +181,7 @@ import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } background: #f8f8f8; width: 10.2vw; height: 9.2vw; - padding: 0.2vw; - margin: 0.3vw auto; + margin: 0.3vw 0 0 1vw; border-radius: 1.6vw; >image { width: 100%; diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue index 9aff7bc..c0d6de0 100644 --- a/pages/NursingNew/component/pleasetake/common/takerecord.vue +++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue @@ -268,7 +268,6 @@ // justify-content: space-around; view { - max-width: 6vw; height: 2vw; border-radius: 1vw; border: 1px solid #D2D2D2; @@ -283,7 +282,12 @@ display: inline-block; text-align: center; line-height: 2.1vw; - + &:nth-child(1),&:nth-child(2){ + width: 5vw; + } + &:nth-child(3){ + max-width: 8vw; + } } } .bgimg{ diff --git a/pages/Warehouse/index/index.vue b/pages/Warehouse/index/index.vue index 2605f2a..57211c8 100644 --- a/pages/Warehouse/index/index.vue +++ b/pages/Warehouse/index/index.vue @@ -146,8 +146,6 @@ const swip = ()=>{ let nuId = uni.getStorageSync('nuId'); getPermissionList({employessId:uni.getStorageSync('userInfo').employessId}).then(res=>{ - console.log(res) - console.log(nuId) res.result.forEach(item=>{ if(item.nuId == nuId){ listarr.value = item.dataList diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index d30589a..c30b6e5 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -960,14 +960,14 @@ - + 到货单价: - + ¥{{Number(item.newPrice).toFixed(2)}} - + {{item.createTime.replace(/-/g, '.')}} diff --git a/pages/procurement/components/addall.vue b/pages/procurement/components/addall.vue index 6303e05..d251c72 100644 --- a/pages/procurement/components/addall.vue +++ b/pages/procurement/components/addall.vue @@ -41,7 +41,8 @@ },1800) }else{ this.errmsg = res.message; - this.openerror = true + this.openerror = true; + this.$emit('back') } }) diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js index 12310ff..04100f2 100644 --- a/unpackage/dist/dev/.nvue/pages/camera.js +++ b/unpackage/dist/dev/.nvue/pages/camera.js @@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]); +const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]); export { camera as default }; diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js index a0a8c0f..f69ae1a 100644 --- a/unpackage/dist/dev/.nvue/pages/fullcamera.js +++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js @@ -578,7 +578,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) { ) ]); } -const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]); +const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]); export { fullcamera as default };