Merge branch 'master' of http://159.75.207.46:3000/denghong/plant_manage_mobile into master

pages/massif/mana/recovery.vue

@@ -114,7 +114,7 @@
 				<view class="detail">
 					<view class="name">
 						<text class="over">{{v.plantName}}</text>
-						<text data-unit="kg">{{v.harvestNum}}</text></view>
+						<text data-unit="kg">剩余:{{v.harvestNum}}</text></view>
 					<view class="info">
 						<text class="people">负责人:{{v.principal}}</text>
 						<text class="date">采收日期:{{v.harvestTime}}</text>

pages/massif/mana/transactions.vue

@@ -95,7 +95,7 @@
 					<view class="title">{{v.productName}}</view>
 					<view class="spec">
 						<text>规格：{{v.specification}}</text>
-						<text class="over">{{v.buyerAddress}}</text>
+						<text class="over">{{v.buyerName}}</text>
 					</view>
 					<view class="total">
 						<text :data-unit="`${(parseFloat(v.tradeNum)||0)*(parseFloat(v.specification)||0)}${v.weightUnit}`">{{v.tradeNum}}{{v.packUnit_dictText}}</text>

pages/stock/mana.vue

@@ -169,7 +169,7 @@
 						<text class="warehouse over">{{v.wareHouseName}}</text>
 						<view class="btns">
 							<button class="cu-btn" @click="toList('out',v)">出库</button>
-							<button class="cu-btn" @click="toList('in',v)">入库</button>
+							<!-- <button class="cu-btn" @click="toList('in',v)">入库</button> -->
 						</view>
 					</view>
 				</template>