diff --git a/src/apis/crafts.ts b/src/apis/crafts.ts index 1c9fc9d..7703117 100644 --- a/src/apis/crafts.ts +++ b/src/apis/crafts.ts @@ -7,3 +7,5 @@ export const createCraft = (params: Craft.CraftItem): Promise => http.post export const updateCraft = (params: Craft.CraftItem): Promise => http.put(`/formulation`, params) export const delCraft = (ids: string): Promise => http.delete(`/formulation/${ids}`) + +export const queryCraftList = (params: { solutionId?: number, concentration?: number }): Promise => http.post(`/formulation/list`, params) diff --git a/src/apis/system.ts b/src/apis/system.ts index 16dd7ab..3e059c9 100644 --- a/src/apis/system.ts +++ b/src/apis/system.ts @@ -10,3 +10,4 @@ export const getTime = (): Promise<{ epochMilli: number }> => http.get('/sys/get export const setTime = (params: { epochMilli?: number }): Promise => http.post('/sys/set-datetime', params) export const configList = (params: System.Page = { pageNum: 1, pageSize: 999 }): Promise> => http.post('/system-config/list', params) export const updateConfig = (params: System.SystemConfig): Promise => http.put('/system-config', params) +export const sync = (params: any): Promise => http.post('/device/sync', params) diff --git a/src/components/home/Receive/index.vue b/src/components/home/Receive/index.vue index 6c4cdb6..26b13ce 100644 --- a/src/components/home/Receive/index.vue +++ b/src/components/home/Receive/index.vue @@ -2,6 +2,7 @@ import { addLog } from 'apis/log' import { editSols, getSolsList, saveSols } from 'apis/solution' import { userList as userListApi } from 'apis/user' +import FtButton from 'components/common/FTButton/index.vue' import { FtMessage } from 'libs/message' import { useSystemStore } from 'stores/systemStore' import { inject, onMounted, ref } from 'vue' @@ -47,12 +48,14 @@ const okHandle = async () => { if (!valid) { return } - await addLog({ + + const params = { ...form.value, channelCode: props.data.channelCode, - }) + } + await addLog(params) FtMessage.success('保存成功') - emits('ok') + emits('ok', params) } catch (error) { console.log(error) @@ -89,6 +92,9 @@ const channelMap = { el-input(v-model="form.receivedVolume" placeholder="请输入容量") template(#append) span mL + template(#footer) + ft-button(type="primary" :click-handle="okHandle") 确认领酸 + ft-button(@click="cancel") 取消 diff --git a/src/layouts/default.vue b/src/layouts/default.vue index 4d463ea..e57ca6b 100644 --- a/src/layouts/default.vue +++ b/src/layouts/default.vue @@ -1,9 +1,11 @@