更新
This commit is contained in:
@@ -75,7 +75,14 @@ export default {
|
|||||||
if (type === 'Array') {
|
if (type === 'Array') {
|
||||||
return item => {
|
return item => {
|
||||||
return this.config.labelKey.reduce((prev, cur) => {
|
return this.config.labelKey.reduce((prev, cur) => {
|
||||||
prev += /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur]
|
let type = this.$utils.typeJudgment(cur)
|
||||||
|
let _function =
|
||||||
|
type != 'Function'
|
||||||
|
? item => {
|
||||||
|
return /^[^0-9a-zA-Z]/.test(cur) ? cur : item[cur]
|
||||||
|
}
|
||||||
|
: cur
|
||||||
|
prev += _function(item)
|
||||||
return prev
|
return prev
|
||||||
}, '')
|
}, '')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,7 +207,7 @@
|
|||||||
</el-row>
|
</el-row>
|
||||||
<div :span="24" style="margin-top: 50px; text-align: center; width: 100%">
|
<div :span="24" style="margin-top: 50px; text-align: center; width: 100%">
|
||||||
<el-divider style="width: 100%"></el-divider>
|
<el-divider style="width: 100%"></el-divider>
|
||||||
<div style="display: flex; justify-content: end; width: 90%; margin: 0 auto">
|
<div style="display: flex; justify-content: flex-end; width: 90%; margin: 0 auto">
|
||||||
<el-button @click="close" size="mini">取消</el-button>
|
<el-button @click="close" size="mini">取消</el-button>
|
||||||
<el-button size="mini" type="primary" :disabled="!setWait" @click="addList">确认提交</el-button>
|
<el-button size="mini" type="primary" :disabled="!setWait" @click="addList">确认提交</el-button>
|
||||||
</div>
|
</div>
|
||||||
@@ -654,7 +654,7 @@ export default {
|
|||||||
/* flex: 1; */
|
/* flex: 1; */
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: end;
|
justify-content: flex-end;
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -179,10 +179,8 @@
|
|||||||
</div>
|
</div>
|
||||||
</template>
|
</template>
|
||||||
<script>
|
<script>
|
||||||
import { imgCompress } from '@/utils'
|
|
||||||
import internalCompanyApi from '@/api/user/internalCompany'
|
import internalCompanyApi from '@/api/user/internalCompany'
|
||||||
import utils from '@/utils/encode'
|
|
||||||
const JSESSIONID = utils.uuid()
|
|
||||||
export default {
|
export default {
|
||||||
filters: {},
|
filters: {},
|
||||||
props: {
|
props: {
|
||||||
@@ -194,7 +192,6 @@ export default {
|
|||||||
data() {
|
data() {
|
||||||
return {
|
return {
|
||||||
tableHeight: document.documentElement.clientHeight - 470 - 55,
|
tableHeight: document.documentElement.clientHeight - 470 - 55,
|
||||||
imgCompress,
|
|
||||||
companyList: [],
|
companyList: [],
|
||||||
roleList: [],
|
roleList: [],
|
||||||
roleTypeList: [],
|
roleTypeList: [],
|
||||||
|
|||||||
Reference in New Issue
Block a user