建平需求变更调整完毕

src/apps/AppHelpEffect/AppHelpEffect.vue

@@ -1,128 +1,91 @@
 <template>
   <div class="AppHelpEffect">
     <AiTopFixed>
-      <div class="search"><u-search placeholder="请输入姓名、身份证号" @clear="name='',getList()" clearable v-model="name" :show-action="false" @search="search"></u-search></div>
+      <u-tabs :list="tabs" :is-scroll="false" :current="currentTab" height="96" bar-width="150" @change="v=>{currentTab=v,current=1}"/>
+      <div class="search">
+        <u-search placeholder="请输入姓名、身份证号" @clear="con='',getList()" clearable v-model="con" :show-action="false" @search="search"></u-search>
+      </div>
       <div class="select">
-        <div class="left">
-          <AiAreaPicker v-model="areaId" :area-id="user.areaId" :name.sync="areaName" @select="areaSelect" selectRoot>
-            <div>
-              <u-icon name="map-fill" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px"></u-icon>
-              <span v-if="areaId" style="color:#333;fontSize: 14px;" class="areaName">{{ areaName }}</span>
-              <span v-else style="color: #999;fontSize: 14px;" class="areaName">所在地区</span>
-              <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;margin-top:18px" @select="areaSelect"></u-icon>
-            </div>
-          </AiAreaPicker>
-        </div>
-        <div class="right">
-          <AiSelect v-model="houseType" :list="typeList" @data="typeSelect">
-            <span v-if="!houseType" style="color: #999;">户类型</span>
-            <span v-else>{{ $dict.getLabel('fpHouseType', houseType) }}</span>
-            <u-icon name="arrow-down" color="#999" size="24" style="margin-left: 4px;width: 14px;display:inline-block;"></u-icon>
-          </AiSelect>
-        </div>
+        <AiAreaPicker class="fill" v-model="areaId" :area-id="user.areaId" :name.sync="areaName" @select="areaSelect" selectRoot>
+          <div flex class="center">
+            <u-icon name="map-fill" size="32" color="#999" class="mar-r8"/>
+            <AiMore icon="arrow-down" v-model="areaName" placeholder="所在地区"/>
+          </div>
+        </AiAreaPicker>
+        <AiSelect v-if="currentTab=='0'" class="fill center" flex v-model="houseType" :list="typeList" @data="typeSelect">
+          <AiMore class="fill" icon="arrow-down" v-model="$dict.getLabel('fpHouseType', houseType)" placeholder="户类型"/>
+        </AiSelect>
       </div>
     </AiTopFixed>
-
     <div class="cardList">
