Commit 28e46f85 authored by chenzj's avatar chenzj

刀模版领料申请几个小问题修复

parent 780c4b6b
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
> >
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="物料编号" align="center" prop="toolCode" > <el-table-column label="SN编码" align="center" prop="toolCode" >
</el-table-column> </el-table-column>
<el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true"> <el-table-column label="名称" align="center" prop="toolName" :show-overflow-tooltip="true">
<template slot-scope="scope"> <template slot-scope="scope">
......
...@@ -63,8 +63,8 @@ ...@@ -63,8 +63,8 @@
placeholder="请输入编排单号" placeholder="请输入编排单号"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> --> />
</el-form-item> </el-form-item>-->
<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>
...@@ -122,20 +122,19 @@ ...@@ -122,20 +122,19 @@
<!-- <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="toolRequestId" /> --> <!-- <el-table-column label="主键id" align="center" prop="toolRequestId" /> -->
<el-table-column label="申请单编码" align="center" prop="toolRequestCode" /> <el-table-column label="申请单编码" align="center" prop="toolRequestCode" />
</el-table-column>
<el-table-column label="工序" align="center" prop="processName" /> <el-table-column label="工序" align="center" prop="processName" />
<el-table-column label="作业单元" align="center" prop="workunitName" /> <el-table-column label="作业单元" align="center" prop="workunitName" />
<el-table-column label="申请时间" align="center" prop="requestDate" width="180"> <!-- <el-table-column label="申请时间" align="center" prop="requestDate" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span> <span>{{ parseTime(scope.row.requestDate, '{y}-{m}-{d}') }}</span>
</template> </template>
</el-table-column> </el-table-column> -->
<el-table-column label="预计开始时间" align="center" prop="startTime" width="180"> <el-table-column label="任务开始时间" align="center" prop="startTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.startTime) }}</span> <span>{{ parseTime(scope.row.startTime) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="预计结束时间" align="center" prop="endTime" width="180"> <el-table-column label="任务结束时间" align="center" prop="endTime" width="180">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.endTime) }}</span> <span>{{ parseTime(scope.row.endTime) }}</span>
</template> </template>
...@@ -484,7 +483,8 @@ export default { ...@@ -484,7 +483,8 @@ export default {
this.form.endTime = row.endTime this.form.endTime = row.endTime
this.form.quantity = row.quantity this.form.quantity = row.quantity
this.form.arrangeCode = row.arrangeCode this.form.arrangeCode = row.arrangeCode
this.form.workunitName = row.workunitName this.form.workunitName = row.workunitNamet
this.form.workunitId=row.workunitId
}, },
handleSumNum() { handleSumNum() {
// this.form.requestNum // this.form.requestNum
......
...@@ -128,11 +128,7 @@ ...@@ -128,11 +128,7 @@
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope">
<span>{{
parseTime(scope.row.startTime, "{y}-{m}-{d}:{h}-{m}-{s}")
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="结束生产时间" label="结束生产时间"
...@@ -141,11 +137,6 @@ ...@@ -141,11 +137,6 @@
width="180" width="180"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
> >
<template slot-scope="scope">
<span>{{
parseTime(scope.row.endTime, "{y}-{m}-{d}:{h}-{m}-{s}")
}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" /> <el-table-column :show-overflow-tooltip="true" width="100" label="状态" align="center" prop="statusName" />
<el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" /> <el-table-column :show-overflow-tooltip="true" width="100" label="工作单元名称" align="center" prop="workunitName" />
......
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