|
@@ -16,7 +16,7 @@
|
|
|
<a-row :gutter="15">
|
|
|
<a-col :md="6" :sm="24">
|
|
|
<a-form-model-item label="货架名称" prop="shelfSn">
|
|
|
- <shelfSList v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
|
|
|
+ <shelfSList id="shelfMonitoringList-shelfSn" v-model="queryParam.shelfSn" @change="shelfChange"></shelfSList>
|
|
|
</a-form-model-item>
|
|
|
</a-col>
|
|
|
<a-col :md="6" :sm="24">
|
|
@@ -86,7 +86,7 @@
|
|
|
:disabled="disabled"
|
|
|
:loading="exportLoading"
|
|
|
id="salesManagementList-export">导出</a-button>
|
|
|
- <a @click="advanced=!advanced" style="margin-left: 5px">
|
|
|
+ <a @click="advanced=!advanced" style="margin-left: 5px" id="shelfMonitoringList-advanced">
|
|
|
{{ advanced ? '收起' : '展开' }}
|
|
|
<a-icon :type="advanced ? 'up' : 'down'"/>
|
|
|
</a>
|
|
@@ -105,7 +105,7 @@
|
|
|
<a-divider type="vertical" style="background: #FF7D0C;width: 3px;height: 16px;" />
|
|
|
<span>{{ shelfName || '--' }}</span>
|
|
|
</div>
|
|
|
- <a-button type="primary" class="button-error" id="shelfMonitoringList-export" @click="handleAddBack">新增调回单</a-button>
|
|
|
+ <a-button type="primary" class="button-error" id="shelfMonitoringList-add" @click="handleAddBack">新增调回单</a-button>
|
|
|
<span style="margin-left: 5px">
|
|
|
<template v-if="rowSelectionInfo&&rowSelectionInfo.selectedRowKeys.length > 0">
|
|
|
{{ `已选 ${rowSelectionInfo.selectedRowKeys.length} 项` }}
|
|
@@ -147,7 +147,7 @@
|
|
|
type="link"
|
|
|
class="button-primary"
|
|
|
@click="handleDetail(record)"
|
|
|
- id="shelfMonitoringList-warehousing-btn">出入库明细</a-button>
|
|
|
+ :id="'shelfMonitoringList-warehousing-btn'+record.id">出入库明细</a-button>
|
|
|
</template>
|
|
|
</s-table>
|
|
|
</div>
|
|
@@ -175,13 +175,13 @@ export default {
|
|
|
wrapperCol: { span: 16 },
|
|
|
tableHeight: 0,
|
|
|
queryParam: { // 查询条件
|
|
|
- shelfSn: undefined,
|
|
|
- shelfPlaceCode: '',
|
|
|
- productCode: '',
|
|
|
- productName: '',
|
|
|
- state: undefined,
|
|
|
- unsalableDaysBegin: undefined,
|
|
|
- unsalableDaysEnd: undefined
|
|
|
+ shelfSn: undefined, // 货架sn
|
|
|
+ shelfPlaceCode: '', // 货位号
|
|
|
+ productCode: '', // 产品编码
|
|
|
+ productName: '', // 产品名称
|
|
|
+ state: undefined, // 状态
|
|
|
+ unsalableDaysBegin: undefined, // 滞销天数 起始时间
|
|
|
+ unsalableDaysEnd: undefined //
|
|
|
},
|
|
|
rules: {
|
|
|
'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
|
|
@@ -230,13 +230,13 @@ export default {
|
|
|
})
|
|
|
}
|
|
|
},
|
|
|
- rowSelectionInfo: null,
|
|
|
- isSearch: false,
|
|
|
+ rowSelectionInfo: null, // 已选数据
|
|
|
+ isSearch: false, // 是否显示无数据内容
|
|
|
openModal: false, // 新增编辑 弹框
|
|
|
shelfName: '', // 货架名称
|
|
|
nowData: {
|
|
|
- list: [],
|
|
|
- shelfInfo: {}
|
|
|
+ list: [], // 已选货架列表
|
|
|
+ shelfInfo: {} // 货架信息
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -250,16 +250,16 @@ export default {
|
|
|
const isTEmpty = this.queryParam.unsalableDaysEnd === ''
|
|
|
const isTZero = this.queryParam.unsalableDaysEnd === 0
|
|
|
// 第一个为空(可为null可为空字符)第二个不为空
|
|
|
- // 第一个不为空第二个为空(可为null可为空字符)
|
|
|
- // 第一个大于第二个
|
|
|
if ((isONull || isOEmpty) && (this.queryParam.unsalableDaysEnd || isTZero)) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
|
}
|
|
|
+ // 第一个不为空第二个为空(可为null可为空字符)
|
|
|
if ((this.queryParam.unsalableDaysBegin || isOZero) && (isTNull || isTEmpty)) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
|
}
|
|
|
+ // 第一个大于第二个
|
|
|
if (this.queryParam.unsalableDaysBegin > this.queryParam.unsalableDaysEnd) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
@@ -268,15 +268,16 @@ export default {
|
|
|
this.queryParam.unsalableDaysEnd = this.queryParam.unsalableDaysEnd > 999999999 ? 999999999 : this.queryParam.unsalableDaysEnd
|
|
|
return true
|
|
|
},
|
|
|
+ // 全选、勾选表格
|
|
|
rowSelectionFun (obj) {
|
|
|
this.rowSelectionInfo = obj || null
|
|
|
},
|
|
|
- // 货架 change
|
|
|
+ // 选择货架 change
|
|
|
shelfChange (val, obj) {
|
|
|
this.shelfName = obj && obj.shelfName || ''
|
|
|
this.queryParam.shelfSn = val
|
|
|
},
|
|
|
- // 查询
|
|
|
+ // 查询列表
|
|
|
handleSearch () {
|
|
|
this.$refs.ruleForm.validate(valid => {
|
|
|
if (valid) {
|
|
@@ -284,12 +285,11 @@ export default {
|
|
|
this.$refs.table.refresh(true)
|
|
|
this.isSearch = true
|
|
|
} else {
|
|
|
- console.log('error submit!!')
|
|
|
return false
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 重置
|
|
|
+ // 重置列表
|
|
|
resetSearchForm () {
|
|
|
this.isSearch = false
|
|
|
this.queryParam.shelfSn = undefined
|
|
@@ -302,7 +302,7 @@ export default {
|
|
|
this.$refs.table.clearSelected()
|
|
|
this.handleSearch()
|
|
|
},
|
|
|
- // 导出
|
|
|
+ // 导出列表
|
|
|
handleExport () {
|
|
|
const _this = this
|
|
|
this.$refs.ruleForm.validate(valid => {
|
|
@@ -337,25 +337,24 @@ export default {
|
|
|
handleDetail (row) {
|
|
|
this.$router.push({ path: `/numsGoodsShelves/shelfMonitoring/warehouseDetail/${row.shelfPlaceSn}/${row.productSn}` })
|
|
|
},
|
|
|
+ // 新增调回单成功后
|
|
|
handleOk () {
|
|
|
this.$refs.table.refresh()
|
|
|
this.$refs.table.clearSelected() // 清空表格选中项
|
|
|
this.isSearch = true
|
|
|
},
|
|
|
+ // 关闭新增回调单弹框
|
|
|
handleCancel () {
|
|
|
this.openModal = false
|
|
|
},
|
|
|
- filterOption (input, option) {
|
|
|
- return (
|
|
|
- option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
|
|
|
- )
|
|
|
- },
|
|
|
+ // 页面初始化
|
|
|
pageInit () {
|
|
|
const _this = this
|
|
|
this.$nextTick(() => { // 页面渲染完成后的回调
|
|
|
_this.setTableH()
|
|
|
})
|
|
|
},
|
|
|
+ // 设置表格高度
|
|
|
setTableH () {
|
|
|
const tableSearchH = this.$refs.tableSearch.offsetHeight
|
|
|
this.tableHeight = window.innerHeight - tableSearchH - 245
|