0516

Admin.NET/Admin.NET.Application/Entity/PrintData.cs

@@ -0,0 +1,28 @@
+using Admin.NET.Core;
+namespace Admin.NET.Application.Entity;
+
+/// <summary>
+/// 打印信息
+/// </summary>
+[SugarTable("PrintData","打印信息")]
+public class PrintData  : EntityBaseId
+{
+    /// <summary>
+    /// 条码数据
+    /// </summary>
+    [SugarColumn(ColumnName = "BarCode", ColumnDescription = "条码数据", Length = 64)]
+    public string? BarCode { get; set; }
+    
+    /// <summary>
+    /// 二维码数据
+    /// </summary>
+    [SugarColumn(ColumnName = "QrCode", ColumnDescription = "二维码数据", Length = 128)]
+    public string? QrCode { get; set; }
+    
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [SugarColumn(ColumnName = "Remark", ColumnDescription = "备注", Length = 32)]
+    public string? Remark { get; set; }
+    
+}

Admin.NET/Admin.NET.Application/Service/PrintData/Dto/PrintDataInput.cs

@@ -0,0 +1,56 @@
+using Admin.NET.Core;
+using System.ComponentModel.DataAnnotations;
+
+namespace Admin.NET.Application;
+
+    /// <summary>
+    /// 打印信息基础输入参数
+    /// </summary>
+    public class PrintDataBaseInput
+    {
+        /// <summary>
+        /// 条码数据
+        /// </summary>
+        public virtual string? BarCode { get; set; }
+        
+        /// <summary>
+        /// 二维码数据
+        /// </summary>
+        public virtual string? QrCode { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public virtual string? Remark { get; set; }
+        
+    }
+
+    /// <summary>
+    /// 打印信息分页查询输入参数
+    /// </summary>
+    public class PrintDataInput : BasePageInput
+    {
+        /// <summary>
+        /// 关键字查询
+        /// </summary>
+        public string? SearchKey { get; set; }
+
+        /// <summary>
+        /// 条码数据
+        /// </summary>
+        public string? BarCode { get; set; }
+        
+        /// <summary>
+        /// 二维码数据
+        /// </summary>
+        public string? QrCode { get; set; }
+        
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; }
+        
+    }
+
+
+

Admin.NET/Admin.NET.Application/Service/PrintData/Dto/PrintDataMaterialsInput.cs

@@ -0,0 +1,40 @@
+namespace Admin.NET.Application;
+
+/// <summary>
+/// 打印信息输出参数
+/// </summary>
+public class PrintDataMaterialsInput
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+
+    /// <summary>
+    /// 编码头
+    /// </summary>
+    public string CodeHead { get; set; }
+
+    /// <summary>
+    /// 编码长度
+    /// </summary>
+    public int CodeLength { get; set; }
+
+    /// <summary>
+    /// 数量
+    /// </summary>
+    public int Count { get; set; }
+    
+    /// <summary>
+    /// 码类型
+    /// </summary>
+    public string? CodeType { get; set; }
+    
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string? Remark { get; set; }
+    
+}
+ 
+

Admin.NET/Admin.NET.Application/Service/PrintData/PrintDataService.cs

@@ -0,0 +1,137 @@
+using Admin.NET.Core.Service;
+using Admin.NET.Application.Const;
+using Admin.NET.Application.Entity;
+using Microsoft.AspNetCore.Http;
+namespace Admin.NET.Application;
+/// <summary>
+/// 打印信息服务
+/// </summary>
+[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100)]
+public class PrintDataService : IDynamicApiController, ITransient
+{
+    private readonly SqlSugarRepository<PrintData> _rep;
+    public PrintDataService(SqlSugarRepository<PrintData> rep)
+    {
+        _rep = rep;
+    }
+
+    /// <summary>
+    /// 分页查询打印信息
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "Page")]
+    public async Task<SqlSugarPagedList<PrintData>> Page(PrintDataInput input)
+    {
+        var query = _rep.AsQueryable()
+            .WhereIF(!string.IsNullOrWhiteSpace(input.SearchKey), u =>
+                u.BarCode.Contains(input.SearchKey.Trim())
+                || u.QrCode.Contains(input.SearchKey.Trim())
+                || u.Remark.Contains(input.SearchKey.Trim())
+            )
+            .WhereIF(!string.IsNullOrWhiteSpace(input.BarCode), u => u.BarCode.Contains(input.BarCode.Trim()))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.QrCode), u => u.QrCode.Contains(input.QrCode.Trim()))
+            .WhereIF(!string.IsNullOrWhiteSpace(input.Remark), u => u.Remark.Contains(input.Remark.Trim()))
+            .Select<PrintData>();
+        return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+    }
+
+    /// <summary>
+    /// 增加打印信息
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "Add")]
+    public async Task<long> Add(PrintData input)
+    {
+        var entity = input.Adapt<PrintData>();
+        await _rep.InsertAsync(entity);
+        return entity.Id;
+    }
+
+    /// <summary>
+    /// 删除打印信息
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "Delete")]
+    public async Task Delete(long id)
+    {
+        var entity = await _rep.GetFirstAsync(u => u.Id == id) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+        //await _rep.FakeDeleteAsync(entity);   //假删除
+        await _rep.DeleteAsync(entity);   //真删除
+    }
+
+    /// <summary>
+    /// 更新打印信息
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "Update")]
+    public async Task Update(PrintDataInput input)
+    {
+        var entity = input.Adapt<PrintData>();
+        await _rep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+    }
+
+    /// <summary>
+    /// 获取打印信息
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [ApiDescriptionSettings(Name = "Detail")]
+    public async Task<PrintData> Detail([FromQuery] long id)
+    {
+        return await _rep.GetFirstAsync(u => u.Id == id);
+    }
+
+    /// <summary>
+    /// 获取打印信息列表
+    /// </summary>
+    /// <param name="input"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [ApiDescriptionSettings(Name = "GetPrintDataList")]
+    public async Task<List<PrintData>> GetPrintDataList(PrintDataMaterialsInput input)
+    {
+        var result = new List<PrintData>();
+        var headCode = string.IsNullOrEmpty(input.CodeHead) ? "" : input.CodeHead;
+        int countN = input.CodeLength > 3 ? input.CodeLength : 5;
+        var format = "";
+        for (int i = 0; i < countN; i++)
+        {
+            format += "0";
+        }
+        for (int i = 1; i < input.Count+1; i++)
+        {
+            var code = $"{headCode}{i.ToString(format)}";
+            if (input.CodeType == "条形码")
+            {
+                result.Add(new PrintData() { BarCode = code });
+            }
+            else
+            {
+                result.Add(new PrintData() { QrCode = code });
+            }
+        }
+        return  result;
+    }
+
+    /// <summary>
+    /// 获取打印信息列表
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [ApiDescriptionSettings(Name = "List")]
+    public async Task<List<PrintData>> List()
+    {
+        return await _rep.AsQueryable().ToListAsync();
+    }
+
+}
+

Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -134,7 +134,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=1310000000395, Pid=1310000000391, Title="删除", Permission="sysFile:delete", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000396, Pid=1310000000391, Title="编辑", Permission="sysFile:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2023-10-27 00:00:00"), OrderNo=100 },
 
