Skip to content

C
conferenceLy
提交 17a62262 authored 作者: FC's avatar FC
浏览文件
操作

合并分支 'fc' 到 'master'

Fc 查看合并请求 !10
上级 cf40f723 32130e52
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 77 行增加 和 132 行删除
src/axios/index.js
浏览文件 @ 17a62262
......@@ -23,8 +23,8 @@ const env = {
// API_TEST_ORIGIN: 'http://172.18.27.190:8080/confhd',
// API_BASE_ORIGIN: 'http://192.168.102.146:6888', //越越
// API_TEST_ORIGIN: 'http://192.168.102.146:6888',
API_BASE_ORIGIN: 'http://192.168.102.238:6888', //赵璐
API_TEST_ORIGIN: 'http://192.168.102.238:6888',
API_BASE_ORIGIN: 'http://192.168.102.53:6888', //赵璐
API_TEST_ORIGIN: 'http://192.168.102.53:6888',
},
development_ssj: {
// API_BASE_ORIGIN: 'http://192.168.100.248:6888',
......
src/axios/services.js
浏览文件 @ 17a62262
......@@ -1661,7 +1661,27 @@ findUnitByCustomOrgId(data){
return axios('/conferenceProcess/rescheduleMeeting?processId='+data,{
method:'get',
})
}
},
//会议配置-群发通知
massNotification(data){
return axios('/conferenceProcess/massNotification',{
method:'post',
data
})
},
//会议配置-查询群发通知记录
findMassNotification(data){
return axios('/conferenceProcess/findMassNotification?processId='+data,{
method:'get',
})
},
// 会议配置-查询通知结果
findNoticeResult(data){
return axios('/conferenceProcess/findNoticeResult?sendNoticeId=' + data,{
method:'get',
})
}
}
export default server
src/views/system/el-dialog/addUser.vue
浏览文件 @ 17a62262
<template>
<!-- 编辑|新增人员弹窗 -->
<el-dialog
class="ty_dialog"
:title="zhuangtai == 'update' ? '修改' : '新增'"
:visible.sync="dialogVisible"
:before-close="cancel"
width="40%"
v-loading="loading"
top="8vh"
>
<el-form
ref="addUser"
:rules="rules"
:model="addFrom"
label-width="150px"
class="demo-ruleForm"
>
<el-dialog class="ty_dialog" :title="zhuangtai == 'update' ? '修改' : '新增'"
:visible.sync="dialogVisible" :before-close="cancel" width="40%" v-loading="loading"
top="8vh">
<el-form ref="addUser" :rules="rules" :model="addFrom" label-width="150px"
class="demo-ruleForm">
<el-form-item label="选择权限专用单位:" prop="unitName" class="ty_from_item_position">
<el-select
v-model="addFrom.unitName"
filterable
value-key="unitName"
placeholder="全部"
:disabled="isEdit"
>
<el-option
v-for="(item, index) in authorityUnitArr"
:key="index"
:value="item"
:label="item.unitName"
></el-option>
<el-select v-model="addFrom.unitName" filterable value-key="unitName" placeholder="全部"
:disabled="isEdit">
<el-option v-for="(item, index) in authorityUnitArr" :key="index" :value="item"
:label="item.unitName"></el-option>
</el-select>
<!-- <el-button
type="text"
......@@ -47,12 +27,8 @@
</el-form-item>
<el-form-item label="角色:" prop="sysRoleId">
<el-select v-model="addFrom.sysRoleId" clearable placeholder="请选择">
<el-option
v-for="item in jueseList"
:label="item.label"
:value="item.value"
:key="item.key"
></el-option>
<el-option v-for="item in jueseList" :label="item.label" :value="item.value"
:key="item.key"></el-option>
</el-select>
</el-form-item>
<el-form-item label="手机号:">
......@@ -127,6 +103,7 @@ export default {
watch: {
//手机号
'addFrom.phoneNum': function (curVal, oldVal) {
console.log(curVal);
if (!curVal) {
this.addFrom.phoneNum = ''
return false
......@@ -205,12 +182,14 @@ export default {
// console.log('this.addFrom', JSON.stringify(this.upDataUser))
if (JSON.stringify(this.upDataUser) != '{}') {
// this.addFrom = JSON.parse(JSON.stringify(this.upDataUser))
console.log('addform', this.addFrom);
this.addFrom.cnName = JSON.parse(JSON.stringify(this.upDataUser.cnName))
this.addFrom.dingId = JSON.parse(JSON.stringify(this.upDataUser.dingId))
} else {
if (this.zhuangtai == 'update') {
this.userFrom.password2 = ''
this.addFrom = JSON.parse(JSON.stringify(this.userFrom))
console.log(this.addFrom)
// console.log(this.addFrom)
}
}
......@@ -298,10 +277,12 @@ export default {
},
//获取dingId
getding(e) {
console.log(123);
let params = {
phoneNum: this.addFrom.phoneNum,
}
this.$axios.findDingAndCasByPhone(params).then((res) => {
console.log(res);
this.addFrom.casId = res.data.data.casId
this.addFrom.dingId = res.data.data.dingId
})
......
src/views/system/jurisdiction.vue
浏览文件 @ 17a62262
......@@ -23,12 +23,8 @@
</el-form-item>-->
<el-form-item label="状态:">
<el-select v-model="formData.sysUserStatus" clearable placeholder="全部">
<el-option
v-for="item in options"
:key="item.value"
:label="item.label"
:value="item.value"
></el-option>
<el-option v-for="item in options" :key="item.value" :label="item.label"
:value="item.value"></el-option>
</el-select>
</el-form-item>
<el-form-item class="button_wrap">
......@@ -44,17 +40,9 @@
</div>
<!-- 表格 -->
<div class="content">
<el-table
:data="tableData"
stripe
style="width: 100%"
height="100%"
class="template_table"
@sort-change="sortChange"
:header-cell-style="{ 'text-align': 'left' }"
:cell-style="{ 'text-align': 'left' }"
v-loading="loading"
>
<el-table :data="tableData" stripe style="width: 100%" height="100%" class="template_table"
@sort-change="sortChange" :header-cell-style="{ 'text-align': 'left' }"
:cell-style="{ 'text-align': 'left' }" v-loading="loading">
<el-table-column type="index" label="序号" width="80"></el-table-column>
<el-table-column prop="username" label="账号"></el-table-column>
<el-table-column prop="cnName" label="姓名"></el-table-column>
......@@ -88,82 +76,47 @@
</el-table-column>
<el-table-column label="操作" width="200">
<template slot-scope="scope">
<el-button
type="text"
v-if="scope.row.sysRoleId !== 1"
@click="handleEdit(scope.row)"
>编辑</el-button>
<el-popconfirm
class="maring_left20"
title="确定要启用该用户吗？"
@confirm="upEdit(scope.row)"
v-if="scope.row.sysRoleId !== 1 && scope.row.sysUserStatus == 2"
>
<el-button type="text" v-if="scope.row.sysRoleId !== 1"
@click="handleEdit(scope.row)">编辑</el-button>
<el-popconfirm class="maring_left20" title="确定要启用该用户吗？" @confirm="upEdit(scope.row)"
v-if="scope.row.sysRoleId !== 1 && scope.row.sysUserStatus == 2">
<el-button slot="reference" type="text">授权</el-button>
</el-popconfirm>
<el-popconfirm
class="maring_left20"
title="确定要取消授权吗？"
cancel-button-text="不用了"
icon-color="red"
@confirm="upEdit(scope.row)"
v-if="scope.row.sysRoleId !== 1 && scope.row.sysUserStatus == 1"
>
<el-popconfirm class="maring_left20" title="确定要取消授权吗？" cancel-button-text="不用了"
icon-color="red" @confirm="upEdit(scope.row)"
v-if="scope.row.sysRoleId !== 1 && scope.row.sysUserStatus == 1">
<el-button slot="reference" type="text">取消授权</el-button>
</el-popconfirm>
<el-button type="text" v-if="!scope.row.operatingDate" @click="handleDel(scope.row)">删除</el-button>
<el-button type="text" v-if="!scope.row.operatingDate"
@click="handleDel(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div class="ty_pagination">
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]"
:page-size="10"
<el-pagination @size-change="handleSizeChange" @current-change="handleCurrentChange"
:page-sizes="[10, 20, 30, 40]" :page-size="10"
layout="total, sizes, prev, pager, next, jumper"
:total="total"
></el-pagination>
:total="total"></el-pagination>
</div>
</div>
<addForm
:dialogVisible.sync="dialogVisible"
:userFrom="userFrom"
:zhuangtai="zhuangtai"
:upDataUser="upDataUser"
:isEdit="isEdit"
v-if="dialogVisible"
@showLists="showLists"
@clearData="clearData"
></addForm>
<batch-add-dialog
:changeFlags="2"
:batchAddFlag.sync="batchAddFlag"
:selectPerson="selectPerson"
@addBatchPeople="addBatchPeople"
@sureChange="sureChange"
@cancleFlag="cancleFlag"
@getPerson="getPerson"
></batch-add-dialog>
<addForm :dialogVisible.sync="dialogVisible" :userFrom="userFrom" :zhuangtai="zhuangtai"
:upDataUser="upDataUser" :isEdit="isEdit" v-if="dialogVisible" @showLists="showLists"
@clearData="clearData"></addForm>
<batch-add-dialog :changeFlags="2" :batchAddFlag.sync="batchAddFlag"
:selectPerson="selectPerson" @addBatchPeople="addBatchPeople"
@sureChange="sureChange" @cancleFlag="cancleFlag"
@getPerson="getPerson"></batch-add-dialog>
<!-- 权限专用单位管理 -->
<el-dialog
title="单位授权"
:visible.sync="dialogFormVisible"
:close-on-click-modal="false"
:before-close="handleClose"
class="unitAutoDialog"
>
<el-dialog title="单位授权" :visible.sync="dialogFormVisible" :close-on-click-modal="false"
:before-close="handleClose" class="unitAutoDialog">
<div slot="title" class="dialog-header">
<div>权限专用单位管理</div>
<el-button type="primary" class="btn" @click="addAuthorityUnit()">新增专用单位管理</el-button>
</div>
<div v-if="authorityUnitArr.length>0">
<div
class="unit"
v-for="(item,index) in authorityUnitArr"
:key="authorityUnitArr.length + index"
>
<div class="unit" v-for="(item,index) in authorityUnitArr"
:key="authorityUnitArr.length + index">
<div class="tips_num">权限专用单位：</div>
<el-input v-model="item.unitName" />
<!-- <div>{{item.unitName}}</div> -->
......@@ -177,13 +130,8 @@
</div>
<!-- 内层dialog -->
<el-dialog
width="30%"
title="确认删除"
:visible.sync="delVisible"
append-to-body
:before-close="delHandleClose"
>
<el-dialog width="30%" title="确认删除" :visible.sync="delVisible" append-to-body
:before-close="delHandleClose">
<div>是否删除单位：{{delUnitObj.unitName}}？</div>
<div slot="footer" class="dialog-footer">
<el-button @click="delHandleClose()">取 消</el-button>
......@@ -192,13 +140,8 @@
</el-dialog>
</el-dialog>
<!-- 取消授权 -->
<el-dialog
title="删除账号"
:visible.sync="delUserVisible"
:close-on-click-modal="false"
:before-close="delUserCloseFnc"
class="delUserDialog"
>
<el-dialog title="删除账号" :visible.sync="delUserVisible" :close-on-click-modal="false"
:before-close="delUserCloseFnc" class="delUserDialog">
<div>操作员账号:{{delUser.username}}</div>
<div>确认删除？</div>
<div class="tips">注：未使用过的账号，支持删除</div>
......@@ -274,8 +217,9 @@ export default {
this.batchAddFlag = false
this.dialogVisible = true
this.$set(this.upDataUser, 'cnName', val.employeeName)
this.$set(this.upDataUser, 'dingId', val.accountId)
// this.upDataUser.cnName = val.employeeName
console.log(this.userFrom)
// console.log(this.userFrom)
},
//二次确认删除权限单位
confirmDelUnit() {
......@@ -458,7 +402,7 @@ export default {
this.batchAddFlag = false
this.dialogVisible = true
},
sureChange() {},
sureChange() { },
showLists() {
this.batchAddFlag = true
this.dialogVisible = false
......@@ -565,13 +509,13 @@ export default {
height: 28px;
display: flex;
align-items: center;
background-image: url('../../assets/img/del.png');
background-image: url("../../assets/img/del.png");
background-size: 100% 100%;
background-repeat: no-repeat;
cursor: pointer;
}
.del:hover {
background-image: url('../../assets/img/del_red.png');
background-image: url("../../assets/img/del_red.png");
}
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论