wms-master.git - Gitblit

parent: 8708598a | 补丁 | 提交 | show whitespace

skyouc

2 天以前 2fd99785c2970827bae69004e81c8ce486e71200

库存调整单功能优化

3个文件已修改

10个文件已删除

	rsf-admin/src/page/reviseLog/ReviseLogCreate.jsx	180 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLog/ReviseLogEdit.jsx	152 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLog/ReviseLogList.jsx	172 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLog/ReviseLogPanel.jsx	117 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLog/index.jsx	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx	197 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx	169 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx	176 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx	129 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/reviseLogItem/index.jsx	18 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx	22 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	rsf-admin/src/page/stockManage/locRevise/ReviseLogList.jsx	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 rsf-admin/src/page/reviseLog/ReviseLogCreate.jsx

File was deleted

 rsf-admin/src/page/reviseLog/ReviseLogEdit.jsx

File was deleted

 rsf-admin/src/page/reviseLog/ReviseLogList.jsx

File was deleted

 rsf-admin/src/page/reviseLog/ReviseLogPanel.jsx

File was deleted

 rsf-admin/src/page/reviseLog/index.jsx

File was deleted

 rsf-admin/src/page/reviseLogItem/ReviseLogItemCreate.jsx

File was deleted

 rsf-admin/src/page/reviseLogItem/ReviseLogItemEdit.jsx

File was deleted

 rsf-admin/src/page/reviseLogItem/ReviseLogItemList.jsx

File was deleted

 rsf-admin/src/page/reviseLogItem/ReviseLogItemPanel.jsx

File was deleted

 rsf-admin/src/page/reviseLogItem/index.jsx

File was deleted

 rsf-admin/src/page/stockManage/locRevise/LocReviseEdit.jsx

@@ -55,8 +55,19 @@
                <SimpleForm
                    shouldUnregister
                    warnWhenUnsavedChanges
                    toolbar={<FormToolbar />}
                    toolbar={false}
                    mode="onTouched"
                    sx={{
                        "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
                            bgcolor: 'white',
                            WebkitTextFillColor: "rgba(0, 0, 0)"
                        },

                        "& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
                            bgcolor: 'white',
                            WebkitTextFillColor: "rgba(0, 0, 0)"
                        }
                    }}
                    defaultValues={{}}
                    // sx={{
                    //     "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
@@ -87,19 +98,22 @@
                                    label="table.field.locRevise.type"
                                    source="type"
                                    choices={[
                                        { id: 0, name: ' 库存调整' },
                                        { id: 1, name: ' 库存调整' },
                                        { id: 2, name: ' 盘点调整' },
                                    ]}
                                    readOnly
                                />
                                <NumberInput
                                    label="table.field.locRevise.anfme"
                                    source="anfme"
                                    readOnly
                                />
                            </Stack>
                            <Stack direction='row' gap={2}>
                                <NumberInput
                                    label="table.field.locRevise.reviseQty"
                                    source="reviseQty"
                                    readOnly
                                />
                                <SelectInput
                                    label="table.field.locRevise.exceStatus"
@@ -109,11 +123,13 @@
                                        { id: 1, name: '执行中' },
                                        { id: 2, name: '执行完成' },
                                    ]}
                                    readOnly
                                />
                                <TextInput
                                    label="table.field.locRevise.areaName"
                                    source="orgAreaName"
                                    source="areaName"
                                    parse={v => v}
                                    readOnly
                                />
                            </Stack>
                        </Grid>

 rsf-admin/src/page/stockManage/locRevise/LocReviseList.jsx

@@ -124,7 +124,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={false}
                    expandSingle={true}
                    omit={['id', 'createTime', 'createBy', 'orgAreaId', 'memo']}
                    omit={['id', 'createTime', 'createBy', 'areaId', 'memo']}
                >
                    <NumberField source="id" />
                    <TextField source="code" label="table.field.locRevise.code" />