-            new SysMenu{ Id=1310000000401, Pid=1310000000301, Title="打印模板", Path="/platform/print", Name="sysPrint", Component="/system/print/index", Icon="ele-Printer", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=190 },
+            new SysMenu{ Id=1310000000401, Pid=32518995172933, Title="打印模板", Path="/labelPrinting/print", Name="sysPrint", Component="/labelPrinting/print/index", Icon="ele-Printer", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=190 },
             new SysMenu{ Id=1310000000402, Pid=1310000000401, Title="查询", Permission="sysPrint:page", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000403, Pid=1310000000401, Title="编辑", Permission="sysPrint:update", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000404, Pid=1310000000401, Title="增加", Permission="sysPrint:add", Type=MenuTypeEnum.Btn, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },

Web/.env.development

@@ -1,5 +1,5 @@
 # 本地环境
 ENV = development
 
-# 本地环境接口地址http://localhost:5005
+# 本地环境接口地址http://localhost:5005     http://139.199.191.197:9005
 VITE_API_URL = http://139.199.191.197:9005

Web/package.json

@@ -26,6 +26,7 @@
     "echarts": "^5.5.0",
     "echarts-gl": "^2.0.9",
     "echarts-wordcloud": "^2.1.0",
+    "element-china-area-data": "^6.1.0",
     "element-plus": "^2.6.1",
     "js-cookie": "^3.0.5",
     "js-table2excel": "^1.1.2",

Web/src/api-services/api.ts

@@ -73,4 +73,5 @@ export * from './apis/sys-wechat-user-api';
 export * from './apis/sys-wx-open-api';
 export * from './apis/warehouse-api';
 export * from './apis/warehousing-api';
+export * from './apis/print-data-api';
 

Web/src/api-services/apis/print-data-api.ts

