jf

2022-02-17 19:45:25 +08:00
parent 741b58acd3
commit 3417ac5786
5 changed files with 169 additions and 90 deletions
--- a/src/apps/AppIntegralAudit/AppIntegralAudit.vue
+++ b/src/apps/AppIntegralAudit/AppIntegralAudit.vue
@@ -4,12 +4,11 @@
    <div class="tab-select">
      <div class="item" :class="tabIndex == index ? 'active' : ''" v-for="(item, index) in tabs" :key="index" @click="tabClick(index)">{{item}}<span></span></div>
    </div>
-
    <!-- 列表 -->
    <div>
      <div class="search-box" v-if="tabIndex==0">
        <div class="integral-types" @click="showType = true">{{ type? type : '积分类型' }}<u-icon name="arrow-down"></u-icon></div>
-        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false" @search="search" />
+        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false" @search="search" @clear="getList()"/>
      </div>

      <div class="card-list"  v-if="integralList.length">
@@ -21,7 +20,7 @@
          </div>
          <div class="card-type">
            <div class="type" :style="{color: item.auditStatus==0? '#4181FF':item.auditStatus==1? '#07c160' : '#dd5347'}">{{ $dict.getLabel('integralDeclareStatus',item.auditStatus) }}</div>
-            <div class="num">＋20</div>
+            <div class="num" v-if="item.auditIntegral">{{ item.auditIntegral }}</div>
          </div>
        </div>
      </div>
