From 192af3122363db1a9176e175b98c7f0a21609806 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 28 Apr 2022 14:32:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A3=8E=E9=99=A9=E6=B6=88=E9=99=A4=20?=
 =?UTF-8?q?=E6=94=B6=E5=85=A5=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/jianping/AppHelpedResident/hrAdd.vue | 82 +++++++++++++++----
 .../jianping/AppHelpedResident/hrDetail.vue   | 37 ++++++++-
 2 files changed, 97 insertions(+), 22 deletions(-)

diff --git a/packages/jianping/AppHelpedResident/hrAdd.vue b/packages/jianping/AppHelpedResident/hrAdd.vue
index d08e8ecd..f227e9c4 100644
--- a/packages/jianping/AppHelpedResident/hrAdd.vue
+++ b/packages/jianping/AppHelpedResident/hrAdd.vue
@@ -78,7 +78,7 @@
                   <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="务工时间(月)">
-                  <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
+                  <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
                 </el-form-item>
                 <el-form-item label="就业渠道">
                   <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
@@ -93,7 +93,7 @@
                   <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="公益性岗位(月数)">
-                  <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
+                  <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
                 </el-form-item>
               </div>
               <el-form-item label="务工所在地">
@@ -224,49 +224,83 @@
             <template slot="content">
               <div flex class="half wrap">
                 <el-form-item label="纳入监测对象的收入参考范围">
-                  <el-input v-model="form.income1" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income1" placeholder="请输入" type="number" @input="decimalInput('income1')" clearable/>
                 </el-form-item>
                 <el-form-item label="纳入监测对象的人均收入参考范围">
-                  <el-input v-model="form.income2" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income2" placeholder="请输入" type="number" @input="decimalInput('income2')" clearable/>
                 </el-form-item>
                 <el-form-item label="工资性收入(元)">
-                  <el-input v-model="form.income3" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income3" placeholder="请输入" type="number" @input="decimalInput('income3')" clearable/>
                 </el-form-item>
                 <el-form-item label="生产经营性收入(元)">
-                  <el-input v-model="form.income4" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income4" placeholder="请输入" type="number" @input="decimalInput('income4')" clearable/>
                 </el-form-item>
                 <el-form-item label="计划生育金(元)">
-                  <el-input v-model="form.income5" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income5" placeholder="请输入" type="number" @input="decimalInput('income5')" clearable/>
                 </el-form-item>
                 <el-form-item label="资产收益扶贫分红收入">
-                  <el-input v-model="form.income6" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income6" placeholder="请输入" type="number" @input="decimalInput('income6')" clearable/>
                 </el-form-item>
                 <el-form-item label="低保金(元)">
-                  <el-input v-model="form.income7" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income7" placeholder="请输入" type="number" @input="decimalInput('income7')" clearable/>
                 </el-form-item>
                 <el-form-item label="特困供养金(元)">
-                  <el-input v-model="form.income8" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income8" placeholder="请输入" type="number" @input="decimalInput('income8')" clearable/>
                 </el-form-item>
                 <el-form-item label="养老保险金(元)">
-                  <el-input v-model="form.income9" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income9" placeholder="请输入" type="number" @input="decimalInput('income9')" clearable/>
                 </el-form-item>
                 <el-form-item label="生态补偿金(元)">
-                  <el-input v-model="form.income10" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income10" placeholder="请输入" type="number" @input="decimalInput('income10')" clearable/>
                 </el-form-item>
                 <el-form-item label="转移性收入(元)">
-                  <el-input v-model="form.income11" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income11" placeholder="请输入" type="number" @input="decimalInput('income11')" clearable/>
                 </el-form-item>
                 <el-form-item label="其它转移性收入(元)">
-                  <el-input v-model="form.income12" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income12" placeholder="请输入" type="number" @input="decimalInput('income12')" clearable/>
                 </el-form-item>
                 <el-form-item label="财产性收入(元)">
-                  <el-input v-model="form.income13" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income13" placeholder="请输入" type="number" @input="decimalInput('income13')" clearable/>
                 </el-form-item>
                 <el-form-item label="其它财产收入(元)">
-                  <el-input v-model="form.income14" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income14" placeholder="请输入" type="number" @input="decimalInput('income14')" clearable/>
                 </el-form-item>
                 <el-form-item label="生产经营性支出(元)">
-                  <el-input v-model="form.income15" placeholder="请输入" clearable/>
+                  <el-input v-model="form.income15" placeholder="请输入" type="number" @input="decimalInput('income15')" clearable/>
+                </el-form-item>
+              </div>
+            </template>
+          </ai-card>
+
+          <ai-card title="风险消除情况" v-if="form.status == 3">
+            <template slot="content">
+              <div flex class="half wrap">
+                <el-form-item label="工资性收入情况">
+                  <el-input v-model="form.fxxcIncome1" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome1')" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性收入情况">
+                  <el-input v-model="form.fxxcIncome2" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome2')" clearable/>
+                </el-form-item>
+                <el-form-item label="财产性收入情况">
+                  <el-input v-model="form.fxxcIncome3" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome3')" clearable/>
+                </el-form-item>
+                <el-form-item label="转移性收入情况">
+                  <el-input v-model="form.fxxcIncome4" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome4')" clearable/>
+                </el-form-item>
+                <el-form-item label="理赔收入情况">
+                  <el-input v-model="form.fxxcIncome5" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome5')" clearable/>
+                </el-form-item>
+                <el-form-item label="生产经营性支出情况">
+                  <el-input v-model="form.fxxcIncome6" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome6')" clearable/>
+                </el-form-item>
+                <el-form-item label="合规自然收支情况">
+                  <el-input v-model="form.fxxcIncome7" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome7')" clearable/>
+                </el-form-item>
+                <el-form-item label="家庭纯收入情况">
+                  <el-input v-model="form.fxxcIncome8" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome8')" clearable/>
+                </el-form-item>
+                <el-form-item label="家庭人均纯收入情况">
+                  <el-input v-model="form.fxxcIncome9" placeholder="请输入" type="number" @input="decimalInput('fxxcIncome9')" clearable/>
                 </el-form-item>
               </div>
             </template>
