Browse Source

接口返回字段参数的命名统一为驼峰

master
z_yu 3 years ago
parent
commit
b3361e4a11
  1. 16
      src/views/archivesConfig/commonFields/index.vue
  2. 42
      src/views/archivesConfig/commonFields/module/form.vue
  3. 16
      src/views/archivesConfig/dict/dictDetail.vue
  4. 33
      src/views/archivesConfig/dict/index.vue

16
src/views/archivesConfig/commonFields/index.vue

@ -10,19 +10,19 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 290px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" style="width: 100%;" height="calc(100vh - 290px)" @selection-change="selectionChangeHandler" @row-click="clickRowHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column type="index" label="序号" width="55" /> <el-table-column type="index" label="序号" width="55" />
<el-table-column prop="field_cn_name" label="中文名称" />
<el-table-column prop="field_name" label="字段标识" />
<el-table-column prop="fieldCnName" label="中文名称" />
<el-table-column prop="fieldName" label="字段标识" />
<el-table-column label="数据类型"> <el-table-column label="数据类型">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.is_data_type === 1">字符</span>
<span v-if="scope.row.is_data_type === 2">数字</span>
<span v-if="scope.row.isDataType === 1">字符</span>
<span v-if="scope.row.isDataType === 2">数字</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="is_column_length" label="字段长度" />
<el-table-column prop="isColumnLength" label="字段长度" />
<el-table-column label="默认值"> <el-table-column label="默认值">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.is_default_value === ''">-</span>
<span v-else>{{ scope.row.is_default_value }}</span>
<span v-if="scope.row.isDefaultValue === ''">-</span>
<span v-else>{{ scope.row.isDefaultValue }}</span>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -69,7 +69,7 @@ export default {
group: false group: false
}, },
query: { query: {
is_type: 2
isType: 2
} }
}) })
}, },

42
src/views/archivesConfig/commonFields/module/form.vue

