Commit dfaa1b88 authored by 沈翠玲's avatar 沈翠玲

修复bug

parent 16761b67
...@@ -249,21 +249,22 @@ ...@@ -249,21 +249,22 @@
label="作业单元名称" label="作业单元名称"
align="center" align="center"
prop="workunitName" prop="workunitName"
:show-overflow-tooltip="true"
width="200" width="200"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :content="scope.row.workunitName"> <el-tooltip :content="scope.row.workunitName" key="1" v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'">
<el-input v-if="scope.row.status === 'UN_ASSIGN'|| scope.row.status === 'PREPARE'" v-model="scope.row.workunitName"> <el-input v-model="scope.row.workunitName">
<el-button <el-button
slot="append" slot="append"
icon="el-icon-search" icon="el-icon-search"
@click="currentData = scope.row, $refs['WorkunitSelect'].showFlag = true" @click="currentData = scope.row, $refs['WorkunitSelect'].showFlag = true"
></el-button> ></el-button>
</el-input> </el-input>
<span v-else>{{ </el-tooltip>
scope.row.workunitName <el-tooltip :content="scope.row.workunitName" key="2" v-else>
}}</span> <span>{{
scope.row.workunitName
}}</span>
</el-tooltip> </el-tooltip>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -58,10 +58,10 @@ ...@@ -58,10 +58,10 @@
<el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange" :max-height="maxHeight"> <el-table v-loading="loading" :data="materialList" @selection-change="handleSelectionChange" :max-height="maxHeight">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="申请单号" align="center" width="150" prop="applyNo" />
<el-table-column label="产品编码" align="center" width="150" prop="sapItemCode" /> <el-table-column label="产品编码" align="center" width="150" prop="sapItemCode" />
<el-table-column label="产品名称" align="center" width="150" prop="itemName" /> <el-table-column label="产品名称" align="center" width="150" prop="itemName" />
<!-- <el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" /> --> <!-- <el-table-column label="工作中心名称" align="center" width="150" prop="workstationName" /> -->
<el-table-column label="申请单号" align="center" width="150" prop="applyNo" />
<el-table-column label="工单号" align="center" width="150" prop="workorderCode" /> <el-table-column label="工单号" align="center" width="150" prop="workorderCode" />
<!-- <el-table-column label="领料类型" align="center" width="150" prop="applyType"> <!-- <el-table-column label="领料类型" align="center" width="150" prop="applyType">
<template slot-scope="scope"> <template slot-scope="scope">
......
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