feat(生产日报):
1.质检状态一列删除掉 2.过渡膜原料用量:密度*过渡膜米数:点击保存时自动计算 3. 粒子总用量=过渡膜原料用量+冲击(机)料+消耗数量(物料组是粒子的) 4.增加导出按钮,支持导出EXCEL 5.列表内:若同一个工单,同一班次、同物料号、同一日期、同一个设备、若在物料消耗表中查询出多笔消耗的物料,手动输入栏位只需其中一行物料消耗的需要输入,其它行则置为灰色以及生产A+,生产A级、生产B级,生产总米数、成品重量、废边料、班别原料利用率;
This commit is contained in:
parent
4e8250ba54
commit
91c2586580
@ -93,7 +93,7 @@
|
||||
<el-button type="primary" @click="doSearch">搜索</el-button>
|
||||
<el-button type="primary" @click="doSave">保存</el-button>
|
||||
<el-button type="primary" @click="doReset">清空</el-button>
|
||||
<el-button type="primary" @click="doReset">导出</el-button>
|
||||
<el-button type="primary" @click="doExcel">导出</el-button>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row :gutter="24">
|
||||
@ -125,35 +125,29 @@
|
||||
<el-table-column prop="density" label="密度" header-align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-input v-model="scope.row.density" type="number" clearable/>
|
||||
<el-input v-model="scope.row.density" type="number" clearable :disabled="scope.row.isEnable !== 'Y' "/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="transitionFilmYield" label="过渡膜米数(m)" header-align="center" width="140px">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-input v-model="scope.row.transitionFilmYield" type="number" clearable/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="rawMaterialUsage" label="过渡膜原料用量" header-align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-input v-model="scope.row.rawMaterialUsage" type="number" clearable/>
|
||||
<el-input v-model="scope.row.transitionFilmYield" type="number" clearable :disabled="scope.row.isEnable !== 'Y' "/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="rawMaterialUsage" label="过渡膜原料用量" width="120px"/>
|
||||
<el-table-column prop="impactMaterial" label="冲机料" header-align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-input v-model="scope.row.impactMaterial" type="number" clearable/>
|
||||
<el-input v-model="scope.row.impactMaterial" type="number" clearable :disabled="scope.row.isEnable !== 'Y' "/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="releaseFilmLength" label="管底离型膜长度" header-align="center" width="120px">
|
||||
<template slot-scope="scope">
|
||||
<div>
|
||||
<el-input v-model="scope.row.releaseFilmLength" type="number" clearable/>
|
||||
<el-input v-model="scope.row.releaseFilmLength" type="number" clearable :disabled="scope.row.isEnable !== 'Y' "/>
|
||||
</div>
|
||||
</template>
|
||||
</el-table-column>
|
||||
@ -162,7 +156,6 @@
|
||||
<el-table-column prop="consumeSumQty" label="消耗数量" />
|
||||
<el-table-column prop="particleSumQty" label="粒子总用量" width="120px"/>
|
||||
<el-table-column prop="consumeItemGroup" label="消耗物料的物料组" width="126px"/>
|
||||
<el-table-column prop="inspectionLevelDesc" label="质检状态" />
|
||||
<el-table-column prop="aplusSumQty" label="生产A+级品M" width="106px"/>
|
||||
<el-table-column prop="asumQty" label="生产A级品M" width="100px"/>
|
||||
<el-table-column prop="bsumQty" label="生产B级品M" width="100px"/>
|
||||
@ -207,6 +200,7 @@ import {hideLoading, showLoading} from '@/const/loading'
|
||||
import {setSeq} from "@/util/table";
|
||||
import {resrceDialogObj, shopOrderDialogObj} from "@/views/mes/prd/product-daily-report/init";
|
||||
import moment from "moment/moment";
|
||||
import {iep, mom_wms} from "@/api/prefix";
|
||||
|
||||
export default {
|
||||
name: 'product-daily-report',
|
||||
@ -266,7 +260,6 @@ export default {
|
||||
this.form.resrce = this.$route.query.resrce
|
||||
}
|
||||
if (this.$route.query.shopOrder) {
|
||||
console.log(this.$route.query.shopOrder)
|
||||
this.form.shopOrder = this.$route.query.shopOrder
|
||||
}
|
||||
this.getUserWorkShiftList();
|
||||
@ -423,11 +416,6 @@ export default {
|
||||
})
|
||||
},
|
||||
|
||||
// // 导出excel
|
||||
// doExcel() {
|
||||
// this.downBlobFile(mom_wms('/z-storag-request/exportData'), this.form, '生产入库单.xlsx');
|
||||
// this.$refs.productDailyReportData.clearSelection();
|
||||
// },
|
||||
//表格多选
|
||||
handleSelectionChange(val) {
|
||||
this.multipleSelection = val;
|
||||
@ -446,6 +434,32 @@ export default {
|
||||
this.productDailyReportList = [];
|
||||
},
|
||||
|
||||
// 导出excel
|
||||
doExcel() {
|
||||
let me = this;
|
||||
let timeRange = me.form.timeRange;
|
||||
|
||||
let startTime = "";
|
||||
let endTime = "";
|
||||
if(!timeRange || timeRange == null) {
|
||||
// 生产日期不可为空
|
||||
return this.$message.error('生产日期' + this.$t('mes.wms.messages.doNotEmpty'))
|
||||
} else {
|
||||
startTime = timeRange[0];
|
||||
endTime = timeRange[1];
|
||||
}
|
||||
|
||||
let param = {
|
||||
"site": me.site,
|
||||
"startTime": startTime,
|
||||
"endTime": endTime,
|
||||
"workShiftList": me.form.workShiftList,
|
||||
"resrce": me.form.resrce,
|
||||
"shopOrder": me.form.shopOrder,
|
||||
};
|
||||
this.downBlobFile(iep('/z-product-daily-report/exportData'), param, me.site +'_生产日报.xlsx');
|
||||
this.$refs.productDailyReportData.clearSelection();
|
||||
},
|
||||
handleSizeChange(val) {
|
||||
let me = this
|
||||
me.page.size = val
|
||||
|
||||
Loading…
Reference in New Issue
Block a user