dyh
/
DigitalFactory
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: dyh:755dba17cf6dcd688d44ffc1abeefae5ecdfa66e
Branches Tags
dyh:main
..
compare: dyh:3a62efa2640bae6e56ee0b49cd83a7db700e5aaa
Branches Tags
dyh:main

No commits in common. "755dba17cf6dcd688d44ffc1abeefae5ecdfa66e" and "3a62efa2640bae6e56ee0b49cd83a7db700e5aaa" have entirely different histories.
755dba17cf ... 3a62efa264

13 changed files with 800 additions and 990 deletions
Show Stats Expand all files Collapse all files

31
Admin.NET/Admin.NET.Application/Service/Materials/Dto/MaterialsInput.cs
View File

@ -259,34 +259,3 @@ public class QueryByIdMaterialsInput : DeleteMaterialsInput
{ {
} }
/// <summary>
///
/// </summary>
public class MaterialsUnitInput : MaterialsBaseInput
{
/// <summary>
/// 主键Id
/// </summary>
[Required(ErrorMessage = "主键Id不能为空")]
public long Id { get; set; }
}
/// <summary>
///
/// </summary>
public class MaterialsUnitGetInput
{
/// <summary>
/// 单位组ID
/// </summary>
[Required(ErrorMessage = "主键Id不能为空")]
public virtual long UnitGroupId { get; set; }
/// <summary>
/// 基本单位
/// </summary>
public virtual string Unit { get; set; }
}

10
Admin.NET/Admin.NET.Application/Service/Materials/MaterialsService.cs
View File

@ -166,15 +166,5 @@ public class MaterialsService : IDynamicApiController, ITransient
return model!=null?true:false; return model!=null?true:false;
} }
[HttpPost]
[ApiDescriptionSettings(Name = "GetMaterialsList")]
public async Task<List<Materials>> GetMaterialsList(MaterialsUnitGetInput input)
{
var list = await _rep.AsQueryable().Where(a => !a.IsDelete)
.WhereIF(input.UnitGroupId>0, u => u.UnitGroupId == input.UnitGroupId)
.WhereIF(!string.IsNullOrWhiteSpace(input.Unit), u => u.Unit.Equals(input.Unit))
.ToListAsync();
return list;
}
} }

18
Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitInput.cs
View File

@ -224,21 +224,3 @@ public class QueryByIdSysUnitInput : DeleteSysUnitInput
{ {
} }
/// <summary>
/// 更新单位状态
/// </summary>
public class UpdateSysUnitEnableInput
{
/// <summary>
/// 主键Id
/// </summary>
[Required(ErrorMessage = "主键Id不能为空")]
public string Ids { get; set; }
/// <summary>
/// 是否启用
/// </summary>
public bool IsEnable { get; set; }
}

41
Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs
View File

@ -4,7 +4,6 @@ using Admin.NET.Application.Entity;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ViewFeatures; using Microsoft.AspNetCore.Mvc.ViewFeatures;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using Nest;
namespace Admin.NET.Application; namespace Admin.NET.Application;
/// <summary> /// <summary>
/// 单位服务 /// 单位服务
@ -13,8 +12,6 @@ namespace Admin.NET.Application;
public class SysUnitService : IDynamicApiController, ITransient public class SysUnitService : IDynamicApiController, ITransient
{ {
private readonly SqlSugarRepository<SysUnit> _rep; private readonly SqlSugarRepository<SysUnit> _rep;
public SysUnitService(SqlSugarRepository<SysUnit> rep) public SysUnitService(SqlSugarRepository<SysUnit> rep)
{ {
_rep = rep; _rep = rep;
@ -194,19 +191,41 @@ public class SysUnitService : IDynamicApiController, ITransient
} }
/// <summary> /// <summary>
/// 修改单位启用禁用状态 /// 生成编码
/// </summary> /// </summary>
/// <param name="input"></param> /// <param name="input"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpGet]
[ApiDescriptionSettings(Name = "updateBaseUnitEnable")] [ApiDescriptionSettings(Name = "createCodeNum")]
public async Task UpdateBaseUnitEnable(UpdateSysUnitEnableInput input) public async Task<string> CreateCodeNum()
{ {
foreach (var id in input.Ids.Split(",")) string dt = DateTime.Now.ToString("yyyyMMdd");
var unit = await _rep.AsQueryable()
.Where(a => !a.IsDelete)
.Where(a => a.CodeNum.Contains(dt))
.OrderByDescending(t => t.CodeNum)
.FirstAsync();
if (unit != null)
{ {
var entity = _rep.GetById(id); Match match = Regex.Match(unit.CodeNum, @"\d+");
entity.IsEnable = input.IsEnable; if (match.Success)
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); {
string numberStr = match.Value; // 获取匹配到的数字字符串
int number = int.Parse(numberStr); // 将数字字符串转换为整数
number++; // 对数字进行加1操作
// 将结果转换回字符串，并保持与原数字相同的长度
string paddedNumber = number.ToString().PadLeft(match.Value.Length, '0');
return paddedNumber;
}
else
{
return dt + "001";
}
}
else
{
return dt + "001";
} }
} }
} }

