Skip to content

S
SuperMan
Commit 8e4a59c5 authored by 黄媛媛's avatar 黄媛媛
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents 250802f0 d093bda7
Hide whitespace changes
Inline Side-by-side
Showing with 452 additions and 2 deletions
src/components/TravelManager/TravelNewQuotation/newQuotation.vue
View file @ 8e4a59c5
......@@ -190,7 +190,7 @@
</div>
</div>
<div>
<span class="openGroup opbd" @click="goToOpenTravel('TravelManager6',item)">
<span class="openGroup opbd" @click="goToOpenTravel(item)">
<el-tooltip class="item" effect="dark" content="开团" placement="top-start" popper-class="max-w250">
<i class="iconfont icon-nav-hangzheng"></i>
</el-tooltip>
......@@ -557,7 +557,15 @@
});
},
//开团或修改
goToOpenTravel(path, item) {
goToOpenTravel(item) {
var routeName = this.$route.name;
var path='';
if (routeName == 'newQuotation') {
path='TravelManager6'
}
if (routeName == 'newQuotation2') {
path='TravelManager5'
}
if (item.ID > 0) {
this.$router.push({
name: path,
......
src/components/platformModule/scmAccountManagement.vue 0 → 100644
View file @ 8e4a59c5
<style>
.scmAccountManagement .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
cursor: pointer;
position: relative;
overflow: hidden;
width: 100px;
height: 100px;
border-radius: 50%
}
.scmAccountManagement .avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.scmAccountManagement .avatar-uploader-icon {
font-size: 28px;
color: white;
width: 100px;
height: 100px;
line-height: 80px;
text-align: center;
position: absolute;
left: 0;
top: 0;
background: rgba(0, 0, 0, 0.5);
}
/* 上传样式 */
.scmAccountManagement .avatar-uploader .el-upload {
border: 1px dashed #d9d9d9;
cursor: pointer;
position: relative;
overflow: hidden;
width: 100px;
height: 100px;
border-radius: 50%
}
.scmAccountManagement .avatar-uploader .el-upload:hover {
border-color: #409EFF;
}
.scmAccountManagement .avatar-uploader-icon {
font-size: 28px;
color: white;
width: 100px;
height: 100px;
line-height: 80px;
text-align: center;
position: absolute;
left: 0;
top: 0;
background: rgba(0, 0, 0, 0.5);
}
.scmAccountManagement .avatar {
width: 100px;
height: 100px;
display: block;
position: absolute;
left: 0;
top: 0
}
</style>
<template>
<div class="flexOne scmAccountManagement">
<div class="query-box">
<ul>
<li>
<span><em>{{$t('admin.admin_group')}}</em>
<el-input class='w210' v-model="msg.Name" :placeholder="$t('pub.pleaseImport')"
@keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span><em>{{$t('admin.admin_domain')}}</em>
<el-input class='w210' v-model="msg.Account" :placeholder="$t('pub.pleaseImport')"
@keyup.enter.native="getList"></el-input>
</span>
</li>
<li>
<span><em>{{$t('admin.admin_status')}}</em>
<el-select class='w210' clearable v-model="msg.Status" :placeholder="$t('pub.unlimitedSel')">
<el-option :label="$t('pub.unlimitedSel')" :value='-1'></el-option>
<el-option label="正常" :value='0'></el-option>
<el-option label="禁用" :value='1'></el-option>
<el-option label="删除" :value='2'></el-option>
</el-select>
</span>
</li>
<li>
<input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" />
<input type="button" @click="outerVisible = true,dialogTitle='新增集团信息'" class="normalBtn"
:value="$t('pub.addBtn')" />
</li>
</ul>
</div>
<table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th width="80">编号</th>
<th width="100">姓名</th>
<th width="100">账号</th>
<th width="100">状态</th>
<th width="100">操作人</th>
<th width="100">操作时间</th>
<th width="100">操作</th>
</tr>
<tr v-for="(item,index) in DataList" v-loading='loading' :key="index">
<td>{{item.GroupName}}</td>
<td>{{item.Domain}}</td>
<td>{{item.VersionsName}}</td>
<td>{{item.ContactPersion}}:{{item.MobilePhone}}</td>
<td>{{item.Status==0?'开启':'关闭'}}</td>
<td>{{item.EmAccount}}</td>
<td>
<el-tooltip class="item" effect="dark" content="修改" placement="top-start">
<el-button @click="outerVisible = true,dialogTitle='修改集团信息',updateData(item.Id)" type="primary"
icon="el-icon-edit" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="公司" placement="top-start">
<el-button @click="goUrl('companyManagement',item.Id)" type="primary" icon="iconfont icon-gongsi1" circle>
</el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="管理员" placement="top-start">
<el-button @click="getSystem(item)" type="primary" icon="iconfont icon-guanliyuan" circle></el-button>
</el-tooltip>
</td>
</tr>
</table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
<el-dialog custom-class='w500' :title="dialogTitle" :visible.sync="outerVisible" center
:before-close="closeChangeMachie">
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-form-item class='w400' :label="$t('admin.admin_group')" prop="GroupName">
<el-input type="text" v-model="addMsg.GroupName" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' :label="$t('admin.admin_domain')" prop="Domain">
<el-input type="text" v-model="addMsg.Domain" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label="B2B域名" prop="B2BDomain">
<el-input type="text" v-model="addMsg.B2BDomain " :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' :label="$t('admin.admin_address')" prop="Address">
<el-input type="text" v-model="addMsg.Address" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' :label="$t('pub.telphone')" prop="Tel">
<el-input type="text" v-model="addMsg.Tel" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='联系人姓名' prop="ContactPersion">
<el-input type="text" v-model="addMsg.ContactPersion" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='联系人手机' prop="MobilePhone">
<el-input type="text" v-model="addMsg.MobilePhone" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='系统版本' prop="Versions_Id">
<el-select v-model="addMsg.Versions_Id" placeholder="请选项" @change='sendVal(addMsg.Versions_Id)'>
<el-option v-for='item in versions' :label='item.VersionsName' :key='item.Id' :value='item.Id'></el-option>
</el-select>
</el-form-item>
<el-form-item class='w400' label='账户数量' prop="EmployeeNum">
<el-input type="text" v-model="addMsg.EmployeeNum" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item class='w400' label='部门最大层级' prop="MaxDepartmentTier">
<el-input type="text" v-model="addMsg.MaxDepartmentTier" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item>
<el-form-item label='Logo'>
<el-upload class="avatar-uploader" :http-request="UploadImage" :show-file-list="false"
:on-success="handleAvatarSuccess" :before-upload="beforeAvatarUpload">
<img v-if="imageUrl" :src="imageUrl" class="avatar">
<i class="el-icon-upload2 avatar-uploader-icon"></i>
<span v-if="imageUrl" class="repUp">{{$t('system.up_againUp')}}</span>
<span v-else class="repUp">{{$t('system.up_upImg')}}</span>
</el-upload>
</el-form-item>
<el-form-item class='w400' label='状态' prop="Status">
<el-switch v-model="addMsg.Status" active-value="0" inactive-value="1"></el-switch>
</el-form-item>
<el-form-item class='w400' label='备注' prop="Remarks">
<el-input type="textarea" v-model="addMsg.Remarks"></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="outerVisible = false,resetForm('addMsg')">取 消</button> &nbsp;
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">保存</button>
</div>
</el-dialog>
</div>
</template>
<script>
export default {
data() {
return {
msgTitle: '添加管理员',
loading: true,
value: '',
DataList: '',
versions: [],
chosenIndex: -1,
res: {},
total: 0,
pageSize: '',
currentPage: 1,
outerVisible: false,
innerVisible: false,
isRight: true,
dialogTitle: '',
imageUrl: '',
msg: { //请求数据
pageIndex: 1,
pageSize: 15,
Status: -1,
Name:'',
Account: ''
},
addMsg1: {
GroupId: '',
RoleName: '',
AdminAccount: '',
AdminPassword: '',
AdminName: '',
PostName: '',
EmLoginMobile: ''
},
addMsg: {
Id:0,//编号
Name:"",//姓名
Account:"",//账号
Pwd:"",//密码
SupplierId:0,//供应商编号
HeadImg:"",//头像
},
verSionMsg: {
Status: 0
},
canSave: true,
systemShow: false,
newUserList: []
}
},
mounted() {
this.getList();
this.getVersion();
},
methods: {
//上传图片
UploadImage(file) {
let newArr = [];
newArr.push(file.file);
let fileName = file.file.name;
var path = "/Upload/Temporary/";
this.UploadSelfFileT(path, newArr, x => {
this.imageUrl = this.domainManager().ViittoFileUrl + x.data.FilePath;
this.addMsg.Logo = x.data.FilePath;
});
},
sendVal(id) {
let obj = this.versions.find(item => item.Id === id)
if (obj) {
this.addMsg.EmployeeNum = obj.EmployeeNum
}
},
saveSystem() {
this.apipost('admin_post_SetAdminAccount', this.addMsg1, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.systemShow = false;
this.getList()
this.resetForm1('addMsg1');
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
getSystem(obj) {
this.addMsg1.GroupId = obj.Id
this.systemShow = true
if (obj.EmAccount == '' || obj.EmAccount == null) {
this.canSave = true
this.msgTitle = '添加管理员'
} else {
this.canSave = false
this.msgTitle = '修改管理员'
}
this.apipost('admin_get_GetAdminAccountForRoleList', {
GroupId: obj.Id
}, res => {
if (res.data.resultCode == 1) {
this.newUserList = res.data.data
this.getSystemInfo(obj.Id)
}
}, err => {})
},
getSystemInfo(id) {
this.apipost('admin_get_GetAdminAccount', {
GroupId: id
}, res => {
if (res.data.resultCode == 1) {
this.addMsg1.PostName = res.data.data.PostName
this.addMsg1.AdminName = res.data.data.AdminName
this.addMsg1.AdminAccount = res.data.data.AdminAccount
this.addMsg1.AdminPassWord = res.data.data.AdminPassWord
this.addMsg1.RoleName = res.data.data.RoleName
this.addMsg1.EmLoginMobile = res.data.data.EmLoginMobile
}
}, err => {})
},
handleAvatarSuccess(res, file) { //上传
if (res.resultCode == 1) {
var img_path = res.data.FullFilePath
this.addMsg.Logo = res.data.FilePath
this.imageUrl = img_path
}
},
beforeAvatarUpload(file) { //上传-
},
getList() { //获取数据
this.loading = true
this.apipost('admin_get_GroupGetPageList', this.msg, res => {
if (res.data.resultCode == 1) {
this.loading = false
this.DataList = res.data.data.pageData;
this.total = res.data.data.count;
} else {}
}, err => {})
},
getVersion() { //获取版本信息
this.apipost('admin_get_SysVersionsGetList', this.verSionMsg, res => {
this.versions = res.data.data;
}, err => {
})
},
addData() { //新增数据
this.apipost('admin_post_GroupSet', this.addMsg, res => {
if (res.data.resultCode == 1) {
this.$message.success(res.data.message);
this.outerVisible = false;
this.getList()
this.resetForm('addMsg');
} else {
this.$message.error(res.data.message)
}
}, err => {})
},
updateData(id) {
this.apipost('admin_get_GroupGet', {
GroupId: id
}, res => {
if (res.data.resultCode == 1) {
this.addMsg = res.data.data;
this.addMsg.Status = res.data.data.Status.toString()
this.imageUrl = this.addMsg.Logo;
} else {}
}, err => {})
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getList();
},
resetPageIndex() {
this.msg.pageIndex = 1;
this.currentPage = 1
},
menuShow(index) {
this.chosenIndex = this.chosenIndex == index ? -1 : index;
},
goUrl(path, id) {
this.$router.push({
name: path,
query: {
"id": id,
blank: 'y',
tab: '公司管理'
}
})
},
submitForm(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.addData()
} else {
return false;
}
});
},
submitForm1(addMsg) { //提交创建、修改表单
this.$refs[addMsg].validate((valid) => {
if (valid) {
this.saveSystem()
} else {
return false;
}
});
},
closeChangeMachie(done) { //弹出框关闭初始化弹框内表单
done();
this.resetForm('addMsg');
},
resetForm(formName) { //弹出框取消 初始化谈框内表单
this.$refs[formName].resetFields();
this.addMsg.Id = '-1'
this.addMsg.Logo = '';
this.imageUrl = '';
}
}
}
</script>
src/router/config.js
View file @ 8e4a59c5
......@@ -283,6 +283,14 @@ export default {
title: '城市管理'
},
},
{
path: '/scmAccountManagement', //供应商账号管理
name: 'scmAccountManagement',
component: resolve => require(['@/components/platformModule/scmAccountManagement'], resolve),
meta: {
title: '供应商账号管理'
},
},
{
path: '/companyManagement', //公司管理
name: 'companyManagement',
......@@ -2404,6 +2412,15 @@ export default {
title: '报价单'
},
},
//销售-自主开团报价单
{
path: '/newQuotation2',
name: 'newQuotation2',
component: resolve => require(['@/components/TravelManager/TravelNewQuotation/newQuotation'], resolve),
meta: {
title: '报价单'
},
},
{ // 销售 任务管理
path: '/saleTaskManagement',
name: 'saleTaskManagement',
......
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