mirror of
https://gitee.com/ccnetcore/Yi
synced 2026-04-15 13:46:36 +08:00
采购单详情界面
This commit is contained in:
@@ -26,8 +26,20 @@ namespace Yi.Framework.ApiMicroservice.Controllers.ERP
|
||||
{
|
||||
var result = await _purchaseDetailsService.PageListAsync(input, page);
|
||||
return Result.Success().SetData(result);
|
||||
|
||||
|
||||
}
|
||||
|
||||
[HttpGet]
|
||||
[Route("{id}")]
|
||||
public async Task<Result> GetListByPurchaseId(long id)
|
||||
{
|
||||
var result = await _purchaseDetailsService.GetListByPurchaseIdAsync(id);
|
||||
return Result.Success().SetData(result);
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 单查
|
||||
/// </summary>
|
||||
|
||||
Binary file not shown.
@@ -18,5 +18,7 @@ namespace Yi.Framework.DtoModel.ERP.Purchase
|
||||
|
||||
public string SupplierName { get; set; } = string.Empty;
|
||||
public PurchaseStateEnum PurchaseState { get; set; }
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,6 +5,7 @@ using System.Linq;
|
||||
using System.Text;
|
||||
using System.Threading.Tasks;
|
||||
using Yi.Framework.Model.Base;
|
||||
using Yi.Framework.Model.ERP.Entitys;
|
||||
|
||||
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
|
||||
{
|
||||
@@ -16,5 +17,17 @@ namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
|
||||
public long TotalNumber { get; set; }
|
||||
public long CompleteNumber { get; set; }
|
||||
public string? Remarks { get; set; }
|
||||
|
||||
public long PurchaseId { get; set; }
|
||||
|
||||
}
|
||||
|
||||
public static class PurchaseDetailsCreateUpdateInputExtensions
|
||||
{
|
||||
public static List<PurchaseDetailsCreateUpdateInput> SetPurchaseId(this List<PurchaseDetailsCreateUpdateInput> purchaseDetailsEntities, long purchaseId)
|
||||
{
|
||||
purchaseDetailsEntities.ForEach(u => u.PurchaseId = purchaseId);
|
||||
return purchaseDetailsEntities;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,5 +12,7 @@ namespace Yi.Framework.Interface.ERP
|
||||
public interface IPurchaseDetailsService : ICrudAppService<PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>
|
||||
{
|
||||
Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page);
|
||||
|
||||
Task<List<PurchaseDetailsGetListOutput>> GetListByPurchaseIdAsync(long purchaseId);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -20,7 +20,7 @@ namespace Yi.Framework.Model.ERP.Entitys
|
||||
/// </summary>
|
||||
[JsonConverter(typeof(ValueToStringConverter))]
|
||||
[SugarColumn(IsPrimaryKey = true)]
|
||||
public long Id { get; set; }
|
||||
public long Id { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// 租户id
|
||||
@@ -35,28 +35,28 @@ namespace Yi.Framework.Model.ERP.Entitys
|
||||
/// <summary>
|
||||
/// 物料id
|
||||
/// </summary>
|
||||
public long MaterialId { get; set; }
|
||||
public long MaterialId { get; set; }
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 物料名称
|
||||
/// </summary>
|
||||
public string MaterialName { get; set; }=string.Empty;
|
||||
public string MaterialName { get; set; } = string.Empty;
|
||||
|
||||
/// <summary>
|
||||
/// 物料单位
|
||||
/// </summary>
|
||||
public string MaterialUnit { get; set; }=string.Empty ;
|
||||
public string MaterialUnit { get; set; } = string.Empty;
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 单价
|
||||
/// </summary>
|
||||
public float UnitPrice { get; set; }
|
||||
public float UnitPrice { get; set; }
|
||||
/// <summary>
|
||||
/// 总数量
|
||||
/// </summary>
|
||||
public long TotalNumber { get; set; }
|
||||
public long TotalNumber { get; set; }
|
||||
/// <summary>
|
||||
/// 已完成数量
|
||||
/// </summary>
|
||||
@@ -65,5 +65,9 @@ namespace Yi.Framework.Model.ERP.Entitys
|
||||
/// 备注
|
||||
/// </summary>
|
||||
public string? Remarks { get; set; }
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="NEST" Version="7.16.0" />
|
||||
<PackageReference Include="SqlSugarCore" Version="5.1.3.43-preview03" />
|
||||
<PackageReference Include="SqlSugarCore" Version="5.1.3.43-preview04" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
||||
@@ -16,6 +16,12 @@ namespace Yi.Framework.Service.ERP
|
||||
{
|
||||
public class PurchaseDetailsService : CrudAppService<PurchaseDetailsEntity, PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>, IPurchaseDetailsService
|
||||
{
|
||||
public async Task<List<PurchaseDetailsGetListOutput>> GetListByPurchaseIdAsync(long purchaseId)
|
||||
{
|
||||
var data= await Repository._DbQueryable.Where(u => u.PurchaseId == purchaseId).ToListAsync();
|
||||
return await MapToGetListOutputDtos(data);
|
||||
}
|
||||
|
||||
public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsGetListInput input, PageParModel page)
|
||||
{
|
||||
RefAsync<int> totalNumber = 0;
|
||||
|
||||
@@ -8,6 +8,7 @@ using System.Threading.Tasks;
|
||||
using Yi.Framework.Common.Attribute;
|
||||
using Yi.Framework.Common.Models;
|
||||
using Yi.Framework.DtoModel.ERP.Purchase;
|
||||
using Yi.Framework.DtoModel.ERP.PurchaseDetails;
|
||||
using Yi.Framework.Interface.ERP;
|
||||
using Yi.Framework.Model.Base;
|
||||
using Yi.Framework.Model.ERP.Entitys;
|
||||
@@ -49,7 +50,9 @@ namespace Yi.Framework.Service.ERP
|
||||
TryToSetTenantId(entity);
|
||||
var purchaseId = await Repository.InsertReturnSnowflakeIdAsync(entity);
|
||||
entity.Id = purchaseId;
|
||||
await _purchaseDetailsService.CreateAsync(input.PurchaseDetails);
|
||||
|
||||
|
||||
await _purchaseDetailsService.CreateAsync(input.PurchaseDetails.SetPurchaseId(purchaseId));
|
||||
uow.Commit();
|
||||
}
|
||||
return await MapToGetListOutputDtoAsync(entity); ;
|
||||
|
||||
@@ -1,4 +1,10 @@
|
||||
import request from '@/utils/request'
|
||||
export function getListByPurchaseId(id){
|
||||
return request({
|
||||
url: `/purchaseDetails/getListByPurchaseId/${id}`,
|
||||
method: 'get'
|
||||
})
|
||||
}
|
||||
|
||||
// 分页查询
|
||||
export function listData(query) {
|
||||
|
||||
@@ -1,18 +1,42 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="90px">
|
||||
<el-form
|
||||
:model="queryParams"
|
||||
ref="queryRef"
|
||||
:inline="true"
|
||||
v-show="showSearch"
|
||||
label-width="90px"
|
||||
>
|
||||
<el-form-item label="供应商名称" prop="name">
|
||||
<el-input v-model="queryParams.name" placeholder="请输入供应商名称" clearable style="width: 240px"
|
||||
@keyup.enter="handleQuery" prop="name" />
|
||||
<el-input
|
||||
v-model="queryParams.name"
|
||||
placeholder="请输入供应商名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter="handleQuery"
|
||||
prop="name"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="采购单编号" prop="code">
|
||||
<el-input v-model="queryParams.code" placeholder="请输入采购单编号" clearable style="width: 240px"
|
||||
@keyup.enter="handleQuery" prop="code" />
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入采购单编号"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter="handleQuery"
|
||||
prop="code"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="采购员" prop="buyer">
|
||||
<el-input v-model="queryParams.code" placeholder="请输入采购员" clearable style="width: 240px"
|
||||
@keyup.enter="handleQuery" prop="buyer" />
|
||||
<el-input
|
||||
v-model="queryParams.code"
|
||||
placeholder="请输入采购员"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter="handleQuery"
|
||||
prop="buyer"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="状态" prop="isDeleted">
|
||||
<el-select
|
||||
@@ -40,49 +64,126 @@
|
||||
></el-date-picker>
|
||||
</el-form-item> -->
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery"
|
||||
>搜索</el-button
|
||||
>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['erp:purchase:add']">新增</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
@click="handleAdd"
|
||||
v-hasPermi="['erp:purchase:add']"
|
||||
>新增</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
|
||||
v-hasPermi="['erp:purchase:edit']">修改</el-button>
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
v-hasPermi="['erp:purchase:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
|
||||
v-hasPermi="['erp:purchase:remove']">删除</el-button>
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
v-hasPermi="['erp:purchase:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button type="warning" plain icon="Download" @click="handleExport"
|
||||
v-hasPermi="['erp:purchase:export']">导出</el-button>
|
||||
<el-button
|
||||
type="warning"
|
||||
plain
|
||||
icon="Download"
|
||||
@click="handleExport"
|
||||
v-hasPermi="['erp:purchase:export']"
|
||||
>导出</el-button
|
||||
>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
<right-toolbar
|
||||
v-model:showSearch="showSearch"
|
||||
@queryTable="getList"
|
||||
></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
:data="dataList"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
|
||||
<!-----------------------这里开始就是数据表单的全部列------------------------>
|
||||
<el-table-column label="采购单号" align="center" prop="code" />
|
||||
|
||||
<el-table-column label="供应商" align="center" prop="supplierName" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="供应商"
|
||||
align="center"
|
||||
prop="supplierName"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="需求时间" align="center" prop="needTime" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="需求时间"
|
||||
align="center"
|
||||
prop="needTime"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="采购员" align="center" prop="buyer" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="采购员"
|
||||
align="center"
|
||||
prop="buyer"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="总共金额" align="center" prop="totalMoney" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="总共金额"
|
||||
align="center"
|
||||
prop="totalMoney"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="已支付金额" align="center" prop="paidMoney" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="已支付金额"
|
||||
align="center"
|
||||
prop="paidMoney"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
|
||||
<el-table-column label="采购状态" align="center" prop="purchaseState" :show-overflow-tooltip="true" />
|
||||
<el-table-column
|
||||
label="采购状态"
|
||||
align="center"
|
||||
prop="purchaseState"
|
||||
:show-overflow-tooltip="true"
|
||||
>
|
||||
|
||||
<template #default="scope">
|
||||
<el-tag>{{purchaseStateComputed(scope.row.purchaseState)}}</el-tag>
|
||||
</template>
|
||||
|
||||
<el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true" />
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column
|
||||
label="备注"
|
||||
align="center"
|
||||
prop="remarks"
|
||||
:show-overflow-tooltip="true"
|
||||
/>
|
||||
<!-- <el-table-column label="状态" align="center" prop="isDeleted">
|
||||
<template #default="scope">
|
||||
<dict-tag
|
||||
@@ -107,24 +208,53 @@
|
||||
<span>{{ parseTime(scope.row.createTime) }}</span>
|
||||
</template>
|
||||
</el-table-column> -->
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
|
||||
<el-table-column
|
||||
label="操作"
|
||||
align="center"
|
||||
class-name="small-padding fixed-width"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['business:article:edit']">查看</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
icon="Edit"
|
||||
@click="handleGet(scope.row)"
|
||||
v-hasPermi="['erp:purchase:edit']"
|
||||
>查看</el-button
|
||||
>
|
||||
|
||||
<el-button type="text" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['business:article:edit']">修改</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
icon="Edit"
|
||||
@click="handleUpdate(scope.row)"
|
||||
v-hasPermi="['erp:purchase:edit']"
|
||||
>修改</el-button
|
||||
>
|
||||
|
||||
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:article:remove']">结束</el-button>
|
||||
<el-button type="text" icon="Delete" @click="handleDelete(scope.row)"
|
||||
v-hasPermi="['business:article:remove']">删除</el-button>
|
||||
<el-button
|
||||
type="text"
|
||||
icon="Delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['erp:purchase:remove']"
|
||||
>结束</el-button
|
||||
>
|
||||
<el-button
|
||||
type="text"
|
||||
icon="Delete"
|
||||
@click="handleDelete(scope.row)"
|
||||
v-hasPermi="['erp:purchase:remove']"
|
||||
>删除</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
|
||||
<pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize" @pagination="getList" />
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
<!-- ---------------------这里是新增和更新的对话框--------------------- -->
|
||||
<el-dialog :title="title" v-model="open" width="1200px" append-to-body>
|
||||
@@ -138,81 +268,100 @@
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="供应商" prop="supplierName">
|
||||
<el-select v-model="form.supplierId" filterable placeholder="请选择供应商">
|
||||
<el-option
|
||||
v-for="item in supplierList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
<el-select
|
||||
v-model="form.supplierId"
|
||||
filterable
|
||||
placeholder="请选择供应商"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in supplierList"
|
||||
:key="item.id"
|
||||
:label="item.name"
|
||||
:value="item.id"
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="采购单员" prop="buyer">
|
||||
<el-input v-model="form.buyer" placeholder="请输入采购单员" /> </el-form-item>
|
||||
<el-input v-model="form.buyer" placeholder="请输入采购单员" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :span="8">
|
||||
<el-form-item label="需求时间" prop="needTime">
|
||||
<el-date-picker
|
||||
v-model="form.needTime"
|
||||
type="date"
|
||||
placeholder="选择一个日期"
|
||||
size="default"
|
||||
/>
|
||||
v-model="form.needTime"
|
||||
type="date"
|
||||
placeholder="选择一个日期"
|
||||
size="default"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
<el-col :offset="8" :span="8">
|
||||
<el-form-item label="总金额">
|
||||
{{showTotalMoney}}
|
||||
{{ showTotalMoney }}
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
|
||||
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="物料信息">
|
||||
<el-table :data="form.purchaseDetails" border style="width: 100%">
|
||||
|
||||
<el-table-column width="90">
|
||||
<el-table-column width="90">
|
||||
<template #default="scope">
|
||||
<el-button @click="delMaterialRow(scope.$index)" icon="Delete" type="danger" size="small">删除</el-button>
|
||||
<el-button
|
||||
@click="delMaterialRow(scope.$index)"
|
||||
icon="Delete"
|
||||
type="danger"
|
||||
size="small"
|
||||
>删除</el-button
|
||||
>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column type="index" label="序号" width="60" />
|
||||
<el-table-column prop="materialName" label="物料" width="180" />
|
||||
<el-table-column prop="materialUnit" label="单位" width="180" />
|
||||
<el-table-column prop="unitPrice" label="单价" width="180" >
|
||||
<template #default="scope">
|
||||
<el-input
|
||||
|
||||
v-model="scope.row.unitPrice"/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="totalNumber" label="采购数量" width="180" >
|
||||
<el-table-column prop="unitPrice" label="单价" width="180">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.totalNumber"/>
|
||||
</template>
|
||||
|
||||
<el-input v-model="scope.row.unitPrice" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remarks" label="备注" >
|
||||
<el-table-column
|
||||
prop="totalNumber"
|
||||
label="采购数量"
|
||||
width="180"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-input
|
||||
|
||||
v-model="scope.row.remarks"/>
|
||||
</template>
|
||||
<el-input v-model="scope.row.totalNumber" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remarks" label="备注">
|
||||
<template #default="scope">
|
||||
<el-input v-model="scope.row.remarks" />
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-button class="form-add-btn" type="primary" icon="CirclePlus" plain @click="materialHandleAdd">添加物料</el-button>
|
||||
<el-button
|
||||
class="form-add-btn"
|
||||
type="primary"
|
||||
icon="CirclePlus"
|
||||
plain
|
||||
@click="materialHandleAdd"
|
||||
>添加物料</el-button
|
||||
>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="备注" prop="remarks">
|
||||
<el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" :rows="5"></el-input>
|
||||
<el-input
|
||||
v-model="form.remarks"
|
||||
type="textarea"
|
||||
placeholder="请输入内容"
|
||||
:rows="5"
|
||||
></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
@@ -224,42 +373,137 @@
|
||||
</el-dialog>
|
||||
|
||||
<!-- ---------------------这里是新增物料的对话框--------------------- -->
|
||||
<el-dialog title="添加物料" v-model="openMaterial" width="800px" append-to-body>
|
||||
<el-form :model="queryMaterialParams" ref="queryMaterialRef" :inline="true" label-width="70px">
|
||||
<el-form-item label="物料名称" prop="name">
|
||||
<el-input v-model="queryMaterialParams.name" placeholder="请输入物料名称" clearable style="width: 150px"
|
||||
@keyup.enter="handleMaterialQuery" prop="name" />
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码" prop="code">
|
||||
<el-input v-model="queryMaterialParams.code" placeholder="请输入物料编码" clearable style="width: 150px"
|
||||
@keyup.enter="handleMaterialQuery" prop="code" />
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleMaterialQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetMaterialQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
<!-- 物料表单 -->
|
||||
<el-table
|
||||
style="width: 100%"
|
||||
:data="materialList"
|
||||
@selection-change="materialHandleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column property="code" label="物料编码" />
|
||||
<el-table-column property="name" label="物料信息" />
|
||||
<el-table-column property="unitName" label="物料单位" />
|
||||
|
||||
</el-table>
|
||||
<pagination v-show="materialTotal > 0" :total="materialTotal" v-model:page="queryMaterialParams.pageNum"
|
||||
v-model:limit="queryMaterialParams.pageSize" @pagination="getMaterialList" />
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<el-dialog
|
||||
title="添加物料"
|
||||
v-model="openMaterial"
|
||||
width="800px"
|
||||
append-to-body
|
||||
>
|
||||
<el-form
|
||||
:model="queryMaterialParams"
|
||||
ref="queryMaterialRef"
|
||||
:inline="true"
|
||||
label-width="70px"
|
||||
>
|
||||
<el-form-item label="物料名称" prop="name">
|
||||
<el-input
|
||||
v-model="queryMaterialParams.name"
|
||||
placeholder="请输入物料名称"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
@keyup.enter="handleMaterialQuery"
|
||||
prop="name"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料编码" prop="code">
|
||||
<el-input
|
||||
v-model="queryMaterialParams.code"
|
||||
placeholder="请输入物料编码"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
@keyup.enter="handleMaterialQuery"
|
||||
prop="code"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleMaterialQuery"
|
||||
>搜索</el-button
|
||||
>
|
||||
<el-button icon="Refresh" @click="resetMaterialQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
<!-- 物料表单 -->
|
||||
<el-table
|
||||
style="width: 100%"
|
||||
:data="materialList"
|
||||
@selection-change="materialHandleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="55" />
|
||||
<el-table-column property="code" label="物料编码" />
|
||||
<el-table-column property="name" label="物料信息" />
|
||||
<el-table-column property="unitName" label="物料单位" />
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="materialTotal > 0"
|
||||
:total="materialTotal"
|
||||
v-model:page="queryMaterialParams.pageNum"
|
||||
v-model:limit="queryMaterialParams.pageSize"
|
||||
@pagination="getMaterialList"
|
||||
/>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" @click="submitMaterialForm">确 定</el-button>
|
||||
<el-button type="primary" @click="submitMaterialForm"
|
||||
>确 定</el-button
|
||||
>
|
||||
<el-button @click="materialCancel">取 消</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
|
||||
<!-- ---------------------这里是采购订单详情对话框--------------------- -->
|
||||
<el-dialog
|
||||
title="订单详情"
|
||||
v-model="openDetails"
|
||||
width="1200px"
|
||||
append-to-body
|
||||
>
|
||||
<el-form
|
||||
ref="dataDetailsRef"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="8">
|
||||
<el-form-item label="物料" prop="code">
|
||||
<el-input placeholder="请输入物料" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="8">
|
||||
<el-form-item label="创建时间" style="width: 308px">
|
||||
<el-date-picker
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-row>
|
||||
<el-col :span="24">
|
||||
<el-form-item label="物料信息">
|
||||
<el-table :data="form.purchaseDetails" border style="width: 100%" >
|
||||
<el-table-column type="index" label="序号" width="60" align="center" />
|
||||
<el-table-column prop="materialName" label="物料" width="180" align="center" />
|
||||
<el-table-column prop="materialUnit" label="单位" width="180" align="center" />
|
||||
<el-table-column prop="unitPrice" label="单价" width="180" align="center">
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="totalNumber"
|
||||
label="采购数量"
|
||||
width="180"
|
||||
align="center"
|
||||
>
|
||||
</el-table-column>
|
||||
<el-table-column prop="remarks" label="备注" >
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
<el-form-item label="备注" prop="remarks">
|
||||
{{ form.remarks }}
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<template #footer>
|
||||
<div class="dialog-footer">
|
||||
<el-button type="primary" @click="submitForm">确 定</el-button>
|
||||
<el-button @click="cancel">取 消</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@@ -271,27 +515,26 @@ import {
|
||||
addData,
|
||||
updateData,
|
||||
} from "@/api/erp/purchaseApi";
|
||||
import
|
||||
{
|
||||
allData as supplierlAllData
|
||||
} from "@/api/erp/supplierApi";
|
||||
import {
|
||||
listData as materialListData
|
||||
} from "@/api/erp/materialApi";
|
||||
import { allData as supplierlAllData } from "@/api/erp/supplierApi";
|
||||
import { listData as materialListData } from "@/api/erp/materialApi";
|
||||
import { getListByPurchaseId } from "@/api/erp/purchaseDetailsApi";
|
||||
|
||||
import { ref } from "@vue/reactivity";
|
||||
import { computed } from "@vue/runtime-core";
|
||||
const { proxy } = getCurrentInstance();
|
||||
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
|
||||
|
||||
//详情物料对话框
|
||||
const openDetails = ref(false);
|
||||
|
||||
//添加物料对话框
|
||||
const openMaterial=ref(false);
|
||||
const materialList= ref([]);
|
||||
const openMaterial = ref(false);
|
||||
const materialList = ref([]);
|
||||
const materialTotal = ref(0);
|
||||
const materialMultipleSelection=ref([]);
|
||||
const materialMultipleSelection = ref([]);
|
||||
|
||||
//选择框供应商
|
||||
const supplierList=ref([]);
|
||||
|
||||
const supplierList = ref([]);
|
||||
|
||||
const dataList = ref([]);
|
||||
const open = ref(false);
|
||||
@@ -305,9 +548,9 @@ const title = ref("");
|
||||
const dateRange = ref([]);
|
||||
const data = reactive({
|
||||
form: {
|
||||
supplierId:undefined,
|
||||
totalMoney:0,
|
||||
purchaseDetails:[]
|
||||
supplierId: undefined,
|
||||
totalMoney: 0,
|
||||
purchaseDetails: [],
|
||||
},
|
||||
queryParams: {
|
||||
pageNum: 1,
|
||||
@@ -316,7 +559,7 @@ const data = reactive({
|
||||
code: undefined,
|
||||
buyer: undefined,
|
||||
},
|
||||
queryMaterialParams:{
|
||||
queryMaterialParams: {
|
||||
pageNum: 1,
|
||||
pageSize: 10,
|
||||
name: undefined,
|
||||
@@ -328,7 +571,7 @@ const data = reactive({
|
||||
},
|
||||
});
|
||||
|
||||
const { queryParams, form, queryMaterialParams,rules } = toRefs(data);
|
||||
const { queryParams, form, queryMaterialParams, rules } = toRefs(data);
|
||||
/** 查询列表 */
|
||||
function getList() {
|
||||
loading.value = true;
|
||||
@@ -416,107 +659,108 @@ function handleDelete(row) {
|
||||
getList();
|
||||
proxy.$modal.msgSuccess("删除成功");
|
||||
})
|
||||
.catch(() => { });
|
||||
.catch(() => {});
|
||||
}
|
||||
/** 导出按钮操作 */
|
||||
function handleExport() { }
|
||||
|
||||
function handleExport() {}
|
||||
|
||||
/** 查看详情 */
|
||||
function handleGet(row) {
|
||||
getListByPurchaseId(row.id).then((response) => {
|
||||
form.value.purchaseDetails = response.data;
|
||||
});
|
||||
openDetails.value = true;
|
||||
}
|
||||
|
||||
//-------------这里开始是物料对话框的数据-----------
|
||||
/** 物料查询列表 */
|
||||
function getMaterialList() {
|
||||
materialListData(proxy.addDateRange(queryMaterialParams.value, dateRange.value)).then(
|
||||
(response) => {
|
||||
materialList.value = response.data.data;
|
||||
materialTotal.value = response.data.total;
|
||||
}
|
||||
);
|
||||
materialListData(
|
||||
proxy.addDateRange(queryMaterialParams.value, dateRange.value)
|
||||
).then((response) => {
|
||||
materialList.value = response.data.data;
|
||||
materialTotal.value = response.data.total;
|
||||
});
|
||||
}
|
||||
/** 表单改变选择 */
|
||||
function materialHandleSelectionChange(select)
|
||||
{
|
||||
materialMultipleSelection.value=select
|
||||
function materialHandleSelectionChange(select) {
|
||||
materialMultipleSelection.value = select;
|
||||
}
|
||||
/** 打开对话框 */
|
||||
function materialHandleAdd()
|
||||
{
|
||||
function materialHandleAdd() {
|
||||
getMaterialList();
|
||||
openMaterial.value=true;
|
||||
openMaterial.value = true;
|
||||
}
|
||||
/** 搜索 */
|
||||
function handleMaterialQuery()
|
||||
{
|
||||
function handleMaterialQuery() {
|
||||
getMaterialList();
|
||||
}
|
||||
/**重置表单 */
|
||||
function resetMaterialQuery()
|
||||
{
|
||||
function resetMaterialQuery() {
|
||||
proxy.resetForm("queryMaterialRef");
|
||||
handleMaterialQuery();
|
||||
}
|
||||
/** 提交物料表单 */
|
||||
function submitMaterialForm()
|
||||
{
|
||||
if(materialMultipleSelection.value.length>0)
|
||||
{
|
||||
const purchaseDetailsList= materialMultipleSelection.value.map(u=>{
|
||||
return {materialName:u.name,materialUnit:u.unitName}
|
||||
})
|
||||
|
||||
form.value.purchaseDetails.push(...purchaseDetailsList)
|
||||
materialCancel()
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
proxy.$modal.msgError("请选择至少一个物料");
|
||||
}
|
||||
|
||||
function submitMaterialForm() {
|
||||
if (materialMultipleSelection.value.length > 0) {
|
||||
const purchaseDetailsList = materialMultipleSelection.value.map((u) => {
|
||||
return { materialName: u.name, materialUnit: u.unitName };
|
||||
});
|
||||
|
||||
form.value.purchaseDetails.push(...purchaseDetailsList);
|
||||
materialCancel();
|
||||
} else {
|
||||
proxy.$modal.msgError("请选择至少一个物料");
|
||||
}
|
||||
}
|
||||
/** 取消对话框 */
|
||||
function materialCancel()
|
||||
{
|
||||
openMaterial.value=false
|
||||
function materialCancel() {
|
||||
openMaterial.value = false;
|
||||
}
|
||||
|
||||
/** 删除物料行 */
|
||||
function delMaterialRow(index)
|
||||
{
|
||||
|
||||
form.value.purchaseDetails.splice(index, 1);
|
||||
function delMaterialRow(index) {
|
||||
form.value.purchaseDetails.splice(index, 1);
|
||||
}
|
||||
// watch(data.form, (newValue, oldValue) => {
|
||||
// console.log(newValue.purchaseDetails,999)
|
||||
// }
|
||||
// , { immdiate: true })
|
||||
/** 计算属性:实时计算展示的价格 */
|
||||
const showTotalMoney =computed(()=>{
|
||||
let res=0;
|
||||
form.value.purchaseDetails.forEach(details => {
|
||||
if(details.unitPrice!=undefined && details.totalNumber!=undefined)
|
||||
{res+= details.unitPrice*details.totalNumber}
|
||||
});
|
||||
return res;
|
||||
})
|
||||
const showTotalMoney = computed(() => {
|
||||
let res = 0;
|
||||
form.value.purchaseDetails.forEach((details) => {
|
||||
if (details.unitPrice != undefined && details.totalNumber != undefined) {
|
||||
res += details.unitPrice * details.totalNumber;
|
||||
}
|
||||
});
|
||||
return res;
|
||||
});
|
||||
|
||||
const purchaseStateEnum=[
|
||||
|
||||
{key:"build",name:"新建"},
|
||||
{key:"run",name:"进行中"},
|
||||
{key:"complete",name:"已完成"},
|
||||
{key:"end",name:"已结束"},
|
||||
]
|
||||
/** 计算属性:采购订单状态 */
|
||||
const purchaseStateComputed= computed(()=>
|
||||
(purchaseState) => {
|
||||
return purchaseStateEnum[purchaseState].name
|
||||
});
|
||||
//-------------这里开始是供货商的数据-----------
|
||||
/** 供货商查询列表 */
|
||||
function getSupplierList() {
|
||||
supplierlAllData().then(
|
||||
(response) => {
|
||||
supplierList.value = response.data;
|
||||
}
|
||||
);
|
||||
supplierlAllData().then((response) => {
|
||||
supplierList.value = response.data;
|
||||
});
|
||||
}
|
||||
getList();
|
||||
getSupplierList();
|
||||
</script>
|
||||
<style scoped>
|
||||
.form-add-btn{
|
||||
|
||||
.form-add-btn {
|
||||
width: 100%;
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user