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-04-22 17:47:17 +08:00
parent 98eee1785f 8897a2ad9f
commit a553b8ddc4
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
klp-ui/src/views/wms/anneal/performance/index.vue
View File

@@ -24,6 +24,7 @@
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button icon="el-icon-download" size="mini" @click="exportData">导出</el-button>
</el-form-item> </el-form-item>
</el-form> </el-form>
@@ -121,6 +122,11 @@ export default {
resetQuery() { resetQuery() {
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
},
exportData() {
this.download('/wms/materialCoil/exportAnneal', {
coilIds: this.detailList.map(item => item.coilId).join(','),
}, `annealPerformance_${new Date().getTime()}.xlsx`)
} }
} }
}; };

1
klp-ui/src/views/wms/coil/panels/base.vue
View File

@@ -1189,6 +1189,7 @@ export default {
if (this.showWaybill) { if (this.showWaybill) {
const { shipmentTime, ...query } = { const { shipmentTime, ...query } = {
...this.queryParams, ...this.queryParams,
exportTimeBy: true,
selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product', selectType: this.querys.materialType === '原料' ? 'raw_material' : 'product',
startTime: this.queryParams.shipmentTime?.[0], startTime: this.queryParams.shipmentTime?.[0],
endTime: this.queryParams.shipmentTime?.[1], endTime: this.queryParams.shipmentTime?.[1],