李志伟 2 anos atrás
pai
commit
1c2beffeb1

+ 1
- 1
config/defaultSettings.js Ver arquivo

@@ -8,7 +8,7 @@ const Settings = {
8 8
   fixedHeader: false,
9 9
   fixSiderbar: true,
10 10
   colorWeak: false,
11
-  title: 'FOURTH WALL',
11
+  title: '开票信息收集公示系统',
12 12
   pwa: false,
13 13
   menu: {
14 14
     locale: false,

+ 2
- 2
config/routes.js Ver arquivo

@@ -26,13 +26,13 @@ export default [
26 26
   },  
27 27
   {
28 28
     path: '/invoiceFill',
29
-    name: '班列表',
29
+    name: '班列表',
30 30
     icon: 'ProfileOutlined',
31 31
     component: '@/pages/invoiceFill',    
32 32
   },
33 33
   {
34 34
     path: '/invoiceFill/edit.jsx',
35
-    name: '班编辑',
35
+    name: '班编辑',
36 36
     icon: 'ProfileOutlined',
37 37
     component: '@/pages/invoiceFill/edit.jsx',
38 38
     hideInMenu:true

BIN
public/back.png Ver arquivo


BIN
public/logo.png Ver arquivo


+ 0
- 65
src/components/echart/echart.jsx Ver arquivo

@@ -1,65 +0,0 @@
1
-import React, { useEffect, useRef } from 'react'
2
-// 引入 echarts 核心模块,核心模块提供了 echarts 使用必须要的接口。
3
-import * as echarts from 'echarts/core';
4
-// 引入柱状图图表,图表后缀都为 Chart
5
-import { BarChart, LineChart } from 'echarts/charts';
6
-// 引入提示框,标题,直角坐标系,数据集,内置数据转换器组件,组件后缀都为 Component
7
-import {
8
-  TitleComponent,
9
-  TooltipComponent,
10
-  GridComponent,
11
-  DatasetComponent,
12
-  TransformComponent,
13
-  DataZoomComponent,
14
-  LegendComponent,
15
-} from 'echarts/components';
16
-// 标签自动布局,全局过渡动画等特性
17
-import { LabelLayout, UniversalTransition } from 'echarts/features';
18
-// 引入 Canvas 渲染器,注意引入 CanvasRenderer 或者 SVGRenderer 是必须的一步
19
-import { CanvasRenderer } from 'echarts/renderers';
20
-
21
-// 注册必须的组件
22
-echarts.use([
23
-  TitleComponent,
24
-  TooltipComponent,
25
-  LegendComponent,
26
-  GridComponent,
27
-  DatasetComponent,
28
-  DataZoomComponent,
29
-  TransformComponent,
30
-  BarChart,
31
-  LineChart,//折线图
32
-  LabelLayout,
33
-  UniversalTransition,
34
-  CanvasRenderer
35
-]);
36
-
37
-export default (props) => {
38
-  const { className, style, option } = props
39
-
40
-  const chartRef = useRef()
41
-  const domRef = useRef()
42
-
43
-  const styleMerged = {
44
-    height: '100%',
45
-    ...style || {}
46
-  }
47
-
48
-  useEffect(() => {
49
-    chartRef.current = echarts.init(domRef.current)
50
-
51
-    return () => {
52
-      chartRef.current.dispose()
53
-    }
54
-  }, [])
55
-
56
-  useEffect(() => {
57
-    if (chartRef.current && option) {
58
-      chartRef.current.setOption(option)
59
-    }
60
-  }, [option])
61
-
62
-  return (
63
-    <div className={className} style={styleMerged} ref={domRef} />
64
-  )
65
-}

+ 3
- 3
src/pages/document.ejs Ver arquivo

@@ -6,11 +6,11 @@
6 6
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
7 7
     <meta
8 8
       name="keywords"
9
-      content="UBPA,复工复产,申报系统,云致科技"
9
+      content="开票信息收集公示系统,云致科技"
10 10
     />
11 11
     <meta
12 12
       name="description"
13
-      content="UBPA-DBM复工复产申报系统"
13
+      content="开票信息收集公示系统"
14 14
     />
15 15
     <meta
16 16
       name="description"
@@ -20,7 +20,7 @@
20 20
       name="viewport"
21 21
       content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
22 22
     />
23
-    <title>FOURTH WALL</title>
23
+    <title>开票信息收集公示系统</title>
24 24
     <link rel="icon" href="./logo.png" type="image/x-icon" />
25 25
     <script src="./js/particles.min.js"></script>
26 26
   </head>

+ 10
- 51
src/pages/invoiceDetail/index.jsx Ver arquivo

@@ -1,56 +1,30 @@
1 1
 
2 2
 import moment from 'moment';
3
-import React, { useRef, useEffect, useState } from 'react'
4
-
5
-import { Button, Modal, Popconfirm, message } from 'antd';
6
-import { PlusOutlined } from '@ant-design/icons';
3
+import React, { useRef } from 'react'
7 4
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
8 5
 import { getInvoiceDetailList } from '@/services/invoiceDetail'
9 6
 import { getExport } from '@/services/invoiceFill'
10
-
11 7
 import PageTable from '@/components/PageTable'
12
-import { history } from 'umi';
13 8
 import BanjiSearch from '@/components/BanjiSearch';
14 9
 
15
-const formatterTime = (val) => {
16
-  return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
17
-};
18
-
19 10
 export default (props) => {
20 11
   const actionRef = useRef();
21 12
 
22
-  const handleClick = () => {
23
-    history.push('/invoiceFill/edit.jsx');
24
-  }
25
-  const handleDelete = (id) => {
26
-    deleteInvoiceFill(id).then((res) => {
27
-      message.success('删除成功')
28
-      actionRef.current.reload();
29
-    }).catch((err) => {
30
-      console.log(err.message)
31
-    });
32
-  }
33
-
34
-  const handleBeforSearch = (params) => {
35
-    const { ...others } = params;    
36
-    return { ...others };
37
-  }
38
-
39 13
   const columns = [
40 14
     {
41
-      title: '班名称',
15
+      title: '班次名称',
42 16
       dataIndex: 'invoiceId',
43 17
       key: 'invoiceId',
44 18
       search: true,
45 19
       hideInTable: true,
46 20
       renderFormItem: () => (
47
-        <BanjiSearch placeholder='请输入班名称' />
21
+        <BanjiSearch placeholder='请输入班次名称' />
48 22
       ),
49 23
       formItemProps: {
50 24
         rules: [          
51 25
           {
52 26
             required: true,
53
-            message: '请输入班名称',
27
+            message: '请输入班次名称',
54 28
           }
55 29
         ],
56 30
       }
@@ -116,26 +90,12 @@ export default (props) => {
116 90
       search: false,
117 91
     },
118 92
     {
119
-      title: '操作',
120
-      valueType: 'option',
121
-      key: 'option',
122
-      ellipsis: true,
123
-      render: (_, record) => [
124
-        <Button type="link" key={1} onClick={() => history.push(`/invoiceFill/edit.jsx?id=${record.detailId}`)} style={{ padding: 0 }}>
125
-          编辑
126
-        </Button>,
127
-        <Popconfirm
128
-          key={2}
129
-          title="您是否确认删除 ?"
130
-          onConfirm={() => handleDelete(record.detailId)}
131
-          okText="确定"
132
-          cancelText="取消"
133
-        >
134
-          <Button style={{ padding: 0 }} type="link">
135
-            删除
136
-          </Button>
137
-        </Popconfirm>
138
-      ],
93
+      title: '提交时间',
94
+      dataIndex: 'createDate',
95
+      key: 'createDate',  
96
+      render: (t) => t ? moment(t).format('YYYY-MM-DD HH:mm') : '-',
97
+      width: 200,
98
+      search:false
139 99
     },
140 100
   ]
141 101
 
@@ -154,7 +114,6 @@ export default (props) => {
154 114
         form={{ ignoreRules: false }}
155 115
         manualRequest={true}
156 116
         revalidateOnFocus={false}
157
-        beforeSearchSubmit={handleBeforSearch}
158 117
         rowKey="detailId"
159 118
         scroll={{x:2000}}
160 119
       />

+ 5
- 5
src/pages/invoiceFill/components/BasicInfo.jsx Ver arquivo

@@ -19,7 +19,7 @@ const goBack = () => {
19 19
 export default (props) => {
20 20
   const { invoiceId } = props
21 21
   const [form] = Form.useForm();
22
-  const dateFormat = "YYYY-MM-DD HH:mm:ss";
22
+  const dateFormat = "YYYY-MM-DD HH:mm";
23 23
   const [loading, setLoading] = useState(false);
24 24
   const [formModel] = Form.useForm();
25 25
   const [formData, setFormData] = useState()
@@ -38,7 +38,7 @@ export default (props) => {
38 38
   )
39 39
 
40 40
 
41
-  //保存班
41
+  //保存班
42 42
   const onSubmit = (data) => {
43 43
     var newData = { ...data, endDate: moment(data.endDate) };
44 44
     setLoading(true);
@@ -148,10 +148,10 @@ export default (props) => {
148 148
       <Row>
149 149
         <Col span={12}>
150 150
           <Form {...formItemLayout} onFinish={onSubmit} form={form}>
151
-            <FormItem label="班级名称" name="name" rules={[{ required: true, message: '请输入班级名称' }]}>
152
-              <Input placeholder="请输入班名称" style={{ width: '350px' }} />
151
+            <FormItem label="班次名称" name="name" rules={[{ required: true, message: '请输入班次名称' }]}>
152
+              <Input placeholder="请输入班名称" style={{ width: '350px' }} />
153 153
             </FormItem>
154
-            <FormItem label="截止时间" name="endDate" rules={[{ required: true, message: '请选择班截止时间' }]}>
154
+            <FormItem label="截止时间" name="endDate" rules={[{ required: true, message: '请选择班截止时间' }]}>
155 155
               <DatePicker locale={locale} showTime style={{ width: '350px' }} format={dateFormat} />
156 156
             </FormItem>
157 157
             <FormItem label="状态" name="status" rules={[{ required: true, message: '请选择' }]}>

+ 2
- 2
src/pages/invoiceFill/index.jsx Ver arquivo

@@ -29,13 +29,13 @@ export default (props) => {
29 29
   }
30 30
   const action = () => [
31 31
     <Button key="add" type="primary" icon={<PlusOutlined />} onClick={handleClick}>
32
-      新增班
32
+      新增班
33 33
     </Button>
34 34
   ]
35 35
 
36 36
   const columns = [
37 37
     {
38
-      title: '班名称',
38
+      title: '班名称',
39 39
       dataIndex: 'name',
40 40
       key: 'name',
41 41
       search: true,

+ 1
- 1
src/pages/user/Login/index.jsx Ver arquivo

@@ -42,7 +42,7 @@ const Login = () => {
42 42
       <div className={styles.content}>
43 43
         <div className={styles.top}>
44 44
           <div className={styles.header}>
45
-            <span className={styles.title}>电网报销管理系统</span>
45
+            <span className={styles.title}>开票信息收集公示系统</span>
46 46
           </div>
47 47
           <div className={styles.desc}> </div>
48 48
         </div>

+ 1
- 1
src/services/invoiceFill.js Ver arquivo

@@ -13,7 +13,7 @@ export const saveInvoiceFill = (data) => request('/invoice', { data, method: 'po
13 13
 export const updateInvoiceFill = (id, data) => request(`/invoice/${id}`, { data, method: 'put' });
14 14
 
15 15
 /**
16
- * 删除班
16
+ * 删除班
17 17
  * @param {*} data
18 18
  * @returns
19 19
  */