新增监测

src/apps/AppMonitoringObject/Add.vue

@@ -16,17 +16,17 @@
             </div>
           </div>
         </div>
-        <div class="form-item">
-          <div class="form-item__wrapper" @click="toSelect">
+        <!-- <div class="form-item">
+          <div class="form-item__wrapper">
             <div class="left">
               <i style="width: 8px;"></i>
               <span>选择户主</span>
             </div>
             <div class="right">
-              <AiSelect dict="fpType" v-model="form.objectType"></AiSelect>
-            </div>
+              <AiPagePicker class="select" :selected.sync="form.name">请选择</AiPagePicker>
             </div>
           </div>
+        </div> -->
         <div class="form-item">
           <div class="form-item__wrapper">
             <div class="left">
@@ -150,11 +150,11 @@
           </div>
         </div>
         <div class="upload">
-          <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
+          <AiUploader :def.sync="photo" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
         </div>
       </div>
-    
-      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
+     </div>
+    <!-- <div style="height: 8px; width: 100%;background: #f3f4f5;"></div> -->
 
     <div class="form-group" v-if="isEdit">
       <div class="form-item">
@@ -214,7 +214,7 @@
       </div>
     </div>
 
-      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
+    <!-- <div style="height: 8px; width: 100%;background: #f3f4f5;"></div> -->
 
     <div class="form-group" v-if="isEdit">
       <div class="form-item">
@@ -278,7 +278,31 @@
         </div>
       </div>
     </div>
+
+    <!-- 情况描述 -->
+    <div class="condition" v-if="current == 1">
+      <div class="risk">
+        <div><span style="color: #FF4466;">*</span>风险因素</div>
+        <div>
+          <AiSelect dict="fpRiskType" v-model="form.riskType"></AiSelect>
         </div>
+      </div>
+      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
+      <div class="remark">
+        <p><span style="color: #FF4466;">*</span>备注说明</p>
+        <div>
+          <u-input v-model="form.detail" type="textarea" height="150" :maxlength='500' clearable />
+        </div>
+      </div>
+      <div style="height: 8px; width: 100%;background: #f3f4f5;"></div>
+      <div class="remark">
+        <p><span style="width: 8px;"></span>图片<span style="color: #999;font-size: 14px;">(最多9张)</span></p>
+        <div style="margin-top: 30px;">
+          <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="1" action="/admin/file/add2"></AiUploader>
+        </div>
+      </div>
+    </div>
+   
     
     <div class="btn" hover-class="text" @click="nextStep" v-if="current == 0">下一步</div>
     <div class="btn" hover-class="text" @click="submit" v-if="current == 1"> {{ girdInfo.checkType == 2 ? '保存' : '申请纳入监测' }}</div>
@@ -323,12 +347,16 @@ export default {
         healthyStatus: '',
         age: '',
         birthday: '',
-        isHousehold: ''
+        isHousehold: '',
+        photo: '',
+        riskType: '',
+        detail: '',
       },
       $areaId: '',
-      isEdit: true,
+      isEdit: false,
       id: '',
       girdInfo: {},