72
Web/src/api-services/apis/sys-unit-api.ts
View File

@ -25,7 +25,6 @@ import { AdminResultSysUnit } from '../models';
import { DeleteSysUnitInput } from '../models'; import { DeleteSysUnitInput } from '../models';
import { SysUnitInput } from '../models'; import { SysUnitInput } from '../models';
import { UpdateSysUnitInput } from '../models'; import { UpdateSysUnitInput } from '../models';
import {UpdateSysUnitEnableInput} from "/@/api-services/models/update-sys-unit-enable-input";
/** /**
* SysUnitApi - axios parameter creator * SysUnitApi - axios parameter creator
* @export * @export
@ -411,54 +410,6 @@ export const SysUnitApiAxiosParamCreator = function (configuration?: Configurati
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json'; const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || ""); localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
return {
url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
options: localVarRequestOptions,
};
},
/**
*
* @summary 修改单位启动禁用状态
* @param {UpdateSysUnitInput} [body]
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
apiSysUnitUpdateEnablePost: async (body?: UpdateSysUnitEnableInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
const localVarPath = `/api/sysUnit/updateBaseUnitEnable`;
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, 'https://example.com');
let baseOptions;
if (configuration) {
baseOptions = configuration.baseOptions;
}
const localVarRequestOptions :AxiosRequestConfig = { method: 'POST', ...baseOptions, ...options};
const localVarHeaderParameter = {} as any;
const localVarQueryParameter = {} as any;
// authentication Bearer required
// http bearer authentication required
if (configuration && configuration.accessToken) {
const accessToken = typeof configuration.accessToken === 'function'
? await configuration.accessToken()
: await configuration.accessToken;
localVarHeaderParameter["Authorization"] = "Bearer " + accessToken;
}
localVarHeaderParameter['Content-Type'] = 'application/json-patch+json';
const query = new URLSearchParams(localVarUrlObj.search);
for (const key in localVarQueryParameter) {
query.set(key, localVarQueryParameter[key]);
}
for (const key in options.params) {
query.set(key, options.params[key]);
}
localVarUrlObj.search = (new URLSearchParams(query)).toString();
let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
localVarRequestOptions.data = needsSerialization ? JSON.stringify(body !== undefined ? body : {}) : (body || "");
return { return {
url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash, url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
options: localVarRequestOptions, options: localVarRequestOptions,
@ -583,19 +534,6 @@ export const SysUnitApiFp = function(configuration?: Configuration) {
return axios.request(axiosRequestArgs); return axios.request(axiosRequestArgs);
}; };
}, },
/**
*
* @summary 单位禁用
* @param body
* @param options
*/
async apiSysUnitUpdateEnablePost(body?: UpdateSysUnitEnableInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
const localVarAxiosArgs = await SysUnitApiAxiosParamCreator(configuration).apiSysUnitUpdateEnablePost(body, options);
return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
return axios.request(axiosRequestArgs);
};
},
} }
}; };
@ -779,14 +717,4 @@ export class SysUnitApi extends BaseAPI {
async apiSysUnitCheckPost(body?: UpdateSysUnitInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> { async apiSysUnitCheckPost(body?: UpdateSysUnitInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
return SysUnitApiFp(this.configuration).apiSysUnitCheckPost(body, options).then((request) => request(this.axios, this.basePath)); return SysUnitApiFp(this.configuration).apiSysUnitCheckPost(body, options).then((request) => request(this.axios, this.basePath));
} }
/**
*
* @param body
* @param options
*/
async apiSysUnitUpdateEnablePost(body?: UpdateSysUnitEnableInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
return SysUnitApiFp(this.configuration).apiSysUnitUpdateEnablePost(body, options).then((request) => request(this.axios, this.basePath));
}
} }

38
Web/src/api-services/models/update-sys-unit-enable-input.ts
View File

