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

pages/Warehouse/picking.vue

@@ -143,7 +143,7 @@
 					<view style="color: #888888;margin-top: 10rpx;">
 						规格型号
 					</view>
-					<view class="" style="margin-top: 5rpx;font-size: 34rpx;">
+					<view class="" style="margin-top: 5rpx;font-size: 34rpx;white-space: nowrap;">
 						{{showvalue.wlSpecificationModel}}
 					</view>
 				</view>

pages/procurement/material.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<view class="serchs">
+		<view class="serchs guodu" :style="tx?'':'width:95vw'">
 			<view class="ipt">
 				<input type="text" placeholder="物料名称/物料编码/物料简拼" v-model="form.wlParamInfo"  @confirm="search()"/>
 				<image src="/static/index/procurement/x.png" mode="aspectFill" v-if="form.wlParamInfo"
@@ -14,21 +14,20 @@
 				筛选
 			</view>
 			<view class="shx guodu" @click="chongzhi" 
-			v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''"
+			v-if="form.categoryId!=''||form.wlParamInfo!=''||form.suppliers!=''" >
-			>
 			<image src="/static/index/procurement/cz.png" mode="aspectFill"></image>
 				重置
 			</view>
-			<view class="back" @click="uni.navigateBack()">
+			<view class="back guodu" @click="uni.navigateBack()">
 				<image src="/static/index/procurement/bk.png" mode="aspectFill"></image>
 				返回
 			</view>
 		</view>
 		<view class="kcyj">
-			<view class="kjlt">
+			<view class="kjlt" @click="tx=!tx">
 				库存预警
 			</view>
-			<scroll-view scroll-x="true" class="kcscrol guodu" :style="qb?'width:46.4vw':''"  
+			<scroll-view scroll-x="true" class="kcscrol guodu" :style="tx?(qb?'width:46.4vw':'width:54.4vw') : (qb?'width:91vw':'width:91vw') "
 			scroll-with-animation :scroll-top="scrolltop"  @scrolltolower="scrolltolower(1)">
 				<view class="yjbox" v-for="(v,i) in Material" :key="i"  @click="clickaddcar(v,i)">
 					<image :src="v.materialImg?serverUrl+v.materialImg:'/static/index/procurement/k.png'" mode="aspectFill"></image>
@@ -36,7 +35,7 @@
 					<text class="ytj" v-if="v.isAdd==1">已添加</text>
 				</view>
 			</scroll-view>
-			<view class="kjlt more guodu" :style="qb?'width:11.2vw':''">
+			<view class="kjlt more guodu" :style="qb?'width:11.2vw':'' ">
 				<view @click="qb=!qb;moredex=0" class="righ0">
 					{{!qb?'更多':'收起'}}
 					<image class="guodu" :style="qb?'transform: rotate(180deg);':''" src="/static/index/procurement/zjt.png" mode="aspectFill"></image>
@@ -46,7 +45,7 @@
 
 			</view>
 			<view class="kaprght">
-				<view class="ksfw">
+				<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>
@@ -125,6 +124,8 @@
 	import detail from './components/details.vue'
 	import inboundoutbound from './components/inboundoutbound.vue'
 	import addall from './components/addall.vue'
+	const tx = ref(true)
+	
 	const qb = ref(false)
 	const addflag = ref(false)
 	const ification = ref(false)
@@ -453,7 +454,7 @@
 				padding: 0 1vw;
 				position: absolute;
 				bottom: 0;
-				left: 0;
+				right: 0;
 				overflow: hidden;
 				display: flex;
 
@@ -771,7 +772,7 @@
 			}
 			
 		}
-		.shx:active,.scr:active{
+		.back:active,.shx:active,.scr:active{
 			color: #1083F8;
 			background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
 			border: 1px solid #1083F8;

pages/procurement/materialcar.vue

@@ -48,6 +48,7 @@
 		
 		<view class="mengban" v-if="addflag" @click="addflag = false"></view>
 		<calculator :show="addflag"  :caigouobj="caigouobj"  @colse="addflag = false" @right="right"></calculator>
+		<view class="mengban" v-if="caigouflag" @click="caigouflag = false"></view>
 		<purorder :arrlist="caigouarr" :show="caigouflag" @cloe="caigouflag = false" @config="configr"></purorder>
 	</view>
 </template>
@@ -328,7 +329,7 @@
 			}
 			
 		}
-		.shx:active,.scr:active{
+		.rightbtn>view:active,.shx:active,.scr:active{
 			color: #1083F8;
 			background: linear-gradient(-45deg, rgba(223, 244, 252, 1), rgba(204, 228, 249, 0.43));
 			border: 1px solid #1083F8;
@@ -368,7 +369,7 @@
 			image {
 				width: 1.5vw;
 				height: 1.3vw;
-				margin: 0 0.5vw;
+				margin: 0 0.5vw 0 0;
 			}
 		}
 	}