监测对象

packages/jianping/AppHelpedResident/AppHelpedResident.vue

@@ -27,7 +27,7 @@ export default {
   },
   created() {
     this.dict.load("sex", "fpNation", "fpPrtpStatus", "fpHealth", "fpStudentsInSchool", 'fpYesOrNo', "fpRelationship",
-        "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook","fpType", "fpRiskType",
+        "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook","fpType", "fpRiskType", "fpAssistanceMeasures",
         "fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance","fpIndustrialAssistance","fpSocialAssistance")
   }
 }

packages/jianping/AppHelpedResident/detail/hrLog.vue

@@ -11,7 +11,7 @@
             <b v-text="row.createUserName"/>
             <span v-text="row.createTime"/>
           </el-row>
-          <p>操作类型：</p>
+          <p>操作类型：{{row.operationDesc}}</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
           <div class="btns">

packages/jianping/AppHelpedResident/detail/hrMeasure.vue

@@ -10,7 +10,7 @@
             <b v-text="row.createUserName"/>
             <span v-text="row.createTime"/>
           </el-row>
-          <p>帮扶类型:</p>
+          <p>帮扶类型:{{dict.getLabel('fpAssistanceMeasures', row.operationDesc)}}</p>
           <div class="content" v-text="row.detail"/>
           <ai-uploader v-model="row.files" disabled/>
           <div class="btns">
@@ -23,17 +23,16 @@
     </ai-card>
     <ai-dialog :visible.sync="dialog" :title="addTitle" @closed="form={}" @onConfirm="submit" width="600px">
       <el-form :model="form" :rules="rules" ref="DialogForm" size="small" label-width="80px">
-        <el-form-item label="帮扶类型" prop="sex">
+        <el-form-item label="帮扶类型" prop="operationDesc">
           <ai-select
-            v-model="form.sex"
+            v-model="form.operationDesc"
-            :selectList="dict.getDict('sex')"
+            :selectList="dict.getDict('fpAssistanceMeasures')"
-            disabled
           />
         </el-form-item>
-        <el-form-item label="帮扶措施" prop="detail">
+        <el-form-item label="帮扶措施">
           <el-input type="textarea" v-model="form.detail" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
         </el-form-item>
-        <el-form-item label="图片" prop="files">
+        <el-form-item label="图片">
           <ai-uploader v-model="form.files" :instance="instance" acceptType=".jpg,.jpeg,.png">
             <template #tips>
               最多9张,仅支持10M以内的jpg、jpeg、png格式照片
@@ -66,7 +65,7 @@ export default {
       dialog: false,
       form: {},
       rules: {
-        detail: {required: true, message: "请输入帮扶措施"}
+        operationDesc: {required: true, message: "请输入帮扶措施"}
       },
       tableData: []
     }

packages/jianping/AppHelpedResident/hrDetail.vue

@@ -16,6 +16,25 @@
             <el-button type="primary" @click="handleAccept(0)"
               >驳回申请</el-button
             >
+          </template>
+          <template v-if="/2/.test(detail.status) && isGridAdmin">
+            <el-button type="primary" @click="handleRelieve(1)"
+              >解除风险</el-button
+            >
+            <el-button type="primary" @click="handleRelieve(0)"
+              >继续监测</el-button
+            >
+          </template>
+          <template v-if="/3/.test(detail.status) && isGridAdmin">
+            <el-button type="primary" @click="handleAccept(1)"
+              >纳入监测</el-button
+            >
+            <el-button
+              v-if="isGridAdmin"
+              icon="iconfont iconDelete"
+              @click="handleDelete(detail.id)"
+              >删除</el-button
+            >
           </template>
             <template v-if="/1/.test(detail.status)">
             <el-button
@@ -37,25 +56,6 @@
               >删除</el-button
             >
           </template>
-          <template v-if="/2/.test(detail.status) && isGridAdmin">
-            <el-button type="primary" @click="handleRelieve(1)"
-              >解除风险</el-button
-            >
-            <el-button type="primary" @click="handleRelieve(0)"
-              >继续监测</el-button
-            >
-          </template>
-          <template v-if="/3/.test(detail.status) && isGridAdmin">
-            <el-button type="primary" @click="handleAccept(1)"
-              >纳入监测</el-button
-            >
-            <el-button
-              v-if="isGridAdmin"
-              icon="iconfont iconDelete"
-              @click="handleDelete(detail.id)"
-              >删除</el-button
-            >
-          </template>
           <template v-if="/5/.test(detail.status)">
             <el-button
               v-if="isGridAdmin"
