基础信息根据原型优化

dev
qiuhongwu 6 months ago
parent 551d78da87
commit 9ffa88715c

@ -46,7 +46,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <el-button
@click="getChanjet()" @click="getChanjet()"

@ -72,8 +72,8 @@
class="!w-240px" class="!w-240px"
/> />
</el-form-item>--> </el-form-item>-->
<el-form-item> <el-form-item style="margin-left: 20px;">
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" />搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" />查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" />重置</el-button>
<el-button <el-button
type="primary" type="primary"
@ -105,18 +105,20 @@
</ContentWrap> </ContentWrap>
<ContentWrap> <ContentWrap>
<el-table v-loading="loading" :show-overflow-tooltip="true" :data="list" class="hl-table" :stripe="true"> <el-table v-loading="loading" :show-overflow-tooltip="true" :data="list" class="hl-table" :stripe="true">
<el-table-column type="index" width="100" label="序号" align="center" /> <el-table-column type="index" min-width="70" label="序号" align="center" />
<el-table-column <el-table-column
label="工号" label="工号"
align="center" align="center"
prop="username" prop="username"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
min-width="110"
/> />
<el-table-column <el-table-column
label="姓名" label="姓名"
align="center" align="center"
prop="nickname" prop="nickname"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
min-width="120"
/> />
<el-table-column <el-table-column
label="部门" label="部门"
@ -124,9 +126,10 @@
key="deptName" key="deptName"
prop="deptName" prop="deptName"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
min-width="120"
/> />
<el-table-column label="手机号码" align="center" prop="mobile" width="120" /> <el-table-column label="手机号码" align="center" prop="mobile" min-width="150" />
<el-table-column prop="status" label="启用状态"> <el-table-column prop="status" label="启用状态" min-width="110">
<template #default="scope"> <template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS" :value="scope.row.status" /> <dict-tag :type="DICT_TYPE.BIZ_SYSTEM_COMMON_STATUS" :value="scope.row.status" />
</template> </template>
@ -136,9 +139,9 @@
align="center" align="center"
prop="createTime" prop="createTime"
:formatter="dateFormatter" :formatter="dateFormatter"
width="220" min-width="220"
/> />
<el-table-column label="操作" align="center" width="160"> <el-table-column label="操作" align="center" fixed="right" min-width="140">
<template #default="scope"> <template #default="scope">
<div class="flex items-center justify-center"> <div class="flex items-center justify-center">
<el-button <el-button

@ -37,7 +37,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <el-button
type="primary" type="primary"

