Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

schangxiang@126.com

2025-05-06 358e8f30447f8ba05af42b66d45ddf1a93878b6d

Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

 CommonDLL/CmsQueryExtensions.dll

Binary files differ

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsAreas/WmsAreaDto.cs

@@ -1,4 +1,5 @@
using CMS.Plugin.HIAWms.Domain.Shared.Enums;
using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Domain.Entities;


 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsInOutStockRecord/GetWmsInOutStockRecordInput.cs

@@ -1,229 +1,229 @@
using CmsQueryExtensions.Extension; 
using Volo.Abp.Application.Dtos; 
 
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord; 
 
using CmsQueryExtensions.Extension;
using Volo.Abp.Application.Dtos;

namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsInOutStockRecord;

/// <summary> 
/// å‡ºå…¥åº“记录表查询参数 
/// </summary> 
public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto 
{ 
 
public class GetWmsInOutStockRecordInput : ExtensiblePagedAndSortedResultRequestDto
{

    #region å…³é”®å­—查询 
 

    /// <summary> 
    /// å…³é”®å­—模糊查询（注意是小写！） 
    /// </summary> 
    public string searchVal { get; set; } 
 
    public string searchVal { get; set; }

    /// <summary> 
    /// é€šç”¨æŸ¥è¯¢é…ç½® (1:模糊查询 , 2:精准查询)（注意是小写！） 
    /// </summary> 
    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询; 
 
    public SearchFilterModeEnum searchVal_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

    /// <summary> 
    /// å­æœç´¢ç»„件传递的通用查询配置的属性名（注意是小写！） 
    /// </summary> 
    [NoAutoQuery] 
    public string str_searchFormInputAttrs { get; set; } 
    [NoAutoQuery]
    public string str_searchFormInputAttrs { get; set; }
    /// <summary> 
    /// å­æœç´¢ç»„件传递的通用查询配置的属性名（注意是小写！） 
    /// </summary> 
    public List<string> searchFormInputAttrs 
    { 
        get 
        { 
            if (!string.IsNullOrEmpty(str_searchFormInputAttrs)) 
            { 
                return str_searchFormInputAttrs.Split(',').ToList(); 
            } 
            return new List<string>(); 
        } 
    } 
 
    #endregion 
 
            /// <summary>
        /// å•æ®ç¼–号
        /// </summary>
        public string OrderNo { get; set; }
    public List<string> searchFormInputAttrs
    {
        get
        {
            if (!string.IsNullOrEmpty(str_searchFormInputAttrs))
            {
                return str_searchFormInputAttrs.Split(',').ToList();
            }
            return new List<string>();
        }
    }

        /// <summary>
        /// å•æ®ç¼–号-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum OrderNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    #endregion

        /// <summary>
        /// ç‰©æ–™åç§°
        /// </summary>
        public string MaterialName { get; set; }
    /// <summary>
    /// å•æ®ç¼–号
    /// </summary>
    public string OrderNo { get; set; }

        /// <summary>
        /// ç‰©æ–™åç§°-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialName_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// å•æ®ç¼–号-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum OrderNo_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç‰©æ–™ä»¶å·
        /// </summary>
        public string MaterialNo { get; set; }
    /// <summary>
    /// ç‰©æ–™åç§°
    /// </summary>
    public string MaterialName { get; set; }

        /// <summary>
        /// ç‰©æ–™ä»¶å·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// ç‰©æ–™åç§°-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialName_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œç±»åž‹
        /// </summary>
        public int?  StockType { get; set; }
    /// <summary>
    /// ç‰©æ–™ä»¶å·
    /// </summary>
    public string MaterialNo { get; set; }

        /// <summary>
        /// æ“ä½œç±»åž‹-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum StockType_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
    /// <summary>
    /// ç‰©æ–™ä»¶å·-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialNo_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// å®¹å™¨ç¼–号
        /// </summary>
        public string ContainerNo { get; set; }
    /// <summary>
    /// æ“ä½œç±»åž‹
    /// </summary>
    public int? StockType { get; set; }

        /// <summary>
        /// å®¹å™¨ç¼–号-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ContainerNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// æ“ä½œç±»åž‹-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum StockType_FilterMode { get; set; } = SearchFilterModeEnum.精准查询;

        /// <summary>
        /// æœºåž‹
        /// </summary>
        public string MaterialModel { get; set; }
    /// <summary>
    /// å®¹å™¨ç¼–号
    /// </summary>
    public string ContainerNo { get; set; }

        /// <summary>
        /// æœºåž‹-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialModel_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// å®¹å™¨ç¼–号-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum ContainerNo_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// æ“ä½œæ—¶é—´
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> OperateTime { get; set; }
    /// <summary>
    /// æœºåž‹
    /// </summary>
    public string MaterialModel { get; set; }

    /// <summary>
    /// æœºåž‹-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialModel_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

    /// <summary>
    /// æ“ä½œæ—¶é—´
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public List<string> OperateTime { get; set; }


        /// <summary>
        /// å¤‡æ³¨
        /// </summary>
        public string Remark { get; set; }
    /// <summary>
    /// å¤‡æ³¨
    /// </summary>
    public string Remark { get; set; }

        /// <summary>
        /// å¤‡æ³¨-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum Remark_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// å¤‡æ³¨-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum Remark_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç‰©æ–™ID
        /// </summary>
        public string MaterialId { get; set; }
    /// <summary>
    /// ç‰©æ–™ID
    /// </summary>
    public string MaterialId { get; set; }

        /// <summary>
        /// ç‰©æ–™ID-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum MaterialId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// ç‰©æ–™ID-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum MaterialId_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ä»»åŠ¡å·
        /// </summary>
        public string TaskNo { get; set; }
    /// <summary>
    /// ä»»åŠ¡å·
    /// </summary>
    public string TaskNo { get; set; }

        /// <summary>
        /// ä»»åŠ¡å·-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum TaskNo_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// ä»»åŠ¡å·-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum TaskNo_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// èµ·å§‹åº“位
        /// </summary>
        public string SourcePlace { get; set; }
    /// <summary>
    /// èµ·å§‹åº“位
    /// </summary>
    public string SourcePlace { get; set; }

        /// <summary>
        /// èµ·å§‹åº“位-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum SourcePlace_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// èµ·å§‹åº“位-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum SourcePlace_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// ç›®æ ‡åº“位
        /// </summary>
        public string ToPlace { get; set; }
    /// <summary>
    /// ç›®æ ‡åº“位
    /// </summary>
    public string ToPlace { get; set; }

        /// <summary>
        /// ç›®æ ‡åº“位-查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum ToPlace_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// ç›®æ ‡åº“位-查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum ToPlace_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> CreationTime { get; set; }
    /// <summary>
    /// 
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public List<string> CreationTime { get; set; }


        /// <summary>
        /// 
        /// </summary>
        public string CreatorId { get; set; }
    /// <summary>
    /// 
    /// </summary>
    public string CreatorId { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum CreatorId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// -查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum CreatorId_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> LastModificationTime { get; set; }
    /// <summary>
    /// 
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public List<string> LastModificationTime { get; set; }


        /// <summary>
        /// 
        /// </summary>
        public string LastModifierId { get; set; }
    /// <summary>
    /// 
    /// </summary>
    public string LastModifierId { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum LastModifierId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// -查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum LastModifierId_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        public bool?  IsDeleted { get; set; }
    /// <summary>
    /// 
    /// </summary>
    public bool? IsDeleted { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum IsDeleted_FilterMode { get; set; }= SearchFilterModeEnum.精准查询;
    /// <summary>
    /// -查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum IsDeleted_FilterMode { get; set; } = SearchFilterModeEnum.精准查询;

        /// <summary>
        /// 
        /// </summary>
        public string DeleterId { get; set; }
    /// <summary>
    /// 
    /// </summary>
    public string DeleterId { get; set; }

        /// <summary>
        /// -查询关系运算符 
        /// </summary>
        public SearchFilterModeEnum DeleterId_FilterMode { get; set; }= SearchFilterModeEnum.模糊查询;
    /// <summary>
    /// -查询关系运算符 
    /// </summary>
    public SearchFilterModeEnum DeleterId_FilterMode { get; set; } = SearchFilterModeEnum.模糊查询;

        /// <summary>
        /// 
        /// </summary>
        //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
        [HighSearchRangeAttribute]
        public List<string> DeletionTime { get; set; }
    /// <summary>
    /// 
    /// </summary>
    //表示是 é«˜çº§æŸ¥è¯¢èŒƒå›´æŸ¥è¯¢ç‰¹æ€§
    [HighSearchRangeAttribute]
    public List<string> DeletionTime { get; set; }


 
} 

}

 HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Services/IWmsEnumAppService.cs

@@ -1,6 +1,7 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CmsQueryExtensions;
using System;
using System.Collections.Generic;
using System.Linq;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsEnumAppService.cs

@@ -1,10 +1,10 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsEnumDto;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsStores;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.WmsStores;
using CmsQueryExtensions;
using System;
using System.Collections.Generic;
using System.Linq;

 HIAWms/server/src/CMS.Plugin.HIAWms.Application/Implements/WmsMaterialStockAppService.cs

@@ -1,21 +1,19 @@
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.Shared;
using CMS.Plugin.HIAWms.Domain.Shared.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CmsQueryExtensions;
using Microsoft.Extensions.DependencyInjection;
using System.Text.Json;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.ObjectExtending;
using CMS.Plugin.HIAWms.Domain.Shared.Util;
using CMS.Plugin.HIAWms.Domain.WmsMaterials;
using CMS.Plugin.HIAWms.Domain.WmsContainers;
using CMS.Plugin.HIAWms.Domain.WmsPlaces;
using CMS.Plugin.HIAWms.Domain.WmsAreas;
using Volo.Abp.Uow;
using Microsoft.Extensions.DependencyInjection;
using NPOI.POIFS.Storage;
using System.Text.Json;

namespace CMS.Plugin.HIAWms.Application.Implements;


 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/CMS.Plugin.HIAWms.Domain.Shared.csproj

@@ -21,8 +21,18 @@
    </ItemGroup>

    <ItemGroup>
      <Compile Remove="Util\EnumHelper.cs" />
      <Compile Remove="Util\ExportHelper.cs" />
      <Compile Remove="Util\GetEnumDescriptionUtil.cs" />
    </ItemGroup>

    <ItemGroup>
        <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
        <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.20" />
    </ItemGroup>

    <ItemGroup>
      <Folder Include="Util\" />
    </ItemGroup>

</Project>

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Enums/YesNoEnum.cs

@@ -14,15 +14,16 @@
    public enum YesNoEnum
    {
        /// <summary>
        /// å¦
        /// </summary>
        [Description("否")]
        N = 0,

        /// <summary>
        /// æ˜¯
        /// </summary>
        [Description("是")]
        Y = 1,

        /// <summary>
        /// å¦
        /// </summary>
        [Description("否")]
        N = 2
    }
}

 HIAWms/server/src/CMS.Plugin.HIAWms.Domain.Shared/Util/ExportHelper.cs

@@ -12,6 +12,14 @@
    /// </summary>
    public static class ExportHelper
    {
       

        // æ‰¹é‡è½¬æ¢æ–¹æ³•
        public static List<Dictionary<string, object>> ConvertListToExportData<T>(IEnumerable<T> list)
        {
            return list.Select(ConvertToExportData).ToList();
        }

        // é€šç”¨è½¬æ¢æ–¹æ³•ï¼ˆå…¼å®¹ Func<T, Dictionary<string, object>>）
        public static Dictionary<string, object> ConvertToExportData<T>(T entity)
        {
@@ -24,12 +32,6 @@
                dict[prop.Name] = FormatValue(value);
            }
            return dict;
        }

        // æ‰¹é‡è½¬æ¢æ–¹æ³•
        public static List<Dictionary<string, object>> ConvertListToExportData<T>(IEnumerable<T> list)
        {
            return list.Select(ConvertToExportData).ToList();
        }

        private static object FormatValue(object value)
@@ -47,13 +49,5 @@
            return value;
        }

        private static string GetEnumDescription(Enum value)
        {
            var fieldInfo = value.GetType().GetField(value.ToString());
            var description = fieldInfo?
                .GetCustomAttributes(typeof(DescriptionAttribute), false)
                .FirstOrDefault() as DescriptionAttribute;
            return description?.Description ?? value.ToString();
        }
    }
}

 HIAWms/web/src/components/DyForm/DyForm.tsx

