|
|
@@ -218,6 +218,7 @@
|
|
|
<!--仓库名称-->
|
|
|
<el-form-item label="仓库名称" span="1" prop="warehouseName">
|
|
|
<el-select v-model="parameter.warehouseName" placeholder="请选择仓库名称" filterable clearable>
|
|
|
+ <el-option key="" label="全部仓库" value="全部仓库" />
|
|
|
<el-option v-for="item in warehouseAllXiaLa" :key="item.warehouseName" :label="item.warehouseName" :value="item.warehouseName" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -349,6 +350,7 @@
|
|
|
this.isShowPrintType = false
|
|
|
},
|
|
|
async submitClick() {
|
|
|
+
|
|
|
if (!this.parameter.radio && this.headerText == '打印记录') {
|
|
|
this.$message.error('请选择打印的类型')
|
|
|
return
|
|
|
@@ -368,6 +370,9 @@
|
|
|
if (!this.parameter.warehouseName) {
|
|
|
this.$message.error('请选择所要打印的仓库')
|
|
|
return
|
|
|
+ }
|
|
|
+ if(this.parameter.warehouseName == "全部仓库"){
|
|
|
+ this.parameter.warehouseName = ""
|
|
|
}
|
|
|
this.parameter.warehouseName = this.parameter.warehouseName.replace("（临）","")
|
|
|
if (this.headerText == '导出记录') {
|
zhongtianhaoyuan