Skip to content

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

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

parents 98022273 18410a7a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2947 additions and 864 deletions
src/components/CommodityMan/skuForm.vue 0 → 100644
View file @ a55854bb
<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/sallCenter/CustomPage.vue
View file @ a55854bb
......@@ -21,19 +21,50 @@
</el-table-column>
<el-table-column prop="PageName" label="标题">
</el-table-column>
<el-table-column label="导航与模板" prop="DetailsList" width="500">
<el-table-column label="导航与模板" prop="DetailsList" width="400">
<template slot-scope="scope">
<div class="templat-list">
<template v-if="scope.row.DetailsList && scope.row.DetailsList.length>0"
v-for="(subItem,subIndex) in scope.row.DetailsList">
<div class="templat-item" :key="subIndex">
<div>{{subItem.NavName}}</div>
<div style="color: rgb(153, 153, 153);">{{subItem.TemplateShowName}}</div>
<div style="color: rgb(153, 153, 153);">
<template v-if="subItem.NavName&&subItem.NavName!=''">{{subItem.NavName}}：</template>
{{subItem.TemplateShowName}}</div>
</div>
</template>
</div>
</template>
</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">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsHome" active-color="#409EFF" :active-value="1" :inactive-value="0"
......@@ -48,6 +79,7 @@
</el-switch>
</template>
</el-table-column>
<el-table-column prop="IsUse" label="禁用/启用" width="120">
<template slot-scope="scope">
<el-switch v-model="scope.row.IsUse" active-color="#409EFF" :active-value="1" :inactive-value="0"
......@@ -93,6 +125,10 @@
: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="模板和导航">
<div style="max-width:480px;">
<div class="Custom_item" v-for="(item,index) in addMsg.DetailsList" :key="index">
......@@ -159,7 +195,8 @@
IsHome: 0,
IsUse: 1,
IsShowNav: 0,
IsShowBottomTabBar:1,//是否显示底部导航
IsShowBottomTabBar: 1, //是否显示底部导航
IsNoShowTitle: 0, //是否不显示标题
DetailsList: []
},
total: 0,
......@@ -260,7 +297,8 @@
this.addMsg.IsShowNav = jsonData.IsShowNav;
this.addMsg.IsHome = jsonData.IsHome;
this.addMsg.DetailsList = jsonData.DetailsList;
this.addMsg.IsShowBottomTabBar=jsonData.IsShowBottomTabBar;
this.addMsg.IsShowBottomTabBar = jsonData.IsShowBottomTabBar;
this.addMsg.IsNoShowTitle = jsonData.IsNoShowTitle;
this.CustomIsShowAdd = false;
} else {
this.Info(res.data.message);
......@@ -340,7 +378,7 @@
}
.CustomPage .templat-item div {
width: 50%;
width: 90%;
padding-left: 20px;
}
......
src/components/sallCenter/plugin/link.vue
View file @ a55854bb
......@@ -224,7 +224,7 @@
</el-form-item>
<template v-if="data.picSwitch">
<el-form-item label="图标">
<label slot="label">图标
<label slot="label">
<el-tooltip class="item" effect="dark" content="最大宽度750px，最大高度36px，图标等比例缩放" placement="top">
<i class="el-icon-info"></i>
</el-tooltip>
......
src/components/tradePavilion/BrandEnterpriseManager.vue
View file @ a55854bb
......@@ -14,7 +14,7 @@
<template>
<div class="VehicleManagement">
<div class="head-title">
{{isBrand?'品牌':'服务'}}管理
{{isBrand?'消费品牌':'企业服务'}}管理
<div>
<el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
type="primary">
......@@ -23,14 +23,14 @@
</div>
<div>
<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 class="content">
<div>
<div class="searchInput" style="width: 250px; margin-bottom: 10px">
<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>
</el-input>
<span @click="(msg.pageIndex = 1), getList()" class="el-icon-search" style="
......@@ -42,7 +42,7 @@
</div>
<div class="searchInput" style="width: 200px; margin-bottom: 10px">
<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>
</el-select>
......@@ -146,7 +146,7 @@
ExcelEnumIds: [],
UserId: 0,
RandomNum: 0, //随机数
CategoryId: 0, //分类Id
CategoryId: "", //分类Id
BrandEnterpriseType: null, //(1-品牌，2-服务)
OpeningStatus: -1, // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通
......@@ -192,7 +192,7 @@
BrandName: "", //名称
pageIndex: 1,
pageSize: 15,
CategoryId: 0, //分类Id
CategoryId: "", //分类Id
BrandEnterpriseType: this.isBrand ? 1 : 2, //(1-品牌，2-服务)
}
this.getList();
......@@ -362,15 +362,9 @@
}, (res) => {
if (res.data.resultCode == 1) {
this.CategoryList = res.data.data;
let obj = {
ClassName: "不限",
ID: 0,
};
this.CategoryList.unshift(obj);
}
});
},
//获取项目类型
getProject(type) {
let str = "";
......
src/components/tradePavilion/BuildingManager.vue
View file @ a55854bb
......@@ -14,7 +14,7 @@
<template>
<div class="VehicleManagement">
<div class="head-title">
{{isCarrier?'载体':'楼宇'}}管理
{{isCarrier?'商业载体':'楼宇'}}管理
<div>
<el-button @click="checkAll=false,dialogVisible = true" style="float: right; margin-top: -25px" size="small"
type="primary">
......@@ -23,7 +23,7 @@
</div>
<div>
<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 class="content">
......@@ -84,24 +84,24 @@
</el-option>
</el-select>
</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
@change="(msg.pageIndex = 1), getList()" placeholder="请选择首店类型">
<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>
</el-select>
</div>
</div> -->
<div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.CategoryId" filterable
@change="(msg.pageIndex = 1), getList()" placeholder="请选择分类">
<el-select size="small" v-model="msg.CategoryId" filterable @change="(msg.pageIndex = 1), getList()" clearable
@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>
</el-select>
</div>
<div class="searchInput" style="width: 200px; margin-bottom: 10px">
<el-select size="small" v-model="msg.OpeningStatus" filterable
@change="(msg.pageIndex = 1), getList()" placeholder="请选择开店状态">
<el-select size="small" v-model="msg.OpeningStatus" clearable @change="(msg.pageIndex = 1), getList()"
@clear="(msg.pageIndex = 1), getList()" placeholder="开业状态">
<el-option v-for="item in OpeningList" :key="item.Id" :label="item.Name" :value="item.Id">
</el-option>
</el-select>
......@@ -114,13 +114,13 @@
<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>
<!-- <el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
<el-table-column prop="CarrierMetroList" label="地铁信息" width="200">
<template slot-scope="scope">
<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>
</div>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column prop="Logo" width="100" label="logo">
<template slot-scope="scope">
<el-image :src="scope.row.Logo" style="width: 50px" :preview-src-list="scope.row.LogoList">
......@@ -219,9 +219,9 @@
ExcelEnumIds: [],
UserId: 0,
RandomNum: 0, //随机数
CategoryId: 0, //分类Id
CategoryId: "", //分类Id
BuildingCarrierType: null, //(1-载体，2-楼宇)
OpeningStatus: -1, // 0-即将开业，1-已开业
OpeningStatus: "", // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通
},
usermsg: {
......@@ -261,10 +261,6 @@
},
],
OpeningList: [{
Name: '不限',
Id: -1
},
{
Name: '即将开业',
Id: 0
},
......@@ -299,9 +295,9 @@
ExcelEnumIds: [],
UserId: 0,
RandomNum: 0, //随机数
CategoryId: 0, //分类Id
CategoryId: "", //分类Id
BuildingCarrierType: this.isCarrier ? 1 : 2, //(1-载体，2-楼宇)
OpeningStatus: -1, // 0-即将开业，1-已开业
OpeningStatus: "", // 0-即将开业，1-已开业
QShopType: 0, //1-成都首店,2-宜宾商载通
}
this.getList();
......@@ -483,15 +479,9 @@
}, (res) => {
if (res.data.resultCode == 1) {
this.CategoryList = res.data.data;
let obj = {
ClassName: "不限",
ID: 0,
};
this.CategoryList.unshift(obj);
}
});
},
//获取项目类型
getProject(type) {
let str = "";
......
src/components/tradePavilion/BuildingVehicle.vue
View file @ a55854bb
......@@ -2,8 +2,8 @@
<div v-loading="pageloading" class="editVehicle">
<div class="head-title">
<span @click="CommonJump(isCarrier?'BuildingServiceManager':'BuildingManager')"
class="blue point">{{isCarrier?'载体':'楼宇'}}管理</span>
/ <span>{{ID?'编辑':'新增'}}{{isCarrier?'载体':'楼宇'}}</span>
class="blue point">{{isCarrier?'商业载体':'楼宇'}}管理</span>
/ <span>{{ID?'编辑':'新增'}}{{isCarrier?'商业载体':'楼宇'}}</span>
</div>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="180px">
<el-card shadow="never" style="margin-top: 10px" class="box-card">
......@@ -357,54 +357,54 @@
</el-form-item>
<!--prop="Ascription"-->
<el-form-item label="资产权属" >
<el-input v-model="addMsg.Ascription" style="width: 690px" size="small" placeholder="请输入资产权属">
<el-input v-model="addMsg.Ascription" style="width: 690px" size="small" placeholder="请输入资产权属" maxlength="500">
</el-input>
</el-form-item>
<!--prop="CarrierSize"-->
<el-form-item label="项目面积" >
<el-input v-model="addMsg.CarrierSize" @keyup.native="checkPrice(addMsg, 'CarrierSize')" style="width: 690px"
size="small" placeholder="请输入项目面积">
size="small" placeholder="请输入项目面积" maxlength="500">
<template slot="append">㎡</template>
</el-input>
</el-form-item>
<!--prop="PropertyComposition"-->
<el-form-item label="物业构成" >
<el-input v-model="addMsg.PropertyComposition" style="width: 690px" size="small" placeholder="请输入物业构成">
<el-input v-model="addMsg.PropertyComposition" style="width: 690px" size="small" placeholder="请输入物业构成" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="Location"-->
<el-form-item label="项目发展及定位" >
<el-input v-model="addMsg.Location" style="width: 690px" size="small" placeholder="请输入项目发展及定位">
<el-input v-model="addMsg.Location" style="width: 690px" size="small" placeholder="请输入项目发展及定位" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!-- prop="Crowd"-->
<el-form-item label="周边人群结构特征">
<el-input v-model="addMsg.Crowd" style="width: 690px" size="small" placeholder="请输入周边人群结构特征">
<el-input v-model="addMsg.Crowd" style="width: 690px" size="small" placeholder="请输入周边人群结构特征" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="VisitorsFlowrate"-->
<el-form-item label="人流量参数" >
<el-input v-model="addMsg.VisitorsFlowrate" style="width: 690px" size="small" placeholder="请输入人流量参数">
<el-input v-model="addMsg.VisitorsFlowrate" style="width: 690px" size="small" placeholder="请输入人流量参数" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="LayersNum"-->
<el-form-item label="商业楼层" >
<el-input v-model="addMsg.LayersNum" style="width: 690px" size="small" placeholder="请输入商业楼层">
<el-input v-model="addMsg.LayersNum" style="width: 690px" size="small" placeholder="请输入商业楼层" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="SupportingFacilities"-->
<el-form-item label="水电气及配套" >
<el-input v-model="addMsg.SupportingFacilities" style="width: 690px" size="small" placeholder="请输入水电气及配套">
<el-input v-model="addMsg.SupportingFacilities" style="width: 690px" size="small" placeholder="请输入水电气及配套" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="ManagementCompany"-->
<el-form-item label="管理公司及管理费" >
<el-input v-model="addMsg.ManagementCompany" style="width: 690px" size="small" placeholder="请输入管理公司及管理费">
<el-input v-model="addMsg.ManagementCompany" style="width: 690px" size="small" placeholder="请输入管理公司及管理费" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
<!--prop="BrandDemand"-->
<el-form-item label="目标招商业态及品牌需求" >
<el-input v-model="addMsg.BrandDemand" style="width: 690px" size="small" placeholder="请输入目标招商业态及品牌需求">
<el-input v-model="addMsg.BrandDemand" style="width: 690px" size="small" placeholder="请输入目标招商业态及品牌需求" maxlength="500" show-word-limit>
</el-input>
</el-form-item>
</el-card>
......@@ -489,7 +489,7 @@
BuiltUpArea: "", //经营面积
AreaRequirement: "", //可租赁面积
YeJi: "", //去年业绩
OpeningStatus: -1,
OpeningStatus: 0,
BuildingCarrierType: 1, //(1-载体,2-楼宇)
CategoryId: 0, //分类
Ascription: '', //资产权属
......
src/components/tradePavilion/firmEdit.vue 0 → 100644
View file @ a55854bb
This diff is collapsed.
src/components/tradePavilion/firmManager.vue 0 → 100644
View file @ a55854bb
This diff is collapsed.
src/components/tradePavilion/tenementManager.vue 0 → 100644
View file @ a55854bb
This diff is collapsed.
src/components/tradePavilion/tenementVehicle.vue 0 → 100644
View file @ a55854bb
This diff is collapsed.
src/router/index.js
View file @ a55854bb
......@@ -804,9 +804,9 @@ export default new Router({
},
//楼宇【商载通】
{
path: '/BuildingManager',
name: 'BuildingManager',
component: resolve => require(['@/components/tradePavilion/BuildingManager'], resolve),
path: '/tenementManager',
name: 'tenementManager',
component: resolve => require(['@/components/tradePavilion/tenementManager'], resolve),
},
//商业载体【商载通】
{
......@@ -820,11 +820,12 @@ export default new Router({
name: 'BrandManager',
component: resolve => require(['@/components/tradePavilion/BrandEnterpriseManager'], resolve),
},
//企业服务管理
{
path: '/EnterpriseManager',
name: 'EnterpriseManager',
component: resolve => require(['@/components/tradePavilion/BrandEnterpriseManager'], resolve),
path: '/firmManager',
name: 'firmManager',
component: resolve => require(['@/components/tradePavilion/firmManager'], resolve),
},
//贸易管理--载体管理编辑
{
......@@ -832,18 +833,30 @@ export default new Router({
name: 'editVehicle',
component: resolve => require(['@/components/tradePavilion/editVehicle'], resolve),
},
//楼宇管理--载体管理编辑
//载体管理编辑
{
path: '/BuildingVehicle',
name: 'BuildingVehicle',
component: resolve => require(['@/components/tradePavilion/BuildingVehicle'], resolve),
},
//品牌管理--企业管理编辑
//楼宇管理编辑
{
path: '/tenementVehicle',
name: 'tenementVehicle',
component: resolve => require(['@/components/tradePavilion/tenementVehicle'], resolve),
},
//品牌管理编辑
{
path: '/BrandEnterEdit',
name: 'BrandEnterEdit',
component: resolve => require(['@/components/tradePavilion/BrandEnterEdit'], resolve),
},
//企业管理编辑
{
path: '/firmEdit',
name: 'firmEdit',
component: resolve => require(['@/components/tradePavilion/firmEdit'], resolve),
},
//贸易管理--实名认证
{
path: '/realAuthentication',
......
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