eslint 修复
This commit is contained in:
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
import { getAction, deleteAction, postAction, httpAction } from '@/api/manage'
|
import { getAction, deleteAction,putAction, postAction, httpAction } from '@/api/manage'
|
||||||
import Vue from 'vue'
|
import Vue from 'vue'
|
||||||
import {UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
|
import {UI_CACHE_DB_DICT_DATA } from '@/store/mutation-types'
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -171,7 +171,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
|
|||||||
if(avatar && avatar.startsWith(subStr)){
|
if(avatar && avatar.startsWith(subStr)){
|
||||||
return avatar
|
return avatar
|
||||||
}else{
|
}else{
|
||||||
if(avatar && avatar.length>0 && avatar.indexOf('[')==-1){
|
if(avatar && avatar.length>0 && avatar.indexOf('[')==-1){
|
||||||
return window._CONFIG['staticDomainURL'] + '/' + avatar
|
return window._CONFIG['staticDomainURL'] + '/' + avatar
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
|
import {ajaxGetDictItems,getDictItemsFromCache} from '@/api/api'
|
||||||
import {getAction} from '@/api/manage'
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取字典数组
|
* 获取字典数组
|
||||||
@@ -137,7 +136,6 @@ export async function getDictItems(dictCode, params) {
|
|||||||
console.log('------- 从DB中获取到了字典-------dictCode : ', dictCode, res)
|
console.log('------- 从DB中获取到了字典-------dictCode : ', dictCode, res)
|
||||||
return Promise.resolve(res)
|
return Promise.resolve(res)
|
||||||
} else {
|
} else {
|
||||||
console.error('getDictItems error: : ', res)
|
|
||||||
return Promise.resolve([])
|
return Promise.resolve([])
|
||||||
}
|
}
|
||||||
}).catch((res) => {
|
}).catch((res) => {
|
||||||
|
|||||||
@@ -87,7 +87,6 @@
|
|||||||
computed: {
|
computed: {
|
||||||
//透传给下级组件的事件,需要排除本组件使用的change事件
|
//透传给下级组件的事件,需要排除本组件使用的change事件
|
||||||
childListeners() {
|
childListeners() {
|
||||||
const vm = this
|
|
||||||
let result = Object.assign({},
|
let result = Object.assign({},
|
||||||
this.$listeners,
|
this.$listeners,
|
||||||
)
|
)
|
||||||
@@ -97,7 +96,7 @@
|
|||||||
},
|
},
|
||||||
watch:{
|
watch:{
|
||||||
value: {
|
value: {
|
||||||
handler(val,oldValue) {
|
handler(val) {
|
||||||
if (val instanceof Array) {
|
if (val instanceof Array) {
|
||||||
this.initFileList(val.join(','))
|
this.initFileList(val.join(','))
|
||||||
} else {
|
} else {
|
||||||
@@ -207,7 +206,7 @@
|
|||||||
}
|
}
|
||||||
this.$emit('change', path)
|
this.$emit('change', path)
|
||||||
},
|
},
|
||||||
handleDelete(file){
|
handleDelete(){
|
||||||
//如有需要新增 删除逻辑
|
//如有需要新增 删除逻辑
|
||||||
},
|
},
|
||||||
handleCancel() {
|
handleCancel() {
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
class="j-table-force-nowrap"
|
class="j-table-force-nowrap"
|
||||||
@change="handleTableChange">
|
@change="handleTableChange">
|
||||||
|
|
||||||
<template slot="htmlSlot" slot-scope="text,record">
|
<template slot="htmlSlot" slot-scope="text">
|
||||||
<div class="primary-color" @click="toAttendance">{{ text }}</div>
|
<div class="primary-color" @click="toAttendance">{{ text }}</div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -201,13 +201,13 @@ export default {
|
|||||||
/*
|
/*
|
||||||
* 上传会议文件
|
* 上传会议文件
|
||||||
* */
|
* */
|
||||||
handleUploadFile(record) {
|
handleUploadFile() {
|
||||||
this.$refs.modalForm.add({})
|
this.$refs.modalForm.add({})
|
||||||
},
|
},
|
||||||
/*
|
/*
|
||||||
* 报名信息
|
* 报名信息
|
||||||
* */
|
* */
|
||||||
handleSignup(record) {
|
handleSignup() {
|
||||||
this.$router.push({
|
this.$router.push({
|
||||||
path:'/incomePayments/meetManage/SignUpInfoList'
|
path:'/incomePayments/meetManage/SignUpInfoList'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
|
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="手机号" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['paymentMethod']" @change="">
|
<a-radio-group v-decorator="['paymentMethod']">
|
||||||
<a-radio :value="1">嘉宾</a-radio>
|
<a-radio :value="1">嘉宾</a-radio>
|
||||||
<a-radio :value="2">参会人</a-radio>
|
<a-radio :value="2">参会人</a-radio>
|
||||||
<a-radio :value="3">内部企业</a-radio>
|
<a-radio :value="3">内部企业</a-radio>
|
||||||
@@ -51,7 +51,7 @@
|
|||||||
|
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="嘉宾类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="嘉宾类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']" >
|
||||||
<a-radio :value="1">VIP</a-radio>
|
<a-radio :value="1">VIP</a-radio>
|
||||||
<a-radio :value="2">演讲嘉宾</a-radio>
|
<a-radio :value="2">演讲嘉宾</a-radio>
|
||||||
<a-radio :value="3">特邀嘉宾</a-radio>
|
<a-radio :value="3">特邀嘉宾</a-radio>
|
||||||
@@ -105,7 +105,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="是否用餐" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="是否用餐" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']">
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
@@ -113,7 +113,7 @@
|
|||||||
</a-col>
|
</a-col>
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="是否回民" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="是否回民" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']" >
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
@@ -130,7 +130,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="是否需要接站" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="是否需要接站" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']" >
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
@@ -164,7 +164,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="是否需要送站" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="是否需要送站" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']" >
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
@@ -224,7 +224,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="是否住酒店" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="是否住酒店" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']" >
|
||||||
<a-radio :value="1">是</a-radio>
|
<a-radio :value="1">是</a-radio>
|
||||||
<a-radio :value="0">否</a-radio>
|
<a-radio :value="0">否</a-radio>
|
||||||
</a-radio-group>
|
</a-radio-group>
|
||||||
@@ -275,7 +275,7 @@
|
|||||||
<a-row :gutter="24">
|
<a-row :gutter="24">
|
||||||
<a-col :xl="6" :md="8" :sm="24">
|
<a-col :xl="6" :md="8" :sm="24">
|
||||||
<a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
<a-form-item label="缴费方式" :labelCol="labelCol" :wrapperCol="wrapperCol">
|
||||||
<a-radio-group v-decorator="['guestType']" @change="">
|
<a-radio-group v-decorator="['guestType']">
|
||||||
<a-radio :value="1">汇款</a-radio>
|
<a-radio :value="1">汇款</a-radio>
|
||||||
<a-radio :value="2">现场</a-radio>
|
<a-radio :value="2">现场</a-radio>
|
||||||
<a-radio :value="2">打包</a-radio>
|
<a-radio :value="2">打包</a-radio>
|
||||||
|
|||||||
@@ -47,9 +47,6 @@
|
|||||||
class="j-table-force-nowrap"
|
class="j-table-force-nowrap"
|
||||||
@change="handleTableChange">
|
@change="handleTableChange">
|
||||||
|
|
||||||
<template slot="htmlSlot" slot-scope="text,record">
|
|
||||||
<div class="primary-color">参会单位</div>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<template slot="text" slot-scope="text">
|
<template slot="text" slot-scope="text">
|
||||||
<j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
|
<j-ellipsis v-if="text" :value="text" :length="20"></j-ellipsis>
|
||||||
|
|||||||
@@ -100,7 +100,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
callback(key) {
|
callback() {
|
||||||
//console.log(key)
|
//console.log(key)
|
||||||
},
|
},
|
||||||
loadData() {
|
loadData() {
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { getAction, putAction ,postAction} from '@api/manage'
|
import { getAction ,postAction} from '@api/manage'
|
||||||
import JEllipsis from '@comp/jero/JEllipsis'
|
import JEllipsis from '@comp/jero/JEllipsis'
|
||||||
export default {
|
export default {
|
||||||
name: 'DictDeleteList',
|
name: 'DictDeleteList',
|
||||||
|
|||||||
@@ -127,7 +127,7 @@
|
|||||||
}
|
}
|
||||||
this.loading = true
|
this.loading = true
|
||||||
let params = this.getQueryParams()
|
let params = this.getQueryParams()
|
||||||
return new Promise((resolve) => {
|
return new Promise(() => {
|
||||||
getAction(this.url.list,params).then(res=>{
|
getAction(this.url.list,params).then(res=>{
|
||||||
if(res.success){
|
if(res.success){
|
||||||
let result = res.result
|
let result = res.result
|
||||||
@@ -332,5 +332,5 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
@import '~@assets/less/common.less'
|
@import '~@assets/less/common.less';
|
||||||
</style>
|
</style>
|
||||||
@@ -157,7 +157,7 @@
|
|||||||
delete: '/sys/checkRule/delete',
|
delete: '/sys/checkRule/delete',
|
||||||
deleteBatch: '/sys/checkRule/deleteBatch',
|
deleteBatch: '/sys/checkRule/deleteBatch',
|
||||||
exportXlsUrl: 'sys/checkRule/exportXls',
|
exportXlsUrl: 'sys/checkRule/exportXls',
|
||||||
importExcelUrl: 'sys/checkRule/importExcel',
|
importExcelUrl: 'sys/checkRule/importExcel'
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -51,7 +51,6 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { filterObj } from '@/utils/util'
|
|
||||||
import { getAction,putAction } from '@/api/manage'
|
import { getAction,putAction } from '@/api/manage'
|
||||||
import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
|
import ShowAnnouncement from '@/components/tools/ShowAnnouncement'
|
||||||
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
import {JeroListMixin} from '@/mixins/JeroListMixin'
|
||||||
@@ -126,8 +125,7 @@
|
|||||||
dataIndex: 'action',
|
dataIndex: 'action',
|
||||||
align:'center',
|
align:'center',
|
||||||
scopedSlots: { customRender: 'action' },
|
scopedSlots: { customRender: 'action' },
|
||||||
}],
|
}], url: {
|
||||||
url: {
|
|
||||||
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
|
list: '/sys/sysAnnouncementSend/getMyAnnouncementSend',
|
||||||
editCementSend:'sys/sysAnnouncementSend/editByAnntIdAndUserId',
|
editCementSend:'sys/sysAnnouncementSend/editByAnntIdAndUserId',
|
||||||
readAllMsg:'sys/sysAnnouncementSend/readAll',
|
readAllMsg:'sys/sysAnnouncementSend/readAll',
|
||||||
|
|||||||
@@ -125,5 +125,5 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
<style scoped>
|
<style scoped>
|
||||||
@import '~@assets/less/common.less'
|
@import '~@assets/less/common.less';
|
||||||
</style>
|
</style>
|
||||||
@@ -57,14 +57,14 @@
|
|||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'
|
import {queryTreeListForDeptRole,queryDeptRolePermission,saveDeptRolePermission} from '@/api/api'
|
||||||
import RoleDataruleModal from './RoleDataruleModal.vue'
|
// import RoleDataruleModal from './RoleDataruleModal.vue'
|
||||||
import DeptRoleDataruleModal from './DeptRoleDataruleModal'
|
import DeptRoleDataruleModal from './DeptRoleDataruleModal'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'DeptRoleAuthModal',
|
name: 'DeptRoleAuthModal',
|
||||||
components:{
|
components:{
|
||||||
DeptRoleDataruleModal,
|
DeptRoleDataruleModal,
|
||||||
RoleDataruleModal
|
// RoleDataruleModal
|
||||||
},
|
},
|
||||||
data(){
|
data(){
|
||||||
return {
|
return {
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
<a-card :style="{ marginTop: '12px',height:'auto' }">
|
<a-card :style="{ marginTop: '12px',height:'auto' }">
|
||||||
<a-checkbox-group @change="designNameChange" v-model="designNameValue" style="width: 100%">
|
<a-checkbox-group @change="designNameChange" v-model="designNameValue" style="width: 100%">
|
||||||
<a-row>
|
<a-row>
|
||||||
<template v-for="(des) in designNameOption">
|
<template v-for="(des,key) in designNameOption">
|
||||||
<a-col :span="6">
|
<a-col :span="6" :key="key">
|
||||||
<a-checkbox :value="des.value">{{ des.text }}</a-checkbox>
|
<a-checkbox :value="des.value">{{ des.text }}</a-checkbox>
|
||||||
</a-col>
|
</a-col>
|
||||||
</template>
|
</template>
|
||||||
|
|||||||
@@ -46,7 +46,6 @@
|
|||||||
|
|
||||||
import { httpAction, getAction } from '@/api/manage'
|
import { httpAction, getAction } from '@/api/manage'
|
||||||
import pick from 'lodash.pick'
|
import pick from 'lodash.pick'
|
||||||
import { validateDuplicateValue } from '@/utils/util'
|
|
||||||
import JFormContainer from '@/components/jero/JFormContainer'
|
import JFormContainer from '@/components/jero/JFormContainer'
|
||||||
import JDate from '@/components/jero/JDate'
|
import JDate from '@/components/jero/JDate'
|
||||||
import JDictSelectTag from '@/components/dict/JDictSelectTag'
|
import JDictSelectTag from '@/components/dict/JDictSelectTag'
|
||||||
@@ -56,7 +55,6 @@
|
|||||||
components: {
|
components: {
|
||||||
JFormContainer,
|
JFormContainer,
|
||||||
JDate,
|
JDate,
|
||||||
JDictSelectTag,
|
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
formData: {
|
formData: {
|
||||||
|
|||||||
@@ -169,8 +169,7 @@ import {ACCESS_TOKEN} from '@/store/mutation-types'
|
|||||||
import {getAction} from '@/api/manage'
|
import {getAction} from '@/api/manage'
|
||||||
import {addUser, editUser, queryUserRole, queryall,queryallRoles, queryDepartTreeList} from '@/api/api'
|
import {addUser, editUser, queryUserRole, queryall,queryallRoles, queryDepartTreeList} from '@/api/api'
|
||||||
import {disabledAuthFilter} from '@/utils/authFilter'
|
import {disabledAuthFilter} from '@/utils/authFilter'
|
||||||
import {duplicateCheck} from '@/api/api'
|
import { passwordReg} from '@/utils/validate'
|
||||||
import { isEmail, passwordReg} from '@/utils/validate'
|
|
||||||
import {checkPhone,checkEmail,checkUserName} from '@/utils/validateOnly'
|
import {checkPhone,checkEmail,checkUserName} from '@/utils/validateOnly'
|
||||||
import { getRSAPublicKey } from '@/api/login.js'
|
import { getRSAPublicKey } from '@/api/login.js'
|
||||||
import {encrypt} from '@/utils/util'
|
import {encrypt} from '@/utils/util'
|
||||||
|
|||||||
@@ -161,7 +161,7 @@
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
var params = {
|
const params = {
|
||||||
username: value,
|
username: value,
|
||||||
}
|
}
|
||||||
checkOnlyUser(params).then((res) => {
|
checkOnlyUser(params).then((res) => {
|
||||||
|
|||||||
@@ -42,7 +42,7 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
import { putAction,getAction } from '@/api/manage'
|
import {getAction } from '@/api/manage'
|
||||||
export default {
|
export default {
|
||||||
name: 'Step3',
|
name: 'Step3',
|
||||||
// components: {
|
// components: {
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
setInterval(that.countDown, 1000)
|
setInterval(that.countDown, 1000)
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
time: function (newVal,oldVal) {
|
time: function (newVal) {
|
||||||
if (newVal == 0) {
|
if (newVal == 0) {
|
||||||
var params = {
|
var params = {
|
||||||
username: this.userList.username
|
username: this.userList.username
|
||||||
|
|||||||
@@ -92,8 +92,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
import {mixinDevice} from '@/utils/mixin.js'
|
import {mixinDevice} from '@/utils/mixin.js'
|
||||||
import {getSmsCaptcha} from '@/api/login'
|
import { postAction} from '@/api/manage'
|
||||||
import {getAction, postAction} from '@/api/manage'
|
|
||||||
import {checkOnlyUser} from '@/api/api'
|
import {checkOnlyUser} from '@/api/api'
|
||||||
|
|
||||||
const levelNames = {
|
const levelNames = {
|
||||||
|
|||||||
Reference in New Issue
Block a user