xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

采购订单搭建

Browse Source
This commit is contained in:
陈淳
2023-01-04 18:16:56 +08:00
parent e8e6b928cf
commit e03e584684
25 changed files with 918 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

68
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Config/SwaggerDoc.xml
View File

@@ -215,6 +215,74 @@
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseController.PageList(Yi.Framework.DtoModel.ERP.Purchase.PurchaseCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseController.GetById(System.Int64)">
<summary>
单查
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseController.Create(Yi.Framework.DtoModel.ERP.Purchase.PurchaseCreateUpdateInput)">
<summary>
增
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseController.Update(System.Int64,Yi.Framework.DtoModel.ERP.Purchase.PurchaseCreateUpdateInput)">
<summary>
更
</summary>
<param name="id"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseController.Del(System.Collections.Generic.List{System.Int64})">
<summary>
删
</summary>
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.PageList(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.GetById(System.Int64)">
<summary>
单查
</summary>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.Create(Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsCreateUpdateInput)">
<summary>
增
</summary>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.Update(System.Int64,Yi.Framework.DtoModel.ERP.PurchaseDetails.PurchaseDetailsCreateUpdateInput)">
<summary>
更
</summary>
<param name="id"></param>
<param name="input"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.PurchaseDetailsController.Del(System.Collections.Generic.List{System.Int64})">
<summary>
删
</summary>
<param name="ids"></param>
<returns></returns>
</member>
<member name="M:Yi.Framework.ApiMicroservice.Controllers.ERP.SupplierController.PageList(Yi.Framework.DtoModel.ERP.Supplier.SupplierCreateUpdateInput,Yi.Framework.Common.Models.PageParModel)">
<summary>
分页查

81
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseController.cs Normal file
View File

@@ -0,0 +1,81 @@
using Microsoft.AspNetCore.Mvc;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.Purchase;
using Yi.Framework.Interface.ERP;
namespace Yi.Framework.ApiMicroservice.Controllers.ERP
{
[ApiController]
[Route("api/[controller]/[action]")]
public class PurchaseController : ControllerBase
{
private readonly ILogger<PurchaseController> _logger;
private readonly IPurchaseService _purchaseService;
public PurchaseController(ILogger<PurchaseController> logger, IPurchaseService purchaseService)
{
_logger = logger;
_purchaseService = purchaseService;
}
/// <summary>
/// 分页查
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] PurchaseCreateUpdateInput input, [FromQuery] PageParModel page)
{
var result = await _purchaseService.PageListAsync(input, page);
return Result.Success().SetData(result);
}
/// <summary>
/// 单查
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
public async Task<Result> GetById(long id)
{
var result = await _purchaseService.GetByIdAsync(id);
return Result.Success().SetData(result);
}
/// <summary>
/// 增
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task<Result> Create(PurchaseCreateUpdateInput input)
{
var result = await _purchaseService.CreateAsync(input);
return Result.Success().SetData(result);
}
/// <summary>
/// 更
/// </summary>
/// <param name="id"></param>
/// <param name="input"></param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public async Task<Result> Update(long id, PurchaseCreateUpdateInput input)
{
var result = await _purchaseService.UpdateAsync(id, input);
return Result.Success().SetData(result);
}
/// <summary>
/// 删
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
[HttpDelete]
public async Task<Result> Del(List<long> ids)
{
await _purchaseService.DeleteAsync(ids);
return Result.Success();
}
}
}

81
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/Controllers/ERP/PurchaseDetailsController.cs Normal file
View File