@@ -132,8 +132,8 @@
                    <NumberField source="anfme" label="table.field.locRevise.anfme" />
                    <NumberField source="reviseQty" label="table.field.locRevise.reviseQty" />
                    <TextField source="exceStatus$" label="table.field.locRevise.exceStatus" sortable={false} />
                    <NumberField source="orgAreaId" label="table.field.locRevise.areaId" />
                    <TextField source="orgAreaName" label="table.field.locRevise.areaName" />
                    <NumberField source="areaId" label="table.field.locRevise.areaId" />
                    <TextField source="areaName" label="table.field.locRevise.areaName" />
                    <TextField source="updateBy$" label="common.field.updateBy" />
                    <DateField source="updateTime" label="common.field.updateTime" showTime />
                    <DateField source="createBy$" label="common.field.createBy" />

 rsf-admin/src/page/stockManage/locRevise/ReviseLogList.jsx

@@ -123,7 +123,7 @@
                    rowClick={(id, resource, record) => false}
                    expand={<ReviseLogItemList />}
                    expandSingle={true}
                    omit={['id', 'reviseId', 'createTime', 'createBy', 'memo']}
                    omit={['id', 'reviseId', 'warehouseId', 'areaId', 'createTime', 'createBy', 'memo']}
                >
                    <NumberField source="id" />
                    <NumberField source="reviseId" label="table.field.reviseLog.reviseId" />

			@@ -55,8 +55,19 @@
			<SimpleForm
			shouldUnregister
			warnWhenUnsavedChanges
			toolbar={<FormToolbar />}
			toolbar={false}
			mode="onTouched"
			sx={{
			"& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
			bgcolor: 'white',
			WebkitTextFillColor: "rgba(0, 0, 0)"
			},

			"& .MuiInputBase-input.MuiFilledInput-input.Mui-disabled": {
			bgcolor: 'white',
			WebkitTextFillColor: "rgba(0, 0, 0)"
			}
			}}
			defaultValues={{}}
			// sx={{
			// "& .MuiFormLabel-root.MuiInputLabel-root.Mui-disabled": {
			@@ -87,19 +98,22 @@
			label="table.field.locRevise.type"
			source="type"
			choices={[
			{ id: 0, name: ' 库存调整' },
			{ id: 1, name: ' 库存调整' },
			{ id: 2, name: ' 盘点调整' },
			]}
			readOnly
			/>
			<NumberInput
			label="table.field.locRevise.anfme"
			source="anfme"
			readOnly
			/>
			</Stack>
			<Stack direction='row' gap={2}>
			<NumberInput
			label="table.field.locRevise.reviseQty"
			source="reviseQty"
			readOnly
			/>
			<SelectInput
			label="table.field.locRevise.exceStatus"
			@@ -109,11 +123,13 @@
			{ id: 1, name: '执行中' },
			{ id: 2, name: '执行完成' },
			]}
			readOnly
			/>
			<TextInput
			label="table.field.locRevise.areaName"
			source="orgAreaName"
			source="areaName"
			parse={v => v}
			readOnly
			/>
			</Stack>
			</Grid>

			@@ -124,7 +124,7 @@
			rowClick={(id, resource, record) => false}
			expand={false}
			expandSingle={true}
			omit={['id', 'createTime', 'createBy', 'orgAreaId', 'memo']}
			omit={['id', 'createTime', 'createBy', 'areaId', 'memo']}
			>
			<NumberField source="id" />
			<TextField source="code" label="table.field.locRevise.code" />
			@@ -132,8 +132,8 @@
			<NumberField source="anfme" label="table.field.locRevise.anfme" />
			<NumberField source="reviseQty" label="table.field.locRevise.reviseQty" />
			<TextField source="exceStatus$" label="table.field.locRevise.exceStatus" sortable={false} />
			<NumberField source="orgAreaId" label="table.field.locRevise.areaId" />
			<TextField source="orgAreaName" label="table.field.locRevise.areaName" />
			<NumberField source="areaId" label="table.field.locRevise.areaId" />
			<TextField source="areaName" label="table.field.locRevise.areaName" />
			<TextField source="updateBy$" label="common.field.updateBy" />
			<DateField source="updateTime" label="common.field.updateTime" showTime />
			<DateField source="createBy$" label="common.field.createBy" />

			@@ -123,7 +123,7 @@
			rowClick={(id, resource, record) => false}
			expand={<ReviseLogItemList />}
			expandSingle={true}
			omit={['id', 'reviseId', 'createTime', 'createBy', 'memo']}
			omit={['id', 'reviseId', 'warehouseId', 'areaId', 'createTime', 'createBy', 'memo']}
			>
			<NumberField source="id" />
			<NumberField source="reviseId" label="table.field.reviseLog.reviseId" />