yunxi
/
mes-heli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 6 Wiki Activity

【订单发货、库存盘点、采购订单】操作列注意靠右处理

Browse Source
pull/4/head
qiuhongwu 8 months ago
parent a00eb67a75
commit 6b301ac06f
3 changed files with 111 additions and 110 deletions
Show Stats Download Patch File Download Diff File

4
mes-ui/mes-ui-admin-vue3/src/views/heli/deliverorder/index.vue
Unescape View File

@ -139,7 +139,9 @@
<dict-tag :type="DICT_TYPE.HELI_DELIVER_ORDER_STATUS" :value="scope.row.deliverStatus" />
</template>
</el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="220">
<el-table-column fixed="right" align="right" width="220">
<template #header> <span style="margin-right: 30%">操作</span>
</template>
<template #default="scope">
<el-button
v-if="scope.row.deliverStatus == 1"

5
mes-ui/mes-ui-admin-vue3/src/views/heli/purchaseorder/index.vue
Unescape View File

@ -98,7 +98,10 @@
<dict-tag :type="DICT_TYPE.HELI_PURCHASE_ORDER_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" fixed="right" min-width="180">
<el-table-column label="操作" align="right" fixed="right" min-width="180">
<template #header>
<span style="margin-right: 30%">操作</span>
</template>
<template #default="scope">
<el-button link type="primary" @click="openForm('edit', scope.row.id)" v-if="scope.row.status == 1 || scope.row.status == 4">
编辑

218
mes-ui/mes-ui-admin-vue3/src/views/heli/storagecheck/index.vue
Unescape View File