@@ -50,7 +50,7 @@
    },
    labelPosition: {
      type: String,
      default: 'left',
      default: 'right',
    },
    formData: {
      type: Object as PropType<{ [key: string]: any }>,

 HIAWms/web/src/widgets/WmsInOutStockRecord/Controllers/WmsInOutStockRecordDrawer.tsx

@@ -1,275 +1,278 @@
import { 
  ref, 
  onMounted, 
  reactive, 
  computed, 
  Ref, 
  watch, 
  SetupContext, 
  h, 
} from 'vue' 
import { injectModel } from '@/libs/Provider/Provider' 
import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer' 
import { ElMessage } from 'element-plus' 
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
 
export const useWmsInOutStockRecordDrawer = (props: any, ctx?: any) => { 
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>('wmsInOutStockRecordDrawer') 
  /** 
   * ç”¨æ¥å¯¹æ¯”的初始化数据 
   */ 
  const initiateData: Ref<Record<string, any>> = ref({}) 
  const formData = ref<Record<string, any>>({}) 
  // ref 
  const formRef = ref() 
 
  const disabled = ref(false) 
 
  const current = computed(() => { 
    return props.row || null 
  }) 
 
  const inputNumber = (attrs) => { 
    return ( 
      <el-input-number 
        min="1" 
        step="1" 
        precision="0" 
        {...attrs} 
      ></el-input-number> 
    ) 
  } 
 
  const visible = computed({ 
    get() { 
      return props.modelValue 
    }, 
    set(val) { 
      ctx.emit('update:modelValue', val) 
    }, 
  }) 
  /** 
   * æ·»åŠ çš„form字段 
   */ 
  const formItems = reactive([ 
                    { 
                   label: '单据编号', 
                   prop: 'orderNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入单据编号', 
              rules: [{required: true, message: '单据编号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '物料名称', 
                   prop: 'materialName', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料名称', 
                }, 
                { 
                   label: '物料件号', 
                   prop: 'materialNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料件号', 
              rules: [{required: true, message: '物料件号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '操作类型', 
                   prop: 'stockType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入操作类型', 
              rules: [{required: true, message: '操作类型不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '容器编号', 
                   prop: 'containerNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入容器编号', 
                }, 
                { 
                   label: '机型', 
                   prop: 'materialModel', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入机型', 
                }, 
                { 
                   label: '操作时间', 
                   prop: 'operateTime', 
                   type: 'datetimerange', 
                   el: 'date-picker', 
                   //disabled: disabled, 
                   placeholder: '请输入操作时间', 
                }, 
                { 
                   label: '备注', 
                   prop: 'remark', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入备注', 
                }, 
                { 
                   label: '物料ID', 
                   prop: 'materialId', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入物料ID', 
              rules: [{required: true, message: '物料ID不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入任务号', 
              rules: [{required: true, message: '任务号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入起始库位', 
                }, 
                { 
                   label: '目标库位', 
                   prop: 'toPlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入目标库位', 
                },  
  ]) 
  /** 
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ– 
   */ 
  const checkIsEqualObject = () => { 
    const data = { 
      formData: formData.value, 
    } 
    const check = isEqual(initiateData.value, data) 
    return check 
  } 
 
  const onClose = (done: () => void) => { 
    if (visible.value) { 
      if (checkIsEqualObject()) { 
        visible.value = false 
        done && done() 
      } else { 
        ConfirmBox('是否保存设置？') 
          .then(() => { 
            onConfirm() 
          }) 
          .catch(() => { 
            visible.value = false 
            done && done() 
          }) 
      } 
    } 
  } 
  /** 
   * ä¿å­˜ 
   */ 
  const onConfirm = async () => { 
    await formRef.value?.validate() 
    const data = { 
      orderNo: formData.value.orderNo, 
materialName: formData.value.materialName, 
materialNo: formData.value.materialNo, 
stockType: formData.value.stockType, 
containerNo: formData.value.containerNo, 
materialModel: formData.value.materialModel, 
operateTime: formData.value.operateTime, 
remark: formData.value.remark, 
materialId: formData.value.materialId, 
taskNo: formData.value.taskNo, 
sourcePlace: formData.value.sourcePlace, 
toPlace: formData.value.toPlace,  
    } 
    if (!current.value) { 
      await wmsInOutStockRecordDrawer.addWmsInOutStockRecord(data) 
    } else { 
      const id = current.value.id 
      await wmsInOutStockRecordDrawer.updateWmsInOutStockRecord(id, data) 
    } 
    ElMessage.success('保存成功') 
    ctx.emit('confirm') 
  } 
 
  const updateCheckData = () => { 
    initiateData.value = { 
      formData: { 
        ...formData.value, 
      }, 
    } 
  } 
  const updateFormItemOptions = (propName: string, enumData: any[]) => { 
    const item = formItems.find((item) => item.prop === propName) 
    if (item && enumData) { 
      item.options = enumData.map((item) => ({ 
        label: item.description, 
        value: item.value, 
      })) 
    } 
  } 
  /** 
   * é€šç”¨æŸ¥è¯¢æžšä¸¾ 
   */ 
  const commonQueryEnumForFrom = async () => { 
    const stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({ 
 EnumName: 'StockTypeEnum', 
}) 
updateFormItemOptions('stockType', stockTypeEnumEnum) 
 
  } 
  commonQueryEnumForFrom() 
  /** 
   * å¼¹çª—打开获取详情 
   */ 
  const onOpen = async () => { 
    if (current.value) { 
      const res = await wmsInOutStockRecordDrawer.getWmsInOutStockRecordDetail(current.value) 
 
      formData.value = { 
        orderNo: res.orderNo, 
materialName: res.materialName, 
materialNo: res.materialNo, 
stockType: res.stockType, 
containerNo: res.containerNo, 
materialModel: res.materialModel, 
operateTime: res.operateTime, 
remark: res.remark, 
materialId: res.materialId, 
taskNo: res.taskNo, 
sourcePlace: res.sourcePlace, 
toPlace: res.toPlace,  
        id: res.id, 
      } 
      disabled.value = true 
      updateCheckData() 
    } else { 
      formData.value = {} 
 
      disabled.value = false 
      updateCheckData() 
    } 
  } 
 
  watch(() => current.value, onOpen) 
 
  return { 
    formItems, 
    formData, 
    visible, 
    formRef, 
    onOpen, 
    onClose, 
    onConfirm, 
  } 
} 
import {
  ref,
  onMounted,
  reactive,
  computed,
  Ref,
  watch,
  SetupContext,
  h,
} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsInOutStockRecordDrawer } from '../Models/WmsInOutStockRecordDrawer'
import { ElMessage } from 'element-plus'
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'

export const useWmsInOutStockRecordDrawer = (props: any, ctx?: any) => {
  const wmsInOutStockRecordDrawer = injectModel<WmsInOutStockRecordDrawer>(
    'wmsInOutStockRecordDrawer'
  )
  /**
   * ç”¨æ¥å¯¹æ¯”的初始化数据
   */
  const initiateData: Ref<Record<string, any>> = ref({})
  const formData = ref<Record<string, any>>({})
  // ref
  const formRef = ref()

  const disabled = ref(false)

  const current = computed(() => {
    return props.row || null
  })

  const inputNumber = (attrs) => {
    return (
      <el-input-number
        min="1"
        step="1"
        precision="0"
        {...attrs}
      ></el-input-number>
    )
  }

  const visible = computed({
    get() {
      return props.modelValue
    },
    set(val) {
      ctx.emit('update:modelValue', val)
    },
  })
  /**
   * æ·»åŠ çš„form字段
   */
  const formItems = reactive([
    {
      label: '单据编号',
      prop: 'orderNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入单据编号',
      rules: [{ required: true, message: '单据编号不能为空', trigger: 'blur' }],
    },
    {
      label: '物料名称',
      prop: 'materialName',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入物料名称',
    },
    {
      label: '物料件号',
      prop: 'materialNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入物料件号',
      rules: [{ required: true, message: '物料件号不能为空', trigger: 'blur' }],
    },
    {
      label: '操作类型',
      prop: 'stockType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入操作类型',
      rules: [{ required: true, message: '操作类型不能为空', trigger: 'blur' }],
    },
    {
      label: '容器编号',
      prop: 'containerNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入容器编号',
    },
    {
      label: '机型',
      prop: 'materialModel',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入机型',
    },
    {
      label: '操作时间',
      prop: 'operateTime',
      type: 'datetimerange',
      el: 'date-picker',
      //disabled: disabled,
      placeholder: '请输入操作时间',
    },
    {
      label: '备注',
      prop: 'remark',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入备注',
    },
    {
      label: '物料ID',
      prop: 'materialId',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入物料ID',
      rules: [{ required: true, message: '物料ID不能为空', trigger: 'blur' }],
    },
    {
      label: '任务号',
      prop: 'taskNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入任务号',
      rules: [{ required: true, message: '任务号不能为空', trigger: 'blur' }],
    },
    {
      label: '起始库位',
      prop: 'sourcePlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入起始库位',
    },
    {
      label: '目标库位',
      prop: 'toPlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入目标库位',
    },
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–
   */
  const checkIsEqualObject = () => {
    const data = {
      formData: formData.value,
    }
    const check = isEqual(initiateData.value, data)
    return check
  }

  const onClose = (done: () => void) => {
    if (visible.value) {
      if (checkIsEqualObject()) {
        visible.value = false
        done && done()
      } else {
        ConfirmBox('是否保存设置？')
          .then(() => {
            onConfirm()
          })
          .catch(() => {
            visible.value = false
            done && done()
          })
      }
    }
  }
  /**
   * ä¿å­˜
   */
  const onConfirm = async () => {
    await formRef.value?.validate()
    const data = {
      orderNo: formData.value.orderNo,
      materialName: formData.value.materialName,
      materialNo: formData.value.materialNo,
      stockType: formData.value.stockType,
      containerNo: formData.value.containerNo,
      materialModel: formData.value.materialModel,
      operateTime: formData.value.operateTime,
      remark: formData.value.remark,
      materialId: formData.value.materialId,
      taskNo: formData.value.taskNo,
      sourcePlace: formData.value.sourcePlace,
      toPlace: formData.value.toPlace,
    }
    if (!current.value) {
      await wmsInOutStockRecordDrawer.addWmsInOutStockRecord(data)
    } else {
      const id = current.value.id
      await wmsInOutStockRecordDrawer.updateWmsInOutStockRecord(id, data)
    }
    ElMessage.success('保存成功')
    ctx.emit('confirm')
  }

  const updateCheckData = () => {
    initiateData.value = {
      formData: {
        ...formData.value,
      },
    }
  }
  const updateFormItemOptions = (propName: string, enumData: any[]) => {
    const item = formItems.find((item) => item.prop === propName)
    if (item && enumData) {
      item.options = enumData.map((item) => ({
        label: item.description,
        value: item.value,
      }))
    }
  }
  /**
   * é€šç”¨æŸ¥è¯¢æžšä¸¾
   */
  const commonQueryEnumForFrom = async () => {
    const stockTypeEnumEnum = await wmsInOutStockRecordDrawer.getWmsEnumData({
      EnumName: 'StockTypeEnum',
    })
    updateFormItemOptions('stockType', stockTypeEnumEnum)
  }
  commonQueryEnumForFrom()
  /**
   * å¼¹çª—打开获取详情
   */
  const onOpen = async () => {
    if (current.value) {
      const res = await wmsInOutStockRecordDrawer.getWmsInOutStockRecordDetail(
        current.value
      )

      formData.value = {
        orderNo: res.orderNo,
        materialName: res.materialName,
        materialNo: res.materialNo,
        stockType: res.stockType,
        containerNo: res.containerNo,
        materialModel: res.materialModel,
        operateTime: res.operateTime,
        remark: res.remark,
        materialId: res.materialId,
        taskNo: res.taskNo,
        sourcePlace: res.sourcePlace,
        toPlace: res.toPlace,
        id: res.id,
      }
      disabled.value = true
      updateCheckData()
    } else {
      formData.value = {}

      disabled.value = false
      updateCheckData()
    }
  }

  watch(() => current.value, onOpen)

  return {
    formItems,
    formData,
    visible,
    formRef,
    onOpen,
    onClose,
    onConfirm,
  }
}

 HIAWms/web/src/widgets/WmsStoreInfo/Views/Pages/WmsArea/WmsArea.module.scss

@@ -15,7 +15,7 @@
  .header {
    margin-bottom: 12px;
    display: flex;
    justify-content: flex-start;
    justify-content: flex-start !important;
    align-items: center;
  }
}

 HIAWms/web/src/widgets/WmsTask/Controllers/WmsTaskDrawer.tsx

@@ -1,332 +1,333 @@
import { 
  ref, 
  onMounted, 
  reactive, 
  computed, 
  Ref, 
  watch, 
  SetupContext, 
  h, 
} from 'vue' 
import { injectModel } from '@/libs/Provider/Provider' 
import { WmsTaskDrawer } from '../Models/WmsTaskDrawer' 
import { ElMessage } from 'element-plus' 
import isEqual from 'lodash/isEqual' 
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox' 
import { cloneDeep } from 'lodash' 
 
export const useWmsTaskDrawer = (props: any, ctx?: any) => { 
  const wmsTaskDrawer = injectModel<WmsTaskDrawer>('wmsTaskDrawer') 
  /** 
   * ç”¨æ¥å¯¹æ¯”的初始化数据 
   */ 
  const initiateData: Ref<Record<string, any>> = ref({}) 
  const formData = ref<Record<string, any>>({}) 
  // ref 
  const formRef = ref() 
 
  const disabled = ref(false) 
 
  const current = computed(() => { 
    return props.row || null 
  }) 
 
  const inputNumber = (attrs) => { 
    return ( 
      <el-input-number 
        min="1" 
        step="1" 
        precision="0" 
        {...attrs} 
      ></el-input-number> 
    ) 
  } 
 
  const visible = computed({ 
    get() { 
      return props.modelValue 
    }, 
    set(val) { 
      ctx.emit('update:modelValue', val) 
    }, 
  }) 
  /** 
   * æ·»åŠ çš„form字段 
   */ 
  const formItems = reactive([ 
                    { 
                   label: '巷道', 
                   prop: 'aisle', 
                   //disabled: disabled, 
                   placeholder: '请输入巷道', 
                }, 
                { 
                   label: '托盘编号', 
                   prop: 'containerNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入托盘编号', 
                }, 
                { 
                   label: '堆垛机ID', 
                   prop: 'dodeviceId', 
                   //disabled: disabled, 
                   placeholder: '请输入堆垛机ID', 
                }, 
                { 
                   label: '设备类型', 
                   prop: 'dodevicetype', 
                   //disabled: disabled, 
                   placeholder: '请输入设备类型', 
              rules: [{required: true, message: '设备类型不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '下个任务是否生成成功', 
                   prop: 'isNextTask', 
                   //disabled: disabled, 
                   placeholder: '请输入下个任务是否生成成功', 
                }, 
                { 
                   label: 'WCS是否可以读取', 
                   prop: 'isRead', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入WCS是否可以读取', 
              rules: [{required: true, message: 'WCS是否可以读取不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '可变变量1', 
                   prop: 'mutableParam1', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入可变变量1', 
                }, 
                { 
                   label: '可变变量2', 
                   prop: 'mutableParam2', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入可变变量2', 
                }, 
                { 
                   label: '可变变量3', 
                   prop: 'mutableParam3', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入可变变量3', 
                }, 
                { 
                   label: '子任务类型', 
                   prop: 'sonTaskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入子任务类型', 
                }, 
                { 
                   label: '来源单据号', 
                   prop: 'sourceOrderNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入来源单据号', 
                }, 
                { 
                   label: '起始库位', 
                   prop: 'sourcePlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入起始库位', 
                }, 
                { 
                   label: '设备任务状态', 
                   prop: 'taskDodeviceStatus', 
                   //disabled: disabled, 
                   placeholder: '请输入设备任务状态', 
              rules: [{required: true, message: '设备任务状态不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务等级', 
                   prop: 'taskLevel', 
                   //disabled: disabled, 
                   placeholder: '请输入任务等级', 
              rules: [{required: true, message: '任务等级不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务号', 
                   prop: 'taskNo', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入任务号', 
              rules: [{required: true, message: '任务号不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务状态', 
                   prop: 'taskStatus', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务状态', 
              rules: [{required: true, message: '任务状态不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '任务类型', 
                   prop: 'taskType', 
                   el: 'select', 
                   //disabled: disabled, 
                   placeholder: '请输入任务类型', 
              rules: [{required: true, message: '任务类型不能为空', trigger: 'blur' }], 
                }, 
                { 
                   label: '目标库位', 
                   prop: 'toPlace', 
                   el: 'input', 
                   //disabled: disabled, 
                   placeholder: '请输入目标库位', 
                },  
  ]) 
  /** 
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ– 
   */ 
  const checkIsEqualObject = () => { 
    const data = { 
      formData: formData.value, 
    } 
    const check = isEqual(initiateData.value, data) 
    return check 
  } 
 
  const onClose = (done: () => void) => { 
    if (visible.value) { 
      if (checkIsEqualObject()) { 
        visible.value = false 
        done && done() 
      } else { 
        ConfirmBox('是否保存设置？') 
          .then(() => { 
            onConfirm() 
          }) 
          .catch(() => { 
            visible.value = false 
            done && done() 
          }) 
      } 
    } 
  } 
  /** 
   * ä¿å­˜ 
   */ 
  const onConfirm = async () => { 
    await formRef.value?.validate() 
    const data = { 
      aisle: formData.value.aisle, 
containerNo: formData.value.containerNo, 
dodeviceId: formData.value.dodeviceId, 
dodevicetype: formData.value.dodevicetype, 
isNextTask: formData.value.isNextTask, 
isRead: formData.value.isRead, 
mutableParam1: formData.value.mutableParam1, 
mutableParam2: formData.value.mutableParam2, 
mutableParam3: formData.value.mutableParam3, 
sonTaskType: formData.value.sonTaskType, 
sourceOrderNo: formData.value.sourceOrderNo, 
sourcePlace: formData.value.sourcePlace, 
taskDodeviceStatus: formData.value.taskDodeviceStatus, 
taskLevel: formData.value.taskLevel, 
taskNo: formData.value.taskNo, 
taskStatus: formData.value.taskStatus, 
taskType: formData.value.taskType, 
toPlace: formData.value.toPlace,  
    } 
    if (!current.value) { 
      await wmsTaskDrawer.addWmsTask(data) 
    } else { 
      const id = current.value.id 
      await wmsTaskDrawer.updateWmsTask(id, data) 
    } 
    ElMessage.success('保存成功') 
    ctx.emit('confirm') 
  } 
 
  const updateCheckData = () => { 
    initiateData.value = { 
      formData: { 
        ...formData.value, 
      }, 
    } 
  } 
  const updateFormItemOptions = (propName: string, enumData: any[]) => { 
    const item = formItems.find((item) => item.prop === propName) 
    if (item && enumData) { 
      item.options = enumData.map((item) => ({ 
        label: item.description, 
        value: item.value, 
      })) 
    } 
  } 
  /** 
   * é€šç”¨æŸ¥è¯¢æžšä¸¾ 
   */ 
  const commonQueryEnumForFrom = async () => { 
    const taskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({ 
 EnumName: 'TaskTypeEnum', 
}) 
updateFormItemOptions('taskType', taskTypeEnumEnum) 
const wmsTaskStatusEnum = await wmsTaskDrawer.getWmsEnumData({ 
 EnumName: 'WmsTaskStatus', 
}) 
updateFormItemOptions('taskStatus', wmsTaskStatusEnum) 
const sonTaskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({ 
 EnumName: 'SonTaskTypeEnum', 
}) 
updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum) 
 
  } 
  commonQueryEnumForFrom() 
  /** 
   * å¼¹çª—打开获取详情 
   */ 
  const onOpen = async () => { 
    if (current.value) { 
      const res = await wmsTaskDrawer.getWmsTaskDetail(current.value) 
 
      formData.value = { 
        aisle: res.aisle, 
containerNo: res.containerNo, 
dodeviceId: res.dodeviceId, 
dodevicetype: res.dodevicetype, 
isNextTask: res.isNextTask, 
isRead: res.isRead, 
mutableParam1: res.mutableParam1, 
mutableParam2: res.mutableParam2, 
mutableParam3: res.mutableParam3, 
sonTaskType: res.sonTaskType, 
sourceOrderNo: res.sourceOrderNo, 
sourcePlace: res.sourcePlace, 
taskDodeviceStatus: res.taskDodeviceStatus, 
taskLevel: res.taskLevel, 
taskNo: res.taskNo, 
taskStatus: res.taskStatus, 
taskType: res.taskType, 
toPlace: res.toPlace,  
        id: res.id, 
      } 
      disabled.value = true 
      updateCheckData() 
    } else { 
      formData.value = {} 
 
      disabled.value = false 
      updateCheckData() 
    } 
  } 
 
  watch(() => current.value, onOpen) 
 
  return { 
    formItems, 
    formData, 
    visible, 
    formRef, 
    onOpen, 
    onClose, 
    onConfirm, 
  } 
} 
import {
  ref,
  onMounted,
  reactive,
  computed,
  Ref,
  watch,
  SetupContext,
  h,
} from 'vue'
import { injectModel } from '@/libs/Provider/Provider'
import { WmsTaskDrawer } from '../Models/WmsTaskDrawer'
import { ElMessage } from 'element-plus'
import isEqual from 'lodash/isEqual'
import { ConfirmBox } from '@/components/ConfirmBox/ConfirmBox'
import { cloneDeep } from 'lodash'

export const useWmsTaskDrawer = (props: any, ctx?: any) => {
  const wmsTaskDrawer = injectModel<WmsTaskDrawer>('wmsTaskDrawer')
  /**
   * ç”¨æ¥å¯¹æ¯”的初始化数据
   */
  const initiateData: Ref<Record<string, any>> = ref({})
  const formData = ref<Record<string, any>>({})
  // ref
  const formRef = ref()

  const disabled = ref(false)

  const current = computed(() => {
    return props.row || null
  })

  const inputNumber = (attrs) => {
    return (
      <el-input-number
        min="1"
        step="1"
        precision="0"
        {...attrs}
      ></el-input-number>
    )
  }

  const visible = computed({
    get() {
      return props.modelValue
    },
    set(val) {
      ctx.emit('update:modelValue', val)
    },
  })
  /**
   * æ·»åŠ çš„form字段
   */
  const formItems = reactive([
    {
      label: '巷道',
      prop: 'aisle',
      //disabled: disabled,
      placeholder: '请输入巷道',
    },
    {
      label: '托盘编号',
      prop: 'containerNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入托盘编号',
    },
    {
      label: '堆垛机ID',
      prop: 'dodeviceId',
      //disabled: disabled,
      placeholder: '请输入堆垛机ID',
    },
    {
      label: '设备类型',
      prop: 'dodevicetype',
      //disabled: disabled,
      placeholder: '请输入设备类型',
      rules: [{ required: true, message: '设备类型不能为空', trigger: 'blur' }],
    },
    {
      label: '下个任务是否生成成功',
      prop: 'isNextTask',
      //disabled: disabled,
      placeholder: '请输入下个任务是否生成成功',
    },
    //   {
    //      label: 'WCS是否可以读取',
    //      prop: 'isRead',
    //      el: 'select',
    //      //disabled: disabled,
    //      placeholder: '请输入WCS是否可以读取',
    // rules: [{required: true, message: 'WCS是否可以读取不能为空', trigger: 'blur' }],
    //   },
    {
      label: '可变变量1',
      prop: 'mutableParam1',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入可变变量1',
    },
    {
      label: '可变变量2',
      prop: 'mutableParam2',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入可变变量2',
    },
    {
      label: '可变变量3',
      prop: 'mutableParam3',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入可变变量3',
    },
    {
      label: '子任务类型',
      prop: 'sonTaskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入子任务类型',
    },
    {
      label: '来源单据号',
      prop: 'sourceOrderNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入来源单据号',
    },
    {
      label: '起始库位',
      prop: 'sourcePlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入起始库位',
    },
    {
      label: '设备任务状态',
      prop: 'taskDodeviceStatus',
      //disabled: disabled,
      placeholder: '请输入设备任务状态',
      rules: [
        { required: true, message: '设备任务状态不能为空', trigger: 'blur' },
      ],
    },
    {
      label: '任务等级',
      prop: 'taskLevel',
      //disabled: disabled,
      placeholder: '请输入任务等级',
      rules: [{ required: true, message: '任务等级不能为空', trigger: 'blur' }],
    },
    {
      label: '任务号',
      prop: 'taskNo',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入任务号',
      rules: [{ required: true, message: '任务号不能为空', trigger: 'blur' }],
    },
    {
      label: '任务状态',
      prop: 'taskStatus',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务状态',
      rules: [{ required: true, message: '任务状态不能为空', trigger: 'blur' }],
    },
    {
      label: '任务类型',
      prop: 'taskType',
      el: 'select',
      //disabled: disabled,
      placeholder: '请输入任务类型',
      rules: [{ required: true, message: '任务类型不能为空', trigger: 'blur' }],
    },
    {
      label: '目标库位',
      prop: 'toPlace',
      el: 'input',
      //disabled: disabled,
      placeholder: '请输入目标库位',
    },
  ])
  /**
   * æ ¡éªŒæ˜¯å¦æœ‰æ•°æ®å˜åŒ–
   */
  const checkIsEqualObject = () => {
    const data = {
      formData: formData.value,
    }
    const check = isEqual(initiateData.value, data)
    return check
  }

  const onClose = (done: () => void) => {
    if (visible.value) {
      if (checkIsEqualObject()) {
        visible.value = false
        done && done()
      } else {
        ConfirmBox('是否保存设置？')
          .then(() => {
            onConfirm()
          })
          .catch(() => {
            visible.value = false
            done && done()
          })
      }
    }
  }
  /**
   * ä¿å­˜
   */
  const onConfirm = async () => {
    await formRef.value?.validate()
    const data = {
      aisle: formData.value.aisle,
      containerNo: formData.value.containerNo,
      dodeviceId: formData.value.dodeviceId,
      dodevicetype: formData.value.dodevicetype,
      isNextTask: formData.value.isNextTask,
      isRead: formData.value.isRead,
      mutableParam1: formData.value.mutableParam1,
      mutableParam2: formData.value.mutableParam2,
      mutableParam3: formData.value.mutableParam3,
      sonTaskType: formData.value.sonTaskType,
      sourceOrderNo: formData.value.sourceOrderNo,
      sourcePlace: formData.value.sourcePlace,
      taskDodeviceStatus: formData.value.taskDodeviceStatus,
      taskLevel: formData.value.taskLevel,
      taskNo: formData.value.taskNo,
      taskStatus: formData.value.taskStatus,
      taskType: formData.value.taskType,
      toPlace: formData.value.toPlace,
    }
    if (!current.value) {
      await wmsTaskDrawer.addWmsTask(data)
    } else {
      const id = current.value.id
      await wmsTaskDrawer.updateWmsTask(id, data)
    }
    ElMessage.success('保存成功')
    ctx.emit('confirm')
  }

  const updateCheckData = () => {
    initiateData.value = {
      formData: {
        ...formData.value,
      },
    }
  }
  const updateFormItemOptions = (propName: string, enumData: any[]) => {
    const item = formItems.find((item) => item.prop === propName)
    if (item && enumData) {
      item.options = enumData.map((item) => ({
        label: item.description,
        value: item.value,
      }))
    }
  }
  /**
   * é€šç”¨æŸ¥è¯¢æžšä¸¾
   */
  const commonQueryEnumForFrom = async () => {
    const taskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
      EnumName: 'TaskTypeEnum',
    })
    updateFormItemOptions('taskType', taskTypeEnumEnum)
    const wmsTaskStatusEnum = await wmsTaskDrawer.getWmsEnumData({
      EnumName: 'WmsTaskStatus',
    })
    updateFormItemOptions('taskStatus', wmsTaskStatusEnum)
    const sonTaskTypeEnumEnum = await wmsTaskDrawer.getWmsEnumData({
      EnumName: 'SonTaskTypeEnum',
    })
    updateFormItemOptions('sonTaskType', sonTaskTypeEnumEnum)
  }
  commonQueryEnumForFrom()
  /**
   * å¼¹çª—打开获取详情
   */
  const onOpen = async () => {
    if (current.value) {
      const res = await wmsTaskDrawer.getWmsTaskDetail(current.value)

      formData.value = {
        aisle: res.aisle,
        containerNo: res.containerNo,
        dodeviceId: res.dodeviceId,
        dodevicetype: res.dodevicetype,
        isNextTask: res.isNextTask,
        isRead: res.isRead,
        mutableParam1: res.mutableParam1,
        mutableParam2: res.mutableParam2,
        mutableParam3: res.mutableParam3,
        sonTaskType: res.sonTaskType,
        sourceOrderNo: res.sourceOrderNo,
        sourcePlace: res.sourcePlace,
        taskDodeviceStatus: res.taskDodeviceStatus,
        taskLevel: res.taskLevel,
        taskNo: res.taskNo,
        taskStatus: res.taskStatus,
        taskType: res.taskType,
        toPlace: res.toPlace,
        id: res.id,
      }
      disabled.value = true
      updateCheckData()
    } else {
      formData.value = {}

      disabled.value = false
      updateCheckData()
    }
  }

  watch(() => current.value, onOpen)

  return {
    formItems,
    formData,
    visible,
    formRef,
    onOpen,
    onClose,
    onConfirm,
  }
}

 HIAWms/web/src/widgets/WmsTask/Views/Pages/WmsTask/WmsTask.tsx

@@ -1,324 +1,326 @@
import { computed, defineComponent, onMounted, reactive, ref } from 'vue' 
import type { Ref } from 'vue' 
import BaseTable from '@/components/Table/Table' 
import styles from './WmsTask.module.scss' 
import { useWmsTask } from '../../../Controllers/WmsTask' 
import IconButton from '@/components/IconButton/IconButton' 
import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer' 
import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer' 
import Search from '@/components/Search/Search' 
import { columns } from './Config' 
import TdButton from '@/components/TdButton/TdButton' 
import { vPermission } from '@/libs/Permission/Permission' 
import { 
  getWmsEnumData 
} from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer' 
import { 
  ElInput, 
  ElSelect, 
  ElOption, 
  ElDatePicker, 
  ElForm, 
  ElFormItem, 
} from 'element-plus' 
import { injectModel } from '@/libs/Provider/Provider' 
 
interface RenderTableType { 
  url?: string 
  dataSource: Ref<any[]> 
  isDrag?: boolean 
  isChecked?: boolean 
  isHidePagination?: boolean 
  params?: Record<string, any> 
  autoHeight?: boolean 
} 
 
export default defineComponent({ 
  name: 'WmsTask', 
  directives: { 
    permission: vPermission, 
  }, 
  setup(props, ctx) { 
    const { 
      dataSource, 
      contextMenu, 
      dialogConfig, 
      dialogConfigForQuery, 
      tableRef, 
      current, 
      search, 
      sort, 
      headers, 
      onError, 
      onSearch, 
      onRowClick, 
      onConfirmWmsTask, 
      onCheck, 
      onAddWmsTask, 
      onAdvancedQuery, 
      onExport, 
      openDetail, 
      onSuccess, 
      onBeforeUpload, 
    } = useWmsTask(props, ctx) 
 
    //定义高级查询引用 
   const wmsTaskQueryDrawerRef=ref(null); 
    // æ–°å¢žçš„查询条件 
    const queryForm = ref({ 
      searchVal: '', 
      str_searchFormInputAttrs:[] 
    }) 
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题) 
    const _searchFormInputAttrs = ref([ 
     'TaskNo', 'ContainerNo' 
    ]); 
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码'); 
     
 
    // åŠ¨æ€æžšä¸¾é€‰é¡¹ 
    const enumOptions = reactive({ 
      taskType: [] as Array<{label: string; value: any }>, 
taskStatus: [] as Array<{label: string; value: any }>, 
sonTaskType: [] as Array<{label: string; value: any }>,  
    }) 
 
    // èŽ·å–枚举数据 
    const fetchEnumData = async () => { 
      try { 
        const taskTypeEnumData = await getWmsEnumData({ 
 EnumName: 'TaskTypeEnum', 
}) 
enumOptions.taskType = taskTypeEnumData.map((item) => ({ 
  label: item.description, 
  value: item.value, 
})) 
const wmsTaskStatusData = await getWmsEnumData({ 
 EnumName: 'WmsTaskStatus', 
}) 
enumOptions.taskStatus = wmsTaskStatusData.map((item) => ({ 
  label: item.description, 
  value: item.value, 
})) 
const sonTaskTypeEnumData = await getWmsEnumData({ 
 EnumName: 'SonTaskTypeEnum', 
}) 
enumOptions.sonTaskType = sonTaskTypeEnumData.map((item) => ({ 
  label: item.description, 
  value: item.value, 
})) 
 
      } catch (error) { 
        console.error('获取枚举数据失败:', error) 
      } 
    } 
 
    // ç»„件挂载时获取枚举数据 
    onMounted(() => { 
      fetchEnumData() 
    }) 
 
    // å®šä¹‰å“åº”式查询数据 
    const _curHighQueryData = ref({ searchVal: '',str_searchFormInputAttrs:[] }); 
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】） 
    const handleQueryForMain = async () => { 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal; 
      _curHighQueryData.value.str_searchFormInputAttrs = _searchFormInputAttrs.value; 
      tableRef.value.getList(_curHighQueryData.value) 
    } 
    // æ–°ç‰ˆçš„查询方法（高级查询中的按钮【查询】） 
    const handleQuery = async (extraParams = {}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      commonSaveCurHighQueryData(filteredData); 
      tableRef.value.getList(filteredData) 
    } 
    // æ–°ç‰ˆçš„查询重置 
    const resetQuery = () => { 
      queryForm.value.searchVal = '' 
      queryForm.value.str_searchFormInputAttrs=_searchFormInputAttrs.value; 
    } 
     //新版的导出方法 
     const handleExport=()=>{ 
      onExport(_curHighQueryData.value); 
    } 
    // æ–°ç‰ˆçš„查询弹出框关闭方法 
    const closeQuery = (extraParams={}) => { 
      let filteredData = commonGetHighQueryForm(extraParams); 
      console.log("closeQuery方法"); 
      console.log(filteredData); 
      commonSaveCurHighQueryData(filteredData); 
    } 
    //保存查询值 
    const commonSaveCurHighQueryData=(filteredData={})=>{ 
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }; 
      _curHighQueryData.value.searchVal = queryForm.value.searchVal 
      _curHighQueryData.value.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
    } 
     //获取高级查询弹出框的查询值 
     const commonGetHighQueryForm=(extraParams={})=>{ 
      // è¿‡æ»¤æŽ‰ undefined çš„值 
      let filteredData = Object.assign( 
        {}, 
        ...Object.entries(extraParams).map(([key, value]) => 
          value !== undefined ? { [key]: value } : {} 
        ) 
      ) 
      //组合模糊查询 
      filteredData.searchVal = queryForm.value.searchVal 
      filteredData.str_searchFormInputAttrs =_searchFormInputAttrs.value; 
      return filteredData; 
    } 
    
 
    /** 
     * @returns è¡¨æ ¼ 
     */ 
    const RenderBaseTable = (props: RenderTableType) => { 
      const { 
        url, 
        dataSource, 
        isDrag, 
        isChecked, 
        isHidePagination, 
        params, 
        autoHeight, 
      } = props 
 
      return ( 
        <div 
          class={{ 
            [styles.wmsTaskList]: true, 
          }} 
        > 
          <BaseTable 
            ref={tableRef} 
            url={url} 
            sortUrlTpl="/api/v1/HIAWms/wmsTask/{id}/adjustsort/{sort}" 
            v-model:dataSource={dataSource.value} 
            columns={columns} 
            contextMenu={contextMenu} 
            params={params} 
            isDrag={isDrag} 
            isChecked={isChecked} 
            autoHeight={autoHeight} 
            onCheck={onCheck} 
            onRowClick={onRowClick} 
            isHidePagination={isHidePagination} 
            pageSize={20} 
            v-slots={{ 
              name: ({ row }: any) => { 
                return row?.name ? ( 
                  <TdButton 
                    onClick={() => openDetail(row)} 
                    text={<span style="color:#5a84ff">详情</span>} 
                    icon="scale" 
                    tip={row?.name} 
                    hover 
                  > 
                    {row?.name} 
                  </TdButton> 
                ) : ( 
                  '-' 
                ) 
              }, 
            }} 
          ></BaseTable> 
        </div> 
      ) 
    } 
 
    return () => { 
      return ( 
        <div class={styles.wmsTaskContent}> 
          {/* æ·»åŠ /编辑 */} 
          <WmsTaskDrawer 
            v-model={dialogConfig.visible} 
            title={dialogConfig.title} 
            row={current.value} 
            sort={sort.value} 
            onConfirm={onConfirmWmsTask} 
          /> 
          {/* é«˜çº§æŸ¥è¯¢ */} 
          <WmsTaskQueryDrawer 
            ref="wmsTaskQueryDrawerRef" 
            v-model={dialogConfigForQuery.visible} 
            title={dialogConfigForQuery.title} 
            row={current.value} 
            sort={sort.value} 
            onConfirmQuery={handleQuery} 
            onRestQuery={resetQuery} 
            onClose={closeQuery} 
          /> 
 
          <div class={styles.headerContent}> 
            <div class={styles.header}> 
              <IconButton 
                v-permission="wmsTask-add" 
                icon="add-p" 
                onClick={onAddWmsTask} 
                type="primary" 
              > 
                æ·»åŠ  
              </IconButton> 
              <el-divider direction="vertical" /> 
 
              <el-divider direction="vertical" /> 
              <el-upload 
                v-permission="wmsTask-import" 
                name="file" 
                accept=".xlsx,.xls,.csv" 
                show-file-list={false} 
                onError={onError} 
                onSuccess={onSuccess} 
                before-upload={onBeforeUpload} 
                headers={headers.value} 
                action="/api/v1/HIAWms/wmsTask/import" 
              > 
                <IconButton icon="in">导入</IconButton> 
              </el-upload> 
 
              <IconButton 
                v-permission="wmsTask-output" 
                icon="out" 
                onClick={handleExport} 
              > 
                å¯¼å‡º 
              </IconButton> 
            </div> 
            <ElFormItem style={{ marginTop: '15px' }}> 
              <ElFormItem label="关键字"> 
                <ElInput 
                  v-model={queryForm.value.searchVal} 
                  placeholder={searchFormInputAttrs_Placeholder.value} 
                  clearable 
                  class={styles.formItem} 
                /> 
              </ElFormItem> 
              <IconButton type="primary" icon="search" onClick={handleQueryForMain}> 
                æŸ¥è¯¢ 
              </IconButton> 
import { computed, defineComponent, onMounted, reactive, ref } from 'vue'
import type { Ref } from 'vue'
import BaseTable from '@/components/Table/Table'
import styles from './WmsTask.module.scss'
import { useWmsTask } from '../../../Controllers/WmsTask'
import IconButton from '@/components/IconButton/IconButton'
import WmsTaskDrawer from '../Dialog/WmsTaskDrawer/WmsTaskDrawer'
import WmsTaskQueryDrawer from '../Dialog/WmsTaskQueryDrawer/WmsTaskQueryDrawer'
import Search from '@/components/Search/Search'
import { columns } from './Config'
import TdButton from '@/components/TdButton/TdButton'
import { vPermission } from '@/libs/Permission/Permission'
import { getWmsEnumData } from '@/widgets/WmsTask/Models/Service/WmsTaskDrawer'
import {
  ElInput,
  ElSelect,
  ElOption,
  ElDatePicker,
  ElForm,
  ElFormItem,
} from 'element-plus'
import { injectModel } from '@/libs/Provider/Provider'

interface RenderTableType {
  url?: string
  dataSource: Ref<any[]>
  isDrag?: boolean
  isChecked?: boolean
  isHidePagination?: boolean
  params?: Record<string, any>
  autoHeight?: boolean
}

export default defineComponent({
  name: 'WmsTask',
  directives: {
    permission: vPermission,
  },
  setup(props, ctx) {
    const {
      dataSource,
      contextMenu,
      dialogConfig,
      dialogConfigForQuery,
      tableRef,
      current,
      search,
      sort,
      headers,
      onError,
      onSearch,
      onRowClick,
      onConfirmWmsTask,
      onCheck,
      onAddWmsTask,
      onAdvancedQuery,
      onExport,
      openDetail,
      onSuccess,
      onBeforeUpload,
    } = useWmsTask(props, ctx)

    //定义高级查询引用
    const wmsTaskQueryDrawerRef = ref(null)
    // æ–°å¢žçš„查询条件
    const queryForm = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
    })
    //定义整体模糊查询的列数组(注意：必须大小写跟后端的实体类属性名一致，否则会导致匹配不对的问题)
    const _searchFormInputAttrs = ref(['TaskNo', 'ContainerNo'])
    const searchFormInputAttrs_Placeholder = ref('请输入任务编码/托盘编码')

    // åŠ¨æ€æžšä¸¾é€‰é¡¹
    const enumOptions = reactive({
      taskType: [] as Array<{ label: string; value: any }>,
      taskStatus: [] as Array<{ label: string; value: any }>,
      sonTaskType: [] as Array<{ label: string; value: any }>,
    })

    // èŽ·å–枚举数据
    const fetchEnumData = async () => {
      try {
        const taskTypeEnumData = await getWmsEnumData({
          EnumName: 'TaskTypeEnum',
        })
        enumOptions.taskType = taskTypeEnumData.map((item) => ({
          label: item.description,
          value: item.value,
        }))
        const wmsTaskStatusData = await getWmsEnumData({
          EnumName: 'WmsTaskStatus',
        })
        enumOptions.taskStatus = wmsTaskStatusData.map((item) => ({
          label: item.description,
          value: item.value,
        }))
        const sonTaskTypeEnumData = await getWmsEnumData({
          EnumName: 'SonTaskTypeEnum',
        })
        enumOptions.sonTaskType = sonTaskTypeEnumData.map((item) => ({
          label: item.description,
          value: item.value,
        }))
      } catch (error) {
        console.error('获取枚举数据失败:', error)
      }
    }

    // ç»„件挂载时获取枚举数据
    onMounted(() => {
      fetchEnumData()
    })

    // å®šä¹‰å“åº”式查询数据
    const _curHighQueryData = ref({
      searchVal: '',
      str_searchFormInputAttrs: [],
    })
    // æ–°ç‰ˆçš„查询方法（主页面中的按钮【查询】）
    const handleQueryForMain = async () => {
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
      tableRef.value.getList(_curHighQueryData.value)
    }
    // æ–°ç‰ˆçš„查询方法（高级查询中的按钮【查询】）
    const handleQuery = async (extraParams = {}) => {
      let filteredData = commonGetHighQueryForm(extraParams)
      commonSaveCurHighQueryData(filteredData)
      tableRef.value.getList(filteredData)
    }
    // æ–°ç‰ˆçš„查询重置
    const resetQuery = () => {
      queryForm.value.searchVal = ''
      queryForm.value.str_searchFormInputAttrs = _searchFormInputAttrs.value
    }
    //新版的导出方法
    const handleExport = () => {
      onExport(_curHighQueryData.value)
    }
    // æ–°ç‰ˆçš„查询弹出框关闭方法
    const closeQuery = (extraParams = {}) => {
      let filteredData = commonGetHighQueryForm(extraParams)
      console.log('closeQuery方法')
      console.log(filteredData)
      commonSaveCurHighQueryData(filteredData)
    }
    //保存查询值
    const commonSaveCurHighQueryData = (filteredData = {}) => {
      _curHighQueryData.value = { ..._curHighQueryData.value, ...filteredData }
      _curHighQueryData.value.searchVal = queryForm.value.searchVal
      _curHighQueryData.value.str_searchFormInputAttrs =
        _searchFormInputAttrs.value
    }
    //获取高级查询弹出框的查询值
    const commonGetHighQueryForm = (extraParams = {}) => {
      // è¿‡æ»¤æŽ‰ undefined çš„值
      let filteredData = Object.assign(
        {},
        ...Object.entries(extraParams).map(([key, value]) =>
          value !== undefined ? { [key]: value } : {}
        )
      )
      //组合模糊查询
      filteredData.searchVal = queryForm.value.searchVal
      filteredData.str_searchFormInputAttrs = _searchFormInputAttrs.value
      return filteredData
    }

    /**
     * @returns è¡¨æ ¼
     */
    const RenderBaseTable = (props: RenderTableType) => {
      const {
        url,
        dataSource,
        isDrag,
        isChecked,
        isHidePagination,
        params,
        autoHeight,
      } = props

      return (
        <div
          class={{
            [styles.wmsTaskList]: true,
          }}
        >
          <BaseTable
            ref={tableRef}
            url={url}
            sortUrlTpl="/api/v1/HIAWms/wmsTask/{id}/adjustsort/{sort}"
            v-model:dataSource={dataSource.value}
            columns={columns}
            contextMenu={contextMenu}
            params={params}
            isDrag={isDrag}
            isChecked={isChecked}
            autoHeight={autoHeight}
            onCheck={onCheck}
            onRowClick={onRowClick}
            isHidePagination={isHidePagination}
            pageSize={20}
            v-slots={{
              name: ({ row }: any) => {
                return row?.name ? (
                  <TdButton
                    onClick={() => openDetail(row)}
                    text={<span style="color:#5a84ff">详情</span>}
                    icon="scale"
                    tip={row?.name}
                    hover
                  >
                    {row?.name}
                  </TdButton>
                ) : (
                  '-'
                )
              },
            }}
          ></BaseTable>
        </div>
      )
    }

    return () => {
      return (
        <div class={styles.wmsTaskContent}>
          {/* æ·»åŠ /编辑 */}
          <WmsTaskDrawer
            v-model={dialogConfig.visible}
            title={dialogConfig.title}
            row={current.value}
            sort={sort.value}
            onConfirm={onConfirmWmsTask}
          />
          {/* é«˜çº§æŸ¥è¯¢ */}
          <WmsTaskQueryDrawer
            ref="wmsTaskQueryDrawerRef"
            v-model={dialogConfigForQuery.visible}
            title={dialogConfigForQuery.title}
            row={current.value}
            sort={sort.value}
            onConfirmQuery={handleQuery}
            onRestQuery={resetQuery}
            onClose={closeQuery}
          />

          <div class={styles.headerContent}>
            <div class={styles.header}>
              <IconButton
                v-permission="wmsTask-add"
                icon="add-p"
                onClick={onAddWmsTask}
                type="primary"
              >
                æ·»åŠ 
              </IconButton>
              <el-divider direction="vertical" />

              <el-divider direction="vertical" />
              <el-upload
                v-permission="wmsTask-import"
                name="file"
                accept=".xlsx,.xls,.csv"
                show-file-list={false}
                onError={onError}
                onSuccess={onSuccess}
                before-upload={onBeforeUpload}
                headers={headers.value}
                action="/api/v1/HIAWms/wmsTask/import"
              >
                <IconButton icon="in">导入</IconButton>
              </el-upload>

              <IconButton
                v-permission="wmsTask-output"
                icon="out"
                onClick={handleExport}
              >
                å¯¼å‡º
              </IconButton>
            </div>
            <ElFormItem style={{ marginTop: '15px' }}>
              <ElFormItem label="关键字">
                <ElInput
                  v-model={queryForm.value.searchVal}
                  placeholder={searchFormInputAttrs_Placeholder.value}
                  clearable
                  class={styles.formItem}
                />
              </ElFormItem>
              <IconButton
                type="primary"
                icon="search"
                onClick={handleQueryForMain}
              >
                æŸ¥è¯¢
              </IconButton>
              {/* <IconButton style="" icon="refresh" onClick={resetQuery}> 
                é‡ç½® 
              </IconButton> */} 
              <IconButton 
                v-permission="wmsTask-add" 
                icon="search" 
                onClick={onAdvancedQuery} 
                type="primary" 
              > 
                é«˜çº§æŸ¥è¯¢ 
              </IconButton> 
            </ElFormItem> 
          </div> 
 
          <RenderBaseTable 
            url="/api/v1/HIAWms/wmsTask/page" 
            dataSource={dataSource} 
            isChecked={true} 
            isDrag={true} 
          /> 
        </div> 
      ) 
    } 
  }, 
}) 
              </IconButton> */}
              <IconButton
                v-permission="wmsTask-add"
                icon="search"
                onClick={onAdvancedQuery}
                type="primary"
              >
                é«˜çº§æŸ¥è¯¢
              </IconButton>
            </ElFormItem>
          </div>

          <RenderBaseTable
            url="/api/v1/HIAWms/wmsTask/page"
            dataSource={dataSource}
            isChecked={true}
            isDrag={true}
          />
        </div>
      )
    }
  },
})

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/DataBaseFactory/Default/MySqlDataBaseServiceHandle.cs

@@ -15,7 +15,7 @@
            //string strSql = $"SELECT COLUMN_NAME as ColumnName, COLUMN_TYPE as DataType, IS_NULLABLE as IsNullable, CHARACTER_MAXIMUM_LENGTH as DataLength,COLUMN_COMMENT as Description " +
            //                       $"FROM INFORMATION_SCHEMA.COLUMNS " +
            //                       $"WHERE  TABLE_NAME = '{tableName}'";
            string strSql = $"SELECT c.COLUMN_NAME as ColumnName, c.DATA_TYPE as DataType, c.IS_NULLABLE as IsNullable, c.CHARACTER_MAXIMUM_LENGTH as DataLength, c.COLUMN_COMMENT as Description, " +
            string strSql = $"SELECT c.COLUMN_NAME as ColumnName, c.DATA_TYPE as DataType, c.IS_NULLABLE as IsNullable, c.CHARACTER_MAXIMUM_LENGTH as DataLength, c.COLUMN_COMMENT as Description,c.NUMERIC_SCALE as MyPrecision, " +
                $"CASE WHEN kcu.COLUMN_NAME IS NOT NULL THEN 'true' ELSE 'false' END AS IsPrimaryKey " +
                $"FROM INFORMATION_SCHEMA.COLUMNS c " +
                $"LEFT JOIN INFORMATION_SCHEMA.KEY_COLUMN_USAGE kcu " +

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/DataBaseFactory/Default/SqlServerDataBaseServiceHandle.cs

@@ -28,7 +28,7 @@
    where ic.object_id=obj.object_id
    and ic.column_id=col.column_id
) as IsPrimaryKey,
col.Precision,
col.Precision as MyPrecision,
col.Scale 
from sys.objects obj
inner join sys.columns col
@@ -72,7 +72,7 @@
                        model = new ColumnModel();
                        if (dt.Rows[n]["Precision"].ToString() != "")
                        {
                            model.Precision = int.Parse(dt.Rows[n]["Precision"].ToString());
                            model.MyPrecision = int.Parse(dt.Rows[n]["Precision"].ToString());
                        }
                        if (dt.Rows[n]["Scale"].ToString() != "")
                        {

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Model/ColumnModell.cs

@@ -40,7 +40,7 @@
        /// </summary>
        public bool IsPrimaryKey { get; set; }

        public int Precision { get; set; }
        public int? MyPrecision { get; set; }

        public int Scale { get; set; }
    }

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/AppService/AppServiceÄ£°å.txt

@@ -1,7 +1,7 @@
using CMS.Plugin.$NameSpacePath$.Application.Contracts.Dtos.$EntityName$;
using CMS.Plugin.$NameSpacePath$.Application.Contracts.Services;
using CMS.Plugin.$NameSpacePath$.Domain.Shared;
using CMS.Plugin.$NameSpacePath$.Domain.Shared.Util;
using CmsQueryExtensions;
using CMS.Plugin.$NameSpacePath$.Domain.$EntityName$;
using CmsQueryExtensions.Extension;
using System.Linq.Expressions;

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Entity/DtoÄ£°å.txt

@@ -1,4 +1,5 @@
using CMS.Plugin.$NameSpacePath$.Domain.Shared.Enums;
using CmsQueryExtensions;
using Volo.Abp.Application.Dtos;
using Volo.Abp.Data;
using Volo.Abp.Domain.Entities;

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Templete/Web/Views/Pages/EntityNameClass/EntityNameClass_moduleÄ£°å.txt

@@ -15,7 +15,7 @@
  .header {
    margin-bottom: 12px;
    display: flex;
    justify-content: flex-start;
    justify-content: flex-end;
    align-items: center;
  }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Code/Utility/StructStrHelper.cs

@@ -85,7 +85,7 @@
                        model = new ColumnModel();
                        if (dt.Rows[n]["Precision"].ToString() != "")
                        {
                            model.Precision = int.Parse(dt.Rows[n]["Precision"].ToString());
                            model.MyPrecision = int.Parse(dt.Rows[n]["Precision"].ToString());
                        }
                        if (dt.Rows[n]["Scale"].ToString() != "")
                        {
@@ -887,7 +887,7 @@
                    case DataTypeEnum.dt_decimal:
                    case DataTypeEnum.dt_float:
                        sql.Append("@" + attrColumnName + "  " + columnModel.DataType
                            + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao + "\n");
                            + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao + "\n");
                        break;
                    default:
                        break;
@@ -949,7 +949,7 @@
                    case DataTypeEnum.dt_decimal:
                    case DataTypeEnum.dt_float:
                        sql.Append("@" + attrColumnName + "  " + columnModel.DataType
                            + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao + "\n");
                            + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao + "\n");
                        break;
                    default:
                        break;
@@ -1010,7 +1010,7 @@
                    case DataTypeEnum.dt_decimal:
                    case DataTypeEnum.dt_float:
                        sql.Append("@" + attrColumnName + "  " + columnModel.DataType
                            + "(" + columnModel.Precision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao);
                            + "(" + columnModel.MyPrecision.ToString() + "," + columnModel.Scale.ToString() + ")  " + fuhao);
                        break;
                    default:
                        break;

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/queryExtensions/CmsQueryExtensions/Utils/EnumHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,77 @@
using System.ComponentModel;

namespace CmsQueryExtensions
{
    /// <summary>
    /// æžšä¸¾å¸®åŠ©ç±».
    /// </summary>
    public static class EnumHelper
    {
        /// <summary>
        /// èŽ·å–枚举.
        /// </summary>
        /// <param name="enumName"> </param>
        /// <returns></returns>
        /// <exception cref="ArgumentException"></exception>
        public static List<EnumItem> GetEnumItems(string enumName)
        {
            // èŽ·å–当前程序集中的所有类型
            var enumType = AppDomain.CurrentDomain.GetAssemblies()
                .SelectMany(a => a.GetTypes())
                .FirstOrDefault(t => t.Name == enumName && t.IsEnum);

            if (enumType == null)
            {
                throw new Exception($"枚举类型 {enumName} ä¸å­˜åœ¨");
            }

            return GetEnumItems(enumType);
        }

        /// <summary>
        /// èŽ·å–枚举类型.
        /// </summary>
        /// <param name="enumType"></param>
        /// <returns></returns>
        /// <exception cref="ArgumentException"></exception>
        public static List<EnumItem> GetEnumItems(Type enumType)
        {
            if (!enumType.IsEnum)
            {
                throw new Exception("提供的类型不是枚举类型");
            }

            var result = new List<EnumItem>();
            var values = Enum.GetValues(enumType);

            foreach (var value in values)
            {
                var fieldInfo = enumType.GetField(value.ToString());
                var description = fieldInfo?
                    .GetCustomAttributes(typeof(DescriptionAttribute), false)
                    .FirstOrDefault() as DescriptionAttribute;

                result.Add(new EnumItem
                {
                    Value = (int)value,
                    Name = value.ToString(),
                    Description = description?.Description ?? value.ToString(),
                });
            }

            return result;
        }
    }

    /// <summary>
    /// æžšä¸¾æè¿°.
    /// </summary>
    public class EnumItem
    {
        public int Value { get; set; }

        public string Name { get; set; }

        public string Description { get; set; }
    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/queryExtensions/CmsQueryExtensions/Utils/ExportHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,53 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel;
using System.Reflection;
using System.Threading.Tasks;

namespace CmsQueryExtensions
{
    /// <summary>
    /// å¯¼å‡ºå¸®åŠ©ç±».
    /// </summary>
    public static class ExportHelper
    {
       

        // æ‰¹é‡è½¬æ¢æ–¹æ³•
        public static List<Dictionary<string, object>> ConvertListToExportData<T>(IEnumerable<T> list)
        {
            return list.Select(ConvertToExportData).ToList();
        }

        // é€šç”¨è½¬æ¢æ–¹æ³•ï¼ˆå…¼å®¹ Func<T, Dictionary<string, object>>）
        public static Dictionary<string, object> ConvertToExportData<T>(T entity)
        {
            var dict = new Dictionary<string, object>();
            if (entity == null) return dict;

            foreach (var prop in typeof(T).GetProperties())
            {
                var value = prop.GetValue(entity);
                dict[prop.Name] = FormatValue(value);
            }
            return dict;
        }

        private static object FormatValue(object value)
        {
            if (value == null) return string.Empty;

            // å¤„理枚举
            if (value is Enum enumValue)
                return GetEnumDescriptionUtil.GetEnumDescription(enumValue);

            // å¤„理布尔
            if (value is bool boolValue)
                return boolValue ? "是" : "否";

            return value;
        }

    }
}

 Weben_CMSרÓôúÂëÉú³ÉÆ÷/Weben_CMS_TemplateDemo/queryExtensions/CmsQueryExtensions/Utils/GetEnumDescriptionUtil.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,30 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;

namespace CmsQueryExtensions
{
    public class GetEnumDescriptionUtil
    {
        /// <summary>
        /// èŽ·å–枚举的描述
        /// </summary>
        /// <param name="enumValue"></param>
        /// <returns></returns>
        public static string GetEnumDescription(Enum enumValue)
        {
            string value = enumValue.ToString();
            if (string.IsNullOrWhiteSpace(value) || value == "0") return "";
            FieldInfo field = enumValue.GetType().GetField(value);
            object[] objs = field.GetCustomAttributes(typeof(DescriptionAttribute), false);  //获取描述属性
            if (objs == null || objs.Length == 0)  //当描述属性没有时，直接返回名称
                return value;
            DescriptionAttribute descriptionAttribute = (DescriptionAttribute)objs[0];
            return descriptionAttribute.Description;
        }
    }
}