Commit 46230300 authored by 黄奎's avatar 黄奎

页面修改

parent 7917aebb
This diff is collapsed.
......@@ -920,7 +920,7 @@
<div class="EC_div" :class="{'checkedNav':cked==7}">
<div class="EC_ComTitle">委托授权书</div>
<template v-for="(item,index) in dataList.guestList">
<p class="shouquanNum" >{{index+1}}</p>
<p class="shouquanNum">{{index+1}}</p>
<div class="shouquanDiv">
<p class="ShouDiv_Title">委托授权书</p>
<p><span>{{dataList.company}}</span></p>
......@@ -1171,8 +1171,10 @@
</div>
<div class="EC_floatdiv">
<input type="button" class="normalBtn" v-if="dataList.status==1" @click="getinvalid()" value="作废" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()" value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载" @click="toContractPDF(dataList.contractNum)" />
<input type="button" class="normalBtn" v-if="dataList.companySignature==''" @click="isShowFade=true,GetQrCode()"
value="客户签字" />
<input type="button" class="normalBtn" v-if="dataList.companySignature!=''" value="下载"
@click="toContractPDF(dataList.contractNum)" />
</div>
</div>
<div class="fade" v-show="isShowFade"></div>
......@@ -1201,7 +1203,7 @@
dataList: [],
isShowFade: false,
QRCodeStr: "",
pdfLoading:false
pdfLoading: false
};
},
methods: {
......@@ -1229,8 +1231,7 @@
} else {
}
}).catch(err => {
})
}).catch(err => {})
},
// 生成pdf
......@@ -1240,7 +1241,7 @@
TCID: this.$route.query.TCID,
orderID: this.$route.query.orderID,
};
this.pdfLoading=true;
this.pdfLoading = true;
this.$http({
headers: {
'Content-Type': 'application/json'
......@@ -1268,7 +1269,6 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -1322,15 +1322,14 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.dataList.status=0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate",this.dataList,res => {
this.dataList.status = 0;
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
} else {
this.Error(res.data.message);
}
},null);
}, null);
}).catch(() => {
this.$message.info('取消删除');
});
......
This diff is collapsed.
<template>
<div class="Sheepcommission">
<div class="query-box">
......@@ -50,16 +49,16 @@
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
......@@ -67,9 +66,9 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
IsSelectCommpany:1
Name: '',
Moblie: '',
IsSelectCommpany: 1
},
dataList: [],
loading: false
......@@ -85,7 +84,7 @@ export default {
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
blank: 'y'
}
})
},
......@@ -95,33 +94,27 @@ export default {
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
} else {
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}, err => {})
},
}
};
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
<template>
<div class="Sheepcommission">
<div class="query-box">
......@@ -50,16 +49,16 @@
<td colspan="15" align="center">暂无数据</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size="msg.pageSize" :total='total'>
</el-pagination>
</div>
</template>
<script>
import moment from "moment";
export default {
import moment from "moment";
export default {
name: "Feedback",
data() {
return {
......@@ -67,8 +66,8 @@ export default {
msg: {
pageIndex: 1,
pageSize: 10,
Name:'',
Moblie:'',
Name: '',
Moblie: '',
},
dataList: [],
loading: false
......@@ -84,7 +83,7 @@ export default {
name: "commissionSubsidiary",
query: {
UserId: item.UserId,
blank:'y'
blank: 'y'
}
})
},
......@@ -94,33 +93,27 @@ export default {
},
getList() {
this.loading = true;
this.apipost('Financial_get_GetMallUserCommissionPageList',this.msg,res=>{
this.apipost('Financial_get_GetMallUserCommissionPageList', this.msg, res => {
this.loading = false;
if(res.data.resultCode==1){
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
this.dataList = res.data.data.pageData;
}else{
} else {
this.$message.error(res.data.message);
}
},err=>{})
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}, err => {})
},
}
};
};
</script>
<style>
.Sheepcommission .underline{
.Sheepcommission .underline {
text-decoration: underline;
}
.Sheepcommission .point{
}
.Sheepcommission .point {
cursor: pointer;
}
}
</style>
......@@ -170,14 +170,6 @@ export default {
},
err => {}
);
// this.apiJavaPostSmall("/api/ERPOrderCommission/GetDistributionOrderCommissionPageList", this.msg, res => {
// if (res.data.resultCode === 1) {
// this.total = res.data.data.count;
// this.dataList = res.data.data.pageData;
// } else {
// this.Error(res.data.message);
// }
// }, null);
}
}
};
......
This diff is collapsed.
......@@ -1061,7 +1061,6 @@
},
//获取数据
getList() {
//this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -1135,7 +1134,6 @@
type: 'warning'
}).then(() => {
this.dataList.status = 0;
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.dataList, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.dataList, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......
......@@ -1499,7 +1499,6 @@
document.documentElement.scrollTop = anchor.offsetTop - 70
},
getList() {
// this.apiJavaPost("/api/contract/getContractInfo", this.msg, res => {
this.apipost("travelcontract_post_GetContractInfoService", this.msg, res => {
if (res.data.resultCode === 1) {
var tempObj = res.data.data;
......@@ -1698,7 +1697,6 @@
}
this.CtObj.travelContent = this.$refs.TcTravel_Table.innerHTML;
this.CtObj.rbGroupId = this.CurrentUserInfo.RB_Group_id
// this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_SetContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1730,7 +1728,6 @@
}).then(() => {
this.CtObj.status = 0;
this.CtObj.auditContract = 0;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_post_UpdateStatusContractService", this.CtObj, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
......@@ -1759,8 +1756,6 @@
});
},
sendAudit() {
//this.CtObj.auditContract = 1;
//this.apiJavaPost("/api/contract/dosaveOrUpdate", this.CtObj, res => {
this.apipost("travelcontract_get_UpdateAuditContractService", {
"AuditContract": 1,
"Id": this.CtObj.Id
......@@ -1881,7 +1876,6 @@
let msg = {
orderId: this.msg.orderID
}
// this.apiJavaPost("/api/contract/getContractGuestByOrderId", msg, res => {
this.apipost("travelcontract_post_GetContractGuestByOrderId", msg, res => {
if (res.data.resultCode === 1) {
this.backGuest = res.data.data;
......
<style>
.height_auto.el-select .el-input {
.height_auto.el-select .el-input {
height: auto;
}
.CommodityType ._addUpload_box {
}
.CommodityType ._addUpload_box {
display: block;
margin: 10px 0 0;
}
.CommodityType ._addUpload_box img {
}
.CommodityType ._addUpload_box img {
height: 15px;
display: block;
margin-right: 25px;
}
.CommodityType ._addUpload_box > div.el-upload {
}
.CommodityType ._addUpload_box>div.el-upload {
float: left;
width: 138px;
height: 92px;
......@@ -22,8 +25,9 @@
padding: 5px;
margin-right: 10px;
position: relative;
}
.CommodityType ._addUpload_box .icon-guanbi1 {
}
.CommodityType ._addUpload_box .icon-guanbi1 {
font-size: 12px;
color: white;
display: inline-block;
......@@ -37,22 +41,26 @@
width: 15px;
text-align: center;
line-height: 15px;
}
.CommodityType ._addUpload_box > div:hover {
}
.CommodityType ._addUpload_box>div:hover {
background-color: #f5f5f5;
}
.CommodityType .el-upload-dragger {
}
.CommodityType .el-upload-dragger {
font-size: 28px;
color: #8c939d;
width: 126px;
height: 80px;
line-height: 41px;
text-align: center;
}
.CommodityType .bg_color_delete{
}
.CommodityType .bg_color_delete {
background-color: #ee4454;
border-color: #ee4454;
}
}
</style>
<template>
......@@ -61,12 +69,8 @@
<ul class>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input
type="button"
@click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn"
:value="$t('pub.addBtn')"
>
<input type="button" @click="outerVisible = true,dialogTitle='新增商品活动', addMsg.reqType = 'add',resetInfo()"
class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -90,18 +94,9 @@
<td>{{item.descrip}}</td>
<td>{{item.createTime.replace('T', ' ')}}</td>
<td>
<el-tooltip
class="item"
effect="dark"
:content="$t('active.ld_editInfo')"
placement="top"
>
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"
></el-button>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button type="primary" icon="el-icon-edit" circle
@click="outerVisible=true,dialogTitle='修改商品活动',updateData(item)"></el-button>
</el-tooltip>
<!-- <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class="bg_color_delete" icon="el-icon-delete" circle @click="Delete(item)"></el-button>
......@@ -113,16 +108,11 @@
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
<el-dialog
custom-class="w400"
:title="dialogTitle"
:visible.sync="outerVisible"
center
:before-close="closeChangeMachie"
>
<el-dialog custom-class="w400" :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="130px">
<el-form-item :label="$t('MarketingActi.commActivityName')" prop="name">
<el-input v-model="addMsg.name" class="w217"/>
<el-input v-model="addMsg.name" class="w217" />
</el-form-item>
<el-form-item :label="$t('MarketingActi.ActivityPro')" prop="descrip">
<el-input type="textarea" v-model="addMsg.descrip" class="w217"></el-input>
......@@ -132,25 +122,14 @@
<div class="_pic_upload">
<template v-if="addMsg.images!==''">
<div>
<div
style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;"
>
<div style="width:100%;height:100%;overflow: hidden;display: flex;align-items: center;">
<img :src="addMsg.images">
<span
style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''"
>{{$t('system.up_againUp')}}</span>
<span style="font-size:12px; color:#666666;cursor: pointer;line-height: 20px;"
@click="addMsg.images=''">{{$t('system.up_againUp')}}</span>
</div>
</div>
</template>
<el-upload
v-else
drag
:http-request="uploadFileBtn"
:multiple="false"
:show-file-list="false"
action
>
<el-upload v-else drag :http-request="uploadFileBtn" :multiple="false" :show-file-list="false" action>
<i class="el-icon-plus avatar-uploader-icon"></i>
<div class="el-upload__text">{{$t("active.ld_djscwj")}}</div>
</el-upload>
......@@ -159,17 +138,15 @@
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button
class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')"
>{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="hollowFixedBtn"
@click="outerVisible = false, resetForm('addMsg')">{{$t('pub.cancelBtn')}}</button> &nbsp;
<button class="normalBtn" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
export default {
data() {
return {
//请求
......@@ -184,12 +161,16 @@ export default {
id: 0
},
rules: {
name: [
{ required: true, message: "请输入名称", trigger: "blur" }
],
descrip: [
{ required: true, message: "请输入描述", trigger: "blur" }
]
name: [{
required: true,
message: "请输入名称",
trigger: "blur"
}],
descrip: [{
required: true,
message: "请输入描述",
trigger: "blur"
}]
},
loading: false,
outerVisible: false,
......@@ -207,15 +188,16 @@ export default {
methods: {
// 删除
Delete(item) {
this.$confirm("是否删除"+ item.name+"? 删除后不可恢复", "提示", {
this.$confirm("是否删除" + item.name + "? 删除后不可恢复", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: 'delete', id: item.id },
this.apiJavaPost("/api/IntegralManager/goodsTypeManager", {
reqType: 'delete',
id: item.id
},
res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -237,7 +219,10 @@ export default {
return;
}
// 1 文档 2 数据 3 图片
let typeArr = [{ stringArr: "GIF|JPG|JPEG|PNG|BMP", type: 3 }];
let typeArr = [{
stringArr: "GIF|JPG|JPEG|PNG|BMP",
type: 3
}];
let ft = file.file.name
.substring(file.file.name.lastIndexOf(".") + 1, file.file.name.length)
.toUpperCase();
......@@ -256,9 +241,9 @@ export default {
this.$message.info(this.$t("tips.shangchuanzhong"));
this.UploadSelfFileT(path, newArr, x => {
let fileSize =
file.file.size < 1024
? file.file.size
: (file.file.size / 1024).toFixed(0);
file.file.size < 1024 ?
file.file.size :
(file.file.size / 1024).toFixed(0);
this.addMsg.images = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.$message.success(this.$t("tips.scchenggong"));
this.$forceUpdate();
......@@ -267,10 +252,7 @@ export default {
//获取数据
getList() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
res => {
this.apiJavaPost("/api/IntegralManager/getGoodsSeries", {}, res => {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data;
......@@ -295,10 +277,7 @@ export default {
//提交添加
addAward() {
if (this.addMsg.images === "") return this.Error("请上传图片");
this.apiJavaPost(
"/api/IntegralManager/AddGoodsSeries",
this.addMsg,
res => {
this.apiJavaPost("/api/IntegralManager/AddGoodsSeries", this.addMsg, res => {
if (res.data.resultCode === 1) {
this.Success(res.data.message);
this.outerVisible = false;
......@@ -337,5 +316,6 @@ export default {
this.$refs[formName].resetFields();
}
}
};
};
</script>
This diff is collapsed.
......@@ -570,10 +570,7 @@
return this.$message.error(this.$t('rule.yxjzrbxdyksshijian'))
}
this.isleaveBtn = false;
this.apiJavaPost(
"/api/sell/coupon/setCoupon",
this.addMsg,
res => {
this.apiJavaPost("/api/sell/coupon/setCoupon", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.outerVisible = false;
......
<style>
.height_auto.el-select .el-input{
.height_auto.el-select .el-input {
height: auto
}
}
</style>
<template>
......@@ -44,7 +45,8 @@
</li>
<li>
<input type="button" @click="getList" class="hollowFixedBtn" :value="$t('pub.searchBtn')">
<input type="button" @click="addIntegralMall('addIntegralMall', '', $t('MarketingActi.addComm'))" class="normalBtn" :value="$t('pub.addBtn')">
<input type="button" @click="addIntegralMall('addIntegralMall', '', $t('MarketingActi.addComm'))"
class="normalBtn" :value="$t('pub.addBtn')">
</li>
</ul>
</div>
......@@ -77,26 +79,23 @@
<td>{{item.state === 1 ? '上架' : item.state === 0 ? '下架' : '删除'}}</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('active.ld_editInfo')" placement="top">
<el-button
type="primary"
icon="el-icon-edit"
circle
@click="addIntegralMall('addIntegralMall', item, '修改商品')"
></el-button>
<el-button type="primary" icon="el-icon-edit" circle
@click="addIntegralMall('addIntegralMall', item, '修改商品')"></el-button>
</el-tooltip>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
<el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper"
:page-size=msg.pageSize :total=total>
</el-pagination>
<div class="noDataNotice" v-if="dataList.length<1">
<i class="iconfont icon-kong"></i>
<p>{{$t("active.ld_noData")}}</p>
</div>
</div>
</div>
</template>
<script>
export default {
export default {
data() {
return {
//请求
......@@ -108,11 +107,11 @@ export default {
type: '',
ishot: ''
},
loading:false,
dataList:[],
loading: false,
dataList: [],
GoodsTypeList: [],
GoodsSeriesList: [],
total:0,
total: 0,
};
},
......@@ -121,16 +120,15 @@ export default {
this.getGoodsTypeManager();
this.getGoodsSeries();
},
filters: {
},
filters: {},
methods: {
handleCurrentChange(val){
this.msg.pageIndex=val;
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
getHotName: function (id) {
for(let i = 0; i < this.GoodsSeriesList.length; i++ ) {
for (let i = 0; i < this.GoodsSeriesList.length; i++) {
if (this.GoodsSeriesList[i].id === id) {
return this.GoodsSeriesList[i].name
}
......@@ -139,9 +137,7 @@ export default {
},
getGoodsSeries() {
this.loading = true;
this.apiJavaPost(
"/api/IntegralManager/getGoodsSeries",
{},
this.apiJavaPost("/api/IntegralManager/getGoodsSeries", {},
res => {
this.loading = false;
if (res.data.resultCode === 1) {
......@@ -153,15 +149,20 @@ export default {
null
);
},
addIntegralMall: function( path, obj, tab){
addIntegralMall: function (path, obj, tab) {
localStorage.editIntegralMall = JSON.stringify(obj);
this.$router.push({ name: path,query:{blank: 'y', tab: tab} })
this.$router.push({
name: path,
query: {
blank: 'y',
tab: tab
}
})
},
getGoodsTypeManager() {
this.apiJavaPost(
"/api/IntegralManager/goodsTypeManager",
{ reqType: "find" },
res => {
this.apiJavaPost("/api/IntegralManager/goodsTypeManager", {
reqType: "find"
}, res => {
if (res.data.resultCode === 1) {
this.GoodsTypeList = res.data.data;
} else {
......@@ -178,12 +179,13 @@ export default {
this.loading = false;
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData;
this.total= res.data.data.count;
this.total = res.data.data.count;
} else {
this.Error(res.data.message)
}
}, null);
},
}
};
};
</script>
This diff is collapsed.
......@@ -2,11 +2,13 @@
<div class="CheckDetails basefix">
<div class="left">
<el-carousel v-if="datainfo.ImageList.length>0" height="500px">
<el-carousel-item style="display:flex;align-items:center" v-for="(item,index) in datainfo.ImageList" :key="index">
<el-carousel-item style="display:flex;align-items:center" v-for="(item,index) in datainfo.ImageList"
:key="index">
<img style="width:100%;" :src="item" alt="">
</el-carousel-item>
</el-carousel>
<img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../../assets/img/Travelslider.png" alt="">
<img v-else style="width:100%;height:500px;border: 1px solid #ccc;" src="../../../assets/img/Travelslider.png"
alt="">
</div>
<div class="right overflowY" style="height:500px">
<div class="baseTitle f12">使用信息</div>
......@@ -101,7 +103,7 @@
</div>
</div>
<div class="baseTitle f12">操作记录</div>
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0" >
<table class="myTable miniTable" border="0" cellspacing="0" cellpadding="0">
<thead>
<th>类型</th>
<th>内容</th>
......@@ -113,12 +115,8 @@
<td>{{ item.TypeName }}</td>
<td>{{ item.Content }}</td>
<td>
<img
v-if="item.SignImage && item.SignImage != ''"
style="height: 45px;width: 55px;"
:src="item.SignImage"
alt=""
/>
<img v-if="item.SignImage && item.SignImage != ''" style="height: 45px;width: 55px;" :src="item.SignImage"
alt="" />
<span class="c99" v-else>-</span>
</td>
<td>
......@@ -131,13 +129,8 @@
</tr>
</tbody>
</table>
<el-pagination
@current-change="currentChange"
background
:page-size="msg.pageSize"
layout="prev, pager, next"
:total="total"
>
<el-pagination @current-change="currentChange" background :page-size="msg.pageSize" layout="prev, pager, next"
:total="total">
</el-pagination>
</div>
......@@ -146,33 +139,33 @@
</template>
<script>
export default {
export default {
name: '',
data(){
return{
data() {
return {
msg: {
pageIndex: 1,
pageSize: 5,
PropertyId: ""
},
OperationList:[],
total:0,
datainfo:{
ImageList:[],
OperationList: [],
total: 0,
datainfo: {
ImageList: [],
},
PropertyId:'',
PropertyId: '',
}
},
created(){
created() {
},
mounted(){
mounted() {
},
methods:{
InitData(id){
this.PropertyId=id;
this.msg.PropertyId=id;
methods: {
InitData(id) {
this.PropertyId = id;
this.msg.PropertyId = id;
this.getOperation();
this.getDataInfo();
},
......@@ -181,10 +174,7 @@ export default {
this.getOperation();
},
getOperation() {
this.apiJavaPost(
"/api/property/GetPropertyLogPageList",
this.msg,
res => {
this.apiJavaPost("/api/property/GetPropertyLogPageList", this.msg, res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
this.OperationList = res.data.data.pageData;
......@@ -196,10 +186,10 @@ export default {
null
);
},
getDataInfo(){
this.apiJavaPost(
"/api/property/GetPropertyInfo",
{Id:this.PropertyId},
getDataInfo() {
this.apiJavaPost("/api/property/GetPropertyInfo", {
Id: this.PropertyId
},
res => {
this.OperationLoad = false;
if (res.data.resultCode === 1) {
......@@ -212,131 +202,159 @@ export default {
);
},
},
}
}
</script>
<style scoped>
.myTable{
.myTable {
width: 100%;
font-size: 12px;
border-collapse: collapse;
font-family: "宋体"!important;
}
.myTable thead th{
color:#A6C6C6;
font-family: "宋体" !important;
}
.myTable thead th {
color: #A6C6C6;
padding-left: 20px;
height: 50px;
line-height: 50px;
font-weight:bold;
font-weight: bold;
text-align: left;
}
.myTable thead tr{
background:transparent!important;
}
.myTable thead tr {
background: transparent !important;
}
}
.myTable .hoverSpan1{
.myTable .hoverSpan1 {
left: -20px;
}
.myTable .hoverSpan2{
}
.myTable .hoverSpan2 {
right: -20px;
}
.myTable .commonStyle{
height:100%;
background:#fff;
}
.myTable .commonStyle {
height: 100%;
background: #fff;
position: absolute;
width: 20px;
top:0;
top: 0;
display: none;
}
.miniTable tr td{
padding:6px 0 6px 20px!important;
}
.myTable tr{
background:#fff;
}
.miniTable tr td {
padding: 6px 0 6px 20px !important;
}
.myTable tr {
background: #fff;
border-bottom: 4px solid #F8FAFB;
cursor: pointer;
}
.noHoverTable tr{
border-bottom:none!important;
}
.myTable .trNobottom{
border-top: 4px solid #F8FAFB!important;
border-bottom:none!important;
}
.myTable tbody tr:hover{
box-shadow:0px 0 20px 0px rgba(176,176,176,0.2);
}
.noHoverTable tr {
border-bottom: none !important;
}
.myTable .trNobottom {
border-top: 4px solid #F8FAFB !important;
border-bottom: none !important;
}
.myTable tbody tr:hover {
box-shadow: 0px 0 20px 0px rgba(176, 176, 176, 0.2);
transition: transform .5s ease;
/* transform: scaleX(1.02); */
}
.noHoverTable tbody tr:hover{
box-shadow:0 0 0 transparent!important;
}
.myTable tbody tr:hover .commonStyle{
}
.noHoverTable tbody tr:hover {
box-shadow: 0 0 0 transparent !important;
}
.myTable tbody tr:hover .commonStyle {
display: block;
transition: transform .5s ease;
box-shadow:0px 0px 0px 0px rgba(176,176,176,0.2);
}
.myTable tbody tr:hover td{
border-radius:0!important;
}
.myTable tbody tr:first-child td:first-child{
border-radius:20px 0 0 0;
}
.myTable tbody tr:first-child td:last-child{
border-radius:0 20px 0 0;
}
.myTable tbody tr:last-child td:first-child{
border-radius:0 0 0 20px;
}
.myTable tbody tr:last-child td:last-child{
border-radius:0 0 20px 0;
}
.myTable tr td{
box-shadow: 0px 0px 0px 0px rgba(176, 176, 176, 0.2);
}
.myTable tbody tr:hover td {
border-radius: 0 !important;
}
.myTable tbody tr:first-child td:first-child {
border-radius: 20px 0 0 0;
}
.myTable tbody tr:first-child td:last-child {
border-radius: 0 20px 0 0;
}
.myTable tbody tr:last-child td:first-child {
border-radius: 0 0 0 20px;
}
.myTable tbody tr:last-child td:last-child {
border-radius: 0 0 20px 0;
}
.myTable tr td {
position: relative;
padding:11px 0 11px 20px;
}
.overflowY{
padding: 11px 0 11px 20px;
}
.overflowY {
overflow-y: scroll;
height: 100%;
box-sizing: border-box;
position: relative;
}
.CheckDetails .baseDiv .desItem:nth-child(3n){
margin-right:0;
}
.CheckDetails p{
margin:0;
}
.CheckDetails .desItem p:first-child{
}
.CheckDetails .baseDiv .desItem:nth-child(3n) {
margin-right: 0;
}
.CheckDetails p {
margin: 0;
}
.CheckDetails .desItem p:first-child {
margin-bottom: 4px;
}
.CheckDetails .desItem{
}
.CheckDetails .desItem {
display: inline-block;
background: #F1F1F1;
box-sizing: border-box;
border-radius: 10px;
width: 200px;
margin:10px 10px 10px 0;
padding:6px 10px;
}
.CheckDetails .baseTitle{
padding:5px 0;
margin: 10px 10px 10px 0;
padding: 6px 10px;
}
.CheckDetails .baseTitle {
padding: 5px 0;
border-bottom: 1px dashed #ccc;
margin-bottom:10px
}
.CheckDetails>div{
margin-bottom: 10px
}
.CheckDetails>div {
float: left;
font-size: 12px;
}
.CheckDetails .left{
width:440px;
}
.CheckDetails .left {
width: 440px;
box-sizing: border-box;
padding:25px;
}
.CheckDetails .right{
padding: 25px;
}
.CheckDetails .right {
width: 680px;
padding:0 10px 0 15px;
padding: 0 10px 0 15px;
box-sizing: border-box;
}
}
</style>
This diff is collapsed.
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