@ -1,38 +0,0 @@
/* tslint:disable */
/* eslint-disable */
/**
* 所有接口
* 让 .NET 开发更简单、更通用、更流行。前后端分离架构(.NET6/Vue3)，开箱即用紧随前沿技术。
*
* OpenAPI spec version: 1.0.0
*
*
* NOTE: This class is auto generated by the swagger code generator program.
* https://github.com/swagger-api/swagger-codegen.git
* Do not edit the class manually.
*/
/**
* 单位禁用更新输入参数
*
* @export
* @interface UpdateSysUnitInput
*/
export interface UpdateSysUnitEnableInput {
/**
* 单位组ID
*
* @type {number}
* @memberof UpdateSysUnitInput
*/
isEnable: boolean;
/**
* 主键Id
*
* @type {number}
* @memberof UpdateSysUnitInput
*/
ids: string;
}

9
Web/src/api/main/materials.ts
View File

@ -8,7 +8,6 @@ enum Api {
ListMaterials = '/api/materials/list', ListMaterials = '/api/materials/list',
MtListBySourceId = '/api/materialList/listBySourceId', MtListBySourceId = '/api/materialList/listBySourceId',
CheckMaterials = '/api/materials/CheckById', CheckMaterials = '/api/materials/CheckById',
GetMaterialsList = '/api/materials/GetMaterialsList',
} }
// 增加物料 // 增加物料
@ -74,11 +73,3 @@ export const materialListBySourceId = (sourceId: any) =>
method: 'get', method: 'get',
data: { sourceId }, data: { sourceId },
}); });
// 获取物料集合
export const listMaterialByUnit = (unitGroupId: any,unit:any) =>
request({
url: Api.GetMaterialsList,
method: 'post',
data: { UnitGroupId:unitGroupId,Unit:unit },
});

49
Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
View File

@ -2,7 +2,7 @@
<template> <template>
<div class="sys-open-access-container"> <div class="sys-open-access-container">
<el-dialog v-model="state.isShowDialog" :title="props.title" width="1000"> <el-dialog v-model="state.isShowDialog" :title="props.title" width="1000">
<el-form :inline="true" :model="ruleForm" class="demo-form-inline" label-width="90px"> <el-form ref="ruleFormRef" :inline="true" :model="ruleForm" class="demo-form-inline" label-width="90px">
<el-row> <el-row>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="物料类型" :rules="[{ required: true, message: '物料类型不能为空', trigger: 'blur' }]"> <el-form-item label="物料类型" :rules="[{ required: true, message: '物料类型不能为空', trigger: 'blur' }]">
@ -11,10 +11,13 @@
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
<el-row style="display: flex; justify-content: space-around;"> <template #footer>
<span class="dialog-footer">
<el-button style="width: 100px;" type="primary" @click="matterSubmit">提交</el-button> <el-button style="width: 100px;" type="primary" @click="matterSubmit">提交</el-button>
<el-button style="width: 100px;" @click="closeDialog">取消</el-button> <el-button style="width: 100px;" @click="closeDialog">取消</el-button>
</el-row> </span>
</template>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -22,11 +25,15 @@
<script setup lang="ts"> <script setup lang="ts">
import {onMounted, reactive, ref} from 'vue'; import {onMounted, reactive, ref} from 'vue';
import {getAPI} from '/@/utils/axios-utils'; import {getAPI} from '/@/utils/axios-utils';
import { BrandApi, MaterialClassifyApi, PackageInfoApi, SysUnitGroupApi,SysUnitApi } from '/@/api-services/api'; import {
import { AddMaterialsInput, BrandOutput, MaterialsOutput, PackageInfoOutput, SysUnitGroupOutput, SysUnitOutput} from '/@/api-services/models'; MaterialClassifyApi,
} from '/@/api-services/api';
import {
MaterialsOutput,
SysUnitGroupOutput,
SysUnitOutput, UpdateMaterialClassifyInput
} from '/@/api-services/models';
import {ElMessageBox, ElMessage, TabsPaneContext} from 'element-plus'; import {ElMessageBox, ElMessage, TabsPaneContext} from 'element-plus';
import { addMaterials, updateMaterials,detailMaterials } from '/@/api/main/materials';
import { listUnitGroup } from '/@/api/main/unit';
import {addMaterialsClassify, detailMaterialsClassify, updateMaterialsClassify} from "/@/api/main/materialClassify"; import {addMaterialsClassify, detailMaterialsClassify, updateMaterialsClassify} from "/@/api/main/materialClassify";
const props = defineProps({ const props = defineProps({
@ -45,8 +52,7 @@ const fyListGet = async () => {
fyListData.value = res.data.result; fyListData.value = res.data.result;
} }
} }
const ruleFormRef = ref();
const ruleForm = ref<any>({});
const state = reactive({ const state = reactive({
loading: false, loading: false,
@ -66,18 +72,18 @@ const state = reactive({
editPrintTitle: '', editPrintTitle: '',
unitGroupData: [] as Array<SysUnitGroupOutput>, unitGroupData: [] as Array<SysUnitGroupOutput>,
unitData: [] as Array<SysUnitOutput>, unitData: [] as Array<SysUnitOutput>,
ruleForm: {} as UpdateMaterialClassifyInput,
}); });
// 打开弹窗 // 打开弹窗
const openDialog = async (row: any) => { const openDialog = async (row: any) => {
//ruleFormRef.value?.resetFields(); ruleFormRef.value?.resetFields();
//state.selectedTabName = '0'; // 重置为第一个 tab 页 //state.selectedTabName = '0'; // 重置为第一个 tab 页
let rowData = JSON.parse(JSON.stringify(row)); let rowData = JSON.parse(JSON.stringify(row));
if (rowData.id) if (rowData.id)
ruleForm.value = (await detailMaterialsClassify(rowData.id)).data.result; state.ruleForm = (await detailMaterialsClassify(rowData.id)).data.result;
else { else {
ruleForm.value = rowData; state.ruleForm = rowData;
ruleForm.value.isEnable=true;
} }
state.isShowDialog = true; state.isShowDialog = true;
}; };
@ -92,13 +98,14 @@ onMounted(() => {
}); });
//提交 //提交
const matterSubmit = async () => { const matterSubmit = () => {
ruleFormRef.value.validate(async (valid: boolean) => {
if (!valid) return;
let res; let res;
if (props.title == '添加物料类型') { if (props.title == '添加物料类型') {
res = await addMaterialsClassify(ruleForm.value); res = await addMaterialsClassify(state.ruleForm);
} } else {
else { res = await updateMaterialsClassify(state.ruleForm);
res = await updateMaterialsClassify(ruleForm.value);
} }
//console.log(res) //console.log(res)
@ -109,13 +116,13 @@ const matterSubmit = async () => {
type: 'success', type: 'success',
}) })
//state.tableData.handleList(); //state.tableData.handleList();
} } else
else
ElMessage.error(res.message!) ElMessage.error(res.message!)
emit("reloadTable"); emit("reloadTable");
closeDialog(); closeDialog();
} });
}
// 导出对象 // 导出对象

