Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/warehousenew/warehouseManagementList.vue

@@ -248,7 +248,6 @@
       </div>
       <div class="bottom-btn">
         <el-button @click="submitClick()">确定</el-button>
-        <!-- <el-button @click="submitClick()" v-if="headerText == '打印记录'">确定</el-button> -->
         <el-button @click="removePrint">取消</el-button>
       </div>
     </div>
@@ -574,7 +573,6 @@
 
       },
       async submitClick1() {
-
         if (!this.parameter.startDate) {
           this.$message.error('请选择打印的起始日期')
           return
@@ -587,25 +585,24 @@
           this.$message.error('截止日期输入错误')
           return
         }
-        if(this.parameter.warehouseName == '全部仓库'){
+        if (this.parameter.warehouseName == '全部仓库') {
           this.parameter.warehouseName = ''
         }
-            const {
-              data
-            } = await exportHistoricalInventory({
-              startDate: this.parameter.startDate,
-              endDate: this.parameter.endDate,
-              warehouseName: this.parameter.warehouseName
-            }, {}, {
-              responseType: 'blob'
-            }).toPromise()
-            downloadFile({
-              res: data,
-              fileName: `${
-          this.date.year + (this.date.month ? `-${this.date.month}` : '')
-        }导出历史库存记录`,
-              type: 'xls',
-            })
+        const {
+          data
+        } = await exportHistoricalInventory({
+          startDate: this.parameter.startDate,
+          endDate: this.parameter.endDate,
+          warehouseName: this.parameter.warehouseName
+        }, {}, {
+          responseType: 'blob'
+        }).toPromise()
+              downloadFile({
+                res: data,
+                fileName: `${this.date.year + (this.date.month ? `-${this.date.month}` : '')
+                  }导出历史库存记录`,
+                type: 'xls',
+              })
       },
       handleClose(){
         this.indialog = false