@@ -54,6 +53,10 @@ export default {
  created() {   
    this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
      this.getList()
+      uni.$on('update',()=>{
+        this.current = 1
+        this.getList()
+      })
    })
  },
  methods: {
@@ -71,10 +74,10 @@ export default {
          size: 10,
          description : this.keyword,
          applyIntegralType: this.applyIntegralType,
-          auditStatus: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : this.tabIndex == 2 ? "1|2" : ''
+          auditType: this.tabIndex== 0 ? "" : this.tabIndex == 1 ? 0 : 1
        }
      }).then(res => {
-        if(res.code==0){
+        if(res?.data){
          this.integralList = this.current > 1 ? [...this.integralList, ...res.data.records] : res.data.records
          this.$forceUpdate()
        } 
@@ -86,7 +89,6 @@ export default {
    },

    confirmTypeSelect(e) {
-      console.log(e);
      this.type = e[0].label
      this.applyIntegralType = e[0].value
      this.current = 1,
@@ -95,13 +97,12 @@ export default {
    },

    toDetail(item) {
-      uni.navigateTo({url: `./detail?id=${item.id}`})
+      uni.navigateTo({url: `./detail?id=${item.id}&nopass=${item.auditType}`})
    }
  },
  onShow() {
    document.title = '积分审核'
  },
-
 }
 </script>

@@ -186,10 +187,10 @@ export default {
        color: #999999;

        .name {
-          padding: 0 30px;
+          padding: 0 20px;
          background: #EEEEEE;
          border-radius: 24px;
-          margin-right: 40px;
+          margin-right: 24px;
        }
      }

--- a/src/apps/AppIntegralAudit/detail.vue
+++ b/src/apps/AppIntegralAudit/detail.vue
@@ -2,8 +2,7 @@
  <div class="detail">
    <div class="detail-list">
      <div class="detail-info">
-        <!-- <AiOpenData  type="userName" :openid="form.corpId" style="display: inline-block;"/> -->
-        <div class="detail-name">申请人:<span>{{form.corpId}}</span></div>
+        <div class="detail-name">申请人:<span>{{form.residentName}}</span></div>
        <div class="detail-type">{{ $dict.getLabel('atWillReportType',form.applyIntegralType) }}</div>
      </div>
      <div class="detail-area">
@@ -21,8 +20,8 @@
      </div>
    </div>

-    <!-- 审核通过、不通过 -->
-    <div class="integral" v-if="admin === 1">
+    <!-- 待审核 -->
+    <div class="integral" v-if="form.auditStatus == 0">
      <div class="result">
        <div>积分审核结果</div>
        <div class="options">
@@ -63,51 +62,55 @@
      <u-select :list="$dict.getDict('atWillReportType')" value-name="dictValue" label-name="dictName"
              v-model="isShowType" @confirm="integralType"></u-select>

-      <u-select :list="typeList" value-name="integral" label-name="ruleName"
+      <u-select :list="typeList" value-name="id" label-name="ruleName"
              v-model="isShowOption" @confirm="typeChange"></u-select>
    </div>


-    <!-- 只读通过、不通过 -->
+    <!-- 已审核 -->
    <div class="readOnly" v-else>
-      <div class="item">
-        <div>积分审核</div>
-        <div>通过</div>
-      </div>
      <!-- 通过 -->
-      <div v-if="nopass === 0">  
+      <div v-if="nopass == 1">  
+        <div class="item">
+          <div>积分审核</div>
+          <div>通过</div>
+        </div>
        <div class="item">
          <div>积分类别</div>
-          <div>乡村建设类</div>
+          <div>{{ form.auditIntegralType }}</div>
        </div>
        <div class="item">
          <div>积分事项</div>
-          <div>多字段显示</div>
+          <div>{{ form.auditRuleName }}</div>
        </div>
        <div class="item">
          <div>积分方式</div>
-          <div style="color: #E6736E;">+20</div>
+          <div style="color: #E6736E;">{{ form.auditIntegral }}</div>
        </div>
      </div>
      <!-- 不通过 -->
-      <div v-else>
+      <div v-if="nopass==2">
+        <div class="item">
+          <div>积分审核</div>
+          <div>不通过</div>
+        </div>
        <div class="item nopass">
          <div>不通过的理由</div>
-          <div class="textarea">我村赴黎平参加百村杯篮球赛经费分两阶段分发， 第一阶段为小组循环赛，第二阶段为淘汰赛。第一 其中包括队员球服两套，住宿、饮食</div>
+          <div class="textarea">{{ form.auditOpinion }}</div>
        </div>
      </div>
      <div class="item">
        <div>审核人</div>
-        <div>李维民</div>
+        <div>{{ form.auditUserName }}</div>
      </div>
      <div class="item last">
        <div>审核时间</div>
-        <div>2022-02-18 18:16:27</div>
+        <div>{{ form.auditTime }}</div>
      </div>
    </div>

    <div style="height: 56px"></div>
-    <div class="saveBtn" v-if="admin === 1" @click="submit">保存</div>
+    <div class="saveBtn" v-if="form.auditStatus == 0" @click="submit">保存</div>
  </div>
 </template>

@@ -118,7 +121,7 @@ export default {
    return {
      id: '',
      nopass: 1,
-      admin: 1,
+      auditType: 1,
      opts: 1,
      isShowType: false,
      isShowOption: false,
@@ -128,10 +131,9 @@ export default {
      data: {
        id: '',
        auditIntegralType: '',
-        // auditIntegralName: '',
        auditOpinion: '',   // 不通过理由
        ruleName: '',
-        integral: ''
+        integral: '',
      },
      typeList: [],
    }
@@ -139,11 +141,17 @@ export default {
  onLoad(o) {
    this.$dict.load('atWillReportType','integralDeclareStatus').then(()=>{
      this.id = o.id
+      this.nopass = o.nopass
      this.getDetail()
    })
  },
  methods: {
-    previewImage() {},
+    previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
    getDetail() {
      this.$http.post(`/app/appvillagerintegraldeclare/queryDetailById?id=${this.id}`).then(res => {
        if(res.code==0) {
@@ -156,24 +164,26 @@ export default {
      if(!this.data.auditIntegralType) {
        return this.$u.toast('请选择积分类别')
      } else {
-       
        this.$http.post(`/app/appvillagerintegralrule/list?current=1&size=10&auditIntegralType=${this.data.auditIntegralType}`).then(res=>{
          if(res.code == 0){
            this.typeList = res.data.records
            this.isShowOption=true
-            // this.data.id = res.data.records.id
          }
        })
      }
    },
    typeChange(e) {
      console.log(e);
-      // this.data.id = e[0].id
      this.data.ruleName = e[0].label
+      this.data.id = e[0].value
      this.data.integral = e[0].value
+      this.typeList.map((item) => {
+        if(item.id == e[0].value) {
+          this.data.integral = item.integral
+        }
+      })
    },
    integralType(e) {
-      // this.data.auditIntegralName = e[0].label
      this.data.auditIntegralType = e[0].value
    },
    submit() {
@@ -194,13 +204,18 @@ export default {
        params: {
          id: this.id,
          pass: this.opts,
-          ...this.data
+          auditRuleId: this.data.id,
+          auditIntegralType: this.data.auditIntegralType,
+          auditIntegral: this.data.integral,
+          opinion: this.data.auditOpinion,
+          auditRuleName: this.data.ruleName
        }
-      }).then(res=>{
-        console.log(res);
+      }).then(()=>{
        this.$u.toast('保存成功')
-      }).catch(err=>{
-        console.log(err);
+        uni.$emit('update')
+        setTimeout(()=>{
+          uni.navigateBack()
+        },600)
      })
    }
  },
--- a/src/apps/AppVillagersCircle/AppVillagersCircle.vue
+++ b/src/apps/AppVillagersCircle/AppVillagersCircle.vue
@@ -7,28 +7,27 @@

    <!-- 全部 -->
    <div v-if="tabIndex == 0">
-      <div class="search-box">
-        <div class="integral-types" @click="showType = true">话题类型<u-icon name="arrow-down"></u-icon></div>
-        <u-search placeholder="请输入关键字" v-model="keyword" :show-action="false"></u-search>
+      <div class="search-box" v-if="tabIndex==0">
+        <div class="integral-types" @click="showType = true">{{ topicType? topicType:'话题类型' }}<u-icon name="arrow-down"></u-icon></div>
+        <u-search placeholder="请输入关键字" v-model="content" :show-action="false" @search="getList()" @clear="getList()"></u-search>
      </div>

-      <div class="card-list">
-        <div class="card-item" @click="toDetail">
-          <div class="card-title">阳光美丽，空气格外清新</div>
+      <div class="card-list" v-if="villagerList.length">
+        <div class="card-item" v-for="(item,index) in villagerList" :key="index" @click="toDetail(item)">
+          <div class="card-title">{{ item.content }}</div>
          <div class="card-name">
            <div class="name">发布信息</div>
-            <div class="name">美丽庭院</div>
-            <div class="time">2021-12-06</div>
+            <div class="name">{{$dict.getLabel('villagerCircleTopic',item.topic)}}</div>
+            <div class="time">{{ item.createTime }}</div>
          </div>
          <div class="card-type">
-            <div class="type">审核通过</div>
+            <div class="type">{{$dict.getLabel('auditStatus',item.auditType)}}</div>
          </div>
        </div>
      </div>
-      <AiEmpty description="暂无数据" class="emptyWrap"></AiEmpty>
+      <AiEmpty description="暂无数据" class="emptyWrap" v-else></AiEmpty>

-      <!-- $dict.getDict('yesOrNo') -->
-      <u-select v-model="showType" :list="typeList" label-name="dictName" value-name="dictValue"
+      <u-select v-model="showType" :list="$dict.getDict('villagerCircleTopic')" label-name="dictName" value-name="dictValue"
              @confirm="confirmTypeSelect"/>
    </div>
  </div>
@@ -41,34 +40,56 @@ export default {
  data () {
    return {
      tabs: ['全部', '待处理', '已处理'],
-      tabIndex: 0,
+      tabIndex: '',
      showType: false,
-      keyword: '',
+      content: '',
      typeList: [],
-
+      villagerList: [],
+      current: 1,
+      topic: '',
+      topicType: '',
    }
  },
+  onLoad() {
+    this.$dict.load('villagerCircleTopic','auditStatus').then(()=>{
+      this.getList()
+    })
+  },
  methods: {
-
    tabClick(index) {
      this.tabIndex = index
    },
-
-    confirmTypeSelect(e) {
-      console.log(e);
+    getList() {
+      this.$http.post('app/appvillagercircleinfo/list',null,{
+        params: {
+          current: 1,
+          size: 10,
+          status: this.tabIndex==0? '':this.tabIndex==1?'0': this.tabIndex==2?'1|2':'',
+          topic: this.topic,
+          content: this.content
+        }
+      }).then(res=>{
+        if(res?.data) {
+          this.villagerList = this.current >1 ? [...this.villagerList,...res.data.records] : res.data.records
+        }
+      })
    },

-    toDetail() {
-      uni.navigateTo({url: './detail'})
+    confirmTypeSelect(e) {
+      this.topic = e[0].value,
+      this.topicType = e[0].label
+      this.current = 1,
+      this.villagerList = []
+      this.getList()
+    },
+
+    toDetail(item) {
+      uni.navigateTo({url: `./detail?id=${item.id}`})
    }
  },
  onShow() {
    document.title = '村民圈'
  },
-  onLoad() {
-    // this.$dict.load('yesOrNo')
-  },
-
 }
 </script>

@@ -153,7 +174,7 @@ export default {
        color: #999999;

        .name {
-          padding: 0 30px;
+          padding: 0 15px;
          background: #EEEEEE;
          border-radius: 24px;
          margin-right: 20px;
--- a/src/apps/AppVillagersCircle/Reject.vue
+++ b/src/apps/AppVillagersCircle/Reject.vue
@@ -2,7 +2,7 @@
  <div class="Reject">
    <div class="text-area">
      <div class="title">不通过理由</div>
-      <textarea placeholder="请输入" maxlength="200"></textarea>
+      <textarea placeholder="请输入" maxlength="200" v-model="value"></textarea>
    </div>
    <div class="footer" @click="submit">
      <div class="btn">保存</div>
@@ -16,17 +16,26 @@ export default {
  data() {
    return {
      value: '',
+      id: ''
    };
  },
  onShow() {
    document.title = '村民圈审核'
  },
-  onLoad(option) {
-    // this.id = option.id
+  onLoad(o) {
+    this.id = o.id
  },
  methods: {
    submit() {
-
+      this.$http.post('/app/appvillagercircleinfo/examine',null, {
+        params: {
+          id: this.id,
+          pass: 0,
+          opinion: this.value
+        }
+      }).then(res => {
+        console.log(res);
+      })
    }
  },
 };
--- a/src/apps/AppVillagersCircle/detail.vue
+++ b/src/apps/AppVillagersCircle/detail.vue
@@ -3,24 +3,26 @@
    <div class="avatar-info">
      <div class="avatar-img">
        <img src="./img/tx@2x.png" alt="">
-        <!-- <img src="./img/tx@2x.png" alt=""> -->
      </div>
      <div class="avatar-title">
-        <div class="name">雷洋</div>
+        <div class="name">
+          <!-- <AiOpenData  type="userName" :openid="data.id" style="display: inline-block;"/> -->
+          {{ data.id }}
+        </div>
        <div class="time">
-          <span>美丽庭院</span>
-          <span>2020-10-28 12:30</span>
+          <span>{{ $dict.getLabel('villagerCircleTopic',data.topic) }}</span>
+          <span>{{ data.createTime }}</span>
        </div>
      </div>
    </div>
-    <div class="textarea">⾦秋穿上⽑⾐，漫步森林，在阳光下呼吸伸展，⾃在安逸的天⼈。也许是兰天名字的由来吧。</div>
-    <div>
-      <img :src="item.url" alt="" v-for="(item, i) in files" :key="i" @click="previewImage(files, item.url)" />
+    <div class="textarea">{{ data.content }}</div>
+    <div style="background: #FFFFFF; padding:0 30px; box-sizing: border-box;">
+      <img :src="item.url" alt="" v-for="(item, i) in data.pictures" :key="i"  @click="previewImage(data.pictures, item.url)" class="upLoadPic"/>
    </div>
-    <div class="address">
+    <div class="address" v-if="data.gpsDesc">
      <span class="addr-bg">
        <img src="./img/address.png" alt="">
-        <span>东湖生态旅游风景区听涛景区</span>
+        <span>{{ data.gpsDesc }}</span>
      </span>
    </div>
    <div class="comment">
@@ -67,29 +69,51 @@ export default {
  data() {
    return {
      files: [],
-      status: 1,
-
+      status: 0,
+      id: '',
+      data: {},
    }
  },
+  onLoad(o) {
+    this.$dict.load('villagerCircleTopic').then(()=>{
+      this.id = o.id
+      this.getDetail()
+      this.getComment()
+    })
+  },
  methods: {
-    previewImage() {},
+     previewImage(images, img) {
+      uni.previewImage({
+        urls: images.map(v => v.url),
+        current: img
+      })
+    },
+    getDetail() {
+      this.$http.post(`/app/appvillagercircleinfo/queryDetailById?id=${this.id}`).then(res => {
+        // console.log(res);
+        if(res.code==0){
+          this.data = res.data
+        }
+      })
+    },
+    getComment() {
+      this.$http.post('/app/appvillagercirclecomment/list').then((res)=>{
+        console.log(res);
+      })
+    },
    toReject() {
-      uni.navigateTo({url: './Reject'})
+      uni.navigateTo({url: `./Reject?id=${data.id}`})
    },
    agree() {}
  },
  onShow() {
    document.title = "村民圈审核"
  },
-  onLoad() {},
-
-
 }
 </script>

 <style lang="scss" scoped>
 .detail {
-  
  .avatar-info {
    display: flex;
    padding: 0 32px;
@@ -124,6 +148,7 @@ export default {
    box-sizing: border-box;
    font-size: 32px;
    background: #FFFFFF;
+    padding-bottom: 40px;
  }
  .address {
    background: #FFFFFF;
@@ -185,6 +210,7 @@ export default {
        width: 100%;
        padding: 30px 0 0 0 ;
        color: #999999;
+        margin-bottom: 20px;
      }
    }
    .nopass {
@@ -195,6 +221,14 @@ export default {
      border-bottom: none;
    }
  }
+  .upLoadPic {
+    width: 220px;
+    height:220px;
+    margin-right: 8px;
+  }
+  .upLoadPic:nth-child(3n) {
+    margin-right: 0;
+  }
  .btn {
    display: flex;
    position: fixed;
@@ -215,6 +249,5 @@ export default {
      text-align: center;
    }
  }
-
 }
 </style>