Compare commits
2 Commits
0c3382d6db
...
702de37397
| Author | SHA1 | Date | |
|---|---|---|---|
| 702de37397 | |||
| 81252ccb2d |
@@ -50,7 +50,8 @@
|
|||||||
<i class="el-icon-box"></i>
|
<i class="el-icon-box"></i>
|
||||||
<p>暂无待领物料</p>
|
<p>暂无待领物料</p>
|
||||||
</div> -->
|
</div> -->
|
||||||
<KLPTable :data="materialCoilList" height="calc(100vh - 340px)" :floatLayer="true" :floatLayerConfig="floatLayerConfig" :row-style="getRowStyle">
|
<KLPTable :data="materialCoilList" height="calc(100vh - 340px)" :floatLayer="true"
|
||||||
|
:floatLayerConfig="floatLayerConfig" :row-style="getRowStyle">
|
||||||
<el-table-column prop="status" label="钢卷状态" width="100" show-overflow-tooltip>
|
<el-table-column prop="status" label="钢卷状态" width="100" show-overflow-tooltip>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag size="small" :style="getBorderStyle(scope.row)">{{ getTypeLabel(scope.row) }}</el-tag>
|
<el-tag size="small" :style="getBorderStyle(scope.row)">{{ getTypeLabel(scope.row) }}</el-tag>
|
||||||
@@ -66,12 +67,15 @@
|
|||||||
<el-table-column prop="warehouseName" label="逻辑库区" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="warehouseName" label="逻辑库区" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="specification" label="规格" width="100" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="specification" label="规格" width="100" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="netWeight" label="净重" width="100" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="netWeight" label="净重" width="100" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="action" label="操作" width="400">
|
<el-table-column prop="action" label="操作" width="500">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
||||||
size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
|
size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
|
||||||
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
||||||
size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
|
size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
|
||||||
|
<el-button size="mini" type="default" style="margin-left: 0px; padding: 4px !important;" icon="el-icon-view" @click="handleNumberCoilClick(scope.row)">
|
||||||
|
数字钢卷
|
||||||
|
</el-button>
|
||||||
<el-button type="warning" icon="el-icon-time" size="mini" @click="handleTrace(scope.row)"
|
<el-button type="warning" icon="el-icon-time" size="mini" @click="handleTrace(scope.row)"
|
||||||
:loading="scope.row.picking" class="action-btn">追溯</el-button>
|
:loading="scope.row.picking" class="action-btn">追溯</el-button>
|
||||||
|
|
||||||
@@ -80,14 +84,12 @@
|
|||||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(scope.row)"
|
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(scope.row)"
|
||||||
:loading="scope.row.picking" class="action-btn">删除</el-button>
|
:loading="scope.row.picking" class="action-btn">删除</el-button>
|
||||||
|
|
||||||
<el-button v-if="scope.row.dataType == 1 && scope.row.status == 0"
|
<el-button v-if="scope.row.dataType == 1 && scope.row.status == 0" type="success"
|
||||||
type="success" icon="el-icon-refresh"
|
icon="el-icon-refresh" size="mini" @click="handleRestoreMaterial(scope.row)"
|
||||||
size="mini" @click="handleRestoreMaterial(scope.row)" :loading="scope.row.cancelling"
|
:loading="scope.row.cancelling" class="action-btn">回滚</el-button>
|
||||||
class="action-btn">回滚</el-button>
|
<el-button v-if="scope.row.dataType == 10 && scope.row.status == 0" type="success"
|
||||||
<el-button v-if="scope.row.dataType == 10 && scope.row.status == 0"
|
icon="el-icon-refresh" size="mini" @click="handleForceInMaterial(scope.row)"
|
||||||
type="success" icon="el-icon-refresh"
|
:loading="scope.row.cancelling" class="action-btn">强制入库</el-button>
|
||||||
size="mini" @click="handleForceInMaterial(scope.row)" :loading="scope.row.cancelling"
|
|
||||||
class="action-btn">强制入库</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
@@ -603,6 +605,12 @@ export default {
|
|||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
parseTime,
|
parseTime,
|
||||||
|
// 进入数字钢卷页面
|
||||||
|
handleNumberCoilClick(row) {
|
||||||
|
this.$router.push({
|
||||||
|
path: '/wms/coil/' + row.coilId,
|
||||||
|
});
|
||||||
|
},
|
||||||
/** 新增按钮操作 */
|
/** 新增按钮操作 */
|
||||||
handleAdd() {
|
handleAdd() {
|
||||||
this.reset();
|
this.reset();
|
||||||
|
|||||||
@@ -55,12 +55,15 @@
|
|||||||
<el-table-column prop="specification" label="规格" width="100" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="specification" label="规格" width="100" show-overflow-tooltip></el-table-column>
|
||||||
<el-table-column prop="netWeight" label="净重" width="100" show-overflow-tooltip></el-table-column>
|
<el-table-column prop="netWeight" label="净重" width="100" show-overflow-tooltip></el-table-column>
|
||||||
|
|
||||||
<el-table-column prop="action" label="操作" width="400">
|
<el-table-column prop="action" label="操作" width="460">
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
||||||
size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
|
size="mini" icon="el-icon-view" @click="handlePreviewLabel(scope.row)" title="预览标签">预览</el-button>
|
||||||
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
<el-button v-loading="buttonLoading" style="margin-left: 0px; padding: 4px !important;" type="default"
|
||||||
size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
|
size="mini" icon="el-icon-printer" @click="handlePrintLabel(scope.row)" title="打印标签">打印</el-button>
|
||||||
|
<el-button size="mini" type="default" style="margin-left: 0px; padding: 4px !important;" icon="el-icon-view" @click="handleNumberCoilClick(scope.row)">
|
||||||
|
数字钢卷
|
||||||
|
</el-button>
|
||||||
<el-button type="warning" icon="el-icon-time" size="mini" @click="handleTrace(scope.row)"
|
<el-button type="warning" icon="el-icon-time" size="mini" @click="handleTrace(scope.row)"
|
||||||
:loading="scope.row.picking" class="action-btn">追溯</el-button>
|
:loading="scope.row.picking" class="action-btn">追溯</el-button>
|
||||||
|
|
||||||
@@ -69,14 +72,12 @@
|
|||||||
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(scope.row)"
|
<el-button type="danger" icon="el-icon-delete" size="mini" @click="hanleDeleteMaterial(scope.row)"
|
||||||
:loading="scope.row.picking" class="action-btn">删除</el-button>
|
:loading="scope.row.picking" class="action-btn">删除</el-button>
|
||||||
|
|
||||||
<el-button v-if="scope.row.dataType == 1 && scope.row.status == 0"
|
<el-button v-if="scope.row.dataType == 1 && scope.row.status == 0" type="success" icon="el-icon-refresh"
|
||||||
type="success" icon="el-icon-refresh"
|
|
||||||
size="mini" @click="handleRestoreMaterial(scope.row)" :loading="scope.row.cancelling"
|
size="mini" @click="handleRestoreMaterial(scope.row)" :loading="scope.row.cancelling"
|
||||||
class="action-btn">回滚</el-button>
|
class="action-btn">回滚</el-button>
|
||||||
<el-button v-if="scope.row.dataType == 10 && scope.row.status == 0"
|
<el-button v-if="scope.row.dataType == 10 && scope.row.status == 0" type="success"
|
||||||
type="success" icon="el-icon-refresh"
|
icon="el-icon-refresh" size="mini" @click="handleForceInMaterial(scope.row)"
|
||||||
size="mini" @click="handleForceInMaterial(scope.row)" :loading="scope.row.cancelling"
|
:loading="scope.row.cancelling" class="action-btn">强制入库</el-button>
|
||||||
class="action-btn">强制入库</el-button>
|
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
|
||||||
@@ -597,6 +598,12 @@ export default {
|
|||||||
}
|
}
|
||||||
return '物品类型';
|
return '物品类型';
|
||||||
},
|
},
|
||||||
|
// 进入数字钢卷页面
|
||||||
|
handleNumberCoilClick(row) {
|
||||||
|
this.$router.push({
|
||||||
|
path: '/wms/coil/' + row.coilId,
|
||||||
|
});
|
||||||
|
},
|
||||||
// 分条操作列表(100-199)
|
// 分条操作列表(100-199)
|
||||||
splitTypes() {
|
splitTypes() {
|
||||||
if (!this.dict.type.action_type) return [];
|
if (!this.dict.type.action_type) return [];
|
||||||
|
|||||||
209
klp-ui/src/views/wms/report/components/timeRangePicker.vue
Normal file
209
klp-ui/src/views/wms/report/components/timeRangePicker.vue
Normal file
@@ -0,0 +1,209 @@
|
|||||||
|
<template>
|
||||||
|
<div class="time-range-picker">
|
||||||
|
<div class="time-picker-section">
|
||||||
|
<el-date-picker
|
||||||
|
style="width: 200px;"
|
||||||
|
v-model="startTime"
|
||||||
|
type="datetime"
|
||||||
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
|
placeholder="选择开始时间"
|
||||||
|
@change="handleTimeChange"
|
||||||
|
/>
|
||||||
|
<span class="separator">至</span>
|
||||||
|
<el-date-picker
|
||||||
|
style="width: 200px;"
|
||||||
|
v-model="endTime"
|
||||||
|
type="datetime"
|
||||||
|
value-format="yyyy-MM-dd HH:mm:ss"
|
||||||
|
placeholder="选择结束时间"
|
||||||
|
@change="handleTimeChange"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div class="quick-options">
|
||||||
|
<el-button size="small" @click="setQuickTime('prevDay')">前一天</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('nextDay')">后一天</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('last7Days')">近7天</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('last15Days')">近15天</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('last30Days')">近30天</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('thisWeek')">本周</el-button>
|
||||||
|
<el-button size="small" @click="setQuickTime('thisMonth')">本月</el-button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</template>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
export default {
|
||||||
|
name: 'TimeRangePicker',
|
||||||
|
props: {
|
||||||
|
value: {
|
||||||
|
type: Object,
|
||||||
|
default: () => ({})
|
||||||
|
},
|
||||||
|
startKey: {
|
||||||
|
type: String,
|
||||||
|
default: 'byCreateTimeStart'
|
||||||
|
},
|
||||||
|
endKey: {
|
||||||
|
type: String,
|
||||||
|
default: 'byCreateTimeEnd'
|
||||||
|
},
|
||||||
|
defaultStartTime: {
|
||||||
|
type: String,
|
||||||
|
default: ''
|
||||||
|
},
|
||||||
|
defaultEndTime: {
|
||||||
|
type: String,
|
||||||
|
default: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
data() {
|
||||||
|
return {
|
||||||
|
startTime: '',
|
||||||
|
endTime: ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
watch: {
|
||||||
|
value: {
|
||||||
|
handler(newVal) {
|
||||||
|
if (newVal) {
|
||||||
|
this.startTime = newVal[this.startKey] || ''
|
||||||
|
this.endTime = newVal[this.endKey] || ''
|
||||||
|
}
|
||||||
|
},
|
||||||
|
immediate: true,
|
||||||
|
deep: true
|
||||||
|
}
|
||||||
|
},
|
||||||
|
mounted() {
|
||||||
|
if (this.defaultStartTime && this.defaultEndTime) {
|
||||||
|
this.startTime = this.defaultStartTime
|
||||||
|
this.endTime = this.defaultEndTime
|
||||||
|
this.handleTimeChange()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
methods: {
|
||||||
|
addZero(num) {
|
||||||
|
return num.toString().padStart(2, '0')
|
||||||
|
},
|
||||||
|
formatDate(date) {
|
||||||
|
const year = date.getFullYear()
|
||||||
|
const month = this.addZero(date.getMonth() + 1)
|
||||||
|
const day = this.addZero(date.getDate())
|
||||||
|
return `${year}-${month}-${day}`
|
||||||
|
},
|
||||||
|
// 从时间字符串中提取时分秒部分
|
||||||
|
getTimePart(timeStr) {
|
||||||
|
if (!timeStr) return '07:00:00'
|
||||||
|
const parts = timeStr.split(' ')
|
||||||
|
return parts.length > 1 ? parts[1] : '07:00:00'
|
||||||
|
},
|
||||||
|
// 将日期和时间组合
|
||||||
|
combineDateTime(dateStr, timeStr) {
|
||||||
|
return `${dateStr} ${timeStr}`
|
||||||
|
},
|
||||||
|
handleTimeChange() {
|
||||||
|
this.$emit('input', {
|
||||||
|
[this.startKey]: this.startTime,
|
||||||
|
[this.endKey]: this.endTime
|
||||||
|
})
|
||||||
|
this.$emit('change', {
|
||||||
|
[this.startKey]: this.startTime,
|
||||||
|
[this.endKey]: this.endTime
|
||||||
|
})
|
||||||
|
},
|
||||||
|
setQuickTime(type) {
|
||||||
|
// 保留当前选中的时分秒
|
||||||
|
const startHourMinSec = this.getTimePart(this.startTime)
|
||||||
|
const endHourMinSec = this.getTimePart(this.endTime)
|
||||||
|
|
||||||
|
// 获取当前选择的开始和结束时间对应的日期对象
|
||||||
|
let currentStartDate = this.startTime ? new Date(this.startTime.replace(/-/g, '/')) : new Date()
|
||||||
|
let currentEndDate = this.endTime ? new Date(this.endTime.replace(/-/g, '/')) : new Date()
|
||||||
|
|
||||||
|
let newStartDate = new Date(currentStartDate)
|
||||||
|
let newEndDate = new Date(currentEndDate)
|
||||||
|
|
||||||
|
switch (type) {
|
||||||
|
case 'prevDay':
|
||||||
|
// 在当前时间基础上向前推一天
|
||||||
|
newStartDate.setDate(newStartDate.getDate() - 1)
|
||||||
|
newEndDate.setDate(newEndDate.getDate() - 1)
|
||||||
|
break
|
||||||
|
case 'nextDay':
|
||||||
|
// 在当前时间基础上向后推一天
|
||||||
|
newStartDate.setDate(newStartDate.getDate() + 1)
|
||||||
|
newEndDate.setDate(newEndDate.getDate() + 1)
|
||||||
|
break
|
||||||
|
case 'last7Days':
|
||||||
|
const now1 = new Date()
|
||||||
|
const sevenDaysAgo = new Date(now1)
|
||||||
|
sevenDaysAgo.setDate(sevenDaysAgo.getDate() - 7)
|
||||||
|
newStartDate = sevenDaysAgo
|
||||||
|
newEndDate = now1
|
||||||
|
break
|
||||||
|
case 'last15Days':
|
||||||
|
const now2 = new Date()
|
||||||
|
const fifteenDaysAgo = new Date(now2)
|
||||||
|
fifteenDaysAgo.setDate(fifteenDaysAgo.getDate() - 15)
|
||||||
|
newStartDate = fifteenDaysAgo
|
||||||
|
newEndDate = now2
|
||||||
|
break
|
||||||
|
case 'last30Days':
|
||||||
|
const now3 = new Date()
|
||||||
|
const thirtyDaysAgo = new Date(now3)
|
||||||
|
thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30)
|
||||||
|
newStartDate = thirtyDaysAgo
|
||||||
|
newEndDate = now3
|
||||||
|
break
|
||||||
|
case 'thisWeek':
|
||||||
|
const now4 = new Date()
|
||||||
|
const dayOfWeek = now4.getDay() || 7
|
||||||
|
const weekStart = new Date(now4)
|
||||||
|
weekStart.setDate(weekStart.getDate() - dayOfWeek + 1)
|
||||||
|
const weekEnd = new Date(weekStart)
|
||||||
|
weekEnd.setDate(weekEnd.getDate() + 6)
|
||||||
|
newStartDate = weekStart
|
||||||
|
newEndDate = weekEnd
|
||||||
|
break
|
||||||
|
case 'thisMonth':
|
||||||
|
const now5 = new Date()
|
||||||
|
const monthStart = new Date(now5.getFullYear(), now5.getMonth(), 1)
|
||||||
|
const monthEnd = new Date(now5.getFullYear(), now5.getMonth() + 1, 0)
|
||||||
|
newStartDate = monthStart
|
||||||
|
newEndDate = monthEnd
|
||||||
|
break
|
||||||
|
}
|
||||||
|
|
||||||
|
// 组合新的日期和保留的时分秒
|
||||||
|
this.startTime = this.combineDateTime(this.formatDate(newStartDate), startHourMinSec)
|
||||||
|
this.endTime = this.combineDateTime(this.formatDate(newEndDate), endHourMinSec)
|
||||||
|
|
||||||
|
this.handleTimeChange()
|
||||||
|
|
||||||
|
// 快捷选择后触发查询事件
|
||||||
|
this.$emit('quick-select')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
|
||||||
|
<style scoped>
|
||||||
|
.time-range-picker {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.time-picker-section {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
}
|
||||||
|
.separator {
|
||||||
|
color: #606266;
|
||||||
|
}
|
||||||
|
.quick-options {
|
||||||
|
display: flex;
|
||||||
|
gap: 8px;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
@@ -2,13 +2,15 @@
|
|||||||
<div class="app-container" v-loading="loading">
|
<div class="app-container" v-loading="loading">
|
||||||
<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="timeRange">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeStart" type="datetime"
|
<time-range-picker
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
v-model="queryParams"
|
||||||
</el-form-item>
|
start-key="byExportTimeStart"
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
end-key="byExportTimeEnd"
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byExportTimeEnd" type="datetime"
|
:default-start-time="defaultStartTime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
:default-end-time="defaultEndTime"
|
||||||
|
@quick-select="handleQuery"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||||
@@ -76,6 +78,7 @@ import MutiSelect from "@/components/MutiSelect";
|
|||||||
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
||||||
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
||||||
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
||||||
|
import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
|
||||||
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
@@ -88,6 +91,7 @@ export default {
|
|||||||
WarehouseSelect,
|
WarehouseSelect,
|
||||||
ColumnsSetting,
|
ColumnsSetting,
|
||||||
CoilTable,
|
CoilTable,
|
||||||
|
TimeRangePicker,
|
||||||
},
|
},
|
||||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||||
data() {
|
data() {
|
||||||
@@ -116,13 +120,13 @@ export default {
|
|||||||
activeColumnConfig: 'coil-report-delivery',
|
activeColumnConfig: 'coil-report-delivery',
|
||||||
settingVisible: false,
|
settingVisible: false,
|
||||||
list: [],
|
list: [],
|
||||||
|
defaultStartTime: startTime,
|
||||||
|
defaultEndTime: endTime,
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 99999,
|
pageSize: 99999,
|
||||||
status: 1,
|
status: 1,
|
||||||
dataType: 1,
|
dataType: 1,
|
||||||
byExportTimeStart: startTime,
|
|
||||||
byExportTimeEnd: endTime,
|
|
||||||
selectType: 'product',
|
selectType: 'product',
|
||||||
enterCoilNo: '',
|
enterCoilNo: '',
|
||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
|
|||||||
@@ -124,6 +124,7 @@ export const splitConfig = {
|
|||||||
{ value: '1988150800092950529', label: '退火分条成品' },
|
{ value: '1988150800092950529', label: '退火分条成品' },
|
||||||
{ value: '1988150380649967617', label: '镀锌分条成品' },
|
{ value: '1988150380649967617', label: '镀锌分条成品' },
|
||||||
{ value: '1988151027466170370', label: '拉矫分条成品' },
|
{ value: '1988151027466170370', label: '拉矫分条成品' },
|
||||||
|
{ value: '2027272581575487489', label: '包装用内部仓' },
|
||||||
],
|
],
|
||||||
productionLine: '分条线',
|
productionLine: '分条线',
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,13 +2,15 @@
|
|||||||
<div class="app-container" v-loading="loading">
|
<div class="app-container" v-loading="loading">
|
||||||
<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="timeRange">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
<time-range-picker
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
v-model="queryParams"
|
||||||
</el-form-item>
|
start-key="byCreateTimeStart"
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
end-key="byCreateTimeEnd"
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
:default-start-time="defaultStartTime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
:default-end-time="defaultEndTime"
|
||||||
|
@quick-select="handleQuery"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||||
@@ -87,6 +89,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
|||||||
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
|
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
|
||||||
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
||||||
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
||||||
|
import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
|
||||||
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
||||||
|
|
||||||
|
|
||||||
@@ -100,6 +103,7 @@ export default {
|
|||||||
WarehouseSelect,
|
WarehouseSelect,
|
||||||
ColumnsSetting,
|
ColumnsSetting,
|
||||||
CoilTable,
|
CoilTable,
|
||||||
|
TimeRangePicker,
|
||||||
},
|
},
|
||||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
||||||
data() {
|
data() {
|
||||||
@@ -128,12 +132,11 @@ export default {
|
|||||||
activeColumnConfig: 'coil-report-receive',
|
activeColumnConfig: 'coil-report-receive',
|
||||||
settingVisible: false,
|
settingVisible: false,
|
||||||
list: [],
|
list: [],
|
||||||
|
defaultStartTime: startTime,
|
||||||
|
defaultEndTime: endTime,
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 9999,
|
pageSize: 9999,
|
||||||
// status: 1,
|
|
||||||
byCreateTimeStart: startTime,
|
|
||||||
byCreateTimeEnd: endTime,
|
|
||||||
selectType: 'raw_material',
|
selectType: 'raw_material',
|
||||||
enterCoilNo: '',
|
enterCoilNo: '',
|
||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
|
|||||||
@@ -175,7 +175,6 @@ export default {
|
|||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
dicts: ['product_coil_status', 'coil_itemname'],
|
|
||||||
data() {
|
data() {
|
||||||
// 工具函数:个位数补零
|
// 工具函数:个位数补零
|
||||||
const addZero = (num) => num.toString().padStart(2, '0')
|
const addZero = (num) => num.toString().padStart(2, '0')
|
||||||
|
|||||||
@@ -2,13 +2,15 @@
|
|||||||
<div class="app-container" v-loading="loading">
|
<div class="app-container" v-loading="loading">
|
||||||
<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="timeRange">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
<time-range-picker
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
v-model="queryParams"
|
||||||
</el-form-item>
|
start-key="byCreateTimeStart"
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
end-key="byCreateTimeEnd"
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
:default-start-time="defaultStartTime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
:default-end-time="defaultEndTime"
|
||||||
|
@quick-select="handleQuery"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||||
@@ -77,6 +79,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
|||||||
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
|
import { listDeliveryPlan } from '@/api/wms/deliveryPlan'
|
||||||
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
||||||
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
||||||
|
import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
|
||||||
import { fetchLossList } from "@/views/wms/report/js/fetch";
|
import { fetchLossList } from "@/views/wms/report/js/fetch";
|
||||||
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
||||||
|
|
||||||
@@ -92,6 +95,7 @@ export default {
|
|||||||
WarehouseSelect,
|
WarehouseSelect,
|
||||||
ColumnsSetting,
|
ColumnsSetting,
|
||||||
CoilTable,
|
CoilTable,
|
||||||
|
TimeRangePicker,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
actionTypes: {
|
actionTypes: {
|
||||||
@@ -107,7 +111,7 @@ export default {
|
|||||||
default: '',
|
default: '',
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
dicts: ['product_coil_status', 'coil_material', 'coil_itemname', 'coil_manufacturer'],
|
dicts: ['coil_material', 'coil_manufacturer'],
|
||||||
data() {
|
data() {
|
||||||
// 工具函数:个位数补零,保证格式统一(比如 9 → 09,5 → 05)
|
// 工具函数:个位数补零,保证格式统一(比如 9 → 09,5 → 05)
|
||||||
const addZero = (num) => num.toString().padStart(2, '0')
|
const addZero = (num) => num.toString().padStart(2, '0')
|
||||||
@@ -135,12 +139,11 @@ export default {
|
|||||||
settingVisible: false,
|
settingVisible: false,
|
||||||
list: [],
|
list: [],
|
||||||
lossList: [],
|
lossList: [],
|
||||||
|
defaultStartTime: startTime,
|
||||||
|
defaultEndTime: endTime,
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 9999,
|
pageSize: 9999,
|
||||||
// status: 1,
|
|
||||||
byCreateTimeStart: startTime,
|
|
||||||
byCreateTimeEnd: endTime,
|
|
||||||
selectType: 'raw_material',
|
selectType: 'raw_material',
|
||||||
enterCoilNo: '',
|
enterCoilNo: '',
|
||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
|
|||||||
@@ -2,13 +2,15 @@
|
|||||||
<div class="app-container" v-loading="loading">
|
<div class="app-container" v-loading="loading">
|
||||||
<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="timeRange">
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="datetime"
|
<time-range-picker
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择开始时间"></el-date-picker>
|
v-model="queryParams"
|
||||||
</el-form-item>
|
start-key="byCreateTimeStart"
|
||||||
<el-form-item label="结束时间" prop="endTime">
|
end-key="byCreateTimeEnd"
|
||||||
<el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="datetime"
|
:default-start-time="defaultStartTime"
|
||||||
value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择结束时间"></el-date-picker>
|
:default-end-time="defaultEndTime"
|
||||||
|
@quick-select="handleQuery"
|
||||||
|
/>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="入场钢卷号" prop="endTime">
|
<el-form-item label="入场钢卷号" prop="endTime">
|
||||||
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
<el-input style="width: 200px; display: inline-block;" v-model="queryParams.enterCoilNo"
|
||||||
@@ -76,6 +78,7 @@ import MutiSelect from "@/components/MutiSelect";
|
|||||||
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
|
||||||
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
import ColumnsSetting from "@/views/wms/report/components/setting/columns.vue";
|
||||||
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
import CoilTable from "@/views/wms/report/components/coilTable/index.vue";
|
||||||
|
import TimeRangePicker from "@/views/wms/report/components/timeRangePicker.vue";
|
||||||
import { fetchOutputList } from "@/views/wms/report/js/fetch";
|
import { fetchOutputList } from "@/views/wms/report/js/fetch";
|
||||||
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
import { saveReportFile } from "@/views/wms/report/js/reportFile";
|
||||||
|
|
||||||
@@ -91,6 +94,7 @@ export default {
|
|||||||
WarehouseSelect,
|
WarehouseSelect,
|
||||||
ColumnsSetting,
|
ColumnsSetting,
|
||||||
CoilTable,
|
CoilTable,
|
||||||
|
TimeRangePicker,
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
baseQueryParams: {
|
baseQueryParams: {
|
||||||
@@ -133,12 +137,11 @@ export default {
|
|||||||
activeColumnConfig: 'coil-report-output',
|
activeColumnConfig: 'coil-report-output',
|
||||||
settingVisible: false,
|
settingVisible: false,
|
||||||
list: [],
|
list: [],
|
||||||
|
defaultStartTime: startTime,
|
||||||
|
defaultEndTime: endTime,
|
||||||
queryParams: {
|
queryParams: {
|
||||||
pageNum: 1,
|
pageNum: 1,
|
||||||
pageSize: 9999,
|
pageSize: 9999,
|
||||||
// status: 1,
|
|
||||||
byCreateTimeStart: startTime,
|
|
||||||
byCreateTimeEnd: endTime,
|
|
||||||
enterCoilNo: '',
|
enterCoilNo: '',
|
||||||
currentCoilNo: '',
|
currentCoilNo: '',
|
||||||
warehouseId: '',
|
warehouseId: '',
|
||||||
|
|||||||
Reference in New Issue
Block a user