Commit 0603bcc3 authored by lixy's avatar lixy

操作按钮调整

parent 845942c1
...@@ -68,4 +68,9 @@ ...@@ -68,4 +68,9 @@
text-align: center; text-align: center;
padding: 10px; padding: 10px;
} }
/*.table-fixed {*/
.el-table__fixed-right {
height: 100% !important; //设置高优先,以覆盖内联样式
}
/*}*/
</style> </style>
...@@ -38,8 +38,8 @@ ...@@ -38,8 +38,8 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="200" fixed="right"> <el-table-column align="center" label="操作" width="200" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleActivityData(scope.row)" style="margin-left:0px">活动数据</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleActivityData(scope.row)">活动数据</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -68,11 +68,11 @@ ...@@ -68,11 +68,11 @@
<span><p><font size="1" face="arial">{{scope.row.content}}</font></p></span> <span><p><font size="1" face="arial">{{scope.row.content}}</font></p></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="160" fixed="right"> <el-table-column align="center" label="操作" width="130" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" @click="compileAppUpload(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="compileAppUpload(scope.row)">编辑
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteApp(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red" size="small" @click="deleteApp(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
<span v-if="scope.row.status==2">下架</span> <span v-if="scope.row.status==2">下架</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-show="scope.row.status==1">下架</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)" v-show="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">上架</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)" v-show="scope.row.status==2">上架</el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">删除</el-button> <el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)" style="color:red" v-show="scope.row.status==2">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -50,12 +50,12 @@ ...@@ -50,12 +50,12 @@
<span v-if="scope.row.status==2">下架</span> <span v-if="scope.row.status==2">下架</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button size="small" type="success" @click="handleDown(scope.row)" style="margin-left:0px" v-show="scope.row.status==1">下架</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDown(scope.row)" v-show="scope.row.status==1">下架</el-button>
<el-button size="small" type="success" @click="handleUp(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">上架</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUp(scope.row)" v-show="scope.row.status==2">上架</el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)" style="margin-left:0px" v-show="scope.row.status==2">删除</el-button> <el-button class="el-button el-button--text el-button--small" size="small" @click="deleteHandler(scope.row)" style="color:red;" v-show="scope.row.status==2">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -6,42 +6,42 @@ ...@@ -6,42 +6,42 @@
</el-button> </el-button>
</div> </div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row <el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 1500px"> style="width: 100%">
<el-table-column <el-table-column
type="index" type="index"
align="center" label="序号" width="98"> align="center" label="序号" width="98">
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="标题"> <el-table-column width="160" align="center" label="标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{scope.row.title}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="类型"> <el-table-column width="180" align="center" label="类型">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.type==0?"app首页":scope.row.type==1?"app旅游页":scope.row.type==2?"租车":scope.row.type==3?"个人中心":scope.row.type==4?"小程序首页":scope.row.type==5?'发现':scope.row.type}}</span> <span>{{scope.row.type==0?"app首页":scope.row.type==1?"app旅游页":scope.row.type==2?"租车":scope.row.type==3?"个人中心":scope.row.type==4?"小程序首页":scope.row.type==5?'发现':scope.row.type}}</span>
</template> </template>
</el-table-column> </el-table-column>
<!--location 1:推荐 2:拍拍 3:短视频 4:问答--> <!--location 1:推荐 2:拍拍 3:短视频 4:问答-->
<el-table-column width="200" align="center" label="位置"> <el-table-column width="100" align="center" label="位置">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.location==0?"所有页面":scope.row.location==1?"推荐":scope.row.location==2?"拍拍":scope.row.location==3?"短视频":scope.row.location==4?"问答": scope.row.location}}</span> <span>{{scope.row.location==0?"所有页面":scope.row.location==1?"推荐":scope.row.location==2?"拍拍":scope.row.location==3?"短视频":scope.row.location==4?"问答": scope.row.location}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="banner图"> <el-table-column width="250" align="center" label="banner图">
<template scope="scope"> <template scope="scope">
<img :src="scope.row.cover" style="width:100%;max-height:100px;"> <img :src="scope.row.cover" style="width:100%;max-height:100px;">
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="跳转"> <el-table-column align="center" label="跳转">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.url}}</span> <span>{{scope.row.url}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作"> <el-table-column align="center" width="150" label="操作">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -92,9 +92,9 @@ ...@@ -92,9 +92,9 @@
<el-table-column align="center" label="操作" width="150" fixed="right"> <el-table-column align="center" label="操作" width="150" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button v-if="branchCompany_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button v-if="branchCompany_btn_edit" size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button v-if="branchCompany_btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除 <el-button v-if="branchCompany_btn_del" size="small" class="el-button el-button--text el-button--small" style="color: red;" @click="handleDelete(scope.row)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="80" align="center" label="负责人"> <el-table-column width="100" align="center" label="负责人">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.leader}}</span> <span>{{scope.row.leader}}</span>
</template> </template>
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="300" align="center" label="地址"> <el-table-column align="center" label="地址">
<template scope="scope"> <template scope="scope">
<span>{{getAddrStr(scope.row) + scope.row.addrDetail}}</span> <span>{{getAddrStr(scope.row) + scope.row.addrDetail}}</span>
</template> </template>
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
<el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" width="150">
<template scope="scope"> <template scope="scope">
<el-button v-if="campsite_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button v-if="campsite_btn_edit" size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button v-if="campsite_btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除 <el-button v-if="campsite_btn_del" size="small" style="color:red;" class="el-button el-button--text el-button--small" @click="handleDelete(scope.row)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
type="index" type="index"
align="center" label="序号" width="98"> align="center" label="序号" width="98">
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="标题"> <el-table-column width="250" align="center" label="标题">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.title}}</span> <span>{{scope.row.title}}</span>
</template> </template>
...@@ -21,11 +21,11 @@ ...@@ -21,11 +21,11 @@
<span>{{scope.row.type}}</span> <span>{{scope.row.type}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作"> <el-table-column align="center" width="150" label="操作">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button type="danger" v-if="scope.row.type!=88" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color: red;" v-if="scope.row.type!=88" size="small" @click="deleteHandler(scope.row)">删除</el-button>
<!--<el-button size="small" type="danger" @click="deleteHandler(scope.row)">删除--> <!--<el-button size="small" type="danger" @click="deleteHandler(scope.row)">删除-->
<!--</el-button>--> <!--</el-button>-->
</template> </template>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="公司名称"> <el-table-column width="280" align="center" label="公司名称">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.companyName}}</span> <span>{{scope.row.companyName}}</span>
</template> </template>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
<span>{{scope.row.price}}</span> <span>{{scope.row.price}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" align="center" label="地区"> <el-table-column align="center" label="地区">
<template scope="scope"> <template scope="scope">
<span>{{getAddrStr(scope.row.addrProvince, scope.row.addrCity)}}</span> <span>{{getAddrStr(scope.row.addrProvince, scope.row.addrCity)}}</span>
</template> </template>
...@@ -55,9 +55,9 @@ ...@@ -55,9 +55,9 @@
<el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" width="150">
<template scope="scope"> <template scope="scope">
<el-button v-if="btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button v-if="btn_edit" size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button v-if="btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除 <el-button v-if="btn_del" size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="handleDelete(scope.row)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -8,18 +8,18 @@ ...@@ -8,18 +8,18 @@
<span>{{scope.row.id}}</span> <span>{{scope.row.id}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="公司名称"> <el-table-column align="center" label="公司名称">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.companyName}}</span> <span>{{scope.row.companyName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="110" align="center" label="申请人"> <el-table-column align="center" label="申请人">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="150" align="center" label="联系方式"> <el-table-column align="center" label="联系方式">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.tel}}</span> <span>{{scope.row.tel}}</span>
</template> </template>
...@@ -39,11 +39,11 @@ ...@@ -39,11 +39,11 @@
<span>{{scope.row.createTime}}</span> <span>{{scope.row.createTime}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" width="150" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button v-if="btn_buy && scope.row.state == 0" size="small" type="success" @click="handleBuy(scope.row)">认购</el-button> <el-button v-if="btn_buy && scope.row.state == 0" size="small" class="el-button el-button--text el-button--small" @click="handleBuy(scope.row)">认购</el-button>
<el-button v-if="btn_cancel && scope.row.state == 0" size="small" type="success" @click="handleCancel(scope.row)">放弃</el-button> <el-button v-if="btn_cancel && scope.row.state == 0" size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="handleCancel(scope.row)">放弃</el-button>
<el-button v-if="btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除</el-button> <el-button v-if="btn_del" size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="handleDelete(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -28,11 +28,11 @@ ...@@ -28,11 +28,11 @@
<el-button size="mini" type="text" @click="isSearchChange(scope.row)" v-else ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button> <el-button size="mini" type="text" @click="isSearchChange(scope.row)" v-else ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="100" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -62,15 +62,15 @@ ...@@ -62,15 +62,15 @@
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="300" label="操作" fixed="right"> <el-table-column align="center" width="150" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}} <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{campsiteshop_btn_update?"编辑":"查看"}}
</el-button> </el-button>
<el-button size="small" type="primary" v-if="(scope.row.saleState==2|| scope.row.saleState==0) && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">上架 <el-button size="small" class="el-button el-button--text el-button--small" v-if="(scope.row.saleState==2|| scope.row.saleState==0) && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">上架
</el-button> </el-button>
<el-button size="small" type="warn" v-if="scope.row.saleState==1 && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">下架 <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.saleState==1 && campsiteshop_btn_update_salestatus" @click="upStatus(scope.row)">下架
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)" v-if="campsiteshop_btn_del">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)" v-if="campsiteshop_btn_del">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -59,6 +59,7 @@ ...@@ -59,6 +59,7 @@
:show-file-list="false" :show-file-list="false"
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip"><span style="color: red;">建议尺寸:485*485px</span></div>
<img v-if="$utils.isString(form.logo) && !$utils.isEmpty(form.logo)" :src="form.logo" style="width:300px;max-height:300px;"> <img v-if="$utils.isString(form.logo) && !$utils.isEmpty(form.logo)" :src="form.logo" style="width:300px;max-height:300px;">
<i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> <i v-else class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload> </el-upload>
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
:file-list="fileList2" :file-list="fileList2"
:on-success="handleBannerSuccess" :on-success="handleBannerSuccess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip">最多上传5张</div> <div slot="tip" class="el-upload__tip">最多上传5张 <span style="color: red;">建议尺寸:1080*644px</span></div>
<el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button> <el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
......
...@@ -61,10 +61,10 @@ ...@@ -61,10 +61,10 @@
<span>{{scope.row.crtTimeStr}}</span> <span>{{scope.row.crtTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" fixed="right"> <el-table-column align="center" label="操作" width="150" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" @click="handleUpdate(scope.row)">编辑</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -62,9 +62,9 @@ ...@@ -62,9 +62,9 @@
<span>{{scope.row.finishTimeStr}}</span> <span>{{scope.row.finishTimeStr}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="100" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="primary" v-if="scope.row.stauts==0" @click="handleUpdate(scope.row)">审核</el-button> <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.stauts==0" @click="handleUpdate(scope.row)">审核</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -55,15 +55,15 @@ ...@@ -55,15 +55,15 @@
<span>{{scope.row.saleCount}}</span> <span>{{scope.row.saleCount}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" fixed="right" label="操作"> <el-table-column align="center" width="150" fixed="right" label="操作">
<template scope="scope"> <template scope="scope">
<el-button v-if="tourManage_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button v-if="tourManage_btn_edit" size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button size="small" type="primary" v-if="scope.row.status==2|| scope.row.status==0" @click="upStatus(scope.row)">上架 <el-button size="small"class="el-button el-button--text el-button--small" v-if="scope.row.status==2|| scope.row.status==0" @click="upStatus(scope.row)">上架
</el-button> </el-button>
<el-button size="small" type="warn" v-if="scope.row.status==1" @click="upStatus(scope.row)">下架 <el-button size="small" class="el-button el-button--text el-button--small" v-if="scope.row.status==1" @click="upStatus(scope.row)">下架
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -29,15 +29,20 @@ ...@@ -29,15 +29,20 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<el-row>
<el-col :span="4">
<el-form-item label="是否为推荐" prop="mileage"> <el-form-item label="是否为推荐" prop="mileage">
<el-radio class="radio" v-model="form.recommend" label="1"></el-radio> <el-radio class="radio" v-model="form.recommend" label="1"></el-radio>
<el-radio class="radio" v-model="form.recommend" label="0"></el-radio> <el-radio class="radio" v-model="form.recommend" label="0"></el-radio>
</el-form-item> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员价格" prop="mileage"> <el-form-item label="会员价格" prop="mileage">
<el-radio class="radio" v-model="form.isMember" label="1">启用会员价</el-radio> <el-radio class="radio" v-model="form.isMember" label="1">启用会员价</el-radio>
<el-radio class="radio" v-model="form.isMember" label="0">不启用会员价</el-radio> <el-radio class="radio" v-model="form.isMember" label="0">不启用会员价</el-radio>
</el-form-item> </el-form-item>
</el-col>
</el-row>
<el-form-item label="" prop="mileage"> <el-form-item label="" prop="mileage">
<el-radio class="radio" v-model="form.isOutside" label="0">省内</el-radio> <el-radio class="radio" v-model="form.isOutside" label="0">省内</el-radio>
<el-radio class="radio" v-model="form.isOutside" label="1">省外</el-radio> <el-radio class="radio" v-model="form.isOutside" label="1">省外</el-radio>
...@@ -111,22 +116,16 @@ ...@@ -111,22 +116,16 @@
<el-input v-model="form.viewCount" placeholder="请输入浏览量" type="number" min="0"></el-input> <el-input v-model="form.viewCount" placeholder="请输入浏览量" type="number" min="0"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="排序"> <el-form-item label="排序">
<el-input v-model="form.rank" placeholder="请输入排序值" type="number" min="0"></el-input> <el-input v-model="form.rank" placeholder="请输入排序值" type="number" min="0"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="单位" prop="amount"> <el-form-item label="单位" prop="amount">
<el-input v-model="form.unit" placeholder="人"></el-input> <el-input v-model="form.unit" placeholder="人"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row>
<el-row>
<el-col :span="4"> <el-col :span="4">
<el-form-item label="销量" prop="saleCount"> <el-form-item label="销量" prop="saleCount">
<el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input> <el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
...@@ -143,6 +142,7 @@ ...@@ -143,6 +142,7 @@
:on-success="handleAvatarSuccess" :on-success="handleAvatarSuccess"
:on-progress="uploadProcess" :on-progress="uploadProcess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip"> <span style="color: red;">建议尺寸:320*228px</span></div>
<el-progress v-show="imgFlag == true" type="circle" :percentage="percent" style="margin-top: 20px"></el-progress> <el-progress v-show="imgFlag == true" type="circle" :percentage="percent" style="margin-top: 20px"></el-progress>
<img v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag" :src="form.cover" style="width:300px;max-height:300px;"> <img v-if="$utils.isString(form.cover) && !$utils.isEmpty(form.cover) && !imgFlag" :src="form.cover" style="width:300px;max-height:300px;">
<i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i> <i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
:file-list="fileList2" :file-list="fileList2"
:on-success="handleBannerSuccess" :on-success="handleBannerSuccess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip">最多上传5张</div> <div slot="tip" class="el-upload__tip">最多上传5张 <span style="color: red;">建议尺寸:1080*644px</span></div>
<el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button> <el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
...@@ -243,11 +243,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本 ...@@ -243,11 +243,13 @@ import UE from '../../modal/Ueditor';//百度ue富文本
getTourTagList, getTourTagList,
getAllTourTag getAllTourTag
} from 'api/tourManage'; } from 'api/tourManage';
import ElRow from "element-ui/packages/row/src/row";
export default { export default {
props: ["oneTourRow", "title"], props: ["oneTourRow", "title"],
name: 'upkeepDialog', name: 'upkeepDialog',
components: { components: {
// Editor, // Editor,
ElRow,
UE, UE,
Destination, Destination,
tourTime, tourTime,
......
...@@ -45,11 +45,11 @@ ...@@ -45,11 +45,11 @@
<!--<el-icon v-else class="el-icon-star-off" @click="tourTagHotChange(scope.row)"></el-icon>--> <!--<el-icon v-else class="el-icon-star-off" @click="tourTagHotChange(scope.row)"></el-icon>-->
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="100" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -81,9 +81,9 @@ ...@@ -81,9 +81,9 @@
<span>{{scope.row.crtName}}</span> <span>{{scope.row.crtName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="100" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button type="danger" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del&&scope.row.status!=1">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red" size="small" @click="deleteHandler(scope.row)" v-if="memberEnter_btn_del&&scope.row.status!=1">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -37,14 +37,14 @@ ...@@ -37,14 +37,14 @@
<span>{{scope.row.price}}</span> <span>{{scope.row.price}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="205" align="center" label="有效期"> <el-table-column align="center" label="有效期">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.endDate}}</span> <span>{{scope.row.endDate}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="212" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="danger" @click="delMembership(scope.row)" v-if="memberManagement_btn_del">删除 <el-button size="small" class="el-button el-button--text el-button--small" style="color:red" @click="delMembership(scope.row)" v-if="memberManagement_btn_del">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<!-- <span>{{scope.row.updName}}</span>--> <!-- <span>{{scope.row.updName}}</span>-->
<!-- </template>--> <!-- </template>-->
<!-- </el-table-column>--> <!-- </el-table-column>-->
<el-table-column align="center" label="操作" width="380" fixed="right"> <el-table-column align="center" label="操作" width="350" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">查看详情 <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">查看详情
</el-button> </el-button>
...@@ -135,11 +135,11 @@ ...@@ -135,11 +135,11 @@
</el-button> </el-button>
<el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1" size="small" @click="userOrder(scope.row)">用户订单 <el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1" size="small" @click="userOrder(scope.row)">用户订单
</el-button> </el-button>
<el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small" type="danger" @click="disable(scope.row)">设为禁用 <el-button v-if="scope.row.status!=1&&userList_btn_forbidden" size="small" class="el-button el-button--text el-button--small" style="color:red" @click="disable(scope.row)">设为禁用
</el-button> </el-button>
<el-button v-if="scope.row.status==1&&userList_btn_unmute" size="small" type="danger" @click="available(scope.row)">取消禁用 <el-button v-if="scope.row.status==1&&userList_btn_unmute" size="small" class="el-button el-button--text el-button--small" style="color:red" @click="available(scope.row)">取消禁用
</el-button> </el-button>
<el-button type="danger" size="small" v-if="userList_btn_del" @click="deleteUser(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red" size="small" v-if="userList_btn_del" @click="deleteUser(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -33,25 +33,25 @@ ...@@ -33,25 +33,25 @@
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%"> style="width: 100%">
<el-table-column width="120" align="center" label="名称"> <el-table-column align="center" label="名称">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="100" align="center" label="物品类型"> <el-table-column align="center" label="物品类型">
<template scope="scope"> <template scope="scope">
<span>{{getTypeName(scope.row.type)}}</span> <span>{{getTypeName(scope.row.type)}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="200" align="center" label="备注"> <el-table-column align="center" label="备注">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.remark}}</span> <span>{{scope.row.remark}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column width="180" align="center" label="最后更新时间"> <el-table-column align="center" label="最后更新时间">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.updateTime?scope.row.updateTime:scope.row.createTime}}</span> <span>{{scope.row.updateTime?scope.row.updateTime:scope.row.createTime}}</span>
</template> </template>
...@@ -59,10 +59,10 @@ ...@@ -59,10 +59,10 @@
<el-table-column align="center" label="操作" width="250"> <el-table-column align="center" label="操作" width="250">
<template scope="scope"> <template scope="scope">
<el-button v-if="accompanying_item_btn_update " size="small" type="success" @click="handleUpdate(scope.row)"> <el-button v-if="accompanying_item_btn_update " size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">
编辑 编辑
</el-button> </el-button>
<el-button v-if="accompanying_item_btn_del " size="small" type="success" @click="handleDelete(scope.row)">删除 <el-button v-if="accompanying_item_btn_del " size="small"class="el-button el-button--text el-button--small" style="color: red;" @click="handleDelete(scope.row)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -338,7 +338,7 @@ ...@@ -338,7 +338,7 @@
</el-button> </el-button>
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleBookInfo(scope.row)">预订信息</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleBookInfo(scope.row)">预订信息</el-button>
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleDepartureLog(scope.row)">出车记录</el-button> <el-button size="small" class="el-button el-button--text el-button--small" @click="handleDepartureLog(scope.row)">出车记录</el-button>
<el-button size="small" style="color:red;" @click="deleteHandler(scope.row)" class="el-button el-button--text el-button--small" v-if="vehicleInfo_btn_ret">删除</el-button> <el-button size="small" @click="deleteHandler(scope.row)" class="el-button el-button--text el-button--small" style="color:red;" v-if="vehicleInfo_btn_ret">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
type="primary" icon="edit">添加</el-button> type="primary" icon="edit">添加</el-button>
</div> </div>
<el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row <el-table :key='tableKey' :data="list" v-loading.body="listLoading" border fit highlight-current-row
style="width: 100%"> style="width:452px">
<el-table-column align="center" label="保养项目" width="300"> <el-table-column align="center" label="保养项目" width="300">
<template scope="scope"> <template scope="scope">
<span>{{scope.row.name}}</span> <span>{{scope.row.name}}</span>
...@@ -13,9 +13,9 @@ ...@@ -13,9 +13,9 @@
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="150"> <el-table-column align="center" label="操作" width="150">
<template scope="scope"> <template scope="scope">
<el-button v-if="vehicleUpkeepItem_btn_edit" size="small" type="success" @click="handleUpdate(scope.row)">编辑 <el-button v-if="vehicleUpkeepItem_btn_edit" size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">编辑
</el-button> </el-button>
<el-button v-if="vehicleUpkeepItem_btn_del" size="small" type="danger" @click="handleDelete(scope.row)">删除 <el-button v-if="vehicleUpkeepItem_btn_del" size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="handleDelete(scope.row)">删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
......
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
<span>{{scope.row.branchCompanyName}}</span> <span>{{scope.row.branchCompanyName}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" label="操作" width="100" fixed="right"> <el-table-column align="center" label="操作" width="65" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="getLogInfo(scope.row)">详情</el-button> <el-button size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="getLogInfo(scope.row)">详情</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -68,9 +68,9 @@ ...@@ -68,9 +68,9 @@
<el-table-column align="center" label="操作" width="100" fixed="right"> <el-table-column align="center" label="操作" width="100" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button v-if="scope.row.status == 1&&vehicleInfo_btn_upkeep" size="small" type="success" @click="handleDeal(scope.row)">处理 <el-button v-if="scope.row.status == 1&&vehicleInfo_btn_upkeep" size="small" class="el-button el-button--text el-button--small" style="color:red;" @click="handleDeal(scope.row)">处理
</el-button> </el-button>
<el-button v-if="scope.row.status == 5&&vehicleInfo_btn_upkeepEnd" size="small" type="success" @click="upkeepEndHandler(scope.row)"> <el-button v-if="scope.row.status == 5&&vehicleInfo_btn_upkeepEnd" size="small" class="el-button el-button--text el-button--small" @click="upkeepEndHandler(scope.row)">
保养结束 保养结束
</el-button> </el-button>
</template> </template>
......
...@@ -74,11 +74,11 @@ ...@@ -74,11 +74,11 @@
<span>{{scope.row.leasableQuantity}}</span> <span>{{scope.row.leasableQuantity}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="100" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}} <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleTypeList_btn_edit?'编辑':'查看'}}
</el-button> </el-button>
<el-button type="danger" size="small" @click="deleteHandler(scope.row)" v-if="vehicleTypeList_btn_del">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" size="small" @click="deleteHandler(scope.row)" v-if="vehicleTypeList_btn_del">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
:file-list="fileList2" :file-list="fileList2"
:on-success="handleBannerSuccess" :on-success="handleBannerSuccess"
list-type="picture"> list-type="picture">
<div slot="tip" class="el-upload__tip">最多上传5张</div> <div slot="tip" class="el-upload__tip">最多上传5张 <span style="color: red;">建议尺寸:1080*470px</span></div>
<el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button> <el-button v-if="fileList2.length<5" size="small" type="primary">点击上传</el-button>
</el-upload> </el-upload>
</el-form-item> </el-form-item>
......
...@@ -47,11 +47,11 @@ ...@@ -47,11 +47,11 @@
<el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==0&&vehicleTypeLabel_btn_multipleSelection" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button> <el-button size="mini" type="text" @click="setIsMore(scope.row)" v-if="scope.row.parent.isMore==0&&vehicleTypeLabel_btn_multipleSelection" ><i style="font-size:24px;" class="el-icon-star-off el-icon--right"></i></el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column align="center" width="200" label="操作" fixed="right"> <el-table-column align="center" width="100" label="操作" fixed="right">
<template scope="scope"> <template scope="scope">
<el-button size="small" type="success" @click="handleUpdate(scope.row)">{{vehicleTypeLabel_btn_save?'编辑':'查看'}} <el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleTypeLabel_btn_save?'编辑':'查看'}}
</el-button> </el-button>
<el-button type="danger" v-if="scope.row.parent.id != 1 && scope.row.parent.id!= 14&&vehicleTypeLabel_btn_del" size="small" @click="deleteHandler(scope.row)">删除</el-button> <el-button class="el-button el-button--text el-button--small" style="color:red;" v-if="scope.row.parent.id != 1 && scope.row.parent.id!= 14&&vehicleTypeLabel_btn_del" size="small" @click="deleteHandler(scope.row)">删除</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
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