From ca60f4fca70a2ead893b44a8eb4e6446068c1a28 Mon Sep 17 00:00:00 2001 From: Teng <461587751@qq.com> Date: Fri, 6 Mar 2026 16:34:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- component/public/huakuai.vue | 3 - pages/NursingNew/component/index.vue | 6 +- .../component/leftcontent/serveswipe.vue | 62 +++---------------- pages/NursingNew/component/nurse/bigindex.vue | 6 +- pages/NursingNew/component/nurse/newindex.vue | 6 -- pages/Warehouse/finish.vue | 8 +-- pages/Warehouse/index/component/index.vue | 4 +- pages/Warehouse/picking.vue | 2 +- pages/login/login.vue | 31 ---------- pages/procurement/components/nomessage.vue | 22 +++---- pages/procurement/components/purorder.vue | 2 +- pages/procurement/material.vue | 6 +- pages/procurement/materialcar.vue | 2 +- pages/procurement/purchaseorder.vue | 7 ++- 14 files changed, 42 insertions(+), 125 deletions(-) diff --git a/component/public/huakuai.vue b/component/public/huakuai.vue index 2f3f615..ef8f9f1 100644 --- a/component/public/huakuai.vue +++ b/component/public/huakuai.vue @@ -149,7 +149,6 @@ function onEnd() { icon: 'none', duration: 2000 }) - // console.log("????", originX.value) emit('success') } else { offsetX.value = 0 @@ -166,10 +165,8 @@ onMounted(() => { 'https://www.focusnu.com/media/directive/login/0.png', 'https://www.focusnu.com/media/directive/login/1.png', 'https://www.focusnu.com/media/directive/login/2.png', - // 'https://www.focusnu.com/media/directive/login/3.png' ] bgImage.value = images[Math.floor(Math.random() * images.length)] - console.log('加载图片:', bgImage.value) }) diff --git a/pages/NursingNew/component/index.vue b/pages/NursingNew/component/index.vue index 075f968..cd8a96d 100644 --- a/pages/NursingNew/component/index.vue +++ b/pages/NursingNew/component/index.vue @@ -1240,7 +1240,7 @@ .submit { width: 100%; height: 3.2vw; - margin-top: 0.4vw; + margin-top: 6vw; padding-right: 0.2vw; display: flex; justify-content: flex-end; @@ -1362,7 +1362,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 1.5vw; + font-size: 35rpx; color: #333333; display: flex; align-items: center; @@ -1458,7 +1458,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 1.4vw; + font-size: 35rpx; color: #333333; display: flex; align-items: center; diff --git a/pages/NursingNew/component/leftcontent/serveswipe.vue b/pages/NursingNew/component/leftcontent/serveswipe.vue index 57a606e..fc4bc96 100644 --- a/pages/NursingNew/component/leftcontent/serveswipe.vue +++ b/pages/NursingNew/component/leftcontent/serveswipe.vue @@ -8,10 +8,6 @@ 暂无服务指令 - @@ -25,12 +21,6 @@ - @@ -113,8 +103,6 @@ :src="indexmessage?.previewFile? serverUrl + indexmessage?.previewFile: `/static/index/noorder1.png`" mode="heightFix" /> - {{ indexmessage?.directiveName }} @@ -175,7 +163,6 @@ - @@ -196,14 +183,12 @@ - - @@ -234,12 +219,7 @@ - - @@ -290,13 +270,6 @@ - - - @@ -325,7 +296,7 @@ const topbuttontarget = ref(0); const ilanarr = ref([]); const listobj = ref({}); - // const photoplay = ref(false) + const serverUrl = ref(uni.getStorageSync('imagebase')) const servervideoUrl = ref(uni.getStorageSync('serverUrl') + '/sys/commonVideo/staticVideo/') const serverpicUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/') @@ -334,7 +305,7 @@ const autoplay = ref(false) const severcards = ref>() const init = (e) => { - // console.log("啥啊",e) + firstgetqueryCgdList(e); setTimeout(() => { severcards.value.firstgetqueryCgdList() @@ -362,10 +333,7 @@ let timestampMs = new Date(obj.endTime).getTime(); let times = new Date().getTime(); let djs = timestampMs - times; - // let timeendamp = timestampMs + (Number(plsbuy.value[current.value].timeoutDuration)*60); - console.log(timestampMs, '结束时间戳') - console.log(times, '当前时间戳') - console.log(Math.round(djs / 1000), '倒计时时间戳') + djstinme.value = Math.round(djs / 1000); if (djstinme.value < 0) { plsbuy.value[current.value].chaoshitime = true @@ -390,7 +358,7 @@ } current.value += e; current2.value = current.value - // console.log(current.value, current.value) + } const form = reactive({ pageNo: 1, @@ -401,7 +369,6 @@ }) onMounted(() => { setTimeout(() => { - // photoplay.value = true; current.value = 0; }, 500) }) @@ -413,18 +380,11 @@ openerror.value = true return } - // else { - // font.value = '敬请期待~' - // open.value = 3 - // return - // } // 打包过不了校验 queryEmpList({ id: uni.getStorageSync('userInfo').id }).then(res => { - console.log(res) zdxzarr.value = res.result; zdxzarr.value.forEach(item => { item.flag = false - // console.log(item.headPath) }) zdxzdex.value = e; }) @@ -432,9 +392,7 @@ const plsbuy = ref([]) const flag = ref(false) const zdwu = (e, k) => { - // console.log("点完咋不好使啊",zdxzdex.value) if (zdxzdex.value == 1) { - // console.log("???????",e.flag) e.flag = !e.flag; zdxzarr.value.forEach((item, i) => { if (i != k) { @@ -547,7 +505,6 @@ return result; } const clickLeftMenu = (index : any, item : object) => { - // console.log("/////") queryOrderInfoList({ mainId: item.id }).then(res => { if (res.result.length > 0) { res.result.forEach((item, i) => { @@ -555,7 +512,6 @@ item.match = splitString(item.directiveName) }) plsbuy.value[index].servebao = res.result - // console.log("啥",plsbuy.value) } }) } @@ -771,9 +727,9 @@ } const ends = () => { - console.log("看看传的", { id: endobj.value.id }) + // console.log("看看传的", { id: endobj.value.id }) endOrder({ id: endobj.value.id }).then(res => { - console.log(res) + // console.log(res) if (res.success) { open.value = 0; endobj.value = {}; @@ -1260,6 +1216,7 @@ margin-right: 10rpx; font-weight: 600; margin-top: 1vw; + z-index: 1; } .server-bgc { @@ -1805,7 +1762,7 @@ margin-bottom: 20rpx; .photowall-name { - font-size: 38rpx; + font-size: 35rpx; // font-weight: 600; } @@ -1995,7 +1952,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 1.4vw; + font-size: 35rpx; color: #333333; display: flex; align-items: center; @@ -2054,6 +2011,7 @@ border: 2px solid #f8f8f8; width: 16.5vw; margin-right: 1.6vw;; + margin-bottom: 1.6vw; height: 17vw; border-radius: 1.1vw; background: #fff; diff --git a/pages/NursingNew/component/nurse/bigindex.vue b/pages/NursingNew/component/nurse/bigindex.vue index e747236..93ae534 100644 --- a/pages/NursingNew/component/nurse/bigindex.vue +++ b/pages/NursingNew/component/nurse/bigindex.vue @@ -281,8 +281,7 @@ {{ splitString(item.directiveName)[0]}} - ({{ splitString(item.directiveName)[1]}}) @@ -323,8 +322,7 @@ {{ splitString(item.directiveName)[0]}} - ({{ splitString(item.directiveName)[1]}}) diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue index 5e6ff75..96f49be 100644 --- a/pages/NursingNew/component/nurse/newindex.vue +++ b/pages/NursingNew/component/nurse/newindex.vue @@ -737,7 +737,6 @@ ({{ splitString(postitem.directiveName)[1]}}) - {{ postitem.startTime }} @@ -816,7 +815,6 @@ const nextpageing = ref(false) let nextPageTimer = null - // 组件卸载时清理 onBeforeUnmount(() => { if (nextPageTimer) { @@ -828,12 +826,10 @@ if (oldVal[0] === 2) { // 每次触发都立即设为 true nextpageing.value = true - // 重置定时器（如果已有） if (nextPageTimer) { clearTimeout(nextPageTimer) } - // 1 秒后如果未再次触发则设为 false nextPageTimer = setTimeout(() => { nextpageing.value = false @@ -854,7 +850,6 @@ { deep: true }); watch(() => props.canmove, (newVal, oldVal) => { if (oldVal === false && newVal === true) { - // console.log("结束") isTuoing.value = false; canmovechange.value = true; if (props.isblue == 1) { @@ -863,7 +858,6 @@ getNew() } else if (props.isblue == 3) { - // console.log("删除这个", postitem.value) isDelete.value = true; deletedonghua.value = false; setTimeout(() => deletedonghua.value = true, 50) diff --git a/pages/Warehouse/finish.vue b/pages/Warehouse/finish.vue index 6c65d26..356d549 100644 --- a/pages/Warehouse/finish.vue +++ b/pages/Warehouse/finish.vue @@ -1429,7 +1429,7 @@ const lefttarget = ref(0); const clickLeftMenu = (index : any, item : any) => { let num = Math.ceil((index + 1)) - leftscrolltop.value = (num - 2) * 188.5; + leftscrolltop.value = (num - 2) * 198; lefttarget.value = index; form.cgdId = plsbuy.value[index].id form.pageNo = 1 @@ -2275,11 +2275,9 @@ .left-menu-father { margin-top: 10rpx; - height: 90vh; + height: 91vh; max-width: 590rpx; min-width: 590rpx; - // background-color: blue; - // background-color: red; .left-menu-scroll { height: 100%; @@ -2287,7 +2285,7 @@ .pls-card { width: 100%; - height: 358rpx; + height: 390rpx; border: transparent 3rpx solid; background-color: #fff; border-radius: 40rpx; diff --git a/pages/Warehouse/index/component/index.vue b/pages/Warehouse/index/component/index.vue index 4d4c403..6278dea 100644 --- a/pages/Warehouse/index/component/index.vue +++ b/pages/Warehouse/index/component/index.vue @@ -1249,7 +1249,7 @@ .submit { width: 100%; height: 3.2vw; - margin-top: 0.4vw; + margin-top: 6vw; padding-right: 0.2vw; display: flex; justify-content: flex-end; @@ -1371,7 +1371,7 @@ .tittop { height: 2vw; font-weight: 400; - font-size: 1.5vw; + font-size: 35rpx; color: #333333; display: flex; align-items: center; diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue index fdfd164..b11e596 100644 --- a/pages/Warehouse/picking.vue +++ b/pages/Warehouse/picking.vue @@ -129,7 +129,7 @@ 物料信息 - ￥{{showvalue.totalPrice}} + ￥{{Number(showvalue.totalPrice).toFixed(2)}} diff --git a/pages/login/login.vue b/pages/login/login.vue index 25fb674..15713c9 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -114,9 +114,7 @@ - 确定 - @@ -220,7 +218,6 @@ const getImg = () => { if (/^\d{11}$/.test(form.username)) { isRel(form.username).then((res : any) => { - console.log("啥啊", res.result) if (res.result.code == `0`) { if(!res.result.orgList.length){ uni.showToast({ @@ -230,17 +227,14 @@ }) return } - // console.log("又咋了啊") uni.setStorageSync('serverUrl', res.result.orgList[0].serverUrl); uni.setStorageSync('orgList', res.result.orgList); uni.setStorageSync('orgListName', res.result.orgList[0].departName); uni.setStorageSync('orgListCode', res.result.orgList[0].orgCode); - allserve.value = res.result.orgList time.value = Date.now(); getLoginCode(time.value).then((res : any) => { - console.log("获取验证码", res) form.captcha = res.message canclick.value = true }) @@ -257,7 +251,6 @@ }) canclick.value = false; } - }) } else { if (form.username) { @@ -276,7 +269,6 @@ const login = () => { if (isTarget.value) { huakuaiOpen.value = true; - } else { openbottom.value = true; } @@ -293,15 +285,12 @@ } jumpFirst.value = true; } - } const loading = ref(0) - const selectserve = ref(false); const huakuaiOK = () => { uni.setStorageSync('form', form); if (allserve.value.length > 1) { - // console.log("aaaaaa"); huakuaiOpen.value = false; selectserve.value = true; } else { @@ -314,22 +303,16 @@ uni.setStorageSync('serverUrl', item.serverUrl); uni.setStorageSync('orgListName', item.departName); uni.setStorageSync('orgListCode', item.orgCode); - - setTimeout(() => { - // gotoindex() getLoginCode(time.value).then((res : any) => { - console.log("啥啊", res,index) form.captcha = res.message if (index) { loginApp(form).then(res => { - if (res.success) { uni.setStorageSync('token', res.result.token); uni.setStorageSync('username', form.username); uni.setStorageSync('realname', res.result.userInfo.realname); uni.setStorageSync('userInfo', res.result.userInfo); - gotoindex() } else { uni.showToast({ @@ -343,15 +326,12 @@ gotoindex() } }) - }, 500) - } const huakuaisuccess = () => { form.checkKey = time.value huakuaiOpen.value = false loginApp(form).then(res => { - console.log("没有id吗",res) if (res.success) { uni.showToast({ title: res.message, @@ -362,7 +342,6 @@ uni.setStorageSync('username', form.username); uni.setStorageSync('realname', res.result.userInfo.realname); uni.setStorageSync('userInfo', res.result.userInfo); - // huakuaiOK() if (loading.value === 2) { huakuaiOK() } else { @@ -377,14 +356,6 @@ } }) } - // // 生命周期钩子 - // onLoad(() => { - - // }); - // // 生命周期钩子 - // onShow(() => { - - // }); function init() { var monitorModule = uni.requireNativePlugin("MonitorModule") @@ -558,7 +529,6 @@ margin-left: 30rpx; width: 100%; height: 100rpx; - // margin-top: 50rpx; } .popup-wrapper { @@ -671,7 +641,6 @@ display: flex; align-items: center; } - } .box { diff --git a/pages/procurement/components/nomessage.vue b/pages/procurement/components/nomessage.vue index 297c13a..09c006f 100644 --- a/pages/procurement/components/nomessage.vue +++ b/pages/procurement/components/nomessage.vue @@ -27,10 +27,10 @@ \ No newline at end of file diff --git a/pages/procurement/components/purorder.vue b/pages/procurement/components/purorder.vue index f34e796..3be3c03 100644 --- a/pages/procurement/components/purorder.vue +++ b/pages/procurement/components/purorder.vue @@ -494,9 +494,9 @@ margin: 0.8vw auto 0.25vw; padding: 0.2vw; background: #fff; - border-radius: 1.1vw; >image { + border-radius: 1vw; width: 100%; height: 100%; } diff --git a/pages/procurement/material.vue b/pages/procurement/material.vue index 94dd7ad..6fe2025 100644 --- a/pages/procurement/material.vue +++ b/pages/procurement/material.vue @@ -215,7 +215,7 @@ queryInvoicingList(form).then(res => { if (res.result.records.length) { shownomessage.value = false; - } else { + } else if(!InvoicingList.value.length){ shownomessage.value = true; } res.result.records.forEach(item => { @@ -463,6 +463,8 @@ dhbl: type.num } addShoppingCartList([dt]).then(res => { + console.log("啥啊",[dt]) + console.log("返回啥啊",res) if (res.success) { uni.showToast({ icon: res.success ? 'success' : 'none', @@ -912,7 +914,7 @@ line-height: 1.75vw; position: absolute; top: 0.8vw; - right: 0.8vw; + left: 0.8vw; } image { diff --git a/pages/procurement/materialcar.vue b/pages/procurement/materialcar.vue index 4540db4..9efd1f4 100644 --- a/pages/procurement/materialcar.vue +++ b/pages/procurement/materialcar.vue @@ -3,7 +3,7 @@ - + diff --git a/pages/procurement/purchaseorder.vue b/pages/procurement/purchaseorder.vue index 02d14b5..45ce3fb 100644 --- a/pages/procurement/purchaseorder.vue +++ b/pages/procurement/purchaseorder.vue @@ -133,19 +133,19 @@ - + 暂无数据 - + 暂无数据 - + 暂无数据 @@ -1705,6 +1705,7 @@ display: flex; justify-content: center; align-items: center; + } .contain-right-nomessage {