Merge branch 'dev' of http://git.ycjcjy.com/ubpa/pc-admin into dev

config/routes.js

@@ -68,6 +68,12 @@ export default [
       },
     ],
   },
+  {
+    path: '/deleteLog',
+    name: '删除日志',
+    icon: 'ProfileOutlined',
+    component: '@/pages/deleteLog',    
+  },
   // {
   //   path: '/MonitoringScreen',
   //   layout: false,

src/components/OrgSearch/index.jsx

@@ -20,6 +20,10 @@ export default (props) => {
   const handleSearch = (text) => {
     if (text) {
       searchData(text)
+    }else{
+      getList({ pageSize: 999 }, showType).then(res => {
+        setList(res.records || [])
+      })
     }
   }
 
@@ -28,6 +32,10 @@ export default (props) => {
       getDetail(value).then((res) => {
         setList([res])
       })
+    }else{
+      getList({ pageSize: 999 }, showType).then(res => {
+        setList(res.records || [])
+      })
     }
   }, [value])
 

src/pages/deleteLog/index.jsx

@@ -0,0 +1,100 @@
+
+import React, { useRef } from 'react'
+import moment from 'moment';
+import { DatePicker } from 'antd';
+import { PageHeaderWrapper } from '@ant-design/pro-layout';
+import PageTable from '@/components/PageTable'
+import OrgSearch from '@/components/OrgSearch';
+import { getDeleteformList } from '@/services/work'
+
+const { RangePicker } = DatePicker;
+
+const formatterTime = (val) => {
+  return val ? moment(val).format('YYYY-MM-DD HH:mm') : '';
+};
+
+export default (props) => {
+  const initDate = useRef(moment())
+  const deleteDateRef = useRef(moment())
+
+  const handleBeforSearch = (params) => {
+    const { createDate, deleteDate, ...others } = params;
+
+    let start, end;
+    if (!createDate || createDate.length < 1) {
+      // 默认时间是今天
+      start = moment().format('YYYY-MM-DD')
+      end = start
+    } else {
+      start = moment(createDate[0]).format('YYYY-MM-DD')
+      end = moment(createDate[1]).format('YYYY-MM-DD')
+    }
+    let deleteStart, deleteEnd;
+    if (!deleteDate || deleteDate.length < 1) {
+      // 默认时间是今天
+      deleteStart = moment().format('YYYY-MM-DD')
+      deleteEnd = deleteStart
+    } else {
+      deleteStart = moment(deleteDate[0]).format('YYYY-MM-DD')
+      deleteEnd = moment(deleteDate[1]).format('YYYY-MM-DD')
+    }
+
+    return { ...others, start, end, deleteStart, deleteEnd };
+  }
+
+  const columns = [
+    {
+      title: '企业名称',
+      dataIndex: 'orgId',
+      key: 'orgId',
+      search: true,
+      hideInTable: true,
+      renderFormItem: () => (
+        <OrgSearch placeholder='请输入企业名称' />
+      ),
+    },
+    {
+      title: '企业名称',
+      dataIndex: 'orgName',
+      key: 'orgName',
+      search: false,
+    },
+    {
+      title: '操作人',
+      dataIndex: 'deleteUserName',
+      key: 'deleteUserName',
+      search:false
+    },
+    {
+      title: '操作时间',
+      dataIndex: 'deleteDate',
+      key: 'deleteDate',
+      render: (t) => formatterTime(t),
+      renderFormItem: (_, record) => <RangePicker defaultValue={[deleteDateRef.current, deleteDateRef.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+    },
+    {
+      title: '申请人',
+      dataIndex: 'userName',
+      key: 'userName',
+    },
+    {
+      title: '申请时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      render: (t) => formatterTime(t),
+      renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
+    },
+  ]
+
+  return (
+    <PageHeaderWrapper>
+      <PageTable
+        columns={columns}
+        request={getDeleteformList}
+        options={false}
+        beforeSearchSubmit={handleBeforSearch}
+        rowKey="formId"
+      />
+    </PageHeaderWrapper>
+  )
+}

src/pages/org/org/Edit.jsx

@@ -1,27 +1,32 @@
-import React, { useEffect, useState } from 'react'
-import { Form, Input, Button, Checkbox } from 'antd';
+import React, { useEffect, useState, useCallback, useRef } from 'react'
+import { useModel } from 'umi'
+import { Form, Input, Button,message } from 'antd';
 import ProCard from '@ant-design/pro-card';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
-import { getDetail, saveOrg, updateOrg } from '@/services/org';
+import QRCode from 'qrcodejs2'
+import { getDetail, saveOrg, updateOrg,saveOrgUser,getOrgAdminDetail } from '@/services/org';
+import md5 from 'md5';
 
 export default (props) => {
   const { history } = props;
   const { id } = history.location.query;
+  const { initialState } = useModel('@@initialState');
 
   const [form] = Form.useForm();
   const [formData, setFormData] = useState()
   const [loading, setLoading] = useState(false)
+  const qrcodeRef = useRef()
+  const linkRef = useRef()
 
-  useEffect(() => {
-    if (id) {
-      getDetail(id).then(res => {
+  const [adminForm] = Form.useForm();
+  const [adminFormData, setAdminFormData] = useState()
+  const [adminLoading, setAdminLoading] = useState(false)
 
-        setFormData(res);
-        form.setFieldsValue(res);
-      })
+  const downloadQrcode = useCallback(() => {
+    if (linkRef.current) {
+      linkRef.current.click();
     }
-  }, [id, form])
-
+  }, [])
   const onFinish = (values) => {
     setLoading(true)
     if (id) {
@@ -40,46 +45,145 @@ export default (props) => {
       })
     }
   };
-
   const onFinishFailed = (errorInfo) => {
     console.log('Failed:', errorInfo);
   };
 
+  const onAdminFinish=(values)=>{
+    if (!/^1[0-9]{10}$/.test(values.phone)) {
+      message.warning('请输入正确的十一位手机号');
+      setLoading(false);
+      return false;
+    }
+    var data={...adminFormData,...values,password:md5(values.password),isAdmin:true};
+    setAdminLoading(true)
+    saveOrgUser(id,data).then(res=>{
+      message.success('保存成功');
+      history.go(-1);
+      setAdminLoading(false)
+    }).catch(err=>{
+      console.log(err);
+      setAdminLoading(false)
+    })
+  }
+
+  useEffect(() => {
+    if (id) {
+      getDetail(id).then(res => {
+        setFormData(res);
+        form.setFieldsValue(res);
+
+        // 初始化二维码
+        const qrcode = new QRCode(qrcodeRef.current, {
+          width: 160,
+          height: 160, // 高度
+          text: initialState.report_url + '?org=' + id
+        })
+        const canvas = qrcodeRef.current.querySelector('canvas')
+        // 创建下载链接
+        const aElement = document.createElement('a');
+        linkRef.current = aElement;
+        linkRef.current.download = res.orgName + '.png'
+        linkRef.current.href = canvas.toDataURL('image/jpg')
+      })
+      getOrgAdminDetail(id).then((res)=>{
+        setAdminFormData(res);
+        adminForm.setFieldsValue(res);
+      })
+    }
+  }, [id, form])
+
   return (
     <PageHeaderWrapper>
-      <ProCard bordered>
-        <div style={{ maxWidth: '600px' }}>
-          <Form
-            name="basic"
-            form={form}
-            labelCol={{ span: 8 }}
-            wrapperCol={{ span: 16 }}
-            initialValues={formData}
-            onFinish={onFinish}
-            onFinishFailed={onFinishFailed}
-            autoComplete="off"
-          >
-            <Form.Item
-              label="企业名称"
-              name="orgName"
-              rules={[{ required: true, message: '请填写企业名称!' }]}
+      <ProCard tabs={{ type: 'card' }} style={{ minHeight: '700px' }}>
+        <ProCard.TabPane key={1} tab="基本信息">
+          <div style={{ maxWidth: '600px' }}>
+            <Form
+              name="basic"
+              form={form}
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}
+              initialValues={formData}
+              onFinish={onFinish}
+              onFinishFailed={onFinishFailed}
+              autoComplete="off"
             >
-              <Input />
-            </Form.Item>
-            <Form.Item
-              label="权重"
-              name="weight"
-              rules={[{ required: true, message: '请填写企业名称!' }]}
+              <Form.Item
+                label="企业名称"
+                name="orgName"
+                rules={[{ required: true, message: '请填写企业名称!' }]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item
+                label="权重"
+                name="weight"
+                rules={[{ required: true, message: '请填写企业名称!' }]}
+              >
+                <Input type='number' min='0' />
+              </Form.Item>
+              <Form.Item label=' ' colon={false} wrapperCol={{ offset: 3 }}>
+                <div ref={qrcodeRef} />
+              </Form.Item>
+              <Form.Item label=' ' colon={false} >
+                <Button type="primary" htmlType="submit" loading={loading}>
+                  保存
+                </Button>
+                <Button style={{ margin: '0 32px' }} onClick={downloadQrcode} >
+                  下载二维码
+                </Button>
+                <Button onClick={()=>{history.go(-1);}} >返回</Button>
+              </Form.Item>
+            </Form>
+          </div>
+        </ProCard.TabPane>
+        <ProCard.TabPane disabled={!id} key={2} tab='管理员'>
+          <div style={{ maxWidth: '600px' }}>
+            <Form
+              form={adminForm}
+              labelCol={{ span: 8 }}
+              wrapperCol={{ span: 16 }}
+              initialValues={adminFormData}
+              onFinish={onAdminFinish}
             >
-              <Input type='number' min='0' />
-            </Form.Item>
-            <Form.Item wrapperCol={{ offset: 8, span: 16 }}>
-              <Button type="primary" htmlType="submit" loading={loading}>
-                保存
-              </Button>
-            </Form.Item>
-          </Form>
-        </div>
+              <Form.Item
+                label="姓名"
+                name="userName"
+                rules={[{ required: true, message: '请填写管理员姓名!' }]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item
+                label="手机号"
+                name="phone"
+                rules={[{ required: true, message: '请填写手机号!' }]}
+              >
+                <Input maxLength={11}/>
+              </Form.Item>
+              <Form.Item
+                label="登录账号"
+                name="loginName"
+                rules={[{ required: true, message: '请填写登录账号!' }]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item
+                label="密码"
+                name="password"
+                rules={[{ required: true, message: '请填写密码!' }]}
+              >
+                <Input />
+              </Form.Item>
+              <Form.Item label=' ' colon={false} >
+                <Button type="primary" htmlType="submit" loading={adminLoading}>
+                  保存
+                </Button>
+                <Button style={{marginLeft:'32px'}} onClick={()=>{history.go(-1);}}>返回</Button>
+              </Form.Item>
+            </Form>
+          </div>
+
+        </ProCard.TabPane>
       </ProCard>
     </PageHeaderWrapper>
   )

src/pages/resumework/form/index.jsx

@@ -1,11 +1,11 @@
 
 import React, { useRef } from 'react'
 import moment from 'moment';
-import { Badge, Image, DatePicker } from 'antd';
+import { Badge, Image, DatePicker,Button,Popconfirm,message } from 'antd';
 import { PageHeaderWrapper } from '@ant-design/pro-layout';
 import PageTable from '@/components/PageTable'
 import OrgSearch from '@/components/OrgSearch';
-import { getList, exportList } from '@/services/work'
+import { getList, exportList,deleteworkForm } from '@/services/work'
 
 const { RangePicker } = DatePicker;
 
@@ -33,6 +33,15 @@ export default (props) => {
     return { ...others, start, end };
   }
 
+  const handleDelete=(val)=>{
+    deleteworkForm(val).then(res=>{
+      message.success('删除成功');
+      actionRef.current.reload();
+    }).catch(err=>{
+      message.error(err.message || err);
+    })
+  }
+
   const columns = [
     {
       title: '企业名称',
@@ -42,7 +51,15 @@ export default (props) => {
       hideInTable:true,
       renderFormItem: () => (
         <OrgSearch placeholder='请输入企业名称' />
-      )
+      ),
+      formItemProps: {
+        rules: [
+          {
+            required: true,
+            message: '请输入企业名称',
+          },
+        ],
+      },
     },
     {
       title: '企业名称',
@@ -99,6 +116,24 @@ export default (props) => {
       render: (t) => formatterTime(t),
       renderFormItem: (_, record) => <RangePicker defaultValue={[initDate.current, initDate.current]} placeholder={['开始日期', '结束日期']} format='YYYY-MM-DD' />
     },
+    {
+      title: '操作',
+      valueType: 'option',
+      width: 160,
+      render: (_, record) => [
+        <Popconfirm
+          key={4}
+          title="您是否确认删除 ?"
+          onConfirm={() => handleDelete(record.formId)}
+          okText="确定"
+          cancelText="取消"
+        >
+          <Button style={{ padding: 0 }} type="link">
+            删除
+          </Button>
+        </Popconfirm>,
+      ],
+    },
   ]
 
 

src/services/org.js

@@ -11,3 +11,10 @@ export const saveOrg = (data) => request('/org', { data, method: 'post' });
 
 // 更新信息
 export const updateOrg = (id, data) => request(`/org/${id}`, { data, method: 'put' });
+
+
+// 新增管理员
+export const saveOrgUser = (id,data) => request(`/org/${id}/user`, { data, method: 'post' });
+
+// 获取企业管理员详情
+export const getOrgAdminDetail = (id) => request(`/org/${id}/admin`);

src/services/work.js

@@ -15,3 +15,16 @@ export const getAbnormalList = (params) =>
     ).format('YYYY-MM-DD')}&isAll=true&isAbnormal=true`,
     { params },
   );
+// 获取删除列表
+export const getDeleteformList = (params) =>
+  request(
+    `/resume-work-form?isAll=true&isDelete=true`,
+    { params },
+  );
+
+/**
+ * 删除提交记录
+ * @param {*} data
+ * @returns
+ */
+export const deleteworkForm = (id) => request(`/resume-work-form/${id}`, { method: 'delete' });