36
Web/src/views/basics-date/matter/component/editOpenAccess.vue
View File

@ -2,11 +2,11 @@
<template> <template>
<div class="sys-open-access-container"> <div class="sys-open-access-container">
<el-dialog v-model="state.isShowDialog" :title="props.title" width="1000"> <el-dialog v-model="state.isShowDialog" :title="props.title" width="1000">
<el-form ref="ruleFormRef" :inline="true" :model="ruleForm" class="demo-form-inline" label-width="90px"> <el-form :inline="true" :model="ruleForm" class="demo-form-inline" label-width="90px">
<el-row> <el-row>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="name" label="名称" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]"> <el-form-item label="名称" :rules="[{ required: true, message: '分销单位不能为空', trigger: 'blur' }]">
<el-input v-model="ruleForm.name" placeholder="请输入名称" clearable /> <el-input v-model="ruleForm.name" placeholder="请输入名称" clearable />
</el-form-item> </el-form-item>
</el-col> </el-col>
@ -16,7 +16,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="8"> <el-col :span="8">
<el-form-item prop="classify" label="分类" :rules="[{ required: true, message: '分类不能为空', trigger: 'blur' }]"> <el-form-item label="分类" :rules="[{ required: true, message: '分销单位不能为空', trigger: 'blur' }]">
<el-select v-model="ruleForm.classify" placeholder="请选择" clearable> <el-select v-model="ruleForm.classify" placeholder="请选择" clearable>
<el-option :label="item.name" :value="item.id" v-for="item, index in fyListData" <el-option :label="item.name" :value="item.id" v-for="item, index in fyListData"
:key="index" /> :key="index" />
@ -178,20 +178,6 @@
</vxe-column> </vxe-column>
</vxe-table> </vxe-table>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="操作信息" name="操作信息">
<el-row>
<el-col :span="8">
<el-form-item label="创建人" >
<el-input v-model="ruleForm.createUserName" disabled clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="修改人" >
<el-input v-model="ruleForm.updateUserName" disabled clearable />
</el-form-item>
</el-col>
</el-row>
</el-tab-pane>
</el-tabs> </el-tabs>
</el-form> </el-form>
<el-row style="display: flex; justify-content: space-around;"> <el-row style="display: flex; justify-content: space-around;">
@ -229,7 +215,7 @@ const fyListGet = async () => {
} }
const ruleForm = ref<any>({}); const ruleForm = ref<any>({});
const ruleFormRef = ref();
const state = reactive({ const state = reactive({
loading: false, loading: false,
isShowDialog:false, isShowDialog:false,
@ -252,8 +238,8 @@ const state = reactive({
// 打开弹窗 // 打开弹窗
const openDialog = async (row: any) => { const openDialog = async (row: any) => {
ruleFormRef.value?.resetFields(); //ruleFormRef.value?.resetFields();
state.selectedTabName = '0'; // 重置为第一个 tab 页 //state.selectedTabName = '0'; // 重置为第一个 tab 页
let rowData = JSON.parse(JSON.stringify(row)); let rowData = JSON.parse(JSON.stringify(row));
if (rowData.id) if (rowData.id)
ruleForm.value = (await detailMaterials(rowData.id)).data.result; ruleForm.value = (await detailMaterials(rowData.id)).data.result;
@ -321,12 +307,11 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
//提交 //提交
const matterSubmit = async () => { const matterSubmit = async () => {
ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
if (isValid) {
let res; let res;
if (props.title=='添加物料'){ if (props.title=='添加物料'){
res = await addMaterials(ruleForm.value); res = await addMaterials(ruleForm.value);
} else { }
else {
res = await updateMaterials(ruleForm.value); res = await updateMaterials(ruleForm.value);
} }
//console.log(res) //console.log(res)
@ -338,12 +323,11 @@ const matterSubmit = async () => {
type: 'success', type: 'success',
}) })
//state.tableData.handleList(); //state.tableData.handleList();
} else }
else
ElMessage.error(res.message!) ElMessage.error(res.message!)
closeDialog(); closeDialog();
} }
});
}
// //获取包装关系 // //获取包装关系

2
Web/src/views/basics-date/matter/index.vue
View File

@ -124,8 +124,6 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="remarks" label="备注" width="200" show-overflow-tooltip="" /> <el-table-column prop="remarks" label="备注" width="200" show-overflow-tooltip="" />
<el-table-column prop="updateUserName" label="修改人" show-overflow-tooltip=""/>
<el-table-column prop="updateTime" label="修改时间" show-overflow-tooltip=""/>
<el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')"> <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')">
<template #default="scope"> <template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMaterials(scope.row)" v-auth="'materials:update'"> 编辑 </el-button> <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMaterials(scope.row)" v-auth="'materials:update'"> 编辑 </el-button>

