|
|
@@ -337,17 +337,28 @@
|
|
|
prop="auditStatusText"
|
|
|
label="审核状态"
|
|
|
width="100">
|
|
|
+ <template slot-scope="scope">
|
|
|
+ <el-popover
|
|
|
+ placement="top"
|
|
|
+ width="300"
|
|
|
+ trigger="hover">
|
|
|
+ <span v-html="scope.row.statusDesc"></span>
|
|
|
+ <span style="display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; overflow: hidden;cursor: pointer;color: #48a2ff;" slot="reference">{{scope.row.auditStatusText}}</span>
|
|
|
+ </el-popover>
|
|
|
+ </template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
label="操作"
|
|
|
width="450">
|
|
|
<template slot-scope="scope">
|
|
|
- <el-button v-if="scope.row.auditStatus==0||scope.row.auditStatus==2" size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,1)" >通过</el-button>
|
|
|
+ <el-button size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,1)" >通过</el-button>
|
|
|
+ <el-button size="mini" type="info" title="不通过" @click="GoodsReceiveAudit(scope.row,2)">不通过</el-button>
|
|
|
+ <!-- <el-button v-if="scope.row.auditStatus==0||scope.row.auditStatus==2" size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,1)" >通过</el-button>
|
|
|
<el-button v-if="scope.row.auditStatus==0" size="mini" type="info" title="不通过" @click="GoodsReceiveAudit(scope.row,2)">不通过</el-button>
|
|
|
- <el-button v-if="scope.row.auditStatus==1" size="mini" type="warning" title="取消通过" @click="GoodsReceiveAudit(scope.row,0)">取消通过</el-button>
|
|
|
+ <el-button v-if="scope.row.auditStatus==1" size="mini" type="warning" title="取消通过" @click="GoodsReceiveAudit(scope.row,0)">取消通过</el-button> -->
|
|
|
<!-- <el-button size="mini" title="删除" type="danger" @click="Deleteintolibraryreceives(scope.row)">删除</el-button> -->
|
|
|
- <el-button size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,5)" >出库</el-button>
|
|
|
- <el-button size="mini" title="拒绝出库" type="danger" @click="GoodsReceiveAudit(scope.row,6)">拒绝出库</el-button>
|
|
|
+ <!-- <el-button size="mini" type="primary" title="通过" @click="GoodsReceiveAudit(scope.row,5)" >出库</el-button>
|
|
|
+ <el-button size="mini" title="拒绝出库" type="danger" @click="GoodsReceiveAudit(scope.row,6)">拒绝出库</el-button> -->
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -750,17 +761,17 @@
|
|
|
<el-table-column
|
|
|
prop="stockQuantity"
|
|
|
label="物品数量"
|
|
|
- width="100">
|
|
|
+ width="80">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="unit"
|
|
|
label="单位"
|
|
|
- width="100">
|
|
|
+ width="60">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="lastUpdateUserName"
|
|
|
label="最后录入人"
|
|
|
- width="100">
|
|
|
+ width="90">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
prop="lastUpdateTime"
|
|
|
@@ -768,6 +779,10 @@
|
|
|
width="180">
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
+ prop="stockQuantityLabel"
|
|
|
+ label="状态描述">
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
prop="remark"
|
|
|
label="备注">
|
|
|
</el-table-column>
|
