feat: 维修反馈

src/api/approve.js

@@ -44,4 +44,10 @@ export const editApprove = data => (request({
 export const getUserApproveCount = () => (request({
     method: 'POST',
     url: 'approve/get_count',
+}))
+
+export const postFeedbackResult = data => (request({
+    data,
+    method: "POST",
+    url: "approve/feedback"
 }))

src/router/index.js

@@ -112,6 +112,15 @@ const routes = [
     component: () => import(/* webpackChunkName: "approve" */ '../views/approve/detail.vue')
   },
 
+  {
+    meta: {
+      title: '上传返回结果',
+    },
+    path: '/approve/feedback',
+    name: 'FeedbackResult',
+    component: () => import(/* webpackChunkName: "approve" */ '../views/approve/feedback-results.vue')
+  },
+
 
   // ====== 我的页面
   {

src/store/modules/user.js

@@ -13,13 +13,13 @@ const state = {
     signatureStateText: '',  // 个签
 
     // 徐同泽
-    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
 
     // 于
     // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ5MiwibmJmIjoxNzAyNjk3NDkyLCJleHAiOjE3Mjg2MTc0OTJ9.tvPS5OIrfn21LItFuUSiKgnAUu1p-9x5xwzVzxp6y20'
 
     // 物业主管
-    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzNTg5MCwibmJmIjoxNzAzMDM1ODkwLCJleHAiOjE3Mjg5NTU4OTB9.BNRfY7re51HRSjWxDObt4D-qYCkTzgCXyLupNAoAg84'
+    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzNTg5MCwibmJmIjoxNzAzMDM1ODkwLCJleHAiOjE3Mjg5NTU4OTB9.BNRfY7re51HRSjWxDObt4D-qYCkTzgCXyLupNAoAg84'
 
     // 信息主管
     // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMiIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzODI1MywibmJmIjoxNzAzMDM4MjUzLCJleHAiOjE3Mjg5NTgyNTN9.eglTZ2-CPHUBDYyPbzk5k69Yv24J2ELTd8CN3VZL8_8'

src/styles/index.less

@@ -51,6 +51,9 @@ html,body{
     &-jcsp {
        justify-content: space-between; 
     }
+    &-jcsa {
+       justify-content: space-around; 
+    }
     &-jic {
         justify-items: center;
     }

src/views/approve/components/ApproveControl.vue

@@ -1,5 +1,8 @@
 <template>
-    <div class="approve-control-container flex flex-row flex-row-aic">
+    <div :class="[
+        'approve-control-container flex flex-row flex-row-aic',
+        flag === 'info' ? 'flex-row-jcsp' : 'flex-row-jcsa'
+    ]">
         <!-- 
             flag = info 几种状态
             2处理中: 催办，撤销，下载文件
@@ -69,7 +72,8 @@ export default {
             let state = Number(this.flagState)
             let module = this.module
             console.log(flag, state, module);
-            const [urging, edit, revoke, ding, print, REISSUE, pushResult] = this.control
+            const [urging, edit, revoke, ding, print, REISSUE, applyApproval, pushResult] = this.control; /* disable-line */
+            console.log(applyApproval);
             let temparr = []
 
             if (flag === 'info') {
@@ -120,7 +124,8 @@ export default {
                         ]
                         break;
                     case 3:
-                        if (module === 8) temparr.push(pushResult)
+                        // 维修时添加上上传结果
+                        if (module === 8 && (this.editData && this.editData.is_feedback)) temparr.push(pushResult)
                         temparr.push(print)
                         break;
                     // case 4: // 收到的没有状态
@@ -177,7 +182,7 @@ export default {
                 {
                     title: '上传反馈结果',
                     img: require('@/assets/icons-print.png'),
-                    event: this.handleEvent
+                    event: this.handleUploadFeedback
                 }
             ]
         }
@@ -186,6 +191,14 @@ export default {
         handleEvent() {
             this.$toast('等待功能实现中')
         },
+        handleUploadFeedback() {
+            this.$router.push({
+                name: 'FeedbackResult',
+                query: {
+                    id: this.id
+                }
+            })
+        },
         // NOTE: 提醒
         // TODO: 申请提醒/审批提醒
         async handleDingEvent() {
@@ -270,7 +283,6 @@ export default {
     &-container {
         padding: 11px 24px 30px;
         background-color: #f2f1f6;
-        justify-content: space-between;
 
         .item {
             display: flex;

src/views/approve/feedback-results.vue

@@ -0,0 +1,88 @@
+<template>
+  <div class="examine-container flex flex-col">
+    <div class="examine__input">
+      <van-field v-model="message" :rows="20" autosize type="textarea" maxlength="300" placeholder="请输入反馈结果"
+        show-word-limit />
+
+      <c-files ctype="images" v-model="images" />
+    </div>
+
+    <div class="p-h-12">
+      <div class="btnbox" @click="handleResetSignature">
+        <span>确认反馈</span>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+
+import CFiles from '../applyfor/components/CFiles.vue'
+import * as dd from 'dingtalk-jsapi'
+
+import { postFeedbackResult } from '@api/approve'
+
+export default {
+  components: {
+    CFiles
+  },
+  data() {
+    return {
+      images: [],
+      message: '',
+    }
+  },
+  created() {
+    // Set Navigation title and back
+    // TODO: Set Navigation title and other.
+    dd.biz.navigation.setTitle({
+      title: this.btnTxt
+    })
+  },
+  methods: {
+    handleResetSignature() {
+      let msg = this.message
+      if (!msg) return this.$toast('请填写反馈理由~')
+
+      this.__put__()
+    },
+
+    // 反馈结果
+    async __put__() {
+      try {
+        const params = {
+          approve_id: this.$route.query.id,
+          feedback: this.message,
+          feedback_images: this.images.map(image => image.url).join(',')
+        }
+
+        const result = await postFeedbackResult(params)
+
+        if (result.code === 1) {
+          this.$toast(result.msg)
+          this.$router.go(-1)
+        }
+      } catch (error) {
+        console.log('%c examine error >>>', 'background: blue; color: #fff', error);
+      }
+
+    }
+  }
+}
+</script>
+<style lang="less">
+.examine {
+  &-container {
+    height: 100vh;
+    justify-content: space-between;
+    padding-bottom: 20px;
+    box-sizing: border-box;
+  }
+
+  &__input {
+    .custom-files-container {
+      margin-top: 10px;
+    }
+  }
+}
+</style>