Merge remote-tracking branch 'origin/main'

# Conflicts:
#	Web/src/views/basics-date/matter/component/editClassifyOpenAccess.vue
#	Web/src/views/basics-date/unit/index.vue

Admin.NET/Admin.NET.Application/Service/Materials/Dto/MaterialsInput.cs

@@ -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; }
+
+}

Admin.NET/Admin.NET.Application/Service/Materials/MaterialsService.cs

@@ -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;
+    }
 }
 

Admin.NET/Admin.NET.Application/Service/SysUnit/Dto/SysUnitInput.cs

@@ -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; }
+}
+

Admin.NET/Admin.NET.Application/Service/SysUnit/SysUnitService.cs

@@ -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]
+    [HttpPost]
-    [ApiDescriptionSettings(Name = "createCodeNum")]
+    [ApiDescriptionSettings(Name = "updateBaseUnitEnable")]
-    public async Task<string> CreateCodeNum()
+    public async Task UpdateBaseUnitEnable(UpdateSysUnitEnableInput input)
     {
-        string dt = DateTime.Now.ToString("yyyyMMdd");
+        foreach (var id in input.Ids.Split(","))
-        var unit = await _rep.AsQueryable()
-             .Where(a => !a.IsDelete)
-             .Where(a => a.CodeNum.Contains(dt))
-             .OrderByDescending(t => t.CodeNum)
-             .FirstAsync();
-        if (unit != null)
         {
-            Match match = Regex.Match(unit.CodeNum, @"\d+");
+            var entity = _rep.GetById(id);
-            if (match.Success)
+            entity.IsEnable = input.IsEnable;
-            {
+            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";
         }
     }
 }

Web/src/api-services/apis/sys-unit-api.ts

@@ -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));
+
+    }
 }

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

@@ -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;
+}

Web/src/api/main/materials.ts

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

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

@@ -2,7 +2,7 @@
 <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' }]">
@@ -11,13 +11,10 @@
                     </el-col>
                 </el-row>
             </el-form>
-      <template #footer>
+            <el-row style="display: flex; justify-content: space-around;">
-				<span class="dialog-footer">
                 <el-button style="width: 100px;" type="primary" @click="matterSubmit">提交</el-button>
                 <el-button style="width: 100px;" @click="closeDialog">取消</el-button>
-				</span>
+            </el-row>
-      </template>
-
         </el-dialog>
     </div>
 </template>
@@ -25,15 +22,11 @@
 <script setup lang="ts">
 import { onMounted, reactive, ref } from 'vue';
 import { getAPI } from '/@/utils/axios-utils';
-import {
+import { BrandApi, MaterialClassifyApi, PackageInfoApi, SysUnitGroupApi,SysUnitApi } from '/@/api-services/api';
-  MaterialClassifyApi,
+import { AddMaterialsInput, BrandOutput, MaterialsOutput, PackageInfoOutput, SysUnitGroupOutput, SysUnitOutput} from '/@/api-services/models';
-} from '/@/api-services/api';
-import {
-  MaterialsOutput,
-  SysUnitGroupOutput,
-  SysUnitOutput, UpdateMaterialClassifyInput
-} 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({
@@ -52,7 +45,8 @@ const fyListGet = async () => {
         fyListData.value = res.data.result;
     }
 }
-const ruleFormRef = ref();
+
+const ruleForm = ref<any>({});
 
 const state = reactive({
 	loading: false,
@@ -72,18 +66,18 @@ const state = reactive({
 	editPrintTitle: '',
     unitGroupData:[] as Array<SysUnitGroupOutput>,
     unitData:[] as Array<SysUnitOutput>,
-  ruleForm: {} as UpdateMaterialClassifyInput,
 });
 
 // 打开弹窗
 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;
+        ruleForm.value = (await detailMaterialsClassify(rowData.id)).data.result;
 		else{
-    state.ruleForm = rowData;
+            ruleForm.value = rowData;
+            ruleForm.value.isEnable=true;
         }
 	state.isShowDialog = true;
 };
@@ -98,14 +92,13 @@ onMounted(() => {
 });
 
 //提交
-const matterSubmit = () => {
+const matterSubmit = async () => {
-  ruleFormRef.value.validate(async (valid: boolean) => {
-    if (!valid) return;
     let res;
     if (props.title=='添加物料类型'){
-      res = await addMaterialsClassify(state.ruleForm);
+        res = await addMaterialsClassify(ruleForm.value);
-    } else {
+    }
-      res = await updateMaterialsClassify(state.ruleForm);
+    else {
+        res = await updateMaterialsClassify(ruleForm.value);
     }
     //console.log(res)
 
@@ -116,15 +109,15 @@ const matterSubmit = () => {
             type: 'success',
         })
         //state.tableData.handleList();
-    } else
+    } 
+    else
         ElMessage.error(res.message!)
     emit("reloadTable");
     closeDialog();
-  });
-
 }
 
 
