Commit 437d8747 authored by tanjunxin's avatar tanjunxin

fix: 1.表格增加创建和更新相关字段;2.排班ui优化

parent 9e386675
...@@ -74,7 +74,6 @@ ...@@ -74,7 +74,6 @@
<el-popover <el-popover
ref="popoverRef" ref="popoverRef"
placement="top" placement="top"
width="320"
trigger="focus" trigger="focus"
@show="handleShow(teamShift)" @show="handleShow(teamShift)"
> >
......
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
<el-table v-loading="loading" :data="calplanList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="calplanList" @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="计划编号" align="center" prop="planCode" > <el-table-column label="计划编号" align="center" prop="planCode" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
type="text" type="text"
...@@ -121,11 +121,19 @@ ...@@ -121,11 +121,19 @@
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="150"/> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<el-table-column label="更新人" align="center" prop="updateBy" width="150"/> <!-- <template slot-scope="scope">
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" > </template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
......
...@@ -100,9 +100,17 @@ ...@@ -100,9 +100,17 @@
<el-table-column label="异常处理人" align="center" prop="nickName" /> <el-table-column label="异常处理人" align="center" prop="nickName" />
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column label="创建人" align="center" prop="createBy" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/> <el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/> <el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -73,7 +73,11 @@ ...@@ -73,7 +73,11 @@
align="center" align="center"
prop="createTime" prop="createTime"
width="150" width="150"
/> >
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d}") }}</span>
</template> -->
</el-table-column>
<el-table-column <el-table-column
label="更新人" label="更新人"
align="center" align="center"
...@@ -85,7 +89,11 @@ ...@@ -85,7 +89,11 @@
align="center" align="center"
prop="updateTime" prop="updateTime"
width="150" width="150"
/> >
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, "{y}-{m}-{d}") }}</span>
</template> -->
</el-table-column>
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
......
...@@ -99,6 +99,18 @@ ...@@ -99,6 +99,18 @@
<dict-tag :options="dict.type.mes_order_status" :value="scope.row.status" /> <dict-tag :options="dict.type.mes_order_status" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" width="150" fixed="right" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="150" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" <!-- <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
......
...@@ -98,7 +98,7 @@ ...@@ -98,7 +98,7 @@
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="检验要求" align="center" prop="indexName" /> <el-table-column label="检验要求" align="center" prop="indexName" width="280"/>
<el-table-column label="检测项类型" align="center" prop="indexType"> <el-table-column label="检测项类型" align="center" prop="indexType">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/> <dict-tag :options="dict.type.mes_index_type" :value="scope.row.indexType"/>
...@@ -112,10 +112,18 @@ ...@@ -112,10 +112,18 @@
</el-table-column> </el-table-column>
<el-table-column label="检验名称" align="center" prop="qcTool" /> <el-table-column label="检验名称" align="center" prop="qcTool" />
<el-table-column label="创建人" align="center" prop="createBy" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/> <el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/> <el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
......
...@@ -114,9 +114,17 @@ ...@@ -114,9 +114,17 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150"/> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/> <el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150"/> <el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -148,6 +148,18 @@ ...@@ -148,6 +148,18 @@
<dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/> <dict-tag :options="dict.type.qc_submit_status" :value="scope.row.abnormalStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" width="230" fixed="right" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="230" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -121,6 +121,18 @@ ...@@ -121,6 +121,18 @@
<el-table-column label="是否质检确认" align="center" prop="isConfirm" :formatter="yesNoFmt"/> <el-table-column label="是否质检确认" align="center" prop="isConfirm" :formatter="yesNoFmt"/>
<el-table-column label="是否新品" align="center" prop="isNewProduct" :formatter="yesNoFmt"/> <el-table-column label="是否新品" align="center" prop="isNewProduct" :formatter="yesNoFmt"/>
<el-table-column label="备注" align="center" prop="remark"/> <el-table-column label="备注" align="center" prop="remark"/>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -146,7 +146,19 @@ ...@@ -146,7 +146,19 @@
<el-table-column label="开始时间" align="center" prop="startTime" /> <el-table-column label="开始时间" align="center" prop="startTime" />
<el-table-column label="结束时间" align="center" prop="endTime" /> <el-table-column label="结束时间" align="center" prop="endTime" />
<el-table-column label="维护时间" align="center" prop="processTime" /> <el-table-column label="维护时间" align="center" prop="processTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
size="mini" size="mini"
......
...@@ -162,6 +162,18 @@ ...@@ -162,6 +162,18 @@
<dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/> <dict-tag :options="dict.type.mes_tool_status" :value="scope.row.status"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" width="120" fixed="right" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button <!-- <el-button
......
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
<!-- <el-table-column type="selection" width="55" align="center" /> --> <!-- <el-table-column type="selection" width="55" align="center" /> -->
<el-table-column label="上下机编码" min-width="150" align="center" prop="toolMachinesCode" /> <el-table-column label="上下机编码" min-width="150" align="center" prop="toolMachinesCode" />
<!-- <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" /> --> <!-- <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" /> -->
<el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" /> <!-- <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" /> -->
<el-table-column label="编排单号" align="center" prop="arrangeCode"/> <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
<el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" /> <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
<el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" min-width="100" align="center" prop="workunitName" />
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<el-table-column label="物料编码" width="130" align="center" prop="sapItemCode" /> <el-table-column label="物料编码" width="130" align="center" prop="sapItemCode" />
<el-table-column label="物料名称" width="100" align="center" prop="itemName" /> <el-table-column label="物料名称" width="100" align="center" prop="itemName" />
<!-- <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" /> --> <!-- <el-table-column label="申请单编码" min-width="130" align="center" prop="toolRequestCode" /> -->
<el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" /> <!-- <el-table-column label="领用单编码" min-width="150" align="center" prop="toolRequestUseCode" /> -->
<el-table-column label="编排单号" align="center" prop="arrangeCode"/> <el-table-column label="编排单号" align="center" prop="arrangeCode"/>
<el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" /> <el-table-column label="工序任务编码" width="120" align="center" prop="taskCode" />
<el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" /> <el-table-column label="工作单元名称" min-width="120" align="center" prop="workunitName" />
...@@ -48,10 +48,18 @@ ...@@ -48,10 +48,18 @@
<el-table-column label="上机状态" width="100" align="center" prop="typeName" /> <el-table-column label="上机状态" width="100" align="center" prop="typeName" />
<el-table-column label="数量" width="80" align="center" prop="allQuantity" /> <el-table-column label="数量" width="80" align="center" prop="allQuantity" />
<el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" /> <el-table-column label="使用寿命" width="80" align="center" prop="nextMaintenPeriod" />
<el-table-column label="创建人" width="180" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" width="180" align="center" prop="createTime" /> <el-table-column label="创建时间" align="center" prop="createTime" width="150">
<el-table-column label="更新人" width="180" align="center" prop="updateBy" /> <!-- <template slot-scope="scope">
<el-table-column label="更新时间" width="180" align="center" prop="updateTime" /> <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
</el-table> </el-table>
<pagination <pagination
......
...@@ -158,11 +158,24 @@ ...@@ -158,11 +158,24 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="申请数量" align="center" prop="requestNum" /> <el-table-column label="申请数量" align="center" prop="requestNum" />
<el-table-column label="创建人" align="center" prop="createBy" width="100"/>
<el-table-column label="创建时间" align="center" prop="createTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy" width="100"/>
<el-table-column label="更新时间" align="center" prop="updateTime" width="150">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> --> <!-- <el-table-column label="编排单号" align="center" prop="arrangeCode" /> -->
<el-table-column <el-table-column
label="操作" label="操作"
align="center" align="center"
class-name="small-padding fixed-width" class-name="small-padding fixed-width"
fixed="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
...@@ -56,10 +56,18 @@ ...@@ -56,10 +56,18 @@
<el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordList" @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="刀模版入库单编码" min-width="150" align="center" prop="toolWarehouseCode" /> <el-table-column label="刀模版入库单编码" min-width="150" align="center" prop="toolWarehouseCode" />
<el-table-column label="创建人" align="center" prop="createBy" /> <el-table-column label="创建人" align="center" prop="createBy"/>
<el-table-column label="创建时间" align="center" prop="createTime">
<!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="更新人" align="center" prop="updateBy"/> <el-table-column label="更新人" align="center" prop="updateBy"/>
<el-table-column label="创建时间" align="center" prop="createTime"/> <el-table-column label="更新时间" align="center" prop="updateTime">
<el-table-column label="更新时间" align="center" prop="updateTime"/> <!-- <template slot-scope="scope">
<span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
</template> -->
</el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" width="100" fixed="right" class-name="small-padding fixed-width">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment