MES报工优化1

master
A0010407 1 year ago
parent 87fc6dad9f
commit 4551b6bd81

@ -48,7 +48,7 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<!-- <el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="primary" type="primary"
plain plain
@ -79,7 +79,7 @@
@click="handleDelete" @click="handleDelete"
v-hasPermi="['mes:reportWork:remove']" v-hasPermi="['mes:reportWork:remove']"
>删除</el-button> >删除</el-button>
</el-col> --> </el-col>
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -95,7 +95,7 @@
<el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="reportWorkList" @selection-change="handleSelectionChange">
<el-table-column type="selection" align="center" /> <el-table-column type="selection" align="center" />
<el-table-column label="报工单编号" align="center" prop="reportCode" width="100"> <el-table-column label="报工单编号" align="center" prop="reportCode" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
@ -303,7 +303,7 @@
<ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume> <ReportWorkConsume v-if="form.reportCode !=null" :optType="optType" :reportCode="form.reportCode"></ReportWorkConsume>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancel" v-if="optType =='view'"></el-button> <el-button type="primary" @click="cancel" v-if="optType =='view'"></el-button>
<el-button type="primary" @click="submitForm" v-else> </el-button> <el-button type="primary" @click="submitForm" v-else></el-button>
<el-button @click="cancel"> </el-button> <el-button @click="cancel"> </el-button>
</div> </div>
</el-dialog> </el-dialog>

@ -48,7 +48,6 @@
<el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="reportWorkConsumeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="id" align="center" prop="recordId" />
<el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/> <el-table-column label="工单编码" align="center" prop="workorderCode" width="200"/>
<el-table-column label="物料编号" align="center" prop="materialCode" width="200"/> <el-table-column label="物料编号" align="center" prop="materialCode" width="200"/>
<el-table-column label="物料名称" align="center" prop="materialName" width="200"/> <el-table-column label="物料名称" align="center" prop="materialName" width="200"/>

Loading…
Cancel
Save