Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-app

# Conflicts:
#	pages/erp/warehousing/warehousing.vue

pages/erp/warehousing/warehousing.vue

@@ -34,6 +34,7 @@
 			</view>
 			<view class="row row-bottom">
 				<view class="left">毛重（吨）</view>
+<<<<<<< HEAD
 				<input type="number" @input='calculate' v-model='detailData.grossWeight' class="right-bottom"
 					inputmode="decimal" step="0.01" placeholder="输入毛重"></input>
 			</view>
@@ -41,6 +42,14 @@
 				<view class="left">皮重（吨）</view>
 				<input type="number" @input='calculate' v-model='detailData.tare' class="right-bottom"
 					placeholder="输入皮重" inputmode="decimal" step="0.01"></input>
+=======
+				<input type="number" @input='calculate' name="grossWeight" v-model='detailData.grossWeight' class="right-bottom"  inputmode="decimal" step="0.01"
+					placeholder="输入毛重"></input>
+			</view>
+			<view class="row row-bottom">
+				<view class="left">皮重（吨）</view>
+				<input type="number" @input='calculate' name="tare" v-model='detailData.tare' class="right-bottom" placeholder="输入皮重" inputmode="decimal" step="0.01"></input>
+>>>>>>> f40903b1d1600a8795cb4d5b56bfc79650a87590
 			</view>
 			<view class="row row-bottom">
 				<view class="left">扣重（吨）</view>