|
|
@@ -250,6 +250,13 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="8">
|
|
|
+ <el-form-item prop="stockOrderSpecification" label="机型">
|
|
|
+ <div style="display: flex">
|
|
|
+ <el-input v-model="stockOrderSpecification" clearable style="margin-right: 10px" placeholder="请输入机型" />
|
|
|
+ </div>
|
|
|
+ </el-form-item>
|
|
|
+ </el-col>
|
|
|
+ <el-col :span="8">
|
|
|
<el-form-item prop="stockTimes" label="日期">
|
|
|
<el-date-picker
|
|
|
v-model="stockTimes"
|
|
|
@@ -262,7 +269,7 @@
|
|
|
/>
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
- <el-col :span="8">
|
|
|
+ <el-col :span="24">
|
|
|
<div style="float: right;"> <el-button size="mini" @click="handleReset($event, 'stockCost')">重置</el-button>
|
|
|
<el-button type="primary" size="mini" @click="currentPage = 1,getStockCostList()">查询</el-button></div>
|
|
|
</el-col>
|
|
|
@@ -456,6 +463,7 @@ export default {
|
|
|
specification: '',
|
|
|
stockOrderNo: '',
|
|
|
stockTimes: [],
|
|
|
+ stockOrderSpecification: '',
|
|
|
invoiceOrderForm: {
|
|
|
time: [],
|
|
|
invoiceId: '',
|
|
|
@@ -559,7 +567,7 @@ export default {
|
|
|
materialName: '',
|
|
|
materialNumber: '',
|
|
|
materialOldNumber: '',
|
|
|
- specification: '',
|
|
|
+ specification: this.stockOrderSpecification,
|
|
|
orderId: this.stockOrderNo,
|
|
|
endTime: time.length ? time[0] : '',
|
|
|
startTime: time.length ? time[1] : ''
|
|
|
@@ -576,6 +584,7 @@ export default {
|
|
|
this.getListInvoiceOrder()
|
|
|
} else if (type === 'stockCost') {
|
|
|
this.stockOrderNo = ''
|
|
|
+ this.stockOrderSpecification = ''
|
|
|
this.stockTimes = []
|
|
|
this.getStockCostList()
|
|
|
} else {
|
zh