From b43cc87fe9051681435e4baca01d9b74a513680e Mon Sep 17 00:00:00 2001
From: wangweidong <850489345@qq.com>
Date: Fri, 20 Mar 2026 13:55:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/NursingNew/component/nurse/api.js       |  9 +++-
 pages/NursingNew/component/nurse/newindex.vue | 49 ++++++++++++-------
 .../component/warehousematrix/api.js          |  9 +++-
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/pages/NursingNew/component/nurse/api.js b/pages/NursingNew/component/nurse/api.js
index e568d57..0a90353 100644
--- a/pages/NursingNew/component/nurse/api.js
+++ b/pages/NursingNew/component/nurse/api.js
@@ -165,4 +165,11 @@ export const getInstructionTag = () => {
 		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/getInstructionTag`,
 		method: 'get' 
 	})
-}
\ No newline at end of file
+}
+export const deleteDirectiveSet = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteDirectiveSet`,
+		method: 'post' ,
+		data: params,
+	})
+}
diff --git a/pages/NursingNew/component/nurse/newindex.vue b/pages/NursingNew/component/nurse/newindex.vue
index 1ad48a6..0970857 100644
--- a/pages/NursingNew/component/nurse/newindex.vue
+++ b/pages/NursingNew/component/nurse/newindex.vue
@@ -792,7 +792,7 @@
 					<view class="button" @click="killruleclick">确定</view>
 				</view>
 
-				<view class="title">确定要删除指令吗</view>
+				<view class="title">确定要删除指令{{postitem.includesarray.length>1?'集合':''}}吗</view>
 				<view class="card-box">
 					<view class="title-time-blue-card">
 						<image class="blue-img" src="/static/index/bluetarget.png" />
@@ -805,8 +805,8 @@
 							<view class="title-time-font-rel">
 								{{ splitString(postitem.directiveName)[0]}}
 							</view>
-							<view v-if="splitString(postitem.directiveName)[1]" class="title-time-font-tags">
-								({{ splitString(postitem.directiveName)[1]}})
+							<view v-if="postitem.includesarray.length>1" class="title-time-font-tags">
+								指令集合
 							</view>
 							<view class="card-time">
 								<view class="weight-time">
@@ -853,7 +853,7 @@
 <script setup lang="ts">
 	import { ref, onMounted, onBeforeUnmount, computed, nextTick, watch, onUnmounted, toRaw } from 'vue';
 	import { onShow, onHide } from '@dcloudio/uni-app';