@@ -0,0 +1,635 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 业务应用
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * 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.
+ */
+
+import globalAxios, { AxiosResponse, AxiosInstance, AxiosRequestConfig } from 'axios';
+import { Configuration } from '../configuration';
+// Some imports not used depending on template conditions
+// @ts-ignore
+import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
+import { AdminResultInt64 } from '../models';
+import { AdminResultListPrintData } from '../models';
+import { AdminResultPrintData } from '../models';
+import { AdminResultSqlSugarPagedListPrintData } from '../models';
+import { PrintData } from '../models';
+import { PrintDataInput } from '../models';
+import { PrintDataMaterialsInput } from '../models';
+/**
+ * PrintDataApi - axios parameter creator
+ * @export
+ */
+export const PrintDataApiAxiosParamCreator = function (configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 增加打印信息
+         * @param {PrintData} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataAddPost: async (body?: PrintData, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/add`;
+            // 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,
+            };
+        },
+        /**
+         * 
+         * @summary 删除打印信息
+         * @param {number} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataDeleteIdPost: async (id: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            // verify required parameter 'id' is not null or undefined
+            if (id === null || id === undefined) {
+                throw new RequiredError('id','Required parameter id was null or undefined when calling apiPrintDataDeleteIdPost.');
+            }
+            const localVarPath = `/api/printData/delete/{id}`
+                .replace(`{${"id"}}`, encodeURIComponent(String(id)));
+            // 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;
+            }
+
+            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};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息
+         * @param {number} [id] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataDetailGet: async (id?: number, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/detail`;
+            // 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: 'GET', ...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;
+            }
+
+            if (id !== undefined) {
+                localVarQueryParameter['id'] = id;
+            }
+
+            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};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {PrintDataMaterialsInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataGetPrintDataListPost: async (body?: PrintDataMaterialsInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/getPrintDataList`;
+            // 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,
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataListGet: async (options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/list`;
+            // 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: 'GET', ...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;
+            }
+
+            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};
+
+            return {
+                url: localVarUrlObj.pathname + localVarUrlObj.search + localVarUrlObj.hash,
+                options: localVarRequestOptions,
+            };
+        },
+        /**
+         * 
+         * @summary 分页查询打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataPagePost: async (body?: PrintDataInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/page`;
+            // 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,
+            };
+        },
+        /**
+         * 
+         * @summary 更新打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        apiPrintDataUpdatePost: async (body?: PrintDataInput, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/printData/update`;
+            // 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,
+            };
+        },
+    }
+};
+
+/**
+ * PrintDataApi - functional programming interface
+ * @export
+ */
+export const PrintDataApiFp = function(configuration?: Configuration) {
+    return {
+        /**
+         * 
+         * @summary 增加打印信息
+         * @param {PrintData} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataAddPost(body?: PrintData, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultInt64>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataAddPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 删除打印信息
+         * @param {number} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataDeleteIdPost(id: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataDeleteIdPost(id, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息
+         * @param {number} [id] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataDetailGet(id?: number, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultPrintData>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataDetailGet(id, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {PrintDataMaterialsInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataGetPrintDataListPost(body?: PrintDataMaterialsInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListPrintData>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataGetPrintDataListPost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataListGet(options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultListPrintData>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataListGet(options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 分页查询打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataPagePost(body?: PrintDataInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<AdminResultSqlSugarPagedListPrintData>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataPagePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+        /**
+         * 
+         * @summary 更新打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataUpdatePost(body?: PrintDataInput, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => Promise<AxiosResponse<void>>> {
+            const localVarAxiosArgs = await PrintDataApiAxiosParamCreator(configuration).apiPrintDataUpdatePost(body, options);
+            return (axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
+                const axiosRequestArgs :AxiosRequestConfig = {...localVarAxiosArgs.options, url: basePath + localVarAxiosArgs.url};
+                return axios.request(axiosRequestArgs);
+            };
+        },
+    }
+};
+
+/**
+ * PrintDataApi - factory interface
+ * @export
+ */
+export const PrintDataApiFactory = function (configuration?: Configuration, basePath?: string, axios?: AxiosInstance) {
+    return {
+        /**
+         * 
+         * @summary 增加打印信息
+         * @param {PrintData} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataAddPost(body?: PrintData, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultInt64>> {
+            return PrintDataApiFp(configuration).apiPrintDataAddPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 删除打印信息
+         * @param {number} id 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataDeleteIdPost(id: number, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return PrintDataApiFp(configuration).apiPrintDataDeleteIdPost(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取打印信息
+         * @param {number} [id] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataDetailGet(id?: number, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultPrintData>> {
+            return PrintDataApiFp(configuration).apiPrintDataDetailGet(id, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {PrintDataMaterialsInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataGetPrintDataListPost(body?: PrintDataMaterialsInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListPrintData>> {
+            return PrintDataApiFp(configuration).apiPrintDataGetPrintDataListPost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 获取打印信息列表
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataListGet(options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultListPrintData>> {
+            return PrintDataApiFp(configuration).apiPrintDataListGet(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 分页查询打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataPagePost(body?: PrintDataInput, options?: AxiosRequestConfig): Promise<AxiosResponse<AdminResultSqlSugarPagedListPrintData>> {
+            return PrintDataApiFp(configuration).apiPrintDataPagePost(body, options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary 更新打印信息
+         * @param {PrintDataInput} [body] 
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async apiPrintDataUpdatePost(body?: PrintDataInput, options?: AxiosRequestConfig): Promise<AxiosResponse<void>> {
+            return PrintDataApiFp(configuration).apiPrintDataUpdatePost(body, options).then((request) => request(axios, basePath));
+        },
+    };
+};
+
+/**
+ * PrintDataApi - object-oriented interface
+ * @export
+ * @class PrintDataApi
+ * @extends {BaseAPI}
+ */
+export class PrintDataApi extends BaseAPI {
+    /**
+     * 
+     * @summary 增加打印信息
+     * @param {PrintData} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataAddPost(body?: PrintData, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultInt64>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataAddPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 删除打印信息
+     * @param {number} id 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataDeleteIdPost(id: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataDeleteIdPost(id, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取打印信息
+     * @param {number} [id] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataDetailGet(id?: number, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultPrintData>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataDetailGet(id, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取打印信息列表
+     * @param {PrintDataMaterialsInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataGetPrintDataListPost(body?: PrintDataMaterialsInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListPrintData>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataGetPrintDataListPost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 获取打印信息列表
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataListGet(options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultListPrintData>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataListGet(options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 分页查询打印信息
+     * @param {PrintDataInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataPagePost(body?: PrintDataInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<AdminResultSqlSugarPagedListPrintData>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataPagePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+    /**
+     * 
+     * @summary 更新打印信息
+     * @param {PrintDataInput} [body] 
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof PrintDataApi
+     */
+    public async apiPrintDataUpdatePost(body?: PrintDataInput, options?: AxiosRequestConfig) : Promise<AxiosResponse<void>> {
+        return PrintDataApiFp(this.configuration).apiPrintDataUpdatePost(body, options).then((request) => request(this.axios, this.basePath));
+    }
+}

Web/src/api-services/models/print-data-input.ts

@@ -0,0 +1,94 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 业务应用
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * 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 PrintDataInput
+ */
+export interface PrintDataInput {
+
+    /**
+     * 当前页码
+     *
+     * @type {number}
+     * @memberof PrintDataInput
+     */
+    page?: number;
+
+    /**
+     * 页码容量
+     *
+     * @type {number}
+     * @memberof PrintDataInput
+     */
+    pageSize?: number;
+
+    /**
+     * 排序字段
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    field?: string | null;
+
+    /**
+     * 排序方向
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    order?: string | null;
+
+    /**
+     * 降序排序
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    descStr?: string | null;
+
+    /**
+     * 关键字查询
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    searchKey?: string | null;
+
+    /**
+     * 条码数据
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    barCode?: string | null;
+
+    /**
+     * 二维码数据
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    qrCode?: string | null;
+
+    /**
+     * 备注
+     *
+     * @type {string}
+     * @memberof PrintDataInput
+     */
+    remark?: string | null;
+}

Web/src/api-services/models/print-data-materials-input.ts

@@ -0,0 +1,70 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 业务应用
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * 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 PrintDataMaterialsInput
+ */
+export interface PrintDataMaterialsInput {
+
+    /**
+     * 主键Id
+     *
+     * @type {number}
+     * @memberof PrintDataMaterialsInput
+     */
+    id?: number;
+
+    /**
+     * 编码头
+     *
+     * @type {string}
+     * @memberof PrintDataMaterialsInput
+     */
+    codeHead?: string | null;
+
+    /**
+     * 编码长度
+     *
+     * @type {number}
+     * @memberof PrintDataMaterialsInput
+     */
+    codeLength?: number;
+
+    /**
+     * 数量
+     *
+     * @type {number}
+     * @memberof PrintDataMaterialsInput
+     */
+    count?: number;
+
+    /**
+     * 码类型
+     *
+     * @type {string}
+     * @memberof PrintDataMaterialsInput
+     */
+    codeType?: string | null;
+
+    /**
+     * 备注
+     *
+     * @type {string}
+     * @memberof PrintDataMaterialsInput
+     */
+    remark?: string | null;
+}

Web/src/api-services/models/print-data.ts

@@ -0,0 +1,54 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * 业务应用
+ * No description provided (generated by Swagger Codegen https://github.com/swagger-api/swagger-codegen)
+ *
+ * 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 PrintData
+ */
+export interface PrintData {
+
+    /**
+     * 雪花Id
+     *
+     * @type {number}
+     * @memberof PrintData
+     */
+    id?: number;
+
+    /**
+     * 条码数据
+     *
+     * @type {string}
+     * @memberof PrintData
+     */
+    barCode?: string | null;
+
+    /**
+     * 二维码数据
+     *
+     * @type {string}
+     * @memberof PrintData
+     */
+    qrCode?: string | null;
+
+    /**
+     * 备注
+     *
+     * @type {string}
+     * @memberof PrintData
+     */
+    remark?: string | null;
+}

Web/src/api/main/packageInfo.ts

@@ -0,0 +1,50 @@
+import request from '/@/utils/request';
+enum Api {
+  AddPackageInfo = '/api/packageInfo/add',
+  DeletePackageInfo = '/api/packageInfo/delete',
+  UpdatePackageInfo = '/api/packageInfo/update',
+  PagePackageInfo = '/api/packageInfo/page',
+  DetailPackageInfo = '/api/packageInfo/detail',
+}
+
+// 增加包装关系
+export const addPackageInfo = (params?: any) =>
+	request({
+		url: Api.AddPackageInfo,
+		method: 'post',
+		data: params,
+	});
+
+// 删除包装关系
+export const deletePackageInfo = (params?: any) => 
+	request({
+			url: Api.DeletePackageInfo,
+			method: 'post',
+			data: params,
+		});
+
+// 编辑包装关系
+export const updatePackageInfo = (params?: any) => 
+	request({
+			url: Api.UpdatePackageInfo,
+			method: 'post',
+			data: params,
+		});
+
+// 分页查询包装关系
+export const pagePackageInfo = (params?: any) => 
+	request({
+			url: Api.PagePackageInfo,
+			method: 'post',
+			data: params,
+		});
+
+// 详情包装关系
+export const detailPackageInfo = (id: any) => 
+	request({
+			url: Api.DetailPackageInfo,
+			method: 'get',
+			data: { id },
+		});
+
+

Web/src/main.ts

@@ -17,6 +17,8 @@ import vue3TreeOrg from 'vue3-tree-org'; // 组织架构图
 import 'vue3-tree-org/lib/vue3-tree-org.css'; // 组织架构图样式
 import 'animate.css'; // 动画库
 
+//import chinaData from 'element-china-area-data'
+
 import VXETable from 'vxe-table';
 import 'vxe-table/lib/style.css';
 
@@ -33,5 +35,5 @@ for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
 }
 directive(app);
 other.elSvg(app);
-
+//app.config.globalProperties.$chinaData = chinaData
 app.use(pinia).use(router).use(ElementPlus).use(i18n).use(VueGridLayout).use(VForm3).use(VueSignaturePad).use(vue3TreeOrg).use(useTable).mount('#app');

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

@@ -6,17 +6,17 @@
                 <el-row>
 
                     <el-col :span="8">
-                        <el-form-item label="名称">
+                        <el-form-item label="名称" :rules="[{ required: true, message: '分销单位不能为空', trigger: 'blur' }]">
                             <el-input v-model="state.matterFrom.name" placeholder="请输入名称" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="编码">
+                        <el-form-item label="编码" :rules="[{ required: true, message: '分销单位不能为空', trigger: 'blur' }]">
                             <el-input v-model="state.matterFrom.codeNum" placeholder="请输入编码" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="分类">
+                        <el-form-item label="分类" :rules="[{ required: true, message: '分销单位不能为空', trigger: 'blur' }]">
                             <el-select v-model="state.matterFrom.classify" placeholder="请选择" clearable>
                                 <el-option :label="item.name" :value="item.id" v-for="item, index in fyListData"
                                     :key="index" />
@@ -53,7 +53,7 @@
                             <el-col :span="8">
                                 <el-form-item label="品牌">
                                     <el-select v-model="state.matterFrom.brand" placeholder="请选择" clearable>
-                                        <el-option v-for="item in brandDate" :key="item.id" :label="item.name" :value="item.name"  />
+                                        <el-option v-for="item in brandDate" :key="item.id" :label="item.name" :value="item.id"  />
                                     </el-select>
                                 </el-form-item>
                             </el-col>
@@ -158,11 +158,7 @@
                             <vxe-column field="codeTypeNum" sortable title="条码类型编码" width=""
                                 :edit-render="{}"></vxe-column>
                             <vxe-column field="codeType" sortable title="条码类型" width="" :edit-render="{}"></vxe-column>
-                            <!-- <vxe-column field="packageName" sortable title="包装关系名" width="" :edit-render="{}">
-                                <template #edit="{ row }">
-                                    <vxe-input v-model="row.packageName" type="text" placeholder="请输入单位"></vxe-input>
-                                </template>
-                            </vxe-column> -->
+ 
                             <vxe-column field="unit" sortable title="单位" width="" :edit-render="{}">
                                 <template #edit="{ row }">
                                     <vxe-select v-model="row.unit" placeholder="请选择" clearable>
@@ -294,33 +290,34 @@ const getunitGroupList = async () => {
 const activeName = ref('基本信息')
 
 const handleClick = (tab: TabsPaneContext, event: Event) => {
-    console.log(tab, event)
+    //console.log(tab, event)
+    console.log('handleClick')
 }
-const clearFormValues = (formObject) => {
-    for (let key in formObject) {
-        if (formObject.hasOwnProperty(key)) {
-            formObject[key] = ''; // 或者 null
-        }
-    }
-};
+// const clearFormValues = (formObject) => {
+//     for (let key in formObject) {
+//         if (formObject.hasOwnProperty(key)) {
+//             formObject[key] = ''; // 或者 null
+//         }
+//     }
+// };
 
  let key = ref(0)
-watch(state.isShowDialog, (newValue, oldValue) => {
-    if (!newValue) {
-        clearFormValues(state.matterFrom)
-        infoDate = [];
+// watch(state.isShowDialog, (newValue, oldValue) => {
+//     if (!newValue) {
+//         clearFormValues(state.matterFrom)
+//         infoDate = [];
         
-        activeName.value = '基本信息';
-    }else{
-        key.value = Math.random();
-    }
-})
+//         activeName.value = '基本信息';
+//     }else{
+//         key.value = Math.random();
+//     }
+// })
 
 
 //提交
 const matterSubmit = async () => {
     let res;
-    console.log(state.matterFrom);
+    //console.log(state.matterFrom);
     if (props.title=='新增'){
         res = await getAPI(MaterialsApi).apiMaterialsAddPost(state.matterFrom);
     }
@@ -328,10 +325,10 @@ const matterSubmit = async () => {
         let update = {} as UpdateMaterialsInput
         Object.assign(update,state.matterFrom)
         res = await getAPI(MaterialsApi).apiMaterialsUpdatePost(update);        
-        await UpdateInfoApi(infoDate)
+        //await UpdateInfoApi(infoDate)
     }
-    console.log('res');
-    console.log(res);
+    // console.log('res');
+    // console.log(res);
     if (res.data.code === 200) {
         state.isShowDialog = false;
         ElMessage({

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

@@ -2,24 +2,16 @@
 <template>
     <div class="main">
         <div class="main-from common-box">
-            <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="70px">
+            <el-form :inline="true" :model="state.queryParams" class="demo-form-inline" label-width="70px">
                 <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="可用状态">
-                            <el-select v-model="formInline.isEnable" placeholder="请选择" clearable>
-                                <el-option label="启用" :value="true" />
-                                <el-option label="禁用" :value="false" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="名称">
-                            <el-input v-model="formInline.name" placeholder="请输入名称" clearable />
+                            <el-input v-model="state.queryParams.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="state.queryParams.codeNum" placeholder="请输入编码" clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
@@ -27,17 +19,17 @@
 
                     <el-col :span="8">
                         <el-form-item label="规格型号">
-                            <el-input v-model="formInline.specifications" placeholder="请输入" clearable />
+                            <el-input v-model="state.queryParams.specifications" placeholder="请输入" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="助记码">
-                            <el-input v-model="formInline.simpleNumber" placeholder="请输入" clearable />
+                        <el-form-item label="关键字">
+                            <el-input v-model="state.queryParams.searchKey" placeholder="请输入" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="品牌">
-                            <el-select v-model="formInline.brand" placeholder="请选择" clearable>
+                            <el-select v-model="state.queryParams.brand" placeholder="请选择" clearable>
                                 <el-option :label="item.name" :value="item.id" v-for="item, index in state.brandDate"
                                     :key="index" />
                             </el-select>
@@ -45,13 +37,8 @@
                     </el-col>
                 </el-row>
                 <el-form-item>
-                    <el-button type="primary" @click="handleQuery">查询</el-button>
-                    <el-button type="primary" @click="onSubmit">重置</el-button>
-                    <el-button @click="onSubmit">保存</el-button>
+                    <el-button type="primary" @click="onSubmit">查询</el-button>
                     <el-button type="primary" @click="add">新增</el-button>
-                    <el-button @click="onSubmit" type="warning">删除</el-button>
-                    <el-button @click="onSubmit">启用</el-button>
-                    <el-button @click="onSubmit">禁用</el-button>
                     <el-dropdown style="margin-left: 10px;">
                         <el-button type="primary">
                             更多操作<el-icon class="el-icon--right"><arrow-down /></el-icon>
@@ -69,7 +56,7 @@
 
         <div class="main-table common-box">
             <div class="tab-hed">
-                <el-select v-model="formInline.classify" placeholder="分类" clearable style="width: 200px;">
+                <el-select v-model="state.queryParams.classify" placeholder="分类" clearable style="width: 200px;">
                     <el-option :label="item.name" :value="item.id" v-for="item, index in fyListData" :key="index" />
                 </el-select>
                 <div>
@@ -107,7 +94,6 @@
 
                     <vxe-column field="barcode" sortable title="仓库条码" width=""></vxe-column>
                     <vxe-column field="createTime" sortable title="创建时间" width=""></vxe-column>
-                    <vxe-column field="f" sortable title="仓库扩展字符串扩展字段1" width=""></vxe-column>
                     <vxe-column title="操作" width="200" fixed="right" show-overflow>
                         <template #default="{ row }">
                             <vxe-button type="text">查看</vxe-button>
@@ -129,11 +115,11 @@
     </div>
 </template>
 
-<script setup lang="ts">
+<script setup lang="ts" name="matter">
 import { onMounted, reactive, ref, watch } from 'vue';
 import { getAPI } from '/@/utils/axios-utils';
-import { BrandApi, MaterialClassifyApi, MaterialsApi, SysUnitGroupApi, SysUnitApi } from '/@/api-services/api';
-import { AddMaterialsInput, BrandOutput, DeleteMaterialsInput, MaterialsOutput, SysUnitGroupOutput, SysUnitOutput} from '/@/api-services/models';
+import { BrandApi, MaterialClassifyApi, MaterialsApi} from '/@/api-services/api';
+import { AddMaterialsInput, BrandOutput, DeleteMaterialsInput, MaterialsOutput} from '/@/api-services/models';
 import { ElMessageBox, ElMessage, TabsPaneContext } from 'element-plus';
 import EditAccess from '/@/views/basics-date/matter/component/editOpenAccess.vue';
 
@@ -158,6 +144,15 @@ const state = reactive({
 		page: 1,
 		pageSize: 10,
 		total: 0 as any,
+	},
+    queryParams: {
+    name: '',//名称
+    brand: '',//品牌
+    isEnable: "",//可用状态
+    codeNum: '',//编码
+    searchKey: "",//助记码
+    specifications: "",//规格型号
+    classify: ""
 },
 	editPrintTitle: '',
 });
@@ -174,30 +169,20 @@ onMounted(() => {
     getBrandList();
 })
 
-//获取物料列表数据
-const formInline = reactive({
-    name: '',//名称
-    brand: '',//品牌
-    isEnable: "",//可用状态
-    codeNum: '',//编码
-    simpleNumber: "",//助记码
-    specifications: "",//规格型号
-    classify: ""
-})
-
 
 const handleQuery = async () => {
     state.loading = true;
-    let res = await getAPI(MaterialsApi).apiMaterialsPagePost({ page: 1, pageSize: 10, ...formInline });
+    let params = Object.assign(state.queryParams, state.tableParams);
+    let res = await getAPI(MaterialsApi).apiMaterialsPagePost(params);
     if (res.data.code === 200) {
-        pageVO1.total = res.data.result?.total!;
         state.tableData = res.data.result?.items!;
+        state.tableParams.total = res.data.result?.total!;
     }
     state.loading = false;
 }
 
 const onSubmit = () => {
-    console.log('submit!')
+    handleQuery();
 }
 
 //获取品牌数据

Web/src/views/basics-date/packageinfo/component/editDialog.vue

@@ -0,0 +1,171 @@
+<template>
+	<div class="packageInfo-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-row :gutter="35">
+					<el-form-item v-show="false">
+						<el-input v-model="ruleForm.id" />
+					</el-form-item>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="物料Id" prop="materialsId">
+							<el-input v-model="ruleForm.materialsId" placeholder="请输入物料Id" maxlength="20" 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="ruleForm.isEnable" active-text="是" inactive-text="否" />
+							
+						</el-form-item>
+						
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="条码类型编码" prop="codeTypeNum">
+							<el-input v-model="ruleForm.codeTypeNum" 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="codeType">
+							<el-input v-model="ruleForm.codeType" 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="packageName">
+							<el-input v-model="ruleForm.packageName" 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="单位Id" prop="unitId">
+							<el-input v-model="ruleForm.unitId" placeholder="请输入单位Id" maxlength="20" 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="单位组Id" prop="unitGroupId">
+							<el-input v-model="ruleForm.unitGroupId" placeholder="请输入单位组Id" maxlength="20" 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="productCount">
+							<el-input v-model="ruleForm.productCount" placeholder="请输入产品数量" maxlength="32" show-word-limit clearable />
+							
+						</el-form-item>
+						
+					</el-col>
+				</el-row>
+			</el-form>
+			<template #footer>
+				<span class="dialog-footer">
+					<el-button @click="cancel">取 消</el-button>
+					<el-button type="primary" @click="submit">确 定</el-button>
+				</span>
+			</template>
+		</el-dialog>
+	</div>
+</template>
+<style scoped>
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
+</style>
+<script lang="ts" setup>
+	import { ref,onMounted } from "vue";
+	import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+	import { ElMessage } from "element-plus";
+	import type { FormRules } from "element-plus";
+	import { addPackageInfo, updatePackageInfo, detailPackageInfo } from "/@/api/main/packageInfo";
+
+	//父级传递来的参数
+	var props = defineProps({
+		title: {
+		type: String,
+		default: "",
+	},
+	});
+	//父级传递来的函数，用于回调
+	const emit = defineEmits(["reloadTable"]);
+	const ruleFormRef = ref();
+	const isShowDialog = ref(false);
+	const ruleForm = ref<any>({});
+	//自行添加其他规则
+	const rules = ref<FormRules>({
+		materialsId: [{required: true, message: '请输入物料Id！', trigger: 'blur',},],
+	});
+
+	// 打开弹窗
+	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 detailPackageInfo(rowData.id)).data.result;
+		else
+			ruleForm.value = rowData;
+		isShowDialog.value = true;
+	};
+
+	// 关闭弹窗
+	const closeDialog = () => {
+		emit("reloadTable");
+		isShowDialog.value = false;
+	};
+
+	// 取消
+	const cancel = () => {
+		isShowDialog.value = false;
+	};
+
+	// 提交
+	const submit = async () => {
+		ruleFormRef.value.validate(async (isValid: boolean, fields?: any) => {
+			if (isValid) {
+				let values = ruleForm.value;
+				if (ruleForm.value.id == undefined || ruleForm.value.id == null || ruleForm.value.id == "" || ruleForm.value.id == 0) {
+					await addPackageInfo(values);
+				} else {
+					await updatePackageInfo(values);
+				}
+				closeDialog();
+			} else {
+				ElMessage({
+					message: `表单有${Object.keys(fields).length}处验证失败，请修改后再提交`,
+					type: "error",
+				});
+			}
+		});
+	};
+
+
+
+
+
+
+
+	// 页面加载时
+	onMounted(async () => {
+	});
+
+	//将属性或者函数暴露给父组件
+	defineExpose({ openDialog });
+</script>
+
+
+
+

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

@@ -1,22 +1,221 @@
-<template>
-<a>ssssssssssssssssssssssssssssssssssss</a>
+<template>
+  <div class="packageInfo-container">
+    <el-card shadow="hover" :body-style="{ paddingBottom: '0' }">
+      <el-form :model="queryParams" ref="queryForm" labelWidth="90">
+        <el-row>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10">
+            <el-form-item label="关键字">
+              <el-input v-model="queryParams.searchKey" clearable="" placeholder="请输入模糊查询关键字"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="物料Id">
+              <el-input v-model="queryParams.materialsId" clearable="" placeholder="请输入物料Id"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="条码类型编码">
+              <el-input v-model="queryParams.codeTypeNum" clearable="" placeholder="请输入条码类型编码"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="条码类型">
+              <el-input v-model="queryParams.codeType" clearable="" placeholder="请输入条码类型"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="包装关系名称">
+              <el-input v-model="queryParams.packageName" clearable="" placeholder="请输入包装关系名称"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="单位Id">
+              <el-input v-model="queryParams.unitId" clearable="" placeholder="请输入单位Id"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="单位组Id">
+              <el-input v-model="queryParams.unitGroupId" clearable="" placeholder="请输入单位组Id"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="8" :xl="4" class="mb10" v-if="showAdvanceQueryUI">
+            <el-form-item label="产品数量">
+              <el-input v-model="queryParams.productCount" clearable="" placeholder="请输入产品数量"/>
+              
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :md="12" :lg="6" :xl="6" class="mb10">
+            <el-form-item>
+              <el-button-group style="display: flex; align-items: center;">
+                <el-button type="primary"  icon="ele-Search" @click="handleQuery" v-auth="'packageInfo:page'"> 查询 </el-button>
+                <el-button icon="ele-Refresh" @click="() => queryParams = {}"> 重置 </el-button>
+                <el-button icon="ele-ZoomIn" @click="changeAdvanceQueryUI" v-if="!showAdvanceQueryUI" style="margin-left:5px;"> 高级查询 </el-button>
+                <el-button icon="ele-ZoomOut" @click="changeAdvanceQueryUI" v-if="showAdvanceQueryUI" style="margin-left:5px;"> 隐藏 </el-button>
+                <el-button type="primary" style="margin-left:5px;" icon="ele-Plus" @click="openAddPackageInfo" v-auth="'packageInfo:add'"> 新增 </el-button>
+                
+              </el-button-group>
+            </el-form-item>
+            
+          </el-col>
+        </el-row>
+      </el-form>
+    </el-card>
+    <el-card class="full-table" shadow="hover" style="margin-top: 5px">
+      <el-table
+				:data="tableData"
+				style="width: 100%"
+				v-loading="loading"
+				tooltip-effect="light"
+				row-key="id"
+                @sort-change="sortChange"
+				border="">
+        <el-table-column type="index" label="序号" width="55" align="center"/>
+        <el-table-column prop="materialsId" label="物料Id" width="140"  show-overflow-tooltip="" />
+        <el-table-column prop="isEnable" label="是否启用" width="120"  show-overflow-tooltip="">
+          <template #default="scope">
+            <el-tag v-if="scope.row.isEnable"> 是 </el-tag>
+            <el-tag type="danger" v-else> 否 </el-tag>
+            
           </template>
           
-<script setup lang="ts" name="packageinfo">
-import { onMounted, reactive,ref } from 'vue';
+        </el-table-column>
+        <el-table-column prop="codeTypeNum" label="条码类型编码" width="90"  show-overflow-tooltip="" />
+        <el-table-column prop="codeType" label="条码类型" width="140"  show-overflow-tooltip="" />
+        <el-table-column prop="packageName" label="包装关系名称" width="90"  show-overflow-tooltip="" />
+        <el-table-column prop="unitId" label="单位Id" width="140"  show-overflow-tooltip="" />
+        <el-table-column prop="unitGroupId" label="单位组Id" width="140"  show-overflow-tooltip="" />
+        <el-table-column prop="productCount" label="产品数量" width="140"  show-overflow-tooltip="" />
+        <el-table-column label="操作" width="140" align="center" fixed="right" show-overflow-tooltip="" v-if="auth('packageInfo:update') || auth('packageInfo:delete')">
+          <template #default="scope">
+            <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditPackageInfo(scope.row)" v-auth="'packageInfo:update'"> 编辑 </el-button>
+            <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delPackageInfo(scope.row)" v-auth="'packageInfo:delete'"> 删除 </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+				v-model:currentPage="tableParams.page"
+				v-model:page-size="tableParams.pageSize"
+				:total="tableParams.total"
+				:page-sizes="[10, 20, 50, 100, 200, 500]"
+				small=""
+				background=""
+				@size-change="handleSizeChange"
+				@current-change="handleCurrentChange"
+				layout="total, sizes, prev, pager, next, jumper"
+	/>
 
-const formInline = reactive({
-    name:'',//名称
-    isEnable:"",//可用状态
-    codeNum:'',//编码
+      <editDialog
+        ref="editDialogRef"
+        :title="editPackageInfoTitle"
+        @reloadTable="handleQuery"
+      />
+    </el-card>
+  </div>
+</template>
+
+<script lang="ts" setup name="packageInfo">
+  import { ref } from "vue";
+  import { ElMessageBox, ElMessage } from "element-plus";
+  import { auth } from '/@/utils/authFunction';
+  import { getDictDataItem as di, getDictDataList as dl } from '/@/utils/dict-utils';
+  import { formatDate } from '/@/utils/formatTime';
+
+  import editDialog from '/@/views/basics-date/packageInfo/component/editDialog.vue'
+  import { pagePackageInfo, deletePackageInfo } from '/@/api/main/packageInfo';
+
+
+  const showAdvanceQueryUI = ref(false);
+  const editDialogRef = ref();
+  const loading = ref(false);
+  const tableData = ref<any>([]);
+  const queryParams = ref<any>({});
+  const tableParams = ref({
+    page: 1,
+    pageSize: 10,
+    total: 0,
+  });
+
+  const printPackageInfoTitle = ref("");
+  const editPackageInfoTitle = ref("");
+
+  // 改变高级查询的控件显示状态
+  const changeAdvanceQueryUI = () => {
+    showAdvanceQueryUI.value = !showAdvanceQueryUI.value;
+  }
+  
+
+  // 查询操作
+  const handleQuery = async () => {
+    loading.value = true;
+    var res = await pagePackageInfo(Object.assign(queryParams.value, tableParams.value));
+    tableData.value = res.data.result?.items ?? [];
+    tableParams.value.total = res.data.result?.total;
+    loading.value = false;
+  };
+
+  // 列排序
+  const sortChange = async (column: any) => {
+	queryParams.value.field = column.prop;
+	queryParams.value.order = column.order;
+	await handleQuery();
+  };
+
+  // 打开新增页面
+  const openAddPackageInfo = () => {
+    editPackageInfoTitle.value = '添加包装关系';
+    editDialogRef.value.openDialog({});
+  };
+
+  
+  // 打开编辑页面
+  const openEditPackageInfo = (row: any) => {
+    editPackageInfoTitle.value = '编辑包装关系';
+    editDialogRef.value.openDialog(row);
+  };
+
+  // 删除
+  const delPackageInfo = (row: any) => {
+    ElMessageBox.confirm(`确定要删除吗?`, "提示", {
+    confirmButtonText: "确定",
+    cancelButtonText: "取消",
+    type: "warning",
   })
-
-
-onMounted(() => {
-    console.log('startPackageInfo')
+  .then(async () => {
+    await deletePackageInfo(row);
+    handleQuery();
+    ElMessage.success("删除成功");
   })
+  .catch(() => {});
+  };
 
+  // 改变页面容量
+  const handleSizeChange = (val: number) => {
+    tableParams.value.pageSize = val;
+    handleQuery();
+  };
+
+  // 改变页码序号
+  const handleCurrentChange = (val: number) => {
+    tableParams.value.page = val;
+    handleQuery();
+  };
+
+  handleQuery();
 </script>
-
-<style lang="scss" scoped>
+<style scoped>
+:deep(.el-ipnut),
+:deep(.el-select),
+:deep(.el-input-number) {
+	width: 100%;
+}
 </style>
+

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

@@ -3,14 +3,6 @@
         <div class="main-from common-box">
             <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="70px">
                 <el-row>
-                    <el-col :span="8">
-                        <el-form-item label="可用状态">
-                            <el-select v-model="formInline.isEnable" placeholder="请选择" clearable>
-                                <el-option label="启用" value="0" />
-                                <el-option label="禁用" value="1" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
                     <el-col :span="8">
                         <el-form-item label="名称">
                             <el-input v-model="formInline.name" placeholder="请输入名称" clearable />
@@ -21,21 +13,12 @@
                             <el-input v-model="formInline.codeNum" placeholder="请输入编码" clearable />
                         </el-form-item>
                     </el-col>
-                </el-row>
-                <el-row>
 
-                    <el-col :span="8">
-                        <el-form-item label="简码">
-                            <el-input v-model="formInline.brevityCode" placeholder="请输入" clearable />
-                        </el-form-item>
-                    </el-col>
                 </el-row>
+
                 <el-form-item>
                     <el-button type="primary" @click="unitPage">查询</el-button>
-                    <el-button type="primary" @click="onSubmit">重置</el-button>
-                    <el-button @click="onSubmit">保存</el-button>
                     <el-button type="primary" @click="onSubmit">新增</el-button>
-                    <el-button @click="onSubmit" type="warning">删除</el-button>
                     <el-button @click="onSubmit">启用</el-button>
                     <el-button @click="onSubmit">禁用</el-button>
                 </el-form-item>
@@ -52,8 +35,8 @@
                     <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>
-
                         <el-dropdown>
                             <span class="el-dropdown-link">
                                 更多
@@ -182,6 +165,9 @@
                 <el-button style="width: 100px;" @click="dialogTableVisible = false">取消</el-button>
             </el-row>
         </el-dialog>
+
+        
+
     </div>
 </template>
 
@@ -236,7 +222,9 @@ const tableData = ref([
     
 ])
 
-
+const addUnitGroup=()=>{
+    console.log('tableData!')
+}
 
 const pageVO1 = reactive({
     currentPage: 1,

Web/src/views/labelPrinting/materialPrinting/component/editAccess.vue

@@ -73,8 +73,8 @@
 <script setup lang="ts">
 import { onMounted, reactive,ref } from 'vue'
 import { getAPI } from '/@/utils/axios-utils';
-import { SysUnitApi, MaterialsApi, SysPrintApi } from '/@/api-services/api';
-import { SysUnitOutput, MaterialsOutput, SysPrint } from '/@/api-services/models';
+import { SysUnitApi, MaterialsApi, SysPrintApi, PrintDataApi } from '/@/api-services/api';
+import { SysUnitOutput, MaterialsOutput, SysPrint, PrintDataInput, PrintData, PrintDataMaterialsInput } from '/@/api-services/models';
 import { ElMessageBox, ElMessage, TabsPaneContext } from 'element-plus';
 import VueJsonPretty from 'vue-json-pretty';
 import 'vue-json-pretty/lib/styles.css';
@@ -82,7 +82,7 @@ import 'vue-json-pretty/lib/styles.css';
 import { hiprint } from 'vue-plugin-hiprint';
 import providers from '../../print/component/hiprint/providers';
 import PrintPreview from '../../print/component/hiprint/preview.vue';
-import printData from '../../print/component/hiprint/print-data';
+import { PrintDataApiFp } from '../../../../api-services/apis/print-data-api';
 
 
 const props = defineProps({
@@ -93,6 +93,7 @@ const props = defineProps({
 let hiprintTemplate = ref();
 const preViewRef = ref();
 
+const printData = ref<PrintData[]>([]);
 
 //定义printInfoFrom字段
 const printInfoFrom = reactive({
@@ -154,28 +155,51 @@ const queryUnitByGroupId = async (groupId:number) => {
 //定义matterSubmit方法
 const printSubmit = () => {
     //changeMode();
-    console.log(printInfoFrom.printDataTem)
+    // console.log(printInfoFrom.printDataTem)
+    if(printInfoFrom.printDataTem=='')
+    {
+        ElMessage.error('请先选择打印模板');
+        return
+    }
     hiprintTemplate.value.clear();
     hiprintTemplate.value?.update(JSON.parse(printInfoFrom.printDataTem));
-    console.log(hiprintTemplate.value)
-    console.log(hiprintTemplate.value.printPanels[0].width)
+    // console.log(hiprintTemplate.value)
+    //console.log(hiprintTemplate.value.printPanels[0].width)
     let { width } = hiprintTemplate.value.printPanels[0].width;
-    //let width=80;
-    preViewRef.value.showDialog(hiprintTemplate.value, printData, width);
+    let tempPrintData =[{qrCode: '6544898545156',barCode:'456789'},{qrCode: 'https://cli.im/deqr/other',barCode:'https://www.baidu.com/'}]
+    //preViewRef.value.showDialog(hiprintTemplate.value, tempPrintData, width);
 
-
-
-    // state.waitShowPrinter = true;
-	// hiprintTemplate.value.print(
-	// 	printData,
-	// 	{},
-	// 	{
-	// 		callback: () => {
-	// 			state.waitShowPrinter = false;
-	// 		},
-	// 	}
-	// );
+    getPrintData().then(()=>{
+        state.waitShowPrinter = true;
+        hiprintTemplate.value.print(
+		printData.value,
+		{},
+		{
+			callback: () => {
+				state.waitShowPrinter = false;
+			},
 		}
+	);
+    });
+   
+}
+
+// 查询操作
+const getPrintData = async () => {
+    let codeType=printInfoFrom.printDataTem.includes('条形码')?'条形码':'二维码';
+	//PrintDataMaterialsInput
+    let printInput = {
+        codeHead:state.matterFrom.codeNum,
+        codeLength:5,
+        count:printInfoFrom.printCount,
+        codeType:codeType
+    };
+    
+	var res = await getAPI(PrintDataApi).apiPrintDataGetPrintDataListPost(printInput);
+	printData.value = res.data.result ?? [];
+    //console.log(printData.value)    
+};
+
 
 const formInline = reactive({
     user: '',
@@ -218,7 +242,7 @@ onMounted(() => {
 
 // 选择模板
 const changeMode = () => {
-	console.log('changeMode')
+	//console.log('changeMode')
 	let provider = providers[0];
 	hiprint.init({
 		providers: [provider.f],
@@ -246,9 +270,10 @@ const changeMode = () => {
 	hiprintTemplate.value.design('#hiprint-printTemplate');
 	// 获取当前放大比例, 当zoom时传true才会有
 	state.scaleValue = hiprintTemplate.value.editingPanel.scale || 1;
-    console.log('changeModeEnd')
+    //console.log('changeModeEnd')
 };
 
+
 // 导出对象
 defineExpose({ openDialog });
 </script>

Web/src/views/labelPrinting/materialPrinting/index.vue

@@ -1,41 +1,30 @@
 <template>
     <div class="main">
         <div class="main-from common-box">
-            <el-form :inline="true" :model="formInline" class="demo-form-inline" label-width="100px">
+            <el-form :inline="true" :model="state.queryParams" class="demo-form-inline" label-width="100px">
 
                 <el-row>
                     <el-col :span="8">
                         <el-form-item label="物料编码">
-                            <el-input v-model="formInline.user" placeholder="请输入物料编码查询" clearable />
+                            <el-input v-model="state.queryParams.code" placeholder="请输入物料编码查询" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
                         <el-form-item label="物料名称">
-                            <el-input v-model="formInline.user" placeholder="请输入物料名称查询" clearable />
+                            <el-input v-model="state.queryParams.name" placeholder="请输入物料名称查询" clearable />
                         </el-form-item>
                     </el-col>
                     <el-col :span="8">
-                        <el-form-item label="规格型号">
-                            <el-input v-model="formInline.user" placeholder="请输入规格型号查询" clearable />
+                        <el-form-item label="关键字">
+                            <el-input v-model="state.queryParams.searchKey" placeholder="请输入关键字查询" clearable />
                         </el-form-item>
                     </el-col>
                 </el-row>
-                <!-- <el-row>
-                    
-                    <el-col :span="8">
-                        <el-form-item label="品牌">
-                            <el-select v-model="formInline.region" placeholder="请选择" clearable>
-                                <el-option label="海天品牌" value="shanghai" />
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                </el-row> -->
-
 
                 <el-form-item>
                     <el-button type="primary" @click="onSubmit">查询</el-button>
                     <el-button type="primary" @click="onSubmit">重置</el-button>
-                    <el-button @click="onSubmit">保存</el-button>
+                    <el-button @click="''">保存</el-button>
                 </el-form-item>
             </el-form>
         </div>
@@ -44,12 +33,14 @@
                 <vxe-table show-overflow height="100%" :data="tableData" :border=true :tree-config="{ transform: true }"
                     :scroll-y="{ gt: 20 }">
                     <vxe-column  type="seq" title="序号" width="70" sortable></vxe-column>
-                    <vxe-column field="name" sortable title="物料名称" width=""></vxe-column>
+                    <vxe-column field="name" sortable title="物料名称" width="300"></vxe-column>
+                    <vxe-column field="codeNum" sortable title="编码" width="120"></vxe-column>
                     <vxe-column field="specifications" sortable title="规格型号" width=""></vxe-column>
                     <vxe-column field="brand" sortable title="品牌" width=""></vxe-column>
+                    <vxe-column field="unit" sortable title="基本单位" width=""></vxe-column>
                     <vxe-column title="操作" width="200" fixed="right" show-overflow>
                             <template #default="{ row }">
-                                <vxe-button type="text"  @click="printLabel(row)">打印标签</vxe-button>
+                                <vxe-button type="text" style="color: rgb(238, 100, 36);" @click="printLabel(row)">打印标签</vxe-button>
                                 <!-- <vxe-button type="text" icon="vxe-icon-delete"></vxe-button> -->
                             </template>
                         </vxe-column>
@@ -95,7 +86,9 @@ const state = reactive({
     editOpenAccessTitle:'打印信息',
 	printData: [] as Array<SysPrint>,
 	queryParams: {
-		name: undefined,
+    code: '',
+    name: '',
+    searchKey: '',
 },
 	tableParams: {
 		page: 1,
@@ -133,14 +126,8 @@ const queryUnitByGroupId = async (groupId:number) => {
 };
 
 
-const formInline = reactive({
-    user: '',
-    region: '',
-    date: '',
-})
-
 const onSubmit = () => {
-    console.log('submit!')
+    MaterialsPage();
 }
 
 
@@ -152,7 +139,8 @@ const pageVO1 = reactive({
 
 
 const MaterialsPage = async () => {
-    let res = await getAPI(MaterialsApi).apiMaterialsPagePost({ page: 1, pageSize: 10, ...formInline });
+    let params = Object.assign(state.queryParams, state.tableParams);
+    let res = await getAPI(MaterialsApi).apiMaterialsPagePost(params);//{ page: 1, pageSize: 10, ...formInline }
     if (res.data.code === 200) {
         pageVO1.total = res.data.result?.total!;
         tableData.value = res.data.result?.items!;

Web/src/views/labelPrinting/print/component/hiprint/index.vue

@@ -292,7 +292,7 @@ const otherPaper = () => {
 // 预览
 const preView = () => {
 	let { width } = state.curPaper;
-	preViewRef.value.showDialog(hiprintTemplate.value, printData, width);
+	preViewRef.value.showDialog(hiprintTemplate.value, printData, width);//printData
 };
 // 直接打印
 const print = () => {

Web/src/views/labelPrinting/print/component/hiprint/preview.vue

@@ -32,6 +32,8 @@ const showDialog = (hiprintTemplate: any, printData: {}, width = 210) => {
 			previewContentRef.value.removeChild(previewContentRef.value.firstChild);
 		}
 		const newHtml = hiprintTemplate.getHtml(printData);
+		// console.log('newHtml')
+		// console.log(newHtml[0])
 		previewContentRef.value.appendChild(newHtml[0]);
 	});
 };

Web/src/views/labelPrinting/print/component/hiprint/print-data.ts

@@ -1,17 +1,17 @@
 // 打印数据
 import logoImg from '/@/assets/logo.png';
 export default {
-	barCode: 'Admin.NET',
-	qrCode: '二维码',
+	barCode: 'GuanWei',
+	qrCode: '20240516001',
 	longText: '长文本',
 	imageUrl: logoImg,
 	table: [
-		{ NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
-		{ NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
-		{ NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
-		{ NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
-		{ NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
-		{ NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品01', SL: 2, GG: '1*24g', TM: '2O22010100111', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品02', SL: 2, GG: '1*24g', TM: '2O22010100112', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品03', SL: 2, GG: '1*24g', TM: '2O22010100113', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品04', SL: 2, GG: '1*24g', TM: '2O22010100114', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品05', SL: 2, GG: '1*24g', TM: '2O22010100115', DJ: '6.8', JE: '13.6' },
+		{ NAME: '测试商品06', SL: 2, GG: '1*24g', TM: '2O22010100116', DJ: '6.8', JE: '13.6' },
 		{ NAME: '测试商品07', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
 		{ NAME: '测试商品08', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },
 		{ NAME: '测试商品09', SL: 2, GG: '1*24g', TM: '2O22010100110', DJ: '6.8', JE: '13.6' },