@ -11,13 +11,13 @@
<UploadImg v-model="formData.logo" /> <UploadImg v-model="formData.logo" />
</el-form-item> </el-form-item>
<el-form-item label="物料编码" prop="code"> <el-form-item label="物料编码" prop="code">
<el-input disabled v-model="formData.code" placeholder="系统自动生成" class="!w-250px" /> <el-input disabled v-model="formData.code" placeholder="系统自动生成" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="物料名称" prop="name"> <el-form-item label="物料名称" prop="name">
<el-input :disabled="formType == 'update'" v-model="formData.name" placeholder="请输入物料名称" class="!w-250px" /> <el-input v-model="formData.name" placeholder="请输入物料名称" disabled class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="物料类型" prop="materialType"> <el-form-item label="物料类型" prop="materialType">
<el-select v-model="formData.materialType" clearable placeholder="请选择物料类型" class="!w-250px"> <el-select v-model="formData.materialType" disabled clearable placeholder="请选择物料类型" class="!w-250px">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)" v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)"
:key="dict.value" :key="dict.value"
@ -27,7 +27,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="系统单位" prop="unit"> <el-form-item label="系统单位" prop="unit">
<el-select v-model="formData.unit" clearable placeholder="请选择系统单位" class="!w-250px"> <el-select v-model="formData.unit" disabled clearable placeholder="请选择系统单位" class="!w-250px">
<el-option <el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_UNIT)" v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_UNIT)"
:key="dict.value" :key="dict.value"
@ -37,16 +37,16 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="物料简称" prop="shortName"> <el-form-item label="物料简称" prop="shortName">
<el-input v-model="formData.shortName" placeholder="请输入物料简称" class="!w-250px" /> <el-input v-model="formData.shortName" disabled placeholder="请输入物料简称" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="规格/型号" prop="spec"> <el-form-item label="规格/型号" prop="spec">
<el-input v-model="formData.spec" placeholder="请输入规格/型号" class="!w-250px" /> <el-input v-model="formData.spec" disabled placeholder="请输入规格/型号" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="品牌" prop="brand"> <el-form-item label="品牌" prop="brand">
<el-input v-model="formData.brand" placeholder="请输入品牌" class="!w-250px" /> <el-input v-model="formData.brand" disabled placeholder="请输入品牌" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="物料主要来源" prop="mainFrom"> <el-form-item label="物料主要来源" prop="mainFrom">
<el-select v-model="formData.mainFrom" clearable placeholder="请选择物料主要来源" class="!w-250px"> <el-select v-model="formData.mainFrom" disabled clearable placeholder="请选择物料主要来源" class="!w-250px">
<el-option <el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_ORIGINAL)" v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_MATERIAL_ORIGINAL)"
:key="dict.value" :key="dict.value"
@ -74,25 +74,25 @@
:value="item.id" :value="item.id"
/> />
</el-select> --> </el-select> -->
<SupplierSelect v-model="formData.mainSupplierId" @update:newValue="handleSelectedSupplier" /> <SupplierSelect v-model="formData.mainSupplierId" @update:newValue="handleSelectedSupplier" disabled />
</el-form-item> </el-form-item>
<el-form-item label="销项/进项税率" prop="outputInputTaxRate"> <el-form-item label="销项/进项税率" prop="outputInputTaxRate">
<el-input v-model="formData.outputInputTaxRate" placeholder="请输入销项税率/进项税率" class="!w-250px" > <el-input v-model="formData.outputInputTaxRate" disabled placeholder="请输入销项税率/进项税率" class="!w-250px" >
<template #append>%</template> <template #append>%</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="description"> <el-form-item label="备注" prop="description">
<el-input type="textarea" v-model="formData.description" height="150px" class="!w-500px" show-word-limit maxlength="200"/> <el-input type="textarea" disabled v-model="formData.description" height="150px" class="!w-500px" show-word-limit maxlength="200"/>
</el-form-item> </el-form-item>
<el-form-item label="安全库存" prop="invSafe"> <el-form-item label="安全库存" prop="invSafe">
<el-input v-model="formData.invSafe" placeholder="请输入安全库存" class="!w-250px" /> <el-input v-model="formData.invSafe" disabled placeholder="请输入安全库存" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="物料条码" prop="barcode"> <el-form-item label="物料条码" prop="barcode">
<el-input v-model="formData.barcode" placeholder="请输入物料条码" class="!w-250px" /> <el-input v-model="formData.barcode" disabled placeholder="请输入物料条码" class="!w-250px" />
</el-form-item> </el-form-item>
<el-form-item label="启用状态" prop="status"> <el-form-item label="启用状态" prop="status">
<el-radio-group v-model="formData.status"> <el-radio-group v-model="formData.status" disabled>
<el-radio <el-radio
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)" v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)"
:key="dict.value" :key="dict.value"
@ -104,7 +104,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<template #footer> <template #footer>
<el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> <!-- <el-button @click="submitForm" type="primary" :disabled="formLoading"> </el-button> -->
<el-button @click="dialogVisible = false"> </el-button> <el-button @click="dialogVisible = false"> </el-button>
</template> </template>
</Dialog> </Dialog>

