|
@@ -72,28 +72,27 @@
|
|
|
<a-alert type="info" style="margin-bottom: 10px;">
|
|
|
<div slot="message">
|
|
|
<div class="form-grid">
|
|
|
- <div v-if="$hasPermissions(authCode + '_costPrice')"><label>总成本:</label><strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</div>
|
|
|
- <div><label>总数量:</label><strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;</div>
|
|
|
- <div><label>已取消数量:</label><strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;</div>
|
|
|
- <div><label>已下推数量:</label><strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;</div>
|
|
|
- <div><label>待下推数量:</label><strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;</div>
|
|
|
- <div><label>已发货数量:</label><strong>{{ detailData&&(detailData.totalDispatchQty || detailData.totalDispatchQty==0) ? detailData.totalDispatchQty : '--' }}</strong>;</div>
|
|
|
- <div><label>待发货数量:</label><strong>{{ detailData&&(detailData.totalUndispatchQty || detailData.totalUndispatchQty==0) ? detailData.totalUndispatchQty : '--' }}</strong>;</div>
|
|
|
- <div><label>单重(kg):</label><strong>{{ detailData&&(detailData.weight || detailData.weight==0) ? detailData.weight : '--' }}</strong>;</div>
|
|
|
- <div style="width:190px;" v-if="$hasPermissions(authCode + '_costPrice')"><label style="width:108px;">平均成本公斤单价:</label><strong>{{ detailData&&(detailData.averageCost || detailData.averageCost==0) ? toThousands(detailData.averageCost) : '--' }}</strong>;</div>
|
|
|
- <div v-if="isCityPrice"><label>市级总售价:</label><strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_costPrice')">总成本:<strong>{{ detailData&&(detailData.totalCost || detailData.totalCost==0) ? toThousands(detailData.totalCost) : '--' }}</strong>;</div>
|
|
|
+ <div>总数量:<strong>{{ detailData&&(detailData.totalQty || detailData.totalQty==0) ? detailData.totalQty : '--' }}</strong>;</div>
|
|
|
+ <div>已取消数量:<strong>{{ detailData&&(detailData.totalCancelQty || detailData.totalCancelQty==0) ? detailData.totalCancelQty : '--' }}</strong>;</div>
|
|
|
+ <div>已下推数量:<strong>{{ detailData&&(detailData.totalPushedQty || detailData.totalPushedQty==0) ? detailData.totalPushedQty : '--' }}</strong>;</div>
|
|
|
+ <div>待下推数量:<strong>{{ detailData&&(detailData.totalUnpushedQty || detailData.totalUnpushedQty==0) ? detailData.totalUnpushedQty : '--' }}</strong>;</div>
|
|
|
+ <div>已发货数量:<strong>{{ detailData&&(detailData.totalDispatchQty || detailData.totalDispatchQty==0) ? detailData.totalDispatchQty : '--' }}</strong>;</div>
|
|
|
+ <div>待发货数量:<strong>{{ detailData&&(detailData.totalUndispatchQty || detailData.totalUndispatchQty==0) ? detailData.totalUndispatchQty : '--' }}</strong>;</div>
|
|
|
+ <div style="width:190px;" v-if="$hasPermissions(authCode + '_costPrice')&&isAveragePrice"><label style="width:108px;">平均成本公斤单价:<strong>{{ detailData&&(detailData.totalWeightAvgCost || detailData.totalWeightAvgCost==0) ? toThousands(detailData.totalWeightAvgCost) : '--' }}</strong>;</label></div>
|
|
|
+ <div v-if="isAveragePrice">合计重量(kg):<strong>{{ detailData&&(detailData.totalWeight || detailData.totalWeight==0) ? detailData.totalWeight : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;">优惠金额:<strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong>;</div>
|
|
|
</br>
|
|
|
- <div v-if="$hasPermissions(authCode + '_costPrice')"><label>总毛利:</label><strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>总售价:</label><strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>已取消金额:</label><strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>已下推金额:</label><strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>待下推金额:</label><strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>已发货金额:</label><strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? toThousands(detailData.totalDispatchAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')"><label>待发货金额:</label><strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? toThousands(detailData.totalUndispatchAmount) : '--' }}</strong>;</div>
|
|
|
- <div><label>合计重量(kg):</label><strong>{{ detailData&&(detailData.totalWeight || detailData.totalWeight==0) ? detailData.totalWeight : '--' }}</strong>;</div>
|
|
|
- <div style="width:190px;" v-if="$hasPermissions(authCode + '_salesPrice')"><label style="width:108px;">平均售价公斤单价:</label><strong>{{ detailData&&(detailData.averageRealAmount || detailData.averageRealAmount==0) ? toThousands(detailData.averageRealAmount) : '--' }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalDiscountAmount" style="color: red;"><label>优惠金额:</label><strong>{{ Number(detailData.totalDiscountAmount).toFixed(2) }}</strong>;</div>
|
|
|
- <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalConvertPromoGiftsAmount" style="color: red;"><label>促销产品转采购额金额:</label><strong>{{ Number(detailData.totalConvertPromoGiftsAmount).toFixed(2) }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_costPrice')">总毛利:<strong>{{ detailData&&(detailData.grossProfit || detailData.grossProfit==0) ? toThousands(detailData.grossProfit) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">总售价:<strong>{{ detailData&&(detailData.totalAmount || detailData.totalAmount==0) ? toThousands(detailData.totalAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">已取消金额:<strong>{{ detailData&&(detailData.totalCancelAmount || detailData.totalCancelAmount==0) ? toThousands(detailData.totalCancelAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">已下推金额:<strong>{{ detailData&&(detailData.totalPushedAmount || detailData.totalPushedAmount==0) ? toThousands(detailData.totalPushedAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">待下推金额:<strong>{{ detailData&&(detailData.totalUnpushedAmount || detailData.totalUnpushedAmount==0) ? toThousands(detailData.totalUnpushedAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">已发货金额:<strong>{{ detailData&&(detailData.totalDispatchAmount || detailData.totalDispatchAmount==0) ? toThousands(detailData.totalDispatchAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')">待发货金额:<strong>{{ detailData&&(detailData.totalUndispatchAmount || detailData.totalUndispatchAmount==0) ? toThousands(detailData.totalUndispatchAmount) : '--' }}</strong>;</div>
|
|
|
+ <div style="width:190px;" v-if="$hasPermissions(authCode + '_salesPrice')&&isAveragePrice"><label style="width:108px;">平均售价公斤单价:<strong>{{ detailData&&(detailData.totalWeightAvgPrice || detailData.totalWeightAvgPrice==0) ? toThousands(detailData.totalWeightAvgPrice) : '--' }}</strong>;</label></div>
|
|
|
+ <div v-if="isCityPrice"> 市级总售价:<strong>{{ detailData&&(detailData.totalCityAmount || detailData.totalCityAmount==0) ? toThousands(detailData.totalCityAmount) : '--' }}</strong>;</div>
|
|
|
+ <div v-if="$hasPermissions(authCode + '_salesPrice')&&detailData&&detailData.totalConvertPromoGiftsAmount" style="color: red;width:170px;">促销产品转采购额金额:<strong>{{ Number(detailData.totalConvertPromoGiftsAmount).toFixed(2) }}</strong>;</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</a-alert>
|
|
@@ -162,7 +161,7 @@
|
|
|
<a-button id="salesDetail-updateStock" type="primary" v-if="showStock" @click="getThreeStock" class="button-info">第三方库存</a-button>
|
|
|
<a-button id="salesDetail-stockOut" v-if="detailData && (detailData.billStatus == 'WAIT_AUDIT' || detailData.billStatus == 'HQ_CHANGE')" type="link" @click="openStockOut">缺货明细</a-button>
|
|
|
<a-checkbox id="salesDetail-cityPrice" v-model="isCityPrice" v-if="$hasPermissions(authCode + '_cityPrice')"><span style="display: inline-block;margin-top: 1px;">市级价</span></a-checkbox>
|
|
|
- <a-checkbox id="salesDetail-cityPrice" v-model="isCityPrice" v-if="$hasPermissions(authCode + '_costPrice')&&$hasPermissions(authCode + '_salesPrice')"><span style="display: inline-block;margin-top: 1px;">市级价</span></a-checkbox>
|
|
|
+ <a-checkbox id="salesDetail-cityPrice" v-model="isAveragePrice" v-if="$hasPermissions(authCode + '_costPrice')&&$hasPermissions(authCode + '_salesPrice')"><span style="display: inline-block;margin-top: 1px;">平均公斤单价</span></a-checkbox>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
@@ -179,6 +178,7 @@
|
|
|
:chooseList="chooseDealerList"
|
|
|
:transferQty="transferQty"
|
|
|
:showCityPrice="isCityPrice"
|
|
|
+ :showAveragePrice="isAveragePrice"
|
|
|
:showTransferDealer="showTransferDealer">
|
|
|
</detailProductList>
|
|
|
</div>
|
|
@@ -323,6 +323,7 @@ export default {
|
|
|
detailData: null, // 详情数据
|
|
|
nowType: null, // 打印导出类型
|
|
|
isCityPrice: false, // 是否显示市级价
|
|
|
+ isAveragePrice: false, // 是否显示
|
|
|
visibleAudit: false, // 审核弹框
|
|
|
spinningAudit: false, // 审核loading
|
|
|
auditText: null, // 审核备注信息
|
|
@@ -779,12 +780,7 @@ export default {
|
|
|
.form-grid{
|
|
|
div{
|
|
|
display: inline-block;
|
|
|
- width:130px;
|
|
|
- label{
|
|
|
- display: inline-block;
|
|
|
- // text-align: right;
|
|
|
- // width:90px;
|
|
|
- }
|
|
|
+ width:136px;
|
|
|
}
|
|
|
}
|
|
|
}
|