|
@@ -47,6 +47,11 @@
|
47
|
47
|
<el-input v-model="query.ordNo" size="small" style="width:120px;margin-left: -8px" @input="getOrdList">
|
48
|
48
|
</el-input>
|
49
|
49
|
</el-form-item>
|
|
50
|
+
|
|
51
|
+ <el-form-item label="垛位备注" style="margin-left: -15px">
|
|
52
|
+ <el-input v-model="query.remark1" size="small" style="width:120px;margin-left: -8px">
|
|
53
|
+ </el-input>
|
|
54
|
+ </el-form-item>
|
50
|
55
|
<el-form-item label="" style="margin-top: 0px;margin-left: 10px">
|
51
|
56
|
<el-button @click="handleSearch" size="small" type="primary">查询</el-button>
|
52
|
57
|
<el-button @click="showChangeCustomer" size="small" type="primary">货权转移</el-button>
|
|
@@ -101,6 +106,8 @@
|
101
|
106
|
</el-table-column>
|
102
|
107
|
<el-table-column prop="remark" label="备注" width="150" show-overflow-tooltip header-align="center">
|
103
|
108
|
</el-table-column>
|
|
109
|
+ <el-table-column prop="remark1" label="垛位备注" width="200" show-overflow-tooltip header-align="center">
|
|
110
|
+ </el-table-column>
|
104
|
111
|
<el-table-column prop="addTime" label="入库时间" width="200" show-overflow-tooltip header-align="center">
|
105
|
112
|
</el-table-column>
|
106
|
113
|
</el-table>
|
|
@@ -225,10 +232,11 @@
|
225
|
232
|
materialName: '',
|
226
|
233
|
standard: '',
|
227
|
234
|
customerName: '',
|
228
|
|
- plateNo: '',
|
|
235
|
+ plateNo: [],
|
229
|
236
|
wareId:'',
|
230
|
|
- ordNo:'',
|
|
237
|
+ ordNo:[],
|
231
|
238
|
fkcustmerName:'',
|
|
239
|
+ remark1:''
|
232
|
240
|
},
|
233
|
241
|
multipleSelection: [],
|
234
|
242
|
tableData: [],
|
|
@@ -425,8 +433,9 @@
|
425
|
433
|
materialName: this.query.materialName,
|
426
|
434
|
standard: this.query.standard,
|
427
|
435
|
customerName: this.query.customerName,
|
428
|
|
- plateNo: this.query.plateNo == "" ? this.query.plateNo : this.query.plateNo.join(','),
|
429
|
|
- ordNo: this.query.ordNo == "" ? this.query.ordNo : this.query.ordNo.join(',')
|
|
436
|
+ plateNo: this.query.plateNo.length == 0 ? '' : this.query.plateNo.join(','),
|
|
437
|
+ ordNo: this.query.ordNo == 0 ? '' : this.query.ordNo.join(','),
|
|
438
|
+ remark1: this.query.remark1
|
430
|
439
|
}
|
431
|
440
|
console.log(param);
|
432
|
441
|
axios.get(url, param).then(response => {
|