|
|
@@ -285,15 +285,15 @@
|
|
|
<el-form ref="form" label-width="110px">
|
|
|
<el-form-item label="类型" v-if="headerText == '打印记录'">
|
|
|
<el-radio-group v-model="parameter.radio" >
|
|
|
- <el-radio :label="1">入库记录</el-radio>
|
|
|
+ <el-radio :label="3" >入库记录</el-radio>
|
|
|
<el-radio :label="2">出库记录</el-radio>
|
|
|
</el-radio-group>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="起始日期">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" 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" :default-value="new Date()"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<el-form-item label="截止日期">
|
|
|
- <el-date-picker value-format="yyyy-MM-dd" 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" :default-value="new Date()"></el-date-picker>
|
|
|
</el-form-item>
|
|
|
<!--仓库名称-->
|
|
|
<el-form-item label="仓库名称" span="1" prop="warehouseName" >
|
|
|
@@ -316,9 +316,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="bottom-btn">
|
|
|
- <el-button @click="submitClick()" >确定</el-button>
|
|
|
+ <el-button @click="submitClick()">确定</el-button>
|
|
|
<!-- <el-button @click="submitClick()" v-if="headerText == '打印记录'">确定</el-button> -->
|
|
|
- <el-button @click="isShowPrintType = false">取消</el-button>
|
|
|
+ <el-button @click="removePrint">取消</el-button>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -333,7 +333,9 @@ import {
|
|
|
getsponsible,
|
|
|
clearancee,
|
|
|
xiala,
|
|
|
- postExport
|
|
|
+ postExport,
|
|
|
+ addselectinfoList,
|
|
|
+ printAdd,
|
|
|
} from '@/model/warehouse/index'
|
|
|
import { downloadFile } from '@/utils/batchDown'
|
|
|
import Pagination from '@/components/Pagination'
|
|
|
@@ -394,7 +396,11 @@ export default {
|
|
|
isShowPrintType:false,//打印
|
|
|
headerText:"",
|
|
|
packtypeList:[],//仓库列表
|
|
|
- parameter:{},
|
|
|
+ parameter:{
|
|
|
+ radio:3,
|
|
|
+ startDate:"",
|
|
|
+ endDate:"",
|
|
|
+ },
|
|
|
date: {
|
|
|
year: dayjs().format('YYYY'),
|
|
|
month: dayjs().format('MM'),
|
|
|
@@ -423,16 +429,45 @@ export default {
|
|
|
.then((response) => {
|
|
|
this.packtypeList = response
|
|
|
})
|
|
|
+ let date = new Date()
|
|
|
+ var year = date.getFullYear();
|
|
|
+ var month = date.getMonth() + 1;
|
|
|
+ var strDate = date.getDate()
|
|
|
+ this.parameter.startDate = ""+year+"-"+month+"-"+(strDate-1)
|
|
|
+ this.parameter.endDate = ""+year+"-"+month+"-"+strDate
|
|
|
this.isShowPrintType = true
|
|
|
},
|
|
|
+ removePrint(){
|
|
|
+ this.isShowPrintType = false
|
|
|
+ this.parameter = {}
|
|
|
+ },
|
|
|
async submitClick(){
|
|
|
- if(this.headerText = "导出入库记录"){
|
|
|
+ if(!this.parameter.radio && this.headerText == "打印记录"){
|
|
|
+ this.$message.error("请选择打印的类型")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!this.parameter.startDate){
|
|
|
+ this.$message.error("请选择打印的起始日期")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!this.parameter.endDate){
|
|
|
+ this.$message.error("请选择打印的截止日期")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(new Date(this.parameter.endDate).getTime() < new Date(this.parameter.startDate).getTime()){
|
|
|
+ this.$message.error("截止日期输入错误")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(!this.parameter.warehouseName){
|
|
|
+ this.$message.error("请选择所要打印的仓库")
|
|
|
+ return
|
|
|
+ }
|
|
|
+ if(this.headerText == "导出入库记录"){
|
|
|
const {
|
|
|
data
|
|
|
} = await postExport({startDate:this.parameter.startDate,endDate:this.parameter.endDate,warehouseName:this.parameter.warehouseName}, {}, {
|
|
|
responseType: 'blob'
|
|
|
}).toPromise()
|
|
|
- debugger
|
|
|
downloadFile({
|
|
|
res: data,
|
|
|
fileName: `${
|
|
|
@@ -440,11 +475,36 @@ export default {
|
|
|
}导出记录`,
|
|
|
type: 'xls',
|
|
|
})
|
|
|
- }else if(this.headerText = "打印记录"){
|
|
|
- window.open('../../../../../static/warehousePrint.html')
|
|
|
- console.log(this.parameter)
|
|
|
+ }else if(this.headerText == "打印记录"){
|
|
|
+ addselectinfoList({
|
|
|
+ compId: localStorage.getItem('ws-pf_compId'),
|
|
|
+ startDate:this.parameter.startDate,
|
|
|
+ endDate:this.parameter.endDate,
|
|
|
+ warehouseName:this.parameter.warehouseName,
|
|
|
+ searchType:this.parameter.radio,
|
|
|
+ currentPage: 1,
|
|
|
+ pageSize: 999,
|
|
|
+ }).toPromise()
|
|
|
+ .then((response) => {
|
|
|
+ if(response.records.length == 0){
|
|
|
+ this.$message.error("暂未查到所要打印的出入库信息")
|
|
|
+ }else{
|
|
|
+ sessionStorage.setItem("inOutWarehouse_Print",JSON.stringify(response.records))
|
|
|
+ let i = ""
|
|
|
+ i = this.parameter.radio+"&warehouseName=" + this.parameter.warehouseName
|
|
|
+ window.open('../../../../../static/warehousePrint.html?type=' + i)
|
|
|
+ }
|
|
|
+ })
|
|
|
+ // printAdd().toPromise()
|
|
|
+ // .then((response) => {
|
|
|
+ // debugger
|
|
|
+ // console.log(response)
|
|
|
+ // })
|
|
|
}
|
|
|
},
|
|
|
+ startChane(e){
|
|
|
+ console.log(e)
|
|
|
+ },
|
|
|
//清仓
|
|
|
clearance(row) {
|
|
|
console.log(row.outNumber)
|
zhongtianhaoyuan