diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue
index 2a65a19..7345271 100644
--- a/pages/NursingNew/component/index.vue
+++ b/pages/NursingNew/component/index.vue
@@ -148,9 +148,13 @@
-
+
- {{ indexmessage?.directiveName }}
+ {{ indexmessage?.directiveName }}
+
+
+
+ {{indexmessage.categoryName}}
@@ -723,6 +727,7 @@
}
const clickLeftMenu = (index : any, item : object) => {
queryOrderInfoList({ mainId: item.id }).then(res => {
+ console.log(res)
if(res.result.length>0){
indexmessage.value = res.result[0]
}else{
@@ -1720,12 +1725,6 @@
left: 0%;
width: 120%;
height: 120rpx;
- background: linear-gradient(to bottom,
- rgba(239, 240, 244, 1) 0%,
- /* #eff0f4 全不透明 */
- rgba(239, 240, 244, 0) 100%
- /* #eff0f4 完全透明 */
- );
z-index: 4;
}
@@ -1735,12 +1734,6 @@
left: 0%;
width: 120%;
height: 120rpx;
- background: linear-gradient(to top,
- rgba(239, 240, 244, 1) 0%,
- /* #eff0f4 全不透明 */
- rgba(239, 240, 244, 0) 100%
- /* #eff0f4 完全透明 */
- );
z-index: 4;
}
diff --git a/pages/NursingNew/component/pleasetake/common/takerecord.vue b/pages/NursingNew/component/pleasetake/common/takerecord.vue
index 845089f..9aff7bc 100644
--- a/pages/NursingNew/component/pleasetake/common/takerecord.vue
+++ b/pages/NursingNew/component/pleasetake/common/takerecord.vue
@@ -241,7 +241,7 @@
}
}
.cont{
- width: 38vw;
+ width: 37.5vw;
height: 14.6vw;
background: #F9F9FA;
border-radius: 1.6vw;
@@ -249,39 +249,41 @@
position: relative;
.leftbox {
- width: 13vw;
+ width: 14vw;
height: 12vw;
- border-right: 2px solid #E5E5E5;
+ border-right: 2px solid #f2f2f2;
display: flex;
flex-direction: column;
align-items: center;
position: absolute;
left: 0;
top: 1.3vw;
+ padding-left: 0.5vw;
.carditem {
- width: 100%;
- margin-top: 0.3vw;
+ width: 80%;
+ margin : 0.3vw auto 0;
display: flex;
- align-items: center;
+ justify-content: flex-start;
flex-wrap: wrap;
// justify-content: space-around;
view {
- width: 6vw;
+ max-width: 6vw;
height: 2vw;
border-radius: 1vw;
border: 1px solid #D2D2D2;
font-weight: 400;
font-size: 0.9vw;
color: #555555;
- display: flex;
- justify-content: center;
- align-items: center;
- padding: 0 0.6vw;
+ 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;
+
}
}
.bgimg{
diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index 0ba580f..67861d7 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -961,16 +961,17 @@
}
.left-tages {
- width: 130rpx;
+ min-width: 130rpx;
height: 38rpx;
border-radius: 19rpx;
- display: flex;
- justify-content: center;
- align-items: center;
color: #555555;
border: 1rpx solid #D2D2D2;
margin-bottom:0.2vw;
font-size: 19rpx;
+ text-align: center;
+ line-height: 40rpx;
+ white-space: nowrap;
+ padding: 0 0.4vw;
}
}
diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue
index f43af91..a2314fa 100644
--- a/pages/procurement/common/thitem.vue
+++ b/pages/procurement/common/thitem.vue
@@ -431,7 +431,7 @@
.itembox {
width: 100%;
height: calc(100vh - 22vw);
- padding: 1vw 0.5vw 1vw;
+ padding: 1vw 0.5vw 0vw;
background: #fff;
diff --git a/pages/procurement/components/addall.vue b/pages/procurement/components/addall.vue
index 47022fc..6303e05 100644
--- a/pages/procurement/components/addall.vue
+++ b/pages/procurement/components/addall.vue
@@ -11,6 +11,7 @@
确定
+
@@ -20,17 +21,29 @@
props:{
show:false,
},
+ data(){
+ return{
+ openerror:false,
+ errmsg:''
+ }
+ },
methods: {
add(){
addWaringAll({nuId: uni.getStorageSync('nuId')}).then(res=>{
- uni.showToast({
- icon:res.success?'success':'none',
- title:res.message
- })
- setTimeout(()=>{
- this.$emit('config')
- },1800)
+ if(res.success){
+ uni.showToast({
+ icon:res.success?'success':'none',
+ title:res.message
+ })
+ setTimeout(()=>{
+ this.$emit('config')
+ },1800)
+ }else{
+ this.errmsg = res.message;
+ this.openerror = true
+ }
+
})
}
}
diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue
index 0165612..afbdbcb 100644
--- a/pages/procurement/retstock.vue
+++ b/pages/procurement/retstock.vue
@@ -765,6 +765,7 @@
height: calc(100vh - 8vw);
display: flex;
justify-content: space-between;
+ padding-right: 0.6vw;
margin-top: 1vw;
.rightscr {
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
};