H5/threeSide.git

parent: c1be9c1e | 补丁 | 提交 | show whitespace

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

pyt

8 小时以前 ea40abf8b76ec6ef2adcb9b5174ddf08df0927c8

Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

4个文件已修改

	management/src/pages/appeal-management/detail.jsx	16 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	management/src/pages/appeal-management/statistics/index.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	management/src/pages/setting/role/components/addAndEdit.jsx	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	management/src/pages/setting/user/index.jsx	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 management/src/pages/appeal-management/detail.jsx

@@ -127,6 +127,16 @@
            </>,
            span: 4,
        },
        {
            key: '16',
            label: '上传语音',
            children: <>
                {detail.voiceFile && (detail.voiceFile || '').split(',').map((item, index) => (
                    <audio width={100} src={item} key={index} controls></audio>
                ))}
            </>,
            span: 4,
        },
    ];

    // 上传前校验
@@ -249,7 +259,7 @@
                        <Descriptions title="办理进度" column={1}>
                            {detail.complaintProgresses?.length > 0 ? detail.complaintProgresses.map((item, index) => (
                                <Descriptions.Item key={index}>
                                    <Card style={{ width: '800px', position: 'relative' }} title={item.createByName} extra={moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}>
                                    <Card style={{ width: '1250px', position: 'relative' }} title={item.createByName} extra={moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}>
                                        <Descriptions column={1} >
                                            <Descriptions.Item>{item.describe}</Descriptions.Item>
                                            <Descriptions.Item label={'上传图片'}>
@@ -259,7 +269,7 @@
                                            </Descriptions.Item>
                                            <Descriptions.Item label={'上传视频'}>
                                                {item.video && item.video.split(',').map((video, idx) => (
                                                    <video width={280} style={{ marginRight: '10px' }} src={video} key={idx} controls></video>
                                                    <video width={100} style={{ marginRight: '10px' }} src={video} key={idx} controls></video>
                                                ))}
                                            </Descriptions.Item>
                                        </Descriptions>
@@ -316,7 +326,7 @@
                                        </Descriptions.Item>
                                        <Descriptions.Item label={'上传视频'}>
                                            {detail.completionVideos && detail.completionVideos.split(',').map((item, index) => (
                                                <video width={280} style={{ marginRight: '10px' }} src={item} key={index} controls></video>
                                                <video width={100} style={{ marginRight: '10px' }} src={item} key={index} controls></video>
                                            ))}
                                        </Descriptions.Item>
                                    </Descriptions>

 management/src/pages/appeal-management/statistics/index.jsx

@@ -81,7 +81,7 @@
                                <Button
                                    type="link"
                                    onClick={() => {
                                        history.push('/appeal-management/detail?id=' + record.id)
                                        history.push('/appeal-management/detail?id=' + record.complaintId)
                                    }}
                                >
                                    查看详情

 management/src/pages/setting/role/components/addAndEdit.jsx

@@ -157,7 +157,7 @@
                </Form.Item>
                <Form.Item
                    name="tree"
                    label="角色权限"
                    label="后台权限"
                    rules={[{
                        required: true,
                        validator: (rule, value) => {
@@ -166,7 +166,7 @@
                                    resolve('');
                                } else {
                                    if (treeSeletKeys.length === 0) {
                                        reject(new Error('请选择角色权限'));
                                        reject(new Error('请选择后台权限'));
                                    }
                                    resolve('');
                                }

 management/src/pages/setting/user/index.jsx

@@ -29,6 +29,7 @@
  const [modalVisible1, handleModalVisibles1] = useState(false);
  const [roleList, setRoleList] = useState([]);
  const [unitId, setUnitId] = useState('');
  const [openKeys, setOpenKeys] = useState([]);
  const access = useAccess();
  const [items, setItems] = useState([]);
  const { SubMenu } = Menu;
@@ -92,7 +93,7 @@
      if (item.children && item.children.length > 0) {
        return (
          <SubMenu
            key={item.key}
            key={item.id}
            title={node(item)}
            onTitleClick={(e) => {
              if (e && e.domEvent) {
@@ -113,12 +114,11 @@
            if (e && e.domEvent) {
              e.domEvent.stopPropagation();
            }
            const itemId = item.id || item.key;
            setUnitId(itemId);
            setUnitId(item.id);
            const values = form.getFieldsValue();
            actionRef.current.reload(values);
          }}
          key={item.key}
          key={item.id}
        >
          {node(item)}
        </Menu.Item>
@@ -339,9 +339,10 @@
        <QueryFilter
          form={form}
          labelWidth={100}
          onReset={(values) => {
            fetchUnit(values);
          initialValues={{ type: 1 }}
          onReset={() => {
            setUnitId('');
            setOpenKeys([]);
            actionRef.current.reload();
          }}
          onFinish={(values) => {
@@ -377,6 +378,9 @@

          <Menu 
            mode="inline"
            selectedKeys={unitId ? [unitId] : []}
            openKeys={openKeys}
            onOpenChange={setOpenKeys}
            onClick={({ key, domEvent }) => {
              domEvent.stopPropagation();
            }}
@@ -387,6 +391,11 @@
        <Col span={20} style={{ minHeight: 650 }}>
          <ProTable
            rowKey="id"
            onReset={() => {
              setUnitId('');
              setOpenKeys([]);
              actionRef.current.reset();
            }}
            actionRef={actionRef}
            columns={columns}
            pagination={{

			@@ -127,6 +127,16 @@
			</>,
			span: 4,
			},
			{
			key: '16',
			label: '上传语音',
			children: <>
			{detail.voiceFile && (detail.voiceFile \|\| '').split(',').map((item, index) => (
			<audio width={100} src={item} key={index} controls></audio>
			))}
			</>,
			span: 4,
			},
			];

			// 上传前校验
			@@ -249,7 +259,7 @@
			<Descriptions title="办理进度" column={1}>
			{detail.complaintProgresses?.length > 0 ? detail.complaintProgresses.map((item, index) => (
			<Descriptions.Item key={index}>
			<Card style={{ width: '800px', position: 'relative' }} title={item.createByName} extra={moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}>
			<Card style={{ width: '1250px', position: 'relative' }} title={item.createByName} extra={moment(item.createTime).format('YYYY-MM-DD HH:mm:ss')}>
			<Descriptions column={1} >
			<Descriptions.Item>{item.describe}</Descriptions.Item>
			<Descriptions.Item label={'上传图片'}>
			@@ -259,7 +269,7 @@
			</Descriptions.Item>
			<Descriptions.Item label={'上传视频'}>
			{item.video && item.video.split(',').map((video, idx) => (
			<video width={280} style={{ marginRight: '10px' }} src={video} key={idx} controls></video>
			<video width={100} style={{ marginRight: '10px' }} src={video} key={idx} controls></video>
			))}
			</Descriptions.Item>
			</Descriptions>
			@@ -316,7 +326,7 @@
			</Descriptions.Item>
			<Descriptions.Item label={'上传视频'}>
			{detail.completionVideos && detail.completionVideos.split(',').map((item, index) => (
			<video width={280} style={{ marginRight: '10px' }} src={item} key={index} controls></video>
			<video width={100} style={{ marginRight: '10px' }} src={item} key={index} controls></video>
			))}
			</Descriptions.Item>
			</Descriptions>

			@@ -81,7 +81,7 @@
			<Button
			type="link"
			onClick={() => {
			history.push('/appeal-management/detail?id=' + record.id)
			history.push('/appeal-management/detail?id=' + record.complaintId)
			}}
			>
			查看详情

			@@ -157,7 +157,7 @@
			</Form.Item>
			<Form.Item
			name="tree"
			label="角色权限"
			label="后台权限"
			rules={[{
			required: true,
			validator: (rule, value) => {
			@@ -166,7 +166,7 @@
			resolve('');
			} else {
			if (treeSeletKeys.length === 0) {
			reject(new Error('请选择角色权限'));
			reject(new Error('请选择后台权限'));
			}
			resolve('');
			}

			@@ -29,6 +29,7 @@
			const [modalVisible1, handleModalVisibles1] = useState(false);
			const [roleList, setRoleList] = useState([]);
			const [unitId, setUnitId] = useState('');
			const [openKeys, setOpenKeys] = useState([]);
			const access = useAccess();
			const [items, setItems] = useState([]);
			const { SubMenu } = Menu;
			@@ -92,7 +93,7 @@
			if (item.children && item.children.length > 0) {
			return (
			<SubMenu
			key={item.key}
			key={item.id}
			title={node(item)}
			onTitleClick={(e) => {
			if (e && e.domEvent) {
			@@ -113,12 +114,11 @@
			if (e && e.domEvent) {
			e.domEvent.stopPropagation();
			}
			const itemId = item.id \|\| item.key;
			setUnitId(itemId);
			setUnitId(item.id);
			const values = form.getFieldsValue();
			actionRef.current.reload(values);
			}}
			key={item.key}
			key={item.id}
			>
			{node(item)}
			</Menu.Item>
			@@ -339,9 +339,10 @@
			<QueryFilter
			form={form}
			labelWidth={100}
			onReset={(values) => {
			fetchUnit(values);
			initialValues={{ type: 1 }}
			onReset={() => {
			setUnitId('');
			setOpenKeys([]);
			actionRef.current.reload();
			}}
			onFinish={(values) => {
			@@ -377,6 +378,9 @@

			<Menu
			mode="inline"
			selectedKeys={unitId ? [unitId] : []}
			openKeys={openKeys}
			onOpenChange={setOpenKeys}
			onClick={({ key, domEvent }) => {
			domEvent.stopPropagation();
			}}
			@@ -387,6 +391,11 @@
			<Col span={20} style={{ minHeight: 650 }}>
			<ProTable
			rowKey="id"
			onReset={() => {
			setUnitId('');
			setOpenKeys([]);
			actionRef.current.reset();
			}}
			actionRef={actionRef}
			columns={columns}
			pagination={{