转交 审核

src/apps/AppHelpDeclaration/details.vue

@@ -93,20 +93,15 @@
 
     <div class="fixedBtn">
       <div class="status00">
-        <div class="columns border-r" @click="toContent(1)">
+        <div class="columns" @click="toContent(1)">
           <span class="hint">转交事件</span>
         </div>
 
-        <!-- <div class="columns" @click="toContent(2)">
+        <div class="columns" @click="toContent(2)">
-          <span class="hint">拒绝受理</span>
+          <span class="hint">审核处理</span>
-        </div> -->
+        </div>
-
-        <div class="doIt" @click="doItShow = true">审核处理</div>
       </div>
-
-      <div class="endDoIt" v-if="data.eventStatus == 1 && data.rightType == 0" @click="toContent(3)">前往办理</div>
     </div>
-    <u-modal v-model="doItShow" :mask-close-able="true" z-index="99" content="确定处理该事件?" :show-cancel-button="true" @confirm="doThings"></u-modal>
   </div>
 </template>
 
@@ -117,7 +112,6 @@ export default {
       list: [],
       data: {},
       id: '',
-      doItShow: false,
     }
   },
   onLoad(o) {
@@ -142,8 +136,9 @@ export default {
         current: img
       })
     },
+    // 转交 1 ， 审核处理 2
     toContent(status) {
-      uni.navigateTo({ url: `./result?status=${status}` })
+      uni.navigateTo({ url: `./result?status=${status}&id=${this.id}` })
     },
   }
 }
@@ -366,37 +361,23 @@ export default {
         display: flex;
         flex-direction: column;
         align-items: center;
-        width: 50%;
+        flex: 1;
-        padding: 16px 0;
+        padding: 28px 0;
         border-top: 1px solid #ddd;
         .hint {
-          margin-top: 16px;
-          font-size: 32px;
-          color: #666666;
-        }
-      }
-      .border-r {
-        border-right: 1px solid #ddd;
-      }
-      .doIt {
-        width: 56%;
-        background: #3975c6;
-        text-align: center;
-        line-height: 112px;
-        font-size: 32px;
-        font-weight: 500;
-        color: #fff;
-      }
-    }
-
-    .endDoIt {
-      background: #3975c6;
-      text-align: center;
-      padding: 34px 0;
 
           font-size: 32px;
-      font-weight: 500;
+          color: #333;
-      color: #ffffff;
+        }
+      }
+      .columns:last-child {
+        border-left: 1px solid #ddd;
+        background: #3975c6;
+        .hint {
+          font-size: 32px;
+          color: #FFF;
+        }
+      }
     }
   }
 }

src/apps/AppHelpDeclaration/result.vue

@@ -1,41 +1,44 @@
 <template>
-  <div class="result">
+  <div class="result" showPage='false'>
-    <div class="contents">
-      <u-form :model="forms" ref="uForm" label-width="auto" :border-bottom="false">
-        <u-form-item label="转交给" prop="status" required :border-bottom="false" right-icon="arrow-right" class="first-form" v-if="status == 1">
-          <u-input v-model="forms.name" placeholder="请选择转交对象" @click="toSelectUser" disabled />
-        </u-form-item>
-        <u-form-item label="事件分类" prop="groupName" required :border-bottom="false" right-icon="arrow-right" v-if="status != 1">
-          <!-- <u-input v-model="forms.groupName" placeholder="请选择事件分类"  /> -->
-          <span @click="show = true" class="right-span" :style="forms.groupName ? '' : 'color:#999;'">{{forms.groupName || '请选择事件分类'}}</span>
     
-          <u-select v-model="show" :list="myList" value-name="id" label-name="groupName" @confirm="selectStatus"></u-select>
+    <div class="type">
-        </u-form-item>
+      <div class="left">
-
+        <span>*</span>
-        <u-form-item :label="status == 3 ? '办结意见' : status == 2 ? '拒绝受理意见' : '办理意见'" prop="content" required :border-bottom="false" label-position="top" class="contents">
+        <span v-if="status == 1">处理意见</span>
-          <u-input v-model="forms.content" :placeholder="status == 2 ? '请写下拒绝受理意见…' : '请写下你的办结意见...'" type="textarea" auto-height height="100" maxlength="500" />
+        <span v-if="status == 2">处理结果</span>
-        </u-form-item>
+      </div>
-
+      <div class="right">
-        <div class="line"></div>
+        <div style="display: flex" v-if="status == 1">
-
+          <input v-model="doUsername" placeholder="请选择转交对象" @click="toSelectUser" disabled style="display: inline-block;"/>
-        <u-form-item label="图片上传(最多9张)" prop="files" :border-bottom="false" class="avatars" label-position="top">
+          <u-icon name="arrow-right" color="#999" size="28"></u-icon>
-          <AiUploader :def.sync="forms.files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+        </div>
-        </u-form-item>
+        <div class="check_box" v-if="status == 2">
-
+          <div class="check-item" :class="auditStatus == '1' ? 'check-active' : '' " @click="auditStatus='1'">通过审核<img src="./components/img/check-icon.png" alt=""></div>
-      </u-form>
+          <div class="check-item" :class="auditStatus == '0' ? 'check-active' : '' " @click="auditStatus='0'">驳回申请<img src="./components/img/check-icon.png" alt=""></div>
+        </div>
+      </div>
     </div>
 
