jiangfeng 5 years ago
parent
commit
5172dd545a

+ 2 - 1
ghsApp/src/pagesPurchase/components/CommodityPurchase.vue

@@ -11,7 +11,8 @@
 			<view class="kc">{{ info.rank }}级</view>
 			<view class="num-open_bx">
 				<view class="price">
-					<text class="unit">¥</text><text>{{ info.price }}</text>
+					<!--<text class="unit">¥</text><text>{{ info.price }}</text>-->
+					<text class="unit">库存:{{ info.stock }}</text>
 				</view>
 				<view class="open-bx">
 					<i class="iconfont iconjian" :class="delAnimationData?'animation':''" @click="delEvent" v-if="bigCount > 0 || smallCount > 0"></i>

+ 6 - 41
ghsApp/src/pagesPurchase/details.vue

@@ -83,58 +83,23 @@
 				<view class="module-com input-line-wrap">
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">打包费</view>
-						<input
-							:disabled="!canIEdit"
-							v-model="form.packingCharge"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="floor"
-							placeholder="请填写,留空没有费用"
-						/>
+						<input :disabled="!canIEdit" v-model="form.packingCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">短途运费</view>
-						<input
-							:disabled="!canIEdit"
-							v-model="form.shortCharge"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="floor"
-							placeholder="请填写,留空没有费用"
-						/>
+						<input :disabled="!canIEdit" v-model="form.shortCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">包机(长途运费)</view>
-						<input
-							:disabled="!canIEdit"
-							v-model="form.longCharge"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="floor"
-							placeholder="请填写,留空没有费用"
-						/>
+						<input :disabled="!canIEdit" v-model="form.longCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">提货费</view>
-						<input
-							:disabled="!canIEdit"
-							v-model="form.pickCharge"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="floor"
-							placeholder="请填写,留空没有费用"
-						/>
+						<input :disabled="!canIEdit" v-model="form.pickCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false">
 						<view class="tui-title ">本地运费</view>
-						<input
-							:disabled="!canIEdit"
-							v-model="form.localCharge"
-							placeholder-class="phcolor"
-							class="tui-input"
-							name="floor"
-							placeholder="请填写,留空没有费用"
-						/>
+						<input :disabled="!canIEdit" v-model="form.localCharge" placeholder-class="phcolor" class="tui-input" name="floor" placeholder="请填写,留空没有费用"/>
 					</tui-list-cell>
 					<tui-list-cell class="line-cell" :hover="false" :arrow="true">
 						<view class="tui-title ">入库日期</view>
@@ -170,7 +135,7 @@
 			<view class="price-view">
 				<text class="price-title">总金额</text>
 				<text class="price-number">
-					¥ <text class="large">{{ allPrice }}</text>
+					¥ <text class="large">{{ Number(allPrice) + Number(form.packingCharge) + Number(form.shortCharge) + Number(form.longCharge) + Number(form.pickCharge) + Number(form.localCharge) }}</text>
 				</text>
 			</view>
 			<button class="admin-button-com blue middle" v-if="canIEdit" @click="formSubmit">