增加备注字段

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/AddModal.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { message, Form, Modal, Select, DatePicker, TreeSelect } from 'antd';
+import { message, Form, Modal, Select, DatePicker, TreeSelect, Input } from 'antd';
 import { connect } from 'dva';
 import moment from 'moment';
 
@@ -38,7 +38,7 @@ function AddModal(props) {
       let params = [
         {
           type_id: Number(values.subType),
-          comment: '',
+          comment: values.comment,
           // 父级id
           parent_type_id: Number(values.type),
           data: [
@@ -225,6 +225,9 @@ function AddModal(props) {
         {showDepSelect && renderDepSelect()}
         {renderSubType()}
         <Form.Item label="时间">{time}</Form.Item>
+        <Form.Item label="备注" name="comment">
+          <Input />
+        </Form.Item>
       </Form>
     </Modal>
   );

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/AuthWorkList.js

@@ -32,6 +32,10 @@ function AuthWorkList(props) {
       title: '提交人',
       dataIndex: ['User', 'CName'],
     },
+    {
+      title: '备注',
+      dataIndex: "comment",
+    },
     {
       title: '审核状态',
       render: record => renderStatus(record),

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/WorkList.js

@@ -15,7 +15,7 @@ function WorkList(props) {
     },
     {
       title: '所属项目/所属部门',
-      width: '30%',
+      width: '20%',
       render: item => {
         if (item.zIndex === 0) return '';
         return item.Project?.Name || depUserMap?.get(item.pay_dep_id)?.Name || '-';
@@ -26,6 +26,10 @@ function WorkList(props) {
       width: '15%',
       render: record => renderStatus(record),
     },
+    {
+      title: '备注',
+      dataIndex: 'comment',
+    },
     {
       title: '工时',
       width: '15%',
@@ -57,21 +61,9 @@ function WorkList(props) {
         if (item.audit_state == 1) return <a onClick={() => handleDelete(item)}>删除</a>;
         return (
           <>
-            <a
-              onClick={() =>
-                onHandleSave(item, workHour[`${item.id}`])
-              }
-            >
-              保存
-            </a>
+            <a onClick={() => onHandleSave(item, workHour[`${item.id}`])}>保存</a>
             <Divider type="vertical"></Divider>
-            <a
-              onClick={() =>
-                onAuth(item, workHour[`${item.id}`])
-              }
-            >
-              上报审批
-            </a>
+            <a onClick={() => onAuth(item, workHour[`${item.id}`])}>上报审批</a>
             <Divider type="vertical"></Divider>
             <a onClick={() => handleDelete(item)}>删除</a>
           </>

src/pages/PurchaseAdmin/PurchaseList/WorkingHours/index.js

@@ -247,10 +247,13 @@ function List(props) {
     let list = dataList.filter(item => item.time == current && item.status == 0);
     // let total = list.reduce((total, item) => total + item.workload, 0);
     let waitTotal = 0,
-      successTotal = 0;
+      successTotal = 0,
+      rejectTotal = 0;
     list.forEach(item => {
       if (item.audit_state == 2) {
         successTotal += item.workload;
+      } else if (item.audit_state == 3) {
+        rejectTotal += item.workload;
       } else {
         waitTotal += item.workload;
       }
@@ -268,7 +271,8 @@ function List(props) {
     return (
       <Popover content={content}>
         {successTotal !== 0 && <div>已审批: {successTotal}</div>}
-        {waitTotal !== 0 && <div style={{ color: '#e43d33' }}>已拒绝: {waitTotal}</div>}
+        {waitTotal !== 0 && <div style={{ color: '#1890FF' }}>待处理: {waitTotal}</div>}
+        {rejectTotal !== 0 && <div style={{ color: '#e43d33' }}>已拒绝: {rejectTotal}</div>}
       </Popover>
     );
   };