Skip to content

E
ElectricitySheep
Commit d01a72a9 authored by zhengke's avatar zhengke
Browse files
Options

no message

parents 2ecae9bb 73215197
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1245 additions and 1581 deletions
src/components/CommodityMan/skuForm.vue 0 → 100644
View file @ d01a72a9
<template>
<div class="skuForm">
<div class="content">
<template v-if="MonthDayList&&MonthDayList.length>0">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-for="(item,index) in MonthDayList" :key='index' :label="item.YearMonth">
<template v-if="item.DateList && item.DateList.length>0">
<table>
<thead>
<tr>
<th>日期</th>
<th>价格</th>
<th>库存</th>
<th>成本</th>
</tr>
</thead>
<tbody v-for="(subItem,subIndex) in item.DateList">
<tr>
<td>
{{subItem.Day}}
</td>
<td>
<el-input v-model="subItem.SellingPrice" @keyup.native="checkPrice(subItem,'SellingPrice')"
size="small" style="width:100px;"></el-input>
</td>
<td>
<el-input v-model="subItem.InventoryNum" @keyup.native="checkPrice(subItem,'InventoryNum')"
size="small" style="width:100px;"></el-input>
</td>
<td>
<el-input v-model="subItem.CostMoney" @keyup.native="checkPrice(subItem,'CostMoney')"
size="small" style="width:100px;"></el-input>
</td>
</tr>
</tbody>
</table>
</template>
</el-tab-pane>
</el-tabs>
</template>
</div>
</div>
</template>
<script>
export default {
components: {},
name: "skuForm",
props: ["addMsg", "SpecificationValueList", "SpecificationList", "SpecificationPriceList"],
data() {
return {
QMsg: {
StartDate: "2024-01-01",
EndDate: '2024-05-20'
},
MonthDayList: [], //
activeName: ""
}
},
created() {
},
mounted() {
this.getDayData();
},
methods: {
handleClick() {
},
getDayData() {
this.apipost('/api/product/CreateSkuCalendar', this.QMsg,
res => {
if (res.data.resultCode === 1) {
this.MonthDayList = res.data.data;
this.Success(res.data.message)
} else {
this.Error(res.data.message);
}
},
null
);
}
},
};
</script>
<style>
</style>
src/components/Index.vue
View file @ d01a72a9
...@@ -4,7 +4,12 @@ ...@@ -4,7 +4,12 @@
<div class="main-container"> <div class="main-container">
<div class="homeIndexTop"> <div class="homeIndexTop">
<div class="hoindexImgdiv"> <div class="hoindexImgdiv">
<template v-if="mall_userInfo&&mall_userInfo.TenantId==30">
<!-- <img src="../assets/img/logo.png" alt="" style="height:30px"> --> <!-- <img src="../assets/img/logo.png" alt="" style="height:30px"> -->
</template>
<template v-else>
<img src="../assets/img/logo.png" alt="" style="height:30px">
</template>
</div> </div>
<div class="hoindexRight" style="cursor:pointer;"> <div class="hoindexRight" style="cursor:pointer;">
<el-dropdown> <el-dropdown>
...@@ -221,8 +226,12 @@ ...@@ -221,8 +226,12 @@
</div> </div>
</div> </div>
</div> </div>
<!-- <div style="text-align: center;line-height: 60px;color: #000;font-size:12px">由成都微途科技有限公司提供技术支持</div> --> <template v-if="mall_userInfo&&mall_userInfo.TenantId==30">
<div style="text-align: center;line-height: 60px;color: #000;font-size:12px"></div>
</template>
<template v-else>
<div style="text-align: center;line-height: 60px;color: #000;font-size:12px">由成都微途科技有限公司提供技术支持</div>
</template>
<!-- 修改手机号 --> <!-- 修改手机号 -->
<el-dialog title="修改手机号" :visible.sync="dialogVisible" width="400px"> <el-dialog title="修改手机号" :visible.sync="dialogVisible" width="400px">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
...@@ -486,7 +495,8 @@ ...@@ -486,7 +495,8 @@
required: true, required: true,
trigger: 'blur' trigger: 'blur'
}] }]
} },
mall_userInfo: {},
} }
}, },
methods: { methods: {
...@@ -621,8 +631,8 @@ ...@@ -621,8 +631,8 @@
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
userInfo.MallBaseId = item.MallBaseId; userInfo.MallBaseId = item.MallBaseId;
userInfo.MallName = item.MallName; userInfo.MallName = item.MallName;
userInfo.IsOpenSchool=item.IsOpenSchool; userInfo.IsOpenSchool = item.IsOpenSchool;
userInfo.IsKorea=item.IsKorea; userInfo.IsKorea = item.IsKorea;
localStorage.mall_userInfo = JSON.stringify(userInfo); localStorage.mall_userInfo = JSON.stringify(userInfo);
}, },
//修改密码 //修改密码
...@@ -745,6 +755,7 @@ ...@@ -745,6 +755,7 @@
}, },
}, },
mounted() { mounted() {
this.mall_userInfo = JSON.parse(localStorage.mall_userInfo);
this.TestMiniApp(); this.TestMiniApp();
this.init(); this.init();
this.getMiniPrograme(); this.getMiniPrograme();
......
src/components/common/chooseMenu.vue
View file @ d01a72a9
<style> <style>
.other_Style{ .other_Style {
color:#409EFF; color: #409EFF;
} }
</style> </style>
<template> <template>
<div class="chooseMenu"> <div class="chooseMenu">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane v-for="(item,index) in dataList" :label="item.PageTypeName" :name="item.PageTypeId+''" :key="index"> <el-tab-pane v-for="(item,index) in dataList" :label="item.PageTypeName" :name="item.PageTypeId+''" :key="index">
<div style="height:450px;overflow:scroll;line-height:normal;" v-if="item.PageTypeId!=6"> <div style="height:450px;overflow:scroll;line-height:normal;" v-if="item.PageTypeId==6">
<template v-for="(subItem,subIndex) in item.SubMenuList">
<div :key="subIndex" style="margin-bottom:10px;">
<el-checkbox v-model="subItem.IsChecked" :key="subIndex" @change="checkMenuChange(subItem)">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</el-checkbox>
</div>
</template>
</div>
<div style="height:450px;overflow:scroll" v-else>
<el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText"> <el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText">
</el-input> </el-input>
<el-tree :data="item.SubMenuList" node-key="PageId" ref="tree" :props="defaultProps" filter <el-tree :data="item.SubMenuList" node-key="PageId" ref="tree" :props="defaultProps" filter
:filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox :check-on-click-node="true"> :filter-node-method="filterNode" @check="handleCheck" :check-strictly="true" show-checkbox
:check-on-click-node="true">
<span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="{'other_Style':data.SubMenuList&&data.SubMenuList.length>0}">{{ data.PageName }}</span>
</span>
</el-tree>
</div>
<!--商载通-->
<div style="height:450px;overflow:scroll;line-height:normal;" v-if="item.PageTypeId==8">
<!-- <el-input placeholder="输入关键字进行过滤" style="width:99%;margin-bottom:10px;" v-model="filterText">
</el-input> -->
<el-tree :data="item.SubMenuList" node-key="PageId" ref="ybszttree" :props="defaultProps" filter
:filter-node-method="filterNode" @check="handleSZTCheck" :check-strictly="true" show-checkbox
:check-on-click-node="true">
<span class="custom-tree-node" slot-scope="{ node, data }"> <span class="custom-tree-node" slot-scope="{ node, data }">
<span :class="{'other_Style':data.SubMenuList&&data.SubMenuList.length>0}">{{ data.PageName }}</span> <span :class="{'other_Style':data.SubMenuList&&data.SubMenuList.length>0}">{{ data.PageName }}</span>
</span> </span>
</el-tree> </el-tree>
</div> </div>
<div style="height:450px;overflow:scroll" v-else>
<template v-for="(subItem,subIndex) in item.SubMenuList">
<div :key="subIndex" style="margin-bottom:5px;">
<el-checkbox v-model="subItem.IsChecked" :key="subIndex" @change="checkMenuChange(subItem)">
<span v-if="subItem.SelfPageName">{{subItem.SelfPageName}}</span>
<span v-else>{{subItem.PageName}} </span>
</el-checkbox>
</div>
</template>
</div>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
...@@ -74,9 +88,23 @@ ...@@ -74,9 +88,23 @@
IsParameter: 0, IsParameter: 0,
ParameterValue: "", ParameterValue: "",
PageName: "", PageName: "",
new_link_url:'' new_link_url: ''
}; };
if (this.activeName != 6) { if (this.activeName == 6) {
obj.PageUrl = this.checkedObj.PageUrl
obj.new_link_url = this.checkedObj.PageUrl
obj.IsParameter = this.checkedObj.IsParameter
obj.ParameterValue = this.checkedObj.ParameterValue
obj.PageName = this.checkedObj.PageName;
}
//宜宾商载通
if (this.activeName == 8) {
obj.PageUrl = this.checkedObj.PageUrl
obj.new_link_url = this.checkedObj.PageUrl
obj.IsParameter = this.checkedObj.IsParameter
obj.ParameterValue = this.checkedObj.ParameterValue
obj.PageName = this.checkedObj.PageName;
} else {
if (this.dataList && this.dataList.length > 0) { if (this.dataList && this.dataList.length > 0) {
this.dataList.forEach(item => { this.dataList.forEach(item => {
if (item.SubMenuList && item.SubMenuList.length > 0) { if (item.SubMenuList && item.SubMenuList.length > 0) {
...@@ -92,12 +120,6 @@ ...@@ -92,12 +120,6 @@
} }
}); });
} }
} else {
obj.PageUrl = this.checkedObj.PageUrl
obj.new_link_url = this.checkedObj.PageUrl
obj.IsParameter = this.checkedObj.IsParameter
obj.ParameterValue = this.checkedObj.ParameterValue
obj.PageName = this.checkedObj.PageName;
} }
return obj; return obj;
}, },
...@@ -134,6 +156,14 @@ ...@@ -134,6 +156,14 @@
this.checkedObj = a; this.checkedObj = a;
} }
}, },
//check单选
handleSZTCheck(a, b) {
//a为传递给 data 属性的数组中该节点所对应的对象；b为树目前的选中状态对象
if (b.checkedKeys.length > 0) {
this.$refs.ybszttree[0].setCheckedKeys([a.PageId]);
this.checkedObj = a;
}
},
}, },
mounted() { mounted() {
this.getList(); this.getList();
......
src/components/sallCenter/CustomPage.vue
View file @ d01a72a9
...@@ -21,19 +21,50 @@ ...@@ -21,19 +21,50 @@
</el-table-column> </el-table-column>
<el-table-column prop="PageName" label="标题"> <el-table-column prop="PageName" label="标题">
</el-table-column> </el-table-column>
<el-table-column label="导航与模板" prop="DetailsList" width="500"> <el-table-column label="导航与模板" prop="DetailsList" width="400">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="templat-list"> <div class="templat-list">
<template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0" <template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0"
v-for="(subItem,subIndex) in scope.row.DetailsList"> v-for="(subItem,subIndex) in scope.row.DetailsList">
<div class="templat-item" :key="subIndex"> <div class="templat-item" :key="subIndex">
<div>{{subItem.NavName}}</div> <div style="color: rgb(153, 153, 153);">
<div style="color: rgb(153, 153, 153);">{{subItem.TemplateShowName}}</div> <template v-if="subItem.NavName&&subItem.NavName!=''">{{subItem.NavName}}：</template>
{{subItem.TemplateShowName}}</div>
</div> </div>
</template> </template>
</div> </div>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="IsShowBottomTabBar" label="导航条" width="100">
<template slot-scope="scope">
<template v-if="scope.row.IsShowNav==1">
显示
</template>
<template v-else>
<font style="color:red;">不显示</font>
</template>
</template>
</el-table-column>
<el-table-column prop="IsShowBottomTabBar" label="底部导航" width="100">
<template slot-scope="scope">
<template v-if="scope.row.IsShowBottomTabBar==1">
显示
</template>
<template v-else>
<font style="color:red;">不显示</font>
</template>
</template>
</el-table-column>
<el-table-column prop="IsNoShowTitle" label="标题" width="100">
<template slot-scope="scope">
<template v-if="scope.row.IsNoShowTitle==0">
显示
</template>
<template v-else>
<font style="color:red;">不显示</font>
</template>
</template>
</el-table-column>
<el-table-column prop="IsHome" label="设为首页" width="150"> <el-table-column prop="IsHome" label="设为首页" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0" <el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0"
...@@ -48,6 +79,7 @@ ...@@ -48,6 +79,7 @@
</el-switch> </el-switch>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="IsUse" label="禁用/启用" width="120"> <el-table-column prop="IsUse" label="禁用/启用" width="120">
<template slot-scope="scope"> <template slot-scope="scope">
<el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0" <el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"
...@@ -88,6 +120,15 @@ ...@@ -88,6 +120,15 @@
<el-switch v-model="addMsg.IsShowNav" active-color="#409EFF" :active-value="1" :inactive-value="0"> <el-switch v-model="addMsg.IsShowNav" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch> </el-switch>
</el-form-item> </el-form-item>
<el-form-item label="显示底部导航条">
<el-switch v-model="addMsg.IsShowBottomTabBar" active-color="#409EFF" :active-value="1"
:inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="不显示标题">
<el-switch v-model="addMsg.IsNoShowTitle" active-color="#409EFF" :active-value="1" :inactive-value="0">
</el-switch>
</el-form-item>
<el-form-item label="模板和导航"> <el-form-item label="模板和导航">
<div style="max-width:480px;"> <div style="max-width:480px;">
<div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index"> <div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index">
...@@ -154,6 +195,8 @@ ...@@ -154,6 +195,8 @@
IsHome: 0, IsHome: 0,
IsUse: 1, IsUse: 1,
IsShowNav: 0, IsShowNav: 0,
IsShowBottomTabBar: 1, //是否显示底部导航
IsNoShowTitle: 0, //是否不显示标题
DetailsList: [] DetailsList: []
}, },
total: 0, total: 0,
...@@ -254,6 +297,8 @@ ...@@ -254,6 +297,8 @@
this.addMsg.IsShowNav = jsonData.IsShowNav; this.addMsg.IsShowNav = jsonData.IsShowNav;
this.addMsg.IsHome = jsonData.IsHome; this.addMsg.IsHome = jsonData.IsHome;
this.addMsg.DetailsList = jsonData.DetailsList; this.addMsg.DetailsList = jsonData.DetailsList;
this.addMsg.IsShowBottomTabBar = jsonData.IsShowBottomTabBar;
this.addMsg.IsNoShowTitle = jsonData.IsNoShowTitle;
this.CustomIsShowAdd = false; this.CustomIsShowAdd = false;
} else { } else {
this.Info(res.data.message); this.Info(res.data.message);
...@@ -333,7 +378,7 @@ ...@@ -333,7 +378,7 @@
} }
.CustomPage .templat-item div { .CustomPage .templat-item div {
width: 50%; width: 90%;
padding-left: 20px; padding-left: 20px;
} }
......
src/components/sallCenter/plugin/link.vue
View file @ d01a72a9
...@@ -213,13 +213,18 @@ ...@@ -213,13 +213,18 @@
<el-button @click="isShowLink=true">选择链接</el-button> <el-button @click="isShowLink=true">选择链接</el-button>
</template> </template>
</el-input> </el-input>
<template v-if="data.link&&data.link.url">
<el-input size="small" class="link-page" v-model="data.link.url">
<template slot="prepend">链接地址</template>
</el-input>
</template>
</el-form-item> </el-form-item>
<el-form-item v-if="data.style == '1'" label="图标开关"> <el-form-item v-if="data.style == '1'" label="图标开关">
<el-switch v-model="data.picSwitch"></el-switch> <el-switch v-model="data.picSwitch"></el-switch>
</el-form-item> </el-form-item>
<template v-if="data.picSwitch"> <template v-if="data.picSwitch">
<el-form-item label="图标"> <el-form-item label="图标">
<label slot="label">图标 <label slot="label">
<el-tooltip class="item" effect="dark" content="最大宽度750px，最大高度36px，图标等比例缩放" placement="top"> <el-tooltip class="item" effect="dark" content="最大宽度750px，最大高度36px，图标等比例缩放" placement="top">
<i class="el-icon-info"></i> <i class="el-icon-info"></i>
</el-tooltip> </el-tooltip>
......
src/components/tradePavilion/BrandEnterpriseManager.vue
View file @ d01a72a9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<template> <template>
<div class="VehicleManagement"> <div class="VehicleManagement">
<div class="head-title"> <div class="head-title">
{{isBrand?'品牌':'服务'}}管理 {{isBrand?'消费品牌':'企业服务'}}管理
<div> <div>
<el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small" <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
type="primary"> type="primary">
...@@ -23,14 +23,14 @@ ...@@ -23,14 +23,14 @@
</div> </div>
<div> <div>
<el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small" <el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small"
@click="CommonJump('BrandEnterEdit',{isBrand:isBrand?1:0})">新增{{isBrand?'品牌':'服务'}}</el-button> @click="CommonJump('BrandEnterEdit',{isBrand:isBrand?1:0})">新增{{isBrand?'消费品牌':'企业服务'}}</el-button>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
<div> <div>
<div class="searchInput" style="width: 250px; margin-bottom: 10px"> <div class="searchInput" style="width: 250px; margin-bottom: 10px">
<el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()" <el-input @keyup.enter.native="(msg.pageIndex = 1), getList()" @clear="(msg.pageIndex = 1), getList()"
style="display: inline-block; width: 225px; height: 30px" :placeholder="`${isBrand?'品牌':'服务'}名称`" v-model="msg.BrandName" style="display: inline-block; width: 225px; height: 30px" :placeholder="`${isBrand?'消费品牌':'企业服务'}名称`" v-model="msg.BrandName"
size="small" clearable> size="small" clearable>
</el-input> </el-input>
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style=" <span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
</div> </div>
<div class="searchInput" style="width: 200px; margin-bottom: 10px"> <div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.CategoryId" filterable <el-select size="small" v-model="msg.CategoryId" filterable
@change="(msg.pageIndex = 1), getList()" :placeholder="`请选择${isBrand?'品牌':'服务'}分类`"> @change="(msg.pageIndex = 1), getList()" :placeholder="`${isBrand?'消费品牌':'企业服务'}分类`" clearable @clear="(msg.pageIndex = 1), getList()">
<el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID"> <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
ExcelEnumIds: [], ExcelEnumIds: [],
UserId: 0, UserId: 0,
RandomNum: 0, //随机数 RandomNum: 0, //随机数
CategoryId: 0, //分类Id CategoryId: "", //分类Id
BrandEnterpriseType: null, //(1-品牌，2-服务) BrandEnterpriseType: null, //(1-品牌，2-服务)
OpeningStatus: -1, // 0-即将开业，1-已开业 OpeningStatus: -1, // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通 QShopType: 0, //1-成都首店,2-宜宾商载通
...@@ -192,7 +192,7 @@ ...@@ -192,7 +192,7 @@
BrandName: "", //名称 BrandName: "", //名称
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
CategoryId: 0, //分类Id CategoryId: "", //分类Id
BrandEnterpriseType: this.isBrand ? 1 : 2, //(1-品牌，2-服务) BrandEnterpriseType: this.isBrand ? 1 : 2, //(1-品牌，2-服务)
} }
this.getList(); this.getList();
...@@ -254,13 +254,13 @@ ...@@ -254,13 +254,13 @@
}, 2000); }, 2000);
}, },
checkCarrierFile(msg) { checkCarrierFile(msg) {
var fileName = "服务信息.xls"; var fileName = "企业服务信息.xls";
if (this.isBrand) { if (this.isBrand) {
fileName = "消费品牌信息.xls"; fileName = "消费品牌信息.xls";
} }
var that = this; var that = this;
this.apipost( this.apipost(
"/api/Trade/CheckBuildingCarrierFile", "/api/Trade/CheckBrandEnterpriseFile",
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
if (this.isBrand) { if (this.isBrand) {
this.loadingText = "正在下载消费品牌文件,请勿关闭或刷新页面..."; this.loadingText = "正在下载消费品牌文件,请勿关闭或刷新页面...";
} else { } else {
this.loadingText = "正在下载服务文件,请勿关闭或刷新页面..."; this.loadingText = "正在下载企业服务文件,请勿关闭或刷新页面...";
} }
var fileUrl = res.data.data.fileUrl; var fileUrl = res.data.data.fileUrl;
var filepath = res.data.data.filePath; var filepath = res.data.data.filePath;
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
responseType: 'arraybuffer', responseType: 'arraybuffer',
onDownloadProgress: (progressEvent) => { onDownloadProgress: (progressEvent) => {
const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100); const progress = Math.round((progressEvent.loaded / progressEvent.total) * 100);
that.loadingText = `正在下载【` + (that.isBrand ? '品牌' : "服务") + `】文件` + progress + that.loadingText = `正在下载【` + (that.isBrand ? '消费品牌' : "企业服务") + `】文件` + progress +
`%,请勿关闭或刷新页面...`; `%,请勿关闭或刷新页面...`;
// 在这里处理下载进度, 如更新界面上的进度条 // 在这里处理下载进度, 如更新界面上的进度条
} }
...@@ -317,7 +317,7 @@ ...@@ -317,7 +317,7 @@
getDown() { getDown() {
this.cityOptions = []; this.cityOptions = [];
this.apipost("/api/Trade/GetBuildingCarrierExportEnumList", {}, (res) => { this.apipost("/api/Trade/GetBrandEnterpriseExportEnumList", {}, (res) => {
this.cities = res.data.data; this.cities = res.data.data;
let data = res.data.data; let data = res.data.data;
data.forEach((item) => { data.forEach((item) => {
...@@ -362,15 +362,9 @@ ...@@ -362,15 +362,9 @@
}, (res) => { }, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CategoryList = res.data.data; this.CategoryList = res.data.data;
let obj = {
ClassName: "不限",
ID: 0,
};
this.CategoryList.unshift(obj);
} }
}); });
}, },
//获取项目类型 //获取项目类型
getProject(type) { getProject(type) {
let str = ""; let str = "";
......
src/components/tradePavilion/BuildingManager.vue
View file @ d01a72a9
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<template> <template>
<div class="VehicleManagement"> <div class="VehicleManagement">
<div class="head-title"> <div class="head-title">
{{isCarrier?'载体':'楼宇'}}管理 {{isCarrier?'商业载体':'楼宇'}}管理
<div> <div>
<el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small" <el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
type="primary"> type="primary">
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
</div> </div>
<div> <div>
<el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small" <el-button type="primary" style="float: right; margin: -25px 10px 0px 0px" class="el-button--small"
@click="CommonJump('BuildingVehicle',{isCarrier:isCarrier?1:0})">新增{{isCarrier?'载体':'楼宇'}}</el-button> @click="CommonJump('BuildingVehicle',{isCarrier:isCarrier?1:0})">新增{{isCarrier?'商业载体':'楼宇'}}</el-button>
</div> </div>
</div> </div>
<div class="content"> <div class="content">
...@@ -84,24 +84,24 @@ ...@@ -84,24 +84,24 @@
</el-option> </el-option>
</el-select> </el-select>
</div> --> </div> -->
<div class="searchInput" style="width: 200px; margin-bottom: 10px"> <!-- <div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.QShopType" filterable <el-select size="small" v-model="msg.QShopType" filterable
@change="(msg.pageIndex = 1), getList()" placeholder="请选择首店类型"> @change="(msg.pageIndex = 1), getList()" placeholder="请选择首店类型">
<el-option label="不限" :value="0"></el-option> <el-option label="不限" :value="0"></el-option>
<el-option v-for="item in ShopTypeList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in ShopTypeList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
</div> </div> -->
<div class="searchInput" style="width: 200px; margin-bottom: 10px"> <div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.CategoryId" filterable <el-select size="small" v-model="msg.CategoryId" filterable @change="(msg.pageIndex = 1), getList()" clearable
@change="(msg.pageIndex = 1), getList()" placeholder="请选择分类"> @clear="(msg.pageIndex = 1), getList()" :placeholder="(isCarrier?'商业载体':'楼宇')+`分类`">
<el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID"> <el-option v-for="item in CategoryList" :key="item.ID" :label="item.ClassName" :value="item.ID">
</el-option> </el-option>
</el-select> </el-select>
</div> </div>
<div class="searchInput" style="width: 200px; margin-bottom: 10px"> <div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.OpeningStatus" filterable <el-select size="small" v-model="msg.OpeningStatus" clearable @change="(msg.pageIndex = 1), getList()"
@change="(msg.pageIndex = 1), getList()" placeholder="请选择开店状态"> @clear="(msg.pageIndex = 1), getList()" placeholder="开业状态">
<el-option v-for="item in OpeningList" :key="item.Id" :label="item.Name" :value="item.Id"> <el-option v-for="item in OpeningList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option> </el-option>
</el-select> </el-select>
...@@ -114,13 +114,13 @@ ...@@ -114,13 +114,13 @@
<el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0"> <el-table :data="tableData" v-loading="loading" border style="width: 100%; margin: 20px 0">
<el-table-column prop="CarrierName" width="200" label="项目名称"> <el-table-column prop="CarrierName" width="200" label="项目名称">
</el-table-column> </el-table-column>
<!-- <el-table-column prop="CarrierMetroList" label="地铁信息" width="200"> <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-for="(item, index) in scope.row.CarrierMetroList" :key="index" class="CarrierList"> <div v-for="(item, index) in scope.row.CarrierMetroList" :key="index" class="CarrierList">
<span>{{ item.MetroNum }}号线</span><span>{{ item.MetroName }}</span><span>{{ item.Distance }}</span> <span>{{ item.MetroNum }}号线</span><span>{{ item.MetroName }}</span><span>{{ item.Distance }}</span>
</div> </div>
</template> </template>
</el-table-column> --> </el-table-column>
<el-table-column prop="Logo" width="100" label="logo"> <el-table-column prop="Logo" width="100" label="logo">
<template slot-scope="scope"> <template slot-scope="scope">
<el-image :src="scope.row.Logo" style="width: 50px" :preview-src-list="scope.row.LogoList"> <el-image :src="scope.row.Logo" style="width: 50px" :preview-src-list="scope.row.LogoList">
...@@ -219,9 +219,9 @@ ...@@ -219,9 +219,9 @@
ExcelEnumIds: [], ExcelEnumIds: [],
UserId: 0, UserId: 0,
RandomNum: 0, //随机数 RandomNum: 0, //随机数
CategoryId: 0, //分类Id CategoryId: "", //分类Id
BuildingCarrierType: null, //(1-载体，2-楼宇) BuildingCarrierType: null, //(1-载体，2-楼宇)
OpeningStatus: -1, // 0-即将开业，1-已开业 OpeningStatus: "", // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通 QShopType: 0, //1-成都首店,2-宜宾商载通
}, },
usermsg: { usermsg: {
...@@ -261,10 +261,6 @@ ...@@ -261,10 +261,6 @@
}, },
], ],
OpeningList: [{ OpeningList: [{
Name: '不限',
Id: -1
},
{
Name: '即将开业', Name: '即将开业',
Id: 0 Id: 0
}, },
...@@ -299,9 +295,9 @@ ...@@ -299,9 +295,9 @@
ExcelEnumIds: [], ExcelEnumIds: [],
UserId: 0, UserId: 0,
RandomNum: 0, //随机数 RandomNum: 0, //随机数
CategoryId: 0, //分类Id CategoryId: "", //分类Id
BuildingCarrierType: this.isCarrier ? 1 : 2, //(1-载体，2-楼宇) BuildingCarrierType: this.isCarrier ? 1 : 2, //(1-载体，2-楼宇)
OpeningStatus: -1, // 0-即将开业，1-已开业 OpeningStatus: "", // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通 QShopType: 0, //1-成都首店,2-宜宾商载通
} }
this.getList(); this.getList();
...@@ -483,15 +479,9 @@ ...@@ -483,15 +479,9 @@
}, (res) => { }, (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.CategoryList = res.data.data; this.CategoryList = res.data.data;
let obj = {
ClassName: "不限",
ID: 0,
};
this.CategoryList.unshift(obj);
} }
}); });
}, },
//获取项目类型 //获取项目类型
getProject(type) { getProject(type) {
let str = ""; let str = "";
......
src/components/tradePavilion/brandManagement.vue
View file @ d01a72a9
...@@ -318,7 +318,7 @@ ...@@ -318,7 +318,7 @@
var fileName = "品牌信息.xls"; var fileName = "品牌信息.xls";
var that = this; var that = this;
this.apipost( this.apipost(
"/api/Trade/CheckBrandEnterpriseFile", "/api/Trade/CheckBrandFile",
msg, msg,
(res) => { (res) => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
...@@ -369,7 +369,7 @@ ...@@ -369,7 +369,7 @@
}, },
getDown() { getDown() {
this.cityOptions = []; this.cityOptions = [];
this.apipost("/api/Trade/GetBrandEnterpriseExportEnumList", {}, (res) => { this.apipost("/api/Trade/GetBusinessExportEnumList", {}, (res) => {
var tempData = []; var tempData = [];
let data = res.data.data; let data = res.data.data;
data.forEach((item) => { data.forEach((item) => {
......
src/plug/index.js
View file @ d01a72a9
...@@ -53,35 +53,25 @@ export default { ...@@ -53,35 +53,25 @@ export default {
}, },
//域名管理对象 //域名管理对象
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = "http://192.168.5.46:8200"; let mallApiUrl = "http://192.168.5.46:8200"; //商城接口地址
let javaUrl = 'http://192.168.5.214:8018'; let javaUrl = 'http://192.168.5.214:8018'; //资产Api地址
let vtUploadUrl = "http://192.168.5.214:8120"; let vtUploadUrl = "http://192.168.5.214:8120"; //文件上传地址
let vtViewUrl = "http://192.168.5.214:8130"; let vtViewUrl = "http://192.168.5.214:8130"; //文件预览地址
let erpWebUrl = "http://localhost:8080"; let erpWebUrl = "http://localhost:8080"; //ERP后台Web地址
let locationName = window.location.hostname; let locationName = window.location.hostname;
if (locationName.indexOf('testmall.oytour') !== -1) { if (locationName.indexOf('oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com"; mallApiUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "https://imgfile.oytour.com";
erpWebUrl = "http://admin.oytour.com";
} else if (locationName.indexOf('oytour') !== -1) {
domainUrl = "https://mallapi.oytour.com";
javaUrl = "http://property.oytour.com"; javaUrl = "http://property.oytour.com";
vtUploadUrl = "http://upload.oytour.com"; vtUploadUrl = "http://upload.oytour.com";
vtViewUrl = "https://imgfile.oytour.com"; vtViewUrl = "https://imgfile.oytour.com";
erpWebUrl = "http://admin.oytour.com"; erpWebUrl = "http://admin.oytour.com";
} }
var obj = { var obj = {
//主地址npm DomainUrl: mallApiUrl, //商城接口地址
DomainUrl: domainUrl, javaUrl: javaUrl, //资产Api地址
//资产管理
javaUrl: javaUrl,
//常用提交数据URL
PostUrl: domainUrl + "/api/common/post",
ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com', ImageUrl: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com',
UploadFileUrl: domainUrl + '/api/File/LocalFileUploadImport', UploadFileUrl: mallApiUrl + '/api/File/LocalFileUploadImport',
UploadBlob: domainUrl + '/api/File/UploadBlob', UploadBlob: mallApiUrl + '/api/File/UploadBlob',
//文件上传自己服务器 //文件上传自己服务器
VTUploadUrl: vtUploadUrl, VTUploadUrl: vtUploadUrl,
//文件预览自己服务器 //文件预览自己服务器
......
src/router/index.js
View file @ d01a72a9
...@@ -802,24 +802,25 @@ export default new Router({ ...@@ -802,24 +802,25 @@ export default new Router({
name: 'VehicleManagement', name: 'VehicleManagement',
component: resolve => require(['@/components/tradePavilion/VehicleManagement'], resolve), component: resolve => require(['@/components/tradePavilion/VehicleManagement'], resolve),
}, },
//楼宇 //楼宇【商载通】
{ {
path: '/tenementManager', path: '/tenementManager',
name: 'tenementManager', name: 'tenementManager',
component: resolve => require(['@/components/tradePavilion/tenementManager'], resolve), component: resolve => require(['@/components/tradePavilion/tenementManager'], resolve),
}, },
//商业载体 //商业载体【商载通】
{ {
path: '/BuildingServiceManager', path: '/BuildingServiceManager',
name: 'BuildingServiceManager', name: 'BuildingServiceManager',
component: resolve => require(['@/components/tradePavilion/BuildingManager'], resolve), component: resolve => require(['@/components/tradePavilion/BuildingManager'], resolve),
}, },
//消费品牌管理 //消费品牌管理【商载通】
{ {
path: '/BrandManager', path: '/BrandManager',
name: 'BrandManager', name: 'BrandManager',
component: resolve => require(['@/components/tradePavilion/BrandEnterpriseManager'], resolve), component: resolve => require(['@/components/tradePavilion/BrandEnterpriseManager'], resolve),
}, },
//企业服务管理 //企业服务管理
{ {
path: '/firmManager', path: '/firmManager',
......
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