50
Web/src/views/basics-date/unit/index.vue
View File

@ -33,7 +33,9 @@
<div> <div>
<el-button type="success" link <el-button type="success" link
@click.prevent="addUnitGroup" @click.prevent="addUnitGroup"
style="border-right: 1px #515a6e solid; border-radius: 0px; margin-right: 3px; padding: 0 3px;">新增</el-button> style="border-right: 1px #515a6e solid; border-radius: 0px; margin-right: 3px; padding: 0 3px;">
新增
</el-button>
</div> </div>
</div> </div>
<div style="height: 100%;"> <div style="height: 100%;">
@ -53,7 +55,9 @@
<vxe-column title="操作" width="150" fixed="right" show-overflow> <vxe-column title="操作" width="150" fixed="right" show-overflow>
<template #default="{ row }"> <template #default="{ row }">
<vxe-button type="text" @click="editUnitGroup(row)" icon="vxe-icon-edit">修改</vxe-button> <vxe-button type="text" @click="editUnitGroup(row)" icon="vxe-icon-edit">修改</vxe-button>
<vxe-button type="text" @click="deleteUnitGroup(row)" icon="vxe-icon-delete" style="color: rgb(223, 65, 65)">删除</vxe-button> <vxe-button type="text" @click="deleteUnitGroup(row)" icon="vxe-icon-delete"
style="color: rgb(223, 65, 65)">删除
</vxe-button>
<!-- <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> --> <!-- <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> -->
</template> </template>
</vxe-column> </vxe-column>
@ -88,10 +92,13 @@
</el-table-column> </el-table-column>
<el-table-column prop="updateUserName" label="修改人" show-overflow-tooltip=""/> <el-table-column prop="updateUserName" label="修改人" show-overflow-tooltip=""/>
<el-table-column prop="updateTime" label="修改时间" show-overflow-tooltip=""/> <el-table-column prop="updateTime" label="修改时间" show-overflow-tooltip=""/>
<el-table-column width="200" label="操作"align="center" fixed="right" show-overflow-tooltip="" v-if="auth('materials:update') || auth('materials:delete')"> <el-table-column width="200" label="操作" align="center" fixed="right" show-overflow-tooltip=""
v-if="auth('materials:update') || auth('materials:delete')">
<template #default="scope"> <template #default="scope">
<vxe-button type="text" @click="editUnit(scope.row)" icon="vxe-icon-edit">修改</vxe-button> <vxe-button type="text" @click="editUnit(scope.row)" icon="vxe-icon-edit">修改</vxe-button>
<vxe-button type="text" @click="deleteUnit(scope.row)" icon="vxe-icon-delete" style="color: rgb(223, 65, 65)">删除</vxe-button> <vxe-button type="text" @click="deleteUnit(scope.row)" icon="vxe-icon-delete"
style="color: rgb(223, 65, 65)">删除
</vxe-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -226,7 +233,7 @@
<el-button style="width: 100px;" @click="dialogTableVisible = false">取消</el-button> <el-button style="width: 100px;" @click="dialogTableVisible = false">取消</el-button>
</el-row> </el-row>
</el-dialog> </el-dialog>
<div v-if="isShowDialog">
<el-dialog v-model="isShowDialog" :title="mGroupTitle" ref="ruleFormRef" :width="800"> <el-dialog v-model="isShowDialog" :title="mGroupTitle" ref="ruleFormRef" :width="800">
<template #header> <template #header>
<div style="color: #fff"> <div style="color: #fff">
@ -236,7 +243,8 @@
<el-form :model="unitGroupModel" label-width="auto" :rules="rules"> <el-form :model="unitGroupModel" label-width="auto" :rules="rules">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="名称" prop="name"> <el-form-item label="名称" prop="name">
<el-input v-model="unitGroupModel.name" placeholder="请输入名称" maxlength="32" show-word-limit clearable /> <el-input v-model="unitGroupModel.name" placeholder="请输入名称" maxlength="32" show-word-limit
clearable/>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20"> <el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
@ -252,7 +260,7 @@
</span> </span>
</template> </template>
</el-dialog> </el-dialog>
</div>
</div> </div>
</template> </template>
@ -261,7 +269,12 @@
import {onMounted, reactive, ref} from 'vue' import {onMounted, reactive, ref} from 'vue'
import {getAPI} from '/@/utils/axios-utils'; import {getAPI} from '/@/utils/axios-utils';
import {SysUnitApi, SysUnitGroupApi} from '/@/api-services/api'; import {SysUnitApi, SysUnitGroupApi} from '/@/api-services/api';
import { AddSysUnitInput, SqlSugarPagedListSysUnitOutput, SysUnitGroupOutput, SysUnitInput} from '/@/api-services/models'; import {
AddSysUnitInput,
SqlSugarPagedListSysUnitOutput,
SysUnitGroupOutput,
SysUnitInput
} from '/@/api-services/models';
import type {FormRules} from "element-plus"; import type {FormRules} from "element-plus";
import {ElMessageBox, ElMessage} from 'element-plus'; import {ElMessageBox, ElMessage} from 'element-plus';
import {auth} from "/@/utils/authFunction"; import {auth} from "/@/utils/authFunction";
@ -290,7 +303,6 @@ let mGroupTitle = ref('新增');
let dialogTableVisible = ref(false); let dialogTableVisible = ref(false);
const unitFrom = ref<any>({isEnable: true, isDelete: false, name: '', codeNum: ''}) const unitFrom = ref<any>({isEnable: true, isDelete: false, name: '', codeNum: ''})
const cancel = () => { const cancel = () => {
@ -331,7 +343,10 @@ const formInline = reactive({} as SysUnitInput)
//获取单位数据 //获取单位数据
const unitPage = async (parameter = formInline) => { const unitPage = async (parameter = formInline) => {
let res = await getAPI(SysUnitApi).apiSysUnitPagePost({pageSize:tableParams.value.pageSize,page:tableParams.value.page, ...parameter,...formInline }); let res = await getAPI(SysUnitApi).apiSysUnitPagePost({
pageSize: tableParams.value.pageSize,
page: tableParams.value.page, ...parameter, ...formInline
});
data.unit = res.data.result?.items as any; data.unit = res.data.result?.items as any;
tableParams.value.total = res.data.result?.total; tableParams.value.total = res.data.result?.total;
} }
@ -373,8 +388,7 @@ const unitSubmit = async () => {
unitPage({groupUnitId: data.selectUnitGroupId}); unitPage({groupUnitId: data.selectUnitGroupId});
} }
} else { } else {
if(unitFrom.value.isBaseUnit && item!=null && item.id!=unitFrom.value.id) if (unitFrom.value.isBaseUnit && item != null && item.id != unitFrom.value.id) {
{
ElMessage({message: '基本单位必须唯一', type: 'error',}); ElMessage({message: '基本单位必须唯一', type: 'error',});
unitFrom.value.isBaseUnit = false; unitFrom.value.isBaseUnit = false;
return; return;
@ -400,7 +414,7 @@ const getCurrentDate = () => {
} }
const editUnit = async (row: any) => { const editUnit = async (row: any) => {
unitFrom.value=row; unitFrom.value = reactive({ ...row });
mTitle.value = '编辑' mTitle.value = '编辑'
dialogTableVisible.value = true; dialogTableVisible.value = true;
} }
@ -420,7 +434,8 @@ const deleteUnit=async(row:any)=>{
} else } else
ElMessage.error(res.data.message!) ElMessage.error(res.data.message!)
}) })
.catch(() => {}); .catch(() => {
});
} }
const addUnitGroup = () => { const addUnitGroup = () => {
@ -429,10 +444,10 @@ const addUnitGroup=()=>{
} }
const editUnitGroup=async(row:any)=>{ const editUnitGroup = (row: any) => {
unitGroupModel=row;
mGroupTitle.value = '编辑' mGroupTitle.value = '编辑'
isShowDialog.value = true; isShowDialog.value = true;
unitGroupModel = reactive({ ...row });
} }
const deleteUnitGroup = async (row: any) => { const deleteUnitGroup = async (row: any) => {
@ -458,7 +473,8 @@ const deleteUnitGroup=async(row:any)=>{
} else } else
ElMessage.error(res.data.message!) ElMessage.error(res.data.message!)
}) })
.catch(() => {}); .catch(() => {
});
} }
} }

