/

src/pages/invoiceFill/components/BasicInfo.jsx

@@ -1,10 +1,12 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { Form, Input, Popconfirm, Select, Button, Modal, InputNumber, message, Col, Row, Card } from 'antd';
+import { Form, Input, Popconfirm, Select, Button, Modal, InputNumber, message, Col, Row, DatePicker } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
+import moment from 'moment';
 import { saveInvoiceFill, updateInvoiceFill, getInvoiceFillDetail } from '@/services/invoiceFill'
 import { saveInvoiceItemTpl, getInvoiceItemTplList, deleteInvoiceItemTpl } from '@/services/invoiceItemTpl'
 import { history } from 'umi';
 import PageTable from '@/components/PageTable';
+import locale from 'antd/es/date-picker/locale/zh_CN';
 
 const FormItem = Form.Item;
 const { Option } = Select;
@@ -15,6 +17,7 @@ const goBack = () => {
 export default (props) => {
   const { invoiceId } = props
   const [form] = Form.useForm();
+  const dateFormat = "YYYY-MM-DD HH:mm:ss";
   const [loading, setLoading] = useState(false);
   const [formModel] = Form.useForm();
   const [editModal, setEditModal] = useState(false);
@@ -23,7 +26,7 @@ export default (props) => {
 
   //保存班级
   const onSubmit = (data) => {
-    var newData = { ...data };
+    var newData = { ...data,endDate:moment(Date(data.endDate)) };
     setLoading(true);
     if (invoiceId) {
       updateInvoiceFill(invoiceId, newData)
@@ -81,6 +84,7 @@ export default (props) => {
       message.error(err.message || err);
     });
   }
+
   const actions = () => [
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={showModel}>
       新增报销项目
@@ -89,7 +93,7 @@ export default (props) => {
   useEffect(() => {
     if (invoiceId) {
       getInvoiceFillDetail(invoiceId).then((res) => {
-        form.setFieldsValue(res)
+        form.setFieldsValue({...res,endDate:moment(res.endDate)})
       }).catch((err) => {
         message.error(err.message || err);
       });
@@ -132,10 +136,14 @@ export default (props) => {
             <FormItem label="班级名称" name="name" rules={[{ required: true, message: '请输入班级名称' }]}>
               <Input placeholder="请输入班级名称" style={{ width: '350px' }} />
             </FormItem>
+            <FormItem label="截止时间" name="endDate" rules={[{ required: true, message: '请选择班级截止时间' }]}>
+              <DatePicker locale={locale} showTime style={{width:'350px'}} format={dateFormat} />
+            </FormItem>
             <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>
               <Select placeholder="请选择发布状态" style={{ width: '350px' }}>
-                <Option value={1}>发布</Option>
+                <Option value={1}>进行中</Option>
                 <Option value={0}>未发布</Option>
+                <Option value={2}>已截止</Option>
               </Select>
             </FormItem>
             <FormItem label=" " colon={false}>

src/pages/invoiceFill/components/InvoiceDetail.jsx

@@ -1,8 +1,7 @@
 import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
-import { Form, Input, Button, Modal, message, Popconfirm } from 'antd';
-import { PlusOutlined } from '@ant-design/icons';
-import { getInvoiceDetailList, updateInvoiceDetail,deleteInvoiceDetail } from '@/services/invoiceDetail'
-import {getExport} from '@/services/invoiceFill'
+import { Form, Input, Button, Modal, message, Popconfirm, Radio } from 'antd';
+import { getInvoiceDetailList, updateInvoiceDetail, deleteInvoiceDetail } from '@/services/invoiceDetail'
+import { getExport } from '@/services/invoiceFill'
 import PageTable from '@/components/PageTable';
 
 const FormItem = Form.Item;
@@ -18,7 +17,7 @@ export default forwardRef((props, ref) => {
 
   //弹窗保存
   const Submit = (val) => {
-    updateInvoiceDetail(invoiceDetail.detailId,invoiceId, { ...invoiceDetail, ...val }).then((res) => {
+    updateInvoiceDetail(invoiceId, { ...invoiceDetail, ...val }).then((res) => {
       message.success('修改成功')
       setModelLoading(false)
       refrash()
@@ -36,8 +35,8 @@ export default forwardRef((props, ref) => {
   }
 
   const showModel = (value) => {
-    form.setFieldsValue(value)
-    setInvoiceDetail(value)
+    form.setFieldsValue({ ...value, name: value.itemName, mergeRemark: value.mergeRemark || 0 })
+    setInvoiceDetail({ ...value, name: value.itemName, mergeRemark: value.mergeRemark || 0 })
     setEditModal(true);
   }
   const refrash = () => {
@@ -60,37 +59,6 @@ export default forwardRef((props, ref) => {
       dataIndex: 'personName',
       key: 'personName',
     },
-    {
-      title: '开票单位',
-      dataIndex: 'orgName',
-      key: 'orgName',
-    },
-    {
-      title: '纳税识别号',
-      dataIndex: 'taxNo',
-      key: 'taxNo',
-    },
-    {
-      title: '地址',
-      dataIndex: 'address',
-      key: 'address',
-      search: false
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-    },
-    {
-      title: '开户银行',
-      dataIndex: 'bankName',
-      key: 'bankName',
-    },
-    {
-      title: '开户行账户',
-      dataIndex: 'cardNo',
-      key: 'cardNo',
-    },
     {
       title: '项目',
       dataIndex: 'itemName',
@@ -102,18 +70,6 @@ export default forwardRef((props, ref) => {
       key: 'charge',
       search: false
     },
-    {
-      title: '是否合开',
-      dataIndex: 'mergeRemark',
-      key: 'mergeRemark',
-      search: false
-    },
-    {
-      title: '住宿清单',
-      dataIndex: 'stayRemark',
-      key: 'stayRemark',
-      search: false
-    },
     {
       title: '操作',
       valueType: 'option',
@@ -146,11 +102,10 @@ export default forwardRef((props, ref) => {
         request={getInvoiceDetailList}
         actionRef={actionRef}
         columns={columns}
-        rowKey="detailId"
+        rowKey={(record, index) => (record, index)}
         expfunc={getExport}
         invoiceId={invoiceId}
         options={false}
-        scroll={{ x: 2000 }}
         params={{ invoiceId }}
       />
 
@@ -165,39 +120,15 @@ export default forwardRef((props, ref) => {
         footer={null}
       >
         <Form {...formItemLayout} onFinish={Submit} form={form}>
-          <FormItem label="姓名" name="personName" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="开票（单位全称）" name="orgName" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="纳税识别号" name="taxNo" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="地址" name="address" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="电话" name="phone" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
+          <FormItem label="姓名">
+            {invoiceDetail?.personName}
           </FormItem>
-          <FormItem label="开户银行" name="bankName" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="开户行账户" name="cardNo" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="项目" name="itemName" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
+          <FormItem label="项目" name="name">
+            {invoiceDetail?.name}
           </FormItem>
           <FormItem label="开票金额" name="charge" rules={[{ required: true, message: '请输入' }]}>
             <Input placeholder="请输入" />
           </FormItem>
-          <FormItem label="是否合开" name="mergeRemark" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
-          <FormItem label="住宿清单" name="stayRemark" rules={[{ required: true, message: '请输入' }]}>
-            <Input placeholder="请输入" />
-          </FormItem>
           <FormItem label=" " colon={false}>
             <Button type="default" onClick={onCancel}>
               取消

src/pages/invoiceFill/index.jsx

@@ -19,26 +19,6 @@ export default (props) => {
   const handleClick = () => {
     history.push('/invoiceFill/edit.jsx');
   }
-  const handleOK = (record, data) => {
-    const title = record.status
-      ? '您确定要将该班级状态变更为未发布吗? 变更后该班级将不在移动端显示'
-      : '您确定要将该班级状态变更为发布吗? 发布后该班级可以在移动端显示';
-    Modal.confirm({
-      title: title,
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        // updateBanner(record.bannerId, { ...record, status: record.status === 1 ? 0 : 1 })
-        //   .then((res) => {
-        //     message.success('操作成功');
-        //     actionRef.current.reload();
-        //   })
-        //   .catch((err) => {
-        //     console.log(err.message)
-        //   });
-      },
-    });
-  };
   const handleDelete = (id) => {
     deleteInvoiceFill(id).then((res) => {
       message.success('删除成功')
@@ -72,12 +52,13 @@ export default (props) => {
       dataIndex: 'status',
       key: 'status',
       render: (_, record) => {
-        return record.status === 1 ? '发布' : '未发布';
+        return record.status === 0 ? '未发布' :record.status === 1 ? '进行中' : '已截止';
       },
       valueType: 'select',
       valueEnum: {
-        1: { text: '发布' },
-        2: { text: '未发布' },
+        0: { text: '未发布' },
+        1: { text: '进行中' },
+        2: { text: '已截止' },
       },
     },
     {
@@ -86,14 +67,11 @@ export default (props) => {
       key: 'option',
       ellipsis: true,
       render: (_, record) => [
-        <Button type="link" key={1} onClick={() => handleOK(record)} style={{ padding: 0 }}>
-          {record.status === 0 ? '发布' : '取消发布'}
-        </Button>,
-        <Button type="link" key={2} onClick={() => history.push(`/invoiceFill/edit.jsx?id=${record.invoiceId}`)} style={{ padding: 0 }}>
+        <Button type="link" key={1} onClick={() => history.push(`/invoiceFill/edit.jsx?id=${record.invoiceId}`)} style={{ padding: 0 }}>
           编辑
         </Button>,
         <Popconfirm
-          key={3}
+          key={2}
           title="您是否确认删除 ?"
           onConfirm={() => handleDelete(record.invoiceId)}
           okText="确定"

src/services/invoiceDetail.js

@@ -2,15 +2,15 @@ import request from '@/utils/request';
 
 // 获取列表
 export const getInvoiceDetailList = (params) =>
-  request(`/invoice/${params.invoiceId}/detail`, { params });
+  request(`/invoice/${params.invoiceId}/detail-tpl`, { params });
 
 // 生成明细
 export const saveInvoiceDetail = (invoiceId) =>
-  request(`/invoice/${invoiceId}/detail`, { method: 'post' });
+  request(`/invoice/${invoiceId}/detail-tpl`, { method: 'post' });
 
 // 更新信息
-export const updateInvoiceDetail = (id, invoiceId, data) =>
-  request(`/invoice/${invoiceId}/detail/${id}`, { data, method: 'put' });
+export const updateInvoiceDetail = (invoiceId, data) =>
+  request(`/invoice/${invoiceId}/detail-tpl/item`, { data, method: 'post' });
 
 /**
  * 删除报销明细
@@ -18,4 +18,4 @@ export const updateInvoiceDetail = (id, invoiceId, data) =>
  * @returns
  */
 export const deleteInvoiceDetail = (id) =>
-  request(`/invoice/detail/${id}`, { method: 'delete' });
+  request(`/invoice/detail-tpl/item/${id}`, { method: 'delete' });