-      <div v-if="list.length">
-        <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
-          <p class="user">
-            <span class="name">{{ item.name }}</span>
-            <span :style="{color: item.houseType==1? '#FF6300': '#00D25D'}">{{ $dict.getLabel('fpHouseType', item.houseType) }}</span>
-          </p>
-          <div class="idCard">{{ item.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
-          <div class="tel"><img src="./images/dh@2x.png" alt="">{{ item.phone}}</div>
-          <div class="address"><img src="./images/dz@2x.png" alt="">
-            {{ item.countyName + item.townName + item.villageName }}{{ item.currentAddress || '' }}
-          </div>
-        </div>
-      </div>
-      <AiEmpty v-else description="暂无数据"></AiEmpty>
+      <component ref="List" :is="currentPage.list" v-bind="{current,search:{areaId,houseType,con}}"/>
     </div>
- 
   </div>
 </template>
 
 <script>
 import {mapState} from 'vuex'
+import HelpedResidentList from "./helpedResidentList";
+import NormalFarmerList from "./normalFarmerList";
+
 export default {
   name: "AppHelpEffect",
+  components: {NormalFarmerList, HelpedResidentList},
   appName: '帮扶成效',
   data() {
     return {
-      name: "",
+      con: "",
       current: 1,
-      declareReason: "",
-      areaList: [],
       typeList: [],
-      houseType: 1,
-      list: [],
       areaId: '',
       areaName: '',
       houseType: '',
+      currentTab: '0'
     }
   },
   computed: {
-    ...mapState(['user'])
+    ...mapState(['user']),
+    tabs: () => [
+      {name: "监测对象", list: HelpedResidentList},
+      {name: "一般农户", list: NormalFarmerList}
+    ],
+    currentPage: v => v.tabs[v.currentTab] || {}
   },
-
   methods: {
     areaSelect(e) {
       this.areaId = e
-      this.current = 1
-      this.list = []
-      this.getList()
-    },
-    onLoad() {
-      this.$dict.load('fpHouseType').then(() => {
-        this.typeList = this.$dict.getDict('fpHouseType').map((item) =>{
-          return {
-            label: item.dictName,
-            value: item.dictValue
-          }
-        })
-        this.typeList.unshift({ label: '全部类型', value: ''})
-        this.areaId = this.user.areaId
-        this.getList()
-      })
-      
+      this.refreshList()
     },
     typeSelect(v) {
-      this.current = 1
-      this.list = []
       this.houseType = v?.[0].value
-      this.getList()
+      this.refreshList()
     },
     search(value) {
       this.name = value
-      this.list = []
-      this.current= 1
-      this.getList()
+      this.refreshList()
     },
-    getList() {
-      this.$http.post('/app/apppreventionreturntopoverty/list', null, {
-        params: {
-          current: this.current,
-          con: this.name,
-          areaId: this.areaId,
-          houseType: this.houseType
-        },
-      }).then((res) => {
-        if (res?.data) {
-          this.list = this.current > 1 ? [...this.list, ...res.data.records] : res.data.records
+    refreshList() {
+      this.current = 1
+      this.$nextTick(() => this.$refs.List.getList(true))
+    }
+  },
+  onLoad() {
+    this.areaId = this.user.areaId
+    this.$dict.load('fpHouseType').then(() => {
+      this.typeList = this.$dict.getDict('fpHouseType').map((item) => {
+        return {
+          label: item.dictName,
+          value: item.dictValue
         }
       })
-    },
-    toDetail(id) {
-      uni.navigateTo({url: `./helpDetail?id=${id}`})
-    },
-    onReachBottom() {
-      this.current ++
-      this.getList()
-    }
+      this.typeList.unshift({label: '全部类型', value: ''})
+    })
   },
   onShow() {
     document.title = '帮扶成效'
+  },
+  onReachBottom() {
+    this.current++
   }
 }
 </script>
@@ -133,57 +96,60 @@ export default {
     height: 100px;
     line-height: 100px;
   }
+
+  .center {
+    justify-content: center;
+    text-align: center;
+  }
+
   .select {
     width: 100%;
     display: flex;
     height: 86px;
     line-height: 86px;
     text-align: center;
-
-    ::v-deep .AiSelect .display {
-      justify-content: center;
-    }
-
-    .left,
-    .right {
-      flex: 1;
-    }
   }
-  .cardList {
+
+  ::v-deep .cardList {
     padding: 32px;
     box-sizing: border-box;
+
     .card {
       padding: 32px;
       box-sizing: border-box;
       margin-bottom: 32px;
       background: #FFF;
-      box-shadow: 0px 0px 8px 0px rgba(0,0,0,0.0200);
+      box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.0200);
       border-radius: 16px;
+
       .user {
         display: flex;
         justify-content: space-between;
+
         .name {
           font-size: 36px;
           font-weight: 600;
         }
       }
+
       .idCard,
       .tel,
       .address {
         margin-top: 8px;
         color: #999999;
+
         img {
           margin-right: 16px;
           width: 28px;
           height: 28px;
         }
       }
+
       .tel,
       .address {
         color: #333;
       }
     }
   }
-
 }
-</style>
+</style>

src/apps/AppHelpEffect/addLog.vue

@@ -1,35 +1,55 @@
 <template>
   <div class="addLog">
-    <div class="help" v-if="type == 1">
-      <div><span style="color: #FF4466;">*</span>帮扶类型</div>
-      <AiSelect dict="fpAssistanceMeasures" v-model="operationDesc"></AiSelect>
-    </div>
-    <div class="form-item form-item__textarea">
-      <div class="form-item__title">
-        <em v-if="type==0">*</em>
-        <h2>{{type == 1 ? '帮扶内容' : '走访内容'}}</h2>
-      </div>
-      <textarea maxlength="500" v-model="detail" :placeholder="type == 1 ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
-      <div class="hint">{{ detail.length }}/500</div>
-    </div>
-    <div class="form-item form-item__imgs">
-      <div class="form-item__title">
-        <h2>图片</h2>
-        <i>（最多9张）</i>
-      </div>
-      <div>
-        <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
-      </div>
-    </div>
+    <AiGroup v-if="isBangFu">
+      <AiItem label="帮扶类型" required>
+        <AiSelect dict="fpAssistanceMeasures" v-model="form.operationDesc"/>
+      </AiItem>
+    </AiGroup>
+    <AiGroup v-else-if="isNormalFarmer">
+      <AiItem label="走访对象" required>
+        <input v-model="form.name"/>
+      </AiItem>
+      <AiItem label="现住址" required>
+        <AiAreaPicker v-model="form.areaId" :name.sync="areaName">
+          <AiMore v-model="form.areaName"/>
+        </AiAreaPicker>
+      </AiItem>
+      <AiItem label="走访日期" required>
+        <AiDate v-model="form.visitDate"/>
+      </AiItem>
+    </AiGroup>
+    <!--走访日志-->
+    <AiGroup v-else>
+      <AiItem label="走访日期" required>
+        <AiDate v-model="form.visitDate"/>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem :label="isBangFu ? '帮扶内容' : '走访内容'" required topLabel>
+        <textarea maxlength="500" v-model="form.detail" :placeholder="isBangFu ? '请输入帮扶内容' : '请输入走访内容'"></textarea>
+        <div class="hint">{{ form.detail.length || 0 }}/500</div>
+      </AiItem>
+    </AiGroup>
+    <AiGroup>
+      <AiItem label="图片" topLabel>
+        <span slot="sub" class="color-999" v-text="`（最多9张）`"/>
+        <AiUploader :def.sync="form.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+      </AiItem>
+    </AiGroup>
     <div class="btn" @click="submit">提交</div>
   </div>
 </template>
 
 <script>
+import AiMore from "../../components/AiMore";
 
 export default {
+  components: {AiMore},
   data() {
     return {
+      name: null,
+      areaId: null,
+      areaName: null,
       detail: '',
       pid: '',
       files: [],
@@ -37,57 +57,59 @@ export default {
       type: '',
       operationDesc: '',
       flag: false,
+      form: {detail: ""}
     }
   },
+  computed: {
+    isBangFu: v => v.type == 1,
+    isNormalFarmer: v => v.type == 2
+  },
   onLoad(query) {
     this.$dict.load('fpAssistanceMeasures')
     this.pid = query.pid
     this.type = query.type
-    if(query.id) {
+    this.visitDate = this.$dateFormat(this.$dayjs())
+    if (query.id) {
       this.id = query.id
       this.getInfo()
     }
   },
   onShow() {
-    if(this.type == 1) {
-      document.title = this.id ? '编辑帮扶措施' : '添加帮扶措施'
-    }else {
-      document.title = this.id ? '编辑走访日志' : '添加走访日志'
-    }
-
+    this.pageTitle()
   },
   methods: {
+    pageTitle() {
+      const action = this.id ? '编辑' : '添加', app = this.type == 1 ? '帮扶措施' : this.type == 2 ? '一般农户走访日志' : '走访日志'
+      document.title = action + app
+    },
     getInfo() {
       this.$http.post(`/app/apppreventionreturntopovertylog/queryDetailById?id=${this.id}`).then(res => {
-        if (res.code == 0) {
-          this.operationDesc = res.data.operationDesc
-          this.detail = res.data.detail
-          this.files = res.data.files || []
+        if (res?.data) {
+          this.form = res.data
         }
       })
     },
     submit() {
-      if(this.flag) return
-      if(this.type == 1) {
-        if (!this.operationDesc) {
+      if (this.flag) return
+      if (this.type == 1) {
+        if (!this.form.operationDesc) {
           return this.$u.toast('请选择帮扶类型')
         }
+      } else if (this.type == 2) {
+        if (!this.form.areaId) {
+          return this.$u.toast('请选择现住址')
+        }
+        if (!this.form.name) {
+          return this.$u.toast('请输入走访对象')
+        }
       } else {
-        if (!this.detail) {
+        if (!this.form.detail) {
           return this.$u.toast('请输入走访内容')
         }
       }
-
       this.flag = true
-      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', {
-        detail: this.detail,
-        files: this.files,
-        pid: this.pid,
-        id: this.id,
-        type: this.type,
-        operationDesc: this.operationDesc
-      }).then(res => {
-        if (res.code === 0) {
+      this.$http.post('/app/apppreventionreturntopovertylog/addOrUpdate', this.form).then(res => {
+        if (res.code == 0) {
           this.$u.toast('提交成功')
           uni.$emit('reload')
           setTimeout(() => {
@@ -95,7 +117,6 @@ export default {
               delta: 1
             })
           }, 300)
-
         }
       })
     }
@@ -184,7 +205,7 @@ export default {
     background: #3192F4;
   }
 
-  .hint{
+  .hint {
     text-align: right;
     color: #999;
   }

src/apps/AppHelpEffect/helpedResidentList.vue

@@ -0,0 +1,65 @@
+<template>
+  <section class="helpedResidentList">
+    <div v-if="list.length">
+      <div class="card" v-for="(item,index) in list" :key="index" @click="toDetail(item.id)">
+        <p class="user">
+          <span class="name">{{ item.name }}</span>
+          <span :style="{color: item.houseType==1? '#FF6300': '#00D25D'}">{{ $dict.getLabel('fpHouseType', item.houseType) }}</span>
+        </p>
+        <div class="idCard">{{ item.idNumber.replace(/(.{6}).*(.{4})/, '$1********$2') }}</div>
+        <div class="tel"><img src="./images/dh@2x.png" alt="">{{ item.phone }}</div>
+        <div class="address"><img src="./images/dz@2x.png" alt="">
+          {{ item.countyName + item.townName + item.villageName }}{{ item.currentAddress || '' }}
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else description="暂无数据"/>
+  </section>
+</template>
+
+<script>
+export default {
+  name: "helpedResidentList",
+  props: {
+    current: {default: 1},
+    search: {default: () => ({})}
+  },
+  data() {
+    return {
+      list: [],
+      total: 0
+    }
+  },
+  methods: {
+    getList(must) {
+      if (must || this.total == 0 || this.list.length < this.total) {
+        const {current, search} = this.$props
+        this.$http.post('/app/apppreventionreturntopoverty/list', null, {
+          params: {...search, current},
+        }).then((res) => {
+          if (res?.data) {
+            this.list = [current == 1 ? [] : this.list, res.data.records].flat().filter(Boolean)
+            this.total = res.data.total
+          }
+        })
+      }
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./helpDetail?id=${id}`})
+    },
+  },
+  watch: {
+    current: {
+      handler() {
+        this.$u.throttle(this.getList)
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.helpedResidentList {
+}
+</style>

src/apps/AppHelpEffect/normalFarmerList.vue

@@ -0,0 +1,208 @@
+<template>
+  <section class="normalFarmerList">
+    <div v-if="list.length">
+      <div class="log-item" v-for="(item, index) in list" :key="index">
+        <div class="log-item__wrapper">
+          <div class="log-item__user">
+            <div class="left">
+              <h2>{{ item.name }}</h2>
+            </div>
+            <div class="right">
+              <span class="mar-r8">{{ item.visitDate }}</span>
+              <u-icon name="list" color="#999" size="28" @click="edit(item.id, 2)" v-if="item.createUserId == user.id"/>
+            </div>
+          </div>
+          <p v-text="item.detail"/>
+          <div class="imgs" v-if="item.files && item.files.length">
+            <image :src="img.url" @click="prevImg(item.files, img.url)" v-for="(img, index) in item.files" :key="index"/>
+          </div>
+        </div>
+      </div>
+    </div>
+    <AiEmpty v-else description="暂无数据"/>
+    <AiFixedBtn>
+      <div class="addBtn iconfont iconfont-iconfangda" @tap="toAddLog()"></div>
+    </AiFixedBtn>
+  </section>
+</template>
+
+<script>
+import {mapState} from 'vuex'
+
+export default {
+  name: "normalFarmerList",
+  props: {
+    current: {default: 1},
+    search: {default: () => ({})}
+  },
+  data() {
+    return {
+      list: [],
+      total: 0
+    }
+  },
+  computed: {
+    ...mapState(['user'])
+  },
+  methods: {
+    getList(must) {
+      if (must || this.total == 0 || this.list.length < this.total) {
+        const {current, search} = this.$props
+        this.$http.post('/app/apppreventionreturntopovertylog/list', null, {
+          params: {...search, current, type: 2},
+        }).then((res) => {
+          if (res?.data) {
+            this.list = [current == 1 ? [] : this.list, res.data.records].flat().filter(Boolean)
+            this.total = res.data.total
+          }
+        })
+      }
+    },
+    toDetail(id) {
+      uni.navigateTo({url: `./helpDetail?id=${id}`})
+    },
+    toAddLog(pid) {
+      uni.navigateTo({
+        url: `./addLog?pid=${pid || ''}&type=2`
+      })
+    },
+    prevImg(urls, img) {
+      const imgs = urls.map(v => v.url)
+      uni.previewImage({
+        urls: imgs,
+        current: img
+      })
+    },
+    edit(id, type) {
+      uni.showActionSheet({
+        itemList: ['编辑', '删除'],
+        success: res => {
+          if (res?.tapIndex === 0) {
+            uni.navigateTo({
+              url: `./addLog?pid=${this.id}&id=${id}&type=${type}`
+            })
+          } else if (res?.tapIndex == 1) {
+            this.$confirm('确定删除该数据？').then(() => {
+              uni.showLoading()
+              this.$http.post(`/app/apppreventionreturntopovertylog/delete?ids=${id}`).then(ret => {
+                if (ret?.code == 0) {
+                  this.$u.toast('删除成功')
+                  this.getList()
+                }
+              }).finally(() => uni.hideLoading())
+            }).catch(() => 0)
+          }
+        }
+      })
+    },
+  },
+  watch: {
+    current: {
+      handler() {
+        this.getList()
+      },
+      immediate: true
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.normalFarmerList {
+  .log-item {
+    padding: 0 0 0 32px;
+    background: #fff;
+
+    &:first-child {
+      margin-top: 16px;
+    }
+
+    &:last-child {
+      .log-item__wrapper {
+        border: none !important;
+      }
+    }
+
+    .log-item__wrapper {
+      padding: 32px 32px 32px 0;
+      border-bottom: 1px solid #E4E5E6;
+
+      .log-item__user {
+        display: flex;
+        align-items: center;
+        justify-content: space-between;
+
+        & > div {
+          display: flex;
+          align-items: center;
+        }
+
+        .left {
+          .user, image {
+            width: 80px;
+            height: 80px;
+            line-height: 80px;
+            margin-right: 16px;
+            text-align: center;
+            border-radius: 50%;
+            background: #2266FF;
+
+            span {
+              color: #fff;
+              font-size: 28px;
+            }
+          }
+
+          h2 {
+            color: #333;
+            font-size: 32px;
+          }
+        }
+
+        .right {
+          image {
+            width: 32px;
+            height: 32px;
+          }
+
+          span {
+            margin-right: 6px;
+            color: #999999;
+            font-size: 28px;
+          }
+        }
+      }
+
+      p {
+        margin: 4px 0 16px 0;
+        color: #343D65;
+        font-size: 28px;
+      }
+
+      .imgs {
+
+        image {
+          width: 136px;
+          height: 136px;
+          margin-right: 8px;
+          margin-bottom: 8px;
+        }
+      }
+    }
+  }
+
+  .addBtn {
+    width: 96px;
+    height: 96px;
+    flex-shrink: 0;
+    background: $uni-color-primary;
+    box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2);
+    font-size: 48px;
+    color: #fff;
+    border-radius: 50%;
+    justify-content: center;
+    align-items: center;
+    display: flex;
+  }
+}
+</style>