From 106c96572f8cf303fc9469265d8f4050c60e9628 Mon Sep 17 00:00:00 2001 From: lifengge <1058105477@qq.com> Date: Wed, 27 Jul 2022 13:57:12 +0800 Subject: [PATCH] 修改未检人员页面，含新增、编辑、查看弹框信息 --- juvenile-prosecution-vue/src/views/business/MinorList.vue | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------- juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------- 2 files changed, 148 insertions(+), 83 deletions(-) diff --git a/juvenile-prosecution-vue/src/views/business/MinorList.vue b/juvenile-prosecution-vue/src/views/business/MinorList.vue index a984f5f..ba65411 100644 --- a/juvenile-prosecution-vue/src/views/business/MinorList.vue +++ b/juvenile-prosecution-vue/src/views/business/MinorList.vue @@ -18,7 +18,8 @@ 新增 - 模板导出 + 模板导出 + 导入 @@ -71,8 +72,8 @@ - - + + {{ info.householdNum }} {{ info.number }} {{ info.name }} @@ -82,18 +83,18 @@ {{ info.schoolName }} {{ info.startYear }} {{ info.school_dictText }} - {{ info.address }} - {{ info.school_dictText }} - {{ info.schoolName }} {{ info.guardian }} {{ info.relation }} - {{ info.reason_dictText }} - {{ info.specialReason }} - {{ info.remark }} + {{ info.reason_dictText }} + {{ info.specialReason }} + {{ info.address }} + {{ info.remark }} - + - + @@ -113,7 +114,7 @@ import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { GetAge } from '@/utils/util' import MinorModal from './modules/MinorModal' import '@/assets/less/TableExpand.less' -import { getAction,downFile } from '@api/manage' +import { getAction, downFile } from '@api/manage' import { FormTypes } from '@/utils/JEditableTableUtil' //引入JS方法 import { filterDictTextByCache } from '@/components/dict/JDictSelectUtil' @@ -229,33 +230,40 @@ export default { { title: '姓名', align: 'center', + width: 80, dataIndex: 'name' }, { title: '身份证号', align: 'center', + width: 170, dataIndex: 'identity' }, { title: '与户主的关系', align: 'center', + width: 120, dataIndex: 'relation' }, { title: '行政区划', align: 'center', + width: 120, dataIndex: 'division', scopedSlots: { customRender: 'longText' } }, { title: '现住址', align: 'center', + width: 200, + ellipsis: true, dataIndex: 'address', scopedSlots: { customRender: 'longText' } }, { title: '是否犯罪', align: 'center', + width: 100, dataIndex: 'crime', customRender: (text) => { //字典值翻译通用方法 @@ -265,12 +273,16 @@ export default { { title: '犯罪原因', align: 'center', + width: 200, + ellipsis: true, dataIndex: 'reason', scopedSlots: { customRender: 'longText' } }, { title: '其他参考信息', align: 'center', + width: 200, + ellipsis: true, dataIndex: 'other', scopedSlots: { customRender: 'longText' } } @@ -286,7 +298,7 @@ export default { showQuickJumper: true, total: 0 }, - familyLoading:false, + familyLoading: false } }, created() { @@ -302,19 +314,19 @@ export default { return GetAge(identity) }, handleDetail(record) { - var that = this; - that.info = record; - that.infoVisible = true; - that.familyDatas=[]; - if(null!==record.householdNum && ''!==record.householdNum && undefined!==record.householdNum){ + var that = this + that.info = record + that.infoVisible = true + that.familyDatas = [] + if (null !== record.householdNum && '' !== record.householdNum && undefined !== record.householdNum) { let params = { householdNum: record.householdNum } - that.familyLoading=true; + that.familyLoading = true getAction(this.url.familys, params).then(res => { if (res.success) { - that.familyLoading=false; + that.familyLoading = false that.familyDatas = res.result || [] } else { - that.familyLoading=false; + that.familyLoading = false } }) } @@ -371,8 +383,28 @@ export default { + +/* 设置滚动条的样式 */ +.j-table-force-nowrap .ant-table-body::-webkit-scrollbar { + width: 10px; + height: 10px; +} + +/* 滚动槽 */ +.j-table-force-nowrap .ant-table-body::-webkit-scrollbar-track { + background: #f5f5f5; +} + +/* 滚动条滑块 */ +.j-table-force-nowrap .ant-table-body::-webkit-scrollbar-thumb { + background: #dedede; + -webkit-box-shadow: none; +} + +.desc_info .ant-descriptions-item-label { + width: 140px; +} + \ No newline at end of file diff --git a/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue index 44bb906..dd82721 100644 --- a/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue +++ b/juvenile-prosecution-vue/src/views/business/modules/MinorModal.vue @@ -36,13 +36,11 @@ - - - - - - - + + + + + @@ -53,21 +51,12 @@ - - - - - - - - - @@ -77,41 +66,43 @@ - - - - + + - + + + + + + - + - + - - @@ -133,17 +124,16 @@ export default { return { confirmLoading: false, title: '', - width: 800, visible: false, disableSubmit: false, model: {}, labelCol: { xs: { span: 24 }, - sm: { span: 6 } + sm: { span: 5 } }, wrapperCol: { xs: { span: 24 }, - sm: { span: 16 } + sm: { span: 19 } }, labelCol2: { xs: { span: 24 }, @@ -154,12 +144,12 @@ export default { sm: { span: 20 } }, validatorRules: { - householdNum:[ { required: true, message: '请输入户号' },], - name:[ { required: true, message: '请输入姓名' },], - gender:[ { required: true, message: '请选择性别' },], - identity:[ {required: true,validator:this.validateIdCard}], - relation:[ { required: true, message: '请输入监护人关系' },], - guardian:[ { required: true, message: '请输入监护人' },], + householdNum: [{ required: true, message: '请输入户号' }], + name: [{ required: true, message: '请输入姓名' }], + gender: [{ required: true, message: '请选择性别' }], + identity: [{ required: true, validator: this.validateIdCard }], + relation: [{ required: true, message: '请输入监护人关系' }], + guardian: [{ required: true, message: '请输入监护人' }] }, url: { add: '/sys/minor/add', @@ -173,7 +163,7 @@ export default { { title: '户号', key: 'householdNum', - width: '250px', + width: '230px', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}', @@ -182,7 +172,7 @@ export default { { title: '人员编号', key: 'number', - width: '180px', + width: '230px', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}', @@ -191,7 +181,7 @@ export default { { title: '姓名', key: 'name', - width: '180px', + width: '100px', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}', @@ -200,20 +190,20 @@ export default { { title: '身份证号', key: 'identity', - width: '200px', + width: '190px', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}', validateRules: [{ // pattern: '/(^[1-9]\\d{5}(18|19|([23]\\d))\\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}[0-9Xx]$)|(^[1-9]\\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\\d{3}$)/', - pattern:'^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$', + pattern: '^\\d{6}(18|19|20)?\\d{2}(0[1-9]|1[012])(0[1-9]|[12]\\d|3[01])\\d{3}(\\d|[xX])$', message: '${title}格式不正确' }] }, { title: '与户主的关系', key: 'relation', - width: '180px', + width: '120px', type: FormTypes.input, defaultValue: '', placeholder: '请输入${title}', @@ -231,15 +221,15 @@ export default { { title: '现住址', key: 'address', - width: '180px', + width: '200px', type: FormTypes.input_pop, defaultValue: '', - placeholder: '请输入${title}', + placeholder: '请输入${title}' }, { title: '是否犯罪', key: 'crime', - width: '200px', + width: '100px', type: FormTypes.select, options: [], dictCode: 'is_crime', @@ -249,18 +239,18 @@ export default { { title: '犯罪原因', key: 'reason', - width: '250px', + width: '200px', type: FormTypes.input_pop, defaultValue: '', - placeholder: '请输入${title}', + placeholder: '请输入${title}' }, { title: '其他参考信息', key: 'other', - width: '250px', + width: '200px', type: FormTypes.input_pop, defaultValue: '', - placeholder: '请输入${title}', + placeholder: '请输入${title}' } ] } @@ -283,17 +273,17 @@ export default { this.modelDefault = JSON.parse(JSON.stringify(this.model)) }, methods: { - getAgeByIdentity(identity){ - return GetAge(identity); + getAgeByIdentity(identity) { + return GetAge(identity) }, - validateIdCard(rule,value,callback){ + validateIdCard(rule, value, callback) { console.log(value) - if(undefined==value || null==value || ''==value){ - callback("请输入正确的公民身份号码!"); - }else if ( !value || new RegExp(/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/).test(value)){ - callback(); - }else{ - callback("请输入正确的公民身份号码!"); + if (undefined == value || null == value || '' == value) { + callback('请输入正确的公民身份号码!') + } else if (!value || new RegExp(/(^[1-9]\d{5}(18|19|([23]\d))\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^[1-9]\d{7}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}$)/).test(value)) { + callback() + } else { + callback('请输入正确的公民身份号码!') } }, // 获取所有的editableTable实例 @@ -304,7 +294,7 @@ export default { }, add() { - this.dataSource=[]; + this.dataSource = [] // 默认新增一条数据 this.getAllTable().then(editableTables => { editableTables[0].add() @@ -397,5 +387,48 @@ export default { + + \ No newline at end of file -- libgit2 0.21.4