@@ -0,0 +1,81 @@
using Microsoft.AspNetCore.Mvc;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.PurchaseDetails;
using Yi.Framework.Interface.ERP;
namespace Yi.Framework.ApiMicroservice.Controllers.ERP
{
[ApiController]
[Route("api/[controller]/[action]")]
public class PurchaseDetailsController : ControllerBase
{
private readonly ILogger<PurchaseDetailsController> _logger;
private readonly IPurchaseDetailsService _purchaseDetailsService;
public PurchaseDetailsController(ILogger<PurchaseDetailsController> logger, IPurchaseDetailsService purchaseDetailsService)
{
_logger = logger;
_purchaseDetailsService = purchaseDetailsService;
}
/// <summary>
/// 分页查
/// </summary>
/// <returns></returns>
[HttpGet]
public async Task<Result> PageList([FromQuery] PurchaseDetailsCreateUpdateInput input, [FromQuery] PageParModel page)
{
var result = await _purchaseDetailsService.PageListAsync(input, page);
return Result.Success().SetData(result);
}
/// <summary>
/// 单查
/// </summary>
/// <returns></returns>
[HttpGet]
[Route("{id}")]
public async Task<Result> GetById(long id)
{
var result = await _purchaseDetailsService.GetByIdAsync(id);
return Result.Success().SetData(result);
}
/// <summary>
/// 增
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
public async Task<Result> Create(PurchaseDetailsCreateUpdateInput input)
{
var result = await _purchaseDetailsService.CreateAsync(input);
return Result.Success().SetData(result);
}
/// <summary>
/// 更
/// </summary>
/// <param name="id"></param>
/// <param name="input"></param>
/// <returns></returns>
[HttpPut]
[Route("{id}")]
public async Task<Result> Update(long id, PurchaseDetailsCreateUpdateInput input)
{
var result = await _purchaseDetailsService.UpdateAsync(id, input);
return Result.Success().SetData(result);
}
/// <summary>
/// 删
/// </summary>
/// <param name="ids"></param>
/// <returns></returns>
[HttpDelete]
public async Task<Result> Del(List<long> ids)
{
await _purchaseDetailsService.DeleteAsync(ids);
return Result.Success();
}
}
}

BIN
Yi.Framework.Net6/Yi.Framework.ApiMicroservice/yi-sqlsugar-dev.db
View File

Binary file not shown.

12
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/ConstConfig/PurchaseConst.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.DtoModel.ERP.Purchase.ConstConfig
{
public class PurchaseConst
{
}
}

20
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/MapperConfig/PurchaseProfile.cs Normal file
View File

@@ -0,0 +1,20 @@
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.ERP.Entitys;
namespace Yi.Framework.DtoModel.ERP.Purchase.MapperConfig
{
public class SuppliERProfile:Profile
{
public SuppliERProfile()
{
CreateMap<PurchaseCreateUpdateInput, PurchaseEntity>();
CreateMap<PurchaseEntity, PurchaseGetListOutput>();
}
}
}

21
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseCreateUpdateInput.cs Normal file
View File

@@ -0,0 +1,21 @@
using SqlSugar;
using System;
using System.Collections.Generic;
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.Purchase
{
public class PurchaseCreateUpdateInput : EntityDto<long>
{
public string Code { get; set; }
public DateTime NeedTime { get; set; }
public string Buyer { get; set; }
public long TotalMoney { get; set; }
public long PaidMoney { get; set; }
public PurchaseStateEnum PurchaseState { get; set; }
}
}

20
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/Purchase/PurchaseGetListOutput.cs Normal file
View File

@@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
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.Purchase
{
public class PurchaseGetListOutput: EntityDto<long>
{
public string Code { get; set; }
public DateTime NeedTime { get; set; }
public string Buyer { get; set; }
public long TotalMoney { get; set; }
public long PaidMoney { get; set; }
public PurchaseStateEnum PurchaseState { get; set; }
}
}

12
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/ConstConfig/PurchaseDetailsConst.cs Normal file
View File

@@ -0,0 +1,12 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails.ConstConfig
{
public class PurchaseDetailsConst
{
}
}

20
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/MapperConfig/PurchaseDetailsProfile.cs Normal file
View File

@@ -0,0 +1,20 @@
using AutoMapper;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.ERP.Entitys;
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails.MapperConfig
{
public class SuppliERProfile:Profile
{
public SuppliERProfile()
{
CreateMap<PurchaseDetailsCreateUpdateInput, PurchaseDetailsEntity>();
CreateMap<PurchaseDetailsEntity, PurchaseDetailsGetListOutput>();
}
}
}

19
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsCreateUpdateInput.cs Normal file
View File

@@ -0,0 +1,19 @@
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
{
public class PurchaseDetailsCreateUpdateInput : EntityDto<long>
{
public string MaterialUnit { get; set; }
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long CompleteNumber { get; set; }
public string Remarks { get; set; }
}
}

18
Yi.Framework.Net6/Yi.Framework.DTOModel/ERP/PurchaseDetails/PurchaseDetailsGetListOutput.cs Normal file
View File