@ -1,77 +1,43 @@
<template> <template>
<el-card class="hl-card"> <el-card class="hl-card">
<template #header> <template #header>
<span>物料信息</span> <span>物料信息</span>
</template> </template>
<ContentWrap class="borderxx"> <ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="108px">
class="-mb-15px" <el-form-item label="物料编码" prop="code">
:model="queryParams" <el-input v-model="queryParams.code" placeholder="请输入物料编码" clearable @keyup.enter="handleQuery" class="!w-240px" />
ref="queryFormRef" </el-form-item>
:inline="true" <el-form-item label="物料名称" prop="name">
label-width="108px" <el-input v-model="queryParams.name" placeholder="请输入物料名称" clearable @keyup.enter="handleQuery" class="!w-240px" />
> </el-form-item>
<el-form-item label="物料编码" prop="code"> <el-form-item label="物料类型" prop="materialType">
<el-input <el-select v-model="queryParams.materialType" placeholder="请选择物料类型" clearable class="!w-240px">
v-model="queryParams.code" <el-option v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)" :key="dict.value" :label="dict.label" :value="dict.value" />
placeholder="请输入物料编码" </el-select>
clearable </el-form-item>
@keyup.enter="handleQuery" <el-form-item label="启用状态" prop="status">
class="!w-240px" <el-select v-model="queryParams.status" placeholder="请选择启用状态" clearable class="!w-240px">
/> <el-option v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-form-item> </el-select>
<el-form-item label="物料名称" prop="name"> </el-form-item>
<el-input <el-form-item style="margin-left:15px">
v-model="queryParams.name" <el-button @click="handleQuery" type="primary">
placeholder="请输入物料名称" <Icon icon="ep:search" class="mr-5px" /> 查询
clearable </el-button>
@keyup.enter="handleQuery" <el-button @click="resetQuery">
class="!w-240px" <Icon icon="ep:refresh" class="mr-5px" /> 重置
/> </el-button>
</el-form-item> <!-- <el-button
<el-form-item label="物料类型" prop="materialType">
<el-select
v-model="queryParams.materialType"
placeholder="请选择物料类型"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getStrDictOptions(DICT_TYPE.BIZ_MATERIAL_TYPE)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="启用状态" prop="status">
<el-select
v-model="queryParams.status"
placeholder="请选择启用状态"
clearable
class="!w-240px"
>
<el-option
v-for="dict in getIntDictOptions(DICT_TYPE.BIZ_COMMON_STATUS)"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item style="margin-left:15px">
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button
type="primary" type="primary"
plain plain
@click="openForm('create')" @click="openForm('create')"
v-hasPermi="['biz:material:create']" v-hasPermi="['biz:material: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" type="success"
plain plain
@click="handleExport" @click="handleExport"
@ -80,51 +46,49 @@
> >
<Icon icon="ep:download" class="mr-5px" /> 导出 <Icon icon="ep:download" class="mr-5px" /> 导出
</el-button>--> </el-button>-->
</el-form-item> <el-button @click="getChanjet()" style="background-color: rgba(0, 0, 255, 1);color:#fff;">
</el-form> 获取数据
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column fixed label="序号" type="index" width="100" align="center" />
<el-table-column fixed label="物料编码" align="center" prop="code" min-width="120" />
<el-table-column label="物料名称" align="center" prop="name" min-width="120"/>
<el-table-column label="物料类型" align="center" prop="materialType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_TYPE" :value="scope.row.materialType" />
</template>
</el-table-column>
<el-table-column label="系统单位" align="center" prop="unit" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column label="物料简称" align="center" prop="shortName" min-width="120"/>
<el-table-column label="规格/型号" align="center" prop="spec" min-width="120"/>
<el-table-column label="品牌" align="center" prop="brand" min-width="120"/>
<el-table-column label="主要来源" align="center" prop="mainFrom" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_ORIGINAL" :value="scope.row.mainFrom" />
</template>
</el-table-column>
<el-table-column label="首选供应商" align="center" prop="mainSupplierName" min-width="120"/>
<el-table-column label="启用状态" align="center" prop="status" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" min-width="120">
<template #default="scope">
<el-button
link
type="primary"
@click="openForm('update', scope.row.id)"
v-hasPermi="['biz:material:update']"
>
编辑
</el-button> </el-button>
<!-- <el-button </el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" class="hl-table">
<el-table-column fixed label="序号" type="index" width="100" align="center" />
<el-table-column fixed label="物料编码" align="center" prop="code" min-width="120" />
<el-table-column label="物料名称" align="center" prop="name" min-width="120" />
<el-table-column label="物料类型" align="center" prop="materialType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_TYPE" :value="scope.row.materialType" />
</template>
</el-table-column>
<el-table-column label="系统单位" align="center" prop="unit" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_UNIT" :value="scope.row.unit" />
</template>
</el-table-column>
<el-table-column label="物料简称" align="center" prop="shortName" min-width="120" />
<el-table-column label="规格/型号" align="center" prop="spec" min-width="120" />
<el-table-column label="品牌" align="center" prop="brand" min-width="120" />
<el-table-column label="主要来源" align="center" prop="mainFrom" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_MATERIAL_ORIGINAL" :value="scope.row.mainFrom" />
</template>
</el-table-column>
<el-table-column label="首选供应商" align="center" prop="mainSupplierName" min-width="120" />
<el-table-column label="启用状态" align="center" prop="status" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.BIZ_COMMON_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" min-width="120">
<template #default="scope">
<el-button link type="primary" @click="openForm('detail', scope.row.id)" v-hasPermi="['biz:material:detail']">
查看详情
</el-button>
<!-- <el-button
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"
@ -132,19 +96,14 @@
> >
删除 删除
</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" @pagination="getList" />
:total="total" </ContentWrap>
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
@pagination="getList"
/>
</ContentWrap>
</el-card> </el-card>
<!-- 表单弹窗添加/修改 --> <!-- 表单弹窗添加/修改 -->
<MaterialForm ref="formRef" @success="getList" /> <MaterialForm ref="formRef" @success="getList" />
</template> </template>
@ -191,12 +150,31 @@ const queryParams = reactive({
invUpperLimit: undefined, invUpperLimit: undefined,
invLowerLimit: undefined, invLowerLimit: undefined,
barcode: undefined, barcode: undefined,
virtualPart: "N", virtualPart: 'N',
logo: undefined, logo: undefined
}) })
const queryFormRef = ref() // const queryFormRef = ref() //
const exportLoading = ref(false) // const exportLoading = ref(false) //
const reload: any = inject('reload')
const getChanjet = async () => {
// try {
// const response = await MaterialApi.queryDeptChanjet()
// if (response === true) {
// //
// message.success(t(''))
// reload()
// } else {
// //
// message.error(t(''))
// }
// } catch (error) {
// //
// message.error(t(''))
// console.error('Error fetching chanjet:', error)
// }
}
/** 查询列表 */ /** 查询列表 */
const getList = async () => { const getList = async () => {
loading.value = true loading.value = true

@ -39,7 +39,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <el-button
type="primary" type="primary"
@ -92,14 +92,14 @@
> >
编辑 编辑
</el-button> </el-button>
<!-- <el-button <!-- <el-button
link link
type="danger" type="danger"
@click="handleDelete(scope.row.id)" @click="handleDelete(scope.row.id)"
v-hasPermi="['system:post:delete']" v-hasPermi="['system:post:delete']"
> >
删除 删除
</el-button>--> </el-button> -->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>

@ -20,7 +20,7 @@
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"> <el-button @click="handleQuery" type="primary">
<Icon icon="ep:search" class="mr-5px" /> 搜索 <Icon icon="ep:search" class="mr-5px" /> 查询
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
<Icon icon="ep:refresh" class="mr-5px" /> 重置 <Icon icon="ep:refresh" class="mr-5px" /> 重置

@ -43,7 +43,7 @@
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"> <el-button @click="handleQuery" type="primary">
<Icon class="mr-5px" icon="ep:search" /> <Icon class="mr-5px" icon="ep:search" />
搜索 查询
</el-button> </el-button>
<el-button @click="resetQuery"> <el-button @click="resetQuery">
<Icon class="mr-5px" icon="ep:refresh" /> <Icon class="mr-5px" icon="ep:refresh" />

@ -46,7 +46,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <el-button
@click="getChanjet()" @click="getChanjet()"

@ -1,6 +1,8 @@
<template> <template>
<el-card class="hl-card"> <el-card class="hl-card">
<template #header>车间管理</template> <template #header>
<span>车间管理</span>
</template>
<ContentWrap class="borderxx"> <ContentWrap class="borderxx">
<!-- 搜索工作栏 --> <!-- 搜索工作栏 -->
<el-form <el-form
@ -44,7 +46,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button> <el-button @click="handleQuery" type="primary"><Icon icon="ep:search" class="mr-5px" /> 查询</el-button>
<!-- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button> <!-- <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
<el-button <el-button
type="primary" type="primary"

Loading…
Cancel
Save