|
|
|
|
@ -1,4 +1,5 @@
|
|
|
|
|
<template>
|
|
|
|
|
|
|
|
|
|
<ContentWrap>
|
|
|
|
|
<!-- 搜索工作栏 -->
|
|
|
|
|
<el-form
|
|
|
|
|
@ -8,70 +9,99 @@
|
|
|
|
|
:inline="true"
|
|
|
|
|
label-width="68px"
|
|
|
|
|
>
|
|
|
|
|
<el-form-item label="领模单号" prop="orderId">
|
|
|
|
|
<el-form-item label="入库单号" prop="no">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.orderId"
|
|
|
|
|
placeholder="请输入领模单号"
|
|
|
|
|
v-model="queryParams.no"
|
|
|
|
|
placeholder="请选择入库单号"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="模具编码" prop="code">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.code"
|
|
|
|
|
placeholder="请输入模具编码"
|
|
|
|
|
<el-form-item label="模具" prop="productId">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="queryParams.productId"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="模具名称" prop="name">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.name"
|
|
|
|
|
placeholder="请输入模具名称"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="状态" prop="state">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.state"
|
|
|
|
|
placeholder="请输入状态"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="归还人" prop="person">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.person"
|
|
|
|
|
placeholder="请输入归还人"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
filterable
|
|
|
|
|
placeholder="请选择模具"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in moldList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="入库时间" prop="returnTime">
|
|
|
|
|
<el-form-item label="入库时间" prop="outTime">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="queryParams.returnTime"
|
|
|
|
|
v-model="queryParams.outTime"
|
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
|
|
type="daterange"
|
|
|
|
|
start-placeholder="开始日期"
|
|
|
|
|
end-placeholder="结束日期"
|
|
|
|
|
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
|
|
|
|
|
class="!w-220px"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="库管员" prop="principal">
|
|
|
|
|
<el-input
|
|
|
|
|
v-model="queryParams.principal"
|
|
|
|
|
placeholder="请输入库管员"
|
|
|
|
|
<!-- <el-form-item label="客户" prop="customerId">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="queryParams.customerId"
|
|
|
|
|
clearable
|
|
|
|
|
@keyup.enter="handleQuery"
|
|
|
|
|
filterable
|
|
|
|
|
placeholder="请选择客户"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in customerList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item> -->
|
|
|
|
|
<el-form-item label="仓库" prop="warehouseId">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="queryParams.warehouseId"
|
|
|
|
|
clearable
|
|
|
|
|
filterable
|
|
|
|
|
placeholder="请选择仓库"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in warehouseList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.name"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="创建人" prop="creator">
|
|
|
|
|
<el-select
|
|
|
|
|
v-model="queryParams.creator"
|
|
|
|
|
clearable
|
|
|
|
|
filterable
|
|
|
|
|
placeholder="请选择创建人"
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
>
|
|
|
|
|
<el-option
|
|
|
|
|
v-for="item in userList"
|
|
|
|
|
:key="item.id"
|
|
|
|
|
:label="item.nickname"
|
|
|
|
|
:value="item.id"
|
|
|
|
|
/>
|
|
|
|
|
</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.ERP_AUDIT_STATUS)"
|
|
|
|
|
:key="dict.value"
|
|
|
|
|
:label="dict.label"
|
|
|
|
|
:value="dict.value"
|
|
|
|
|
/>
|
|
|
|
|
</el-select>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="备注" prop="remark">
|
|
|
|
|
<el-input
|
|
|
|
|
@ -82,17 +112,6 @@
|
|
|
|
|
class="!w-240px"
|
|
|
|
|
/>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
<el-form-item label="创建时间" prop="createTime">
|
|
|
|
|
<el-date-picker
|
|
|
|
|
v-model="queryParams.createTime"
|
|
|
|
|
value-format="YYYY-MM-DD HH:mm:ss"
|
|
|
|
|
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-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
|
|
|
|
|
<el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
|
|
|
|
|
@ -100,7 +119,7 @@
|
|
|
|
|
type="primary"
|
|
|
|
|
plain
|
|
|
|
|
@click="openForm('create')"
|
|
|
|
|
v-hasPermi="['mes:mold-return:create']"
|
|
|
|
|
v-hasPermi="['erp:stock-out:create']"
|
|
|
|
|
>
|
|
|
|
|
<Icon icon="ep:plus" class="mr-5px" /> 新增
|
|
|
|
|
</el-button>
|
|
|
|
|
@ -109,54 +128,112 @@
|
|
|
|
|
plain
|
|
|
|
|
@click="handleExport"
|
|
|
|
|
:loading="exportLoading"
|
|
|
|
|
v-hasPermi="['mes:mold-return:export']"
|
|
|
|
|
v-hasPermi="['erp:stock-out:export']"
|
|
|
|
|
>
|
|
|
|
|
<Icon icon="ep:download" class="mr-5px" /> 导出
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
type="danger"
|
|
|
|
|
plain
|
|
|
|
|
@click="handleDelete(selectionList.map((item) => item.id))"
|
|
|
|
|
v-hasPermi="['erp:stock-out:delete']"
|
|
|
|
|
:disabled="selectionList.length === 0"
|
|
|
|
|
>
|
|
|
|
|
<Icon icon="ep:delete" class="mr-5px" /> 删除
|
|
|
|
|
</el-button>
|
|
|
|
|
</el-form-item>
|
|
|
|
|
</el-form>
|
|
|
|
|
</ContentWrap>
|
|
|
|
|
|
|
|
|
|
<!-- 列表 -->
|
|
|
|
|
<ContentWrap>
|
|
|
|
|
<el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
|
|
|
|
|
<el-table-column label="ID" align="center" prop="id" />
|
|
|
|
|
<el-table-column label="领模单号" align="center" prop="orderId" />
|
|
|
|
|
<el-table-column label="模具编码" align="center" prop="code" />
|
|
|
|
|
<el-table-column label="模具名称" align="center" prop="name" />
|
|
|
|
|
<el-table-column label="状态" align="center" prop="state" />
|
|
|
|
|
<el-table-column label="归还人" align="center" prop="person" />
|
|
|
|
|
<!-- <el-tabs v-model="activeName" @tab-click="handleTabClick"> -->
|
|
|
|
|
<!-- <el-tab-pane label="产品出库" name="产品出库" />
|
|
|
|
|
<el-tab-pane label="原料出库" name="原料出库" />
|
|
|
|
|
<el-tab-pane label="备件出库" name="备件出库" />
|
|
|
|
|
<el-tab-pane label="其他出库" name="其他出库" />
|
|
|
|
|
<el-tab-pane label="领模出库" name="领料出库" />
|
|
|
|
|
</el-tabs> -->
|
|
|
|
|
<el-table
|
|
|
|
|
v-loading="loading"
|
|
|
|
|
:data="list"
|
|
|
|
|
:stripe="true"
|
|
|
|
|
:show-overflow-tooltip="true"
|
|
|
|
|
@selection-change="handleSelectionChange"
|
|
|
|
|
>
|
|
|
|
|
<el-table-column width="30" label="选择" type="selection" />
|
|
|
|
|
<el-table-column min-width="180" label="入库单号" align="center" prop="no" />
|
|
|
|
|
<el-table-column label="模具信息" align="left" sortable prop="productNames" min-width="150" />
|
|
|
|
|
<!-- <el-table-column label="客户" align="center" prop="customerName" /> -->
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="入库时间"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="returnTime"
|
|
|
|
|
:formatter="dateFormatter"
|
|
|
|
|
width="180px"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column label="库管员" align="center" prop="principal" />
|
|
|
|
|
<el-table-column label="备注" align="center" prop="remark" />
|
|
|
|
|
<el-table-column
|
|
|
|
|
label="创建时间"
|
|
|
|
|
align="center"
|
|
|
|
|
prop="createTime"
|
|
|
|
|
:formatter="dateFormatter"
|
|
|
|
|
width="180px"
|
|
|
|
|
sortable
|
|
|
|
|
prop="outTime"
|
|
|
|
|
:formatter="dateFormatter2"
|
|
|
|
|
width="120px"
|
|
|
|
|
/>
|
|
|
|
|
<el-table-column label="操作" align="center" min-width="120px">
|
|
|
|
|
<el-table-column label="创建人" align="center" prop="creatorName" />
|
|
|
|
|
<!-- <el-table-column
|
|
|
|
|
label="数量"
|
|
|
|
|
align="right"
|
|
|
|
|
sortable
|
|
|
|
|
prop="totalCount"
|
|
|
|
|
:formatter="erpCountTableColumnFormatter"
|
|
|
|
|
/> -->
|
|
|
|
|
<!-- <el-table-column
|
|
|
|
|
label="金额"
|
|
|
|
|
align="right"
|
|
|
|
|
sortable
|
|
|
|
|
prop="totalPrice"
|
|
|
|
|
:formatter="erpPriceTableColumnFormatter"
|
|
|
|
|
/> -->
|
|
|
|
|
<el-table-column label="状态" align="center" fixed="right" width="90" prop="status">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
|
|
|
|
|
</template>
|
|
|
|
|
</el-table-column>
|
|
|
|
|
<el-table-column label="操作" align="center" fixed="right" width="220">
|
|
|
|
|
<template #default="scope">
|
|
|
|
|
<el-button
|
|
|
|
|
link
|
|
|
|
|
@click="openForm('detail', scope.row.id)"
|
|
|
|
|
v-hasPermi="['erp:stock-out:query']"
|
|
|
|
|
>
|
|
|
|
|
详情
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
link
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="openForm('update', scope.row.id)"
|
|
|
|
|
v-hasPermi="['mes:mold-return:update']"
|
|
|
|
|
v-hasPermi="['erp:stock-out:update']"
|
|
|
|
|
:disabled="scope.row.status === 20"
|
|
|
|
|
>
|
|
|
|
|
编辑
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
link
|
|
|
|
|
type="primary"
|
|
|
|
|
@click="handleUpdateStatus(scope.row.id, 20)"
|
|
|
|
|
v-hasPermi="['erp:stock-out:update-status']"
|
|
|
|
|
v-if="scope.row.status === 10"
|
|
|
|
|
>
|
|
|
|
|
审批
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
link
|
|
|
|
|
type="danger"
|
|
|
|
|
@click="handleUpdateStatus(scope.row.id, 10)"
|
|
|
|
|
v-hasPermi="['erp:stock-out:update-status']"
|
|
|
|
|
v-else
|
|
|
|
|
>
|
|
|
|
|
反审批
|
|
|
|
|
</el-button>
|
|
|
|
|
<el-button
|
|
|
|
|
link
|
|
|
|
|
type="danger"
|
|
|
|
|
@click="handleDelete(scope.row.id)"
|
|
|
|
|
v-hasPermi="['mes:mold-return:delete']"
|
|
|
|
|
@click="handleDelete([scope.row.id])"
|
|
|
|
|
v-hasPermi="['erp:stock-out:delete']"
|
|
|
|
|
>
|
|
|
|
|
删除
|
|
|
|
|
</el-button>
|
|
|
|
|
@ -177,41 +254,53 @@
|
|
|
|
|
</template>
|
|
|
|
|
|
|
|
|
|
<script setup lang="ts">
|
|
|
|
|
import { dateFormatter } from '@/utils/formatTime'
|
|
|
|
|
import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
|
|
|
|
|
import { dateFormatter2 } from '@/utils/formatTime'
|
|
|
|
|
import download from '@/utils/download'
|
|
|
|
|
import { MoldReturnApi, MoldReturnVO } from '@/api/mes/moldreturn'
|
|
|
|
|
import { StockOutApi, StockOutVO } from '@/api/erp/stock/out'
|
|
|
|
|
import MoldReturnForm from './MoldReturnForm.vue'
|
|
|
|
|
import { ProductApi, ProductVO } from '@/api/erp/product/product'
|
|
|
|
|
import { MoldBrandApi, MoldVO } from '@/api/erp/mold'
|
|
|
|
|
import { WarehouseApi, WarehouseVO } from '@/api/erp/stock/warehouse'
|
|
|
|
|
import { UserVO } from '@/api/system/user'
|
|
|
|
|
import * as UserApi from '@/api/system/user'
|
|
|
|
|
import { CustomerApi, CustomerVO } from '@/api/erp/sale/customer'
|
|
|
|
|
|
|
|
|
|
/** 模具管理-模具入库 列表 */
|
|
|
|
|
defineOptions({ name: 'MoldReturn' })
|
|
|
|
|
/** ERP 其它出库单列表 */
|
|
|
|
|
defineOptions({ name: 'MoldGet' })
|
|
|
|
|
|
|
|
|
|
const message = useMessage() // 消息弹窗
|
|
|
|
|
const { t } = useI18n() // 国际化
|
|
|
|
|
|
|
|
|
|
const loading = ref(true) // 列表的加载中
|
|
|
|
|
const list = ref<MoldReturnVO[]>([]) // 列表的数据
|
|
|
|
|
const list = ref<StockOutVO[]>([]) // 列表的数据
|
|
|
|
|
const total = ref(0) // 列表的总页数
|
|
|
|
|
const queryParams = reactive({
|
|
|
|
|
pageNo: 1,
|
|
|
|
|
pageSize: 10,
|
|
|
|
|
orderId: undefined,
|
|
|
|
|
code: undefined,
|
|
|
|
|
name: undefined,
|
|
|
|
|
state: undefined,
|
|
|
|
|
person: undefined,
|
|
|
|
|
returnTime: [],
|
|
|
|
|
principal: undefined,
|
|
|
|
|
no: undefined,
|
|
|
|
|
productId: undefined,
|
|
|
|
|
customerId: undefined,
|
|
|
|
|
outType: '领模出库',
|
|
|
|
|
warehouseId: undefined,
|
|
|
|
|
outTime: [],
|
|
|
|
|
status: 10,
|
|
|
|
|
remark: undefined,
|
|
|
|
|
createTime: [],
|
|
|
|
|
creator: undefined
|
|
|
|
|
})
|
|
|
|
|
const queryFormRef = ref() // 搜索的表单
|
|
|
|
|
const exportLoading = ref(false) // 导出的加载中
|
|
|
|
|
const productList = ref<ProductVO[]>([]) // 产品列表
|
|
|
|
|
const warehouseList = ref<WarehouseVO[]>([]) // 仓库列表
|
|
|
|
|
const customerList = ref<CustomerVO[]>([]) // 客户列表
|
|
|
|
|
const userList = ref<UserVO[]>([]) // 用户列表
|
|
|
|
|
const moldList = ref<MoldVO[]>([]) // 模具列表
|
|
|
|
|
|
|
|
|
|
/** 查询列表 */
|
|
|
|
|
const getList = async () => {
|
|
|
|
|
loading.value = true
|
|
|
|
|
try {
|
|
|
|
|
const data = await MoldReturnApi.getMoldReturnPage(queryParams)
|
|
|
|
|
const data = await StockOutApi.getStockOutPage(queryParams)
|
|
|
|
|
list.value = data.list
|
|
|
|
|
total.value = data.total
|
|
|
|
|
} finally {
|
|
|
|
|
@ -238,15 +327,29 @@ const openForm = (type: string, id?: number) => {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** 删除按钮操作 */
|
|
|
|
|
const handleDelete = async (id: number) => {
|
|
|
|
|
const handleDelete = async (ids: number[]) => {
|
|
|
|
|
try {
|
|
|
|
|
// 删除的二次确认
|
|
|
|
|
await message.delConfirm()
|
|
|
|
|
// 发起删除
|
|
|
|
|
await MoldReturnApi.deleteMoldReturn(id)
|
|
|
|
|
await StockOutApi.deleteStockOut(ids)
|
|
|
|
|
message.success(t('common.delSuccess'))
|
|
|
|
|
// 刷新列表
|
|
|
|
|
await getList()
|
|
|
|
|
selectionList.value = selectionList.value.filter((item) => !ids.includes(item.id))
|
|
|
|
|
} catch {}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** 审批/反审批操作 */
|
|
|
|
|
const handleUpdateStatus = async (id: number, status: number) => {
|
|
|
|
|
try {
|
|
|
|
|
// 审批的二次确认
|
|
|
|
|
await message.confirm(`确定${status === 20 ? '审批' : '反审批'}该出库单吗？`)
|
|
|
|
|
// 发起审批
|
|
|
|
|
await StockOutApi.updateStockOutStatus(id, status)
|
|
|
|
|
message.success(`${status === 20 ? '审批' : '反审批'}成功`)
|
|
|
|
|
// 刷新列表
|
|
|
|
|
await getList()
|
|
|
|
|
} catch {}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -257,16 +360,40 @@ const handleExport = async () => {
|
|
|
|
|
await message.exportConfirm()
|
|
|
|
|
// 发起导出
|
|
|
|
|
exportLoading.value = true
|
|
|
|
|
const data = await MoldReturnApi.exportMoldReturn(queryParams)
|
|
|
|
|
download.excel(data, '模具管理-模具入库.xls')
|
|
|
|
|
const data = await StockOutApi.exportStockOut(queryParams)
|
|
|
|
|
download.excel(data, '其它出库单.xls')
|
|
|
|
|
} catch {
|
|
|
|
|
} finally {
|
|
|
|
|
exportLoading.value = false
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/** 选中操作 */
|
|
|
|
|
const selectionList = ref<StockOutVO[]>([])
|
|
|
|
|
const handleSelectionChange = (rows: StockOutVO[]) => {
|
|
|
|
|
selectionList.value = rows
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const query = reactive({
|
|
|
|
|
brandId: undefined
|
|
|
|
|
})
|
|
|
|
|
/** 初始化 **/
|
|
|
|
|
onMounted(() => {
|
|
|
|
|
getList()
|
|
|
|
|
onMounted(async () => {
|
|
|
|
|
queryParams.outType ='领模出库'
|
|
|
|
|
await getList()
|
|
|
|
|
// 加载产品、仓库列表、客户
|
|
|
|
|
// productList.value = await ProductApi.getProductSimpleList()
|
|
|
|
|
moldList.value = await MoldBrandApi.getMoldAllList()
|
|
|
|
|
warehouseList.value = await WarehouseApi.getWarehouseSimpleList()
|
|
|
|
|
customerList.value = await CustomerApi.getCustomerSimpleList()
|
|
|
|
|
userList.value = await UserApi.getSimpleUserList()
|
|
|
|
|
})
|
|
|
|
|
</script>
|
|
|
|
|
// TODO 芋艿：可优化功能：列表界面，支持导入
|
|
|
|
|
// TODO 芋艿：可优化功能：详情界面，支持打印
|
|
|
|
|
/** tab 切换 */
|
|
|
|
|
let activeName = '产品出库'
|
|
|
|
|
const handleTabClick = (tab: TabsPaneContext) => {
|
|
|
|
|
queryParams.outType = tab.paneName
|
|
|
|
|
handleQuery()
|
|
|
|
|
}
|
|
|
|
|
</script>
|
|
|
|
|
|
kkk-ops
3 weeks ago