Merge branch 'master' of http://8.134.10.79:3000/Leadfyy.co/uniapp-supplychain

canteen/pages/index/index.vue

@@ -37,7 +37,7 @@
 				block_list: []
 			}
 		},
-		onLoad() {
+		onShow() {
 			// todo 优化：显示订单角标
 			this.getHomeData();
 		},
@@ -83,8 +83,9 @@
 </style>
 <style lang="scss" scoped="scoped">
 	.message-tag {
-		width: 60rpx;
-		height: 60rpx;
+		width: 52rpx;
+		height: 52rpx;
+		font-size: 16rpx;
 		background-color: red;
 		border-radius: 50%;
 		margin-right: 10rpx;

canteen/pages/purchase/receipt.vue

@@ -2,7 +2,11 @@
 	<view class="content">
 		<view class="card" v-for="(item, index) in list" :key="index">
 			<view class="lf-row-between">
-				<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
+				<view class="flex lf-row-center justify-center text-center">
+					<view class="lf-color-black lf-font-bold" v-if="item.material && item.material.m_name">{{ item.material.m_name }}</view>
+					<view class="lf-m-l-10">{{item.spec.name}}</view>
+				</view>
+				<view>单位: {{item.material.unit.unit_name}}</view>
 				<!-- 修改功能先隐藏 -->
 				<!-- <view style="color: #11D189;" @click="showEdit">修改</view> -->
 			</view>
@@ -265,7 +269,7 @@
 				if(!this.is_upload){
 					return this.$msg('请上传凭证后再确认收货');
 				}
-				return this.$msg('PASS');
+				// return this.$msg('PASS');
 				this.$http(this.API.API_CONFIRM, {
 					p_sn: this.p_sn,
 					state: '已入库',

supplier/pages/index/index.vue

@@ -37,7 +37,7 @@
 				block_list: []
 			}
 		},
-		onLoad(){
+		onShow() {
 			// todo 优化：显示订单角标
 			this.getData();
 		},
@@ -85,8 +85,9 @@
 </style>
 <style lang="scss" scoped="scoped">
 	.message-tag {
-		width: 60rpx;
-		height: 60rpx;
+		width: 52rpx;
+		height: 52rpx;
+		font-size: 16rpx;
 		background-color: red;
 		border-radius: 50%;
 		margin-right: 10rpx;

supplier/pages/offer/index.vue

@@ -45,7 +45,11 @@
 		<view class="box">
 			<view class="lf-m-b-20 lf-row-between">
 				<view class="lf-font-32 lf-color-black lf-font-bold">报价明细</view>
-				<input placeholder="搜索物资" confirm-type="search" :value="searchValue" @input="inputChange" @confirm="inputConfirm" style="background: pink;" />
+				<view class="flex lf-row-between">
+					<u-icon name="search" class="search-icon" v-if="show_icon"></u-icon>
+					<input placeholder="搜索物资" confirm-type="search" @focus="hideIcon()" class="search-self" :value="searchValue" @input="inputChange" @confirm="inputConfirm" />
+				</view>
+				
 			</view>
 			<wyb-table :first-line-fixed="true" 
 				contentBgColor="#eef6fe" 
@@ -78,6 +82,7 @@
 		},
 		data(){
 			return {
+				show_icon: true,
 				headers: [{
 					label: '物资名称',
 					key: 'name',
@@ -173,6 +178,11 @@
 			}
 		},
 		methods: {
+			hideIcon() {
+				if(this.searchValue != '') {
+					this.show_icon = false;
+				}
+			},
 			// 搜索input值被改变
 			inputChange(event){
 				if(timer){
@@ -182,6 +192,11 @@
 				timer = setTimeout(() => {
 					this.searchValue = event.detail.value;
 				}, 1000);
+				if(event.detail.value == '') {
+					this.show_icon = true;
+				}else {
+					this.show_icon = false;
+				}
 			},
 			// 搜索按下回车
 			inputConfirm(event){
@@ -455,6 +470,22 @@
 	}
 </style>
 <style lang="scss" scoped="scoped">
+	.search-icon {
+		position: relative;
+		left: 50rpx;
+		color: #777;
+	}
+	.search-self {
+		background: rgb(228,228,228);
+		padding: 10rpx 0 10rpx 20rpx;
+		border-radius: 40rpx;
+		font-size: 28rpx;
+	}
+	.search-self .uni-input-placeholder {
+		margin-left: 40rpx;
+		color: #777;
+		font-size: 28rpx;
+	}
 	.lf-m-t-5{
 		margin-top: 5rpx;
 	}