新增添加字段修改为新增
This commit is contained in:
@@ -33,6 +33,7 @@
|
|||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
import { ACCESS_TOKEN } from '@/store/mutation-types'
|
||||||
import { getFileAccessHttpUrl } from '@/api/manage'
|
import { getFileAccessHttpUrl } from '@/api/manage'
|
||||||
|
// eslint-disable-next-line
|
||||||
const Base64 = require('js-base64').Base64
|
const Base64 = require('js-base64').Base64
|
||||||
|
|
||||||
const uidGenerator=()=>{
|
const uidGenerator=()=>{
|
||||||
|
|||||||
@@ -301,7 +301,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {getUserInfo, getMeetInfoById,getAllWorkProjects} from '@api/inconmeMeetingApi'
|
import {getUserInfo, getMeetInfoById,getAllWorkProjects} from '@api/incomeMeetingApi'
|
||||||
import {isRepeat} from '@/utils/util'
|
import {isRepeat} from '@/utils/util'
|
||||||
import {httpAction} from '@api/manage'
|
import {httpAction} from '@api/manage'
|
||||||
import JDictSelectTag from '@comp/dict/JDictSelectTag'
|
import JDictSelectTag from '@comp/dict/JDictSelectTag'
|
||||||
@@ -497,6 +497,7 @@ export default {
|
|||||||
hotelContactsPhone: ''
|
hotelContactsPhone: ''
|
||||||
}]
|
}]
|
||||||
} else {
|
} else {
|
||||||
|
// eslint-disable-next-line
|
||||||
if (this.model.hasOwnProperty('hotelContactsList')) {
|
if (this.model.hasOwnProperty('hotelContactsList')) {
|
||||||
delete this.model.hotelContactsList
|
delete this.model.hotelContactsList
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,7 +32,7 @@
|
|||||||
|
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
||||||
<a-button type="primary" icon="download" @click="handleExportXls('混淆表')">导出</a-button>
|
<a-button type="primary" icon="download" @click="handleExportXls('混淆表')">导出</a-button>
|
||||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||||
<a-button type="primary" icon="import">导入</a-button>
|
<a-button type="primary" icon="import">导入</a-button>
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<a-card :bordered="false" style="padding: 12px 0;">
|
<a-card :bordered="false" style="padding: 12px 0;">
|
||||||
<!-- 按钮操作区域 -->
|
<!-- 按钮操作区域 -->
|
||||||
<a-row style="margin-left: 14px" class="table-operator">
|
<a-row style="margin-left: 14px" class="table-operator">
|
||||||
<a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
|
<a-button @click="handleAdd(1)" type="primary">新增</a-button>
|
||||||
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
|
<a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
|
||||||
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
|
<a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
|
||||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||||
@@ -170,9 +170,9 @@ import DepartModal from './modules/DepartModal'
|
|||||||
import DeptUserInfo from './modules/DeptUserInfo'
|
import DeptUserInfo from './modules/DeptUserInfo'
|
||||||
import pick from 'lodash.pick'
|
import pick from 'lodash.pick'
|
||||||
import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
|
import {queryDepartTreeList, searchByKeywords, deleteByDepartId} from '@/api/api'
|
||||||
import {httpAction, deleteAction} from '@/api/manage'
|
import {httpAction,getAction} from '@/api/manage'
|
||||||
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
||||||
import DepartAuthModal from './modules/DepartAuthModal'
|
// import DepartAuthModal from './modules/DepartAuthModal'
|
||||||
import {checkDepartName} from '@/utils/validateOnly'
|
import {checkDepartName} from '@/utils/validateOnly'
|
||||||
// 表头
|
// 表头
|
||||||
const columns = [
|
const columns = [
|
||||||
@@ -217,7 +217,7 @@ export default {
|
|||||||
name: 'DepartList',
|
name: 'DepartList',
|
||||||
mixins: [JeroListMixin],
|
mixins: [JeroListMixin],
|
||||||
components: {
|
components: {
|
||||||
DepartAuthModal,
|
// DepartAuthModal,
|
||||||
DepartModal,
|
DepartModal,
|
||||||
DeptUserInfo
|
DeptUserInfo
|
||||||
},
|
},
|
||||||
@@ -600,11 +600,11 @@ export default {
|
|||||||
//this.checkedKeys = this.defaultCheckedKeys
|
//this.checkedKeys = this.defaultCheckedKeys
|
||||||
this.checkedKeys = []
|
this.checkedKeys = []
|
||||||
},
|
},
|
||||||
callback(val){
|
callback(){
|
||||||
// tab页切换为基本信息时候 清除表单验证
|
// tab页切换为基本信息时候 清除表单验证
|
||||||
console.log(this.form)
|
console.log(this.form)
|
||||||
if(val === '1' && this.form){
|
// if(val === '1' && this.form){
|
||||||
}
|
// }
|
||||||
// 可能后期会切换回显之前的数据
|
// 可能后期会切换回显之前的数据
|
||||||
},
|
},
|
||||||
// switchCheckStrictly (v) {
|
// switchCheckStrictly (v) {
|
||||||
|
|||||||
@@ -25,7 +25,7 @@
|
|||||||
</a-form>
|
</a-form>
|
||||||
|
|
||||||
<div class="table-operator" style="border-top: 5px">
|
<div class="table-operator" style="border-top: 5px">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:add'">添加</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:dict:add'">新增</a-button>
|
||||||
<a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:export'">导出</a-button>
|
<a-button type="primary" icon="download" @click="handleExportXls('字典信息')" v-has="'sys:dict:export'">导出</a-button>
|
||||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" v-has="'sys:dict:import'" @change="handleImportExcel">
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" v-has="'sys:dict:import'" @change="handleImportExcel">
|
||||||
<a-button type="primary" icon="import">导入</a-button>
|
<a-button type="primary" icon="import">导入</a-button>
|
||||||
@@ -70,7 +70,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { filterObj } from '@/utils/util'
|
// import { filterObj } from '@/utils/util'
|
||||||
import { JeroListMixin } from '@/mixins/JeroListMixin'
|
import { JeroListMixin } from '@/mixins/JeroListMixin'
|
||||||
import DictModal from './modules/DictModal'
|
import DictModal from './modules/DictModal'
|
||||||
import DictItemList from './DictItemList'
|
import DictItemList from './DictItemList'
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
|
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator">
|
<div class="table-operator">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
|
||||||
<a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
|
<a-button type="primary" icon="download" @click="handleExportXls('定时任务信息')">导出</a-button>
|
||||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl"
|
||||||
@change="handleImportExcel">
|
@change="handleImportExcel">
|
||||||
|
|||||||
@@ -21,7 +21,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator" style="margin: 5px 0 10px 2px">
|
<div class="table-operator" style="margin: 5px 0 10px 2px">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:role:add'">添加角色</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'sys:role:add'">新增</a-button>
|
||||||
<a-button @click="handleAddLowerLevel" type="primary" icon="plus">添加下级</a-button>
|
<a-button @click="handleAddLowerLevel" type="primary" icon="plus">添加下级</a-button>
|
||||||
<a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
|
<a-button @click="batchDel" type="danger" icon="delete">批量删除</a-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -58,9 +58,8 @@
|
|||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
||||||
import {postAction, getAction} from '@/api/manage'
|
import {postAction} from '@/api/manage'
|
||||||
import RoleModal from './modules/RoleModal'
|
import RoleModal from './modules/RoleModal'
|
||||||
import {filterObj} from '@/utils/util'
|
|
||||||
import UserRoleModal from './modules/UserRoleModal'
|
import UserRoleModal from './modules/UserRoleModal'
|
||||||
import JEllipsis from '@comp/jero/JEllipsis'
|
import JEllipsis from '@comp/jero/JEllipsis'
|
||||||
import moment from 'moment'
|
import moment from 'moment'
|
||||||
@@ -73,7 +72,6 @@ export default {
|
|||||||
UserRoleModal,
|
UserRoleModal,
|
||||||
RoleModal,
|
RoleModal,
|
||||||
JEllipsis,
|
JEllipsis,
|
||||||
moment
|
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
@@ -145,6 +143,7 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
|
moment,
|
||||||
selectOK(data) {
|
selectOK(data) {
|
||||||
let params = {}
|
let params = {}
|
||||||
params.roleId = this.currentRoleId
|
params.roleId = this.currentRoleId
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
|
|
||||||
<!-- 操作按钮区域 -->
|
<!-- 操作按钮区域 -->
|
||||||
<div class="table-operator" style="border-top: 5px">
|
<div class="table-operator" style="border-top: 5px">
|
||||||
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">添加用户</a-button>
|
<a-button @click="handleAdd" type="primary" icon="plus" v-has="'user:add'">新增</a-button>
|
||||||
<a-button @click="downTemplate('用户导入模板')" type="primary" icon="download">下载模板</a-button>
|
<a-button @click="downTemplate('用户导入模板')" type="primary" icon="download">下载模板</a-button>
|
||||||
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
<a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
|
||||||
<a-button type="primary" icon="import">导入</a-button>
|
<a-button type="primary" icon="import">导入</a-button>
|
||||||
@@ -103,7 +103,7 @@ import UserModal from './modules/UserModal'
|
|||||||
import {getAction, getFileAccessHttpUrl} from '@/api/manage'
|
import {getAction, getFileAccessHttpUrl} from '@/api/manage'
|
||||||
import '@/assets/less/TableExpand.less'
|
import '@/assets/less/TableExpand.less'
|
||||||
import { JeroListMixin } from '@/mixins/JeroListMixin'
|
import { JeroListMixin } from '@/mixins/JeroListMixin'
|
||||||
import JInput from '@/components/jero/JInput'
|
// import JInput from '@/components/jero/JInput'
|
||||||
import JEllipsis from '@comp/jero/JEllipsis'
|
import JEllipsis from '@comp/jero/JEllipsis'
|
||||||
import {queryDepartTreeList, resetUserPassword} from '@api/api'
|
import {queryDepartTreeList, resetUserPassword} from '@api/api'
|
||||||
|
|
||||||
@@ -113,7 +113,7 @@ export default {
|
|||||||
mixins: [JeroListMixin],
|
mixins: [JeroListMixin],
|
||||||
components: {
|
components: {
|
||||||
UserModal,
|
UserModal,
|
||||||
JInput,
|
// JInput,
|
||||||
JEllipsis
|
JEllipsis
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
|
|||||||
Reference in New Issue
Block a user