Compare commits

..

No commits in common. 'b9c0d8c1214ff101f28494799302450f179630ff' and '57bbd4b4ade777316c0b541e371dc5c320367b33' have entirely different histories.

@ -1848,8 +1848,6 @@ export default {
moduleName: 'Product Material Information', moduleName: 'Product Material Information',
searchNameLabel: 'Name', searchNameLabel: 'Name',
searchNamePlaceholder: 'Please enter name', searchNamePlaceholder: 'Please enter name',
searchCodeLabel: 'Code',
searchCodePlaceholder: 'Please enter code',
searchButtonText: 'Search', searchButtonText: 'Search',
resetButtonText: 'Reset', resetButtonText: 'Reset',
addButtonText: 'Add', addButtonText: 'Add',

@ -2680,8 +2680,6 @@ export default {
moduleName: '产品物料信息', moduleName: '产品物料信息',
searchNameLabel: '名称', searchNameLabel: '名称',
searchNamePlaceholder: '请输入名称', searchNamePlaceholder: '请输入名称',
searchCodeLabel: '编码',
searchCodePlaceholder: '请输入编码',
searchButtonText: '搜索', searchButtonText: '搜索',
resetButtonText: '重置', resetButtonText: '重置',
addButtonText: '新增', addButtonText: '新增',

@ -2,29 +2,41 @@
<template> <template>
<ContentWrap> <ContentWrap>
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="auto" @submit.prevent> <el-form
<el-form-item :label="t('FactoryModeling.ProductInformation.searchCodeLabel')" prop="barCode"> class="-mb-15px"
<el-input v-model="queryParams.barCode" :model="queryParams"
:placeholder="t('FactoryModeling.ProductInformation.searchCodePlaceholder')" clearable ref="queryFormRef"
@keyup.enter="handleQuery" class="!w-240px" /> :inline="true"
</el-form-item> label-width="120px"
@submit.prevent
>
<el-form-item :label="t('FactoryModeling.ProductInformation.searchNameLabel')" prop="name"> <el-form-item :label="t('FactoryModeling.ProductInformation.searchNameLabel')" prop="name">
<el-input v-model="queryParams.name" <el-input
:placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')" clearable v-model="queryParams.name"
@keyup.enter="handleQuery" class="!w-240px" /> :placeholder="t('FactoryModeling.ProductInformation.searchNamePlaceholder')"
clearable
@keyup.enter="handleQuery"
class="!w-240px"
/>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery"> <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }}</el-button>
<Icon icon="ep:search" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.searchButtonText') }} <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }}</el-button>
</el-button> <el-button
<el-button @click="resetQuery"> type="primary"
<Icon icon="ep:refresh" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.resetButtonText') }} plain
</el-button> @click="openForm('create')"
<el-button type="primary" plain @click="openForm('create')" v-hasPermi="['erp:product:create']"> v-hasPermi="['erp:product:create']"
>
<Icon icon="ep:plus" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.addButtonText') }} <Icon icon="ep:plus" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.addButtonText') }}
</el-button> </el-button>
<el-button type="success" plain @click="handleExport" :loading="exportLoading" <el-button
v-hasPermi="['erp:product:export']"> type="success"
plain
@click="handleExport"
:loading="exportLoading"
v-hasPermi="['erp:product:export']"
>
<Icon icon="ep:download" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.exportButtonText') }} <Icon icon="ep:download" class="mr-5px" /> {{ t('FactoryModeling.ProductInformation.exportButtonText') }}
</el-button> </el-button>
</el-form-item> </el-form-item>
@ -35,7 +47,12 @@
<ContentWrap> <ContentWrap>
<el-tabs v-model="activeName" @tab-click="handleTabClick"> <el-tabs v-model="activeName" @tab-click="handleTabClick">
<!-- 使用 v-for 动态生成 el-tab-pane --> <!-- 使用 v-for 动态生成 el-tab-pane -->
<el-tab-pane v-for="item in parentList" :key="item.id" :label="item.name" :name="item.id.toString()" /> <el-tab-pane
v-for="item in parentList"
:key="item.id"
:label="item.name"
:name="item.id.toString()"
/>
<!-- <el-tab-pane label="产品" name="2" /> <!-- <el-tab-pane label="产品" name="2" />
<el-tab-pane label="原料" name="1" /> <el-tab-pane label="原料" name="1" />
<el-tab-pane label="备件" name="5" /> <el-tab-pane label="备件" name="5" />
@ -45,46 +62,60 @@
<el-tab-pane label="其他" name="0" /> --> <el-tab-pane label="其他" name="0" /> -->
</el-tabs> </el-tabs>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true"> <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
<el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode" <el-table-column :label="t('FactoryModeling.ProductInformation.tableBarCodeColumn')" align="center" prop="barCode" sortable/>
sortable /> <el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name" width="220px" sortable/>
<el-table-column :label="t('FactoryModeling.ProductInformation.tableNameColumn')" align="left" prop="name" <el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center" prop="standard" sortable/>
width="220px" sortable /> <el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center" prop="subCategoryName" sortable/>
<el-table-column :label="t('FactoryModeling.ProductInformation.tableStandardColumn')" align="center" <el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName" sortable/>
prop="standard" sortable /> <el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status" sortable>
<el-table-column :label="t('FactoryModeling.ProductInformation.tableCategoryColumn')" align="center"
prop="subCategoryName" sortable />
<el-table-column :label="t('FactoryModeling.ProductInformation.tableUnitColumn')" align="center" prop="unitName"
sortable />
<el-table-column :label="t('FactoryModeling.ProductInformation.tableStatusColumn')" align="center" prop="status"
sortable>
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
</template> </template>
</el-table-column> </el-table-column>
<el-table-column :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')" align="center" <el-table-column
prop="createTime" :formatter="dateFormatter" width="180px" sortable /> :label="t('FactoryModeling.ProductInformation.tableCreateTimeColumn')"
align="center"
prop="createTime"
:formatter="dateFormatter"
width="180px"
sortable
/>
<el-table-column :label="t('FactoryModeling.ProductInformation.tableOperateColumn')" align="center" width="150px"> <el-table-column :label="t('FactoryModeling.ProductInformation.tableOperateColumn')" align="center" width="150px">
<template #default="scope"> <template #default="scope">
<!-- <el-button--> <!-- <el-button-->
<!-- v-if="scope.row.categoryId ===2"--> <!-- v-if="scope.row.categoryId ===2"-->
<!-- link--> <!-- link-->
<!-- type="primary"--> <!-- type="primary"-->
<!-- @click="openBomForm('detail', scope.row.id)"--> <!-- @click="openBomForm('detail', scope.row.id)"-->
<!-- >--> <!-- >-->
<!-- BOM--> <!-- BOM-->
<!-- </el-button>--> <!-- </el-button>-->
<el-button link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['erp:product:update']"> <el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['erp:product:update']"
>
{{ t('FactoryModeling.ProductInformation.tableEditAction') }} {{ t('FactoryModeling.ProductInformation.tableEditAction') }}
</el-button> </el-button>
<el-button link type="danger" @click="handleDelete(scope.row.id)" v-hasPermi="['erp:product:delete']"> <el-button
link
type="danger"
@click="handleDelete(scope.row.id)"
v-hasPermi="['erp:product:delete']"
>
{{ t('FactoryModeling.ProductInformation.tableDeleteAction') }} {{ t('FactoryModeling.ProductInformation.tableDeleteAction') }}
</el-button> </el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<!-- 分页 --> <!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" <Pagination
@pagination="getList" /> :total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap> </ContentWrap>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
@ -117,7 +148,6 @@ const queryParams = reactive({
pageNo: 1, pageNo: 1,
pageSize: 10, pageSize: 10,
name: undefined, name: undefined,
barCode: undefined,
categoryId: undefined categoryId: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
@ -165,7 +195,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess')) message.success(t('common.delSuccess'))
// //
await getList() await getList()
} catch { } } catch {}
} }
/** 导出按钮操作 */ /** 导出按钮操作 */

Loading…
Cancel
Save