+      photo: []
     }
   },
   computed: {
@@ -337,7 +365,7 @@ export default {
 
   onLoad(query) {
     this.isGirdUser()
-    this.$dict.load(['fpType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
+    this.$dict.load(['fpType','fpRiskType', 'riskEliminationMethod', 'fpRiskType', 'fpYesOrNo', 'fpNation', 'fpEducation', 'fpStudentsInSchool', 'fpHealth',
     'fpLaborSkills', 'fpPoliticalOutlook', 'sex', 'fpHealth']).then(() => {
       if (query.id) {
         this.isEdit = true
@@ -356,9 +384,9 @@ export default {
 
   methods: {
     toSelect() {
-      uni.navigateTo({
-        url: './residentList'
-      })
+      // uni.navigateTo({
+      //   url: './residentList'
+      // })
     },
     rules() {
       return {
@@ -407,6 +435,7 @@ export default {
       this.form.householdIdNumber = this.form.idNumber
       this.form.householdRelation = '01'
       this.form.isHousehold = 1
+      this.form.photo = this.photo[0].accessUrl
       this.current = 1
     },
 
@@ -419,9 +448,7 @@ export default {
         if (res.code == 0) {
           this.$u.toast(this.isEdit ? '保存成功' : '提交成功')
           uni.$emit('reload')
-          uni.navigateBack({
-            delta: 1
-          })
+          uni.navigateTo({url: './serviceResult'})
         }
       }).catch((err) => {
         this.$u.toast(err)
@@ -655,6 +682,20 @@ export default {
     }
   }
 
+  .condition {
+    margin-top: 16px;
+    .risk {
+      display: flex;
+      justify-content: space-between;
+      padding: 30px 32px;
+      box-sizing: border-box;
+    }
+    .remark {
+      padding: 30px 32px;
+      box-sizing: border-box;
+    }
+  }
+
   .btn {
     position: fixed;
     left: 0;

src/apps/AppMonitoringObject/residentList.vue

@@ -1,93 +0,0 @@
-<template>
-  <div class="residentList">
-    <div class="searchBox">
-      <u-search placeholder="请输入户主姓名/联系方式/身份证后6位" v-model="keyword" :show-action="false"></u-search>
-    </div>
-    <div class="card-list">
-      <div class="item">
-        <div class="user-pic">
-          <img src="./components/img/user-img.png" alt="">
-        </div>
-        <div class="info">
-          <h4>李毅</h4>
-          <div class="num">
-            <div>42068219980502252X</div>
-            <div>18571799417</div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-export default {
-  name: "residentList",
-  data() {
-    return {
-      keyword: '',
-    }
-  },
-  onLoad() {},
-  onShow() {
-
-  },
-  methods: {
-    getUser() {
-      this.$http.post('/app/appresident/list', null,{
-
-      }).then(res => {
-        console.log(res);
-      })
-    }
-  },
-
-}
-</script>
-
-<style lang="scss" socped>
-.residentList {
-  .searchBox {
-    height: 104px;
-    line-height: 104px;
-    padding: 0 32px;
-    box-sizing: border-box;
-    background: #FFF;
-    border-bottom: 1px solid #DDD;
-  }
-  .card-list {
-    padding: 0 32px;
-    box-sizing: border-box;
-    background: #FFF;
-    .item {
-      display: flex;
-      padding: 24px 0;
-      box-sizing: border-box;
-      border-bottom: 1px solid #DDD;
-      .user-pic {
-        width: 80px;
-        height: 80px;
-        margin-right: 32px;
-        img {
-          width: 100%;
-          height: 100%;
-        }
-      }
-      .info {
-        width: calc(100% - 112px);
-        h4 {
-          font-size: 32px;
-          font-weight: 600;
-        }
-        .num {
-          margin-top: 8px;
-          color: #999999;
-          font-style: 26px;
-          display: flex;
-          justify-content: space-between;
-        }
-      }
-    }
-  }
-}
-</style>

src/apps/AppMonitoringObject/serviceResult.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="service-result">
+    <image src="./components/img/service-success.png" />
+    <h2> 申请成功，请等待管理员审批！</h2>
+    <!-- <div class="text">
+      <span>可在</span>
+      <i>我的-进度查询</i>
+      <span>中查看</span>
+    </div> -->
+    <div class="service-btn" hover-class="text-hover" @click="back">确定</div>
+  </div>
+</template>
+
+<script>
+  export default {
+    data () {
+      return {
+
+      }
+    },
+
+    onLoad (query) {
+      uni.setNavigationBarTitle({
+        title: query.title
+      })
+    },
+
+    methods: {
+      back () {
+        uni.navigateBack({
+          delta: 2
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .service-result {
+    min-height: 100vh;
+    padding-top: 96rpx;
+    text-align: center;
+    background: #fff;
+
+    .service-btn {
+      width: 558rpx;
+      height: 88rpx;
+      line-height: 88rpx;
+      margin: 120rpx auto 0;
+      text-align: center;
+      background: #197DF0;
+      font-size: 36rpx;
+      color: #fff;
+      box-shadow: 0px 8rpx 16rpx 0px rgba(0, 0, 0, 0.02);
+      border-radius: 8rpx;
+    }
+
+    h2 {
+      margin-bottom: 32rpx;
+      color: #333333;
+      font-size: 36rpx;
+      font-weight: 600;
+    }
+
+    .text {
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      font-size: 28rpx;
+      color: #333;
+
+      i {
+        color: #467DFE;
+      }
+    }
+
+    image {
+      width: 192rpx;
+      height: 192rpx;
+    }
+  }
+</style>