@@ -63,7 +63,7 @@
               @click="handleAccept(1)"
               >纳入监测</el-button
             >
-            <el-button v-else type="primary" @click="handleAccept()"
+            <el-button v-else type="primary" @click="applyMonitor('申请纳入监测')"
               >申请纳入监测</el-button
             >
             <el-button
@@ -80,6 +80,8 @@
           >
             删除
           </el-button>
+          <el-button type="primary" @click="applyMonitor('申请纳入监测')">申请纳入监测</el-button>
+          <el-button type="primary" @click="examine('纳入监测审批')">纳入监测</el-button>
         </template>
       </ai-title>
       <template #content>
@@ -232,7 +234,6 @@
                 </template>
               </ai-card>
               <template>
-                <!-- v-if="/[123]/.test(detail.status)" -->
                 <ai-card title="收入情况(单位:元)">
                   <template slot="content">
                     <div flex class="half wrap">
@@ -263,43 +264,6 @@
                     </div>
                   </template>
                 </ai-card>
-                <!-- <ai-card title="帮扶情况">
-                  <template slot="content">
-                    <div flex class="half wrap">
-                      <el-form-item label="产业帮扶">{{
-                          dict.getLabel('fpIndustrialAssistance', detail.industrialAssistance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="健康帮扶">{{
-                          dict.getLabel('fpHealthAssistance', detail.healthAssistance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="就业帮扶">{{
-                          dict.getLabel('fpEmploymentAssistance', detail.employmentAssistance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="教育帮扶">
-                        {{ dict.getLabel('fpEducationalAssistance', detail.educationalAssistance) }}
-                      </el-form-item>
-                      <el-form-item label="金融帮扶">{{
-                          dict.getLabel('fpFnancialAssistance', detail.financialAssistance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="社会帮扶">{{
-                          dict.getLabel('fpSocialAssistance', detail.socialAssistance)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="公益岗帮扶">
-                        {{ dict.getLabel('fpPublicWelfarePostAssistance', detail.publicWelfarePostAssistance) }}
-                      </el-form-item>
-                      <el-form-item label="是否风险消除">{{
-                          dict.getLabel('fpYesOrNo', detail.riskEliminated)
-                        }}
-                      </el-form-item>
-                      <el-form-item label="风险消除日期">{{ detail.riskEliminatedTime }}</el-form-item>
-                    </div>
-                  </template>
-                </ai-card> -->
                 <ai-card title="家庭成员">
                   <template #right>
                     <span
@@ -647,6 +611,77 @@
             </el-form-item>
           </el-form>
         </ai-dialog>
+        <!-- <ai-dialog :visible.sync="isShowApply" :title="dialogTitle" @closed="form={}" @onConfirm="submitApply" width="600px">
+          <el-form :model="applyInfo" :rules="rulesApply" ref="dialogApplyInfo" size="small" label-width="80px">
+            <el-form-item label="风险因素" prop="riskType">
+              <ai-select
+                v-model="applyInfo.riskType"
+                :selectList="dict.getDict('fpRiskType')"
+              />
+            </el-form-item>
+            <el-form-item label="风险消除因素" prop="riskType">
+              <ai-select
+                v-model="applyInfo.riskType"
+                :selectList="dict.getDict('fpRiskType')"
+              />
+            </el-form-item>
+            <el-form-item label="备注说明">
+              <el-input type="textarea" v-model="applyInfo.detail" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
+            </el-form-item>
+            <el-form-item label="图片">
+              <ai-uploader v-model="applyInfo.files" :instance="instance" acceptType=".jpg,.jpeg,.png">
+                <template #tips>
+                  最多9张,仅支持10M以内的jpg、jpeg、png格式照片
+                </template>
+              </ai-uploader>
+            </el-form-item>
+          </el-form>
+        </ai-dialog> -->
+        <ai-dialog :visible.sync="isShowExamine" :title="dialogTitle" @closed="form={}" @onConfirm="submitApply" width="800px" customFooter>
+          <el-steps :active="2" align-center>
+            <el-step title="申请信息"></el-step>
+            <el-step title="处理意见"></el-step>
+            <el-step title="完成"></el-step>
+          </el-steps>
+          <div class="info">
+            <ai-wrapper label-width="120px" :columnsNumber="2" style="margin-top: 16px;">
+              <ai-info-item label="操作类型" :value="detail.name"/>
+              <ai-info-item label="风险因素" :value="detail.name"/>
+              <ai-info-item label="风险消除方式" :value="detail.name"/>
+              <ai-info-item label="申请人" :value="detail.name"/>
+              <ai-info-item label="申请时间" :value="detail.name"/>
+            </ai-wrapper>
+            <ai-wrapper label-width="120px" :columnsNumber="1">
+              <ai-info-item label="备注说明" :value="detail.name"/>
+            </ai-wrapper>
+            <ai-uploader v-model="detail.files" disabled/>
+          </div>
+          <div class="form">
+            <el-form :model="applyInfo" :rules="rulesApply" ref="dialogApplyInfo" size="small" label-width="80px">
+              <el-form-item label="审核结果" prop="riskType">
+                <el-radio-group v-model="rulesApply.radio">
+                  <el-radio :label="3">解除风险</el-radio>
+                  <el-radio :label="3">纳入监测</el-radio>
+                  <el-radio :label="6">驳回申请</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="备注说明">
+                <el-input type="textarea" v-model="applyInfo.detail" placeholder="请输入" maxlength="500" show-word-limit rows="5"/>
+              </el-form-item>
+              <el-form-item label="图片">
+                <ai-uploader v-model="applyInfo.files" :instance="instance" acceptType=".jpg,.jpeg,.png">
+                  <template #tips>
+                    最多9张,仅支持10M以内的jpg、jpeg、png格式照片
+                  </template>
+                </ai-uploader>
+              </el-form-item>
+            </el-form>
+          </div>
+          <template slot="footer">
+            <el-button>取消</el-button>
+            <el-button type="primary">下一步</el-button>
+          </template>
+        </ai-dialog>
       </template>
     </ai-detail>
   </section>
@@ -711,6 +746,11 @@ export default {
         householdIdNumber: [{ required: true, message: "请选择户主身份证号" }],
       };
     },
+    rulesApply() {
+      return {
+        riskType: [{ required: true, message: "请选择风险因素" }],
+      };
+    },
     rootArea() {
       return this.user.info?.areaId?.replace(/(\d{6})\d+/g, '$1' + Array(7).join("0")) || ""
     }
@@ -724,7 +764,11 @@ export default {
       isEdit: false,
       isShowDetail: false,
       familyInfo: {},
-      isSelectUser: false
+      isSelectUser: false,
+      isShowApply: false,
+      dialogTitle: '',
+      applyInfo: {},
+      isShowExamine: false
     };
   },
   methods: {
@@ -831,6 +875,30 @@ export default {
       let { query } = this.$route;
       this.$router.push({ query, hash: "#add" });
     },
+    applyMonitor(title) {
+      this.dialogTitle = title
+      this.isShowApply = true
+    },
+    submitApply() {
+      this.$refs.dialogApplyInfo.validate((v) => {
+        if (v) {
+          // this.instance.post(`/app/apppreventionreturntopoverty/addOrUpdate`, this.form).then(res => {
+          //   if (res.code == 0) {
+          //     this.getDetail()
+          //     this.$message.success('提交成功!');
+          //     this.isShowAdd = false
+          //   }
+          // })
+        }
+      });
+    },
+    examine(title) {
+      this.dialogTitle = title
+      this.isShowExamine = true
+    },
+
+
+
     handleDelete(ids) {
       this.$confirm("是否要删除监测对象")
         .then(() => {
@@ -925,5 +993,21 @@ export default {
     max-height: calc(100vh - 136px);
     overflow-y: auto;
   }
+
+  ::v-deep .el-step__icon{
+    border-color: #ccc!important;
+  }
+  ::v-deep .el-step__line{
+    background-color: #ccc!important;
+  }
+  ::v-deep .el-step__title{
+    color: #666!important;
+  }
+  ::v-deep .is-finish{
+    color: #26f!important;
+  }
+  ::v-deep .is-finish .el-step__icon{
+    border-color: #26f!important;
+  }
 }
 </style>