diff --git a/src/apis/weightManage/weightManage.ts b/src/apis/weightManage/weightManage.ts index baf6b95..f179478 100644 --- a/src/apis/weightManage/weightManage.ts +++ b/src/apis/weightManage/weightManage.ts @@ -9,6 +9,7 @@ export interface WeighManageResp { materialSpec: string unitWeight: number photoUrl: string + materialProcess: string matchResult: string downFloatRatio: string upFloatRatio: string @@ -29,6 +30,6 @@ export function validateWeighing(data: any) { } /** @desc 校验物料是否一致 */ -export function vmSend(code: string) { - return http.post(`/vm/send`, { msg: code }) +export function vmSend(materialProcess: string) { + return http.post(`/vm/send`, { materialProcess }) } diff --git a/src/views/material/MaterialInfoAddModal.vue b/src/views/material/MaterialInfoAddModal.vue index 02d0206..bcadf34 100644 --- a/src/views/material/MaterialInfoAddModal.vue +++ b/src/views/material/MaterialInfoAddModal.vue @@ -36,7 +36,6 @@ const title = computed(() => (isUpdate.value ? '修改物料管理' : '新增物 const formRef = ref>() const { materialTypeList, getMaterialTypeSelect } = materialType() -const { materialProcessList, getMaterialProcessSelect } = materialProcess() const { light_level } = useDict('light_level') @@ -91,15 +90,10 @@ const columns: ColumnItem[] = reactive([ }, { label: '物料流程编码', - field: 'materialProcessId', - type: 'select', + field: 'materialProcess', + type: 'input', span: 24, required: true, - props: { - options: materialProcessList, - allowClear: true, - allowSearch: true, - }, }, { label: '物料规格', @@ -149,9 +143,6 @@ const onAdd = async () => { if (!materialTypeList.value.length) { await getMaterialTypeSelect() } - if (!materialProcessList.value.length) { - await getMaterialProcessSelect(); - } visible.value = true } @@ -163,9 +154,6 @@ const onUpdate = async (id: string) => { if (!materialTypeList.value.length) { await getMaterialTypeSelect() } - if (!materialProcessList.value.length) { - await getMaterialProcessSelect(); - } Object.assign(form, data) form.lightLevel = data.lightLevel ? JSON.stringify(data.lightLevel) : '' visible.value = true diff --git a/src/views/material/index.vue b/src/views/material/index.vue index e31b5ba..72afef8 100644 --- a/src/views/material/index.vue +++ b/src/views/material/index.vue @@ -81,7 +81,6 @@