style:检验项目-单位列字段修改

main
黄伟杰 2 weeks ago
parent 247e3592b2
commit 0738cf5812

@ -1,76 +1,37 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
class="-mb-15px"
:model="queryParams"
ref="queryFormRef"
:inline="true"
label-width="68px"
>
<el-form-item label="检验类型" prop="zjType"> <el-form-item label="检验类型" prop="zjType">
<el-select <el-select v-model="queryParams.zjType" clearable filterable placeholder="请选择检验类型" class="!w-240px">
v-model="queryParams.zjType" <el-option v-for="item in typeList" :key="item.id" :label="item.name" :value="item.id" />
clearable
filterable
placeholder="请选择检验类型"
class="!w-240px"
>
<el-option
v-for="item in typeList"
:key="item.id"
:label="item.name"
:value="item.id"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input <el-input v-model="queryParams.name" placeholder="请输入名称" clearable @keyup.enter="handleQuery"
v-model="queryParams.name" class="!w-240px" />
placeholder="请输入名称"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注" prop="remark">
<el-input <el-input v-model="queryParams.remark" placeholder="请输入备注" clearable @keyup.enter="handleQuery"
v-model="queryParams.remark" class="!w-240px" />
placeholder="请输入备注"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> </el-form-item>
<el-form-item label="创建时间" prop="createTime"> <el-form-item label="创建时间" prop="createTime">
<el-date-picker <el-date-picker v-model="queryParams.createTime" value-format="YYYY-MM-DD HH:mm:ss" type="daterange"
v-model="queryParams.createTime" start-placeholder="开始日期" end-placeholder="结束日期"
value-format="YYYY-MM-DD HH:mm:ss" :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-220px" />
type="daterange"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
class="!w-220px"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery">
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <Icon icon="ep:search" class="mr-5px" /> 搜索
<el-button </el-button>
type="primary" <el-button @click="resetQuery">
plain <Icon icon="ep:refresh" class="mr-5px" /> 重置
@click="openForm('create')" </el-button>
v-hasPermi="['mes:zj-item:create']" <el-button type="primary" plain @click="openForm('create')" v-hasPermi="['mes:zj-item:create']">
>
<Icon icon="ep:plus" class="mr-5px" /> 新增 <Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button> </el-button>
<el-button <el-button type="success" plain @click="handleExport" :loading="exportLoading"
type="success" v-hasPermi="['mes:zj-item:export']">
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['mes:zj-item:export']"
>
<Icon icon="ep:download" class="mr-5px" /> 导出 <Icon icon="ep:download" class="mr-5px" /> 导出
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -83,55 +44,31 @@
<!-- <el-table-column label="ID" align="center" prop="id" /> --> <!-- <el-table-column label="ID" align="center" prop="id" /> -->
<el-table-column label="名称" align="center" prop="name" /> <el-table-column label="名称" align="center" prop="name" />
<el-table-column label="作业方式" align="center" prop="tool" /> <el-table-column label="作业方式" align="center" prop="tool" />
<el-table-column label="检验类型" align="center" prop="zjTypeName" > <el-table-column label="检验类型" align="center" prop="zjTypeName">
<template #default="scope"> <template #default="scope">
<el-tag>{{scope.row.zjTypeName}}</el-tag> <el-tag>{{ scope.row.zjTypeName }}</el-tag>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="标准值" align="center" prop="standardVal" /> <el-table-column label="标准值" align="center" prop="standardVal" />
<el-table-column label="上限值" align="center" prop="upperVal" /> <el-table-column label="上限值" align="center" prop="upperVal" />
<el-table-column label="下限值" align="center" prop="lowerVal" /> <el-table-column label="下限值" align="center" prop="lowerVal" />
<el-table-column label="单位" align="center" prop="unit"> <el-table-column label="单位" align="center" prop="unitName" />
<template #default="scope">
{{ getUnitName(scope.row.unit) }}
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" /> <el-table-column label="备注" align="center" prop="remark" />
<el-table-column <el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" width="180px" />
label="创建时间"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
/>
<el-table-column label="操作" align="center" min-width="120px"> <el-table-column label="操作" align="center" min-width="120px">
<template #default="scope"> <template #default="scope">
<el-button <el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:zj-item:update']">
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['mes:zj-item:update']"
>
编辑 编辑
</el-button> </el-button>
<el-button <el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['mes:zj-item:delete']">
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['mes:zj-item:delete']"
>
删除 删除
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination <Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
:total="total" @pagination="getList" />
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
@ -144,7 +81,7 @@ import download from '@/utils/download'
import { ZjItemApi, ZjItemVO } from '@/api/mes/zjitem' import { ZjItemApi, ZjItemVO } from '@/api/mes/zjitem'
import ZjItemForm from './ZjItemForm.vue' import ZjItemForm from './ZjItemForm.vue'
import { ZjTypeApi, ZjTypeVO } from '@/api/mes/zjtype' import { ZjTypeApi, ZjTypeVO } from '@/api/mes/zjtype'
import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit' import { ProductUnitApi } from '@/api/erp/product/unit'
/** 质量管理-检验项目 列表 */ /** 质量管理-检验项目 列表 */
defineOptions({ name: 'ZjItem' }) defineOptions({ name: 'ZjItem' })
@ -153,7 +90,6 @@ const message = useMessage() // 消息弹窗
const { t } = useI18n() // const { t } = useI18n() //
const typeList = ref<ZjTypeVO[]>([]) // const typeList = ref<ZjTypeVO[]>([]) //
const unitList = ref<ProductUnitVO[]>([]) //
const loading = ref(true) // const loading = ref(true) //
const list = ref<ZjItemVO[]>([]) // const list = ref<ZjItemVO[]>([]) //
const total = ref(0) // const total = ref(0) //
@ -213,7 +149,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
} catch {} } catch { }
} }
/** 导出按钮操作 */ /** 导出按钮操作 */
@ -234,16 +170,7 @@ const handleExport = async () => {
/** 初始化 **/ /** 初始化 **/
onMounted(async () => { onMounted(async () => {
typeList.value = await ZjTypeApi.getZjTypeList() typeList.value = await ZjTypeApi.getZjTypeList()
unitList.value = await ProductUnitApi.getProductUnitSimpleList()
getList() getList()
}) })
const getUnitName = (value: any) => {
const v = value === '' || value === null || value === undefined ? undefined : Number(value)
if (!v || !unitList.value.length) return '-'
const item = unitList.value.find((u) => u.id === v)
return item?.name ?? '-'
}
</script> </script>

Loading…
Cancel
Save