|
@@ -46,7 +46,7 @@
|
46
|
46
|
</el-input>
|
47
|
47
|
</el-form-item>
|
48
|
48
|
<el-form-item label="钢板号" style="margin-left: -35px;">
|
49
|
|
- <el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px">
|
|
49
|
+ <el-input v-model="query.plateNo" size="small" style="width:120px;margin-left: -8px" @input="getPltList">
|
50
|
50
|
</el-input>
|
51
|
51
|
</el-form-item>
|
52
|
52
|
<el-form-item label="出库时间" style="margin-left: -35px;margin-top: 0px">
|
|
@@ -265,7 +265,7 @@
|
265
|
265
|
materialName: '',
|
266
|
266
|
standard: '',
|
267
|
267
|
customerName: '',
|
268
|
|
- plateNo: '',
|
|
268
|
+ plateNo: [],
|
269
|
269
|
RecordDate:[],
|
270
|
270
|
carNo:'',
|
271
|
271
|
tallyPeople:'',
|
|
@@ -538,7 +538,8 @@
|
538
|
538
|
materialName: this.query.materialName,
|
539
|
539
|
standard: this.query.standard,
|
540
|
540
|
customerName: this.query.customerName,
|
541
|
|
- plateNo: this.query.plateNo,
|
|
541
|
+ plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
|
|
542
|
+ //plateNo: this.query.plateNo,
|
542
|
543
|
pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"), //date类型
|
543
|
544
|
pToDate :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
|
544
|
545
|
carNo:this.query.carNo,
|
|
@@ -569,6 +570,10 @@
|
569
|
570
|
handleSelectionChange(val) {
|
570
|
571
|
this.selectRows = val
|
571
|
572
|
},
|
|
573
|
+ getPltList(){
|
|
574
|
+ const replaceResult = this.query.plateNo.replace(/[;,,;\s\r\n]+/g, ",").split(",");
|
|
575
|
+ this.query.plateNo = replaceResult;
|
|
576
|
+ },
|
572
|
577
|
handleOutBack() {
|
573
|
578
|
if (this.selectRows.length != 1) {
|
574
|
579
|
this.$message({
|
|
@@ -669,7 +674,8 @@
|
669
|
674
|
materialName: this.query.materialName,
|
670
|
675
|
standard: this.query.standard,
|
671
|
676
|
customerName: this.query.customerName,
|
672
|
|
- plateNo: this.query.plateNo,
|
|
677
|
+ //plateNo: this.query.plateNo,
|
|
678
|
+ plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
|
673
|
679
|
pFromDate:(!this.query.RecordDate[0]) ? "1970-01-01 00:00:00" : this.query.RecordDate[0].Format("yyyy-MM-dd HH:mm:ss"), //date类型
|
674
|
680
|
pToDate :(!this.query.RecordDate[1]) ? new Date().Format("yyyy-MM-dd HH:mm:ss") :this.query.RecordDate[1].Format("yyyy-MM-dd HH:mm:ss"),
|
675
|
681
|
carNo:this.query.carNo,
|
|
@@ -734,6 +740,7 @@
|
734
|
740
|
,"出库时间"
|
735
|
741
|
,"备注"
|
736
|
742
|
,"类型"
|
|
743
|
+ ,"库龄"
|
737
|
744
|
|
738
|
745
|
] // 导出的表头名
|
739
|
746
|
const filterVal = [
|
|
@@ -766,6 +773,7 @@
|
766
|
773
|
,"addTime"
|
767
|
774
|
,"remark"
|
768
|
775
|
,"recordType"
|
|
776
|
+ ,"inwareDay"
|
769
|
777
|
]
|
770
|
778
|
|
771
|
779
|
for(var i=0;i<imptData.length;i++){
|