Merge branch 'main' of http://47.115.223.229:8888/yangjun/hldy_app_mini

component/public/severcard.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" >
+		<view class="fixed-card" :style="openleft?{}:{right:`-34vw`}" v-if="qcobj.startTime">
 			<view class="fixed-card-left">
 				<image class="card-left-img" :style="!qcobj?.previewFile?'width: 450rpx':''"
 					:src="qcobj?.previewFile? 'https://www.focusnu.com/media/upFiles/' + qcobj?.previewFile: `/static/index/newindex/wendu/2.png`" mode="aspectFill"/>
@@ -14,10 +14,14 @@
 				</view>
 				<view class="icon-people">
 					<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
-					单人执行
+					<text v-if="qcobj.optType == 1" style="white-space: nowrap;">单人执行</text>
+					<text v-if="qcobj.optType == 2" style="white-space: nowrap;">协助执行</text>
+					
 					<image style="margin-left: 1vw;" class="people-img"
 						src="/static/index/newindex/leftmenu/iconright.png" />
-					{{qcobj.employeeName}}
+					
+					<text v-if="qcobj.optType == 1">{{qcobj.employeeName}}</text>
+					<text v-if="qcobj.optType == 2">{{qcobj.optNames}}</text>
 				</view>
 				<view class="icon-button">
 					<view class="" :class="qcobj.izStart=='N'?'button-right':'button-left'"  @click="start()">
@@ -106,7 +110,7 @@
 	 // 		}
 	 // 	})
 	 // }
-	const end = (v)=>{
+	const end = ()=>{
 		if(qcobj.value.izStart=='Y'&& qcobj.value.izFinish=='N'){
 			open.value=3;
 		}

pages/NursingNew/component/index.vue

@@ -445,10 +445,16 @@
 			</view>
 			<view class="icon-people">
 				<image class="people-img" src="/static/index/newindex/leftmenu/iconleft.png" />
-				单人执行
+				
+				<text v-if="indexmessage.optType == 1" style="white-space: nowrap;">单人执行</text>
+				<text v-if="indexmessage.optType == 2" style="white-space: nowrap;">协助执行</text>
+				
 				<image style="margin-left: 1vw;" class="people-img"
 					src="/static/index/newindex/leftmenu/iconright.png" />
-				{{indexmessage.employeeName}}
+				
+				<text v-if="indexmessage.optType == 1">{{indexmessage.employeeName}}</text>
+				<text v-if="indexmessage.optType == 2">{{indexmessage.optNames}}</text>
+				
 			</view>
 			<!-- <view style="color: #555555;">
 				业务单号：P10120251010001

pages/procurement/components/Inventory.vue

@@ -9,7 +9,11 @@
 						 @touchend="handleTouchEnd($event,v,index)"  @touchstart="touchstart($event,v,index)"
 						  scroll-with-animation scroll-x="true" :scroll-left="v.scrollleft" @scroll="scroll($event,v)">
 								<view class="speitem guodu" :class="v.zk?'spleft':''">
-									<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
+									<view class="imghs">
+										<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'"
+											mode="aspectFill">
+										</image>
+									</view>
 									<view class="cardp">
 										<view v-if="v.categoryId_dictText">{{v.categoryId_dictText}}</view>
 										<view v-if="v.typeId_dictText">{{v.typeId_dictText}}</view>
@@ -383,10 +387,18 @@
 						}
 					}
 				}
-				>image{
+				.imghs{
 					width: 9vw;
 					height: 8vw;
-					margin: 1vw auto 0;
+					margin: 0.8vw auto 0.25vw;
+					padding: 0.2vw;
+					background: #fff;
+					border-radius: 1.1vw;
+					>image {
+						width: 100%;
+						height: 100%;
+						border-radius: 1.1vw;
+					}
 				}
 			}
 		}

pages/procurement/material.vue

@@ -26,7 +26,7 @@
 			</view> -->
 		</view>
 		<view class="kcyj">
-			<view class="kjlt" @click="tx=!tx">
+			<view class="kjlt" >
 				库存预警
 			</view>
 			<scroll-view scroll-x="true" class="kcscrol guodu"
@@ -53,37 +53,7 @@
 				<view class="guodu" :class="qb?(moredex==2?'avt':''):'righ0'" @click="moredex=2">添加全部</view>
 
 			</view>
-			<view class="kaprght guodu">
+			
-				<view class="ksfw guodu" :style="tx?'':'right: -38vw !important;'">
-					<view class="lcar">
-						<image :src="'/static/index/procurement/k.png'" mode="aspectFill"></image>
-						<view class="nm">纸尿裤-拉拉裤纸拉拉裤纸拉拉裤纸拉拉裤纸</view>
-					</view>
-					<view class="rcar">
-						<view class="wul">物料采购</view>
-						<view class="tm">10:00 - 10:10</view>
-						<view class="zhxng">
-							<view>
-								<image src="/static/index/procurement/xz.png" mode="aspectFill"></image>
-								<text>协助执行</text>
-							</view>
-							<view>
-								<image src="/static/index/procurement/ap.png" mode="aspectFill"></image>
-								<text>王金福 / 李贵田</text>
-							</view>
-						</view>
-						<view class="shjs">
-							<view class="iacts">开始服务</view>
-							<view>服务结束</view>
-						</view>
-						<view class="jx">
-							<image src="/static/index/procurement/l0.png" mode="aspectFill"></image>
-							<text>待进行</text>
-						</view>
-					</view>
-
-				</view>
-			</view>
 
 		</view>
 		<view class="listcard">
@@ -124,6 +94,7 @@
 		<view class="mengban" v-if="moredex==2" @click="moredex=0"></view>
 		<addall :show="moredex==2" @back="moredex=0" @config="config"></addall>
 		<errorshow :show="openerror" :font="errmsg" @close="openerror=false"  />
+		<severcard></severcard>
 	</view>
 </template>