gjy преди 3 години
родител
ревизия
d1a638b8b0
променени са 2 файла, в които са добавени 10 реда и са изтрити 9 реда
  1. 1 1
      src/model/warehouse/index.js
  2. 9 8
      src/views/warehouse/warehouseManagementList.vue

+ 1 - 1
src/model/warehouse/index.js

@@ -120,5 +120,5 @@ export const postcheckorupdate = appRx.post(API_GET_CHECKORUPDATE,errorCatcher,
 //获取出入库任务编号
 export const getReceiptTaskNo = appRx.get(API_GET_RECEIPTTASKNO,errorCatcher, errorHandle, filter)
 //导出
-export const postExport = appRx.post(API_POST_EXPORT,errorCatcher, errorHandle, filter)
+export const postExport = appRx.post(API_POST_EXPORT)
 

+ 9 - 8
src/views/warehouse/warehouseManagementList.vue

@@ -290,10 +290,10 @@
              </el-radio-group>
               </el-form-item>
               <el-form-item label="起始日期">
-              <el-date-picker type="date" placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
+              <el-date-picker value-format="yyyy-MM-dd" type="date"  placeholder="请选择起始日期" v-model="parameter.startDate"></el-date-picker>
               </el-form-item>
               <el-form-item label="截止日期">
-              <el-date-picker type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
+              <el-date-picker  value-format="yyyy-MM-dd" type="date" placeholder="请选择截止日期" v-model="parameter.endDate" ></el-date-picker>
               </el-form-item>
                <!--仓库名称-->
             <el-form-item label="仓库名称" span="1" prop="warehouseName" >
@@ -426,10 +426,11 @@ export default {
       this.isShowPrintType = true
     },
     async submitClick(){
-      // if(this.headerText = "导出入库记录"){
+      debugger
+      if(this.headerText = "导出入库记录"){
         const { 
            data 
-           } = await postExport(this.parameter, {}, {
+           } = await postExport({startDate:this.parameter.startDate,endDate:this.parameter.endDate,warehouseName:this.parameter.warehouseName}, {}, {
           responseType: 'blob'
         }).toPromise()
         downloadFile({
@@ -439,10 +440,10 @@ export default {
         }导出记录`,
           type: 'xls',
         })
-      // }else if(this.headerText = "打印记录"){
-      //  window.open('../../../../../static/warehousePrint.html')
-      //  console.log(this.parameter)
-      // }
+      }else if(this.headerText = "打印记录"){
+       window.open('../../../../../static/warehousePrint.html')
+       console.log(this.parameter)
+      }
     },
     //清仓
     clearance(row) {