From d65845f46216b223e338b7f34c7b1b0a6a687666 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Mon, 15 Dec 2025 17:09:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/public/calendar.vue | 1 + .../component/pleasetake/common/carditem.vue | 8 +- .../component/pleasetake/common/htditem.vue | 6 +- .../component/pleasetake/common/submits.vue | 10 +- .../pleasetake/component/requestform.vue | 13 +- .../pleasetake/component/returnorder.vue | 22 ++- .../pleasetake/component/takehomep.vue | 26 ++- pages/procurement/authorization.vue | 6 +- pages/procurement/common/submits.vue | 2 +- pages/procurement/common/thitem.vue | 6 +- pages/procurement/material.vue | 4 +- pages/procurement/materialcar.vue | 8 +- pages/procurement/outbound.vue | 31 ++- pages/procurement/retstock.vue | 176 ++++++++++++++++-- 14 files changed, 246 insertions(+), 73 deletions(-) diff --git a/component/public/calendar.vue b/component/public/calendar.vue index a1a99fb..2590a87 100644 --- a/component/public/calendar.vue +++ b/component/public/calendar.vue @@ -252,6 +252,7 @@ box-shadow: 0 2px 6px rgba(0, 0, 0, 0.1); // max-width: 720rpx; margin: 0 auto; + overflow: hidden; } .header { diff --git a/pages/NursingNew/component/pleasetake/common/carditem.vue b/pages/NursingNew/component/pleasetake/common/carditem.vue index 4a802b7..5539007 100644 --- a/pages/NursingNew/component/pleasetake/common/carditem.vue +++ b/pages/NursingNew/component/pleasetake/common/carditem.vue @@ -230,7 +230,7 @@ top:0; left: 10vw; >view { - margin-top: 0.25vw; + margin-top: 0vw; &:nth-child(3) { width: 100%; @@ -308,7 +308,7 @@ font-weight: bold; font-size: 1.6vw; color: #222222; - padding-top: 1.3vw; + padding-top: 1vw; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -363,7 +363,7 @@ >image { width: 8.5vw; height: 7.5vw; - margin: 0.7vw auto 0.25vw; + margin: 0vw auto 0.25vw; } } @@ -384,7 +384,7 @@ height: 13vw; margin-bottom: 0.9vw; .carditem{ - width: 27.5vw; + width: 28.3vw; height: 13vw; background: rgba(245, 246, 248, 1); border-radius: 1.1vw; diff --git a/pages/NursingNew/component/pleasetake/common/htditem.vue b/pages/NursingNew/component/pleasetake/common/htditem.vue index 4c75341..92eb781 100644 --- a/pages/NursingNew/component/pleasetake/common/htditem.vue +++ b/pages/NursingNew/component/pleasetake/common/htditem.vue @@ -228,7 +228,7 @@ top:0; left: 10vw; >view { - margin-top: 0.25vw; + margin-top: 0vw; &:nth-child(3) { width: 100%; @@ -307,7 +307,7 @@ font-size: 1.6vw; color: #222222; height: 3vw; - padding-top: 1.2vw; + padding-top: 1vw; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -362,7 +362,7 @@ >image { width: 8vw; height: 7vw; - margin: 1vw auto 0.25vw; + margin: 0.3vw auto 0.25vw; } } diff --git a/pages/NursingNew/component/pleasetake/common/submits.vue b/pages/NursingNew/component/pleasetake/common/submits.vue index 190d2a5..2792a67 100644 --- a/pages/NursingNew/component/pleasetake/common/submits.vue +++ b/pages/NursingNew/component/pleasetake/common/submits.vue @@ -132,7 +132,7 @@ top:0; left: 10vw; >view { - margin-top: 0.25vw; + margin-top: 0vw; &:nth-child(3) { width: 100%; @@ -211,7 +211,7 @@ font-size: 1.6vw; color: #222222; height: 3vw; - padding-top: 1.2vw; + padding-top: 1vw; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -252,9 +252,9 @@ } >image { - width: 8.5vw; - height: 7.5vw; - margin: 0.7vw auto 0.25vw; + width: 7vw; + height: 7vw; + margin: 0.5vw auto 0.25vw; } } } diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue index 5dd5509..64524bf 100644 --- a/pages/NursingNew/component/pleasetake/component/requestform.vue +++ b/pages/NursingNew/component/pleasetake/component/requestform.vue @@ -440,8 +440,15 @@ const badshow = ref(false) const zuofei = () => { + let data = { + qldNo: plsbuy.value[lefttarget.value].qldNo, + nuId: uni.getStorageSync('nuId'), + elderId: uni.getStorageSync('NUall').elderId, + nuName: uni.getStorageSync('nuName'), + elderName: uni.getStorageSync(`NUall`).elderInfo.name - cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => { + } + cancellation(data).then((res : any) => { console.log('作废', res) badshow.value = false if (res.success) { @@ -933,8 +940,8 @@ align-items: center; .left-image { - width: 150rpx; - height: 150rpx; + width: 140rpx; + height: 140rpx; // margin: 15rpx 0; margin-top: 10rpx; margin-bottom: 15rpx; diff --git a/pages/NursingNew/component/pleasetake/component/returnorder.vue b/pages/NursingNew/component/pleasetake/component/returnorder.vue index b040927..950542e 100644 --- a/pages/NursingNew/component/pleasetake/component/returnorder.vue +++ b/pages/NursingNew/component/pleasetake/component/returnorder.vue @@ -288,8 +288,8 @@ plsbuy.value = []; // console.log(res) plsbuy.value.push(...res.result.records) - console.log("入参", plzinfo) - console.log("查看数组", res.result.records) + // console.log("入参", plzinfo) + // console.log("查看数组", res.result.records) alltotal.value = res.result.total // console.log("请购单数据呢???", res) @@ -313,7 +313,7 @@ if(res.success){ rightinfolist(); }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -377,7 +377,7 @@ if(res.success){ rightinfolist(); }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -385,8 +385,15 @@ const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') const badshow = ref(false) const zuofei = () => { - - cancellation({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => { + let data = { + qldNo: plsbuy.value[lefttarget.value].qldNo, + nuId: uni.getStorageSync('nuId'), + elderId: uni.getStorageSync('NUall').elderId, + nuName: uni.getStorageSync('nuName'), + elderName: uni.getStorageSync(`NUall`).elderInfo.name + + } + cancellation(data).then((res : any) => { badshow.value = false if (res.success) { plsbuy.value[lefttarget.value] = res.result.result @@ -413,6 +420,7 @@ } const tijiaoshow = ref(false); const tijiao = ()=>{ + let obj = { nuId:plzinfo.nuId, elderId:plzinfo.elderId, @@ -435,7 +443,7 @@ rightinfolist(); },800) }else{ - errmsg.value = res.result.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue index c44cdd3..af4c977 100644 --- a/pages/NursingNew/component/pleasetake/component/takehomep.vue +++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue @@ -134,7 +134,7 @@ nuId: uni.getStorageSync('nuId') } queryQld(plzinfo0).then((res : any) => { - if ( res.result.records.length) { + if (res.result.records.length) { isRead.value = true; } else { isRead.value = false; @@ -149,7 +149,7 @@ nuId: uni.getStorageSync('nuId') } queryQld(plzinfo1).then((res : any) => { - // console.log("22",res.result) + // console.log("22",res.result) if (res.result.records.length) { isQingling.value = true; } else { @@ -181,7 +181,13 @@ }) } const thclk = () => { - requireTH({ nuId: form.nuId, elderId: form.elderId }).then(res => { + + let data = { + nuId: uni.getStorageSync('nuId'), + elderId: uni.getStorageSync('NUall').elderId, + nuName: uni.getStorageSync('nuName'), + } + requireTH(data).then(res => { if (res.success) { thshow.value = false; uni.showToast({ @@ -190,7 +196,7 @@ }) } else { thshow.value = false; - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; console.log("?????") } @@ -238,7 +244,7 @@ objtake.value.isAdd = null; objtake.value.qlNum = null; } else { - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -254,7 +260,7 @@ item.gwcId = null; }) } else { - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -304,7 +310,7 @@ config() } else { - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -331,7 +337,7 @@ v.qlNum = e; wuliao(); } else { - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) @@ -344,7 +350,7 @@ elderName: uni.getStorageSync(`NUall`).elderInfo.name } submitQld(obj).then(res => { - console.log("?????",obj,res) + console.log("?????111", obj, res) if (res.success && res.result.status == 'success') { uni.showToast({ icon: 'success', @@ -357,7 +363,7 @@ }, 800) } else { // console.log("!!!!!",res) - errmsg.value = res.result.message ? res.result.message : res.message + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) diff --git a/pages/procurement/authorization.vue b/pages/procurement/authorization.vue index e84be51..bcdd320 100644 --- a/pages/procurement/authorization.vue +++ b/pages/procurement/authorization.vue @@ -400,7 +400,7 @@ top:0; left: 10vw; >view { - margin-top: 0.25vw; + margin-top: 0vw; &:nth-child(3) { width: 100%; @@ -479,7 +479,7 @@ font-size: 1.6vw; color: #222222; height: 3vw; - padding-top: 1.3vw; + padding-top: 1vw; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -534,7 +534,7 @@ >image { width: 7.5vw; height: 7.5vw; - margin: 0.5vw auto 0.25vw; + margin: 0vw auto 0.25vw; } } diff --git a/pages/procurement/common/submits.vue b/pages/procurement/common/submits.vue index 9f878e9..79a9dda 100644 --- a/pages/procurement/common/submits.vue +++ b/pages/procurement/common/submits.vue @@ -114,7 +114,7 @@ top: 8vw; left: 20vw; z-index: 200; - padding: 1vw 1.4vw; + padding: 1vw 2vw; .wuliaolist { width: 100%; diff --git a/pages/procurement/common/thitem.vue b/pages/procurement/common/thitem.vue index 69fdc3e..bb1fcb1 100644 --- a/pages/procurement/common/thitem.vue +++ b/pages/procurement/common/thitem.vue @@ -232,7 +232,7 @@ top:0; left: 10vw; >view { - margin-top: 0.25vw; + margin-top: 0vw; &:nth-child(3) { width: 100%; @@ -311,7 +311,7 @@ font-size: 1.6vw; color: #222222; height: 3.1vw; - padding-top: 1.3vw; + padding-top: 1vw; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; @@ -366,7 +366,7 @@ >image { width: 7.5vw; height: 7.5vw; - margin: 0.3vw auto 0.25vw; + margin: 0vw auto 0.25vw; } } diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index 888bb93..d2c4d17 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -400,7 +400,7 @@ title:res.message }) }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; adfangdou.value = true; } @@ -705,7 +705,7 @@ display: flex; justify-content: center; letter-spacing: 3px; - font-size: 1.4vw; + font-size: 1.5vw; position: relative; z-index: 100; } diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index 3f22708..cda2b1d 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -159,7 +159,7 @@ InvoicingList.value = []; chongzhi() }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } open.value = 0; @@ -187,7 +187,7 @@ classication.value.getTreelnum() },800) }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } @@ -235,7 +235,7 @@ title:res.message }) }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } adfangdou.value = true; @@ -270,7 +270,7 @@ caigouflag.value = true; uni.hideLoading(); }else{ - errmsg.value = res.message; + errmsg.value = res.result?.message ? res.result?.message : res.message openerror.value = true; } }) diff --git a/pages/procurement/outbound.vue b/pages/procurement/outbound.vue index 4844574..309f65d 100644 --- a/pages/procurement/outbound.vue +++ b/pages/procurement/outbound.vue @@ -29,8 +29,7 @@ 批量选择 - + 回退 @@ -379,7 +378,7 @@ rightarray.value.push(...element.result) rightdonghua.value = true; }) - }else{ + } else { rightarray.value = [] } @@ -473,9 +472,15 @@ }) const badshow = ref(false) const huitui = () => { + console.log("????",uni.getStorageSync(`NUall`)) + let data = { + qldNo: plsbuy.value[lefttarget.value].qldNo, + nuId: uni.getStorageSync('nuId'), + nuName: uni.getStorageSync('nuName'), - orderReturn({ qldNo: plsbuy.value[lefttarget.value].qldNo }).then((res : any) => { - // console.log('回退', res) + } + orderReturn(data).then((res : any) => { + console.log('回退', res) badshow.value = false if (res.success) { plsbuy.value[lefttarget.value] = res.result.result @@ -548,7 +553,7 @@ } } const huituiclick = () => { - if(manyselect.value){ + if (manyselect.value) { console.log("55555") selectarray.value = []; manyselect.value = false @@ -556,8 +561,8 @@ setTimeout(() => { leftscrolltop.value = 0 }, 50) - }else{ - + } else { + badshow.value = true } } @@ -576,7 +581,15 @@ qinglingshow.value = true return } - outbound({ qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo }).then((res : any) => { + let data = { + qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo, + nuId: uni.getStorageSync('nuId'), + // elderId: uni.getStorageSync('NUall').elderId, + nuName: uni.getStorageSync('nuName'), + // elderName: uni.getStorageSync(`NUall`).elderInfo.name + + } + outbound(data).then((res : any) => { selectarray.value = []; manyselect.value = false chukushow.value = false diff --git a/pages/procurement/retstock.vue b/pages/procurement/retstock.vue index 4d51374..1a6b142 100644 --- a/pages/procurement/retstock.vue +++ b/pages/procurement/retstock.vue @@ -2,16 +2,38 @@ - - - + + + + 开始日期 + + + {{ form.showstart }} + + + + 至 + + + 结束日期 + + + {{ form.showend }} + + + + - + 检索 - + + + + 重置 + + @@ -96,6 +118,13 @@ + + + + + + @@ -103,15 +132,23 @@ import { ref, onMounted, reactive, onBeforeUnmount, computed, nextTick, defineComponent } from 'vue'; import { onShow, onLoad, onHide, onPageScroll } from "@dcloudio/uni-app" import { thdList, transRead, thdNuMaterialList, addThc, thcList, removeWl, removeAll, submitThd, startServe, finishServe } from './api/lunpan.js' - const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') + import thwl from './common/thwl.vue' import thitem from './common/thitem.vue' import tanchuang from './components/tanchuang.vue' import submits from './common/submits.vue' + import calendar from '@/component/public/calendar.vue' + + const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') + const opendata = ref(false); const form = reactive({ pageNo: 1, pageSize: 10, - searchContent: '' + searchContent: '', + fqStartTime: "", + fqEndTime: "", + showstart:"", + showend:"" }) const tanshow = ref(false) const subshow = ref(false) @@ -187,12 +224,7 @@ } }) } - const search = (e) => { - if (e == 0) { form.searchContent = '' } - form.pageNo = 1; - tharrlist.value = []; - thlist() - } + const status = ref('loadmore') const plsbuytolower = () => { if (status.value == 'loading' || status.value == 'nomore') { return } @@ -217,7 +249,7 @@ console.log(res) cardarr.value = res.result }) - + } }) } @@ -314,6 +346,36 @@ } }) } + type datetype = { + start : string, + end : string + } + // 销毁日历 + const xiaohui = ref(true); + const chongzhi = () => { + xiaohui.value = false; + setTimeout(() => { + xiaohui.value = true; + }, 300) + form.showstart = "" + form.showend = "" + form.fqStartTime = ""; + form.fqEndTime = ""; + form.pageNo = 1; + tharrlist.value = []; + thlist() + } + const dateget = (res : datetype) => { + console.log("res", res) + form.showstart = res.start.replace(/-/g, '.') + form.showend = res.end.replace(/-/g, '.') + form.fqStartTime = res.start.replace(/-/g, '.') + ` 00:00:00`; + form.fqEndTime = res.end.replace(/-/g, '.') + ` 00:00:00`; + form.pageNo = 1; + tharrlist.value = []; + console.log("0000",form) + thlist() + }