合并

component/public/severcard.vue

@@ -47,7 +47,7 @@
 	 import { queryOrderlist,startDirectiveServe,finishDirectiveServe,queryOrderInfoList } from '@/pages/procurement/api/lunpan.js'
 	 import { startOrder,endOrder,editSubPicPath,editSubMp4,queryEmpList,transferOrder,assistOrder} from '@/pages/NursingNew/component/doctorask/api/api.js'
 	 const qcobj = ref({})
-	 const openleft = ref(false)
+	 const openleft = ref(true)
 	 const open = ref(0);
 	 const zdcont = ref('');
 	 const serverUrl = ref(uni.getStorageSync('serverUrl') + '/sys/common/static/')
@@ -56,15 +56,14 @@
 	 	pageNo: 1,
 	 	pageSize: 10,
 	 	employeeId:uni.getStorageSync('userInfo').employessId, 
-	 	nuId:uni.getStorageSync('nuId')
+	 	nuId:uni.getStorageSync('nuId'),
+		workType:2
 	 })
 	 onMounted(()=>{
 		 firstgetqueryCgdList()
 	 })
 	 const firstgetqueryCgdList = () => {
-		 console.log(form)
 	 	queryOrderlist(form).then(res => {
-			console.log(res)
 	 		if(res.result.records.length>0){
 	 			clickLeftMenu(0,res.result.records[0])
 	 		}else{
@@ -76,7 +75,7 @@
 	 	queryOrderInfoList({ mainId: item.id }).then(res => {
 	 		if(res.result.length>0){
 	 			qcobj.value = res.result[0];
-				openleft.value = qcobj.value.izStart=='N'?true:false;
+				openleft.value = qcobj.value.izStart=='Y'?true:false;
 	 		}else{
 	 			qcobj.value = {};
 	 		}
@@ -126,7 +125,9 @@
 		})
 		
 	}
-	 
+	defineExpose({
+		 firstgetqueryCgdList
+	})
 </script>
 
 <style lang="less" scoped>

pages/NursingNew/component/index.vue

@@ -432,7 +432,7 @@
 			</view>
 		</view>
 	</view>
-	<view class="fixed-card" :style="openleft?{}:{right:`-33vw`}"  v-show="indexmessage?.startTime">
+	<!-- <view class="fixed-card" :style="openleft?{}:{right:`-33vw`}"  v-show="indexmessage?.startTime">
 		<view class="fixed-card-left">
 			<image class="card-left-img" v-if="topbuttontarget==0" :style="!indexmessage?.previewFile?'width: 450rpx':''"
 				:src="indexmessage?.previewFile? 'https://www.focusnu.com/media/upFiles/' + indexmessage?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
@@ -460,9 +460,6 @@
 				<text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text>
 				
 			</view>
-			<!-- <view style="color: #555555;">
-				业务单号：P10120251010001
-			</view> -->
 			<view class="icon-button">
 				<view  :class="indexmessage?.izStart=='N'?'button-right':'button-left'"  @click="start(indexmessage)">
 					开始服务
@@ -476,7 +473,7 @@
 			<image :style="openleft?{}:{transform: `rotate(180deg)`}" class="open-img"
 				src="/static/index/newindex/leftmenu/openleft.png" />
 		</view>
-		
+		</view> -->
 		
 		<view class="mengban" v-if="topbuttontarget>0" @click="topbuttontarget=0"></view>
 		<view class="photowall" v-show="topbuttontarget>0" :style="donghuaopo?{opacity:1}:{opacity:0}" >
@@ -590,10 +587,9 @@
 			</view>
 		</view>
 		<tanchuang :show="open==1" font="是否删除此图片" @back="open = 0" @right="del1()"> </tanchuang>
-		
 			
 				
-	</view>
+	<severcard ref="severcards"></severcard>
 </template>
 
 <script setup lang="ts">
@@ -610,8 +606,8 @@
 		pageNo: 1,
 		pageSize: 10,
 		employeeId:uni.getStorageSync('userInfo').employessId, 
-		nuId:uni.getStorageSync('nuId')
-		
+		nuId:uni.getStorageSync('nuId'),
+		workType:5
 	})
 	const zdxzdex = ref(0)
 	const zdxzarr = ref(0)
@@ -740,7 +736,7 @@
 		queryOrderInfoList({ mainId: item.id }).then(res => {
 			// console.log(res)
 			if(res.result.length>0){
-				indexmessage.value = res.result[0]
+				indexmessage.value = res.result[0]  
 			}else{
 				indexmessage.value = {};
 			}
@@ -1041,6 +1037,7 @@
 		// e.detail.scrollTop 就是当前滚动距离
 		scrollTop.value = e.detail.scrollTop
 	}
+	const severcards = ref<InstanceType<typeof ChildComponent>>()
 	const start = (v) =>{
 		if(v.izStart!='N'){return}
 		console.log(v)
@@ -1048,6 +1045,7 @@
 			console.log(res)
 			if(res.success){
 				v.izStart = "Y";
+				severcards.value.firstgetqueryCgdList()
 			}else{