|
@@ -34,6 +34,9 @@
|
|
</el-select>
|
|
</el-select>
|
|
<el-input v-model="con1" style="width:200px" clearable></el-input>
|
|
<el-input v-model="con1" style="width:200px" clearable></el-input>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item>
|
|
|
|
+ <el-checkbox v-model="isExcludeZero" label="是否排除库存件数为0记录" border></el-checkbox>
|
|
|
|
+ </el-form-item>
|
|
<el-button type="primary" @click="search">查询</el-button>
|
|
<el-button type="primary" @click="search">查询</el-button>
|
|
<el-button type="primary" @click="exportExcel">导出</el-button>
|
|
<el-button type="primary" @click="exportExcel">导出</el-button>
|
|
<!--<el-button type="primary" @click="exportExcelBefore"
|
|
<!--<el-button type="primary" @click="exportExcelBefore"
|
|
@@ -705,6 +708,7 @@ export default {
|
|
con1: '',
|
|
con1: '',
|
|
screen: '',
|
|
screen: '',
|
|
screen1: '',
|
|
screen1: '',
|
|
|
|
+ isExcludeZero: false,
|
|
startTime: generateStartDate(),
|
|
startTime: generateStartDate(),
|
|
endTime: generateEndDate(),
|
|
endTime: generateEndDate(),
|
|
apiId: '531',
|
|
apiId: '531',
|
|
@@ -888,6 +892,7 @@ export default {
|
|
let queryMap = {}
|
|
let queryMap = {}
|
|
queryMap[this.screen] = this.con
|
|
queryMap[this.screen] = this.con
|
|
queryMap[this.screen1] = this.con1
|
|
queryMap[this.screen1] = this.con1
|
|
|
|
+ queryMap['isExcludeZero'] = this.isExcludeZero
|
|
if (this.loginName != null) {
|
|
if (this.loginName != null) {
|
|
queryMap['consigneeName'] = this.loginName
|
|
queryMap['consigneeName'] = this.loginName
|
|
}
|
|
}
|
|
@@ -1008,6 +1013,7 @@ export default {
|
|
let queryMap = {}
|
|
let queryMap = {}
|
|
queryMap[this.screen] = this.con
|
|
queryMap[this.screen] = this.con
|
|
queryMap[this.screen1] = this.con1
|
|
queryMap[this.screen1] = this.con1
|
|
|
|
+ queryMap['isExcludeZero'] = this.isExcludeZero
|
|
if (this.loginName != null) {
|
|
if (this.loginName != null) {
|
|
queryMap['consigneeName'] = this.loginName
|
|
queryMap['consigneeName'] = this.loginName
|
|
}
|
|
}
|