Commit 46230300 authored by 黄奎's avatar 黄奎

页面修改

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