@@ -0,0 +1,18 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Model.Base;
namespace Yi.Framework.DtoModel.ERP.PurchaseDetails
{
public class PurchaseDetailsGetListOutput: EntityDto<long>
{
public string MaterialUnit { get; set; }
public float UnitPrice { get; set; }
public long TotalNumber { get; set; }
public long CompleteNumber { get; set; }
public string Remarks { get; set; }
}
}

16
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseDetailsService.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.PurchaseDetails;
using Yi.Framework.Interface.Base.Crud;
namespace Yi.Framework.Interface.ERP
{
public interface IPurchaseDetailsService : ICrudAppService<PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>
{
Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page);
}
}

16
Yi.Framework.Net6/Yi.Framework.Interface/ERP/IPurchaseService.cs Normal file
View File

@@ -0,0 +1,16 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.Purchase;
using Yi.Framework.Interface.Base.Crud;
namespace Yi.Framework.Interface.ERP
{
public interface IPurchaseService : ICrudAppService<PurchaseGetListOutput, long, PurchaseCreateUpdateInput>
{
Task<PageModel<List<PurchaseGetListOutput>>> PageListAsync(PurchaseCreateUpdateInput input, PageParModel page);
}
}

7
Yi.Framework.Net6/Yi.Framework.Model/ERP/Entitys/PurchaseDetailsEntity.cs
View File

@@ -37,10 +37,15 @@ namespace Yi.Framework.Model.ERP.Entitys
/// </summary>
public long MaterialId { get; set; }
/// <summary>
/// 物料单位
/// </summary>
public string MaterialUnit { get; set; }
/// <summary>
/// 单价
/// </summary>
public float UnitPrice { get; set; }
/// <summary>
/// 总数量

32
Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseDetailsService.cs Normal file
View File

@@ -0,0 +1,32 @@
using AutoMapper;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.PurchaseDetails;
using Yi.Framework.Interface.ERP;
using Yi.Framework.Model.ERP.Entitys;
using Yi.Framework.Repository;
using Yi.Framework.Service.Base.Crud;
namespace Yi.Framework.Service.ERP
{
public class PurchaseDetailsService : CrudAppService<PurchaseDetailsEntity, PurchaseDetailsGetListOutput, long, PurchaseDetailsCreateUpdateInput>, IPurchaseDetailsService
{
public PurchaseDetailsService(IRepository<PurchaseDetailsEntity> repository, IMapper mapper) : base(repository, mapper)
{
}
public async Task<PageModel<List<PurchaseDetailsGetListOutput>>> PageListAsync(PurchaseDetailsCreateUpdateInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable
//.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code))
//.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name))
.ToPageListAsync(page.PageNum, page.PageSize, totalNumber);
return new PageModel<List<PurchaseDetailsGetListOutput>> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) };
}
}
}

32
Yi.Framework.Net6/Yi.Framework.Service/ERP/PurchaseService.cs Normal file
View File

@@ -0,0 +1,32 @@
using AutoMapper;
using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Common.Models;
using Yi.Framework.DtoModel.ERP.Purchase;
using Yi.Framework.Interface.ERP;
using Yi.Framework.Model.ERP.Entitys;
using Yi.Framework.Repository;
using Yi.Framework.Service.Base.Crud;
namespace Yi.Framework.Service.ERP
{
public class PurchaseService : CrudAppService<PurchaseEntity, PurchaseGetListOutput, long, PurchaseCreateUpdateInput>, IPurchaseService
{
public PurchaseService(IRepository<PurchaseEntity> repository, IMapper mapper) : base(repository, mapper)
{
}
public async Task<PageModel<List<PurchaseGetListOutput>>> PageListAsync(PurchaseCreateUpdateInput input, PageParModel page)
{
RefAsync<int> totalNumber = 0;
var data = await Repository._DbQueryable
//.WhereIF(input.Code is not null,u=>u.Code.Contains(input.Code))
//.WhereIF(input.Name is not null, u => u.Name.Contains(input.Name))
.ToPageListAsync(page.PageNum, page.PageSize, totalNumber);
return new PageModel<List<PurchaseGetListOutput>> { Total = totalNumber.Value, Data = await MapToGetListOutputDtosAsync(data) };
}
}
}

5
Yi.Framework.Net6/Yi.Framework.Template/Abstract/ModelTemplateProvider.cs
View File

