From fa55257cdcaa3eb5e5965169150e90d73c28581f Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 22 Dec 2025 13:19:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  4 +--
 .../component/doctorask/doctorask.vue         |  9 ++++--
 pages/login/index.vue                         | 23 ++++++++++----
 pages/watch/settings/input.vue                |  6 ++--
 pages/watch/settings/leida.vue                |  4 +--
 pages/watch/settings/menusettings.vue         | 31 ++++++++++---------
 pages/watch/settings/saoma.vue                |  4 +--
 pages/watch/settings/settings.vue             |  4 +--
 8 files changed, 52 insertions(+), 33 deletions(-)

diff --git a/manifest.json b/manifest.json
index 579d6cf..5f950fd 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "护理单元",
     "appid" : "__UNI__FB2D473",
     "description" : "护理单元",
-    "versionName" : "1.0.016",
-    "versionCode" : 10016,
+    "versionName" : "1.0.018",
+    "versionCode" : 10018,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
diff --git a/pages/NursingNew/component/doctorask/doctorask.vue b/pages/NursingNew/component/doctorask/doctorask.vue
index 463d6cf..7e920ee 100644
--- a/pages/NursingNew/component/doctorask/doctorask.vue
+++ b/pages/NursingNew/component/doctorask/doctorask.vue
@@ -73,6 +73,7 @@
 									<view class="ld"  v-if="v.izStart=='Y'&& v.izFinish=='N'" @click="end(v)">结束服务</view>
 									<view class="bd"  v-if="(v.izStart=='Y'&& v.izFinish=='N')||v.manuallyMp4Path!=null" @click="ysptp(v,i,2)">录像</view>
 									<view class="bd" v-if="(v.izStart=='Y'&& v.izFinish=='N')|| v.manuallyPicPath!=null"  @click="ysptp(v,i,1)" >拍照</view>
+									<view class="bd"  v-if="(v.izStart=='Y'&& v.izFinish=='Y')&&v.tplinkPath!=null" @click="ysptp(v,i,3)">Tplink</view>
 								</view>
 							</view>
 							
@@ -216,7 +217,7 @@
 	}
 	const firstgetqueryCgdList = () => {
 		queryCareList(form).then(res => {
-			console.log(res)
+			console.log(form)
 			plsbuy.value.push(...res.result.records);
 			status.value = res.result.total == plsbuy.value.length ? 'nomore' : 'loadmore';
 			if(form.pageNo==1){
@@ -285,7 +286,11 @@
 		}else if(r == 2&&v.manuallyMp4Path){
 			ilanarr.value = v.manuallyMp4Path.split(",");
 			ilanarr.value = ilanarr.value.filter(item => item !== '');
-		}else{
+		}else if(r == 3&&v.tplinkPath){
+			ilanarr.value = v.tplinkPath.split(",");
+			ilanarr.value = ilanarr.value.filter(item => item !== '');
+		}
+		else{
 			ilanarr.value = [];
 		}
 		
diff --git a/pages/login/index.vue b/pages/login/index.vue
index 570abab..bf2d8a5 100644
--- a/pages/login/index.vue
+++ b/pages/login/index.vue
@@ -10,7 +10,7 @@
 					{{ uni.getStorageSync('realname') }}
 				</view>
 			</view>
-			<view class="lingdang">
+			<view class="lingdang" v-show="!leftarraytarget">
 				<image class="lingdang-img" src="/static/shouye/lingdang.png" />
 				<view class="hongdian"></view>
 			</view>
@@ -30,8 +30,13 @@
 			<view class="yanfazhong" v-show="leftarraytarget==3">
 				研发中...
 			</view>
-			<view class="componentall" v-show="leftarraytarget==4">
-				<menusettings :isShow="leftarraytarget==4" />
+			<view class="componentall" v-show="leftarraytarget==4&&ldflagindex==0">
+				<menusettings :isShow="leftarraytarget==4" @leftarray="leftarray"/>
+			</view>
+			<view class="componentall" v-show="ldflagindex>9" style="margin-top: -2vh;">
+				 <leida v-if="ldflagindex==10"></leida>
+				 <saoma v-if="ldflagindex==11"></saoma>
+				 <inputing v-if="ldflagindex==12"></inputing>
 			</view>
 			<view class="componentall" v-show="leftarraytarget==1 || leftarraytarget==2">
 				<scroll-view scroll-y class="componentall" >
@@ -102,7 +107,9 @@
 	import exit from "@/component/public/exit.vue"
 	import menusettings from '@/pages/watch/settings/menusettings.vue'
 	import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
-
+	import leida from '@/pages/watch/settings/leida.vue'
+	import saoma from '@/pages/watch/settings/saoma.vue'
+	import inputing from '@/pages/watch/settings/input.vue'
 	const menuarray = ref(["", "", "", "", "", ""])
 	const leftarraytarget = ref(0);
 	// 我这么写是为了防止安卓组件被销毁
@@ -144,6 +151,10 @@
 			})
 		}
 	}
