优化
This commit is contained in:
@@ -21,6 +21,7 @@ import { type ColumnItem, GiForm } from '@/components/GiForm'
|
||||
import { useResetReactive } from '@/hooks'
|
||||
import { materialType } from "@/hooks/app/materialType";
|
||||
import {materialProcess} from "@/hooks/app/materialProcess";
|
||||
import {useDict} from "@/hooks/app";
|
||||
|
||||
const emit = defineEmits<{
|
||||
(e: 'save-success'): void
|
||||
@@ -36,6 +37,7 @@ const formRef = ref<InstanceType<typeof GiForm>>()
|
||||
|
||||
const { materialTypeList, getMaterialTypeSelect } = materialType()
|
||||
const { materialProcessList, getMaterialProcessSelect } = materialProcess()
|
||||
const { light_level } = useDict('light_level')
|
||||
|
||||
|
||||
|
||||
@@ -77,6 +79,16 @@ const columns: ColumnItem[] = reactive([
|
||||
allowSearch: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '灯光等级',
|
||||
field: 'lightLevel',
|
||||
type: 'select',
|
||||
span: 24,
|
||||
props: {
|
||||
options: light_level,
|
||||
allowClear: true,
|
||||
},
|
||||
},
|
||||
{
|
||||
label: '物料流程编码',
|
||||
field: 'materialProcessId',
|
||||
@@ -155,10 +167,11 @@ const onUpdate = async (id: string) => {
|
||||
await getMaterialProcessSelect();
|
||||
}
|
||||
Object.assign(form, data)
|
||||
form.lightLevel = data.lightLevel ? JSON.stringify(data.lightLevel) : ''
|
||||
visible.value = true
|
||||
}
|
||||
|
||||
defineExpose({ onAdd, onUpdate })
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss"></style>
|
||||
<style scoped lang="scss"></style>
|
||||
@@ -54,6 +54,9 @@
|
||||
:src="record.photoUrl"
|
||||
/>
|
||||
</template>
|
||||
<template #lightLevel="{ record }">
|
||||
<GiCellTag :value="record.lightLevel" :dict="light_level" />
|
||||
</template>
|
||||
|
||||
<template #action="{ record }">
|
||||
<a-space>
|
||||
@@ -88,9 +91,12 @@ import { useDownload, useTable } from '@/hooks'
|
||||
import { isMobile } from '@/utils'
|
||||
import has from '@/utils/has'
|
||||
import {Message} from "@arco-design/web-vue";
|
||||
import {useDict} from "@/hooks/app";
|
||||
|
||||
defineOptions({ name: 'MaterialInfo' })
|
||||
|
||||
const { light_level } = useDict('light_level')
|
||||
|
||||
interface MaterialInfoRespWithStatus extends MaterialInfoResp {
|
||||
photoLoadError?: boolean;
|
||||
}
|
||||
@@ -118,6 +124,7 @@ const columns = ref<TableInstanceColumns[]>([
|
||||
{ title: '物料单位重量(g)', dataIndex: 'unitWeight', slotName: 'unitWeight' },
|
||||
{ title: '物料品类', dataIndex: 'typeName' },
|
||||
{ title: '物料规格', dataIndex: 'materialSpec', slotName: 'materialSpec' },
|
||||
{ title: '灯光等级', dataIndex: 'lightLevel', slotName: 'lightLevel' },
|
||||
{ title: '物料照片', dataIndex: 'photoUrl', slotName: 'photoUrl', width: 120, align: 'center' },
|
||||
{ title: '创建人', dataIndex: 'createUserString', slotName: 'createUser' },
|
||||
{ title: '创建时间', dataIndex: 'createTime', slotName: 'createTime' },
|
||||
|
||||
Reference in New Issue
Block a user