+
 // 导出对象
 defineExpose({ openDialog });
 </script>

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

@@ -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();
+	ruleFormRef.value?.resetFields();
-	//state.selectedTabName = '0'; // 重置为第一个 tab 页
+	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 == '添加物料') {
         res = await addMaterials(ruleForm.value);
-    }
+      } else {
-    else {
         res = await updateMaterials(ruleForm.value);
       }
       //console.log(res)
@@ -323,11 +338,12 @@ const matterSubmit = async () => {
           type: 'success',
         })
         //state.tableData.handleList();
-    } 
+      } else
-    else
         ElMessage.error(res.message!)
       closeDialog();
     }
+  });
+}
 
 
 // //获取包装关系

Web/src/views/basics-date/matter/index.vue

@@ -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>

Web/src/views/basics-date/unit/index.vue

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

Web/src/views/productionCenter/reportDetailTable/component/editDialog.vue

@@ -1,12 +1,5 @@
 <template>
-	<div class="reportDetailTable-container">
+	<div class="reportDetailTable-container" style="height: 100vh">
-		<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-row :gutter="35">
 					<el-form-item v-show="false">
@@ -169,17 +162,24 @@
 						</el-form-item>
 					</el-col>
 				</el-row>
-			</el-form>
+        <div class="footer" align="right" >
-			<template #footer>
-				<span class="dialog-footer">
           <el-button @click="cancel">取 消</el-button>
           <el-button type="primary" @click="submit">确 定</el-button>
-				</span>
+        </div>
-			</template>
+			</el-form>
-		</el-dialog>
+
   </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,11 +228,9 @@
 	const teamOfGroups = ref<any>([]);
 	const employees = ref<any>([]);
 
-	// 打开弹窗
+  onMounted(async () => {
-	const openDialog = async (row: any) => {
+    if(props.row) {
-		// ruleForm.value = JSON.parse(JSON.stringify(row));
+      let rowData = JSON.parse(JSON.stringify(props.row));
-		// 改用detail获取最新数据来编辑
-		let rowData = JSON.parse(JSON.stringify(row));
       if (rowData.id)
         ruleForm.value = (await detailReportDetailTable(rowData.id)).data.result;
       else
@@ -241,9 +240,26 @@
         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>
 
 

Web/src/views/productionCenter/reportDetailTable/index.vue

@@ -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 = '添加汇报单详情';
+    state.editRow = null;
-    editDialogRef.value.openDialog({});
+    state.editShow = true;
+  };
+
+  // 关闭页面
+  const closeReportDetailTable = () => {
+    state.editShow = false;
   };
 
   
   // 打开编辑页面
   const openEditReportDetailTable = (row: any) => {
-    editReportDetailTableTitle.value = '编辑汇报单详情';
+    state.editRow = row;
-    editDialogRef.value.openDialog(row);
+    state.editShow = true;
+    // editReportDetailTableTitle.value = '编辑汇报单详情';
+    // editDialogRef.value.openDialog(row);
   };