|
@@ -29,21 +29,21 @@
|
|
|
</a-card>
|
|
|
<a-card :bordered="false" size="small" class="pages-wrap">
|
|
|
<div class="goodsAllocationSet-baseInfo">
|
|
|
- <a-button id="goodsAllocationSet-addHW" @click="pageInfo&&pageInfo.state=='NOT_ENABLE'? addHW(0,pageInfo):addHW(1,pageInfo)" type="primary">{{ pageInfo&&pageInfo.state=='NOT_ENABLE'? '批量导入货位':'新增货位' }}</a-button>
|
|
|
+ <a-button id="goodsAllocationSet-impoort" type="primary" class="button-info" @click="addHW(0,pageInfo)">批量导入货位</a-button>
|
|
|
+ <a-button id="goodsAllocationSet-addHW" type="primary" class="button-error" @click="addHW(1,pageInfo)">新增货位</a-button>
|
|
|
</div>
|
|
|
<a-table
|
|
|
class="sTable fixPagination"
|
|
|
ref="table"
|
|
|
size="small"
|
|
|
:pagination="false"
|
|
|
- :columns="pageInfo&&pageInfo.state=='NOT_ENABLE'?columns:columnsDat"
|
|
|
+ :columns="columns"
|
|
|
:data-source="loadData"
|
|
|
bordered>
|
|
|
<template slot="status" slot-scope="text, record">
|
|
|
- <a-button size="small" type="link" id="goodsAllocationSet-handleEdit" @click="handleEdit(record)" v-if=" !record.shelfProductEntity">编辑</a-button>
|
|
|
- <a-button size="small" type="link" id="goodsAllocationSet-handleDel" @click="handleDel(record)" v-if=" !record.shelfProductEntity">删除</a-button>
|
|
|
+ <a-button size="small" type="link" id="goodsAllocationSet-handleEdit" @click="handleEdit(record)" v-if="!record.shelfProductEntity">编辑</a-button>
|
|
|
+ <a-button size="small" type="link" id="goodsAllocationSet-handleDel" @click="handleDel(record)" v-if="!record.shelfProductEntity">删除</a-button>
|
|
|
<span v-if="record.shelfProductEntity" style="display: inline-block;padding-left: 7px;">--</span>
|
|
|
- <!-- <span v-if="!($hasPermissions('B_powerMD_user_edit') && record.superAdmin!=1) && !(record.loginFlag==1 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_restPwd')) && !(record.loginFlag==0 && record.ownerOrgFlag==1 && $hasPermissions('B_powerMD_user_del'))">--</span> -->
|
|
|
</template>
|
|
|
</a-table>
|
|
|
</a-card>
|
|
@@ -75,52 +75,7 @@ export default {
|
|
|
shelfSn: '', // 货架sn
|
|
|
images: [], // 货架图片
|
|
|
// 表头
|
|
|
- columns: [{
|
|
|
- title: '序号',
|
|
|
- width: '4%',
|
|
|
- align: 'center',
|
|
|
- customRender: function (text, record, index) {
|
|
|
- return index + 1
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '货位号',
|
|
|
- dataIndex: 'shelfPlaceCode',
|
|
|
- width: '11%',
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '创建时间',
|
|
|
- dataIndex: 'createDate',
|
|
|
- width: '13%',
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- }
|
|
|
- },
|
|
|
- {
|
|
|
- title: '最后修改时间',
|
|
|
- dataIndex: 'updateDate',
|
|
|
- width: '18%',
|
|
|
- align: 'center',
|
|
|
- customRender: function (text) {
|
|
|
- return text || '--'
|
|
|
- },
|
|
|
- ellipsis: true
|
|
|
- },
|
|
|
- {
|
|
|
- title: '操作',
|
|
|
- width: '9%',
|
|
|
- align: 'left',
|
|
|
- scopedSlots: {
|
|
|
- customRender: 'status'
|
|
|
- }
|
|
|
- }
|
|
|
- ],
|
|
|
- columnsDat: [
|
|
|
+ columns: [
|
|
|
{
|
|
|
title: '序号',
|
|
|
width: '4%',
|
|
@@ -144,16 +99,16 @@ export default {
|
|
|
width: '10%',
|
|
|
align: 'center',
|
|
|
customRender: function (text) {
|
|
|
- return text || ''
|
|
|
+ return text || '--'
|
|
|
}
|
|
|
},
|
|
|
{
|
|
|
- title: '绑定产品',
|
|
|
+ title: '绑定产品名称',
|
|
|
dataIndex: 'shelfProductEntity.productName',
|
|
|
width: '16%',
|
|
|
align: 'left',
|
|
|
customRender: function (text) {
|
|
|
- return text || ''
|
|
|
+ return text || '--'
|
|
|
}
|
|
|
},
|
|
|
{
|
|
@@ -196,7 +151,6 @@ export default {
|
|
|
},
|
|
|
// 导入或新增
|
|
|
addHW (type, val) {
|
|
|
- console.log(type, val, '=========val')
|
|
|
this.shelfSn = val.shelfSn
|
|
|
if (type == 0) {
|
|
|
this.openModal = true
|
|
@@ -208,6 +162,7 @@ export default {
|
|
|
// 获取货位列表
|
|
|
getHwList () {
|
|
|
this.spinning = true
|
|
|
+ this.shelfSn = this.$route.params.shelfSn
|
|
|
shelfHWList(Object.assign({ shelfSn: this.$route.params.shelfSn, shelfProductEntity: {} })).then(res => {
|
|
|
if (res.status == 200) {
|
|
|
this.loadData = res.data
|
|
@@ -238,7 +193,6 @@ export default {
|
|
|
},
|
|
|
// 编辑
|
|
|
handleEdit (row) {
|
|
|
- // this.shelfPlaceSn = row.shelfPlaceSn
|
|
|
this.shelfSn = row.shelfSn
|
|
|
this.itemData = row
|
|
|
this.openHWModal = true
|