@ -4,22 +4,22 @@
<span class="dialog-left-bottom" /> <span class="dialog-left-bottom" />
<div class="setting-dialog"> <div class="setting-dialog">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="中文名称" prop="field_cn_name">
<el-input v-model="form.field_cn_name" style="width: 370px;" />
<el-form-item label="中文名称" prop="fieldCnName">
<el-input v-model="form.fieldCnName" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="字段标识" prop="field_name">
<el-input v-model="form.field_name" style="width: 370px;" />
<el-form-item label="字段标识" prop="fieldName">
<el-input v-model="form.fieldName" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="数据类型" prop="is_data_type">
<el-select v-model="form.is_data_type" placeholder="请选择">
<el-form-item label="数据类型" prop="isDataType">
<el-select v-model="form.isDataType" placeholder="请选择">
<el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" /> <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="字段长度" prop="is_column_length">
<el-input-number v-model="form.is_column_length" controls-position="right" style="width: 370px;" />
<el-form-item label="字段长度" prop="isColumnLength">
<el-input-number v-model="form.isColumnLength" controls-position="right" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="默认值" prop="is_default_value">
<el-input v-model="form.is_default_value" style="width: 370px;" />
<el-form-item label="默认值" prop="isDefaultValue">
<el-input v-model="form.isDefaultValue" style="width: 370px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -39,11 +39,11 @@ import { form } from '@crud/crud'
const defaultForm = { const defaultForm = {
id: null, id: null,
field_cn_name: '',
field_name: '',
is_data_type: 1,
is_column_length: 100,
is_default_value: ''
fieldCnName: '',
fieldName: '',
isDataType: 1,
isColumnLength: 100,
isDefaultValue: ''
} }
export default { export default {
mixins: [form(defaultForm)], mixins: [form(defaultForm)],
@ -52,9 +52,9 @@ export default {
if (!Number.isInteger(value) || value <= 0) { if (!Number.isInteger(value) || value <= 0) {
callback(new Error('请输入正整数数字值')) callback(new Error('请输入正整数数字值'))
} else { } else {
if (this.form.is_data_type === 1 && value > 2000) {
if (this.form.isDataType === 1 && value > 2000) {
callback(new Error('字符最大长度不能超过2000位')) callback(new Error('字符最大长度不能超过2000位'))
} else if (this.form.is_data_type === 2 && value > 11) {
} else if (this.form.isDataType === 2 && value > 11) {
callback(new Error('数字最大长度不能超过11位')) callback(new Error('数字最大长度不能超过11位'))
} else { } else {
callback() callback()
@ -63,16 +63,16 @@ export default {
} }
return { return {
rules: { rules: {
field_cn_name: [
fieldCnName: [
{ required: true, message: '请输入中文名称', trigger: 'blur' } { required: true, message: '请输入中文名称', trigger: 'blur' }
], ],
field_name: [
fieldName: [
{ required: true, message: '请输入字段标识', trigger: 'blur' } { required: true, message: '请输入字段标识', trigger: 'blur' }
], ],
is_data_type: [
isDataType: [
{ required: true, message: '请选择数据类型', trigger: 'blur' } { required: true, message: '请选择数据类型', trigger: 'blur' }
], ],
is_column_length: [
isColumnLength: [
{ validator: checkMaxLength, trigger: 'blur' } { validator: checkMaxLength, trigger: 'blur' }
] ]
}, },

16
src/views/archivesConfig/dict/dictDetail.vue

@ -68,7 +68,7 @@ export default {
group: false group: false
}, },
queryOnPresenterCreated: false, queryOnPresenterCreated: false,
sort: ['dic_sequence,asc']
sort: ['dicSequence,asc']
}) })
] ]
}, },
@ -86,6 +86,7 @@ export default {
data() { data() {
return { return {
dicPid: null, dicPid: null,
needRefreshTree: false,
rules: { rules: {
label: [ label: [
{ required: true, message: '请输入字典名称', trigger: 'blur' } { required: true, message: '请输入字典名称', trigger: 'blur' }
@ -103,17 +104,20 @@ export default {
}, },
methods: { methods: {
[CRUD.HOOK.afterSubmit]() { [CRUD.HOOK.afterSubmit]() {
this.$emit('treeRefresh')
return true
this.needRefreshTree = true
}, },
[CRUD.HOOK.afterDelete]() { [CRUD.HOOK.afterDelete]() {
this.$emit('treeRefresh')
return true
this.needRefreshTree = true
}, },
// //
[CRUD.HOOK.beforeRefresh]() { [CRUD.HOOK.beforeRefresh]() {
this.crud.query.id = this.dicPid this.crud.query.id = this.dicPid
return true
},
[CRUD.HOOK.afterRefresh](crud) {
if (this.needRefreshTree) {
this.needRefreshTree = false
this.$emit('treeRefresh', crud.data)
}
}, },
clickRowHandler(row) { clickRowHandler(row) {
this.$refs.table.clearSelection() this.$refs.table.clearSelection()

33
src/views/archivesConfig/dict/index.vue

@ -6,14 +6,14 @@
<span class="dialog-left-bottom" /> <span class="dialog-left-bottom" />
<div class="setting-dialog"> <div class="setting-dialog">
<el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" size="small" label-width="80px">
<el-form-item label="字典名称" prop="dic_name">
<el-input v-model="form.dic_name" style="width: 370px;" />
<el-form-item label="字典名称" prop="dicName">
<el-input v-model="form.dicName" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="字典代码" prop="dic_code">
<el-input v-model="form.dic_code" style="width: 370px;" />
<el-form-item label="字典代码" prop="dicCode">
<el-input v-model="form.dicCode" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="内容说明"> <el-form-item label="内容说明">
<el-input v-model="form.dic_explain" style="width: 370px;" type="textarea" :rows="4" />
<el-input v-model="form.dicExplain" style="width: 370px;" type="textarea" :rows="4" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -51,7 +51,7 @@ import crudDict from '@/api/archivesConfig/dict'
import CRUD, { presenter, header, form } from '@crud/crud' import CRUD, { presenter, header, form } from '@crud/crud'
import crudOperation from '@crud/CRUD.operation' import crudOperation from '@crud/CRUD.operation'
const defaultForm = { id: null, dic_name: null, dic_code: null, dic_explain: null, dic_type: true }
const defaultForm = { id: null, dicName: null, dicCode: null, dicExplain: null, dicType: true }
export default { export default {
name: 'Dict', name: 'Dict',
@ -68,7 +68,7 @@ export default {
download: false, download: false,
group: false group: false
}, },
sort: ['dic_sequence,asc']
sort: ['dicSequence,asc']
}) })
] ]
}, },
@ -80,10 +80,10 @@ export default {
{ key: 'description', display_name: '描述' } { key: 'description', display_name: '描述' }
], ],
rules: { rules: {
dic_name: [
dicName: [
{ required: true, message: '请输入字典名称', trigger: 'blur' } { required: true, message: '请输入字典名称', trigger: 'blur' }
], ],
dic_code: [
dicCode: [
{ required: true, message: '请输入字典代码', trigger: 'blur' } { required: true, message: '请输入字典代码', trigger: 'blur' }
] ]
}, },
@ -93,8 +93,8 @@ export default {
del: ['admin', 'dict:del'] del: ['admin', 'dict:del']
}, },
defaultProps: { defaultProps: {
children: 'child_menus',
label: 'dic_name'
children: 'childMenus',
label: 'dicName'
}, },
activeAddBtn: false activeAddBtn: false
} }
@ -110,7 +110,7 @@ export default {
// //
handleNodeClick(val) { handleNodeClick(val) {
if (val) { if (val) {
if (val.dic_type === 'true') {
if (val.dicType === 'true') {
this.crud.selectionChangeHandler([val]) this.crud.selectionChangeHandler([val])
} else { } else {
this.crud.selectionChangeHandler([]) this.crud.selectionChangeHandler([])
@ -126,10 +126,11 @@ export default {
// //
form.dictDetails = null form.dictDetails = null
}, },
updateKeyChildren() {
this.crud.refresh()
console.log(this.crud.selections[0])
// this.$refs.tree.updateKeyChildren(this.crud.selections[0])
updateKeyChildren(data) {
console.log(this.$refs.tree.getCurrentKey())
// this.$refs.dictDetail.crud.data
// this.crud.refresh()
// this.$refs.tree.updateKeyChildren(this.$refs.tree.getCurrentKey(), data)
} }
} }
} }

Loading…
Cancel
Save