refactor(wms): 统一时间参数命名并添加纵剪分条原料库数据
将接收、发货和轧后报表的时间参数从startTime/endTime统一改为byCreateTimeStart/byCreateTimeEnd 在轧后报表中添加纵剪分条原料库的数据查询
This commit is contained in:
@@ -3,11 +3,11 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-form label-width="80px" inline>
|
<el-form label-width="80px" inline>
|
||||||
<el-form-item label="开始时间" prop="startTime">
|
<el-form-item label="开始时间" prop="startTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
placeholder="选择开始时间"></el-date-picker>
|
placeholder="选择开始时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
<el-form-item label="结束时间" prop="endTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
placeholder="选择结束时间"></el-date-picker>
|
placeholder="选择结束时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-form label-width="80px" inline>
|
<el-form label-width="80px" inline>
|
||||||
<el-form-item label="开始时间" prop="startTime">
|
<el-form-item label="开始时间" prop="startTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
<el-form-item label="结束时间" prop="endTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
|
|||||||
@@ -3,11 +3,11 @@
|
|||||||
<el-row>
|
<el-row>
|
||||||
<el-form label-width="80px" inline>
|
<el-form label-width="80px" inline>
|
||||||
<el-form-item label="开始时间" prop="startTime">
|
<el-form-item label="开始时间" prop="startTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.startTime" type="datetime"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
<el-form-item label="结束时间" prop="endTime">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.endTime" type="datetime"
|
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
@@ -189,9 +189,18 @@ export default {
|
|||||||
createBy: 'suanzhakuguan',
|
createBy: 'suanzhakuguan',
|
||||||
warehouseId: '1988150545175736322'
|
warehouseId: '1988150545175736322'
|
||||||
}),
|
}),
|
||||||
]).then(([res1, res2, res3]) => {
|
// 酸连轧纵剪分条原料库1988150150521090049
|
||||||
console.log(res1, res2, res3)
|
listMaterialCoil({
|
||||||
this.list = [...res1.rows, ...res2.rows, ...res3.rows]
|
...this.queryParams,
|
||||||
|
pageSize: 9999,
|
||||||
|
pageNum: 1,
|
||||||
|
dataType: 1,
|
||||||
|
createBy: 'suanzhakuguan',
|
||||||
|
warehouseId: '1988150150521090049'
|
||||||
|
}),
|
||||||
|
]).then(([res1, res2, res3, res4]) => {
|
||||||
|
console.log(res1, res2, res3, res4)
|
||||||
|
this.list = [...res1.rows, ...res2.rows, ...res3.rows, ...res4.rows]
|
||||||
this.loading = false
|
this.loading = false
|
||||||
})
|
})
|
||||||
// listPendingAction({
|
// listPendingAction({
|
||||||
|
|||||||
Reference in New Issue
Block a user