审批状态

api/app/lib/controllers/resourceConsumption/index.js

@@ -5,7 +5,7 @@ function getApproveList (opts) {
    return async function (ctx, next) {
 
       const models = ctx.fs.dc.models;
-      const { page, limit, applyAt, approveState, resourceName, applyBy, applyById } = ctx.query;
+      const { page, limit, applyAt, approveState, resourceName, applyBy, applyById, state } = ctx.query;
 
       let errMsg = { message: '获取消费审批列表失败' }
       try {
@@ -16,11 +16,11 @@ function getApproveList (opts) {
             distinct: true,
             include: [{
                model: models.User,
-               as:'applyUser',
+               as: 'applyUser',
                attributes: ['id', 'name']
-            },{
+            }, {
                model: models.User,
-               as:'approveUser',
+               as: 'approveUser',
                attributes: ['id', 'name']
             },]
          }
@@ -45,6 +45,19 @@ function getApproveList (opts) {
             option.where.approveState = approveState
          }
 
+         if (state == 1) {
+            option.where.approveState = '已审批'
+            option.where.token = { $ne: null }
+         }
+         if (state == 2) {
+            option.where.approveState = '已审批'
+            option.where.token = null
+            option.where.approveRemarks = { $ne: null }
+         }
+         if (state == 3) {
+            option.where.approveState = '审批中'
+         }
+
          if (applyAt) {
             option.where.applyAt = {
                $between: [

web/client/src/sections/resourceConsumption/containers/myApplication.js

@@ -4,7 +4,7 @@ import moment from 'moment';
 import ApproveModal from '../components/approveModal';
 
 
-import { Tabs, Form, Input, DatePicker, Button, Table } from 'antd';
+import { Tabs, Form, Input, DatePicker, Button, Table, Select } from 'antd';
 import { v1 } from 'uuid';
 
 
@@ -84,15 +84,28 @@ function MyApplication ({ loading, clientHeight, actions, dispatch, user }) {
             setFormData({ ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" })
             resourceData({ limit: 10, page: 0, ...v, applyAt: v.applyAt ? moment(v.applyAt).format('YYYY-MM-DD HH:mm:ss') : "" })
             setQuery({ limit: 10, page: 0 });
-            console.log(v);
          }}
          autoComplete="off"
       >
          <Form.Item label="资源名称" name="resourceName" >
             <Input allowClear placeholder='资源名称关键字' style={{ width: 200, marginRight: 16 }} />
          </Form.Item>
-         <Form.Item label="申请人" name="applyBy" >
+         <Form.Item label="审批状态" name="state" >
-            <Input allowClear placeholder='申请人关键字' style={{ width: 140, marginRight: 16 }} />
+            <Select allowClear placeholder="全部" style={{ width: 130, marginRight: 16 }}
+               options={[
+                  {
+                     value: 1,
+                     label: '审批通过',
+                  },
+                  {
+                     value: 2,
+                     label: '审批不通过',
+                  },
+                  {
+                     value: 3,
+                     label: '审批中',
+                  }]}
+            />
          </Form.Item>
          <Form.Item label="申请日期" name="applyAt" >
             <DatePicker style={{ width: 140, marginRight: 16 }} />