1、优化采购物品信息相关2、部分bug

components/select-resource-staff/select-resource-staff.vue

@@ -3,11 +3,11 @@
 		<view class="">
 			<checkbox-group @change="checkboxChange">
 				<view class="cu-list menu-avatar " v-for="(item,index) in resourceList" :key="index">
-					<view class="cu-item" style="height: 80rpx;">
+					<view class="cu-item">
 						<view>
 							<checkbox :value="item.resId" :checked="item.checked" />
 						</view>
-						<view class="content content-left">
+						<view class="content">
 							<view class="text-grey">
 								<text class="ellip">{{item.resName}}({{item.parentRstName}}>{{item.rstName}})</text>
 							</view>
@@ -16,6 +16,11 @@
 									编码：{{item.resCode}}
 								</view>
 							</view>
+							<view class="text-gray text-sm flex">
+								<view class="text-cut">
+									固定资产：{{item.isFixedName}}
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -158,4 +163,11 @@
 	.btn-box button{
 		width: 40%;
 	}
+	.cu-list.menu-avatar>.cu-item .content{
+		left: 40rpx;
+		width: 80%;
+	}
+	.cu-list{
+		margin: 0;
+	}
 </style>

components/select-resource/select-resource.vue

@@ -18,7 +18,7 @@
 		<view class="">
 			<checkbox-group @change="checkboxChange">
 				<view class="cu-list menu-avatar " v-for="(item,index) in resourceList" :key="index">
-					<view class="cu-item" style="height: 80rpx;">
+					<view class="cu-item">
 						<view>
 							<checkbox :value="item.resId" :checked="item.checked" />
 						</view>
@@ -31,6 +31,11 @@
 									仓库：{{item.shName}}
 								</view>
 							</view>
+							<view class="text-gray text-sm flex">
+								<view class="text-cut">
+									固定资产：{{item.isFixedName}}
+								</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -231,4 +236,7 @@
 		left: 40rpx;
 		width: 80%;
 	}
+	.cu-list{
+		margin: 0;
+	}
 </style>

components/select-single-resource/select-single-resource.vue

@@ -213,7 +213,8 @@
 					page: 1,
 					row: 100,
 					communityId: getCurrentCommunity().communityId,
-					giveType: 1
+					giveType: 1,
+					flag: 1
 				};
 				queryResourceStoreResName(this, _data)
 					.then(function(res) {

pages/allocationStorehouseManage/allocationStorehouseManage.vue

@@ -134,14 +134,12 @@
 						if (res.confirm) {
 							deleteAllocationStorehouse(_that,item)
 							.then(function(res){
-								if(res.code == 0){
+								uni.showToast({
-									uni.showToast({
+									title: res.msg
-										title: res.msg
+								})
-									})
+								_that.page = 1;
-									_that.page = 1;
+								_that.applyList = [];
-									_that.applyList = [];
+								_that.loadApply();
-									_that.loadApply();
-								}
 							})
 						} else if (res.cancel) {
 							console.log('cancel')

pages/applyRoomDetail/applyRoomDetail.vue

@@ -4,7 +4,7 @@
 			<view class="cu-item arrow" @click="showApplyRoomRecord()">
 				<view class="content">
 					<text class="cuIcon-time text-green"></text>
-					<text class="text-grey">装修跟踪记录</text>
+					<text class="text-grey">空置房跟踪记录</text>
 				</view>
 				<view class="action">
 					<text class="text-grey text-sm">查看</text>

pages/itemOutManage/itemOutManage.vue

@@ -135,14 +135,12 @@
 						if (res.confirm) {
 							deletePurchaseApply(_that,item)
 							.then(function(res){
-								if(res.code == 0){
+								uni.showToast({
-									uni.showToast({
+									title: res.msg
-										title: res.msg
+								})
-									})
+								_that.page = 1;
-									_that.page = 1;
+								_that.applyList = [];
-									_that.applyList = [];
+								_that.loadApply();
-									_that.loadApply();
-								}
 							})
 						} else if (res.cancel) {
 							console.log('cancel')

pages/purchaseApplyDetail/purchaseApplyDetail.vue

@@ -103,7 +103,7 @@
 			<view class="resource-item text-grey" v-for="(item, index) in applyInfo.purchaseApplyDetailVo">
 				<view class="row">
 					<view class="item-t">{{item.resName}}</view>
-					<view class="item-t">{{item.price}}</view>
+					<view class="item-t">{{item.price}}元/{{item.unitCodeName}}</view>
 					<view class="item-t">{{item.quantity}}{{item.unitCodeName}}</view>
 					<view class="item-t" v-if="applyInfo.resOrderType==10000">{{item.purchasePrice ? item.purchasePrice : '-'}}</view>
 					<view class="item-t">{{item.purchaseQuantity ? item.purchaseQuantity + item.unitCodeName : '-'}}</view>
@@ -203,5 +203,6 @@
 		overflow: hidden;
 		display: inline-block;
 		text-align: center;
+		line-height: 30rpx;
 	}
 </style>

pages/purchaseApplyManage/purchaseApplyManage.vue

@@ -146,14 +146,12 @@
 						if (res.confirm) {
 							deletePurchaseApply(_that,item)
 							.then(function(res){
-								if(res.code == 0){
+								uni.showToast({
-									uni.showToast({
+									title: res.msg
-										title: res.msg
+								})
-									})
+								_that.page = 1;
-									_that.page = 1;
+								_that.applyList = [];
-									_that.applyList = [];
+								_that.loadApply();
-									_that.loadApply();
-								}
 							})
 						} else if (res.cancel) {
 							console.log('cancel')

pages/resourceStoreManage/resourceStoreManage.vue

@@ -39,6 +39,11 @@
 								最小计量总数：{{item.miniStock}}{{item.miniUnitCodeName}}
 							</view>
 						</view>
+						<view class="text-gray text-sm flex">
+							<view class="text-cut">
+								固定资产：{{item.isFixedName}}
+							</view>
+						</view>
 					</view>
 				</view>
 			</view>
@@ -155,12 +160,16 @@
 </script>
 
 <style>
+	.cu-list.menu-avatar>.cu-item{
+		height: auto;
+	}
 	.cu-list+.cu-list {
 		margin-top: 20upx;
 	}
 
 	.cu-list.menu-avatar>.cu-item .content{
-		left: 20rpx;
+		position: static;
+		margin-left: 20upx;
 		width: 100%;
 	}
 </style>