-	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, editDirective ,getInstructionTag } from "./api.js";
+	import { getNclist, addBatch, addDirective, addInstant, deleteDirective, editDirective ,getInstructionTag,deleteDirectiveSet} from "./api.js";
 	import { myArray } from './yaoshandiao.js';
 
 	const props = defineProps({
@@ -963,7 +963,16 @@
 	});
 	const killruleclick = () => {
 		isDelete.value = false;
-		deleteDirective({ id: postitem.value.id ,instructionTagId:typearray.value[whitchtype.value]?.instructionType}).then((res) => {
+		let obj ={
+			nuId: uni.getStorageSync('nuId'),
+			positioning:postitem.value.positioning,
+			positioningLong: postitem.value.positioningLong,
+			instructionTagId:typearray.value[whitchtype.value]?.instructionType,
+			id: postitem.value.id 
+		}
+		// console.log(obj)
+		deleteDirectiveSet(obj).then((res) => {
+			// console.log(res)
 			if (res.success) {
 				geteverything()
 				if (saveEditIndex.value.index0 != -1) {
@@ -1157,7 +1166,7 @@
 			}
 			addDirective(postdata).then((res) => {
 				
-				console.log("kankan", postdata, res)
+				// console.log("kankan", postdata, res)
 				if (res.success) {
 					geteverything()
 					setTimeout(() => {
@@ -1330,6 +1339,7 @@
 
 		let infoValue = object
 		infoValue.positioning = indexsave.value[0];
+		infoValue.nuId = uni.getStorageSync('nuId');
 		infoValue.positioningLong = indexsave.value[1];
 		infoValue.startTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].startTime;
 		infoValue.endTime = timearr.value[indexsave.value[0]].children[indexsave.value[1]].endTime;
@@ -1631,14 +1641,14 @@
 	}
 
 	const reldata = ref([]);
-	const deleteRuler = (index0 : number, index1 : number) => {
-		// timearr.value[index0]?.children[index1].instructionTagId = typearray.value[whitchtype.value]?.instructionType;
-		deleteDirective(timearr.value[index0]?.children[index1]).then((res : any) => {
-			if (res.success) {
-				geteverything()
-			}
-		})
-	}
+	// const deleteRuler = (index0 : number, index1 : number) => {
+	// 	// timearr.value[index0]?.children[index1].instructionTagId = typearray.value[whitchtype.value]?.instructionType;
+	// 	deleteDirective(timearr.value[index0]?.children[index1]).then((res : any) => {
+	// 		if (res.success) {
+	// 			geteverything()
+	// 		}
+	// 	})
+	// }
 
 	const saveX = ref(0);
 	const saveY = ref(0);
@@ -1680,7 +1690,7 @@
 	let animTimer = null
 
 	const doaddDirective = (element : any) => {
-		console.log(element,1683)
+		// console.log(element,1683)
 		addDirective(element).then((res) => {
 			if (res.success) {
 				geteverything()
@@ -1701,7 +1711,7 @@
 		killisopen.value = false;
 		deleteshake.value = false;
 		detailshake.value = false;
-		deleteDirective({ id: killthisid.value.id ,instructionTagId:typearray.value[whitchtype.value]?.instructionType}).then((res) => {
+		deleteDirective({ nuId: uni.getStorageSync('nuId'),id: killthisid.value.id ,instructionTagId:typearray.value[whitchtype.value]?.instructionType}).then((res) => {
 			if (res.success) {
 				geteverything()
 				setTimeout(() => {
@@ -1858,7 +1868,7 @@
 		// console.log("有老人吗",uni.getStorageSync('elderId'))
 		if (uni.getStorageSync('nuId') && uni.getStorageSync('elderId')) {
 			getNclist(uni.getStorageSync('nuId'), uni.getStorageSync('elderId'),typearray.value[whitchtype.value]?.instructionType).then((res : any) => {
-				console.log(  res )
+				// console.log(  res )
 				timearr.value = Array.from({ length: 24 }, (_, hour) => ({
 					positioning: hour.toString(),
 					children: minuteArr.map(time => ({
@@ -1917,7 +1927,7 @@
 		geteverything()
 		// savePackagelist.value = uni.getStorageSync('Packagelist') || []
 		let res = uni.getStorageSync(`saveTree${typearray.value[whitchtype.value]?.instructionType}`)
-		console.log(res,typearray.value[whitchtype.value]?.instructionType)
+		// console.log(res,typearray.value[whitchtype.value]?.instructionType)
 		let goodArray = []
 		myArray.forEach((element : any) => {
 			element?.children.forEach((element1 : any) => {
@@ -2216,6 +2226,7 @@
 		killbaddata.value = false
 
 		longPressTimer.value = setTimeout(() => {
+			// console.log(item.includesarray,e)
 			if (isScrolling.value) return
 
 			if (item.directiveName) {
@@ -2406,7 +2417,7 @@
 					openerror.value = true
 					return   // ✅ 这次是真的 return 出函数了
 				}
-				console.log(postdata,2408)
+				// console.log(postdata,2408)
 				addDirective(postdata).then((res) => {
 					if (res.success) {
 						geteverything()
diff --git a/pages/NursingNew/component/warehousematrix/api.js b/pages/NursingNew/component/warehousematrix/api.js
index c614b78..e34cac2 100644
--- a/pages/NursingNew/component/warehousematrix/api.js
+++ b/pages/NursingNew/component/warehousematrix/api.js
@@ -68,7 +68,14 @@ export const deleteDirective = (params) => {
 		data: params,
 	})
 }
-
+// 编排护理流程-删除服务指令集合
+export const deleteDirectiveSet = (params) => {
+	return request({
+		url: `${uni.getStorageSync('serverUrl')}/api/pad/care/directive/deleteDirectiveSet`,
+		method: 'post',
+		data: params,
+	})
+}
 // 编排护理流程-删除即时服务指令
 export const deleteInstant = (params) => {
 	return request({