70
Web/src/views/productionCenter/reportDetailTable/component/editDialog.vue
View File

@ -1,5 +1,12 @@
<template> <template>
<div class="reportDetailTable-container" style="height: 100vh"> <div class="reportDetailTable-container">
<el-dialog v-model="isShowDialog" :width="800" draggable="">
<template #header>
<div style="color: #fff">
<!--<el-icon size="16" style="margin-right: 3px; display: inline; vertical-align: middle"> <ele-Edit /> </el-icon>-->
<span>{{ props.title }}</span>
</div>
</template>
<el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules"> <el-form :model="ruleForm" ref="ruleFormRef" label-width="auto" :rules="rules">
<el-row :gutter="35"> <el-row :gutter="35">
<el-form-item v-show="false"> <el-form-item v-show="false">
@ -162,24 +169,17 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
<div class="footer" align="right" > </el-form>
<template #footer>
<span class="dialog-footer">
<el-button @click="cancel">取 消</el-button> <el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="submit">确 定</el-button> <el-button type="primary" @click="submit">确 定</el-button>
</div> </span>
</el-form> </template>
</el-dialog>
</div> </div>
</template> </template>
<style scoped> <style scoped>
.footer {
position: fixed; /* 固定定位 */
left: 0;
bottom: 60px;
width: 100%; /* 宽度占满整个屏幕 */
color: #fff; /* 文字颜色 */
padding: 10px; /* 可根据需要添加内边距 */
text-align: right; /* 文字居中 */
}
:deep(.el-select), :deep(.el-select),
:deep(.el-input-number) { :deep(.el-input-number) {
width: 100%; width: 100%;
@ -205,10 +205,9 @@
type: String, type: String,
default: "", default: "",
}, },
row: Object
}); });
//父级传递来的函数，用于回调 //父级传递来的函数，用于回调
const emit = defineEmits(["reloadTable","back"]); const emit = defineEmits(["reloadTable"]);
const ruleFormRef = ref(); const ruleFormRef = ref();
const isShowDialog = ref(false); const isShowDialog = ref(false);
const ruleForm = ref<any>({}); const ruleForm = ref<any>({});
@ -228,9 +227,11 @@
const teamOfGroups = ref<any>([]); const teamOfGroups = ref<any>([]);
const employees = ref<any>([]); const employees = ref<any>([]);
onMounted(async () => { // 打开弹窗
if(props.row) { const openDialog = async (row: any) => {
let rowData = JSON.parse(JSON.stringify(props.row)); // ruleForm.value = JSON.parse(JSON.stringify(row));
// 改用detail获取最新数据来编辑
let rowData = JSON.parse(JSON.stringify(row));
if (rowData.id) if (rowData.id)
ruleForm.value = (await detailReportDetailTable(rowData.id)).data.result; ruleForm.value = (await detailReportDetailTable(rowData.id)).data.result;
else else
@ -240,26 +241,9 @@
currentMaterial.value= (await detailMaterials(rowData.materialsId)).data.result; currentMaterial.value= (await detailMaterials(rowData.materialsId)).data.result;
//console.log(materials.value); //console.log(materials.value);
} }
} isShowDialog.value = true;
}); //console.log(ruleForm.value);
};
// // 打开弹窗
// const openDialog = async (row: any) => {
// // ruleForm.value = JSON.parse(JSON.stringify(row));
// // 改用detail获取最新数据来编辑
// let rowData = JSON.parse(JSON.stringify(row));
// if (rowData.id)
// ruleForm.value = (await detailReportDetailTable(rowData.id)).data.result;
// else
// ruleForm.value = rowData;
//
// if(rowData.updateUserId){
// currentMaterial.value= (await detailMaterials(rowData.materialsId)).data.result;
// //console.log(materials.value);
// }
// isShowDialog.value = true;
// //console.log(ruleForm.value);
// };
// 关闭弹窗 // 关闭弹窗
const closeDialog = () => { const closeDialog = () => {
@ -269,8 +253,7 @@
// 取消 // 取消
const cancel = () => { const cancel = () => {
emit("reloadTable"); isShowDialog.value = false;
emit("back");
}; };
// 提交 // 提交
@ -283,8 +266,7 @@
} else { } else {
await updateReportDetailTable(values); await updateReportDetailTable(values);
} }
emit("reloadTable"); closeDialog();
emit("back");
} else { } else {
ElMessage({ ElMessage({
message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`, message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
@ -323,7 +305,7 @@
}); });
//将属性或者函数暴露给父组件 //将属性或者函数暴露给父组件
// defineExpose({ openDialog }); defineExpose({ openDialog });
</script> </script>

40
Web/src/views/productionCenter/reportDetailTable/index.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div v-if="!state.editShow" class="reportDetailTable-container"> <div class="reportDetailTable-container">
<el-card shadow="hover" :body-style="{ paddingBottom: '0' }"> <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
<el-form :model="queryParams" ref="queryForm" labelWidth="90"> <el-form :model="queryParams" ref="queryForm" labelWidth="90">
<el-row> <el-row>
@ -229,27 +229,21 @@
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
/> />
<editDialog
ref="editDialogRef"
:title="editReportDetailTableTitle"
@reloadTable="handleQuery"
/>
<printDetailDialog <printDetailDialog
ref="printDetailDialogRef" ref="printDetailDialogRef"
:title="printDetailTableTitle" :title="printDetailTableTitle"
/> />
</el-card> </el-card>
</div> </div>
<div v-else class="reportDetailTable-container">
<el-card >
<editDialog
ref="editDialogRef"
:title="editReportDetailTableTitle"
:row = "state.editRow"
@reloadTable="handleQuery"
@back="closeReportDetailTable"
/>
</el-card>
</div>
</template> </template>
<script lang="ts" setup="" name="reportDetailTable"> <script lang="ts" setup="" name="reportDetailTable">
import {reactive, ref} from "vue"; import { ref } from "vue";
import { ElMessageBox, ElMessage } from "element-plus"; import { ElMessageBox, ElMessage } from "element-plus";
import { auth } from '/@/utils/authFunction'; import { auth } from '/@/utils/authFunction';
@ -264,10 +258,6 @@ import {reactive, ref} from "vue";
const loading = ref(false); const loading = ref(false);
const tableData = ref<any>([]); const tableData = ref<any>([]);
const queryParams = ref<any>({}); const queryParams = ref<any>({});
const state = reactive({
editShow: false,
editRow:{}
})
const tableParams = ref({ const tableParams = ref({
page: 1, page: 1,
pageSize: 10, pageSize: 10,
@ -292,7 +282,6 @@ import {reactive, ref} from "vue";
loading.value = false; loading.value = false;
}; };
// 列排序 // 列排序
const sortChange = async (column: any) => { const sortChange = async (column: any) => {
queryParams.value.field = column.prop; queryParams.value.field = column.prop;
@ -302,22 +291,15 @@ import {reactive, ref} from "vue";
// 打开新增页面 // 打开新增页面
const openAddReportDetailTable = () => { const openAddReportDetailTable = () => {
state.editRow = null; editReportDetailTableTitle.value = '添加汇报单详情';
state.editShow = true; editDialogRef.value.openDialog({});
};
// 关闭页面
const closeReportDetailTable = () => {
state.editShow = false;
}; };
// 打开编辑页面 // 打开编辑页面
const openEditReportDetailTable = (row: any) => { const openEditReportDetailTable = (row: any) => {
state.editRow = row; editReportDetailTableTitle.value = '编辑汇报单详情';
state.editShow = true; editDialogRef.value.openDialog(row);
// editReportDetailTableTitle.value = '编辑汇报单详情';
// editDialogRef.value.openDialog(row);
}; };