前端优化,枚举更新

wangxinhui

2025-01-07 a1ba606567db3b83827a6a9f0d4fae46217a2e7e

前端优化,枚举更新

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/materielInfo.vue

@@ -27,7 +27,7 @@
      sortName: "id",
    });
    const editFormFields = ref({
      areaId: "",
      warehouseId: "",
      materielCode: "",
      materielName: "",
      materielDes: "",
@@ -37,9 +37,9 @@
    const editFormOptions = ref([
      [
        {
          title: "区域",
          title: "仓库",
          required: true,
          field: "areaId",
          field: "warehouseId",
          type: "string",
        },
        {
@@ -73,13 +73,11 @@
    const searchFormFields = ref({
      materielCode: "",
      materielName: "",
      areaId: "",
    });
    const searchFormOptions = ref([
      [
        { title: "物料编号", field: "materielCode", type: "like" },
        { title: "物料名称", field: "materielName", type: "like" },
        { title: "设备状态", field: "deviceStatus" },
      ],
    ]);
    const columns = ref([

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/palletCodeInfo.vue

@@ -68,20 +68,20 @@
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "warehouse", data: [] },
        bind: { key: "warehouses", data: [] },
      },
      {
        field: "palletType",
        title: "托盘类型",
        type: "string",
        width: 150,
        width: 100,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "decimal",
        width: 90,
        width: 200,
        align: "left",
      },
      {
@@ -90,7 +90,7 @@
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "enableEnum", data: [] },
        bind: { key: "printStatus", data: [] },
      },
      {
        field: "size",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue

@@ -51,7 +51,7 @@
                       {field:'name',title:'员工名称',type:'string',width:110,align:'left'},
                       {field:'state',title:'状态',type:'int',width:110,require:true,align:'left',bind: { key: "status", data: [] }},
                       {field:'invOrgId',title:'库存组织',type:'string',width:110,align:'left'},
                       {field:'type',title:'类型',type:'int',width:110,require:true,align:'left'},
                       {field:'type',title:'类型',type:'int',width:110,require:true,align:'left',hidden:true},
                       {field:'creater',title:'创建者',type:'string',width:110,require:true,align:'left'},
                       {field:'createDate',title:'创建时间',type:'datetime',width:150,require:true,align:'left',sort:true},
                       {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue

@@ -31,7 +31,12 @@
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormFields = ref({
                checkOrderNo:"",
                receiveOrderNo:"",
                checkOrderStatus:"",
                auditStatus:""
            });
            const searchFormOptions = ref([
                [
                    {title:"检验单号", field:"checkOrderNo",type:"like"},
@@ -45,9 +50,9 @@
                    {title:"检验结果", field:"result",type:"like"},
                ]
            ]);
            const columns = ref([{field:'checkOrderId',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'checkOrderNo',title:'检验单号',type:'string',width:110,require:true,align:'left',sort:true},
                       {field:'receiveOrderNo',title:'收货单号',type:'string',width:110,require:true,align:'left'},
            const columns = ref([{field:'checkOrderId',title:'主键',type:'int',width:150,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'checkOrderNo',title:'检验单号',type:'string',width:160,require:true,align:'left',sort:true},
                       {field:'receiveOrderNo',title:'收货单号',type:'string',width:160,require:true,align:'left'},
                       {field:'checkOrderStatus',title:'质检单状态',type:'int',width:110,require:true,align:'left'},
                       {field:'auditStatus',title:'审批状态',type:'int',width:110,require:true,align:'left'},
                       {field:'receiveDetailRowNo',title:'收货单明细行号',type:'int',width:110,require:true,align:'left'},

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder.vue

@@ -126,6 +126,14 @@
        align: "left",
      },
      {
          field: "warehouseId",
          title: "仓库",
          type: "string",
          width: 90,
          align: "left",
          bind:{key: "warehouses", data: []}
      },
      {
        field: "orderType",
        title: "单据类型",
        type: "string",
@@ -145,7 +153,7 @@
        field: "createType",
        title: "创建方式",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "createType", data: [] },
      },

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/purchaseOrder.vue

@@ -60,44 +60,28 @@
      // ],
    ]);
    const searchFormFields = ref({
      inboundOrderNo: "",
      upperOrderNo: "",
      orderType: "",
      orderStatus: "",
      createType: "",
      creater: "",
      createDate: "",
      purchaseOrderNo: "",
      purchaseOrderType: "",
      purchaseOrderStatus: "",
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "inboundOrderNo", type: "like" },
        { title: "上游单据编号", field: "upperOrderNo", type: "like" },
        { title: "采购单号", field: "purchaseOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          field: "purchaseOrderType",
          type: "select",
          dataKey: "purchaseType",
          data: [],
        },
        {
          title: "单据状态",
          field: "orderStatus",
          field: "purchaseOrderStatus",
          type: "select",
          dataKey: "inboundState",
          dataKey: "purchaseOrderStatus",
          data: [],
        },
      ],
      [
        {
          title: "创建方式",
          field: "createType",
          type: "select",
          dataKey: "createType",
          data: [],
        },
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
      ]
    ]);
    const columns = ref([
      {
@@ -114,7 +98,7 @@
        field: "purchaseOrderNo",
        title: "采购单号",
        type: "string",
        width: 120,
        width: 150,
        align: "left",
        link: true,
      },
@@ -130,7 +114,7 @@
        field: "supplierCode",
        title: "供应商编号",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
      },
      {
@@ -146,12 +130,13 @@
        type: "string",
        width: 90,
        align: "left",
        bind: { key: "purchaseOrderStatus", data: [] },
      },
      {
        field: "orderDate",
        title: "下单日期",
        type: "string",
        width: 90,
        width: 160,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/receiveOrder.vue

@@ -28,35 +28,32 @@
    });

    const searchFormFields = ref({
      orderNo: "",
      upperOrderNo: "",
      orderType: "",
      orderStatus: "",
      createType: "",
      receiveOrderNo: "",
      receiveOrderType: "",
      receiveOrderStatus: "",
      creater: "",
      createDate: "",
    });
    const searchFormOptions = ref([
      [
        { title: "单据编号", field: "orderNo", type: "like" },
        { title: "单据编号", field: "receiveOrderNo", type: "like" },
        {
          title: "单据类型",
          field: "orderType",
          field: "receiveOrderType",
          type: "select",
          dataKey: "inOrderType",
          dataKey: "receiveOrderTypeEnum",
          data: [],
        },
        {
          title: "单据状态",
          field: "orderStatus",
          field: "receiveOrderStatus",
          type: "selectList",
          dataKey: "receiveStatus",
          data: [],
        },
      ],
      [
        { title: "供应商", field: "suppliersId", type: "select",dataKey:"suppliers",data:[]},
        { title: "创建者", field: "creater", type: "like" },
        { title: "创建时间", field: "createDate", type: "datetime" },
      ],
    ]);

@@ -139,7 +136,7 @@
        field: "receiveOrderStatus",
        title: "订单状态",
        type: "string",
        width: 150,
        width: 120,
        align: "left",
        bind: { key: "receiveStatus", data: [] },
      },
@@ -149,6 +146,7 @@
        type: "string",
        width: 90,
        align: "left",
        hidden:true
      },
      {
        field: "suppliersId",
@@ -159,23 +157,24 @@
      },
      {
        field: "warehouseId",
        title: "仓库主键",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind:{key: "warehouses", data: []}
      },
      {
        field: "receiveDate",
        title: "收货日期",
        type: "string",
        width: 90,
        width: 160,
        align: "left",
      },
      {
        field: "deliveryCode",
        title: "送货单号",
        type: "string",
        width: 90,
        width: 150,
        align: "left",
      },
      {
@@ -184,6 +183,7 @@
        type: "string",
        width: 90,
        align: "left",
        bind:{key:"enable",data:[]}
      },
      {
        field: "creater",

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder.vue

@@ -129,10 +129,18 @@
        align: "left",
      },
      {
        field: "warehouseId",
        title: "仓库",
        type: "string",
        width: 90,
        align: "left",
        bind:{key: "warehouses", data: []}
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 120,
        width: 160,
        align: "left",
        link: true,
      },
@@ -140,7 +148,7 @@
        field: "upperOrderNo",
        title: "上游单据编号",
        type: "string",
        width: 150,
        width: 160,
        align: "left",
      },
      {
@@ -163,7 +171,7 @@
        field: "createType",
        title: "创建方式",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "createType", data: [] },
      },

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/taskinfo/task.vue

@@ -73,28 +73,28 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 80,
        width: 120,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 150,
        width: 160,
        align: "left",
      },
      {
        field: "roadway",
        title: "巷道号",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
      },
      {
        field: "taskType",
        title: "任务类型",
        type: "int",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "taskType", data: [] },
      },
