Skip to content

C
cloud-platform-ui
Commit e58d8cb3 authored by denghr's avatar denghr
Browse files
Options

Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

parents 24086b1a 62a9703a
Show whitespace changes
Inline Side-by-side
Showing with 474 additions and 419 deletions
src/views/admin/user/index.vue
View file @ e58d8cb3
......@@ -274,6 +274,7 @@
getAll()
.then(response => {
this.allCompaniesArr = response.data;
this.allBranchCompany= response.data;
})
getAllCompany(codeAndBranchCompany => {
this.allCompanies = codeAndBranchCompany;
......@@ -299,9 +300,10 @@
'elements'
]),
getAllZoneList() {
console.log('getAllZoneList')
this.allZoneArr = getAllZone();
return getAllZone();
// console.log('getAllZoneList')
let allZone = getAllZone();
this.allZoneArr = allZone ;
return allZone;
},
},
methods: {
......@@ -325,6 +327,7 @@
* 所属分公司
* */
handleSelectSubordinate(item) {
this.form.companyId = item.id;
this.form.companyName = item.name;
},
......@@ -419,7 +422,7 @@
});
this.dialogFormVisible = true;
this.dialogStatus = 'update';
console.log(this.form);
// console.log(this.form);
// console.log(JSON.stringify(this.form))
});
});
......
src/views/baseInfo/branchCompany/index.vue
View file @ e58d8cb3
......@@ -405,6 +405,7 @@
'companyStatusAndCode'
]),
getAllZoneList(){
this.allZoneArr = getAllZone();
return getAllZone();
},
......
src/views/campsiteManage/modal/campsiteModal.vue
View file @ e58d8cb3
......@@ -22,12 +22,12 @@
</el-form-item>
<el-row>
<el-col :span="8">
<el-form-item label="经度">
<el-form-item label="经度" prop="latitude">
<el-input :value="form.latitude" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="纬度">
<el-form-item label="纬度" prop="longitude">
<el-input :value="form.longitude" readonly></el-input>
</el-form-item>
</el-col>
......@@ -52,10 +52,9 @@
</bm-marker>
</baidu-map>
</el-form-item>
<el-form-item>
<el-form-item >
<!--:center="center"-->
<baidu-map
:zoom="zoom"
:dragging="true"
:scroll-wheel-zoom="true"
......@@ -86,7 +85,7 @@
</div>
</el-dialog>
</template>
<script src="http://api.map.baidu.com/api?v=2.0&ak=iSEprDCqtYn5aC06Y3cDyGCEOP1hydwR"></script>
<script>
import BaiduMap from 'vue-baidu-map';
import {
......@@ -104,12 +103,10 @@
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
export default {
props: ["obj"],
name: 'destinationDialog',
components: {
ElFormItem,
ElCol,
ElInput,
ElRow
......@@ -183,16 +180,12 @@
}
],
longitude:{
type: 'string',
required: true,
message: '请输入经纬度',
trigger: 'blur'
message: '请拾取经纬度'
},
latitude:{
type: 'string',
required: true,
message: '请输入经纬度',
trigger: 'blur'
message: '请拾取经纬度'
},
addrProvince:{
required: true,
......@@ -331,8 +324,12 @@
/**
* 加载地图
* */
handler({map}){
handler ({BMap, map}) {
console.log(BMap, map)
this.postionMap = { //地图坐标
lng: 120.211486,
lat: 30.256576
};
},
//点击获取到当前经纬度
getClickInfo(e) {
......
src/views/campsiteManage/modal/oneCampsiteModal.vue
View file @ e58d8cb3
......@@ -5,35 +5,35 @@
<el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="营地名称">
<el-form-item label="营地名称" prop="name">
<el-input v-model="form.name" placeholder="请输入营地名称" @blur="checkName()"></el-input><span v-if="isExist" style="color:red;">标签名已存在</span>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="营地地址">
<el-form-item label="营地地址" prop="addressStr">
<el-input v-model="form.addressStr" readonly placeholder="请输入营地地址" :on-icon-click="selectDestination" icon="edit"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="客服电话">
<el-form-item label="客服电话" prop="servicePhone">
<el-input v-model="form.servicePhone" placeholder="请输入客服电话"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="联系人">
<el-form-item label="联系人" prop="concat">
<el-input v-model="form.concat" placeholder="请输入联系人"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="联系电话">
<el-form-item label="联系电话" prop="phone">
<el-input v-model="form.phone" placeholder="请输入联系电话"></el-input>
</el-form-item>
</el-col>
......@@ -51,7 +51,7 @@
</el-col>
</el-row>
<!--BASE_API + -->
<el-form-item label="封面图" :style="{display:'block'}">
<el-form-item label="封面图" :style="{display:'block'}" prop="logo">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
......@@ -79,7 +79,7 @@
<i v-else-if="!imgPosterFlag" class="el-icon-plus avatar-uploader-icon" style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
</el-upload>
</el-form-item>
<el-form-item label="轮播图" :style="{display:'block'}">
<el-form-item label="轮播图" :style="{display:'block'}" prop="carouse">
<el-upload
class="upload-demo"
:headers="getHeaderWithToken"
......@@ -110,8 +110,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate && campsiteshop_btn_update" @click="create()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate && campsiteshop_btn_update" @click="update()">确 定</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate && campsiteshop_btn_update" @click="create('form')">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate && campsiteshop_btn_update" @click="update('form')">确 定</el-button>
</div>
<!--编辑营地地址-->
<campsiteModal v-if="showCampsiteVisible && campsiteshop_btn_update" :obj="campsiteObj" v-on:campsiteEvent = "campsiteEvent"></campsiteModal>
......@@ -170,6 +170,19 @@
campsiteLabelModal
},
data() {
var checkPhone = (rule, value, callback) => {
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
} else {
return callback(new Error('请输入正确的手机号'));
}
}
};
return {
imgPosterFlag:false,
percent_poster:0,
......@@ -210,20 +223,30 @@
},
showCampsiteVisible: false,//编辑营地地址
rules: {
name: [
{
name:{
type: 'string',
required: true,
message: '请输入消息内容',
message: '请输入营地名称',
trigger: 'blur'
},
{
min: 0,
max: 100,
message: '长度小于 100 个字符',
servicePhone:{
type: 'string',
required: true,
message: '请输入客服电话',
trigger: 'blur'
},
phone:{validator: checkPhone, trigger: 'blur',required: true},
concat:{
type: 'string',
required: true,
message: '请输入联系人',
trigger: 'blur'
},
addressStr:{
type: 'string',
required: true,
message: '请输入营地地址',
}
]
},
checkList:[],//已选中的标签
allCompanies: {},
......@@ -299,8 +322,10 @@
/**
* 创建
* */
create(){
// this.isCreate = true;
create(formName){
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
let carouse = [];//营地轮播图
this.form.carouse.map(function (item) {
let c = {
......@@ -338,6 +363,10 @@
};
console.log(params);
this.isExistCampsiteShop("create", params);
} else {
return;
}
});
},
/**
* 判断营地名称是否已存在
......@@ -378,7 +407,10 @@
/**
* 编辑
* */
update(){
update(formName){
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
this.isCreate = true;
let carouse = [];//营地轮播图
this.form.carouse.map(function (item) {
......@@ -418,6 +450,10 @@
};
console.log(params);
this.isExistCampsiteShop("update", params);
} else {
return;
}
});
},
/**
* 更新
......
src/views/tourManage/modal/destinationModal.vue
View file @ e58d8cb3
......@@ -32,12 +32,12 @@
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="经度">
<el-form-item label="经度" prop="latitude">
<el-input :value="form.latitude" readonly></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="纬度">
<el-form-item label="纬度" prop="longitude">
<el-input :value="form.longitude" readonly></el-input>
</el-form-item>
</el-col>
......@@ -164,56 +164,26 @@
addrCity: undefined,
},
rules: {
name: [
{
name:{
type: 'string',
required: true,
message: '请输入名称',
trigger: 'blur'
},
{
min: 0,
max: 2000,
message: '长度小于 2000 个字符',
trigger: 'blur'
}
],
address: [
{
address: {
type: 'string',
required: true,
message: '请输入详细地址',
trigger: 'blur'
},
{
min: 0,
max: 2000,
message: '长度小于 2000 个字符',
trigger: 'blur'
}
],
longitude:{
type: 'string',
required: true,
message: '请输入经纬度',
trigger: 'blur'
message: '请选择经纬度'
},
latitude:{
type: 'string',
required: true,
message: '请输入经纬度',
trigger: 'blur'
},
addrProvince:{
required: true,
message: '请选择省份',
trigger: 'blur'
},
addrCity:{
required: true,
message: '请选择城市',
trigger: 'blur'
},
message: '请选择经纬度'
}
},
allCompanies: {},
allCompaniesArr: [],
......@@ -223,7 +193,6 @@
baidumapSwitch:false,
zoom: 16,
location: "深圳市",
}
},
created() {
......
src/views/tourManage/modal/oneTourModal.vue
View file @ e58d8cb3
......@@ -5,7 +5,7 @@
<el-form :model="form" :rules="rules" ref="form" label-width="90px">
<el-row>
<el-col :span="8">
<el-form-item label="旅行名称">
<el-form-item label="旅行名称" prop="name">
<el-input v-model="form.name" placeholder="请输入旅行名称"></el-input>
</el-form-item>
</el-col>
......@@ -19,44 +19,44 @@
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="旅行原价" prop="operator">
<el-form-item label="旅行原价" prop="price">
<el-input v-model="form.price" type="number" min="0" placeholder="请输入旅行原价"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="儿童价" prop="operator">
<el-form-item label="儿童价" prop="childPrice">
<el-input v-model="form.childPrice" type="number" min="0" placeholder="请输入儿童价"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4">
<el-form-item label="是否为推荐" prop="mileage">
<el-form-item label="是否为推荐">
<el-radio class="radio" v-model="form.recommend" label="1">是</el-radio>
<el-radio class="radio" v-model="form.recommend" label="0">否</el-radio>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="会员价格" prop="mileage">
<el-form-item label="会员价格">
<el-radio class="radio" v-model="form.isMember" label="1">启用会员价</el-radio>
<el-radio class="radio" v-model="form.isMember" label="0">不启用会员价</el-radio>
</el-form-item>
</el-col>
</el-row>
<el-form-item label="" prop="mileage">
<el-form-item label="">
<el-radio class="radio" v-model="form.isOutside" label="0">省内</el-radio>
<el-radio class="radio" v-model="form.isOutside" label="1">省外</el-radio>
</el-form-item>
<el-row>
<el-col :span="4">
<el-form-item label="库存" prop="amount">
<el-form-item label="库存" prop="stock">
<el-input v-model="form.stock" placeholder="请输入总人数" type="number" min="0"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<!--<el-col :span="24">-->
<el-form-item label="出发地" prop="departure">
<el-form-item label="出发地">
<el-input style="display: inline-block;margin-right: 10px;width: 240px;" v-model="item.name" v-for="item in departureList"
:key="item.id" readonly placeholder="请输入内容"></el-input>
<el-button size="small" class="el-button el-button--primary" type="button" icon="edit" @click="editDeparture(departureList)">编辑</el-button>
......@@ -101,7 +101,7 @@
<!--<el-input v-model="form.operator" placeholder="请选择活动日期"></el-input>-->
</el-form-item>
</el-row>
<el-form-item label="旅行标签" prop="approvers">
<el-form-item label="旅行标签">
<span v-for="item in form.tagDTOS"
:key="item.id" style="border: 1px solid #ccc; padding: 5px 10px;border-radius: 5px;margin-right: 10px;">{{item.name}}</span>
<!--<el-checkbox-group v-model="checkList">-->
......@@ -122,12 +122,12 @@
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="单位" prop="amount">
<el-form-item label="单位">
<el-input v-model="form.unit" placeholder="人"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label="销量" prop="saleCount">
<el-form-item label="销量">
<el-input v-model="form.saleCount" type="number" min="0" placeholder="请输入销量"></el-input>
</el-form-item>
</el-col>
......@@ -200,8 +200,8 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button @click="cancelTour">取 消</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate" @click="create()">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate&&good_btn_update" @click="update()">确 定</el-button>
<el-button type="primary" v-if="title=='创建' && !isCreate" @click="create('form')">确 定</el-button>
<el-button type="primary" v-if="title=='编辑' && !isCreate&&good_btn_update" @click="update('form')">确 定</el-button>
</div>
<!--编辑出发地-->
<departureModal v-if="editDepartureVisible" :list="departureList" v-on:departureEvent = "departureEvent"></departureModal>
......@@ -283,7 +283,7 @@ import ElRow from "element-ui/packages/row/src/row";
percent: 0,//上传进度
imgFlag: false,
onePathObj:{name: ""},//待编辑的途径地
destinationObj:{name: ""},//目的地
destinationObj:{},//目的地
departureList: [],//出发地列表
departureObj:{name: ""},//出发地
pathway: [],//途径地
......@@ -319,26 +319,24 @@ import ElRow from "element-ui/packages/row/src/row";
showPathWayVisible: false,//编辑途径地
showTimeVisible: false,//编辑时间
rules: {
name: [
{
name: {
type: 'string',
required: true,
message: '请输入消息内容',
message: '请输入旅游名称',
trigger: 'blur'
},
{
min: 0,
max: 100,
message: '长度小于 100 个字符',
trigger: 'blur'
price: {
required: true,
message: '请输入价格',
},
childPrice: {
required: true,
message: '请输入儿童价格'
},
stock: {
required: true,
message: '请输入库存'
}
],
// departure: {
// type: 'string',
// required: true,
// message: '请输入出发地',
// trigger: 'blur'
// },
},
checkList:[],//已选中的标签
allCompanies: {},
......@@ -449,8 +447,10 @@ import ElRow from "element-ui/packages/row/src/row";
/**
* 创建
* */
create(){
this.isCreate = true;
create(formName){
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
//旅游标签
let tagDTOS = [];
this.form.tagDTOS.map(function(item){
......@@ -483,6 +483,15 @@ import ElRow from "element-ui/packages/row/src/row";
};
siteDTOS.push(p);
});
if(this.departureList.length<=0){
this.$notify({
title: '警告',
message: '请选择出发地',
type: 'warning',
duration: 2000
});
return;
}
//途径地
this.pathway.map(function(item){
let provinceObj = item.province?getRegionByCodes([item.province]): [{name:""}];
......@@ -506,6 +515,15 @@ import ElRow from "element-ui/packages/row/src/row";
});
//destinationObj目的地
let destinationObj = this.destinationObj;
if(!destinationObj.name){
this.$notify({
title: '警告',
message: '请选择目的地',
type: 'warning',
duration: 2000
});
return;
}
let provinceObj = destinationObj.province?getRegionByCodes([destinationObj.province]):[{name:""}];
let cityObj = destinationObj.city?getRegionByCodes([destinationObj.city]):[{name:""}];
let p = {
......@@ -520,6 +538,7 @@ import ElRow from "element-ui/packages/row/src/row";
type: 2
};
siteDTOS.push(p);
this.isCreate = true;
let params = {
isOutside: this.form.isOutside,//省内、省外
name: this.form.name,//旅游路线名称
......@@ -564,13 +583,19 @@ import ElRow from "element-ui/packages/row/src/row";
});
}
});
} else {
return;
}
});
},
/**
* 编辑
* */
update(){
update(formName){
//旅游标签
this.isCreate = true;
const set = this.$refs;
set[formName].validate(valid => {
if (valid) {
let tagDTOS = [];
this.form.tagDTOS.map(function(item){
if(item.tagId){
......@@ -603,6 +628,15 @@ import ElRow from "element-ui/packages/row/src/row";
};
siteDTOS.push(p);
});
if(this.departureList.length<=0){
this.$notify({
title: '警告',
message: '请选择出发地',
type: 'warning',
duration: 2000
});
return;
}
//途径地
this.pathway.map(function(item){
let provinceObj = item.province?getRegionByCodes([item.province]): [{name:""}];
......@@ -625,6 +659,15 @@ import ElRow from "element-ui/packages/row/src/row";
});
//destinationObj目的地
let destinationObj = this.destinationObj;
if(!destinationObj.name){
this.$notify({
title: '警告',
message: '请选择目的地',
type: 'warning',
duration: 2000
});
return;
}
let provinceObj = destinationObj.province?getRegionByCodes([destinationObj.province]):[{name:""}];
let cityObj = destinationObj.city?getRegionByCodes([destinationObj.city]):[{name:""}];
let p = {
......@@ -666,6 +709,7 @@ import ElRow from "element-ui/packages/row/src/row";
posterBackground:this.form.posterBackground,//海报背景
};
console.log(params);
this.isCreate = true;
console.log(this.form);
goodsEdit(params).then(response => {
this.isCreate = false;
......@@ -686,6 +730,10 @@ import ElRow from "element-ui/packages/row/src/row";
});
}
});
} else {
return;
}
});
},
/**
* 获取全部旅游标签
......
src/views/userManagement/memberManagement/index.vue
View file @ e58d8cb3
......@@ -137,6 +137,7 @@
name: 'membershipGrade',
data() {
return {
BASE_API: process.env.BASE_API,
list: [],
listLoading: true,
tableKey: 0,
......
src/views/vehicle/vehicleInfo/index.vue
View file @ e58d8cb3
......@@ -236,7 +236,7 @@
</template>
</el-table-column>
<el-table-column width="65" align="center" v-if="showMoreMoreCol" label="保险公司">
<el-table-column width="150" align="center" v-if="showMoreMoreCol" label="保险公司">
<template scope="scope">
<span>{{getInsuranceCompany(scope.row.insuranceCompany)}}</span>
</template>
......@@ -248,31 +248,31 @@
</template>
</el-table-column>
<el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保险开始时间">
<el-table-column width="150" align="center" v-if="showMoreMoreCol" label="保险开始时间">
<template scope="scope">
<span>{{scope.row.insuranceStartDate}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保险结束时间">
<el-table-column width="180" align="center" v-if="showMoreMoreCol" label="保险结束时间">
<template scope="scope">
<span>{{scope.row.insuranceEndDate}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" v-if="showMoreMoreCol" label="年审时间">
<el-table-column width="180" align="center" v-if="showMoreMoreCol" label="年审时间">
<template scope="scope">
<span>{{scope.row.annualVerificationDate}}</span>
</template>
</el-table-column>
<el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保养时间">
<el-table-column width="180" align="center" v-if="showMoreMoreCol" label="保养时间">
<template scope="scope">
<span>{{scope.row.maintenanceDate}}</span>
</template>
</el-table-column>
<el-table-column width="65" align="center" v-if="showMoreMoreCol" label="保养里程数">
<el-table-column width="100" align="center" v-if="showMoreMoreCol" label="保养里程数">
<template scope="scope">
<span>{{scope.row.maintenanceMileage}}</span>
</template>
......@@ -299,7 +299,7 @@
</template>
</el-table-column>
<el-table-column width="120" align="center" v-if="showMoreMoreCol" label="发动机号">
<el-table-column width="130" align="center" v-if="showMoreMoreCol" label="发动机号">
<template scope="scope">
<span>{{scope.row.engineNum}}</span>
</template>
......@@ -323,7 +323,7 @@
</template>
</el-table-column>
<el-table-column align="center" label="操作" width="380" fixed="right">
<el-table-column align="center" label="操作" width="280" fixed="right">
<template scope="scope">
<el-button size="small" class="el-button el-button--text el-button--small" @click="handleUpdate(scope.row)">{{vehicleInfo_btn_edit?"编辑":"查看"}}
</el-button>
......
src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue
View file @ e58d8cb3
......@@ -130,7 +130,7 @@
if (!value) {
return callback(new Error('手机号不能为空'));
} else {
const reg = /^1[3|4|5|7|8][0-9]\d{8}$/
const reg = /^[1](([3][0-9])|([4][5,7,9])|([5][0-9])|([6][6])|([7][1,2,3,5,6,7,8])|([8][0-9])|([9][1,8,9]))[0-9]{8}$/
console.log(reg.test(value));
if (reg.test(value)) {
callback();
......
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