From 0d5a9fed107039721d3f24bd141db03f45aa4f74 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 4 Jul 2022 14:13:55 +0800
Subject: [PATCH] 30486

---
 packages/work/AppHelpedResident/hrAdd.vue                     | 4 ++--
 .../apps/AppPartyIntegralAudit/components/Detail.vue          | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/work/AppHelpedResident/hrAdd.vue b/packages/work/AppHelpedResident/hrAdd.vue
index d2d9fc45..0666c7f1 100644
--- a/packages/work/AppHelpedResident/hrAdd.vue
+++ b/packages/work/AppHelpedResident/hrAdd.vue
@@ -192,13 +192,13 @@
                   <el-radio v-model="form.houseType" label="1">监测对象</el-radio> -->
                   <ai-select v-model="form.houseType" :selectList="dict.getDict('fpHouseType')"/>
                 </el-form-item>
-                <el-form-item label="监测对象类型" :prop="form.houseType == 0? 'objectType':''">
+                <el-form-item label="监测对象类型" v-if="form.houseType == 1" :prop="form.houseType == 1? 'objectType':''">
                   <ai-select v-model="form.objectType" :selectList="dict.getDict('fpType')"/>
                 </el-form-item>
                 <el-form-item label="是否军烈属">
                   <ai-select v-model="form.militaryMartyrs" :selectList="dict.getDict('fpYesOrNo')"/>
                 </el-form-item>
-                <el-form-item label="风险因素" prop="riskType">
+                <el-form-item label="风险因素" :prop="form.houseType == 1? 'riskType': ''" v-if="form.houseType == 1">
                   <ai-select v-model="form.riskType" :selectList="dict.getDict('fpRiskType')"/>
                 </el-form-item>
                 <el-form-item label="脱贫年度">
diff --git a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
index 88768e3b..6290c820 100644
--- a/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
+++ b/project/sanjianxi/apps/AppPartyIntegralAudit/components/Detail.vue
@@ -199,6 +199,7 @@ export default {
       if(this.integralInfo.ruleType == 0 && this.form.pass == 1) {
         this.form.auditIntegral = this.integralInfo.integral
       }
+      // console.log(this.form.integralItem);
       this.$refs.form.validate(v => {
         if (v) {
           this.instance.post('/app/apppartyintegraldeclare/examine', null, {