合并

pages/NursingNew/component/pleasetake/component/requestform.vue

@@ -233,7 +233,7 @@
 		() => props.isShow,
 		(newVal, oldVal) => {
 			// 当旧值为false，新值为true时延迟0.2秒调用方法
-			if (!oldVal && newVal) {
+			if (newVal) {
 				transition.value = false;
 				firstgetqueryCgdList();
 				setTimeout(() => {

pages/NursingNew/component/pleasetake/component/returnorder.vue

@@ -287,7 +287,7 @@
 		
 			cannomessage.value = false
 			plsbuy.value = [];
-			console.log(res)
+			// console.log(res)
 			plsbuy.value.push(...res.result.records)
 			// console.log("入参", plzinfo)
 			// console.log("查看数组", res.result.records)

pages/procurement/outbound.vue

@@ -147,7 +147,8 @@
 
 								<view class="middle-heng-father">
 
-									<view class="middle-ball" :style="Number(v.status)<4?{backgroundColor: `#E5E5E5`}:{}"
+									<view class="middle-ball"
+										:style="Number(v.status)<4?{backgroundColor: `#E5E5E5`}:{}"
 										v-if="Number(v.status)!=5"></view>
 									<image class="middle-ball-img" v-else src="/static/index/requestform/isok.png" />
 								</view>
@@ -227,10 +228,10 @@
 						style="width: 30%;height: 30%;position: absolute;">
 					</defaultr>
 				</scroll-view>
-				<view class="bottom-buttons" v-show="manyselect">
-					<view class="button-gray" @click="quxiao">
+				<view class="bottom-buttons" v-show="plsbuy[lefttarget]?.status==`1`">
+					<!-- <view class="button-gray" @click="quxiao">
 						取消
-					</view>
+					</view> -->
 					<view class="button-blue" @click="chukushow=true">
 						出库
 					</view>
@@ -239,6 +240,7 @@
 		</view>
 	</view>
 	<errorshow :show="openerror" font="注意：只能选择待出库的请领单" @close="openerror=false" />
+	<errorshow :show="qinglingshow" font="注意：批量选择模式请选择一项或以上的请领单" @close="qinglingshow=false" />
 </template>
 
 <script setup lang="ts">
@@ -535,21 +537,31 @@
 	const selectarray = ref([]);
 
 	const startselect = () => {
+		
 		selectarray.value = [];
 		manyselect.value = !manyselect.value
+		if(!manyselect.value){
+			lefttarget.value = 0
+		}
 	}
-	const quxiao = () => {
-		selectarray.value = [];
-		manyselect.value = false
-	}
-	const chukushow = ref(false)
+	// const quxiao = () => {
+	// 	selectarray.value = [];
+	// 	manyselect.value = false;
+		
+	// }
+	const chukushow = ref(false);
+	const qinglingshow = ref(false)
 	const chukuclick = () => {
-		// outbound
-		// console.log("出库",selectarray.value.join(','))
-		outbound({ qldNo: selectarray.value.join(',') }).then((res : any) => {
-			// console.log('出库', res)
+		if(manyselect.value && !selectarray.value.length){
+			qinglingshow.value = true
+			return
+		}
+		outbound({ qldNo: manyselect.value ? selectarray.value.join(',') : plsbuy.value[lefttarget.value].qldNo }).then((res : any) => {
+			selectarray.value = [];
+			manyselect.value = false
 			chukushow.value = false
 			plzinfo.pageNo = 1;
+			lefttarget.value = 0
 			plzinfo.canpull = true;
 			leftscrolltop.value = 1
 			setTimeout(() => {