+	const ldflagindex = ref(0)
+	const leftarray =(e)=>{
+		ldflagindex.value = e;
+	}
 	const exitshow = ref(false);
 	const cardarray = ref([])
 	
@@ -162,7 +173,7 @@
 			// console.log("??11111111",cardarray.value)
 		}
 		leftarraytarget.value = index;
-
+		ldflagindex.value = 0;
 	}
 </script>
 
@@ -279,7 +290,7 @@
 	}
 	.componentall{
 		width: 100%;
-		height: 100%;
+		height: 96%;
 		// background-color: red;
 	}
 	.card-father{
diff --git a/pages/watch/settings/input.vue b/pages/watch/settings/input.vue
index ba7bed5..67a92ff 100644
--- a/pages/watch/settings/input.vue
+++ b/pages/watch/settings/input.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index-content-other">
-		<view class="index-content-right" @click="goback">
+		<!-- <view class="index-content-right" @click="goback">
 			<image class="back-img" :src="`/static/index/settings/back.png`" />
 			返回
-		</view>
+		</view> -->
 		<view class="saomiao">
 			<view class="big-ball" v-if="!allitem.nuName">
 				<view class="ball"></view>
@@ -158,7 +158,7 @@
 	.index-content-down {
 		// width: calc(100% - 60rpx);
 		// height: 100rpx;
-		position: absolute;
+		position: fixed;
 		bottom: 40rpx;
 		left: 50%;
 		transform: translateX(-50%);
diff --git a/pages/watch/settings/leida.vue b/pages/watch/settings/leida.vue
index 63f73bf..7ed9bf4 100644
--- a/pages/watch/settings/leida.vue
+++ b/pages/watch/settings/leida.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index-content-other">
-		<view class="index-content-right" @click="goback">
+		<!-- <view class="index-content-right" @click="goback">
 			<image class="back-img" :src="`/static/index/settings/back.png`" />
 			返回
-		</view>
+		</view> -->
 		<view class="left-contain">
 			<view class="blue-bgc">
 				<image class="all-img" src="/static/index/leida/leftbgc.png" />
diff --git a/pages/watch/settings/menusettings.vue b/pages/watch/settings/menusettings.vue
index f93d164..a1c7515 100644
--- a/pages/watch/settings/menusettings.vue
+++ b/pages/watch/settings/menusettings.vue
@@ -1,5 +1,5 @@
 <template>
-	<scroll-view scroll-y class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
+	<view scroll-y class="index-content-other" :style="transition?{opacity: `1`}:{opacity: `0`}">
 
 		<view class="array-father">
 			<view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)">
@@ -68,7 +68,7 @@
 		</view>
 
 		<!-- </view> -->
-	</scroll-view>
+	</view>
 	<view class="bg-mask" v-if="selectserve">
 		<view @click.stop class="white-select">
 			<view class="big-font">
@@ -88,7 +88,7 @@
 </template>
 
 <script setup lang="ts">
-	import { ref, onMounted, watch, nextTick } from 'vue'
+	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, reactive } from 'vue';
 	import exit from "@/component/public/exit.vue"
 	import reset from "@/component/public/reset.vue"
 	import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
@@ -101,7 +101,7 @@
 	const opentype = ref(false);
 	// const exitshow = ref(false);
 	const resetshow = ref(false);
-	const emit = defineEmits(['jump'])
+	const emit = defineEmits(['jump','leftarray'])
 	// const props = defineProps({ isShow: { type: Boolean, required: true } })
 	const iconsArray = ref(["雷达扫描", "扫码添加", "手动录入", "修改密码", "切换机构", "检查更新", "用户协议", "隐私政策"])
 
