diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue index 01028e8..cbe71e4 100644 --- a/pages/NursingNew/component/pleasetake/common/carditem.vue +++ b/pages/NursingNew/component/pleasetake/common/carditem.vue @@ -308,7 +308,6 @@ font-weight: bold; font-size: 1.6vw; color: #222222; - height: 3vw; padding-top: 1.3vw; text-overflow: ellipsis; overflow: hidden; diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue index 3f60e47..b1caa7d 100644 --- a/pages/NursingNew/component/pleasetake/common/htditem.vue +++ b/pages/NursingNew/component/pleasetake/common/htditem.vue @@ -360,9 +360,9 @@ } >image { - width: 8.5vw; - height: 7.5vw; - margin: 1.7vw auto 0.25vw; + width: 8vw; + height: 7vw; + margin: 1vw auto 0.25vw; } } diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue index d3c3bb3..96bae86 100644 --- a/pages/NursingNew/component/pleasetake/common/submits.vue +++ b/pages/NursingNew/component/pleasetake/common/submits.vue @@ -75,7 +75,7 @@ let now = new Date(); let year = now.getFullYear(); let month = (now.getMonth() + 1)<10?'0'+(now.getMonth() + 1):(now.getMonth() + 1); - let day = now.getDay()<10?'0'+now.getDay():now.getDay(); + let day = now.getDate()<10?'0'+now.getDate():now.getDate(); times.value = year+'.'+month+'.'+day }) const wuobj = ref({}) diff --git a/pages/NursingNew/component/pleasetake/common/takeing.vue b/pages/NursingNew/component/pleasetake/common/takeing.vue index 9fde54b..4c3e8c5 100644 --- a/pages/NursingNew/component/pleasetake/common/takeing.vue +++ b/pages/NursingNew/component/pleasetake/common/takeing.vue @@ -53,7 +53,15 @@ - + 清零 + + + + + {{item}} @@ -158,8 +166,22 @@ stringShow.value = toFixed4ByPadStart(relNumber.value) // emit('jjnum',e) } + const times = ref(false) const closeIt = () => { - emit('right', relNumber.value,props.objtake ) + if(relNumber.value == 0){ + uni.showToast({ + icon:'none', + title:"数量不能为0!" + }) + return + } + if(times.value == false){ + times.value = true; + emit('right', relNumber.value,props.objtake ) + setTimeout(()=>{ + times.value = false; + },1500) + } } function digitCountByString(n) { const s = Math.abs(n).toString(); diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue index 75c707d..28a7714 100644 --- a/pages/NursingNew/component/pleasetake/component/takehomep.vue +++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue @@ -128,8 +128,6 @@ const status = ref('loadmore') const config = ()=>{ queryInvoicingList(form).then(res=>{ - console.log(res) - console.log(form) res.result.records.forEach(item=>{ item.zk = false; item.scrollleft = 0; diff --git a/pages/procurement/common/takeing.vue b/pages/procurement/common/takeing.vue index 6ffd26c..d245339 100644 --- a/pages/procurement/common/takeing.vue +++ b/pages/procurement/common/takeing.vue @@ -53,7 +53,15 @@ - + 清零 + + + + + {{item}} @@ -70,6 +78,7 @@ + @@ -169,8 +178,22 @@ stringShow.value = toFixed4ByPadStart(relNumber.value) // emit('jjnum',e) } + const times = ref(false) const closeIt = () => { - emit('right', relNumber.value,props.objtake ) + if(relNumber.value == 0){ + uni.showToast({ + icon:'none', + title:"数量不能为0!" + }) + return + } + if(times.value == false){ + times.value = true; + emit('right', relNumber.value,props.objtake ) + setTimeout(()=>{ + times.value = false; + },1500) + } } function digitCountByString(n) { const s = Math.abs(n).toString(); diff --git a/pages/procurement/components/inboundoutbound.vue b/pages/procurement/components/inboundoutbound.vue index c3e966d..38bd911 100644 --- a/pages/procurement/components/inboundoutbound.vue +++ b/pages/procurement/components/inboundoutbound.vue @@ -33,7 +33,7 @@ - {{v.crkType_dictText}}{{v.crkStatus_dictText}} + {{v.crkType_dictText}}-{{v.crkStatus_dictText}} {{v.content}} {{v.createTime}}