|
@@ -61,7 +61,8 @@
|
|
|
<a-descriptions-item label="财务状态">{{ detailData&&detailData.financialStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="改单时间" v-if="detailData&&detailData.salesBillSource=='PURCHASE'&&detailData.submitDate">{{ detailData.submitDate }}</a-descriptions-item>
|
|
|
<a-descriptions-item label="最新提交时间" v-if="detailData&&detailData.salesBillSource=='SALES'&&detailData.submitDate">{{ detailData.submitDate }}</a-descriptions-item>
|
|
|
- <a-descriptions-item label="备注" :span="3">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="发货经销商">{{ detailData&&detailData.billStatusDictValue || '--' }}</a-descriptions-item>
|
|
|
+ <a-descriptions-item label="备注" :span="2">{{ detailData&&detailData.remarks || '--' }}</a-descriptions-item>
|
|
|
</a-descriptions>
|
|
|
</div>
|
|
|
</a-card>
|
|
@@ -96,12 +97,12 @@
|
|
|
<div style="flex-grow: 1;width: 60%;">
|
|
|
<a-form layout="inline" @keyup.enter.native="searchTable">
|
|
|
<a-row :gutter="15" type="flex">
|
|
|
- <a-col flex="300px">
|
|
|
+ <a-col flex="260px">
|
|
|
<a-form-item label="出库仓库">
|
|
|
<chooseWarehouse id="salesDetail-warehouse" ref="warehouse" v-model="warehouseSn"></chooseWarehouse>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
- <a-col flex="300px" v-if="hasPrompActive">
|
|
|
+ <a-col flex="260px" v-if="hasPrompActive">
|
|
|
<a-form-item label="产品类型">
|
|
|
<a-select v-model.trim="promoFlag" id="salesDetail-promoFlag" allowClear :dropdownMatchSelectWidth="false" placeholder="请选择产品类型">
|
|
|
<a-select-option value="0">
|
|
@@ -125,6 +126,17 @@
|
|
|
</a-select>
|
|
|
</a-form-item>
|
|
|
</a-col>
|
|
|
+ <a-col flex="260px">
|
|
|
+ <a-form-item label="经销商库存">
|
|
|
+ <v-select
|
|
|
+ code="FLAG"
|
|
|
+ id="purchaseOrder-basicInfo-settleStyleSn"
|
|
|
+ v-model="settleStyleSn"
|
|
|
+ allowClear
|
|
|
+ placeholder="请选择经销商库存是否满足"
|
|
|
+ ></v-select>
|
|
|
+ </a-form-item>
|
|
|
+ </a-col>
|
|
|
<a-col :md="6" :sm="24" style="margin-bottom: 10px;">
|
|
|
<a-button type="primary" @click="searchTable" :disabled="disabled" id="salesDetail-refresh">查询</a-button>
|
|
|
<a-button style="margin-left: 5px" @click="resetSearchForm" id="salesDetail-reset">重置</a-button>
|
|
@@ -132,7 +144,8 @@
|
|
|
</a-row>
|
|
|
</a-form>
|
|
|
</div>
|
|
|
- <div>
|
|
|
+ <div style="margin-bottom: 10px;">
|
|
|
+ <a-button id="salesDetail-updateStock" type="primary" style="margin-right: 10px;" @click="openDealerModal" class="button-dealerStock">经销商库存</a-button>
|
|
|
<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>
|
|
@@ -155,6 +168,17 @@
|
|
|
</a-card>
|
|
|
</a-spin>
|
|
|
<div class="affix-cont" :style="{padding:hideFooter?0:'7px 0 4px'}">
|
|
|
+ <a-button
|
|
|
+ style="width: 100px;margin-right:20px;"
|
|
|
+ :disabled="spinning"
|
|
|
+ type="primary"
|
|
|
+ class="button-info"
|
|
|
+ id="salesDetail-audit-btn"
|
|
|
+ v-if="detailData&&detailData.billStatus == 'WAIT_AUDIT'&&$hasPermissions('B_salesAudit')"
|
|
|
+ @click="handleAudit()"
|
|
|
+ >
|
|
|
+ 转单
|
|
|
+ </a-button>
|
|
|
<a-button
|
|
|
style="width: 100px;"
|
|
|
:disabled="spinning"
|
|
@@ -222,6 +246,8 @@
|
|
|
<stockOutDetail :openModal="showStockOut" :detailData="detailData" :salesBillSn="$route.params.sn || bizSn" @close="showStockOut=false"></stockOutDetail>
|
|
|
<!-- 改单 -->
|
|
|
<tipModal ref="tipModal" :openModal="openTipModal" :dataList="sourceData" @close="closeTipModal" @ok="openTipModalOk"></tipModal>
|
|
|
+ <!-- 经销商库存 弹窗 -->
|
|
|
+ <dealerStockModal :openModal="openDealerStock" @close="closeDealerStock" @ok="openDealerStockOk"></dealerStockModal>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -236,6 +262,7 @@ import dsModal from '@/views/salesManagement/waitDispatchNew/dsModal.vue'
|
|
|
import stockOutDetail from './stockOutDetailModal.vue'
|
|
|
import chooseWarehouse from '@/views/common/chooseWarehouse'
|
|
|
import detailProductList from './comps/detailProductList.vue'
|
|
|
+import dealerStockModal from './comps/dealerStockModal.vue'
|
|
|
import tipModal from './tipModal.vue'
|
|
|
// 接口
|
|
|
import { salesDetailBySn, salesDetailPrint, salesDetailExcel, salesDetailTypeExcel, salesWriteAuditPass, salesWriteAuditReject, salesWriteAuditPush, getThirdStockQty, salesPromoValidaSubmit, changeBillCheckUpdatePrice, changeBillCheck } from '@/api/salesNew'
|
|
@@ -243,7 +270,7 @@ import { salesDetailBySn, salesDetailPrint, salesDetailExcel, salesDetailTypeExc
|
|
|
export default {
|
|
|
name: 'SalesDetailNew',
|
|
|
mixins: [commonMixin],
|
|
|
- components: { VSelect, printModal, auditModal, dsModal, stockOutDetail, chooseWarehouse, detailProductList, tipModal },
|
|
|
+ components: { VSelect, printModal, auditModal, dsModal, stockOutDetail, chooseWarehouse, detailProductList, dealerStockModal,tipModal },
|
|
|
props: {
|
|
|
bizSn: { // 有值则为弹框,无值则为页面
|
|
|
type: [Number, String],
|
|
@@ -270,7 +297,9 @@ export default {
|
|
|
warehouseSn: undefined, // 所在仓库
|
|
|
promoFlag: undefined, // 产品类型
|
|
|
openTipModal: false, // 改单弹窗
|
|
|
- sourceData: undefined// 价格变动数据
|
|
|
+ sourceData: undefined, // 价格变动数据
|
|
|
+ settleStyleSn: undefined, // 经销商库存查询
|
|
|
+ openDealerStock: false // 打开经销商库存弹窗
|
|
|
}
|
|
|
},
|
|
|
computed: {
|
|
@@ -312,6 +341,16 @@ export default {
|
|
|
// 返回
|
|
|
handleBack () {
|
|
|
this.$router.push({ name: 'salesQueryNewList' })
|
|
|
+ },
|
|
|
+ // 打开 经销商库存弹窗
|
|
|
+ openDealerModal () {
|
|
|
+ this.openDealerStock = true
|
|
|
+ },
|
|
|
+ closeDealerStock () {
|
|
|
+
|
|
|
+ },
|
|
|
+ openDealerStockOk () {
|
|
|
+
|
|
|
},
|
|
|
// 编辑
|
|
|
handleEdit () {
|