审核接口完成

TODO.md

@@ -27,6 +27,12 @@
   - [x] 详情渲染完成
 - [x] 各模块提交后渲染字段 (缺少明细字段展示)
 - [x] 商品库搜索商品功能
+- [ ] 审核审批 80%
+
+--- 2023/12/20 ---
+
+- [x] 审核审批完成
+- [ ] 采购审批单
 
 ## 流程
 

src/api/common.js

@@ -37,3 +37,14 @@ export const getImportTemplate = data => (request({
     method: "POST",
     url: "common/get_import_template"
 }))
+
+/**
+ * 获取物业主管或者信息主管员工信息
+ * @param {Object} data {type: [1,2]} 1=物业主管,2=信息负责人  
+ * @returns Promise
+ */
+export const getMaintainData = data => (request({
+    data,
+    method: "POST",
+    url: "common/get_maintain_user"
+}))

src/router/index.js

@@ -67,6 +67,15 @@ const routes = [
     component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/applyOfUser.vue')
   },
 
+  {
+    meta: {
+      title: '采购审批单'
+    },
+    path: '/applyfor/approval-form',
+    name: 'CApprovalForm',
+    component: () => import(/* webpackChunkName: "applyfor" */ '../views/applyfor/approval-form.vue')
+  },
+
   // NOTE：我的审核状态
   {
     path: '/apply-state',

src/store/modules/user.js

@@ -13,17 +13,24 @@ const state = {
     signatureStateText: '',  // 个签
 
     // 徐同泽
-    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
+    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIxOSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ0NCwibmJmIjoxNzAyNjk3NDQ0LCJleHAiOjE3Mjg2MTc0NDR9.BOU8yu57KZrgUbcIGuS0a8AB91oLhH6nHawxYUQwt7U',
 
-    // 张鑫楷
-    token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ5MiwibmJmIjoxNzAyNjk3NDkyLCJleHAiOjE3Mjg2MTc0OTJ9.tvPS5OIrfn21LItFuUSiKgnAUu1p-9x5xwzVzxp6y20'
+    // 于
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMjY5NzQ5MiwibmJmIjoxNzAyNjk3NDkyLCJleHAiOjE3Mjg2MTc0OTJ9.tvPS5OIrfn21LItFuUSiKgnAUu1p-9x5xwzVzxp6y20'
+
+    // 物业主管
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMSIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzNTg5MCwibmJmIjoxNzAzMDM1ODkwLCJleHAiOjE3Mjg5NTU4OTB9.BNRfY7re51HRSjWxDObt4D-qYCkTzgCXyLupNAoAg84'
+
+    // 信息主管
+    // token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1aWQiOiIyMiIsImlzcyI6Imh0dHBzOlwvXC96YWluLmNvbSIsImF1ZCI6Imh0dHBzOlwvXC96YWluLmNvbSIsImlhdCI6MTcwMzAzODI1MywibmJmIjoxNzAzMDM4MjUzLCJleHAiOjE3Mjg5NTgyNTN9.eglTZ2-CPHUBDYyPbzk5k69Yv24J2ELTd8CN3VZL8_8'
 }
 
 const getters = {
     getTags(state){
         if (!state.userinfo.title) return []
         let title = state.userinfo.title
-        return title.split(',')
+        // NOTE: 数据库中是中文“、”
+        return title.split('、')
     },
     getDepartments (state) {
         let userinfo = state.userinfo

src/views/Approve.vue

@@ -6,7 +6,10 @@
     <div class="filter-container p-h-12 flex flex-row flex-row-aic">
       <van-field v-model="searchVal" clearable placeholder="搜索" left-icon="search" :disabled="true" :readonly="true"
         @click="handleClickSearchBox" />
-      <div class="filterbox flex flex-row flex-0shrink" @click="() => popupVisibility = true">
+      <div :class="[
+        'filterbox flex flex-row flex-0shrink',
+        hasFilter ? 'filterbox--sel' : ''
+      ]" @click="() => popupVisibility = true">
         <van-icon name="filter-o" size="20" />
         <span>筛选</span>
       </div>
@@ -44,11 +47,11 @@
           </div>
           <div class="popup__rangetime__main flex flex-row flex-row-aic">
             <van-field :value="timeStart" :disabled="true" clearable placeholder="开始时间" :center="true"
-              @click-input="handleClickTimeStart" />
+              @click="handleClickTimeStart" />
             <span class="horization"></span>
 
             <van-field :value="timeEnd" :disabled="true" clearable placeholder="结束时间" :center="true"
-              @click-input="handleClickTimeEnd" />
+              @click="handleClickTimeEnd" />
           </div>
         </div>
       </div>
@@ -58,9 +61,7 @@
       </div>
 
       <ChooseTime ref="chooseTimeRef" v-model="timeStart" :min-date="minDate" :max-date="maxDate" />
-
       <ChooseTime ref="chooseTimeRef2" v-model="timeEnd" :min-date="minDate" :max-date="maxDate" />
-
     </van-popup>
   </div>
 </template>
@@ -93,7 +94,11 @@ export default {
           break
       }
       return welcomeTxt
-    }
+    },
+    // 判断是否为筛选
+    hasFilter() {
+      return this.typeVal || (this.timeStart && this.timeEnd)
+    },
   },
   data() {
     return {
@@ -159,6 +164,10 @@ export default {
       this.minDate = now
       let nowMax = new Date()
       this.maxDate = nowMax
+
+      if (this.$route.query.type_val) {
+        this.typeVal = this.$route.query.type_val
+      }
     },
     onLoadData() {
       this.__record_list__()
@@ -232,6 +241,7 @@ export default {
     // NOTE: 提交过滤搜索条件
     handleSubmitFilter() {
       this.popupVisibility = false
+      this.tableData = []
       this.onLoadData()
     },
 
@@ -255,7 +265,6 @@ export default {
 
     handleClickTimeStart() {
       const THAT = this
-      THAT.timeVal = THAT.timeStart
       this.$refs.chooseTimeRef.openChooseTime(date => {
         THAT.timeStart = dayjs(date).format('YYYY-MM-DD HH:mm')
       })
@@ -263,8 +272,7 @@ export default {
 
     handleClickTimeEnd() {
       const THAT = this
-      THAT.timeVal = THAT.timeEnd
-      this.$refs.chooseTimeRef.openChooseTime(date => {
+      this.$refs.chooseTimeRef2.openChooseTime(date => {
         THAT.timeEnd = dayjs(date).format('YYYY-MM-DD HH:mm')
       })
     },
@@ -366,6 +374,30 @@ export default {
       color: #727273;
       line-height: 22px;
     }
+
+    &--sel {
+      .van-icon.van-icon-filter-o {
+        color: #3290C4;
+      }
+
+      span {
+        color: #3290C4;
+      }
+    }
+  }
+}
+
+.filter-container .van-cell.van-field,
+.popup__rangetime__main .van-cell.van-field {
+  &::before {
+    content: "";
+    position: absolute;
+    left: 0;
+    top: 0;
+    z-index: 1;
+    width: 100%;
+    height: 100%;
+    background-color: transparent;
   }
 }
 

src/views/My.vue

@@ -151,10 +151,11 @@ export default {
 
         // NOTE: 跳转申请状态列表
         handleGoApplyOfState(row) {
+            console.log('%c ro >>>', 'background: blue; color: #fff', row);
             this.$router.push({
-                name: 'ApplyState',
+                name: 'Approve',
                 query: {
-                    type: row.module
+                    type_val: row.module
                 }
             })
         },

src/views/apply-state/index.vue

@@ -14,10 +14,10 @@
         <div class="approve-main">
             <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData">
                 <approve-item v-for="(item, idx) in tableData" :key="idx" approve-type="xx" :title="rendeTitleCom"
-                    :time="item.apply_date" :rows="item.__rows_item__" :person="item.approve_one.user.name" flag="info"
-                    :flag-state="Number(tabVal)" @click="handleGoInfo(item)" />
+                    :time="item.apply_date" :rows="item.__rows_item__"
+                    :person="item.approve_one ? item.approve_one.user.name : ''" flag="info" :flag-state="Number(tabVal)"
+                    @click="handleGoInfo(item)" />
             </van-list>
-
             <my-empty v-show="showEmpty" tip="暂无数据" />
         </div>
 

src/views/applyfor/ProductStore.vue

@@ -343,6 +343,7 @@
 
 <script>
 /**
+ * 商品库页面
  * @description 当前页面处理为多种展示格式。 
  *  - 商品单选
  *  - 分类选择

src/views/applyfor/approval-form.vue

@@ -0,0 +1,59 @@
+<template>
+  <div class="approval-container">
+    <div class="approval__content">
+      <van-list v-model="listLoading" :finished="finished" :finished-text="finishedText" @load="onLoadData"
+        :immediate-check="false">
+
+      </van-list>
+      <my-empty v-show="showEmpty" tip="暂无数据" />
+    </div>
+  </div>
+</template>
+
+<script>
+
+import { getRecordList } from '@/api/approveinfo'
+
+export default {
+  name: 'CApprovalForm',
+  data: () => ({
+    list: [],
+    showEmpty: false,
+    listLoading: false,
+    finished: false,
+    finishedText: '暂无更多数据了',
+    pagination: {
+      page: 1,
+      page_num: 20
+    }
+  }),
+  created() {
+    this.__list__()
+  },
+  methods: {
+    async __list__() {
+      try {
+        const params = {
+          group: 'form'
+        }
+        const result = await getRecordList(params)
+        if (result.code === 1) {
+          console.log('%c record form list >>>', 'background: blue; color: #fff', result.data);
+
+        }
+      } catch (error) {
+        console.log('%c __list__ >>>', 'background: blue; color: #fff', error);
+
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.approval {
+  &-container {}
+
+  &__content {}
+}
+</style>

src/views/applyfor/components/CFlowPath.vue

@@ -38,7 +38,7 @@
             </div>
 
             <!-- 抄送人 -->
-            <div class="rows">
+            <div class="rows" v-if="copySelList.length || isAllowCopy == '1'">
                 <div class="left">
                     <div class="left__title">
                         抄送人
@@ -48,7 +48,7 @@
                     </div>
                 </div>
                 <div class="right flex flex-row">
-                    <div v-if="copySelList.length" class="procesbox flex flex-row flex-row-aic">
+                    <div class="procesbox flex flex-row flex-row-aic">
                         <div class="flex flex-row" v-if="copySelList.length > 3" @click="showMoreCopy = true">
                             <div class="personal flex flex-col">
                                 <div class="avatar avatar--name">

src/views/applyfor/components/IndexType3.vue

@@ -3,7 +3,8 @@
 
         <!-- TODO: 关联采购审批单 -->
         <!-- 需要新增页面 -->
-        <c-select title="采购审批单" />
+        <!-- <c-select title="采购审批单" /> -->
+        <c-select-imitate title="采购审批单" :value="selOrd_text" @click="handleClickSelOrdRow" @close="handleCloseSelOrd" />
 
         <c-product-store type="3" v-model="stock_goods" />
 
@@ -57,8 +58,9 @@ export default {
             stock_goods: [], // 入库明细
 
             approve_user: [],
-            copy_user: []
+            copy_user: [],
             // formData end
+            selOrd_text: '',
         }
     },
 
@@ -71,6 +73,7 @@ export default {
         // 获取编辑数据
         handleFormatEditData(data) {
             console.log('%c edit data type6 >>>', 'background: blue; color: #fff', data);
+
             const IS_EDIT = this.flag === 'approve'
             this.way = IS_EDIT ? 'edit' : 'update'
             this.id = IS_EDIT ? data.approve_id : data.id
@@ -155,6 +158,17 @@ export default {
                 console.log('it5, __post__', e);
             }
         },
+
+        handleClickSelOrdRow() {
+            this.$router.push({
+                name: 'CApprovalForm',
+                query: {}
+            })
+        },
+        handleCloseSelOrd() {
+            this.selOrd_text = ''
+            this.selOrd = ''
+        }
     },
 }
 

src/views/applyfor/components/IndexType8.vue

@@ -14,7 +14,7 @@
 
         <c-input title="具体内容" :required="true" input-type="textarea" :maxlength="800" v-model="desc" />
 
-        <c-files ctype="images" v-model="images" placeholder="最多九张" />
+        <c-files ref="imageM8Ref" ctype="images" v-model="images" placeholder="最多九张" />
 
         <c-flow-path :approve="approvePeople" :copy="copyPeople" :isAllowCopy="isCopy" />
 
@@ -103,6 +103,8 @@ export default {
                     url: img
                 }))
             }
+
+            this.$refs.imageM8Ref.handleUpdateValues()
         },
         /**
          * @description 提交数据默认函数
@@ -165,6 +167,18 @@ export default {
             }
         },
     },
+    watch: {
+        type: {
+            handler(val, oldv) {
+                if (val && val !== oldv) {
+                    this.getCommonFlowPathData({
+                        flow_item: val
+                    })
+                }
+            },
+            immediate: true
+        }
+    }
 }
 
 </script>

src/views/applyfor/indexMixins.js

@@ -41,8 +41,8 @@ export default {
                     module
                 }
 
-                // NOTE: moduel = [5, 6]时，需要填写 `flow_item`字段。 取值 `options.flow_item`; 获取审批流程
-                if ([5, 6].includes(module) && options.flow_item) params['flow_item'] = options.flow_item
+                // NOTE: moduel = [5, 6, 8]时，需要填写 `flow_item`字段。 取值 `options.flow_item`; 获取审批流程
+                if ([5, 6, 8].includes(module) && options.flow_item) params['flow_item'] = options.flow_item
                 const res = await getApproveFlowPath(params)
 
                 if (res.code === 1) {

src/views/approve/components/ApproveControl.vue

@@ -58,6 +58,10 @@ export default {
         flagState: { // NOTE: flag的状态值`status`
             type: Number
         },
+        editData: {
+            type: Object,
+            default: () => ({})
+        }
     },
     computed: {
         controlComputed() {
@@ -205,7 +209,9 @@ export default {
                 const params = {
                     id: this.id
                 }
+
                 const result = await func(params)
+
                 if (result.code === 1) {
                     console.log('%c revoke event data >>>', 'background: blue; color: #fff', result.data);
                     this.$toast(result.msg)
@@ -238,13 +244,19 @@ export default {
         },
 
         handleGoExaminePage(type) {
-            console.log('type', type);
+            const query = {
+                id: this.id,
+                type
+            }
+
+            // NOTE: 维修时需要指派维修人员
+            if (this.module === 8 && this.editData.is_maintain) {
+                query.maintain_type = this.editData.type
+            }
+
             this.$router.push({
                 name: 'Examine',
-                query: {
-                    // 携带详情Id.
-                    type
-                }
+                query
             })
         },
     }

src/views/approve/components/ApproveFlowPath.vue

@@ -196,6 +196,13 @@ export default {
     position: relative;
     margin-bottom: 43px;
 
+    &:last-child {
+        .row__line {
+            // NOTE: 让其最后一个不展示
+            height: 0;
+        }
+    }
+
     .avatar {
         position: relative;
         width: 36px;

src/views/approve/detail.vue

@@ -39,7 +39,8 @@
         <!-- operate. 操作台 -->
         <!-- 集成 提醒, 修改, 下载, 拒绝，同意  5种 -->
         <div class="approve-control">
-            <approve-control :id="id" :module="module" :flag="pageType" :flag-state="dataDetailStatusComputed" />
+            <approve-control :edit-data="dataDetail" :id="id" :module="module" :flag="pageType"
+                :flag-state="dataDetailStatusComputed" />
         </div>
     </div>
 </template>
@@ -61,7 +62,6 @@ import * as approveApi from '@/api/approve'
 
 import { mapState } from 'vuex'
 
-
 import { formatApplyforRows } from '@/utils/applyfor-item'
 
 export default {
@@ -77,7 +77,7 @@ export default {
             let from = this.pageFrom
             switch (from) {
                 case 'approve_3':
-                    return 4 // 审批详情。 我收到的 没有任何操作权限
+                    return 4 // 审批详情。我收到的 没有任何操作权限
                 default:
                     return status
             }

src/views/approve/examine.vue

@@ -1,8 +1,13 @@
 <template>
     <div class="examine-container flex flex-col">
         <div class="examine__input">
-            <van-field v-model="message" rows="26" autosize type="textarea" maxlength="300" placeholder="请输入审批意见"
-                show-word-limit />
+            <van-field v-model="message" :rows="showMaintainBox ? 20 : 26" autosize type="textarea" maxlength="300"
+                placeholder="请输入审批意见" show-word-limit />
+
+            <template v-if="showMaintainBox">
+                <c-select title="维修人员" v-model="maintain_user_id" :list="maintainList" pickerValueKey="name"
+                    pickerValueId="id" />
+            </template>
         </div>
 
         <div class="p-h-12">
@@ -15,11 +20,16 @@
 
 <script>
 
+import CSelect from '../applyfor/components/CSelect.vue'
 import * as dd from 'dingtalk-jsapi'
 
+import * as commonApi from '@api/common'
 import { putAudit } from '@api/approve'
 
 export default {
+    components: {
+        CSelect
+    },
     computed: {
         btnTxt() {
             let t = this.type
@@ -33,22 +43,36 @@ export default {
                     break;
             }
             return s
+        },
+        showMaintainBox() {
+            return this.maintain_type && this.type === 'pass'
         }
     },
     data() {
         return {
             message: '',
+            maintainList: [],
             maintain_user_id: '',
-            type: undefined
+            type: undefined,
+
+            maintain_type: '',
+            // showMaintainBox: false
         }
     },
     created() {
+
         // this.$route.query
         // type: pass通过, refuse拒绝
-        this.type = this.$route.query.type || undefined
+        const { type, maintain_type } = this.$route.query
+
+        this.type = type
+        this.maintain_type = maintain_type
+        if (maintain_type) { // 有类型展示
+            this.__maintain_data__()
+        }
 
         // Set Navigation title and back
-        // dd.xxx
+        // TODO: Set Navigation title and other.
         dd.biz.navigation.setTitle({
             title: this.btnTxt
         })
@@ -56,8 +80,28 @@ export default {
     methods: {
         handleResetSignature() {
             let msg = this.message
-            console.log('msg', msg);
+            if (!msg) return this.$toast('请填写审批理由~')
+            this.__put__()
         },
+
+        /**
+         * 获取维修/信息员工列表
+         */
+        async __maintain_data__() {
+            try {
+                const params = {
+                    type: this.$route.query.maintain_type
+                }
+                const result = await commonApi.getMaintainData(params)
+                if (result.code === 1) {
+                    const data = result.data || []
+                    this.maintainList = data
+                }
+            } catch (error) {
+                console.log('%c maintain-data error >>>', 'background: blue; color: #fff', error);
+            }
+        },
+
         // 同意或者拒绝
         async __put__() {
             try {
@@ -68,18 +112,18 @@ export default {
                 }
 
                 // 维修人员
-                if (this.$route.query.showm === '1') {
+                if (this.showMaintainBox && this.maintain_user_id) {
                     params.maintain_user_id = this.maintain_user_id
                 }
 
                 const result = await putAudit(params)
-                if (result.code === 1) {
-                    console.log('%c printlog >>>', 'background: blue; color: #fff', result.data);
 
+                if (result.code === 1) {
+                    this.$toast(result.msg)
+                    this.$router.go(-1)
                 }
             } catch (error) {
                 console.log('%c examine error >>>', 'background: blue; color: #fff', error);
-
             }
 
         }
@@ -94,5 +138,11 @@ export default {
         padding-bottom: 20px;
         box-sizing: border-box;
     }
+
+    &__input {
+        .layout-container {
+            margin-top: 10px;
+        }
+    }
 }
 </style>

src/views/approve/search.vue

@@ -13,7 +13,7 @@
                 :immediate-check="false">
                 <approve-item v-for="(item, idx) in tableData" :key="idx" approve-type="xx" :title="item.__title__"
                     :time="item.apply_date" :rows="item.__rows_item__" :person="item.approve_one.user.name" :flag="flag"
-                    :flag-state="flagState" />
+                    :flag-state="flagState" @click="handleGoInfo(item)" />
             </van-list>
             <my-empty v-show="showEmpty" tip="暂无数据" />
         </div>
@@ -71,7 +71,6 @@ export default {
     },
 
     created() {
-        console.log('quers', this.$route.query);
         this.init()
     },
 
@@ -86,14 +85,12 @@ export default {
 
         handleInputEvent: throttle(function (keyword) {
             console.log('keyword>>>', keyword);
-
             this.tableData = []
             this.listLoading = true
             this.pagination.page = 1
             this.finished = false
             this.showEmpty = false
             this.finishedText = '暂无更多数据了'
-
             this.__getlist__()
         }, 400),
 
@@ -121,10 +118,13 @@ export default {
                 page,
                 page_num,
                 search,
-                module: this.formType,
                 status: this.flagState,
             }
 
+            if (this.formType) {
+                params.module = this.formType
+            }
+
             if (this.flag === 'info') {
                 params.group = 'list'
             }
@@ -145,7 +145,7 @@ export default {
                     list = list.map(item => ({
                         ...item,
                         __title__: `${item.approve_info_user.name}提交的${THAT.$store.getters['enum/getModuleText'](item.type)}`,
-                        __rows_item__: formatApproveItemRow(item, THAT.formType)
+                        __rows_item__: formatApproveItemRow(item, item.module)
                     }))
                     if (list.length < this.pagination.page_num) this.finished = true
                     else {
@@ -162,6 +162,18 @@ export default {
             }
 
         },
+
+        // NOTE: 详情
+        handleGoInfo(data) {
+            this.$router.replace({
+                name: 'ExamineDetail',
+                query: {
+                    id: data.approve_id,
+                    type: 'approve',
+                    from: `approve_${this.tabVal}`
+                }
+            })
+        },
     }
 }
 </script>