taoge_xiaodi/td_official
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

合并

Browse Source
This commit is contained in:
taoge1020
2025-08-25 20:05:34 +08:00
parent a7f9339eb8 239c989a26
commit ee2f5ec71e
10 changed files with 312 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

155
src/views/materials/batchPlan/index.vue
View File

@ -6,20 +6,44 @@
<el-card shadow="hover">
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" :offset="0"><el-button type="primary"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']" size="default" @click="handleAdd"
icon="FolderAdd" plain>新增</el-button></el-col>
<el-col :span="1.5" :offset="0"><el-button type="danger" size="default"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']" @click="handleDeleteBatch"
icon="FolderDelete" plain>删除</el-button></el-col>
<el-col :span="1.5" :offset="0"
><el-button
type="primary"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:add']"
size="default"
@click="handleAdd"
icon="FolderAdd"
plain
>新增</el-button
></el-col
>
<el-col :span="1.5" :offset="0"
><el-button
type="danger"
size="default"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:remove']"
@click="handleDeleteBatch"
:disabled="form.mrpBaseBo.status != 'draft'"
icon="FolderDelete"
plain
>删除</el-button
></el-col
>
</el-row>
</template>
<el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search"
clearable />
<el-tree ref="batchTreeRef" class="mt-2" node-key="id" :data="batchOptions"
:props="{ label: 'planCode', children: 'children' }" :expand-on-click-node="false" highlight-current
default-expand-all @node-click="handleNodeClick">
<el-input v-model="batchNumber" placeholder="请输入批次号" @input="searchBatchList" prefix-icon="Search" clearable />
<el-tree
ref="batchTreeRef"
class="mt-2"
node-key="id"
:data="batchOptions"
:props="{ label: 'planCode', children: 'children' }"
:expand-on-click-node="false"
highlight-current
default-expand-all
@node-click="handleNodeClick"
>
<template #default="{ node, data }">
<div class="custom-tree-node">
{{ node.label }}
@ -27,8 +51,14 @@
</div>
</template>
</el-tree>
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.batchData.pageNum"
v-model:limit="queryParams.batchData.pageSize" @pagination="getList" layout="prev, pager, next,jumper" />
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.batchData.pageNum"
v-model:limit="queryParams.batchData.pageSize"
@pagination="getList"
layout="prev, pager, next,jumper"
/>
</el-card>
</el-col>
<el-col :span="19">
@ -36,12 +66,14 @@
<template #header>
<el-row :gutter="10" class="mb8">
<el-col :span="1.5" v-if="form.mrpBaseBo.status == 'draft'">
<el-button type="primary" plain icon="Edit" @click="handleUpdata"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']">修改</el-button>
<el-button type="primary" plain icon="Edit" @click="handleUpdata" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:edit']"
>修改</el-button
>
</el-col>
<el-col :span="1.5">
<el-button plain type="warning" icon="Finished" @click="handleAudit()"
v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']">审核</el-button>
<el-button plain type="warning" icon="Finished" @click="handleAudit()" v-hasPermi="['cailiaoshebei:materialbatchdemandplan:query']"
>审核</el-button
>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@ -59,8 +91,13 @@
<el-table-column label="需求到货时间" align="center" prop="arrivalTime" width="250" />
<el-table-column label="备注" align="center" prop="remark" />
</el-table>
<pagination v-show="mainTotal > 0" :total="mainTotal" v-model:page="queryParams.mainData.pageNum"
v-model:limit="queryParams.mainData.pageSize" @pagination="getMainList" />
<pagination
v-show="mainTotal > 0"
:total="mainTotal"
v-model:page="queryParams.mainData.pageNum"
v-model:limit="queryParams.mainData.pageSize"
@pagination="getMainList"
/>
</el-card>
</el-col>
</el-row>
@ -77,8 +114,7 @@
</el-col>
<el-col :span="8" :offset="0">
<el-form-item label="编制日期" prop="mrpBaseBo.preparedDate">
<el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD"
placeholder="请选择编制日期" />
<el-date-picker v-model="form.mrpBaseBo.preparedDate" type="date" value-format="YYYY-MM-DD" placeholder="请选择编制日期" />
</el-form-item>
</el-col>
<el-col :span="8" :offset="0">
@ -91,20 +127,20 @@
<el-divider>主要信息</el-divider>
<el-table :data="form.planList">
<el-table-column prop="name" align="center" label="版本号 " width="150">
<template #default="scope">
<el-select v-model="scope.row.versions" placeholder="请选择"
@change="(val) => selectNameVersion(val, scope.row)">
<el-option v-for="item in versionList" :key="item.versions" :label="item.versions"
:value="item.versions" />
<el-select v-model="scope.row.versions" placeholder="请选择" @change="(val) => selectNameVersion(val, scope.row)">
<el-option v-for="item in versionList" :key="item.versions" :label="item.versions" :value="item.versions" />
</el-select>
</template>
</el-table-column>
<el-table-column prop="name" align="center" label="物资名称">
<template #default="scope">
<el-select :disabled="!scope.row.versions" v-model="scope.row.suppliespriceId" placeholder="请选择"
@change="(val) => selectName(val, scope.row)">
<el-select
:disabled="!scope.row.versions"
v-model="scope.row.suppliespriceId"
placeholder="请选择"
@change="(val) => selectName(val, scope.row)"
>
<el-option v-for="item in nameList" :key="item.id" :label="item.name" :value="item.id" />
</el-select>
</template>
@ -125,14 +161,16 @@
</template>
</el-table-column>
<el-table-column prop="qs" align="center" label="质量标准" width="150">
<template #header> <span class="text-red">*</span> 质量标准 </template>
<template #default="scope">
<el-input v-model="scope.row.qs" placeholder="请输入质量标准" />
</template>
</el-table-column>
<el-table-column prop="arrivalTime" align="center" label="需求到货时间">
<template #header> <span class="text-red">*</span> 需求到货时间 </template>
<template #default="scope">
<el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择"
style="width: 140px" />
<el-date-picker v-model="scope.row.arrivalTime" type="date" value-format="YYYY-MM-DD" placeholder="请选择" style="width: 140px" />
</template>
</el-table-column>
<el-table-column prop="remark" align="center" label="备注" width="150">
@ -165,8 +203,10 @@ import {
listBatch,
getBatch,
delBatch,
listSelectCailiaoshebei, obtainTheVersion,
getDictList, coryEngineeringList
listSelectCailiaoshebei,
obtainTheVersion,
getDictList,
coryEngineeringList
} from '@/api/materials/batchPlan';
import { CailiaoshebeiVO, CailiaoshebeiQuery, CailiaoshebeiForm } from '@/api/materials/batchPlan/types';
import { useUserStoreHook } from '@/store/modules/user';
@ -392,11 +432,11 @@ const handleUpdata = () => {
/** 提交数据 */
const submitTransferForm = async () => {
const result = validateAndClean(form.value.planList);
console.log('🚀 ~ submitTransferForm ~ form.value.planList:', form.value.planList);
if (!result.valid) {
proxy?.$modal.msgError('验证失败,主要信息存在部分字段缺失的数据项');
proxy?.$modal.msgError(result.message);
return;
}
cailiaoshebeiFormRef.value?.validate(async (valid: boolean) => {
if (valid) {
buttonLoading.value = true;
@ -408,7 +448,6 @@ const submitTransferForm = async () => {
}
});
};
/** 删除批次 */
const handleDeleteBatch = async () => {
const _ids = batchTreeRef.value.getCurrentNode()?.id;
@ -419,29 +458,49 @@ const handleDeleteBatch = async () => {
await getList();
};
//检测主要信息填写状况
function validateAndClean(arr) {
interface ValidateResult {
valid: boolean;
data: any[];
errors: { index: number; field: string; message: string }[];
}
function validateAndClean(arr: any[]) {
// 过滤掉全空的数据项
const cleanedArr = arr.filter((item) => !Object.values(item).every((v) => v === '' || v == null));
let hasFullItem = false; // 是否有一条全填数据
for (const item of cleanedArr) {
let hasFullItem = false; // 是否有至少一条全填数据
for (let idx = 0; idx < cleanedArr.length; idx++) {
const item = cleanedArr[idx];
const keys = Object.keys(item).filter((k) => k !== 'remark' && k !== 'id');
const allFilled = keys.every((k) => item[k] !== '' && item[k] != null);
if (allFilled) {
hasFullItem = true; // 有一条全填
}
const allEmpty = Object.values(item).every((v) => v === '' || v == null);
// 如果不是全填，也不是全空（部分填） → 直接返回失败
// 单独检查 qs 和 arrivalTime
if (!item.qs) {
return { valid: false, message: `第${idx + 1}行：质量标准不能为空`, data: cleanedArr };
}
if (!item.arrivalTime) {
return { valid: false, message: `第${idx + 1}行：需求到货时间不能为空`, data: cleanedArr };
}
// 检查其他字段是否部分填
if (!allFilled && !allEmpty) {
return { valid: false, data: cleanedArr };
return { valid: false, message: `第${idx + 1}行：主要信息存在部分字段缺失的数据项`, data: cleanedArr };
}
if (allFilled) {
hasFullItem = true;
}
}
// 如果没有至少一条全填，返回失败
// 检查是否至少有一条完整的数据
if (!hasFullItem) {
return { valid: false, data: cleanedArr };
return { valid: false, message: '至少需要一条完整的数据', data: cleanedArr };
}
return { valid: true, data: cleanedArr };
return { valid: true, message: '', data: cleanedArr };
}
/** 审核按钮操作 */

3
src/views/materials/purchaseDoc/index.vue
View File

@ -268,6 +268,7 @@ import { listContractor } from '@/api/project/contractor';
import { useUserStoreHook } from '@/store/modules/user';
import { getToken } from '@/utils/auth';
import logisticsDetail from './comm/logisticsDetail.vue';
import { FormRules } from 'element-plus';
const { proxy } = getCurrentInstance() as ComponentInternalInstance;
const route = useRoute();
const router = useRouter();
@ -349,7 +350,7 @@ const data = reactive({
status: undefined,
params: {}
},
rules: {
rules: <FormRules>{
id: [{ required: true, message: '主键ID不能为空', trigger: 'blur' }],
docCode: [{ required: true, message: '采购单编号不能为空', trigger: 'blur' }],
planId: [{ required: true, message: '需求计划不能为空', trigger: 'blur' }],