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

Compare commits

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

2 Commits
3a62efa264 ... 755dba17cf

Author SHA1 Message Date
ljh 755dba17cf Merge remote-tracking branch 'origin/main' 
# Conflicts:
#	Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
#	Web/src/views/basics-date/unit/index.vue
 2024-07-03 23:49:09 +08:00
ljh 8e81dee033 完善单位物料功能 2024-07-03 23:45:10 +08:00
13 changed files with 990 additions and 800 deletions
Show Stats Expand all files Collapse all files

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

@ -259,3 +259,34 @@ 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,5 +166,15 @@ public class MaterialsService : IDynamicApiController, ITransient
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,3 +224,21 @@ 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,6 +4,7 @@ using Admin.NET.Application.Entity;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc.ViewFeatures;
using System.Text.RegularExpressions;
using Nest;
namespace Admin.NET.Application;
/// <summary>
/// 单位服务
@ -12,6 +13,8 @@ namespace Admin.NET.Application;
public class SysUnitService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<SysUnit> _rep;
public SysUnitService(SqlSugarRepository<SysUnit> rep)
{
_rep = rep;
@ -191,41 +194,19 @@ public class SysUnitService : IDynamicApiController, ITransient
}
/// <summary>
/// 生成编码
/// 修改单位启用禁用状态
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpGet]
[ApiDescriptionSettings(Name = "createCodeNum")]
public async Task<string> CreateCodeNum()
[HttpPost]
[ApiDescriptionSettings(Name = "updateBaseUnitEnable")]
public async Task UpdateBaseUnitEnable(UpdateSysUnitEnableInput input)
{
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)
foreach (var id in input.Ids.Split(","))
{
Match match = Regex.Match(unit.CodeNum, @"\d+");
if (match.Success)
{
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";
var entity = _rep.GetById(id);
entity.IsEnable = input.IsEnable;
await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
}
}
}

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

