linweidong
/
besure_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

style：配方库-读取按钮逻辑修改（点击读取打开对应项子列表）

Browse Source
main
黄伟杰 4 weeks ago
parent 9853c096f1
commit 34f6bf6547
2 changed files with 72 additions and 127 deletions
Show Stats Download Patch File Download Diff File

9
src/views/formula/formulaLibrary/components/FormulaLibraryDetailTabs.vue
Unescape Escape View File

@ -186,6 +186,8 @@ const getList = async () => {
if (!props.recipeId) {
list.value = []
total.value = 0
detailList.value = []
to.value = 0
return
}
loading.value = true
@ -199,7 +201,6 @@ const getList = async () => {
detailList.value = d.list
to.value = d.total
}
} finally {
loading.value = false
}
@ -219,15 +220,15 @@ watch(
() => props.recipeId,
() => {
queryParams.pageNo = 1
// if (activeTab.value === 'manual')
getList()
}
},
{ immediate: true }
)
watch(
() => activeTab.value,
(tab) => {
// if (tab === 'manual')
queryParams.pageNo = 1
getList()
}
)

132
src/views/formula/formulaLibrary/index.vue
Unescape Escape View File

@ -1,44 +1,24 @@
<template>
<ContentWrap>
<el-form
class="-mb-15px recipe-library-filter-form"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="auto"
>
class="-mb-15px recipe-library-filter-form" :model="queryParams" ref="queryFormRef" :inline="true"
label-width="auto">
<el-form-item :label="t('RecipeManagement.RecipeLibrary.searchCodeLabel')" prop="code">
<el-input
v-model="queryParams.code"
:placeholder="t('RecipeManagement.RecipeLibrary.searchCodePlaceholder')"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
v-model="queryParams.code" :placeholder="t('RecipeManagement.RecipeLibrary.searchCodePlaceholder')"
clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('RecipeManagement.RecipeLibrary.searchNameLabel')" prop="name">
<el-input
v-model="queryParams.name"
:placeholder="t('RecipeManagement.RecipeLibrary.searchNamePlaceholder')"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
v-model="queryParams.name" :placeholder="t('RecipeManagement.RecipeLibrary.searchNamePlaceholder')"
clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item :label="t('RecipeManagement.RecipeLibrary.searchRecipeLabel')" prop="recipeId">
<el-select
v-model="queryParams.recipeId"
:placeholder="t('RecipeManagement.RecipeLibrary.searchRecipePlaceholder')"
clearable
filterable
class="!w-240px"
>
<el-option
v-for="opt in recipeOptions"
:key="String(opt.value)"
:label="opt.label"
:value="opt.value"
/>
v-model="queryParams.recipeId"
:placeholder="t('RecipeManagement.RecipeLibrary.searchRecipePlaceholder')" clearable filterable
class="!w-240px">
<el-option v-for="opt in recipeOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
<!-- <el-form-item label="来源" prop="source">
@ -69,32 +49,17 @@
<ContentWrap>
<el-table
v-loading="loading"
:data="list"
:stripe="true"
:show-overflow-tooltip="true"
row-key="id"
highlight-current-row
@row-click="handleRowClick"
>
v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" row-key="id"
highlight-current-row @row-click="handleRowClick">
<el-table-column
:label="t('RecipeManagement.RecipeLibrary.tableCodeColumn')"
align="center"
prop="code"
min-width="140"
/>
:label="t('RecipeManagement.RecipeLibrary.tableCodeColumn')" align="center" prop="code"
min-width="140" />
<el-table-column
:label="t('RecipeManagement.RecipeLibrary.tableNameColumn')"
align="center"
prop="name"
min-width="140"
/>
:label="t('RecipeManagement.RecipeLibrary.tableNameColumn')" align="center" prop="name"
min-width="140" />
<el-table-column
:label="t('RecipeManagement.RecipeLibrary.tableRecipeNameColumn')"
align="center"
prop="recipeName"
min-width="160"
>
:label="t('RecipeManagement.RecipeLibrary.tableRecipeNameColumn')" align="center"
prop="recipeName" min-width="160">
<template #default="scope">
<span>{{ scope.row.recipeName ?? '-' }}</span>
</template>
@ -106,12 +71,8 @@
width="120"
/> -->
<el-table-column
:label="t('RecipeManagement.RecipeLibrary.tableCreateTimeColumn')"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180"
/>
:label="t('RecipeManagement.RecipeLibrary.tableCreateTimeColumn')" align="center"
prop="createTime" :formatter="dateFormatter" width="180" />
<!-- <el-table-column label="来源" align="center" prop="source" width="120">
<template #default="scope">
<el-tag v-if="scope.row.source" :type="getSourceTagType(scope.row.source)">{{ scope.row.source }}</el-tag>
@ -119,11 +80,8 @@
</template>
</el-table-column> -->
<el-table-column
:label="t('RecipeManagement.RecipeLibrary.tableOperateColumn')"
align="center"
width="180"
fixed="right"
>
:label="t('RecipeManagement.RecipeLibrary.tableOperateColumn')" align="center" width="180"
fixed="right">
<template #default="scope">
<el-button link type="primary" @click.stop="handleRead(scope.row)">
{{ t('RecipeManagement.RecipeLibrary.tableReadAction') }}
@ -139,11 +97,8 @@
</el-table>
<Pagination
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
:total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
<ContentWrap v-if="detailVisible">
@ -154,37 +109,23 @@
<Dialog :title="dialogTitle" v-model="dialogVisible" width="720px">
<el-form
ref="dialogFormRef"
:model="dialogForm"
:rules="dialogRules"
class="recipe-library-dialog-form"
label-width="auto"
v-loading="dialogLoading"
>
ref="dialogFormRef" :model="dialogForm" :rules="dialogRules" class="recipe-library-dialog-form"
label-width="auto" v-loading="dialogLoading">
<el-form-item :label="t('RecipeManagement.RecipeLibrary.dialogCodeLabel')" prop="code">
<el-input
v-model="dialogForm.code"
:placeholder="t('RecipeManagement.RecipeLibrary.dialogCodePlaceholder')"
clearable
:disabled="dialogType == 'update'"
/>
v-model="dialogForm.code" :placeholder="t('RecipeManagement.RecipeLibrary.dialogCodePlaceholder')"
clearable :disabled="dialogType == 'update'" />
</el-form-item>
<el-form-item :label="t('RecipeManagement.RecipeLibrary.dialogNameLabel')" prop="name">
<el-input
v-model="dialogForm.name"
:placeholder="t('RecipeManagement.RecipeLibrary.dialogNamePlaceholder')"
clearable
/>
v-model="dialogForm.name" :placeholder="t('RecipeManagement.RecipeLibrary.dialogNamePlaceholder')"
clearable />
</el-form-item>
<el-form-item :label="t('RecipeManagement.RecipeLibrary.dialogRecipeLabel')" prop="recipeId">
<el-select
v-model="dialogForm.recipeId"
:placeholder="t('RecipeManagement.RecipeLibrary.dialogRecipePlaceholder')"
clearable
filterable
class="!w-full"
:disabled="dialogType == 'update'"
>
v-model="dialogForm.recipeId"
:placeholder="t('RecipeManagement.RecipeLibrary.dialogRecipePlaceholder')" clearable filterable
class="!w-full" :disabled="dialogType == 'update'">
<el-option v-for="opt in recipeOptions" :key="String(opt.value)" :label="opt.label" :value="opt.value" />
</el-select>
</el-form-item>
@ -402,7 +343,7 @@ const readDialogRef = ref<InstanceType<typeof FormulaLibraryReadDialog>>()
const checkRecipeRecords = async (recipeId: string | number) => {
const params = {
pageNo: 1,
pageSize: 1,
pageSize: 10,
recipeId: String(recipeId)
}
try {
@ -428,11 +369,14 @@ const handleRead = async (row: RecipePlanDetailVO) => {
const recipeId = row?.recipeId
const id = row?.id
if (!recipeId) return
handleRowClick(row)
const recipeName = row?.recipeName
const { hasDeviceRecords, hasManualRecords } = await checkRecipeRecords(recipeId)
const data = await RecipePointApi.getRecipePointList(Number(recipeId))
if (!data?.length) {
await message.confirm(t('RecipeManagement.RecipeLibrary.readDeviceConfirmMessage'))
await message.confirm(
`${t('RecipeManagement.RecipeLibrary.readDeviceConfirmMessage')}(${t('RecipeManagement.RecipeLibrary.readDialogOverwriteTip')})`
)
if (id != null) {
await RecipeDeviceRecordApi.createRecipeDeviceRecordBatch(id)
message.success(t('common.createSuccess'))

Write Preview
Loading…
Cancel
Save