@@ -147,19 +147,22 @@
 	const jumpToTarget = (index : number) => {
 		switch (index) {
 			case 0:
-				uni.navigateTo({
-					url: '/pages/watch/settings/leida'
-				})
+				emit('leftarray',10)
+				// uni.navigateTo({
+				// 	url: '/pages/watch/settings/leida'
+				// })
 				break
 			case 1:
-				uni.navigateTo({
-					url: '/pages/watch/settings/saoma'
-				})
+			emit('leftarray',11)
+				// uni.navigateTo({
+				// 	url: '/pages/watch/settings/saoma'
+				// })
 				break
 			case 2:
-				uni.navigateTo({
-					url: '/pages/watch/settings/input'
-				})
+			emit('leftarray',12)
+				// uni.navigateTo({
+				// 	url: '/pages/watch/settings/input'
+				// })
 				break
 			case 3:
 				resetshow.value = true
@@ -231,7 +234,7 @@
 		align-items: center;
 		justify-content: space-between;
 		width: 100%;
-		height: 130rpx;
+		height: 115rpx;
 
 		.left-item {
 			display: flex;
diff --git a/pages/watch/settings/saoma.vue b/pages/watch/settings/saoma.vue
index 9627fc5..26aa1c3 100644
--- a/pages/watch/settings/saoma.vue
+++ b/pages/watch/settings/saoma.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index-content-other">
-		<view class="index-content-right" @click="goback">
+		<!-- <view class="index-content-right" @click="goback">
 			<image class="back-img" :src="`/static/index/settings/back.png`" />
 			返回
-		</view>
+		</view> -->
 		<view class="saomiao">
 			<view class="card" v-if="allitem.nuName">
 
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index a589fa2..bf6ac8f 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="index-content-other">
-		<view class="index-content-right" @click="goback">
+		<!-- <view class="index-content-right" @click="goback">
 			<image class="back-img" :src="`/static/index/settings/back.png`" />
 			返回
-		</view>
+		</view> -->
 		<view class="array-father">
 			<view v-for="(item,index) in iconsArray.slice(0,3)" :key="index" class="item" @click="jumpToTarget(index)">
 				<view class="left-item">

From 53f694b33cc94c0d9b791cf50926363061619630 Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Mon, 22 Dec 2025 15:27:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pleasetake/component/requestform.vue       |  4 ++--
 .../pleasetake/component/takehomep.vue         |  2 +-
 pages/Warehouse/picking.vue                    | 18 +++++++++++++-----
 pages/procurement/common/pddsub.vue            |  2 +-
 pages/procurement/inventory.vue                |  8 ++++----
 unpackage/dist/cache/.vite/deps/_metadata.json |  8 ++++----
 6 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/pages/NursingNew/component/pleasetake/component/requestform.vue b/pages/NursingNew/component/pleasetake/component/requestform.vue
index b77d29a..ec65740 100644
--- a/pages/NursingNew/component/pleasetake/component/requestform.vue
+++ b/pages/NursingNew/component/pleasetake/component/requestform.vue
@@ -950,7 +950,7 @@
 								width: 140rpx;
 								height: 140rpx;
 								margin-top: 10rpx;
-								margin-bottom: 15rpx;
+								margin-bottom: 0.2vw;
 								padding: 0.2vw;
 								border-radius: 1.1vw;
 								background: #f8f8f8;
@@ -969,7 +969,7 @@
 								align-items: center;
 								color: #555555;
 								border: 1rpx solid #D2D2D2;
-								margin-top:0.2vw;
+								margin-bottom:0.2vw;
 								font-size: 19rpx;
 							}
 						}
diff --git a/pages/NursingNew/component/pleasetake/component/takehomep.vue b/pages/NursingNew/component/pleasetake/component/takehomep.vue
index 1820fa5..54e30cf 100644
--- a/pages/NursingNew/component/pleasetake/component/takehomep.vue
+++ b/pages/NursingNew/component/pleasetake/component/takehomep.vue
@@ -194,7 +194,7 @@
 			if (res.success) {
 				thshow.value = false;
 				uni.showToast({
-					icon: 'none',
+					icon: 'success',
 					title: res.message
 				})
 			} else {
diff --git a/pages/Warehouse/picking.vue b/pages/Warehouse/picking.vue
index 4245e39..21819a7 100644
--- a/pages/Warehouse/picking.vue
+++ b/pages/Warehouse/picking.vue
@@ -1041,6 +1041,7 @@
 		<tanchuang :show="badshow" font="确定要作废这个采购单吗" @back="badshow=false;" @right="zuofei"> </tanchuang>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del()"> </tanchuang>
 		<tanchuang :show="open==2" font="是否销账此物料？" @back="open = 0" @right="sctp(1)"> </tanchuang>
+		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
 	</view>
 </template>
 
@@ -1814,6 +1815,8 @@
 		stringjh.value = toFixed4ByPadStart(showvalue.value.num)
 	}
 	// 
+	const openerror = ref(false)
+	const errmsg = ref('')
 	const fag = (e) => {
 		let str = '';
 		addupimg.value.forEach(item => {
@@ -1830,11 +1833,11 @@
 		pickingInfo(obj).then(res => {
 			console.log(`入参`, obj)
 			console.log(`返回`, res)
-			uni.showToast({
-				icon: 'none',
-				title: res.message ? res.message : '操作成功'
-			})
 			if (res.success) {
+				uni.showToast({
+					icon: res.success?'success':'none',
+					title: res.message ? res.message : '操作成功'
+				})
 				plsbuy.value[lefttarget.value].totalPrice = res.result.cgdTotalPrice
 				albumlist.value = [];
 				addupimg.value = [];
@@ -1842,7 +1845,12 @@
 				open.value = 0;
 				form.cgdId = plsbuy.value[lefttarget.value].id;
 				plsbuy.value[lefttarget.value] = res.result.cgdInfo;
-				queryInvo(middletarget.value)
+				setTimeout(()=>{
+					queryInvo(middletarget.value)
+				},700)
+			}else{
+				errmsg.value = res.message;
+				openerror.value = true;
 			}
 		})
 	}
diff --git a/pages/procurement/common/pddsub.vue b/pages/procurement/common/pddsub.vue
index 3bd84aa..8411068 100644
--- a/pages/procurement/common/pddsub.vue
+++ b/pages/procurement/common/pddsub.vue
@@ -145,7 +145,7 @@
 			if(res.success){
 				uni.showToast({
 					icon:'success',
-					title:res.message
+					title:res.message?res.message:'提交成功'
 				})
 				emit('close');
 				setTimeout(()=>{
diff --git a/pages/procurement/inventory.vue b/pages/procurement/inventory.vue
index 5570bb7..dcfddb9 100644
--- a/pages/procurement/inventory.vue
+++ b/pages/procurement/inventory.vue
@@ -45,11 +45,11 @@
 				</view>
 			</view>
 
-			<nomessage cont="暂无数据" :show="nomessageshow" />
-			<view class="zhedang" v-if="nomessageshow"></view>
+			<!-- <nomessage cont="暂无数据" :show="nomessageshow" /> -->
+			<!-- <view class="zhedang" v-if="nomessageshow"></view> -->
 		</view>
 
-		<view class="all-contain" v-show=" !nomessageshow">
+		<view class="all-contain">
 			<scroll-view scroll-y="true" scroll-with-animation class="all-scroll" :scroll-top="leftscrolltop"
 				@scrolltolower="plsbuytolower" :lower-threshold="200">
 				<view class="scroll-items">
@@ -724,7 +724,7 @@
 		right: 0;
 		top: 0;
 		height: 500rpx;
-		background-color: #fff;
+		// background-color: #fff;
 	}
 
 	.left-selecttype {
diff --git a/unpackage/dist/cache/.vite/deps/_metadata.json b/unpackage/dist/cache/.vite/deps/_metadata.json
index 8674c94..d8e2ed1 100644
--- a/unpackage/dist/cache/.vite/deps/_metadata.json
+++ b/unpackage/dist/cache/.vite/deps/_metadata.json
@@ -1,8 +1,8 @@
 {
-  "hash": "63b19973",
-  "configHash": "f0a71f11",
-  "lockfileHash": "e88c1aa2",
-  "browserHash": "b680c5d4",
+  "hash": "9e248234",
+  "configHash": "17f5f5b6",
+  "lockfileHash": "285de26d",
+  "browserHash": "f287ed85",
   "optimized": {},
   "chunks": {}
 }
\ No newline at end of file