@@ -110,14 +110,14 @@
        field: "sourceAddress",
        title: "起始地址",
        type: "int",
        width: 120,
        width: 220,
        align: "left",
      },
      {
        field: "targetAddress",
        title: "目标地址",
        type: "string",
        width: 120,
        width: 220,
        align: "left",
      },
      // {
@@ -140,7 +140,6 @@
        type: "string",
        width: 90,
        align: "left",
        hidden: true,
      },
      {
        field: "grade",
@@ -160,7 +159,7 @@
        field: "dispatchertime",
        title: "任务下发时间",
        type: "datetime",
        width: 150,
        width: 160,
        align: "left",
        hidden:true,
      },
@@ -183,7 +182,7 @@
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        width: 160,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/taskinfo/task_hty.vue

@@ -73,28 +73,28 @@
        field: "taskNum",
        title: "任务号",
        type: "int",
        width: 80,
        width: 120,
        align: "left",
      },
      {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 150,
        width: 160,
        align: "left",
      },
      {
        field: "roadway",
        title: "巷道号",
        type: "string",
        width: 90,
        width: 120,
        align: "left",
      },
      {
        field: "taskType",
        title: "任务类型",
        type: "int",
        width: 90,
        width: 120,
        align: "left",
        bind: { key: "taskType", data: [] },
      },