@ -1,115 +1,112 @@
<template>
<el-card class="hl-card">
<template #header>
<span>库存盘点</span>
</template>
<el-card class="hl-card">
<template #header>
<span>库存盘点</span>
</template>
<ContentWrap class="borderxx">
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form-item label="盘点单号" prop="stockNo">
<el-input v-model="queryParams.stockNo" placeholder="盘点单号" clearable @keyup.enter="handleQuery"
class="!w-240px" />
</el-form-item>
<el-form-item label="盘点仓库" prop="whId">
<el-input v-model="queryParams.whId" placeholder="盘点仓库" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="盘点类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="盘点类型" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_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.HELI_STORAGE_MAT_CHECK_STATUS).filter(item=> item.value !==3)" :key="dict.value"
:label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="盘点开始时间" prop="checkTime">
<el-date-picker v-model="queryParams.checkTime" value-format="YYYY-MM-DD" type="date" class="!w-240px" placeholder="选择时间" />
</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" plain @click="openForm('create')" v-hasPermi="['heli:storage-check:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" class="hl-table">
<el-table-column type="index" width="100" fixed label="序号" align="center" />
<el-table-column label="盘点单号" fixed align="center" prop="stockNo" min-width="200">
<template #default="scope">
<el-button type="text" @click="openDetail('review', scope.row.id)">
{{scope.row.stockNo}}</el-button>
</template>
</el-table-column>
<el-table-column label="盘点开始时间" align="center" prop="checkTime" min-width="160">
<template #default="scope">
<span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<el-table-column label="盘点仓库" align="center" prop="whId" min-width="100">
<template #default="scope">
{{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
</template>
</el-table-column>
<el-table-column label="盘点类型" align="center" prop="checkType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
</template>
</el-table-column>
<!-- <el-table-column label="排除库存为0的物料" align="center" prop="noZero" min-width="160" >
<!-- 搜索工作栏 -->
<el-form class="-mb-15px" :model="queryParams" ref="queryFormRef" :inline="true" label-width="120px">
<el-form-item label="盘点单号" prop="stockNo">
<el-input v-model="queryParams.stockNo" placeholder="盘点单号" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="盘点仓库" prop="whId">
<el-input v-model="queryParams.whId" placeholder="盘点仓库" clearable @keyup.enter="handleQuery" class="!w-240px" />
</el-form-item>
<el-form-item label="盘点类型" prop="checkType">
<el-select v-model="queryParams.checkType" placeholder="盘点类型" clearable class="!w-240px">
<el-option v-for="dict in getIntDictOptions(DICT_TYPE.HELI_STORAGE_MAT_CHECK_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.HELI_STORAGE_MAT_CHECK_STATUS).filter(item=> item.value !==3)" :key="dict.value" :label="dict.label" :value="dict.value" />
</el-select>
</el-form-item>
<el-form-item label="盘点开始时间" prop="checkTime">
<el-date-picker v-model="queryParams.checkTime" value-format="YYYY-MM-DD" type="date" class="!w-240px" placeholder="选择时间" />
</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" plain @click="openForm('create')" v-hasPermi="['heli:storage-check:create']">
<Icon icon="ep:plus" class="mr-5px" /> 新增
</el-button>
</el-form-item>
</el-form>
</ContentWrap>
<!-- 列表 -->
<ContentWrap>
<el-table v-loading="loading" :data="list" :stripe="true" class="hl-table">
<el-table-column type="index" width="100" fixed label="序号" align="center" />
<el-table-column label="盘点单号" fixed align="center" prop="stockNo" min-width="200">
<template #default="scope">
<el-button type="text" @click="openDetail('review', scope.row.id)">
{{scope.row.stockNo}}</el-button>
</template>
</el-table-column>
<el-table-column label="盘点开始时间" align="center" prop="checkTime" min-width="160">
<template #default="scope">
<span>{{ formatDate(scope.row.checkTime, 'YYYY-MM-DD') }}</span>
</template>
</el-table-column>
<el-table-column label="盘点仓库" align="center" prop="whId" min-width="100">
<template #default="scope">
{{ whList.find((tag) => tag.id === scope.row.whId)?.wh_name }}
</template>
</el-table-column>
<el-table-column label="盘点类型" align="center" prop="checkType" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_TYPE" :value="scope.row.checkType" />
</template>
</el-table-column>
<!-- <el-table-column label="排除库存为0的物料" align="center" prop="noZero" min-width="160" >
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_COMMON_IS_OR_NOT" :value="scope.row.noZero" />
</template>
</el-table-column> -->
<el-table-column label="备注" align="center" prop="description" min-width="160" />
<el-table-column label="创建人" align="center" prop="creator" min-width="120">
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.creator)?.nickname }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" min-width="220" />
<el-table-column label="提交人" align="center" prop="keeper" min-width="120">
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
</template>
</el-table-column>
<el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" min-width="220" />
<el-table-column label="单据状态" fixed="right" align="center" prop="status" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="操作" fixed="right" align="center" min-width="140">
<template #default="scope">
<el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status == 1">
编辑
</el-button>
<el-button link type="primary" @click="openDetail('review', scope.row.id)">
查看详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize"
@pagination="getList" />
</ContentWrap>
</el-card>
<el-table-column label="备注" align="center" prop="description" min-width="160" />
<el-table-column label="创建人" align="center" prop="creator" min-width="120">
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.creator)?.nickname }}
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" :formatter="dateFormatter" min-width="220" />
<el-table-column label="提交人" align="center" prop="keeper" min-width="120">
<template #default="scope">
{{ userList.find((user) => user.id == scope.row.keeper)?.nickname }}
</template>
</el-table-column>
<el-table-column label="提交时间" align="center" prop="keeperTime" :formatter="dateFormatter" min-width="220" />
<el-table-column label="单据状态" fixed="right" align="center" prop="status" min-width="120">
<template #default="scope">
<dict-tag :type="DICT_TYPE.HELI_STORAGE_MAT_CHECK_STATUS" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column fixed="right" align="right" min-width="180">
<template #header> <span style="margin-right: 30%">操作</span>
</template>
<template #default="scope">
<el-button link type="primary" @click="openDetail('update', scope.row.id)" v-if="scope.row.status == 1">
编辑
</el-button>
<el-button link type="primary" @click="openDetail('review', scope.row.id)">
查看详情
</el-button>
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<Pagination :total="total" v-model:page="queryParams.pageNo" v-model:limit="queryParams.pageSize" @pagination="getList" />
</ContentWrap>
</el-card>
<!-- 表单弹窗：添加/修改 -->
<StorageCheckForm ref="formRef" @success="getList" />
</template>
@ -151,16 +148,16 @@ const queryParams = reactive({
outbound: undefined,
outboundTime: [],
cancel: undefined,
cancelTime: [],
cancelTime: []
})
const queryFormRef = ref() // 搜索的表单
const exportLoading = ref(false) // 导出的加载中
const userList = ref<UserApi.UserVO[]>([]) // 用户列表
const whList = ref([])
//仓库列表
const init_page_wh = (async () => {
const init_page_wh = async () => {
whList.value = await WarehouseApi.getSimpList()
})
}
/** 查询列表 */
const getList = async () => {
loading.value = true
@ -208,7 +205,7 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
} catch { }
} catch {}
}
/** 导出按钮操作 */
@ -228,7 +225,6 @@ const handleExport = async () => {
/** 初始化 **/
onMounted(async () => {
await init_page_wh()
await getList()
})

Write Preview
Loading…
Cancel
Save