shanyunduo.cheng

Merge branch 'master' of http://118.178.128.178/Fedex/imac-vue

...@@ -47,14 +47,14 @@ ...@@ -47,14 +47,14 @@
47 <el-table-column label="结束时间" align="center" prop="endDate" width="100" /> 47 <el-table-column label="结束时间" align="center" prop="endDate" width="100" />
48 <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" /> 48 <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" />
49 <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" /> 49 <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
50 - <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="280" fixed="right"> 50 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
51 <template slot-scope="scope"> 51 <template slot-scope="scope">
52 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> 52 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
53 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')"> 53 <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')">
54 删除</el-button> 54 删除</el-button>
55 - <el-button size="mini" type="text" icon="el-icon-video-play" 55 + <el-button size="mini" type="text" icon="el-icon-video-play" v-if="scope.row.status == '3'"
56 @click="handleDeleteorPlayorpause(scope.row,1,'启用')">启用</el-button> 56 @click="handleDeleteorPlayorpause(scope.row,1,'启用')">启用</el-button>
57 - <el-button size="mini" type="text" icon="el-icon-video-pause" 57 + <el-button size="mini" type="text" icon="el-icon-video-pause" v-if="scope.row.status == '1'"
58 @click="handleDeleteorPlayorpause(scope.row,3,'停用')">停用</el-button> 58 @click="handleDeleteorPlayorpause(scope.row,3,'停用')">停用</el-button>
59 </template> 59 </template>
60 </el-table-column> 60 </el-table-column>
......