@@ -110,14 +110,14 @@
        field: "sourceAddress",
        title: "起始地址",
        type: "int",
        width: 120,
        width: 220,
        align: "left",
      },
      {
        field: "targetAddress",
        title: "目标地址",
        type: "string",
        width: 120,
        width: 220,
        align: "left",
      },
      // {
@@ -182,7 +182,7 @@
        field: "createDate",
        title: "创建时间",
        type: "datetime",
        width: 150,
        width: 160,
        align: "left",
      },
      {
@@ -197,13 +197,6 @@
        title: "修改时间",
        type: "datetime",
        width: 160,
        align: "left",
      },
      {
        field: "operateType",
        title: "备注",
        type: "string",
        width: 100,
        align: "left",
      },
      {

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/339ccc6a-95ea-4f78-8616-45299be9dd90.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/4b4ce8f6-d231-4356-8904-ece35b20d64d.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/51bc4fd8-adae-43fe-aa0e-8971136a692a.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/c44d9433-e876-4faf-90e0-7b056781c3b4.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/d25efbec-11d1-4ce7-a481-6187db1d5fbb.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/da85dbf7-c355-4843-a8fd-bdd296cc107b.vsidx

Binary files differ

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PrintStatusEnum.cs

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

namespace WIDESEA_Common.CommonEnum
{
    public enum PrintStatusEnum
    {
        /// <summary>
        /// å·²æ‰“印
        /// </summary>
        [Description("已打印")]
        Printed = 0,
        /// <summary>
        /// æœªæ‰“印
        /// </summary>
        [Description("未打印")]
        UnPrinted =1
    }
}

 ´úÂë¹ÜÀí/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs

@@ -791,6 +791,33 @@
                            List<object> data = new List<object>();

                            {
                                Type type = typeof(PurchaseOrderTypeEnum);
                                List<string> enums = Enum.GetValues(typeof(PurchaseOrderTypeEnum)).Cast<string>().ToList();
                                int index = 0;
                                foreach (var item in enums)
                                {
                                    //FieldInfo? fieldInfo = typeof(PurchaseOrderTypeEnum).GetField(((PurchaseOrderTypeEnum)item).ToString());
                                    //DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                    //if (description != null)
                                    //{
                                    //    data.Add(new { key = item.ToString(), value = description.Description });
                                    //}
                                    //else
                                    //{
                                    //    data.Add(new { key = item.ToString(), value = item.ToString() });
                                    //}
                                    //index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break; 
                    case "purchaseOrderStatus":
                        {
                            List<object> data = new List<object>();

                            {
                                Type type = typeof(PurchaseOrderStatusEnum);
                                List<int> enums = Enum.GetValues(typeof(PurchaseOrderStatusEnum)).Cast<int>().ToList();
                                int index = 0;
@@ -813,6 +840,33 @@
                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                    case "printStatus":
                        {
                            List<object> data = new List<object>();

                            {
                                Type type = typeof(PrintStatusEnum);
                                List<int> enums = Enum.GetValues(typeof(PrintStatusEnum)).Cast<int>().ToList();
                                int index = 0;
                                foreach (var item in enums)
                                {
                                    FieldInfo? fieldInfo = typeof(PrintStatusEnum).GetField(((PrintStatusEnum)item).ToString());
                                    DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
                                    if (description != null)
                                    {
                                        data.Add(new { key = item.ToString(), value = description.Description });
                                    }
                                    else
                                    {
                                        data.Add(new { key = item.ToString(), value = item.ToString() });
                                    }
                                    index++;
                                }
                            }

                            result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
                        }
                        break;
                }
                return result;
            }