DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

Browse Source
This commit is contained in:
Joshi
2026-01-10 16:55:09 +08:00
parent a422fa7ee2 d5990850e7
commit 0a427866bd
4 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-ui/src/views/wms/coil/do/search.vue
View File

@@ -267,8 +267,8 @@
</div>
<div class="card-footer">
<el-button v-if="item.dataType == 1" type="primary" icon="el-icon-check" size="mini" @click="handlePickMaterial(item)"
:loading="item.picking" class="action-btn">领料</el-button>
<el-button v-if="item.dataType == 1" type="primary" icon="el-icon-check" size="mini"
@click="handlePickMaterial(item)" :loading="item.picking" class="action-btn">领料</el-button>
</div>
</div>
</div>

8
klp-ui/src/views/wms/report/delivery.vue
View File

@@ -3,11 +3,11 @@
<el-row>
<el-form label-width="80px" inline>
<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>
</el-form-item>
<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>
</el-form-item>
<el-form-item label="入场钢卷号" prop="endTime">
@@ -127,8 +127,8 @@ export default {
pageNum: 1,
pageSize: 9999,
status: 1,
startTime: startTime,
endTime: endTime,
byCreateTimeStart: startTime,
byCreateTimeEnd: endTime,
selectType: 'product',
enterCoilNo: '',
currentCoilNo: '',

12
klp-ui/src/views/wms/report/receive.vue
View File

@@ -3,11 +3,11 @@
<el-row>
<el-form label-width="80px" inline>
<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>
</el-form-item>
<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>
</el-form-item>
<el-form-item label="入场钢卷号" prop="endTime">
@@ -128,8 +128,8 @@ export default {
pageNum: 1,
pageSize: 9999,
// status: 1,
startTime: startTime,
endTime: endTime,
byCreateTimeStart: startTime,
byCreateTimeEnd: endTime,
selectType: 'product',
enterCoilNo: '',
currentCoilNo: '',
@@ -163,8 +163,8 @@ export default {
actionType: 401,
pageSize: 999,
pageNum: 1,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
byCreateTimeStart: this.queryParams.byCreateTimeStart,
byCreateTimeEnd: this.queryParams.byCreateTimeEnd,
}).then(res => {
const actions = res.rows
const coilIds = actions.map(item => item.coilId).join(',')

29
klp-ui/src/views/wms/report/zha.vue
View File

@@ -3,11 +3,11 @@
<el-row>
<el-form label-width="80px" inline>
<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>
</el-form-item>
<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>
</el-form-item>
<el-form-item label="入场钢卷号" prop="endTime">
@@ -129,8 +129,8 @@ export default {
pageNum: 1,
pageSize: 9999,
// status: 1,
startTime: startTime,
endTime: endTime,
byCreateTimeStart: startTime,
byCreateTimeEnd: endTime,
selectType: 'product',
enterCoilNo: '',
currentCoilNo: '',
@@ -163,8 +163,6 @@ export default {
// 酸连轧成品库
listMaterialCoil({
...this.queryParams,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
pageSize: 9999,
pageNum: 1,
dataType: 1,
@@ -175,8 +173,6 @@ export default {
// 镀锌原料库
listMaterialCoil({
...this.queryParams,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
pageSize: 9999,
pageNum: 1,
dataType: 1,
@@ -187,17 +183,24 @@ export default {
// 脱脂原料库
listMaterialCoil({
...this.queryParams,
startTime: this.queryParams.startTime,
endTime: this.queryParams.endTime,
pageSize: 9999,
pageNum: 1,
dataType: 1,
createBy: 'suanzhakuguan',
warehouseId: '1988150545175736322'
}),
]).then(([res1, res2, res3]) => {
console.log(res1, res2, res3)
this.list = [...res1.rows, ...res2.rows, ...res3.rows]
// 酸连轧纵剪分条原料库1988150150521090049
listMaterialCoil({
...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
})
// listPendingAction({