@@ -67,6 +67,11 @@ namespace Yi.Framework.Template.Abstract
continue;
}
}
//以}结尾，不包含get不是属性，代表类结尾
if (enetityDatas[i].EndsWith("}") && !enetityDatas[i].Contains("get"))
{
break;
}
}
//拼接实体字段

7
Yi.Framework.Net6/Yi.Framework.WebCore/MiddlewareExtend/ErrorHandExtension.cs
View File

@@ -41,13 +41,10 @@ namespace Yi.Framework.WebCore.MiddlewareExtend
}
catch (Exception ex)
{
_logger.LogError("系统错误",ex);
_logger.LogError(ex,$"系统错误:{ex.Message}");
//await _errorHandle.Invoer(context, ex);
var statusCode = context.Response.StatusCode;
if (ex is ArgumentException)
{
statusCode = 200;
}
context.Response.StatusCode = 500;
await HandleExceptionAsync(context, statusCode, ex.Message);
}
finally

2
Yi.Vue3.X.RuoYi/src/utils/request.js
View File

@@ -69,7 +69,6 @@ service.interceptors.request.use(config => {
}
return config
}, error => {
console.log(error)
Promise.reject(error)
})
@@ -117,7 +116,6 @@ service.interceptors.response.use(res => {
}
},
error => {
console.log('err' + error)
let { message } = error;
if (message == "Network Error") {
message = "后端接口连接异常";

45
Yi.Vue3.x.RuoYi/src/api/erp/purchaseApi.js Normal file
View File

@@ -0,0 +1,45 @@
import request from '@/utils/request'
// 分页查询
export function listData(query) {
return request({
url: '/purchase/pageList',
method: 'get',
params: query
})
}
// id查询
export function getData(code) {
return request({
url: '/purchase/getById/' + code,
method: 'get'
})
}
// 新增
export function addData(data) {
return request({
url: '/purchase/create',
method: 'post',
data: data
})
}
// 修改
export function updateData(id,data) {
return request({
url: `/purchase/update/${id}`,
method: 'put',
data: data
})
}
// 删除
export function delData(code) {
return request({
url: '/purchase/del',
method: 'delete',
data:"string"==typeof(code)?[code]:code
})
}

45
Yi.Vue3.x.RuoYi/src/api/erp/purchaseDetailsApi.js Normal file
View File

@@ -0,0 +1,45 @@
import request from '@/utils/request'
// 分页查询
export function listData(query) {
return request({
url: '/purchaseDetails/pageList',
method: 'get',
params: query
})
}
// id查询
export function getData(code) {
return request({
url: '/purchaseDetails/getById/' + code,
method: 'get'
})
}
// 新增
export function addData(data) {
return request({
url: '/purchaseDetails/create',
method: 'post',
data: data
})
}
// 修改
export function updateData(id,data) {
return request({
url: `/purchaseDetails/update/${id}`,
method: 'put',
data: data
})
}
// 删除
export function delData(code) {
return request({
url: '/purchaseDetails/del',
method: 'delete',
data:"string"==typeof(code)?[code]:code
})
}

347
Yi.Vue3.x.RuoYi/src/views/ERP/purchase/index.vue Normal file
View File

@@ -0,0 +1,347 @@
<template>
<div class="app-container">
<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-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-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-form-item>
<!-- <el-form-item label="状态" prop="isDeleted">
<el-select
v-model="queryParams.isDeleted"
placeholder="状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item> -->
<!-- <el-form-item label="创建时间" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item> -->
<el-form-item>
<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-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-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-col>
<el-col :span="1.5">
<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>
</el-row>
<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="name" :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="totalMoney" :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="remarks" :show-overflow-tooltip="true" />
<!-- <el-table-column label="状态" align="center" prop="isDeleted">
<template #default="scope">
<dict-tag
:options="sys_normal_disable"
:value="scope.row.isDeleted"
/>
</template>
</el-table-column> -->
<!-- <el-table-column
label="备注"
align="center"
prop="remark"
:show-overflow-tooltip="true"
/>
<el-table-column
label="创建时间"
align="center"
prop="createTime"
width="180"
>
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column> -->
<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="handleUpdate(scope.row)"
v-hasPermi="['business:article: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>
</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" />
<!-- ---------------------这里是新增和更新的对话框--------------------- -->
<el-dialog :title="title" v-model="open" width="1200px" append-to-body>
<el-form ref="dataRef" :model="form" :rules="rules" label-width="100px">
<el-row :gutter="20">
<el-col :span="8">
<el-form-item label="采购单编码" prop="code">
<el-input v-model="form.code" placeholder="请输入采购单编码" />
</el-form-item>
</el-col>
<el-col :offset="8" :span="8">
<el-form-item label="采购单员" prop="name">
<el-input v-model="form.name" placeholder="请输入采购单员" /> </el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="需求时间" prop="name">
<el-input v-model="form.name" placeholder="请输入采购单员" />
</el-form-item>
</el-col>
<el-col :offset="8" :span="8">
<el-form-item label="总金额" prop="name">
999{{ form.name }}
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form-item label="物料信息">
<el-table :data="tableData" border style="width: 100%">
<el-table-column width="90">
<template #default>
<el-button icon="Delete" type="danger" size="small">删除</el-button>
</template>
</el-table-column>
<el-table-column prop="date" label="物料" width="180" />
<el-table-column prop="name" label="单价" width="180" />
<el-table-column prop="address" label="采购数量" width="180" />
<el-table-column prop="address" label="备注" />
</el-table>
</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-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>
<script setup>
import {
listData,
getData,
delData,
addData,
updateData,
} from "@/api/erp/purchaseApi";
import { ref } from "@vue/reactivity";
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
const tableData = [
{
date: '2016-05-03',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-02',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-04',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
{
date: '2016-05-01',
name: 'Tom',
address: 'No. 189, Grove St, Los Angeles',
},
]
const dataList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
name: undefined,
code: undefined,
buyer: undefined,
},
rules: {
code: [{ required: true, message: "采购单编号不能为空", trigger: "blur" }],
name: [{ required: true, message: "采购单名称不能为空", trigger: "blur" }],
},
});
const { queryParams, form, rules } = toRefs(data);
/** 查询列表 */
function getList() {
loading.value = true;
listData(proxy.addDateRange(queryParams.value, dateRange.value)).then(
(response) => {
dataList.value = response.data.data;
total.value = response.data.total;
loading.value = false;
}
);
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
/** 表单重置 */
function reset() {
proxy.resetForm("dataRef");
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
function resetQuery() {
dateRange.value = [];
proxy.resetForm("queryRef");
handleQuery();
}
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = "添加采购单";
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
ids.value = selection.map((item) => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const id = row.id || ids.value;
getData(id).then((response) => {
form.value = response.data;
open.value = true;
title.value = "修改采购单";
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["dataRef"].validate((valid) => {
if (valid) {
if (form.value.id != undefined) {
updateData(form.value.id, form.value).then((response) => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addData(form.value).then((response) => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const delIds = row.id || ids.value;
proxy.$modal
.confirm('是否确认删除编号为"' + delIds + '"的数据项？')
.then(function () {
return delData(delIds);
})
.then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
})
.catch(() => { });
}
/** 导出按钮操作 */
function handleExport() { }
getList();
</script>

6
Yi.Vue3.x.RuoYi/src/views/ERP/unit/index.vue
View File

@@ -287,12 +287,6 @@
/** 表单重置 */
function reset() {
form.value = {
id: undefined,
title: undefined,
isDeleted: false,
remark: undefined,
};
proxy.resetForm("dataRef");
}
/** 搜索按钮操作 */

318
Yi.Vue3.x.RuoYi/src/views/system/dict/index copy.vue
View File

@@ -1,318 +0,0 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="字典名称" prop="dictName">
<el-input
v-model="queryParams.dictName"
placeholder="请输入字典名称"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<el-input
v-model="queryParams.dictType"
placeholder="请输入字典类型"
clearable
style="width: 240px"
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="状态" prop="isDeleted">
<el-select
v-model="queryParams.isDeleted"
placeholder="状态"
clearable
style="width: 240px"
>
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="创建时间" style="width: 308px">
<el-date-picker
v-model="dateRange"
value-format="YYYY-MM-DD"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item>
<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="['system:dict:add']"
>新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="success"
plain
icon="Edit"
:disabled="single"
@click="handleUpdate"
v-hasPermi="['system:dict:edit']"
>修改</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Delete"
:disabled="multiple"
@click="handleDelete"
v-hasPermi="['system:dict:remove']"
>删除</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="warning"
plain
icon="Download"
@click="handleExport"
v-hasPermi="['system:dict:export']"
>导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="danger"
plain
icon="Refresh"
@click="handleRefreshCache"
v-hasPermi="['system:dict:remove']"
>刷新缓存</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="字典编号" align="center" prop="id" />
<el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true"/>
<el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
<template #default="scope">
<router-link :to="'/system/dict-data/index/' + scope.row.id" class="link-type">
<span>{{ scope.row.dictType }}</span>
</router-link>
</template>
</el-table-column>
<el-table-column label="状态" align="center" prop="isDeleted">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.isDeleted" />
</template>
</el-table-column>
<el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</span>
</template>
</el-table-column>
<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="['system:dict:edit']"
>修改</el-button>
<el-button
type="text"
icon="Delete"
@click="handleDelete(scope.row)"
v-hasPermi="['system:dict: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"
/>
<!-- 添加或修改参数配置对话框 -->
<el-dialog :title="title" v-model="open" width="500px" append-to-body>
<el-form ref="dictRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="字典名称" prop="dictName">
<el-input v-model="form.dictName" placeholder="请输入字典名称" />
</el-form-item>
<el-form-item label="字典类型" prop="dictType">
<el-input v-model="form.dictType" placeholder="请输入字典类型" />
</el-form-item>
<el-form-item label="状态" prop="isDeleted">
<el-radio-group v-model="form.isDeleted">
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="JSON.parse(dict.value)">{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注" prop="remark">
<el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
</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>
<script setup name="Dict">
import useDictStore from '@/store/modules/dict'
import { listType, getType, delType, addType, updateType, refreshCache } from "@/api/system/dict/type";
const { proxy } = getCurrentInstance();
const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
const typeList = ref([]);
const open = ref(false);
const loading = ref(true);
const showSearch = ref(true);
const ids = ref([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
const title = ref("");
const dateRange = ref([]);
const data = reactive({
form: {},
queryParams: {
pageNum: 1,
pageSize: 10,
dictName: undefined,
dictType: undefined,
isDeleted: false
},
rules: {
dictName: [{ required: true, message: "字典名称不能为空", trigger: "blur" }],
dictType: [{ required: true, message: "字典类型不能为空", trigger: "blur" }]
},
});
const { queryParams, form, rules } = toRefs(data);
/** 查询字典类型列表 */
function getList() {
loading.value = true;
listType(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
typeList.value = response.data.data;
total.value = response.data.total;
loading.value = false;
});
}
/** 取消按钮 */
function cancel() {
open.value = false;
reset();
}
/** 表单重置 */
function reset() {
form.value = {
id: undefined,
dictName: undefined,
dictType: undefined,
isDeleted: false,
remark: undefined
};
proxy.resetForm("dictRef");
}
/** 搜索按钮操作 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
/** 重置按钮操作 */
function resetQuery() {
dateRange.value = [];
proxy.resetForm("queryRef");
handleQuery();
}
/** 新增按钮操作 */
function handleAdd() {
reset();
open.value = true;
title.value = "添加字典类型";
}
/** 多选框选中数据 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.id);
single.value = selection.length != 1;
multiple.value = !selection.length;
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset();
const dictId = row.id || ids.value;
getType(dictId).then(response => {
form.value = response.data;
open.value = true;
title.value = "修改字典类型";
});
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["dictRef"].validate(valid => {
if (valid) {
if (form.value.id != undefined) {
updateType(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功");
open.value = false;
getList();
});
} else {
addType(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功");
open.value = false;
getList();
});
}
}
});
}
/** 删除按钮操作 */
function handleDelete(row) {
const dictIds = row.id || ids.value;
proxy.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？').then(function() {
return delType(dictIds);
}).then(() => {
getList();
proxy.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
/** 导出按钮操作 */
function handleExport() {
proxy.download("system/dict/type/export", {
...queryParams.value
}, `dict_${new Date().getTime()}.xlsx`);
}
/** 刷新缓存按钮操作 */
function handleRefreshCache() {
refreshCache().then(() => {
proxy.$modal.msgSuccess("刷新成功");
useDictStore().cleanDict();
});
}
getList();
</script>