防返贫

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? '定时播放':'立即播放'))},

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()
     })
   },

packages/work/AppHelpedResident/hrAdd.vue

@@ -36,6 +36,9 @@
                 <!-- <el-form-item label="年龄" prop="age">
                   <el-input disabled v-model="form.age" placeholder="请输入年龄" type="number"/>
                 </el-form-item> -->
+                <el-form-item label="家庭人口数" prop="familyCount">
+                  <el-input v-model="form.familyCount" placeholder="请输入家庭人口数" :disabled="isEdit || isSelectUser" type="number"/>
+                </el-form-item>
                 <el-form-item label="民族">
                   <ai-select v-model="form.nation" :selectList="dict.getDict('fpNation')"/>
                 </el-form-item>
@@ -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: "请选择现住址"},

packages/work/AppHelpedResident/hrDetail.vue

@@ -42,6 +42,7 @@
                       <el-form-item label="证件号">{{ detail.idNumber }}</el-form-item>
                       <el-form-item label="性别" prop="sex">{{ dict.getLabel("sex", detail.sex) }}</el-form-item>
                       <el-form-item label="出生日期">{{ detail.birthDate }}</el-form-item>
+                      <el-form-item label="家庭人口数">{{ detail.familyCount}}</el-form-item>
                       <!-- <el-form-item label="年龄" prop="age">{{ detail.age}}</el-form-item> -->
                       <el-form-item label="民族">{{ dict.getLabel("fpNation", detail.nation) }}</el-form-item>
                       <el-form-item label="文化程度">{{ dict.getLabel("fpEducation", detail.education) }}</el-form-item>