Skip to content

E
ElectricitySheep
Commit 93f7b9f6 authored by 罗超's avatar 罗超
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/huangyuanyuan/electricitysheep into master

parents f6c1899c 00ff8b49
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 751 additions and 101 deletions
src/components/CommodityMan/goodsListEdit.vue
View file @ 93f7b9f6
......@@ -1915,7 +1915,7 @@
this.addMsg.MarketingLogo.wordsColor = '';
this.addMsg.MarketingLogo.wordsBack = '';
}
this.addMsg.MarketingLogo = JSON.stringify(this.addMsg.MarketingLogo);
this.apipost("/api/product/SetProductGoodsInfo", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -2202,32 +2202,6 @@
if (this.addMsg.PresentFXGrade == 0) {
this.addMsg.PresentFXGrade = ''
}
if (this.addMsg.MarketingLogo) {
try {
let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
let obj = MarketingLogo
this.addMsg.MarketingLogo = obj
} catch (err) {
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
}
}
} else {
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
}
}
this.getSuggestPrice();
this.getFXDGradeList2();
this.getTree();
......
src/components/UserMan/blindDateUsersList.vue
View file @ 93f7b9f6
......@@ -822,7 +822,6 @@ export default {
},
ChangeEnabled(row){
console.log(row)
this.apipost(
"/api/Miai/UpdateFaTie",
{ UserIds:row.Id , IsFaTie: row.IsFaTie },
......
src/components/UserMan/usersListEdit.vue
View file @ 93f7b9f6
......@@ -49,6 +49,10 @@
<el-form-item label="修改备注名">
<el-input v-model="userInfo.AliasName" style="width:478px" size="small"></el-input>
</el-form-item>
<el-form-item label="管理员身份">
<el-radio v-model="userInfo.IsAdmin" label="0" @change="$forceUpdate()">否</el-radio>
<el-radio v-model="userInfo.IsAdmin" label="1" @change="$forceUpdate()">是</el-radio>
</el-form-item>
<el-form-item label="注册时间">
<span>{{userInfo.CreateDate}}</span>
</el-form-item>
......@@ -121,6 +125,7 @@
AliasName: userInfo.AliasName,
PostId: userInfo.PostId,
Blacklist:userInfo.Blacklist,
IsAdmin:userInfo.IsAdmin,
}
this.apipost("/api/user/SetMemberUserInfoForHT", this.addMsg, res => {
if (res.data.resultCode == 1) {
......@@ -178,6 +183,11 @@
UserId: this.UserId
}, res => {
this.userInfo = res.data.data;
if(!this.userInfo['IsAdmin']){
this.userInfo.IsAdmin = '0'
}else{
this.userInfo.IsAdmin = this.userInfo.IsAdmin.toString()
}
this.msg.Name = this.userInfo.SuperiorName;
this.getList();
})
......
src/components/director/directorGoodsEdit.vue
View file @ 93f7b9f6
......@@ -1231,7 +1231,7 @@
this.addMsg.MarketingLogo.wordsColor = '';
this.addMsg.MarketingLogo.wordsBack = '';
}
this.addMsg.MarketingLogo = JSON.stringify(this.addMsg.MarketingLogo)
this.apipost("/api/GuideCar/SetGoodsInfo", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -1498,7 +1498,6 @@
this.addMsg.PresentFXGrade = ''
}
if (!this.addMsg.MarketingLogo || this.addMsg.MarketingLogo == null) {
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
......@@ -1506,11 +1505,7 @@
wordsBack: "",
ico: ""
}
} else {
let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
let obj = MarketingLogo
this.addMsg.MarketingLogo = obj
}
}
this.getSuggestPrice();
this.getFXDGradeList2();
this.getTree();
......
src/components/education/addSchoolAndCompany.vue
View file @ 93f7b9f6
......@@ -249,7 +249,6 @@ export default {
}
);
} else {
console.log("error submit!!");
return;
}
});
......
src/components/education/educationEdit.vue
View file @ 93f7b9f6
......@@ -1224,7 +1224,7 @@
this.addMsg.MarketingLogo.wordsColor = '';
this.addMsg.MarketingLogo.wordsBack = '';
}
this.addMsg.MarketingLogo = JSON.stringify(this.addMsg.MarketingLogo)
this.apipost("/api/Education/SetGoodsInfo", this.addMsg, res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
......@@ -1524,15 +1524,7 @@
wordsBack: "",
ico: ""
}
} else {
// var tempObj = this.addMsg.MarketingLogo.substring(1, this.addMsg.MarketingLogo.length-1);
// var reg=/\\|\//g;
// var cc = "'"+tempObj.replace(reg,"")+"'";
// var bb = eval("("+cc+")");
// var kk = JSON.parse(bb);
// this.addMsg.MarketingLogo=kk;
this.addMsg.MarketingLogo = JSON.parse(this.addMsg.MarketingLogo);
}
}
this.getSuggestPrice();
this.getFXDGradeList2();
this.getTree();
......
src/components/education/schoolAndCompanyList.vue
View file @ 93f7b9f6
......@@ -203,7 +203,6 @@ export default {
methods: {
handleSelectionChange(val) {
this.sels = val;
console.log(138, val);
},
getDateList() {
let msg = JSON.parse(JSON.stringify(this.msg));
......
src/components/offlineService/serviceProductEdit.vue
View file @ 93f7b9f6
......@@ -1847,7 +1847,7 @@
this.addMsg.MarketingLogo.wordsColor = '';
this.addMsg.MarketingLogo.wordsBack = '';
}
this.addMsg.MarketingLogo = JSON.stringify(this.addMsg.MarketingLogo)
//没有开启线上付款
if (!this.IsOfflinePay) {
this.addMsg.DepositMoney = 0;
......@@ -2126,29 +2126,7 @@
if (this.addMsg.PresentFXGrade == 0) {
this.addMsg.PresentFXGrade = ''
}
if (this.addMsg.MarketingLogo) {
try {
let MarketingLogo = JSON.parse(this.addMsg.MarketingLogo)
let obj = MarketingLogo
this.addMsg.MarketingLogo = obj
} catch (err) {
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
}
}
} else {
this.addMsg.MarketingLogo = {
iswords: 0,
words: "",
wordsColor: "",
wordsBack: "",
ico: ""
}
}
this.getSuggestPrice();
this.getFXDGradeList2();
this.getTree();
......
src/components/sallCenter/plugin/link.vue
View file @ 93f7b9f6
......@@ -264,6 +264,11 @@
data: this.linkData.data,
};
},
watch: {
linkData(newVal, oldVal) {
this.data = this.linkData.data;
},
},
created() {
},
......
src/components/tradePavilion/VehicleManagement.vue
View file @ 93f7b9f6
......@@ -127,6 +127,14 @@
"
></span>
</div>
<div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
<el-date-picker
class="indataPicker"
type="daterange"
......@@ -183,8 +191,8 @@
</template>
</el-table-column>
<el-table-column prop="CarrierSize" label="商业体量"> </el-table-column>
<el-table-column prop="LayersNum" width="150" label="商业层数">
</el-table-column>
<el-table-column prop="LayersNum" width="150" label="商业层数"></el-table-column>
<el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
<el-table-column label="操作" width="100">
<template slot-scope="scope">
<el-tooltip
......@@ -288,7 +296,18 @@ export default {
StartOpenTime: "", //开业开始时间
EndOpenTime: "", // 开业截止时间
ExcelEnumIds: [],
UserId:0,
},
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
Source: 0,
MemberGrade: 0,
Id: 0,
Moblie: ''
},
userList:[],
addMsg: {},
dialogVisible: false,
dateStr: [], //日期
......@@ -307,8 +326,21 @@ export default {
this.getList();
this.getTypeEnumList();
this.getDown();
this.getuserList()
},
methods: {
ChangeListName(val) {
this.usermsg.Name = val;
this.getuserList();
},
getuserList() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.userList = pageData;
}
})
},
getList() {
this.loading = true;
if (this.dateStr && this.dateStr.length > 0) {
......
src/components/tradePavilion/addbrand.vue
View file @ 93f7b9f6
......@@ -341,6 +341,24 @@
</div>
</div>
<div class="brandShuxing">
<div class="brandShuxing_item">
<el-form-item label="开店意愿" class="is-required">
<el-radio v-model="ShopWish" :label="1">是</el-radio>
<el-radio v-model="ShopWish" :label="0">否</el-radio>
</el-form-item>
<el-rate
style="margin-top: 10px;"
v-model="addMsg.OpenShopWish"
v-if="ShopWish == 1"
:colors="colors">
</el-rate>
</div>
</div>
<el-form-item label="广告" class="ue-style">
......@@ -392,6 +410,7 @@ export default {
},
data() {
return {
colors: ['#99A9BF', '#F7BA2A', '#FF9900'],
addMsg: {
ID: 0,
Logo: "", //Logo
......@@ -425,6 +444,7 @@ export default {
PaiYanBZ: "", //排烟量备注
ShopSize: "", //店铺开口尺寸
IsShopSize: 1, //店铺开口尺寸（0-否1-有）
OpenShopWish:5,//开店意愿
},
loadingPeople: false,
dynamicTags: [],
......@@ -478,6 +498,7 @@ export default {
BrandClassList: [], //品牌分类列表
ProjectTypeList: [], //商铺性质列表
logoList: [],
ShopWish:1,
};
},
created() {
......@@ -540,7 +561,6 @@ export default {
//其他
let other = this.$refs.ueother.getUEContent();
this.addMsg.Other = other;
console.log(this.addMsg.BuiltUpArea,this.addMsg.EndBuiltUpArea)
if(this.addMsg.BuiltUpArea==='' || this.addMsg.EndBuiltUpArea===''){
this.Error('请输入建筑面积')
return
......@@ -549,6 +569,9 @@ export default {
this.Error('请输入需求面积')
return
}
if(this.ShopWish == 0){
this.addMsg.OpenShopWish = -1
}
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost("/api/Trade/GetSetBrand", this.addMsg, (res) => {
......@@ -582,6 +605,9 @@ export default {
if (this.addMsg.Other && this.addMsg.Other != "") {
this.Other = this.addMsg.Other;
}
if(this.addMsg.OpenShopWish==-1){
this.ShopWish = 0
}
this.logoList = [];
this.logoList.push(this.addMsg.Logo);
}
......
src/components/tradePavilion/brandManagement.vue
View file @ 93f7b9f6
......@@ -63,6 +63,14 @@
:key="y"
></el-option>
</el-select>
<span style="margin-left: 10px">认证用户</span>
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
</div>
<div
......@@ -222,6 +230,7 @@
</el-table-column>
<el-table-column prop="CustomerType" label="客群定位" width="160">
</el-table-column>
<el-table-column prop="UserName" width="100" label="认证用户"></el-table-column>
<el-table-column fixed="right" label="操作" width="120">
<template slot-scope="scope">
<el-tooltip
......@@ -333,7 +342,18 @@ export default {
XinFeng: -1, //新风（0-否1-有）
BrandClassId: 0, //分类
ExcelEnumIds: [],
UserId:0,//用户认证
},
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
Source: 0,
MemberGrade: 0,
Id: 0,
Moblie: ''
},
userList:[],
addMsg: {},
dialogVisible: false,
dataList: [],
......@@ -349,14 +369,39 @@ export default {
};
},
created() {
if(this.$route.query && this.$route.query.UserId){
this.msg.UserId = Number(this.$route.query.UserId)
this.usermsg.Id = Number(this.$route.query.UserId)
this.getuserList(1)
}else{
this.getuserList()
}
this.getBrandClassList();
this.getProjectType();
this.getDown();
},
mounted() {
this.getList();
},
methods: {
ChangeListName(val) {
this.usermsg.Name = val;
this.getuserList();
},
getuserList(type=0) {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.userList = pageData;
if(type==1){
this.usermsg.Id = 0
}
}
})
},
Export() {
this.msg.ExcelEnumIds = this.checkedCities;
let msg = JSON.parse(JSON.stringify(this.msg));
......
src/components/tradePavilion/tradePavilionIndex.vue
View file @ 93f7b9f6
......@@ -231,6 +231,10 @@
@click="isChecked='/firstStoreApply',CommonJump('firstStoreApply')">
<i class="el-icon-menu"></i><span>首店申请</span>
</li>
<li class="menu_item" :class="{'Fchecked':isChecked=='/wishList'}"
@click="isChecked='/wishList',CommonJump('wishList')">
<i class="el-icon-menu"></i><span>心愿列表</span>
</li>
</ul>
</div>
</div>
......
src/components/tradePavilion/wishList.vue 0 → 100644
View file @ 93f7b9f6
<template>
<div class="firstStoreApply">
<div class="head-title" >
心愿列表
<div style="float:right;margin-top:-5px">
</div>
</div>
<div class="content">
<div>
<span style="margin-left: 10px">品牌信息</span>
<div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
style="display:inline-block;width:225px;height:30px" placeholder="品牌信息" v-model="msg.BranchName" size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<span style="margin-left: 10px">对标载体</span>
<div class="searchInput" style="width:250px">
<el-input @keyup.enter.native="msg.pageIndex=1,getList()" @clear="msg.pageIndex=1,getList()"
style="display:inline-block;width:225px;height:30px" placeholder="对标载体" v-model="msg.CarrierName" size="small"
clearable>
</el-input>
<span @click="msg.pageIndex=1,getList()" class="el-icon-search"
style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
</div>
<span style="margin-left: 10px">认证用户</span>
<el-select size="small" v-model="msg.UserId" :filter-method="ChangeListName" filterable @change="(msg.pageIndex = 1), getList()"
placeholder="请选择">
<el-option label="不限" :value="0"></el-option>
<el-option v-for="item in userList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
</div>
<el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
<el-table-column prop="UserName" label="用户名称">
<template slot-scope="scope">
<span>{{scope.row.UserName}} <span style="cursor: pointer;text-decoration: underline;font-size: 12px;" @click="guanlianbrand(scope.row.UserId)">关联品牌</span> </span>
</template>
</el-table-column>
<el-table-column prop="BranchName" label="品牌信息">
</el-table-column>
<el-table-column prop="CarrierName" label="对标载体">
</el-table-column>
<el-table-column prop="Area" label="区域">
</el-table-column>
<el-table-column prop="Status" label="名片">
<template slot-scope="scope">
<img :src="scope.row.NameCard" alt="" style="width: 100px;height: 40px;border-radius: 3px;">
</template>
</el-table-column>
<!-- <el-table-column prop="Status" label="详情">
<template slot-scope="scope">
<div style="cursor: pointer;text-decoration: underline;" @click="Description =scope.row.Description,resondialog = true ">查看详情</div>
</template>
</el-table-column> -->
<el-table-column prop="Status" label="状态">
<template slot-scope="scope">
<span v-if="scope.row.Status==0" style="color:green;">正常</span>
<span v-if="scope.row.Status==1" style="color:#e95252;">删除</span>
</template>
</el-table-column>
<el-table-column prop="UpdateDate" width="200" label="时间">
</el-table-column>
<el-table-column label="操作" width="130">
<template slot-scope="scope">
<el-tooltip class="item" effect="dark" content="查看详情" placement="top">
<img src="../../assets/img/userman/icon-show.png" alt="" class="imgstyle" @click="Description =scope.row.Description,resondialog = true ">
</el-tooltip>
<el-tooltip
class="item"
effect="dark"
content="删除"
placement="top"
>
<img
src="../../assets/img/setup/del.png"
alt=""
class="imgstyle"
@click="delete_b(scope.row)"
/>
</el-tooltip>
</template>
</el-table-column>
</el-table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total">
</el-pagination>
</div>
<el-dialog title="心愿详情" :visible.sync="resondialog" width="600px">
<div style="max-height: 700px;overflow-y: auto;" class="activityContent" v-html="Description"></div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
loading:false,
resondialog:false,
msg: {
pageIndex: 1,
pageSize: 15,
UserId: 0, // 用户id
BranchName: '', // 品牌
CarrierName: '', // 对标载体
},
Description:'',
usermsg: {
pageIndex: 1,
pageSize: 20,
Name: '',
Source: 0,
MemberGrade: 0,
Id: 0,
Moblie: ''
},
total: 0,
tableData: [], //数据列表
resondialog: false,
resondialog2: false,
userList:[],
};
},
created() {
this.getList();
this.getuserList()
},
methods: {
getList() {
this.loading = true;
this.apipost("/api/Trade/GetFirstShopWishPageList", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.total = res.data.data.count;
let pageData = res.data.data.pageData;
this.tableData = pageData;
}
})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
ChangeListName(val) {
this.usermsg.Name = val;
this.getuserList();
},
getuserList() {
this.apipost("/api/user/GetMemberUserDropDownList", this.usermsg, res => {
if (res.data.resultCode == 1) {
let pageData = res.data.data.pageData;
this.userList = pageData;
}
})
},
delete_b(row) {
let that = this;
that.Confirm("是否删除?", function () {
that.apipost(
"/api/Trade/DelFirstShopWishInfo",
{
WishId: row.Id,
},
(res) => {
if (res.data.resultCode == 1) {
that.Success(res.data.message);
that.getList();
} else {
that.Error(res.data.message);
}
}
);
});
},
guanlianbrand(UserId){
this.$router.push({
name: "brandManagement",
query: {
UserId: UserId,
blank: "y",
},
});
}
},
mounted() {}
};
</script>
<style>
.firstStoreApply .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
}
.firstStoreApply .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.firstStoreApply .content .searchInput {
line-height: normal;
display: inline-table;
width: 100%;
border-collapse: separate;
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
.firstStoreApply .content {
background: #fff;
margin-top: 10px;
padding: 20px;
box-sizing: border-box;
}
</style>
\ No newline at end of file
src/router/index.js
View file @ 93f7b9f6
......@@ -767,6 +767,12 @@ export default new Router({
path: '/firstStoreApply',
name: 'firstStoreApply',
component: resolve => require(['@/components/tradePavilion/firstStoreApply'], resolve),
},
//贸易管理--心愿列表
{
path: '/wishList',
name: 'wishList',
component: resolve => require(['@/components/tradePavilion/wishList'], resolve),
},
//贸易管理--首店详情
{
......
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