-    <div class="btn" v-if="this.status == 1" @click="confirm">
+    <div class="remark">
-      <span>转交事件</span>
+      <div class="top">
+        <span style="margin-right: 8px;"></span><span>办理意见</span>
+      </div>
+      <div class="bottom">
+        <u-input type="textarea" v-model="description" placeholder="请写下你的办理意见" maxlength="500" height="200"/>
+      </div>
     </div>
 
-    <div class="btn" v-if="this.status == 2" @click="confirm">
+    <div class="picture">
-      <span>拒绝受理</span>
+      <div class="top">
+        <span style="margin-right: 8px"></span><span>图片上传<span style="color: #999;font-size:14px;">最多9张</span></span>
+      </div>
+      <div class="bottom">
+        <AiUploader :def.sync="files" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+      </div>
     </div>
 
-    <div class="btn" v-if="this.status == 3" @click="confirm">
+    <div class="btn" @click="submit">提交</div>
-      <span>我已办结</span>
+
-    </div>
   </div>
 </template>
 
@@ -43,190 +46,197 @@
 export default {
   data() {
     return {
-      forms: {
+      // operation: '',
-        groupName: '',
+      description: '',
-        groupId: '',
+      status: '',
-        content: '',
       files: [],
-        name: ''
+      showPage: false,
-      },
-      flag: false,
-      show: false,
-      status: '',  //1转交  2拒绝受理  3我已办结
-      myList: [],
       id:'',
+      doUsername: '',
       selectUser: {},
-      titleList: ['', '转交事件', '拒绝受理', '我已办结']
+      auditStatus: '',
+      wxUserId: '',
     }
   },
-  onLoad(option) {
+  onLoad(o) {
-    this.status = option.status
+    this.$dict.load('fpRiskPersonOperation1','fpRiskPersonOperation2','fpRiskType').then(()=>{
-    this.id = option.id
+      this.status = o.status
-    this.forms.groupId = option.groupId
+      this.id = o.id
-    this.forms.groupName = option.groupName
+      this.showPage = true
-    this.typeList()
+
       uni.$on('goback', (res) => {
         this.selectUser = res
         if(res.name) {
-        this.forms.name = res.name
+          this.doUsername = res.name
+          this.wxUserId = res.id
         }else{
-        this.forms.name = res.girdName
+          this.doUsername = res.girdName
+          this.wxUserId = res.id
         }
       })
-  },
+    })
-  onShow() {
+    
-    console.log(this.titleList[this.status])
-    document.title = this.titleList[this.status]
   },
   methods: {
-
+    // 选择转交对象
-    typeList() {
-      this.$http.post(`/app/appclapeventgroup/list`, null, {
-        params: {
-          size: 9999,
-        },
-      })
-      .then((res) => {
-        if (res.code == 0) {
-          this.myList = res.data.records
-          this.$forceUpdate()
-        }
-      })
-    },
-
-    confirm() {
-      if(this.status == 1 && !this.forms.name) {
-        return this.$u.toast('请选择转交对象')
-      }
-      if(this.status != 1 && !this.forms.groupName) {
-        return this.$u.toast('请选择分类')
-      }
-      if(this.status != 1 && !this.forms.content) {
-        return this.$u.toast('请输入意见')
-      }
-      this.submit()
-    },
-    submit() {  //status 1转交  2拒绝受理  3我已办结
-      var url = '', successText= '', params= ''
-      if(this.status == 1) {
-        url = `/app/appclapeventinfo/transfer`
-        successText = '转交成功'
-        params = {
-          ...this.forms,
-          girdId: this.selectUser.id,
-          girdName: this.selectUser.girdName,
-        }
-        if(this.selectUser.name) { //选择的网格员
-          params.girdId = this.selectUser.girdId
-          params.girdMemberId = this.selectUser.id
-          params.girdMemberName = this.selectUser.name
-        }
-      }
-      if(this.status == 2) {
-        url = `/app/appclapeventinfo/refuse`
-        successText = '拒绝成功'
-        params = {...this.forms}
-      }
-      if(this.status == 3) {
-        url = `/app/appclapeventinfo/finishByGirdMember`
-        successText = '办结成功'
-        params = {...this.forms}
-      }
-      params.id = this.id
-      this.$http.post(url, params).then((res) => {
-        if (res.code == 0) {
-          this.$u.toast(successText)
-          uni.$emit('updateDeatil')
-          uni.$emit('getListInit')
-          setTimeout(() => {
-            if(this.status == 1) {
-              uni.navigateBack({delta: 2})
-            }else {
-              uni.navigateBack()
-            }
-          },600)
-        }
-      })
-    },
-    selectStatus(e) {
-      this.forms.groupName = e[0].label
-      this.forms.groupId = e[0].value
-    },
     toSelectUser() {
       uni.navigateTo({ url: './SelectUser' })
     },
+
+    submit() {
+      if (this.status == 1) {
+        if(!this.doUsername) {
+          return this.$u.toast('请选择转交对象')
+        }
+      } 
+      if (this.status == 2) {
+        if(!this.auditStatus) {
+          return this.$u.toast('请选择处理结果')
+        }
+      } 
+
+      // let ids = [];
+      // ids.push(this.id);
+      let url = ''
+      let form = {}
+      if (this.status == 1) {
+        form = {
+          doUsername: this.doUsername,
+          description: this.description,
+          files: this.files,
+          declarationId: this.id,
+          wxUserId: this.wxUserId,
+        }
+        url = '/app/apphelpdeclarationinfo/forward'
+      }
+      if (this.status == 2) {
+        form = {
+          auditStatus: this.auditStatus,
+          description: this.description,
+          files: this.files,
+          declarationId: this.id,
+          wxUserId: this.wxUserId,
+        }
+        url = '/app/apphelpdeclarationinfo/audit'
+      }
+      this.$http.post(url,form).then(res => {
+        if (res.code == 0) {
+          this.$u.toast('提交成功')
+          uni.$emit('update')
+          setTimeout(() => {
+            uni.navigateBack({delta: 2})
+          },600)
+        }
+      })
+    }
   },
+  onShow() {
+    document.title = this.checkType == 1? "处理意见":this.checkType == 2? "处理结果": ''
+  }
 }
 </script>
 
-<style scoped lang="scss">
+<style lang="scss" scoped>
 .result {
-  height: 100%;
+  padding-bottom: 112px;
-  .contents {
+  ::v-deep .ai-uploader .fileList .default {
-    padding-bottom: 140px;
-    ::v-deep .u-form {
-      .u-form-item {
-        padding: 0 45px !important;
-        .u-form-item__body {
-          .u-form-item--right__content__slot {
-            padding-bottom: 0;
-            .u-input {
-              text-align: right !important;
-            }
-          }
-        }
-      }
-
-      .u-form-item:first-child {
-        .u-form-item__body {
-          border-bottom: 1px solid #ddd;
-        }
-      }
-
-      .line {
-        height: 24px;
-        background: #f3f6f9;
-      }
-
-      .contents {
-        padding-bottom: 20px !important;
-        .u-form-item__body {
-          .u-form-item--right__content__slot {
-            .u-input {
-              text-align: left !important;
-            }
-          }
-        }
-      }
-
-      .avatars {
-        padding-bottom: 20px !important;
-        .u-form-item__body {
-          .default {
     width: 160px;
     height: 160px;
   }
+  .type {
+    height: 112px;
+    line-height: 112px;
+    background: #FFF;
+    font-size: 32px;
+    display: flex;
+    justify-content: space-between;
+    padding: 0 32px;
+    box-sizing: border-box;
+    .left {
+      span:first-child {
+        color: #FF4466;
+      }
+      span:last-child {
+        color: #333333;
       }
     }
+    .right {
+      align-self: center;
+      text-align: right;
+
+      .check_box {
+
+        .check-item {
+          display: inline-block;
+          width: 150px;
+          height: 60px;
+          line-height: 64px;
+          text-align: center;
+          background: #F5F5F5;
+          border-radius: 4px;
+          font-size: 30px;
+          font-family: PingFangSC-Medium, PingFang SC;
+          font-weight: 500;
+          color: #333;
+          position: relative;
+
+          img {
+            display: none;
+          }
+        }
+
+        .check-item:nth-of-type(1) {
+          margin-right: 36px;
+        }
+
+        .check-active {
+          background: #E7F1FE;
+          color: #1174FE;
+
+          img {
+            display: block;
+            position: absolute;
+            bottom: 0;
+            right: 0;
+            width: 48px;
+            height: 48px;
+          }
+        }
+      }
+    }
+  }
+  .remark,
+  .picture {
+    box-sizing: border-box;
+    margin-top: 16px;
+    background: #FFF;
+    padding: 0 32px;
+    font-size: 32px;
+    .top {
+      padding-top: 20px;
+      span:first-child {
+        color: #FF4466;
+      }
+      span:last-child {
+        color: #333333;
+      }
+    }
+    .bottom {
+      padding: 30px 0;
     }
   }
 
   .btn {
+    height: 112px;
+    line-height: 112px;
+    text-align: center;
+    background: #3192F4;
+    color: #FFF;
     position: fixed;
     bottom: 0;
+    left: 0;
     width: 100%;
-    box-sizing: border-box;
-    background: #3975c6;
-    padding: 34px 0;
-    text-align: center;
     font-size: 32px;
-    font-weight: 500;
-    color: #ffffff;
-  }
-  .right-span{
-    display: inline-block;
-    width: 100%;
-    text-align: right;
   }
 }
 </style>

src/saas/AppConflictMediation/Content.vue

@@ -139,7 +139,7 @@ export default {
         params = {...this.forms}
       }
       params.id = this.id
-      this.$http.post(url, params).then((res) => {
+      this.$http.post(url, form).then((res) => {
         if (res?.code == 0) {
           this.$u.toast(successText)
           uni.$emit('update')