diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue
index 1b002801..f4ff8d12 100644
--- a/packages/device/AppBroadcast/components/List.vue
+++ b/packages/device/AppBroadcast/components/List.vue
@@ -71,7 +71,9 @@ export default {
ids: [],
colConfigs: [
{prop: 'sourceName', label: '媒资名称', width: 200},
- {prop: 'cyclingType', label: '媒资类型', align: 'center', dict: "dlbResourceType"},
+ {prop: 'cyclingType', label: '媒资类型', align: 'center', render: (h, {row}) => {
+ return h('span', null, this.dict.getLabel('dlbDyclingType',row.cyclingType))},
+ },
{prop: 'messageLevel', label: '级别', align: 'center', dict: "dlbMessageUrgency"},
{prop: 'taskType', label: '播发方式', align: 'center', render: (h, {row}) => {
return h('span', null, (row.taskType == 1? '定时播放':'立即播放'))},
diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue
index 38a2a5d1..58765e73 100644
--- a/packages/device/AppEquipmentManage/components/taskList.vue
+++ b/packages/device/AppEquipmentManage/components/taskList.vue
@@ -100,7 +100,7 @@ export default {
}
},
created() {
- this.$dict.load('dlbDyclingType','dlbMessageUrgency').then(()=>{
+ this.$dict.load('dlbDyclingType','dlbMessageUrgency',).then(()=>{
this.getList()
})
},
diff --git a/packages/work/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue
index 2bf20222..9986c499 100644
--- a/packages/work/AppHelpedResident/hrAdd.vue
+++ b/packages/work/AppHelpedResident/hrAdd.vue
@@ -36,6 +36,9 @@
+
+
+
@@ -341,6 +344,7 @@ export default {
idNumber: [{required: true, message: "请输入证件号"}],
name: [{required: true, message: "请输入姓名"}],
sex: [{required: true, message: "请选择性别"}],
+ familyCount: [{required: true, message: "请输入家庭人口数"}],
phone: [{required: true, message: "请输入联系方式"}],
currentAreaId: [
{required: true, message: "请选择现住址"},
diff --git a/packages/work/AppHelpedResident/hrDetail.vue b/packages/work/AppHelpedResident/hrDetail.vue
index 0b9fa7a1..97a2fca1 100644
--- a/packages/work/AppHelpedResident/hrDetail.vue
+++ b/packages/work/AppHelpedResident/hrDetail.vue
@@ -42,6 +42,7 @@
{{ detail.idNumber }}
{{ dict.getLabel("sex", detail.sex) }}
{{ detail.birthDate }}
+ {{ detail.familyCount}}
{{ dict.getLabel("fpNation", detail.nation) }}
{{ dict.getLabel("fpEducation", detail.education) }}