|
@@ -52,8 +52,8 @@
|
|
|
<a-row>
|
|
|
<a-col :span="11">
|
|
|
<a-input-number
|
|
|
- id="shelfMonitoringList-beginDate"
|
|
|
- v-model="queryParam.beginDate"
|
|
|
+ id="shelfMonitoringList-unsalableDaysBegin"
|
|
|
+ v-model="queryParam.unsalableDaysBegin"
|
|
|
:precision="0"
|
|
|
:min="0"
|
|
|
:max="999999"
|
|
@@ -63,8 +63,8 @@
|
|
|
<a-col :span="2"><span style="display: block;text-align: center;line-height: 32px;">至</span></a-col>
|
|
|
<a-col :span="11">
|
|
|
<a-input-number
|
|
|
- id="shelfMonitoringList-endDate"
|
|
|
- v-model="queryParam.endDate"
|
|
|
+ id="shelfMonitoringList-unsalableDaysEnd"
|
|
|
+ v-model="queryParam.unsalableDaysEnd"
|
|
|
:precision="0"
|
|
|
:min="0"
|
|
|
:max="999999"
|
|
@@ -172,8 +172,8 @@ export default {
|
|
|
productCode: '',
|
|
|
productName: '',
|
|
|
state: undefined,
|
|
|
- beginDate: undefined,
|
|
|
- endDate: undefined
|
|
|
+ unsalableDaysBegin: undefined,
|
|
|
+ unsalableDaysEnd: undefined
|
|
|
},
|
|
|
rules: {
|
|
|
'shelfSn': [{ required: true, message: '请选择货架', trigger: 'change' }]
|
|
@@ -232,29 +232,29 @@ export default {
|
|
|
methods: {
|
|
|
// 校验滞销天数数值范围
|
|
|
checkValueRange () {
|
|
|
- const isONull = this.queryParam.beginDate === null || this.queryParam.beginDate === undefined
|
|
|
- const isOEmpty = this.queryParam.beginDate === ''
|
|
|
- const isOZero = this.queryParam.beginDate === 0
|
|
|
- const isTNull = this.queryParam.endDate === null || this.queryParam.endDate === undefined
|
|
|
- const isTEmpty = this.queryParam.endDate === ''
|
|
|
- const isTZero = this.queryParam.endDate === 0
|
|
|
+ const isONull = this.queryParam.unsalableDaysBegin === null || this.queryParam.unsalableDaysBegin === undefined
|
|
|
+ const isOEmpty = this.queryParam.unsalableDaysBegin === ''
|
|
|
+ const isOZero = this.queryParam.unsalableDaysBegin === 0
|
|
|
+ const isTNull = this.queryParam.unsalableDaysEnd === null || this.queryParam.unsalableDaysEnd === undefined
|
|
|
+ const isTEmpty = this.queryParam.unsalableDaysEnd === ''
|
|
|
+ const isTZero = this.queryParam.unsalableDaysEnd === 0
|
|
|
// 第一个为空(可为null可为空字符)第二个不为空
|
|
|
// 第一个不为空第二个为空(可为null可为空字符)
|
|
|
// 第一个大于第二个
|
|
|
- if ((isONull || isOEmpty) && (this.queryParam.endDate || isTZero)) {
|
|
|
+ if ((isONull || isOEmpty) && (this.queryParam.unsalableDaysEnd || isTZero)) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
|
}
|
|
|
- if ((this.queryParam.beginDate || isOZero) && (isTNull || isTEmpty)) {
|
|
|
+ if ((this.queryParam.unsalableDaysBegin || isOZero) && (isTNull || isTEmpty)) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
|
}
|
|
|
- if (this.queryParam.beginDate > this.queryParam.endDate) {
|
|
|
+ if (this.queryParam.unsalableDaysBegin > this.queryParam.unsalableDaysEnd) {
|
|
|
this.$message.info('请输入正确的滞销天数查询范围!')
|
|
|
return false
|
|
|
}
|
|
|
- this.queryParam.beginDate = this.queryParam.beginDate > 999999999 ? 999999999 : this.queryParam.beginDate
|
|
|
- this.queryParam.endDate = this.queryParam.endDate > 999999999 ? 999999999 : this.queryParam.endDate
|
|
|
+ this.queryParam.unsalableDaysBegin = this.queryParam.unsalableDaysBegin > 999999999 ? 999999999 : this.queryParam.unsalableDaysBegin
|
|
|
+ this.queryParam.unsalableDaysEnd = this.queryParam.unsalableDaysEnd > 999999999 ? 999999999 : this.queryParam.unsalableDaysEnd
|
|
|
return true
|
|
|
},
|
|
|
rowSelectionFun (obj) {
|
|
@@ -286,8 +286,8 @@ export default {
|
|
|
this.queryParam.productCode = ''
|
|
|
this.queryParam.productName = ''
|
|
|
this.queryParam.state = undefined
|
|
|
- this.queryParam.beginDate = undefined
|
|
|
- this.queryParam.endDate = undefined
|
|
|
+ this.queryParam.unsalableDaysBegin = undefined
|
|
|
+ this.queryParam.unsalableDaysEnd = undefined
|
|
|
this.handleSearch()
|
|
|
},
|
|
|
// 新增调回单
|