@@ -457,7 +491,19 @@ export default {
       }else {
         this.form[formName] = '02'
       }
-    }
+    },
+    decimalInput(name) {
+      if(!/^(([1-9]{1}\d*)|(0{1}))(\.\d{1,2})?$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('最多只保留两位小数点')
+      }
+    },
+    numberInput(name) {
+      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('请输入正整数')
+      }
+    },
   },
   created() {
     this.getDetail()
diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index 83eb6e6e..c8d479b8 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -150,6 +150,21 @@
                   </div>
                 </template>
               </ai-card>
+              <ai-card title="风险消除情况" v-if="detail.status == 3">
+                <template slot="content">
+                  <div flex class="half wrap">
+                    <el-form-item label="工资性收入情况">{{detail.fxxcIncome1}}</el-form-item>
+                    <el-form-item label="生产经营性收入情况">{{detail.fxxcIncome2}}</el-form-item>
+                    <el-form-item label="财产性收入情况">{{detail.fxxcIncome3}}</el-form-item>
+                    <el-form-item label="转移性收入情况">{{detail.fxxcIncome4}}</el-form-item>
+                    <el-form-item label="理赔收入情况">{{detail.fxxcIncome5}}</el-form-item>
+                    <el-form-item label="生产经营性支出情况">{{detail.fxxcIncome6}}</el-form-item>
+                    <el-form-item label="合规自然收支情况">{{detail.fxxcIncome7}}</el-form-item>
+                    <el-form-item label="家庭纯收入情况">{{detail.fxxcIncome8}}</el-form-item>
+                    <el-form-item label="家庭人均纯收入情况">{{detail.fxxcIncome9}}</el-form-item>
+                  </div>
+                </template>
+              </ai-card>
               <ai-card title="家庭成员">
                 <template #right>
                   <span style=" color: #2266ff; margin-left: 16px;cursor: pointer;font-size: 12px;" @click="addFamily({})">添加</span>
@@ -252,7 +267,7 @@
                 <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="务工时间(月)">
-                <el-input v-model="form.workeMonths" placeholder="请输入" clearable />
+                <el-input type="number" v-model="form.workeMonths" placeholder="请输入" clearable @input="numberInput('workeMonths')" />
               </el-form-item>
               <el-form-item label="就业渠道">
                 <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
@@ -267,7 +282,7 @@
                 <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
               </el-form-item>
               <el-form-item label="公益性岗位(月数)">
-                <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable />
+                <el-input type="number" v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable @input="numberInput('publicWelfarePostsMonths')" />
               </el-form-item>
             </div>
             <el-form-item label="务工所在地">
@@ -710,7 +725,11 @@ export default {
             })
             this.applyInfo.files = ids.join(',')
           }
-          this.instance.post(url, null, { params: this.applyInfo }).then(res => {
+          let fromData = new FormData()
+          for (let key in this.applyInfo) {
+            fromData.append(key, this.applyInfo[key])
+          }
+          this.instance.post(url, fromData).then(res => {
             if (res.code == 0) {
               this.getDetail()
               this.$message.success('提交成功!');
@@ -744,7 +763,11 @@ export default {
         if (this.changeStatus == 5) { //5 解除风险
           url = `/app/apppreventionreturntopoverty/relieve`
         }
-        this.instance.post(url, null, { params: this.examineFrom }).then(res => {
+        let fromData = new FormData()
+        for (let key in this.examineFrom) {
+          fromData.append(key, this.examineFrom[key])
+        }
+        this.instance.post(url, fromData ).then(res => {
           if (res.code == 0) {
             this.getDetail()
             this.$message.success('提交成功!');
@@ -774,6 +797,12 @@ export default {
         });
       })
     },
+    numberInput(name) {
+      if(!/^[0-9]*[1-9][0-9]*$/g.test(this.form[name])){
+        this.form[name] = ''
+        return this.$message.error('请输入正整数')
+      }
+    },
   },
   created() {
     this.getDetail();

From 197201d923e6370400ba7f32587d8fb286d9980c Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Thu, 28 Apr 2022 14:49:04 +0800
Subject: [PATCH 2/2] 29399

---
 packages/jianping/AppHelpedResident/hrDetail.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/jianping/AppHelpedResident/hrDetail.vue b/packages/jianping/AppHelpedResident/hrDetail.vue
index c8d479b8..fbfe6ac2 100644
--- a/packages/jianping/AppHelpedResident/hrDetail.vue
+++ b/packages/jianping/AppHelpedResident/hrDetail.vue
@@ -812,7 +812,6 @@ export default {
 
 <style lang="scss" scoped>
 .hrDetail {
-  height: 100%;
 
   .flex-start {
     align-items: flex-start;