diff --git a/package.json b/package.json index df5cf15b..5370a600 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "src/components", "src/common/util.js", "src/common/dict.js", + "src/common/dictHlj.js", "src/common/monent.js", "src/common/modules.js", "src/common/http.js", diff --git a/src/common/axios.js b/src/common/axios.js index da0ae36f..531a3824 100644 --- a/src/common/axios.js +++ b/src/common/axios.js @@ -35,7 +35,9 @@ instance.interceptors.response.use(res => { return res.data } else if (res.config.alwaysReturn) { return res.data - } else if (res.data.code == 200) { + } else if (res.data.code == 200) { //黑龙江接口200 正常 + return res.data + } else if (res.data.code == 0) { return res.data } else if (res.data.code === 1) { uni.showToast({ diff --git a/src/common/dictHlj.js b/src/common/dictHlj.js new file mode 100644 index 00000000..b593c72a --- /dev/null +++ b/src/common/dictHlj.js @@ -0,0 +1,76 @@ +/** + * 封装字典工具类 + */ + +const $dictHlj = { + instance: null, + url: "/system/dictData/types/", + init(config) { + this.instance = config?.instance + this.url = config?.url || this.url + }, + dicts() { + let dicts = uni.getStorageSync('dicts') || null + typeof dicts == "string" ? (dicts = JSON.parse(dicts)) : dicts + return dicts || []; + }, + load(...code) { + var url = this.url + code.toString() + return this.instance && this.instance.get(url, { + withoutToken: true, + }).then((res) => { + console.log(res) + if (res && res.data) { + let dicts=[] + for (var i in res.data) { + var e = { + key: res.data[i][0].dictType, + values: res.data[res.data[i][0].dictType] + } + dicts.push(e) + } + this.dicts() + uni.setStorageSync('dicts', dicts); + + } + }).catch((err) => { + console.log(err) + }) + }, + getDict(key) { + if (this.dicts().length) { + let dict = this.dicts().find((e) => e.key == key); + return dict ? dict.values : []; + } else return []; + }, + getValue(key, label) { + if (this.dicts().length) { + let dict = this.dicts().find((e) => e.key == key); + if (dict) { + let item = dict.values.find((v) => v.label == label); + return item ? item.value : label; + } else return label; + } else return label; + }, + getLabel(key, value) { + if (this.dicts().length) { + let dict = this.dicts().find((e) => e.key == key); + if (dict) { + let item = dict.values.find((v) => v.value == value); + return item ? item.label : value; + } else return value ? value : ''; + } else return value ? value : ''; + }, + getColor(key, value) { + if (this.dicts().length) { + let dict = this.dicts().find((e) => e.key == key); + if (dict) { + let item = dict.values.find((v) => v.dictValue == value); + return item ? item.dictColor : value; + } else return value; + } else return value; + } +} + +export default $dictHlj + \ No newline at end of file diff --git a/src/common/util.js b/src/common/util.js index 859e3e0d..92953d50 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -1,4 +1,5 @@ import dict from "./dict" +import dictHlj from "./dictHlj" import dayjs from './monent' import qs from 'query-string' import reg from "./regular"; @@ -255,6 +256,7 @@ export const copy = any => { export default { dict, + dictHlj, confirm, calcAge, injectLib: (url, cb = () => 0) => { diff --git a/src/components/AiUploader.vue b/src/components/AiUploader.vue index 6c200745..24be0b7f 100644 --- a/src/components/AiUploader.vue +++ b/src/components/AiUploader.vue @@ -62,10 +62,6 @@ export default { type: Boolean, default: false, }, - imgUrlHttp: { - type: String, - default: '', - }, }, computed: { ...mapState(['token']), @@ -171,8 +167,8 @@ export default { this.fileList.push(res.data) } else if (this.api == '/admin/file/add-portrait') { this.fileList.push({url: res.data?.split(";")?.[0], id: res.data?.split(";")?.[1]}) - }else if (this.api == '/common/upload') { //图片url回显需先拼接imgUrlHttp - this.fileList.push({url: this.imgUrlHttp + res.data.fileName, fileName: res.data.originalFilename, filePath: this.imgUrlHttp + res.data.fileName}) + }else if (this.api == '/common/upload') { //黑龙江图片上传接口 + this.fileList.push({fileName: res.data.fileName, filePath: res.data.fileName}) } this.$emit("update:def", this.fileList) this.$emit("list", this.fileList) diff --git a/src/main.js b/src/main.js index 30753f3d..0d4c058b 100644 --- a/src/main.js +++ b/src/main.js @@ -28,6 +28,7 @@ Vue.prototype.$dayjs = dayjs Vue.prototype.$cdn = 'https://cdn.cunwuyun.cn/dvcp/h5/'; Object.keys(utils).map((e) => (Vue.prototype['$' + e] = utils[e])); utils.dict.init({instance: axios}) +utils.dictHlj.init({instance: axios}) App.mpType = 'app'; process.env.NODE_ENV == 'development' && new VConsole(); // new VConsole() diff --git a/src/package.json b/src/package.json index 51ae6c06..16a827a3 100644 --- a/src/package.json +++ b/src/package.json @@ -9,6 +9,7 @@ "components", "common/util.js", "common/dict.js", + "common/dictHlj.js", "common/monent.js", "common/modules.js", "common/http.js", diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue index 059dae6e..603ce90b 100644 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue +++ b/src/project/hljjm/AppChildrenInfo/AppChildrenDetail.vue @@ -2,14 +2,14 @@
-
+
基本信息
- +
儿童类别
-
{{$dict.getLabel('CHILD_CATEGORY_CODE', info.childType) || '-'}}
+
{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', info.childType) || '-'}}
儿童名称
@@ -25,7 +25,7 @@
性别
-
{{$dict.getLabel('GENDER_CODE', info.gender) || '-'}}
+
{{$dictHlj.getLabel('GENDER_CODE', info.gender) || '-'}}
年龄
@@ -42,9 +42,9 @@
-
+
生活费信息
- +
@@ -66,9 +66,9 @@
-
+
福利机构信息
- +
@@ -110,9 +110,9 @@ export default { childType: '', synId: '', info: {}, - isShowBasic: false, - isShowLifeMoney: false, - isShowInstitution: false + isShowBasic: true, + isShowLifeMoney: true, + isShowInstitution: true } }, onLoad(option) { @@ -125,7 +125,7 @@ export default { }) this.childType = option.childType this.synId = option.synId - this.$dict.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { + this.$dictHlj.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { this.getDetail() }) }, diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue index 09c68160..d123b97a 100644 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue +++ b/src/project/hljjm/AppChildrenInfo/AppChildrenInfo.vue @@ -5,7 +5,7 @@ *
儿童类型
-
{{$dict.getLabel('CHILD_CATEGORY_CODE', childType) || '请选择'}}
+
{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', childType) || '请选择'}}
@@ -31,9 +31,9 @@
查询
-
返回
+
- +
@@ -44,7 +44,7 @@ export default { data() { return { childName: '', - childType: '1', + childType: '', isShowtype: false } }, @@ -56,7 +56,7 @@ export default { uni.setNavigationBarTitle({ title: '各类儿童信息查询' }) - this.$dict.load(['CHILD_CATEGORY_CODE']) + this.$dictHlj.load(['CHILD_CATEGORY_CODE']) }, methods: { typeChange(e) { @@ -70,6 +70,9 @@ export default { return this.$u.toast(`请输入儿童姓名`) } uni.navigateTo({url: `./AppChildrenList?childType=${this.childType}&childName=${this.childName}`}) + }, + back() { + uni.navigateBack() } }, } diff --git a/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue b/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue index fdf0d2ae..533e1823 100644 --- a/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue +++ b/src/project/hljjm/AppChildrenInfo/AppChildrenList.vue @@ -5,12 +5,12 @@
{{item.childName}}
-
{{$dict.getLabel('CHILD_CATEGORY_CODE', item.childType)}}
+
{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', item.childType)}}
- {{$dict.getLabel('GENDER_CODE', item.gender)}} + {{$dictHlj.getLabel('GENDER_CODE', item.gender)}} {{item.age}}岁
@@ -42,7 +42,7 @@ export default { }) this.childType = option.childType this.childName = option.childName - this.$dict.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { + this.$dictHlj.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { this.getList() }) }, @@ -54,8 +54,8 @@ export default { if(this.current > this.pageTotal) return this.$http.post(`/mobile/childrenInfo/findListPage`, { - // childName: this.childName, - // childType: this.childType, + childName: this.childName, + childType: this.childType, pageNum: this.current, pageSize: 10, }, @@ -63,7 +63,7 @@ export default { withoutToken: true }).then((res) => { if (res.code == 200) { - this.list = this.current > 1 ? [...this.datas, ...res.data.rows] : res.data.rows + this.list = this.current > 1 ? [...this.list, ...res.data.rows] : res.data.rows this.pageTotal = Math.ceil(res.data.total/10) }else { this.$u.toast(res.msg) diff --git a/src/project/hljjm/AppRecognize/AppRecognize.vue b/src/project/hljjm/AppRecognize/AppRecognize.vue index 0c112425..f63e8f08 100644 --- a/src/project/hljjm/AppRecognize/AppRecognize.vue +++ b/src/project/hljjm/AppRecognize/AppRecognize.vue @@ -7,7 +7,7 @@
查询
-
新增认清助养
+
新增认亲助养
diff --git a/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue b/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue index 1ef6878d..6176d060 100644 --- a/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue +++ b/src/project/hljjm/AppRecognize/AppRecognizeAdd.vue @@ -8,6 +8,8 @@

{{item.name}}

+
@@ -23,7 +25,7 @@ *
与助养对象关系
-
{{$dict.getLabel('relationship_children', form.relationshipWithChild) || '请选择'}}
+
{{$dictHlj.getLabel('relationship_children', form.relationshipWithChild) || '请选择'}}
@@ -31,7 +33,7 @@ *
助养方式
-
{{$dict.getLabel('handling_Date', form.assistanceMethod) || '请选择'}}
+
{{$dictHlj.getLabel('handling_Date', form.assistanceMethod) || '请选择'}}
@@ -63,13 +65,11 @@
-
儿童姓名：{{item.childName}}
身份证号：{{item.childNumber}}
-
儿童类别：{{$dict.getLabel('CHILD_CATEGORY_CODE', item.childCategory)}}
+
儿童类别：{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', item.childCategory)}}
出生年月：{{item.birthDate}}
@@ -78,6 +78,7 @@
详情
+
@@ -85,7 +86,7 @@
助养者身份证信息(身份证正反面)
- +
@@ -94,7 +95,7 @@
助养者经济状况证明
- +
@@ -103,7 +104,7 @@
助养者健康状况
- +
@@ -112,7 +113,7 @@
其他材料
- +
@@ -151,8 +152,8 @@
确认
返回
- - + + @@ -168,23 +169,24 @@ export default { stepIndex: 0, files: [], form: { - assistanceName: '张三', - relationshipWithChild: '1', - assistanceMethod: '1', + assistanceName: '李四', + relationshipWithChild: '', + assistanceMethod: '', details: '111', assistanceIdNumber: '110102190001010731', - handlingDate: '2024-09-23', + handlingDate: '', assistanceInformationFile: [], agentId: '', agentPhone: '', agency: '', childBusinessId: '', childType: '', - assistanceMethod: '' }, isShowDate: false, isShowRelationship: false, isShowMethod: false, + current: 1, + pageTotal: 2, childrenList: [], searchChildrenName: '', checkChildrenInfo: {}, //第二步选择儿童信息 @@ -207,7 +209,7 @@ export default { uni.setNavigationBarTitle({ title: '认亲助养' }) - this.$dict.load(['handling_Date', 'relationship_children', 'CHILD_CATEGORY_CODE']) + this.$dictHlj.load(['handling_Date', 'relationship_children', 'CHILD_CATEGORY_CODE']) this.$http.get(`/system/config/configKey/upload.file.path`, { @@ -232,6 +234,30 @@ export default { onDateChange(e) { this.form.handlingDate = `${e.result}` }, + changeId(list) { + list.map((item) => { + item.url = this.imgUrlHttp + item.fileName + }) + this.filesId = list + }, + changeEconomy(list) { + list.map((item) => { + item.url = this.imgUrlHttp + item.fileName + }) + this.filesEconomy = list + }, + changeHealth(list) { + list.map((item) => { + item.url = this.imgUrlHttp + item.fileName + }) + this.filesHealth = list + }, + changeOther(list) { + list.map((item) => { + item.url = this.imgUrlHttp + item.fileName + }) + this.filesOther = list + }, next() { if(!this.stepIndex) { //第一步 return this.validateFirst() @@ -247,36 +273,44 @@ export default { } }, validateFirst() { - // if (!this.form.assistanceName) { - // return this.$u.toast(`请输入助养人姓名`) - // } - // if (!this.form.relationshipWithChild) { - // return this.$u.toast(`请选择与助养对象关系`) - // } - // if (!this.form.assistanceMethod) { - // return this.$u.toast(`请选择助养方式`) - // } - // if (!this.form.details) { - // return this.$u.toast(`请输入详细描述`) - // } - // if (!this.form.assistanceIdNumber) { - // return this.$u.toast(`请输入助养人身份号码`) - // } - // if (!/^[1-9]\d{5}(19\d{2}|20[0-2]\d)(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9xX])$/.test(this.form.assistanceIdNumber)) { - // return this.$u.toast('请输入正确的助养人身份证号') - // } - // if (!this.form.handlingDate) { - // return this.$u.toast(`请选择办理日期`) - // } - this.searchChildrenName = this.form.assistanceName + if (!this.form.assistanceName) { + return this.$u.toast(`请输入助养人姓名`) + } + if (!this.form.relationshipWithChild) { + return this.$u.toast(`请选择与助养对象关系`) + } + if (!this.form.assistanceMethod) { + return this.$u.toast(`请选择助养方式`) + } + if (!this.form.details) { + return this.$u.toast(`请输入详细描述`) + } + if (!this.form.assistanceIdNumber) { + return this.$u.toast(`请输入助养人身份号码`) + } + if (!/^[1-9]\d{5}(19\d{2}|20[0-2]\d)(0[1-9]|1[0-2])(0[1-9]|[1-2][0-9]|3[0-1])\d{3}([0-9xX])$/.test(this.form.assistanceIdNumber)) { + return this.$u.toast('请输入正确的助养人身份证号') + } + if (!this.form.handlingDate) { + return this.$u.toast(`请选择办理日期`) + } + this.stepIndex ++ + this.getChildrenListInit() + }, + getChildrenListInit() { + this.pageNum = 1 + this.pageTotal = 2 + this.childrenList = [] + this.checkChildrenInfo = {} this.getChildrenList() }, getChildrenList() { + if(this.current > this.pageTotal) return this.$http.post(`/mobile/supportRaise/findChildrenList`, { childName: this.searchChildrenName, - pageSize: 1000, - pageNum: 1, + pageSize: 20, + pageNum: this.current, divisionCode: this.user.divisionCode || '' }, { @@ -286,15 +320,15 @@ export default { res.data.rows.map((item) => { item.isCheck = false }) - this.childrenList = res.data.rows - this.stepIndex ++ + this.childrenList = this.current > 1 ? [...this.childrenList, ...res.data.rows] : res.data.rows + this.pageTotal = Math.ceil(res.data.total/20) }else { this.$u.toast(`未查询到有效的儿童信息，请输入正确的助养人姓名`) } }) }, toChildrenDetail(row) { - uni.navigateTo({url: `../AppChildrenInfo/AppChildrenDetail?id=`}) + uni.navigateTo({url: `../AppChildrenInfo/AppChildrenDetail?synId=${row.childId}&childType=${row.childCategoryType}`}) }, checkChildren(index) { this.childrenList.map((item) => { @@ -358,6 +392,10 @@ export default { this.stepIndex -- } }, + onReachBottom() { + this.current++ + this.getChildrenList() + } } @@ -373,6 +411,10 @@ uni-page-body { background-color: #fff; box-sizing: border-box; margin-bottom: 24px; + position: fixed; + top: 0; + left: 0; + z-index: 9; .step-list { display: flex; .step-item { @@ -428,13 +470,16 @@ uni-page-body { } } + ::v-deep .u-search { + margin-top: 24px!important; + } } .form { - background-color: #fff; - + padding-top: 200px; .item { display: flex; padding-top: 16px; + background-color: #fff; .requier { line-height: 44px; font-family: PingFangSC-Regular; @@ -475,7 +520,7 @@ uni-page-body { } } .user-list { - padding: 24px 32px 0 32px; + padding: 282px 32px 0 32px; box-sizing: border-box; ::v-deep .u-search { margin-bottom: 32px!important; diff --git a/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue b/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue index e4fce169..ece78e73 100644 --- a/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue +++ b/src/project/hljjm/AppRecognize/AppRecognizeDetail.vue @@ -9,11 +9,11 @@
与助养对象关系
-
{{$dict.getLabel('relationship_children', info.relationshipWithChild)}}
+
{{$dictHlj.getLabel('relationship_children', info.relationshipWithChild)}}
助养方式
-
{{$dict.getLabel('handling_Date', info.assistanceMethod)}}
+
{{$dictHlj.getLabel('handling_Date', info.assistanceMethod)}}
详细描述
@@ -31,72 +31,95 @@
儿童姓名
-
{{info.assistanceName}}
+
{{info.childName}}
身份证号
-
{{info.assistanceIdNumber}}
+
{{info.childIdNumber}}
儿童类别
-
{{$dict.getLabel('CHILD_CATEGORY_CODE', info.childType)}}
+
{{$dictHlj.getLabel('child_type', info.childType)}}
出生年月
-
{{info.birthDate}}
+
{{info.childBirthDate}}
助养者身份证信息
- -
- +
+
-

暂无数据

+
+
+ +
{{ item.fileName }}
+
+
+

暂无数据

助养者经济状况证明
-
- +
+
-

暂无数据

+
+
+ +
{{ item.fileName }}
+
+
+

暂无数据

助养者健康状况
-
- +
+
-

暂无数据

+
+
+ +
{{ item.fileName }}
+
+
+

暂无数据

其他材料
-
- +
+
-

暂无数据

+
+
+ +
{{ item.fileName }}
+
+
+

暂无数据

办理人
-
{{info.agentId}}
+
{{info.agentId || '-'}}
办理人联系电话
-
{{info.agentPhone}}
+
{{info.agentPhone || '-'}}
办理机构
-
{{info.agency}}
+
{{info.agency || '-'}}
@@ -122,10 +145,15 @@ export default { }, id: '', info: {}, - filesId: [], //身份证照片 - filesEconomy: [], //经济状况证明 - filesHealth: [], //健康证明 - filesOther: [], //其它 + filesIdImg: [], //身份证照片 + filesId: [], //身份证附件 + filesEconomyImg: [], //经济状况证明照片 + filesEconomy: [], //经济状况证明附件 + filesHealthImg: [], //健康证明照片 + filesHealth: [], //健康证明附件 + filesOtherImg: [], //其它照片 + filesOther: [], //其它附件 + imgUrlHttp: '', } }, onLoad(option) { @@ -137,7 +165,15 @@ export default { title: '认亲助养' }) this.id = option.id - this.$dict.load(['handling_Date', 'relationship_children', 'CHILD_CATEGORY_CODE']).then(() => { + this.$http.get(`/system/config/configKey/upload.file.path`, + { + withoutToken: true + }).then((res) => { + if (res.code == 200) { + this.imgUrlHttp = res.data + } + }) + this.$dictHlj.load(['handling_Date', 'relationship_children', 'child_type']).then(() => { this.getDetail() }) @@ -157,21 +193,38 @@ export default { if (res.code == 200) { this.info = {...res.data} res.data.assistanceInformationFile.map((item) => { - item.url = item.filePath + item.url = this.imgUrlHttp + item.fileName + var e = item.fileName.split('.') + item.postfix = e[e.length-1] if(item.type == 1) { - this.filesId.push(item) + if(['jpeg', 'jpg', 'png'].includes(item.postfix)) { + this.filesIdImg.push(item) + }else { + this.filesId.push(item) + } } if(item.type == 2) { - this.filesEconomy.push(item) + if(['jpeg', 'jpg', 'png'].includes(item.postfix)) { + this.filesEconomyImg.push(item) + }else { + this.filesEconomy.push(item) + } } if(item.type == 3) { - this.filesHealth.push(item) + if(['jpeg', 'jpg', 'png'].includes(item.postfix)) { + this.filesHealthImg.push(item) + }else { + this.filesHealth.push(item) + } } if(item.type == 4) { - this.filesOther.push(item) + if(['jpeg', 'jpg', 'png'].includes(item.postfix)) { + this.filesOtherImg.push(item) + }else { + this.filesOther.push(item) + } } }) - console.log(this.filesId) }else { this.$u.toast(res.msg) } @@ -179,10 +232,23 @@ export default { }, previewImages(images, img) { uni.previewImage({ - urls: images.map(v => v.filePath), + urls: images.map(v => v.url), current: img }) }, + previewFile(e) { + uni.downloadFile({ + url: e.url, + success: function (res) { + var filePath = res.tempFilePath; + uni.openDocument({ + filePath: filePath, + fileType: e.postfix, + showMenu: true, + }); + } + }); + } }, } @@ -228,6 +294,22 @@ uni-page-body { margin-right: 0; } } + .file-list { + .file-item { + padding: 16px; + border: 1px solid #CCCCCC; + border-radius: 8px; + display: flex; + margin-bottom: 32px; + img { + width: 96px; + height: 96px; + } + div { + align-self: center; + } + } + } p { color: #999; line-height: 44px; diff --git a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue b/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue index 4d8aec03..fffd0a2d 100644 --- a/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue +++ b/src/project/hljjm/AppRecognize/AppRecognizeSearch.vue @@ -22,7 +22,7 @@
查询
-
返回
+
diff --git a/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue b/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue index 2f895389..c67d3704 100644 --- a/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue +++ b/src/project/hljjm/AppSecurityObject/AppSecurityObject.vue @@ -4,15 +4,15 @@
-
- {{$dict.getLabel('CHILD_CATEGORY_CODE', childTypeCode) || '儿童类别'}} +
+ {{$dictHlj.getLabel('CHILD_CATEGORY_CODE', childTypeCode) || '儿童类别'}}
儿童姓名：{{item.name}}
身份证号：{{item.idNumber}}
-
儿童类别：{{item.childType}}
+
儿童类别：{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', item.childTypeCode)}}
{{item.itemName}}
@@ -21,7 +21,7 @@
- + @@ -48,6 +48,7 @@ export default { pageTotal: 2, list: [], isShowType: false, + typeList: [], childTypeCode: '' } }, @@ -59,7 +60,9 @@ export default { uni.setNavigationBarTitle({ title: '保障对象管理' }) - this.$dict.load(['item_Type', 'CHILD_CATEGORY_CODE']).then(() => { + this.$dictHlj.load(['item_Type', 'CHILD_CATEGORY_CODE']).then(() => { + this.typeList = this.$dictHlj.getDict('CHILD_CATEGORY_CODE') + this.typeList.unshift({label: '全部', value: ''}) this.getList() }) }, @@ -69,6 +72,9 @@ export default { methods: { change(e) { this.tabIndex = e + this.getListInit() + }, + getListInit() { this.current = 1 this.pageTotal = 2 this.list = [] @@ -100,6 +106,7 @@ export default { }, typeChange(e) { this.childTypeCode = e[0].value + this.getListInit() }, }, } diff --git a/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue b/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue index 7eeee902..e82e2606 100644 --- a/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue +++ b/src/project/hljjm/AppSecurityObject/AppSecurityObjectDetail.vue @@ -2,14 +2,14 @@
-
+
基本信息
- +
儿童类别
-
{{$dict.getLabel('CHILD_CATEGORY_CODE', info.childType) || '-'}}
+
{{$dictHlj.getLabel('CHILD_CATEGORY_CODE', info.childType) || '-'}}
儿童名称
@@ -21,7 +21,7 @@
性别
-
{{$dict.getLabel('GENDER_CODE', info.gender) || '-'}}
+
{{$dictHlj.getLabel('GENDER_CODE', info.gender) || '-'}}
户籍地址
@@ -30,9 +30,9 @@
-
+
事项信息
- +
@@ -111,8 +111,8 @@ export default { childTypeCode: '', itemType: '', info: {}, - isShowBasic: false, - isShowMatter: false, + isShowBasic: true, + isShowMatter: true, } }, onLoad(option) { @@ -126,10 +126,9 @@ export default { this.childrenId = option.childrenId this.childTypeCode = option.childTypeCode this.itemType = option.itemType - // this.$dict.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { - // this.getDetail() - // }) - this.getDetail() + this.$dictHlj.load(['CHILD_CATEGORY_CODE', 'GENDER_CODE']).then(() => { + this.getDetail() + }) }, computed: { ...mapState(['user']),