feat(mes,wms): 新增设备送检审批流程及相关功能
1. 新增设备送检审批的API接口层 2. 在待办页面添加设备送检审批标签页 3. 完善设备巡检日报的送检提交功能 4. 修复报表模板查询的参数传递问题 5. 优化设备送检审批单的业务逻辑处理
This commit is contained in:
@@ -654,7 +654,7 @@ export default {
|
||||
|
||||
const [lossRes, outRes] = await Promise.all([
|
||||
listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '', selectType: 'raw_material' }),
|
||||
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', byCreateTimeStart: this.queryParams.startTime, byCreateTimeEnd: this.queryParams.endTime, selectType: 'product' }),
|
||||
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', byCreateTimeStart: this.queryParams.startTime, byCreateTimeEnd: this.queryParams.endTime, selectType: 'product' }),
|
||||
]);
|
||||
|
||||
this.lossList = lossRes.rows.map(item => {
|
||||
@@ -692,7 +692,7 @@ export default {
|
||||
|
||||
const [lossRes, outRes] = await Promise.all([
|
||||
listCoilWithIds({ ...this.queryParams, actionIds: lossActionIds.join(',') || '', startTime: '', endTime: '', selectType: 'raw_material' }),
|
||||
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', selectType: 'product' }),
|
||||
listCoilWithIds({ ...this.queryParams, coilIds: outIds.join(',') || '', startTime: '', endTime: '', byCreateTimeStart: this.queryParams.startTime, byCreateTimeEnd: this.queryParams.endTime, selectType: 'product' }),
|
||||
]);
|
||||
|
||||
if (this.reportType === 'out') {
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
<el-tab-pane label="质保书审批" name="fourth" v-hasPermi="['qc:certificate:approve']">
|
||||
<CertificateBook />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="设备送检记录" name="fifth" v-hasPermi="['mes:eqp:approval']">
|
||||
<EquipmentInspectionApproval readonly :defaultStatus="1" />
|
||||
</el-tab-pane>
|
||||
<el-tab-pane label="其他代办" name="second">
|
||||
<el-empty description="暂无其他代办事项" />
|
||||
</el-tab-pane>
|
||||
@@ -19,6 +22,7 @@
|
||||
import TranferCoilTable from '@/views/wms/coil/views/base/tranfer.vue'
|
||||
import InspectionTask from '@/views/mes/qc/inspection/task.vue'
|
||||
import CertificateBook from '@/views/mes/qc/certificate/book.vue'
|
||||
import EquipmentInspectionApproval from '@/views/mes/eqp/check/approval.vue'
|
||||
|
||||
export default {
|
||||
name: 'TodoIndex',
|
||||
@@ -26,6 +30,7 @@
|
||||
TranferCoilTable,
|
||||
InspectionTask,
|
||||
CertificateBook,
|
||||
EquipmentInspectionApproval,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user