|
@@ -15,7 +15,7 @@
|
|
|
<span>基础信息</span>
|
|
|
<a-button icon="edit" size="small" type="link" style="margin-left: 20px;color: #39f;" @click.stop="openInfoModal = true">编辑</a-button>
|
|
|
</template>
|
|
|
- <a-descriptions :column="3">
|
|
|
+ <a-descriptions :column="4">
|
|
|
<a-descriptions-item label="货架名称">{{ basicInfoData&&basicInfoData.shelfName || '--' }}</a-descriptions-item>
|
|
|
<a-descriptions-item>
|
|
|
<template slot="label">
|
|
@@ -28,19 +28,18 @@
|
|
|
</template>
|
|
|
{{ (basicInfoData&&basicInfoData.customerEntity&&basicInfoData.customerEntity.customerName) || '--' }}
|
|
|
</a-descriptions-item>
|
|
|
- <!-- <a-descriptions-item>
|
|
|
+ <a-descriptions-item>
|
|
|
<template slot="label">
|
|
|
<a-tooltip placement="top">
|
|
|
<template slot="title">
|
|
|
- 1、非铺货产品,是指不是货架上的产品<br>
|
|
|
- 2、终端会员价,对于汽修厂来说,即进货价<br>
|
|
|
- 3、如果该产品在销售单里有销售记录,则使用最近一次销售价,如果没有销售记录,则使用箭冠总公司的终端会员价
|
|
|
+ 1、不勾选则不显示价格,非货架产品只显示车主价,不选择车主价时,非货架产品不显示价格<br>
|
|
|
+ 2、结算价:既易码通进货价
|
|
|
</template>
|
|
|
- 价格显示<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
|
|
|
+ 价格权限设置<a-icon type="question-circle" style="color: rgba(0,0,0,.65);font-size: 16px;margin-left: 2px;vertical-align: sub;cursor: pointer;" />
|
|
|
</a-tooltip>
|
|
|
</template>
|
|
|
- 非铺货产品——{{ showPrice == '1' ? '显示': '不显示' }}价格
|
|
|
- </a-descriptions-item> -->
|
|
|
+ <span>{{showPriceStr.length ? showPriceStr.join("/") : '--'}}</span>
|
|
|
+ </a-descriptions-item>
|
|
|
</a-descriptions>
|
|
|
</a-collapse-panel>
|
|
|
</a-collapse>
|
|
@@ -93,6 +92,15 @@
|
|
|
:showPagination="false"
|
|
|
:defaultLoadData="false"
|
|
|
bordered>
|
|
|
+ <span slot="customTitle">
|
|
|
+ 结算价
|
|
|
+ <a-popover>
|
|
|
+ <template slot="content">
|
|
|
+ 既易码通进货价
|
|
|
+ </template>
|
|
|
+ <a-icon type="question-circle"/>
|
|
|
+ </a-popover>
|
|
|
+ </span>
|
|
|
<!-- 操作 -->
|
|
|
<template slot="action" slot-scope="text, record">
|
|
|
<a-button
|
|
@@ -101,7 +109,7 @@
|
|
|
:class="record.enableFlag==1?'button-error':'button-primary'"
|
|
|
v-if="record.shelfProductApiEntity&&(!record.shelfProductApiEntity.qty||(record.enableFlag==0&&record.shelfProductApiEntity.qty))&&record.shelfProductApiEntity.productSn"
|
|
|
@click="handleEnable(record)"
|
|
|
- >{{record.enableFlag==1?'禁用':'启用'}}</a-button>
|
|
|
+ >{{ record.enableFlag==1?'禁用':'启用' }}</a-button>
|
|
|
<a-button
|
|
|
size="small"
|
|
|
type="link"
|
|
@@ -165,8 +173,7 @@ import bindProductModal from './bindProductModal.vue'
|
|
|
import ImportGuideModal from './importGuideModal.vue'
|
|
|
import basicInfoModal from './basicInfoModal.vue'
|
|
|
import importHuoweiModal from './importHuoweiModal.vue'
|
|
|
-// , getShelfPriceShow
|
|
|
-import { shelfDetail, shelfProductList, shelfProductBatchInsert, delShelfPlaceSn, shelfProductEnable } from '@/api/shelf'
|
|
|
+import { shelfDetail, shelfProductList, shelfProductBatchInsert, delShelfPlaceSn, shelfProductEnable, getShelfPriceShow } from '@/api/shelf'
|
|
|
export default {
|
|
|
name: 'ShelfMonitoringWarehousing',
|
|
|
components: { STable, VSelect, commonModal, bindProductModal, addHwModal, ImportGuideModal, basicInfoModal, importHuoweiModal },
|
|
@@ -188,8 +195,8 @@ export default {
|
|
|
{ title: '货位号', dataIndex: 'shelfPlaceCode', width: '15%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '绑定产品编码', dataIndex: 'shelfProductApiEntity.productCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
|
|
|
{ title: '绑定产品名称', dataIndex: 'shelfProductApiEntity.productName', width: '23%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
|
|
|
- { title: '销售价', dataIndex: 'shelfProductApiEntity.price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
|
|
|
- { title: '结算价', dataIndex: 'shelfProductApiEntity.cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
|
|
|
+ { title: '车主价', dataIndex: 'shelfProductApiEntity.price', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
|
|
|
+ { slots: { title: 'customTitle' }, dataIndex: 'shelfProductApiEntity.cost', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
|
|
|
{ title: '最大库容', dataIndex: 'shelfProductApiEntity.maxQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '当前库存', dataIndex: 'shelfProductApiEntity.qty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
|
|
|
{ title: '操作', scopedSlots: { customRender: 'action' }, width: '15%', align: 'center' }
|
|
@@ -221,19 +228,28 @@ export default {
|
|
|
openInfoModal: false,
|
|
|
openHwModal: false,
|
|
|
openImportModal: false,
|
|
|
- showPrice: ''
|
|
|
+ showPriceStr: []
|
|
|
}
|
|
|
},
|
|
|
methods: {
|
|
|
// 获取价格显示设置
|
|
|
- // getShelfPriceShow () {
|
|
|
- // getShelfPriceShow({ shelfSn: this.$route.params.sn }).then(res => {
|
|
|
- // if (res.status == 200) {
|
|
|
- // this.basicInfoData.showPrice = res.data.paramValue
|
|
|
- // this.showPrice = res.data.paramValue
|
|
|
- // }
|
|
|
- // })
|
|
|
- // },
|
|
|
+ getShelfPriceShow () {
|
|
|
+ this.showPriceStr = []
|
|
|
+ getShelfPriceShow({ shelfSn: this.$route.params.sn }).then(res => {
|
|
|
+ if (res.status == 200) {
|
|
|
+ const ret = res.data&&res.data
|
|
|
+ this.basicInfoData.showPrice = ret
|
|
|
+ ret.map(item => {
|
|
|
+ if(item.paramCode == 'shelf_price_show'&&item.paramValue == 1){
|
|
|
+ this.showPriceStr.push("车主价")
|
|
|
+ }
|
|
|
+ if(item.paramCode == 'shelf_cost_show'&&item.paramValue == 1){
|
|
|
+ this.showPriceStr.push("结算价")
|
|
|
+ }
|
|
|
+ })
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// 导入或新增货位
|
|
|
addHW (type) {
|
|
|
// 导入货位
|
|
@@ -247,25 +263,25 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
// 禁用启用
|
|
|
- handleEnable(row){
|
|
|
+ handleEnable (row) {
|
|
|
const _this = this
|
|
|
- if(row.enableFlag == 1){
|
|
|
+ if (row.enableFlag == 1) {
|
|
|
this.$confirm({
|
|
|
- title: '提示',
|
|
|
- content: '禁用后不参于盘点和补货,但是可以退货、调回,确认禁用吗?',
|
|
|
- centered: true,
|
|
|
- onOk () {
|
|
|
+ title: '提示',
|
|
|
+ content: '禁用后不参于盘点和补货,但是可以退货、调回,确认禁用吗?',
|
|
|
+ centered: true,
|
|
|
+ onOk () {
|
|
|
_this.enableFun(row)
|
|
|
}
|
|
|
})
|
|
|
- }else{
|
|
|
+ } else {
|
|
|
_this.enableFun(row)
|
|
|
}
|
|
|
},
|
|
|
- enableFun(row){
|
|
|
+ enableFun (row) {
|
|
|
const _this = this
|
|
|
_this.spinning = true
|
|
|
- shelfProductEnable({ shelfSn: this.$route.params.sn, shelfProductSn: row.shelfProductApiEntity.shelfProductSn, enableFlag: row.enableFlag==1 ? 0 : 1 }).then(res => {
|
|
|
+ shelfProductEnable({ shelfSn: this.$route.params.sn, shelfProductSn: row.shelfProductApiEntity.shelfProductSn, enableFlag: row.enableFlag == 1 ? 0 : 1 }).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
_this.$message.success(res.message)
|
|
|
_this.$refs.table.refresh()
|
|
@@ -290,7 +306,7 @@ export default {
|
|
|
shelfDetail({ sn: this.$route.params.sn }).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.basicInfoData = res.data
|
|
|
- // this.getShelfPriceShow()
|
|
|
+ this.getShelfPriceShow()
|
|
|
} else {
|
|
|
this.basicInfoData = null
|
|
|
}
|