DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

推送项目重构代码

Browse Source
This commit is contained in:
wangyu
2026-05-29 19:52:32 +08:00
parent 95141d0e1f
commit 3dafaceef2
65 changed files with 3762 additions and 583 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
ruoyi-ui/src/views/oa/oaWarehouse/auditLog.vue Normal file
View File

@@ -0,0 +1,101 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" label-width="80px">
<el-form-item label="操作类型" prop="opType">
<el-select v-model="queryParams.opType" placeholder="全部" clearable style="width: 160px">
<el-option v-for="t in opTypes" :key="t.value" :label="t.label" :value="t.value" />
</el-select>
</el-form-item>
<el-form-item label="实体类型" prop="refType">
<el-select v-model="queryParams.refType" placeholder="全部" clearable style="width: 140px">
<el-option label="采购需求" value="requirement" />
<el-option label="车间采购" value="task" />
<el-option label="出入库单" value="master" />
<el-option label="物料" value="warehouse" />
</el-select>
</el-form-item>
<el-form-item label="实体ID" prop="refId">
<el-input v-model="queryParams.refId" placeholder="可选" clearable style="width: 160px" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-table v-loading="loading" :data="list" stripe size="small">
<el-table-column label="时间" prop="opTime" width="160">
<template slot-scope="scope">{{ parseTime(scope.row.opTime, '{y}-{m}-{d} {h}:{i}') }}</template>
</el-table-column>
<el-table-column label="操作人" prop="opUserName" width="100" />
<el-table-column label="类型" prop="opType" width="120">
<template slot-scope="scope">
<el-tag :type="tagType(scope.row.opType)" size="mini">{{ tagLabel(scope.row.opType) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="摘要" prop="summary" min-width="320" show-overflow-tooltip />
<el-table-column label="关联" width="180">
<template slot-scope="scope">
<span v-if="scope.row.refType">{{ refLabel(scope.row.refType) }} #{{ scope.row.refId }}</span>
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total"
:page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
</div>
</template>
<script>
import { listWarehouseAudit } from '@/api/oa/warehouse/auditLog'
const TAG_MAP = {
REQ_CREATE: { type: 'success', label: '需求新建' },
REQ_UPDATE: { type: 'info', label: '需求修改' },
REQ_DONE: { type: 'success', label: '需求完成' },
REQ_CANCEL: { type: 'warning', label: '需求取消' },
REQ_DELETE: { type: 'danger', label: '需求删除' },
TASK_CREATE: { type: 'success', label: '采购创建' },
TASK_DONE: { type: 'success', label: '采购完成' },
TASK_CANCEL: { type: 'warning', label: '采购取消' },
TASK_UPDATE: { type: 'info', label: '采购修改' },
IN: { type: 'success', label: '入库' },
OUT: { type: 'warning', label: '出库' },
RETURN: { type: 'info', label: '退库' },
STOCK_ADJUST:{ type: 'danger', label: '库存修正' }
}
export default {
name: 'WarehouseAuditLog',
data () {
return {
loading: false,
list: [],
total: 0,
queryParams: { pageNum: 1, pageSize: 20, opType: undefined, refType: undefined, refId: undefined },
opTypes: Object.keys(TAG_MAP).map(k => ({ value: k, label: TAG_MAP[k].label }))
}
},
created () { this.getList() },
methods: {
getList () {
this.loading = true
listWarehouseAudit(this.queryParams).then(res => {
this.list = res.rows || []
this.total = res.total || 0
}).finally(() => { this.loading = false })
},
handleQuery () { this.queryParams.pageNum = 1; this.getList() },
resetQuery () {
this.queryParams = { pageNum: 1, pageSize: 20, opType: undefined, refType: undefined, refId: undefined }
this.getList()
},
tagType (op) { return (TAG_MAP[op] || {}).type || '' },
tagLabel (op) { return (TAG_MAP[op] || {}).label || op },
refLabel (ref) {
return { requirement: '采购需求', task: '车间采购', master: '出入库单', warehouse: '物料' }[ref] || ref
}
}
}
</script>

472
ruoyi-ui/src/views/oa/oaWarehouse/components/AddPurchaseDialog.vue Normal file
View File

@@ -0,0 +1,472 @@
<template>
<el-dialog title="新建采购单" :visible.sync="visibleProxy" width="1080px" append-to-body
:close-on-click-modal="false" custom-class="add-purchase-dialog" @close="handleClose">
<!-- 选中清单 sticky strip（任何步骤都看得到） -->
<div class="selected-strip" v-if="selected.length">
<span class="strip-label">已选 {{ selected.length }} 项：</span>
<el-tag v-for="(it, idx) in selected" :key="it._key" type="info" size="small"
closable disable-transitions @close="removeItem(idx)" class="strip-tag">
{{ tagText(it) }}
</el-tag>
</div>
<div v-else class="selected-strip empty">还没选任何物料</div>
<!-- 步骤指示 -->
<el-steps :active="step" simple class="compact-steps" finish-status="success">
<el-step title="选物料" icon="el-icon-search" />
<el-step title="设数量备注" icon="el-icon-edit-outline" />
<el-step title="确认提交" icon="el-icon-check" />
</el-steps>
<!-- Step 1: 选物料 + 右侧推荐 -->
<div v-if="step === 0" class="step1-wrap">
<div class="step1-main">
<div style="display:flex; align-items:center; gap:8px; margin-bottom:8px;">
<el-input v-model="keyword" placeholder="搜索 物料名 / 型号 / 品牌" clearable
size="mini" prefix-icon="el-icon-search" style="flex:1"
@input="onSearch" @clear="onSearch" />
<el-button size="mini" type="success" plain icon="el-icon-plus"
@click="newMatVisible = true">新增物料</el-button>
</div>
<!-- 新增物料子弹窗 -->
<el-dialog title="新增物料" :visible.sync="newMatVisible" width="520px" append-to-body
:close-on-click-modal="false">
<el-form ref="newMatForm" :model="newMat" :rules="newMatRules" size="mini" label-width="80px">
<el-form-item label="物料名" prop="name">
<el-input v-model="newMat.name" placeholder="必填，如：RVV 电源线" />
</el-form-item>
<el-form-item label="型号" prop="model">
<el-input v-model="newMat.model" placeholder="如：RVV-2×1.5" />
</el-form-item>
<el-form-item label="品牌" prop="brand">
<el-input v-model="newMat.brand" placeholder="如：远东" />
</el-form-item>
<el-form-item label="规格" prop="specifications">
<el-input v-model="newMat.specifications" placeholder="如：100m/卷" />
</el-form-item>
<el-form-item label="单位" prop="unit">
<el-input v-model="newMat.unit" placeholder="如：卷/个/m" />
</el-form-item>
<el-form-item label="预警阈值" prop="threshold">
<el-input-number v-model="newMat.threshold" :min="0" controls-position="right"
style="width: 140px" />
<span style="color:#909399; margin-left:8px;">库存低于此值会提醒补货</span>
</el-form-item>
<el-form-item label="本次采购" prop="taskInventory">
<el-input-number v-model="newMat.taskInventory" :min="1" controls-position="right"
style="width: 140px" />
</el-form-item>
</el-form>
<span slot="footer">
<el-button size="mini" @click="newMatVisible = false">取消</el-button>
<el-button size="mini" type="primary" :loading="newMatSubmitting"
@click="submitNewMaterial">保存并加入采购单</el-button>
</span>
</el-dialog>
<el-table v-loading="loading" :data="list" size="mini" stripe
:row-class-name="rowDangerClass" max-height="320">
<template slot="empty">
<div style="padding: 24px 0; text-align: center;">
<div style="color:#909399; margin-bottom: 12px;">
<i class="el-icon-search" style="font-size: 28px;"></i>
<div style="margin-top: 6px;">没有找到匹配的物料</div>
<div v-if="keyword" style="font-size: 11px; margin-top: 4px;">
库里没有「{{ keyword }}」，直接新增？
</div>
</div>
<el-button type="success" size="mini" icon="el-icon-plus"
@click="openNewMatFromSearch">新增物料</el-button>
</div>
</template>
<el-table-column label="物料" prop="name" min-width="120" show-overflow-tooltip />
<el-table-column label="型号" prop="model" min-width="100" show-overflow-tooltip />
<el-table-column label="品牌" prop="brand" min-width="100" show-overflow-tooltip />
<el-table-column label="规格" prop="specifications" min-width="100" show-overflow-tooltip />
<el-table-column label="库存" prop="inventory" width="64" align="right" />
<el-table-column label="阈值" prop="threshold" width="64" align="right" />
<el-table-column label="操作" width="56" align="center">
<template slot-scope="s">
<el-button v-if="!isSelected(s.row)" type="text" class="add-mini-btn"
icon="el-icon-circle-plus-outline" @click="addItem(s.row)">加入</el-button>
<i v-else class="el-icon-check" style="color:#67c23a; font-size:14px;" title="已加" />
</template>
</el-table-column>
</el-table>
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum"
:limit.sync="queryParams.pageSize" :page-sizes="[20, 50, 100]" @pagination="loadList" />
</div>
<!-- 右侧 推荐（低于阈值 Top 20，按库存与阈值差倒序） -->
<div class="step1-side">
<div class="side-header">
<i class="el-icon-magic-stick" style="color:#e6a23c;"></i>
<span>推荐补货（{{ recommend.length }}）</span>
</div>
<div class="side-list" v-loading="recommendLoading">
<div v-for="r in recommend" :key="r.id" class="rec-item" :class="{ disabled: recIsSelected(r) }"
@click="recIsSelected(r) ? null : addRecommend(r)">
<div class="rec-text" :title="recommendText(r)">
{{ recommendText(r) }}
</div>
<div class="rec-meta">
<span class="rec-stock">库存 {{ r.inventory || 0 }} / 阈值 {{ r.threshold || 0 }}</span>
<i v-if="recIsSelected(r)" class="el-icon-check" style="color:#67c23a"></i>
<i v-else class="el-icon-circle-plus-outline" style="color:#409eff"></i>
</div>
</div>
<div v-if="!recommendLoading && !recommend.length" class="rec-empty">
暂无低于阈值的物料
</div>
</div>
</div>
</div>
<!-- Step 2: 设数量备注 -->
<div v-if="step === 1">
<el-alert v-if="!selected.length" type="warning" :closable="false"
title="请先在步骤 1 选物料" />
<el-table v-else :data="selected" size="mini" stripe max-height="380">
<el-table-column label="物料" min-width="200">
<template slot-scope="s">{{ tagText(s.row) }}</template>
</el-table-column>
<el-table-column label="单位" prop="unit" width="60" />
<el-table-column label="采购数量" width="120" align="center">
<template slot-scope="s">
<el-input-number v-model="s.row.taskInventory" :min="1" size="mini" controls-position="right"
style="width: 100px" />
</template>
</el-table-column>
<el-table-column label="截止日期" width="160" align="center">
<template slot-scope="s">
<el-date-picker v-model="s.row.endTime" type="date" size="mini" value-format="yyyy-MM-dd"
placeholder="选日期" style="width: 140px" />
</template>
</el-table-column>
<el-table-column label="单项备注" min-width="160">
<template slot-scope="s">
<el-input v-model="s.row.remark" size="mini" placeholder="可不填" />
</template>
</el-table-column>
<el-table-column label="" width="50" align="center">
<template slot-scope="s">
<el-button type="text" style="color:#f56c6c" @click="removeItem(s.$index)">×</el-button>
</template>
</el-table-column>
</el-table>
</div>
<!-- Step 3: 确认 -->
<div v-if="step === 2">
<el-form size="mini" label-width="80px">
<el-form-item label="关联需求">
<el-select v-model="form.requirementId" placeholder="可选" filterable clearable style="width: 100%">
<el-option v-for="r in requirementOptions" :key="r.requirementId" :label="r.title"
:value="r.requirementId" />
</el-select>
</el-form-item>
<el-form-item label="单据备注">
<el-input v-model="form.remark" type="textarea" :autosize="{ minRows: 2, maxRows: 4 }"
placeholder="例如：急、月度补货" />
<div style="color:#909399; font-size:11px;">提示：备注里写"急"会被识别为加急单</div>
</el-form-item>
</el-form>
<div style="border:1px solid #ebeef5; border-radius:4px; padding:6px 10px; max-height:180px; overflow:auto;">
<div v-for="(it, i) in selected" :key="it._key"
style="display:flex; justify-content:space-between; padding:4px 0; border-bottom:1px dashed #f0f0f0;">
<span>{{ i + 1 }}. {{ tagText(it) }}</span>
<span style="color:#606266;">× {{ it.taskInventory }} {{ it.unit || '' }}</span>
</div>
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button size="mini" @click="visibleProxy = false">取消</el-button>
<el-button size="mini" v-if="step > 0" @click="step--">上一步</el-button>
<el-button size="mini" type="primary" v-if="step < 2"
:disabled="step === 0 && !selected.length" @click="step++">下一步</el-button>
<el-button size="mini" type="success" v-if="step === 2"
:loading="submitting" @click="submit">提交采购单</el-button>
</span>
</el-dialog>
</template>
<script>
import { addOaWarehouse, listNotThreshold, listThreshold } from '@/api/oa/warehouse/oaWarehouse'
import { addOaWarehouseTaskBatch } from '@/api/oa/warehouse/warehouseTask'
import { listRequirements } from '@/api/oa/requirement'
export default {
name: 'AddPurchaseDialog',
props: { visible: Boolean },
data () {
return {
step: 0,
loading: false,
submitting: false,
keyword: '',
queryParams: { pageNum: 1, pageSize: 20, name: '' },
list: [],
total: 0,
// 右侧推荐
recommend: [],
recommendLoading: false,
selected: [],
form: { requirementId: undefined, remark: '' },
requirementOptions: [],
// 新增物料子弹窗
newMatVisible: false,
newMatSubmitting: false,
newMat: { name: '', model: '', brand: '', specifications: '', unit: '',
threshold: 5, taskInventory: 1 },
newMatRules: {
name: [{ required: true, message: '物料名必填', trigger: 'blur' }],
taskInventory: [{ required: true, message: '采购数量必填', trigger: 'change' }]
}
}
},
computed: {
visibleProxy: {
get () { return this.visible },
set (v) { this.$emit('update:visible', v) }
}
},
watch: {
visible (v) {
if (v) {
this.step = 0
this.selected = []
this.form = { requirementId: undefined, remark: '' }
this.keyword = ''
this.queryParams = { pageNum: 1, pageSize: 20, name: '' }
this.loadList()
this.loadRecommend()
this.loadRequirements()
}
}
},
methods: {
// 列表为空时点新增物料：把搜索词预填到物料名
openNewMatFromSearch () {
if (this.keyword) this.newMat.name = this.keyword
this.newMatVisible = true
},
submitNewMaterial () {
this.$refs.newMatForm.validate(ok => {
if (!ok) return
this.newMatSubmitting = true
const matPayload = {
name: this.newMat.name,
model: this.newMat.model,
brand: this.newMat.brand,
specifications: this.newMat.specifications,
unit: this.newMat.unit,
threshold: this.newMat.threshold,
inventory: 0,
price: 0
}
addOaWarehouse(matPayload).then(res => {
const newId = (res && res.data && (res.data.id || res.data.warehouseId)) || res.id || res.warehouseId
this.selected.push({
_key: 'new_' + Date.now(),
warehouseId: newId,
name: this.newMat.name,
model: this.newMat.model,
brand: this.newMat.brand,
specifications: this.newMat.specifications,
unit: this.newMat.unit,
taskInventory: this.newMat.taskInventory,
endTime: '',
remark: '新增物料'
})
this.$modal.msgSuccess('物料已建档并加入采购单')
this.newMatVisible = false
this.newMat = { name: '', model: '', brand: '', specifications: '', unit: '',
threshold: 5, taskInventory: 1 }
this.loadList()
}).finally(() => { this.newMatSubmitting = false })
})
},
tagText (it) {
return [it.name, it.model, it.brand, it.specifications].filter(Boolean).join(' · ')
},
onSearch () {
this.queryParams.name = this.keyword || ''
this.queryParams.pageNum = 1
this.loadList()
},
loadList () {
this.loading = true
// 统一查所有物料；低于阈值的行会被 rowDangerClass 自动染红
listNotThreshold(this.queryParams).then(res => {
this.list = res.rows || []
this.total = res.total || 0
}).finally(() => { this.loading = false })
},
loadRecommend () {
this.recommendLoading = true
listThreshold({ pageNum: 1, pageSize: 20 }).then(res => {
this.recommend = res.rows || []
}).finally(() => { this.recommendLoading = false })
},
recommendText (r) {
return [r.name, r.model, r.brand, r.specifications].filter(Boolean).join('-')
},
recIsSelected (r) {
return this.selected.some(s => s.warehouseId === r.id)
},
addRecommend (r) {
this.selected.push({
_key: r.id + '_' + Date.now(),
warehouseId: r.id,
name: r.name,
model: r.model,
brand: r.brand,
specifications: r.specifications,
unit: r.unit,
taskInventory: Math.max(1, (r.threshold || 1) - (r.inventory || 0)),
endTime: '',
remark: ''
})
},
loadRequirements () {
listRequirements({ pageNum: 1, pageSize: 200, status: 1 }).then(res => {
this.requirementOptions = res.rows || []
})
},
isSelected (row) {
return this.selected.some(s => s.warehouseId === row.id)
},
addItem (row) {
const item = {
_key: row.id + '_' + Date.now(),
warehouseId: row.id,
name: row.name,
model: row.model,
brand: row.brand,
specifications: row.specifications,
unit: row.unit,
taskInventory: Math.max(1, (row.threshold || 1) - (row.inventory || 0)),
endTime: '',
remark: ''
}
this.selected.push(item)
},
removeItem (idx) {
this.selected.splice(idx, 1)
},
rowDangerClass ({ row }) {
return (row.inventory != null && row.threshold != null && row.inventory < row.threshold)
? 'row-urgent' : ''
},
submit () {
if (!this.selected.length) {
this.$modal.msgWarning('请先选择物料')
return
}
// 把单据层 remark 透传到每一项；后端按需消化
const payload = this.selected.map(s => ({
warehouseId: s.warehouseId,
name: s.name,
model: s.model,
brand: s.brand,
specifications: s.specifications,
unit: s.unit,
taskInventory: s.taskInventory,
endTime: s.endTime,
remark: s.remark || this.form.remark || '',
requirementId: this.form.requirementId
}))
this.submitting = true
addOaWarehouseTaskBatch(payload).then(() => {
this.$modal.msgSuccess('采购单已创建')
this.visibleProxy = false
this.$emit('saved')
}).finally(() => { this.submitting = false })
},
handleClose () { this.step = 0 }
}
}
</script>
<style lang="scss" scoped>
.add-purchase-dialog ::v-deep .el-dialog__body { padding: 12px 18px; }
.selected-strip {
background: #f4f7fa;
border: 1px dashed #d8dce5;
border-radius: 4px;
padding: 6px 8px;
margin-bottom: 8px;
display: flex;
align-items: center;
flex-wrap: wrap;
gap: 4px 6px;
min-height: 32px;
font-size: 12px;
&.empty { color: #909399; }
}
.strip-label { color: #606266; margin-right: 4px; }
.strip-tag { margin-right: 0 !important; }
.compact-steps { margin-bottom: 10px; }
.compact-steps ::v-deep .el-step__title { font-size: 12px; line-height: 28px; }
.compact-steps ::v-deep .is-simple .el-step__head { font-size: 13px; }
.add-mini-btn.el-button {
padding: 0 !important;
font-size: 11px !important;
height: 20px;
line-height: 20px;
i { font-size: 12px; margin-right: 2px; }
}
/* Step1 左右布局 */
.step1-wrap { display: flex; gap: 12px; }
.step1-main { flex: 1; min-width: 0; }
.step1-side {
width: 280px;
flex-shrink: 0;
border: 1px solid #ebeef5;
border-radius: 4px;
display: flex;
flex-direction: column;
max-height: 460px;
background: #fffefb;
}
.side-header {
padding: 8px 10px;
border-bottom: 1px solid #f0f0f0;
font-weight: 600;
font-size: 12px;
background: #fdf6ec;
display: flex;
align-items: center;
gap: 6px;
}
.side-list { flex: 1; overflow-y: auto; padding: 4px; }
.rec-item {
padding: 6px 8px;
border-radius: 3px;
cursor: pointer;
margin-bottom: 4px;
font-size: 11px;
transition: all .15s;
border: 1px solid transparent;
&:hover { background: #ecf5ff; border-color: #d9ecff; }
&.disabled { opacity: .55; cursor: default; background: #f4f4f5; }
}
.rec-text {
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
color: #303133;
margin-bottom: 2px;
}
.rec-meta {
display: flex;
justify-content: space-between;
align-items: center;
color: #909399;
font-size: 10px;
}
.rec-stock { color: #f56c6c; }
.rec-empty { padding: 24px 0; text-align: center; color: #909399; font-size: 12px; }
</style>

19
ruoyi-ui/src/views/oa/oaWarehouse/index.vue
View File

@@ -1,6 +1,7 @@
<template>
<div class="app-container" v-loading="loading">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch"
label-width="68px" class="compact-search">
<el-form-item label="型号" prop="model">
<el-input
v-model="queryParams.model"
@@ -87,16 +88,17 @@
<el-col :span="1.5">
<el-button
plain
icon="el-icon-upload"
type="primary"
icon="el-icon-shopping-cart-2"
size="mini"
@click="addWarehouseTask"
>添加采购计划</el-button>
@click="addDialogVisible = true"
>新建采购单</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<add-purchase-dialog :visible.sync="addDialogVisible" @saved="getList" />
<el-table v-loading="loading" :data="oaWarehouseList" @selection-change="handleSelectionChange" :row-class-name="tableRowClassName">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index"/>
@@ -227,10 +229,13 @@
import { delOaWarehouse, getOaWarehouse, listOaWarehouse, updateOaWarehouse } from "@/api/oa/warehouse/oaWarehouse";
import { addOaWarehouseMasterToIn } from "@/api/oa/warehouse/warehouseMaster";
import { getToken } from "@/utils/auth";
import AddPurchaseDialog from "./components/AddPurchaseDialog.vue";
export default {
name: "OaWarehouse",
components: { AddPurchaseDialog },
data() {
return {
addDialogVisible: false,
// 用户导入参数
upload: {
// 是否显示弹出层（用户导入）
@@ -270,7 +275,7 @@ export default {
// 查询参数
queryParams: {
pageNum: 1,
pageSize: 10,
pageSize: 50,
inventory: undefined,
model: undefined,
unit: undefined,

433
ruoyi-ui/src/views/oa/oaWarehouse/task.vue
View File

@@ -1,107 +1,154 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<!-- 状态筛选 tabs：全部 / 加急 / 未完成 / 已完成 -->
<el-tabs v-model="statusFilter" @tab-click="onStatusTabChange" class="compact-tabs">
<el-tab-pane label="全部" name="all" />
<el-tab-pane name="urgent">
<span slot="label" style="color:#f56c6c;">
<i class="el-icon-warning-outline"></i> 加急 ({{ stat.urgent }})
</span>
</el-tab-pane>
<el-tab-pane :label="`未完成 (${stat.undone})`" name="undone" />
<el-tab-pane :label="`已完成 (${stat.done})`" name="done" />
</el-tabs>
<el-form :model="queryParams" ref="queryForm" size="mini" :inline="true" v-show="showSearch"
label-width="68px" class="compact-search">
<el-form-item label="关联需求" prop="requirementId">
<el-select v-model="queryParams.requirementId" placeholder="选择需求" filterable clearable style="width: 200px">
<el-option v-for="item in requirementList" :key="item.requirementId" :label="item.title"
:value="item.requirementId" />
</el-select>
</el-form-item>
<el-form-item label="操作时间" prop="signTime">
<el-date-picker v-model="searchTime" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']">
</el-date-picker>
:default-time="['00:00:00', '23:59:59']" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
</el-form-item>
</el-form>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
v-hasPermi="['oa:oaOutWarehouse:remove']">删除
</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
<el-button type="primary" size="mini" icon="el-icon-plus" class="add-purchase-btn"
@click="addDialogVisible = true">新建采购单</el-button>
<add-purchase-dialog :visible.sync="addDialogVisible" @saved="getList" />
<el-table v-loading="loading" :data="TaskList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="采购单编号" align="center" prop="masterNum">
<template slot-scope="scope">
<el-input v-model="scope.row.masterNum" size="mini" placeholder="请输入采购单编号"
@blur="updateMasterRemark(scope.row)" />
<el-table v-loading="loading" :data="TaskList" @selection-change="handleSelectionChange" stripe size="small"
row-key="masterId" :expand-row-keys="expandedKeys"
:row-class-name="rowClassName" @expand-change="onRowExpand">
<el-table-column type="expand" width="36">
<template slot-scope="props">
<div style="padding: 10px 24px; background:#fafafa;">
<!-- 顶部：模式 + 批量入库 -->
<div style="display:flex; align-items:center; justify-content:space-between; margin-bottom:8px;">
<div style="display:flex; align-items:center; gap:8px;">
<span style="font-weight:600;">物料明细（{{ (itemsMap[props.row.masterId] || []).length }} 项）</span>
<el-radio-group v-model="mode" size="mini" v-if="props.row.status === 0">
<el-radio-button label="single">单个操作</el-radio-button>
<el-radio-button label="batch">批量操作</el-radio-button>
</el-radio-group>
</div>
<div v-if="mode === 'batch' && props.row.status === 0"
style="display:flex; align-items:center; gap:6px;">
<el-select v-model="batchStatus" size="mini" placeholder="批量设置状态" style="width:140px">
<el-option v-for="s in statusOptions" :key="s.value" :value="s.value" :label="s.label" />
</el-select>
<el-button size="mini" type="success" @click="submitComplete">执行入库</el-button>
</div>
</div>
<el-table v-loading="itemsLoading[props.row.masterId]"
:data="itemsMap[props.row.masterId] || []" size="mini" stripe ref="warehouseTable">
<el-table-column v-if="mode === 'batch' && props.row.status === 0"
type="selection" width="44" align="center" />
<el-table-column label="物料名" prop="name" min-width="120" />
<el-table-column label="截止" prop="endTime" width="120" align="center">
<template slot-scope="s">
<template v-if="s.row.endTime != null && s.row.taskStatus !== 2">
<span v-if="dayDiff(s.row.endTime) > 3">{{ parseTime(s.row.endTime, '{y}-{m}-{d}') }}</span>
<el-tag v-else-if="dayDiff(s.row.endTime) > 0" type="warning" size="mini" effect="plain">剩{{ dayDiff(s.row.endTime) }}天</el-tag>
<el-tag v-else-if="dayDiff(s.row.endTime) === 0" type="danger" size="mini" effect="plain">今日</el-tag>
<el-tag v-else type="danger" size="mini" effect="plain">逾{{ Math.abs(dayDiff(s.row.endTime)) }}天</el-tag>
</template>
</template>
</el-table-column>
<el-table-column label="数量" prop="taskInventory" width="64" align="right" />
<el-table-column label="单位" prop="unit" width="56" />
<el-table-column label="单价" width="110" align="right">
<template slot-scope="s">
<el-input v-if="s.row.taskStatus !== 2 && props.row.status === 0"
v-model="s.row.price" size="mini" type="number" placeholder="¥" />
<span v-else>¥{{ Number(s.row.price || 0).toFixed(2) }}</span>
</template>
</el-table-column>
<el-table-column label="型号" prop="model" min-width="100" />
<el-table-column label="规格" prop="specifications" min-width="100" />
<el-table-column label="品牌" prop="brand" min-width="80" />
<el-table-column label="备注" prop="remark" min-width="140">
<template slot-scope="s">
<el-input v-model="s.row.remark" size="mini" placeholder="备注"
:disabled="s.row.taskStatus === 2 || props.row.status === 1"
@blur="updateRemark(s.row)" />
</template>
</el-table-column>
<el-table-column label="状态" prop="taskStatus" width="110" align="center">
<template slot-scope="s">
<el-tag v-if="s.row.taskStatus === 2" type="success" size="mini">完成</el-tag>
<el-select v-else-if="mode === 'single' && props.row.status === 0"
v-model="s.row.taskStatus" size="mini" placeholder="状态"
@change="handleUpdateTask(s.row)">
<el-option v-for="opt in filteredStatusOptions(s.row)" :key="opt.value"
:value="opt.value" :label="opt.label" />
</el-select>
<el-tag v-else size="mini">{{ statusLabel(s.row.taskStatus) }}</el-tag>
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="60">
<template slot-scope="s">
<el-button v-if="s.row.taskStatus !== 2 && props.row.status === 0"
size="mini" type="text" style="color:#f56c6c"
@click="handleBatchDelete(s.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</div>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="status">
<template slot-scope="scope">
<el-tag :type="scope.row.status === 1 ? 'success' : 'warning'">{{
scope.row.status === 1 ? "完成" : "未完成"
}}
</el-tag>
</template>
<el-table-column type="selection" width="44" align="center" />
<el-table-column label="操作时间" prop="signTime" width="100">
<template slot-scope="scope">{{ parseTime(scope.row.signTime, "{y}-{m}-{d}") }}</template>
</el-table-column>
<el-table-column label="最近截止日期" align="center" prop="nearestEndTime">
<template slot-scope="scope" v-if="scope.row.nearestEndTime != null && scope.row.status !== 1">
<template v-if="dayDiff(scope.row.nearestEndTime) > 3">
<!-- 超过 3 天，正常显示 -->
<span>{{ parseTime(scope.row.nearestEndTime, '{y}-{m}-{d}') }}</span>
</template><template v-else-if="dayDiff(scope.row.nearestEndTime) > 0">
<!-- 未来 1–3 天 -->
<el-tag type="warning" effect="plain">
剩余{{ dayDiff(scope.row.nearestEndTime) }}天
</el-tag>
</template><template v-else-if="dayDiff(scope.row.nearestEndTime) === 0">
<!-- 今天到期 -->
<el-tag type="danger" effect="plain">
<i class="el-icon-warning-outline"></i> 今日过期！
</el-tag>
</template><template v-else>
<!-- 已过期 -->
<el-tag type="danger" effect="plain">
逾期{{ Math.abs(dayDiff(scope.row.endTime)) }}天
</el-tag>
</template>
</template>
</el-table-column>
<el-table-column label="操作时间" align="center" prop="signTime">
<el-table-column label="操作人" prop="signUser" width="90" />
<el-table-column label="关联需求" min-width="220">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.signTime, "{y}-{m}-{d}") }}</span>
</template>
</el-table-column>
<el-table-column label="操作人" align="center" prop="signUser" />
<el-table-column label="备注" align="center" prop="remark">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" size="mini" type="textarea" placeholder="请输入备注"
@blur="updateMasterRemark(scope.row)" />
</template>
</el-table-column>
<el-table-column label="需求编号" align="center" prop="requirementNum">
<template slot-scope="scope">
<el-select v-model="scope.row.requirementId" placeholder="请选择需求编号" filterable clearable
@change="updateMasterRemark(scope.row)">
<el-select v-model="scope.row.requirementId" placeholder="选择需求" filterable clearable size="mini"
style="width: 100%" @change="updateMasterRemark(scope.row)">
<el-option v-for="item in requirementList" :key="item.requirementId" :label="item.title"
:value="item.requirementId" />
</el-select>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<el-table-column label="状态" prop="status" width="90" align="center">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-search" @click="showDetail(scope.row)">查看
</el-button>
<el-button size="mini" type="text" icon="el-icon-finished" v-if="scope.row.status === 0"
@click="handleIn(scope.row)">执行入库
</el-button>
<el-button size="mini" type="text" icon="el-icon-check" v-if="scope.row.status === 0"
@click="handComplete(scope.row)">完成
</el-button>
<el-button size="mini" type="text" icon="el-icon-download" @click="handleExport(scope.row)">导出
</el-button>
<el-button size="mini" type="text" icon="el-icon-remove" @click="handleDelete(scope.row)">删除
</el-button>
<el-tag :type="scope.row.status === 1 ? 'success' : 'warning'" size="mini">
{{ scope.row.status === 1 ? "已完成" : "未完成" }}
</el-tag>
</template>
</el-table-column>
<el-table-column label="备注" prop="remark" min-width="200">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" size="mini" placeholder="点击编辑"
@blur="updateMasterRemark(scope.row)" />
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="220" class-name="small-padding fixed-width">
<template slot-scope="scope">
<el-button size="mini" type="text" v-if="scope.row.status === 0"
@click="expandRow(scope.row)">执行入库</el-button>
<el-button size="mini" type="text" v-if="scope.row.status === 0"
@click="handComplete(scope.row)">完成</el-button>
<el-button size="mini" type="text" @click="handleExport(scope.row)">导出</el-button>
<el-button size="mini" type="text" style="color:#f56c6c" @click="handleDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -109,126 +156,12 @@
<pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@pagination="getList" />
<el-drawer size="70%" :title="parseTime(searchItem.signTime) + '-采购单'" :visible.sync="drawer">
<el-table v-loading="loading" :data="warehouseTaskList">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物料名" align="center" prop="name" />
<el-table-column label="采购数量" align="center" prop="taskInventory" />
<el-table-column label="单位" align="center" prop="unit" />
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="型号" align="center" prop="model" />
<el-table-column label="规格" align="center" prop="specifications" />
<el-table-column label="操作" align="center" prop="remark">
<template slot-scope="scope">
<el-button type="text" icon="el-icon-edit" @click="handleRemoveTask(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
</el-drawer>
<el-drawer size="70%" :title="parseTime(searchItem.signTime, '{y}_{m}_{d}') + '_采购单'"
:visible.sync="completeDrawer">
<!-- 工具栏 -->
<div style="display:flex;justify-content:space-between;margin-bottom:10px">
<!-- 模式切换 -->
<el-radio-group v-model="mode" size="mini">
<el-radio-button label="single">单个入库</el-radio-button>
<el-radio-button label="batch">批量操作</el-radio-button>
</el-radio-group>
</div>
<el-table v-loading="loading" :data="warehouseTaskList" ref="warehouseTable">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" type="index" />
<el-table-column label="物料名" align="center" prop="name" />
<el-table-column label="截止日期" align="center" prop="endTime">
<template slot-scope="scope" v-if="scope.row.endTime != null">
<template v-if="dayDiff(scope.row.endTime) > 3">
<!-- 超过 3 天，正常显示 -->
<span>{{ parseTime(scope.row.endTime, '{y}-{m}-{d}') }}</span>
</template><template v-else-if="dayDiff(scope.row.endTime) > 0">
<!-- 未来 1–3 天 -->
<el-tag type="warning" effect="plain">
剩余{{ dayDiff(scope.row.endTime) }}天
</el-tag>
</template><template v-else-if="dayDiff(scope.row.endTime) === 0">
<!-- 今天到期 -->
<el-tag type="danger" effect="plain">
<i class="el-icon-warning-outline"></i> 今日过期！
</el-tag>
</template><template v-else>
<!-- 已过期 -->
<el-tag type="danger" effect="plain">
逾期{{ Math.abs(dayDiff(scope.row.endTime)) }}天
</el-tag>
</template>
</template>
</el-table-column>
<el-table-column label="采购数量" align="center" prop="taskInventory" />
<el-table-column label="采购价格" align="center" prop="price">
<template slot-scope="scope">
<el-input v-model="scope.row.price" v-if="scope.row.taskStatus !== 2" type="number"></el-input>
<span v-else>
已经操作入库，录入价格请前往入库明细查看
</span>
</template>
</el-table-column>
<el-table-column label="品牌" align="center" prop="brand" />
<el-table-column label="规格" align="center" prop="specifications" />
<el-table-column label="备注" align="center" prop="remark">
<template slot-scope="scope">
<el-input v-model="scope.row.remark" size="mini" placeholder="请输入备注" :disabled="scope.row.taskStatus === 2"
@blur="updateRemark(scope.row)" />
</template>
</el-table-column>
<!-- ⇩⇩⇩ ③ 操作列（单行按钮） ⇩⇩⇩ -->
<!-- ★ 新增状态列 ★ -->
<el-table-column label="状态" prop="taskStatus" width="140" align="center">
<template slot-scope="scope">
<!-- 单个模式：可编辑 -->
<el-tag type="success" v-if="scope.row.taskStatus === 2">完成</el-tag>
<!-- 单个模式下可编辑，动态过滤选项 -->
<el-select v-else-if="mode === 'single'" v-model="scope.row.taskStatus" size="mini" placeholder="状态"
@change="handleUpdateTask(scope.row)">
<el-option v-for="s in filteredStatusOptions(scope.row)" :key="s.value" :value="s.value"
:label="s.label" />
</el-select>
<!-- 批量模式：只显示 -->
<span v-else>{{ statusLabel(scope.row.taskStatus) }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center">
<template slot-scope="scope">
<el-button size="mini" type="danger" v-if="scope.row.taskStatus !== 2"
@click="handleBatchDelete(scope.row)">删除</el-button>
</template>
</el-table-column>
</el-table>
<div style="display: flex; justify-content: flex-end; margin: 20px">
<!-- 批量模式下才显示 -->
<div v-if="mode === 'batch'">
<el-select v-model="batchStatus" size="mini" placeholder="选择批量状态">
<el-option v-for="s in statusOptions" :key="s.value" :value="s.value" :label="s.label" />
</el-select>
</div>
<el-button @click="submitComplete" v-if="mode === 'batch'" size="mini" type="success">执行入库</el-button>
<el-button @click="completeDrawer = false" size="mini">关闭</el-button>
</div>
</el-drawer>
</div>
</template>
<script>
import { listRequirements } from "@/api/oa/requirement";
import AddPurchaseDialog from "./components/AddPurchaseDialog.vue";
import {
addOaWarehouseMaster,
delOaWarehouseMaster, listOaWarehouseMaster,
@@ -246,8 +179,19 @@ import {
export default {
name: "OaOutWarehouse",
components: { AddPurchaseDialog },
data () {
return {
// 顶部状态筛选
statusFilter: 'all',
stat: { undone: 0, done: 0, urgent: 0 },
// 物料明细缓存（按 masterId）
itemsMap: {},
itemsLoading: {},
// 当前展开的行（单展开）
expandedKeys: [],
// 新建采购单 dialog
addDialogVisible: false,
completeDrawer: false,
mode: 'single',
batchStatus: null, // 批量入库时选择的状态
@@ -484,10 +428,84 @@ export default {
this.queryParams.endTime = '';
}
listOaWarehouseMaster(this.queryParams).then((res) => {
this.TaskList = res.rows;
this.total = res.total;
this.TaskList = res.rows || [];
this.total = res.total || 0;
this.loading = false;
// 重置已展开行的缓存
this.itemsMap = {};
});
this.refreshStat();
},
// 加急判定（备注里含「急」）
isUrgent (remark) {
return !!remark && remark.indexOf('急') !== -1
},
// 加急且未完成 → 行红底
rowClassName ({ row }) {
if (row.status !== 1 && this.isUrgent(row.remark)) return 'row-urgent'
return ''
},
// 拉总览数量（不分页快速 head 计数）
refreshStat () {
const base = { ...this.queryParams, pageNum: 1, pageSize: 1, status: undefined, remark: undefined };
Promise.all([
listOaWarehouseMaster({ ...base, status: 0 }),
listOaWarehouseMaster({ ...base, status: 1 }),
listOaWarehouseMaster({ ...base, remark: '急' })
]).then(([u, d, urg]) => {
this.stat.undone = u.total || 0
this.stat.done = d.total || 0
this.stat.urgent = urg.total || 0
})
},
// tab 切换
onStatusTabChange () {
// 重置过滤
this.queryParams.status = undefined
this.queryParams.remark = undefined
if (this.statusFilter === 'undone') {
this.queryParams.status = 0
} else if (this.statusFilter === 'done') {
this.queryParams.status = 1
} else if (this.statusFilter === 'urgent') {
this.queryParams.remark = '急'
}
this.queryParams.pageNum = 1
this.getList()
},
// 行展开：懒加载物料明细 + 同步 warehouseTaskList（兼容老方法）
onRowExpand (row, expanded) {
// 单展开：只保留当前
if (expanded && expanded.length) {
this.expandedKeys = [row.masterId]
} else {
this.expandedKeys = this.expandedKeys.filter(k => k !== row.masterId)
}
if (!expanded || !expanded.length) return
const id = row.masterId
this.currentMasterId = id
if (this.itemsMap[id]) {
this.warehouseTaskList = this.itemsMap[id]
return
}
this.$set(this.itemsLoading, id, true)
getOaWarehouseTaskByMasterId(id).then(res => {
const list = res.data || res.rows || []
this.$set(this.itemsMap, id, list)
this.warehouseTaskList = list
}).finally(() => {
this.$set(this.itemsLoading, id, false)
})
},
// 程序化展开（用于"执行入库"按钮）
expandRow (row) {
if (this.expandedKeys.includes(row.masterId)) {
this.expandedKeys = this.expandedKeys.filter(k => k !== row.masterId)
return
}
this.expandedKeys = [row.masterId]
// 触发数据加载
this.onRowExpand(row, [row.masterId])
},
// 取消按钮
cancel () {
@@ -639,3 +657,18 @@ export default {
},
};
</script>
<style lang="scss" scoped>
.add-purchase-btn.el-button {
position: absolute;
top: 12px;
right: 110px; /* 让出 right-toolbar 的位置 */
z-index: 3;
height: 24px;
line-height: 22px;
padding: 0 8px !important;
font-size: 11px !important;
border-radius: 4px;
i { font-size: 11px; margin-right: 2px; }
}
</style>