@ -25,6 +25,7 @@ import { AdminResultSysUnit } from '../models';
import { DeleteSysUnitInput } from '../models';
import { SysUnitInput } from '../models';
import { UpdateSysUnitInput } from '../models';
import {UpdateSysUnitEnableInput} from "/@/api-services/models/update-sys-unit-enable-input";
/**
* SysUnitApi - axios parameter creator
* @export
@ -410,6 +411,54 @@ export const SysUnitApiAxiosParamCreator = function (configuration?: Configurati
const needsSerialization = (typeof body !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
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 {
url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
options: localVarRequestOptions,
@ -534,6 +583,19 @@ export const SysUnitApiFp = function(configuration?: Configuration) {
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);
};
},
}
};
@ -717,4 +779,14 @@ export class SysUnitApi extends BaseAPI {
async apiSysUnitCheckPost(body?: UpdateSysUnitInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
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 100644
View File

@ -0,0 +1,38 @@
/* 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,6 +8,7 @@ enum Api {
ListMaterials = '/api/materials/list',
MtListBySourceId = '/api/materialList/listBySourceId',
CheckMaterials = '/api/materials/CheckById',
GetMaterialsList = '/api/materials/GetMaterialsList',
}
// 增加物料
@ -72,4 +73,12 @@ export const materialListBySourceId = (sourceId: any) =>
url: Api.MtListBySourceId,
method: 'get',
data: { sourceId },
});
// 获取物料集合
export const listMaterialByUnit = (unitGroupId: any,unit:any) =>
request({
url: Api.GetMaterialsList,
method: 'post',
data: { UnitGroupId:unitGroupId,Unit:unit },
});

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

@ -2,46 +2,39 @@
<template>
<div class="sys-open-access-container">
<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-col :span="24">
<el-form-item label="物料类型" :rules="[{ required: true, message: '物料类型不能为空', trigger: 'blur' }]">
<el-input v-model="ruleForm.name" placeholder="请输入名称" clearable maxlength="32"/>
<el-input v-model="ruleForm.name" placeholder="请输入名称" clearable maxlength="32" />
</el-form-item>
</el-col>
</el-row>
</el-form>
<template #footer>
<span class="dialog-footer">
<el-row style="display: flex; justify-content: space-around;">
<el-button style="width: 100px;" type="primary" @click="matterSubmit">提交</el-button>
<el-button style="width: 100px;" @click="closeDialog">取消</el-button>
</span>
</template>
</el-row>
</el-dialog>
</div>
</template>
<script setup lang="ts">
import {onMounted, reactive, ref} from 'vue';
import {getAPI} from '/@/utils/axios-utils';
import {
MaterialClassifyApi,
} from '/@/api-services/api';
import {
MaterialsOutput,
SysUnitGroupOutput,
SysUnitOutput, UpdateMaterialClassifyInput
} from '/@/api-services/models';
import {ElMessageBox, ElMessage, TabsPaneContext} from 'element-plus';
import { onMounted, reactive, ref } from 'vue';
import { getAPI } from '/@/utils/axios-utils';
import { BrandApi, MaterialClassifyApi, PackageInfoApi, SysUnitGroupApi,SysUnitApi } from '/@/api-services/api';
import { AddMaterialsInput, BrandOutput, MaterialsOutput, PackageInfoOutput, SysUnitGroupOutput, SysUnitOutput} from '/@/api-services/models';
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";
const props = defineProps({
title: String,
orgData: Array<MaterialsOutput>,
});
//父级传递来的函数，用于回调
const emit = defineEmits(["reloadTable"]);
//父级传递来的函数，用于回调
const emit = defineEmits(["reloadTable"]);
//获取物料分类
let fyListData = ref();
@ -52,14 +45,15 @@ const fyListGet = async () => {
fyListData.value = res.data.result;
}
}
const ruleFormRef = ref();
const ruleForm = ref<any>({});
const state = reactive({
loading: false,
isShowDialog: false,
editClassifyOpenAccessTitle: '新增',
tableData: [],//as Array<MaterialsOutput>
orgTreeData: [],//as Array<MaterialsOutput>
isShowDialog:false,
editClassifyOpenAccessTitle:'新增',
tableData: [] ,//as Array<MaterialsOutput>
orgTreeData: [] ,//as Array<MaterialsOutput>
//matterFrom: {} ,//as AddMaterialsInput
queryParams: {
name: undefined,
@ -70,42 +64,41 @@ const state = reactive({
total: 0 as any,
},
editPrintTitle: '',
unitGroupData: [] as Array<SysUnitGroupOutput>,
unitData: [] as Array<SysUnitOutput>,
ruleForm: {} as UpdateMaterialClassifyInput,
unitGroupData:[] as Array<SysUnitGroupOutput>,
unitData:[] as Array<SysUnitOutput>,
});
// 打开弹窗
const openDialog = async (row: any) => {
ruleFormRef.value?.resetFields();
//ruleFormRef.value?.resetFields();
//state.selectedTabName = '0'; // 重置为第一个 tab 页
let rowData = JSON.parse(JSON.stringify(row));
if (rowData.id)
state.ruleForm = (await detailMaterialsClassify(rowData.id)).data.result;
else {
state.ruleForm = rowData;
ruleForm.value = (await detailMaterialsClassify(rowData.id)).data.result;
else{
ruleForm.value = rowData;
ruleForm.value.isEnable=true;
}
state.isShowDialog = true;
};
// 关闭弹窗
const closeDialog = () => {
// 关闭弹窗
const closeDialog = () => {
state.isShowDialog = false;
};
};
onMounted(() => {
fyListGet();
});
//提交
const matterSubmit = () => {
ruleFormRef.value.validate(async (valid: boolean) => {
if (!valid) return;
const matterSubmit = async () => {
let res;
if (props.title == '添加物料类型') {
res = await addMaterialsClassify(state.ruleForm);
} else {
res = await updateMaterialsClassify(state.ruleForm);
if (props.title=='添加物料类型'){
res = await addMaterialsClassify(ruleForm.value);
}
else {
res = await updateMaterialsClassify(ruleForm.value);
}
//console.log(res)
@ -116,17 +109,17 @@ const matterSubmit = () => {
type: 'success',
})
//state.tableData.handleList();
} else
}
else
ElMessage.error(res.message!)
emit("reloadTable");
closeDialog();
});
}
// 导出对象
defineExpose({openDialog});
defineExpose({ openDialog });
</script>
<style lang="scss" scoped>

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

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

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

@ -124,6 +124,8 @@
</template>
</el-table-column>
<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')">
<template #default="scope">
<el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditMaterials(scope.row)" v-auth="'materials:update'"> 编辑 </el-button>

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

@ -5,12 +5,12 @@
<el-row>
<el-col :span="8">
<el-form-item label="名称">
<el-input v-model="formInline.name" placeholder="请输入名称" clearable/>
<el-input v-model="formInline.name" placeholder="请输入名称" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编码">
<el-input v-model="formInline.codeNum" placeholder="请输入编码" clearable/>
<el-input v-model="formInline.codeNum" placeholder="请输入编码" clearable />
</el-form-item>
</el-col>
</el-row>
@ -33,9 +33,7 @@
<div>
<el-button type="success" link
@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 style="height: 100%;">
@ -55,9 +53,7 @@
<vxe-column title="操作" width="150" fixed="right" show-overflow>
<template #default="{ row }">
<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> -->
</template>
</vxe-column>
@ -74,66 +70,63 @@
tooltip-effect="light"
row-key="id"
border="">
<el-table-column type="selection" width="60"/>
<el-table-column prop="codeNum" label="编码" show-overflow-tooltip=""/>
<el-table-column prop="name" label="名称" show-overflow-tooltip=""/>
<el-table-column prop="code" label="代码" show-overflow-tooltip=""/>
<el-table-column type="selection" width="60" />
<el-table-column prop="codeNum" label="编码" show-overflow-tooltip="" />
<el-table-column prop="name" label="名称" show-overflow-tooltip="" />
<el-table-column prop="code" label="代码" show-overflow-tooltip="" />
<el-table-column prop="isEnable" label="可用状态" show-overflow-tooltip="">
<template #default="scope">
{{ scope.row.isEnable ? '启用' : '关闭' }}
</template>
</el-table-column>
<el-table-column prop="childUnitCount" label="子单位数" show-overflow-tooltip=""/>
<el-table-column prop="rate" label="换算率" show-overflow-tooltip=""/>
<el-table-column prop="childUnitCount" label="子单位数" show-overflow-tooltip="" />
<el-table-column prop="rate" label="换算率" show-overflow-tooltip="" />
<el-table-column prop="isEnable" label="作为基本单位" show-overflow-tooltip="">
<template #default="scope">
{{ scope.row.isBaseUnit ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="updateUserName" 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 prop="updateUserName" 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')">
<template #default="scope">
<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>
</el-table-column>
</el-table>
<!-- <vxe-table show-overflow height="100%" :data="data.unit" :border=true-->
<!-- :tree-config="{ transform: true }" :scroll-y="{ gt: 20 }">-->
<!-- <vxe-column type="checkbox" width="60" fixed="left"></vxe-column>-->
<!-- <vxe-table show-overflow height="100%" :data="data.unit" :border=true-->
<!-- :tree-config="{ transform: true }" :scroll-y="{ gt: 20 }">-->
<!-- <vxe-column type="checkbox" width="60" fixed="left"></vxe-column>-->
<!-- <vxe-column field="codeNum" sortable title="编码" width=""></vxe-column>-->
<!-- <vxe-column field="name" sortable title="名称" width=""></vxe-column>-->
<!-- <vxe-column field="code" sortable title="代码" width=""></vxe-column>-->
<!-- <vxe-column field="codeNum" sortable title="编码" width=""></vxe-column>-->
<!-- <vxe-column field="name" sortable title="名称" width=""></vxe-column>-->
<!-- <vxe-column field="code" sortable title="代码" width=""></vxe-column>-->
<!-- <vxe-column sortable title="可用状态" width="">-->
<!-- <template #default="{ row }">-->
<!-- {{ row.isEnable ? '启用' : '关闭' }}-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- <vxe-column field="childUnitCount" sortable title="子单位数" width=""></vxe-column>-->
<!-- <vxe-column field="rate" sortable title="换算率" width=""></vxe-column>-->
<!-- <vxe-column field="isBaseUnit" sortable title="作为基本单位" width="">-->
<!-- <template #default="{ row }">-->
<!-- {{ row.isBaseUnit ? '是' : '否' }}-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- <vxe-column title="操作" width="200" fixed="right" show-overflow>-->
<!-- <template #default="{ row }">-->
<!-- <vxe-button type="text" @click="editUnit(row)" icon="vxe-icon-edit">修改</vxe-button>-->
<!-- <vxe-button type="text" @click="deleteUnit(row)" icon="vxe-icon-delete" style="color: rgb(223, 65, 65)">删除</vxe-button>-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- </vxe-table>-->
<!-- <vxe-column sortable title="可用状态" width="">-->
<!-- <template #default="{ row }">-->
<!-- {{ row.isEnable ? '启用' : '关闭' }}-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- <vxe-column field="childUnitCount" sortable title="子单位数" width=""></vxe-column>-->
<!-- <vxe-column field="rate" sortable title="换算率" width=""></vxe-column>-->
<!-- <vxe-column field="isBaseUnit" sortable title="作为基本单位" width="">-->
<!-- <template #default="{ row }">-->
<!-- {{ row.isBaseUnit ? '是' : '否' }}-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- <vxe-column title="操作" width="200" fixed="right" show-overflow>-->
<!-- <template #default="{ row }">-->
<!-- <vxe-button type="text" @click="editUnit(row)" icon="vxe-icon-edit">修改</vxe-button>-->
<!-- <vxe-button type="text" @click="deleteUnit(row)" icon="vxe-icon-delete" style="color: rgb(223, 65, 65)">删除</vxe-button>-->
<!-- &lt;!&ndash; <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> &ndash;&gt;-->
<!-- </template>-->
<!-- </vxe-column>-->
<!-- </vxe-table>-->
</div>
<div style="line-height: 35px">
<el-pagination
@ -149,10 +142,10 @@
/>
</div>
<!-- <div>-->
<!-- <vxe-pager v-model:current-page="pageVO1.currentPage" v-model:page-size="pageVO1.pageSize"-->
<!-- :total="pageVO1.total" />-->
<!-- </div>-->
<!-- <div>-->
<!-- <vxe-pager v-model:current-page="pageVO1.currentPage" v-model:page-size="pageVO1.pageSize"-->
<!-- :total="pageVO1.total" />-->
<!-- </div>-->
</div>
</div>
@ -162,19 +155,19 @@
<el-col :span="8">
<el-form-item label="名称" :rules="[{ required: true, message: '名称不能为空', trigger: 'blur' }]">
<el-input v-model="unitFrom.name" placeholder="请输入名称" clearable/>
<el-input v-model="unitFrom.name" placeholder="请输入名称" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="编码" :rules="[{ required: true, message: '编码不能为空', trigger: 'blur' }]">
<el-input v-model="unitFrom.codeNum" placeholder="请输入编码" clearable/>
<el-input v-model="unitFrom.codeNum" placeholder="请输入编码" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="单位组" :rules="[{ required: true, message: '单位组不能为空', trigger: 'blur' }]">
<el-select v-model="unitFrom.groupUnitId" placeholder="请选择" clearable>
<el-option :label="item.name" :value="item.id" v-for="item, index in data.unitGroup"
:key="index"/>
:key="index" />
</el-select>
</el-form-item>
</el-col>
@ -182,47 +175,47 @@
<el-row>
<el-col :span="8">
<el-form-item label="精度">
<el-input v-model="unitFrom.accuracy" placeholder="请输入" clearable/>
<el-input v-model="unitFrom.accuracy" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="子单位数" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-input v-model="unitFrom.childUnitCount" placeholder="下级单位数量" clearable/>
<el-input v-model="unitFrom.childUnitCount" placeholder="下级单位数量" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="换算率" :rules="[{ required: true, message: '不能为空', trigger: 'blur' }]">
<el-input v-model="unitFrom.rate" placeholder="基本单位数量" clearable/>
<el-input v-model="unitFrom.rate" placeholder="基本单位数量" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="代码">
<el-input v-model="unitFrom.code" placeholder="请输入" clearable/>
<el-input v-model="unitFrom.code" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="外部编码">
<el-input v-model="unitFrom.externalNumber" placeholder="请输入" clearable/>
<el-input v-model="unitFrom.externalNumber" placeholder="请输入" clearable />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="备注">
<el-input v-model="unitFrom.remarks" placeholder="请输入" clearable/>
<el-input v-model="unitFrom.remarks" placeholder="请输入" clearable />
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="基本单位">
<el-switch v-model="unitFrom.isBaseUnit" inline-prompt active-text="是" inactive-text="否"/>
<el-switch v-model="unitFrom.isBaseUnit" inline-prompt active-text="是" inactive-text="否" />
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="是否启用">
<el-switch v-model="unitFrom.isEnable" inline-prompt active-text="启用" inactive-text="禁用"/>
<el-switch v-model="unitFrom.isEnable" inline-prompt active-text="启用" inactive-text="禁用" />
</el-form-item>
</el-col>
</el-row>
@ -233,8 +226,8 @@
<el-button style="width: 100px;" @click="dialogTableVisible = false">取消</el-button>
</el-row>
</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>
<div style="color: #fff">
<span>单位组</span>
@ -243,13 +236,12 @@
<el-form :model="unitGroupModel" label-width="auto" :rules="rules">
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<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-col>
<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
<el-form-item label="是否启用" prop="isEnable">
<el-switch v-model="unitGroupModel.isEnable" active-text="是" inactive-text="否"/>
<el-switch v-model="unitGroupModel.isEnable" active-text="是" inactive-text="否" />
</el-form-item>
</el-col>
</el-form>
@ -260,73 +252,69 @@
</span>
</template>
</el-dialog>
</div>
</div>
</template>
<script setup lang="ts" name="sysUnit">
import {onMounted, reactive, ref} from 'vue'
import {getAPI} from '/@/utils/axios-utils';
import {SysUnitApi, SysUnitGroupApi} from '/@/api-services/api';
import {
AddSysUnitInput,
SqlSugarPagedListSysUnitOutput,
SysUnitGroupOutput,
SysUnitInput
} from '/@/api-services/models';
import type {FormRules} from "element-plus";
import {ElMessageBox, ElMessage} from 'element-plus';
import { onMounted, reactive, ref } from 'vue'
import { getAPI } from '/@/utils/axios-utils';
import { SysUnitApi, SysUnitGroupApi } from '/@/api-services/api';
import { AddSysUnitInput, SqlSugarPagedListSysUnitOutput, SysUnitGroupOutput, SysUnitInput} from '/@/api-services/models';
import type { FormRules } from "element-plus";
import { ElMessageBox, ElMessage } from 'element-plus';
import {auth} from "/@/utils/authFunction";
let data = reactive({
unit: [] as SqlSugarPagedListSysUnitOutput[],//单位数据
unitGroup: [] as SysUnitGroupOutput[],//单位组数据
selectUnitGroupId: 0,
selectUnitGroupId:0,
});
const loading = ref(false);
const ruleFormRef = ref();
const isShowDialog = ref(false);
const isShowDialog=ref(false);
const tableParams = ref({
page: 1,
pageSize: 10,
total: 0,
});
let unitGroupModel = reactive<any>({isEnable: true, isDelete: false});
//自行添加其他规则
const rules = ref<FormRules>({
let unitGroupModel=reactive<any>({isEnable:true,isDelete:false});
//自行添加其他规则
const rules = ref<FormRules>({
name: [{required: true, message: '请输入名称', trigger: 'blur',},],
});
});
let mTitle = ref('新增');
let mTitle = ref('新增');
let mGroupTitle = ref('新增');
let dialogTableVisible = ref(false);
const unitFrom = ref<any>({isEnable: true, isDelete: false, name: '', codeNum: ''})
const cancel = () => {
isShowDialog.value = false
}
const unitFrom = ref<any>({isEnable:true,isDelete:false,name:'',codeNum:''})
//定义submit方法，新增单位组
const submit = async () => {
if (mGroupTitle.value == '新增') {
const cancel=()=>{
isShowDialog.value=false
}
//定义submit方法，新增单位组
const submit = async () => {
if(mGroupTitle.value=='新增'){
let res = await getAPI(SysUnitGroupApi).apiSysUnitGroupAddPost(unitGroupModel);
console.log(res)
if (res.data.code === 200) {
if (res.data.code===200) {
isShowDialog.value = false;
unitGroup();
}
} else {
}else{
let res = await getAPI(SysUnitGroupApi).apiSysUnitGroupUpdatePost(unitGroupModel);
if (res.data.code === 200) {
if (res.data.code===200) {
isShowDialog.value = false;
unitGroup();
}
}
};
};
//获取单位组数据
const unitGroup = async () => {
@ -335,18 +323,15 @@ const unitGroup = async () => {
}
//单选
const radioChangeEvent = ({row}) => {
const radioChangeEvent = ({ row }) => {
data.selectUnitGroupId = row.id;
unitPage({groupUnitId: row.id})
unitPage({groupUnitId:row.id})
}
const formInline = reactive({} as SysUnitInput)
//获取单位数据
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;
tableParams.value.total = res.data.result?.total;
}
@ -354,49 +339,50 @@ const unitPage = async (parameter = formInline) => {
// 改变页面容量
const handleSizeChange = (val: number) => {
tableParams.value.pageSize = val;
unitPage({groupUnitId: data.selectUnitGroupId});
unitPage({groupUnitId:data.selectUnitGroupId});
};
// 改变页码序号
const handleCurrentChange = (val: number) => {
tableParams.value.page = val;
unitPage({groupUnitId: data.selectUnitGroupId});
unitPage({groupUnitId:data.selectUnitGroupId});
};
const addUnit = () => {
unitFrom.value.codeNum = 'DW' + getCurrentDate();
dialogTableVisible.value = true;
mTitle.value = '新增'
const addUnit= ()=>{
unitFrom.value.codeNum = 'DW'+ getCurrentDate();
dialogTableVisible.value=true;
mTitle.value='新增'
}
//提交
const unitSubmit = async () => {
//校验基本单位是否唯一
let checkRes = await getAPI(SysUnitApi).apiSysUnitCheckPost(unitFrom.value);
if (checkRes.data.code === 200) {
if(checkRes.data.code === 200){
const item = checkRes.data.result;
if (mTitle.value == '新增') {
if (unitFrom.value.isBaseUnit && item != null) {
ElMessage({message: '基本单位必须唯一', type: 'error',});
if(mTitle.value=='新增'){
if(unitFrom.value.isBaseUnit && item!=null){
ElMessage({ message: '基本单位必须唯一', type: 'error', });
unitFrom.value.isBaseUnit = false;
return;
}
let res = await getAPI(SysUnitApi).apiSysUnitAddPost(unitFrom.value);
if (res.data.code === 200) {
if (res.data.code===200) {
dialogTableVisible.value = false;
unitPage({groupUnitId: data.selectUnitGroupId});
unitPage({groupUnitId:data.selectUnitGroupId});
}
} else {
if (unitFrom.value.isBaseUnit && item != null && item.id != unitFrom.value.id) {
ElMessage({message: '基本单位必须唯一', type: 'error',});
}else{
if(unitFrom.value.isBaseUnit && item!=null && item.id!=unitFrom.value.id)
{
ElMessage({ message: '基本单位必须唯一', type: 'error', });
unitFrom.value.isBaseUnit = false;
return;
}
let res = await getAPI(SysUnitApi).apiSysUnitUpdatePost(unitFrom.value);
if (res.data.code === 200) {
if (res.data.code===200) {
dialogTableVisible.value = false;
unitPage({groupUnitId: data.selectUnitGroupId});
unitPage({groupUnitId:data.selectUnitGroupId});
}
}
}
@ -413,13 +399,13 @@ const getCurrentDate = () => {
return `${year}${month}${day}${hours}${minutes}${seconds}`;
}
const editUnit = async (row: any) => {
unitFrom.value = reactive({ ...row });
mTitle.value = '编辑'
dialogTableVisible.value = true;
const editUnit=async(row:any)=>{
unitFrom.value=row;
mTitle.value='编辑'
dialogTableVisible.value=true;
}
const deleteUnit = async (row: any) => {
const deleteUnit=async(row:any)=>{
ElMessageBox.confirm(`确定删除?`, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -428,33 +414,32 @@ const deleteUnit = async (row: any) => {
.then(async () => {
let res = await getAPI(SysUnitApi).apiSysUnitDeletePost(row);
if (res.data.code == 200) {
ElMessage({message: '成功', type: 'success',})
unitPage({groupUnitId: data.selectUnitGroupId});
ElMessage({ message: '成功', type: 'success', })
unitPage({groupUnitId:data.selectUnitGroupId});
//state.tableData.handleList();
} else
ElMessage.error(res.data.message!)
})
.catch(() => {
});
.catch(() => {});
}
const addUnitGroup = () => {
const addUnitGroup=()=>{
isShowDialog.value = true
isShowDialog.value=true
}
const editUnitGroup = (row: any) => {
mGroupTitle.value = '编辑'
isShowDialog.value = true;
unitGroupModel = reactive({ ...row });
const editUnitGroup=async(row:any)=>{
unitGroupModel=row;
mGroupTitle.value='编辑'
isShowDialog.value=true;
}
const deleteUnitGroup = async (row: any) => {
let checkRes = await getAPI(SysUnitGroupApi).apiSysUnitGroupCheckPost({Id: row.id});
if (checkRes.data.code == 200) {
const deleteUnitGroup=async(row:any)=>{
let checkRes = await getAPI(SysUnitGroupApi).apiSysUnitGroupCheckPost({Id:row.id});
if(checkRes.data.code == 200){
const result = checkRes.data.result;
if (result) {
if(result){
return ElMessage.error("存在单位数据,不允许删除")
}
ElMessageBox.confirm(`确定删除?`, '提示', {
@ -466,15 +451,14 @@ const deleteUnitGroup = async (row: any) => {
console.log(row)
let res = await getAPI(SysUnitGroupApi).apiSysUnitGroupDeletePost(row);
if (res.data.code == 200) {
ElMessage({message: '成功', type: 'success',})
ElMessage({ message: '成功', type: 'success', })
unitGroup()
unitPage({groupUnitId: data.selectUnitGroupId})
unitPage({groupUnitId:data.selectUnitGroupId})
//state.tableData.handleList();
} else
ElMessage.error(res.data.message!)
})
.catch(() => {
});
.catch(() => {});
}
}
@ -487,7 +471,7 @@ const pageVO1 = reactive({
onMounted(() => {
unitGroup()
unitPage({groupUnitId: data.selectUnitGroupId})
unitPage({groupUnitId:data.selectUnitGroupId})
})
</script>

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

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

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

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