优化前端

yanjinhui

5 天以前 1d346a70b7f8022a1048086c3691cc654a91f48c

优化前端

 н¨Îļþ¼Ð/WMS/src/extension/system/Sys_Log.js

@@ -17,6 +17,20 @@
    onInit() {
      console.log("sys_log")
      this.setFiexdSearchForm(true);

      // è®¾ç½®é»˜è®¤æ—¶é—´èŒƒå›´ä¸ºä»Šå¤©0点到次日0点
  // èŽ·å–今天0点时间
  // let todayStart = this.base.getDate(true); // èŽ·å–当前时间带时分秒
  // todayStart = todayStart.split(' ')[0] + ' 00:00:00'; // è®¾ç½®ä¸ºä»Šå¤©0点
  
  // // èŽ·å–明天0点时间
  // let tomorrowStart = this.base.addDays(todayStart, -1); // åŠ 1天
  // tomorrowStart = tomorrowStart.split(' ')[0] + ' 00:00:00'; // è®¾ç½®ä¸ºæ˜Žå¤©0点

  // // å¦‚果是日期范围字段（数组形式）
  // this.searchFormFields.beginDate = [tomorrowStart,todayStart];


    },
    onInited() {
      this.height = this.height - 170;

 н¨Îļþ¼Ð/WMS/src/views/Alarm/Container.vue

@@ -90,9 +90,9 @@
                {field:'humidity',title:'湿度',type:'float',width:100,align:'left'},
                {field:'alarm',title:'是否报警',type:'select',width:100,align:'left',bind:{key:'enable',data:[]}},
                {field:'alarmInformation',title:'报警信息',type:'string',width:200,align:'left'},
                {field:'creater',title:'创建者',type:'string',width:100,require:true,align:'left'},
                // {field:'creater',title:'创建者',type:'string',width:100,require:true,align:'left'},
                {field:'createDate',title:'创建时间',type:'datetime',width:160,require:true,align:'left',sort:true},
                {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                // {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                {field:'modifyDate',title:'修改日期',type:'datetime',width:160,align:'left',sort:true}
            ]);
            const detail = ref({

 н¨Îļþ¼Ð/WMS/src/views/Alarm/EquipmentAlarmInfor.vue

@@ -91,10 +91,10 @@
                bind: { key: "deviceStatus", data: [] },
            },
                {field:'syncTime',title:'同步时间',type:'datetime',width:160,align:'left',sort:true},
                {field:'creater',title:'创建者',type:'string',width:100,require:true,align:'left'},
                // {field:'creater',title:'创建者',type:'string',width:100,require:true,align:'left'},
                {field:'createDate',title:'创建时间',type:'datetime',width:160,require:true,align:'left',sort:true},
                {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                {field:'modifyDate',title:'修改日期',type:'datetime',width:160,align:'left',sort:true}
                //{field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                // {field:'modifyDate',title:'修改日期',type:'datetime',width:160,align:'left',sort:true}
            ]);
            const detail = ref({
                cnName: "#detailCnName",

 н¨Îļþ¼Ð/WMS/src/views/basic/materielInfo.vue

@@ -134,15 +134,15 @@
        }
      ]
    },
    {
      title: "物料状态",
      field: "materielState",
      type: "select",
      dataKey: "materielState",
      data: [],
      span: 8,
      required: true,
    }
    // {
    //   title: "物料状态",
    //   field: "materielState",
    //   type: "select",
    //   dataKey: "materielState",
    //   data: [],
    //   span: 8,
    //   required: true,
    // }
  ],
  // ç¬¬äº”行：库存信息
  [
@@ -235,27 +235,20 @@

    const searchFormOptions = ref([
      [
        { 
          title: "仓库编号", 
          field: "warehouseCode", 
          type: "string" 
        },
        // { 
        //   title: "仓库编号", 
        //   field: "warehouseCode", 
        //   type: "string" 
        // },
        { 
          title: "物料编号", 
          field: "materielCode", 
          type: "like" 
        },
      ],
      [
        { 
          { 
          title: "物料名称", 
          field: "materielName", 
          type: "like" 
        },
        {
          title: "品名/通用名",
          field: "item",
          type: "like",
        },
        {
          title: "药剂",
@@ -278,22 +271,22 @@
          dataKey: "materielType",
          data: [],
        },
      ],
      [
        {
         {
          title: "物料属性分类",
          field: "materielSourceType",
          type: "select",
          dataKey: "materialCode",
          data: [],
        },
        {
          title: "物料状态",
          field: "materielState",
          type: "select",
          dataKey: "materielState",
          data: [],
        },
      ],
      [
        // {
        //   title: "物料状态",
        //   field: "materielState",
        //   type: "select",
        //   dataKey: "materielState",
        //   data: [],
        // },
      ],
      // [
      //   {
@@ -434,15 +427,15 @@
        width: 100,
        align: "left",
      },
      {
        field: "materielState",
        title: "物料状态",
        type: "string",
        width: 100,
        align: "left",
        bind: { key: "materielState", data: [] },
        require: true,
      },
      // {
      //   field: "materielState",
      //   title: "物料状态",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      //   bind: { key: "materielState", data: [] },
      //   require: true,
      // },
      {
        field: "goodStatusState",
        title: "下发状态",
@@ -459,13 +452,13 @@
        width: 150,
        align: "left",
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      // {
      //   field: "creater",
      //   title: "创建人",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "createDate",
        title: "创建时间",
@@ -473,13 +466,13 @@
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      // {
      //   field: "modifier",
      //   title: "修改人",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
      {
        field: "modifyDate",
        title: "修改时间",

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder.vue

@@ -75,7 +75,7 @@
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouse",
         dataKey: "warehouseNuber", 
          data: [],
          required: true,
        },
@@ -128,22 +128,22 @@
          dataKey: "order_type",
          data: [],
        },
        {
          title: "表头状态",
          field: "odrderStatus",
        // {
        //   title: "表头状态",
        //   field: "odrderStatus",
        //   type: "select",
        //   dataKey: "odrderStatus",
        //   data: [],
        // },
          {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "odrderStatus",
           dataKey: "warehouseNuber", 
          data: [],
        },
      ],
      [
        {
          title: "库房号",
          field: "warehouse_no",
          type: "select",
          dataKey: "warehouse",
          data: [],
        },
        {
          title: "入库记账时间",
          field: "account_tiem",
@@ -216,13 +216,13 @@
        align: "left",
        bind: { key: "odrderStatus", data: [] },
      },
      {
        field: "creater",
        title: "创建人",
        type: "string",
        width: 90,
        align: "left",
      },
      // {
      //   field: "creater",
      //   title: "创建人",
      //   type: "string",
      //   width: 90,
      //   align: "left",
      // },
      {
        field: "createDate",
        title: "创建时间",
@@ -230,13 +230,13 @@
        width: 160,
        align: "left",
      },
      {
        field: "modifier",
        title: "修改人",
        type: "string",
        width: 100,
        align: "left",
      },
      // {
      //   field: "modifier",
      //   title: "修改人",
      //   type: "string",
      //   width: 100,
      //   align: "left",
      // },
      {
        field: "modifyDate",
        title: "修改时间",

 н¨Îļþ¼Ð/WMS/src/views/inbound/inboundOrder_Hty.vue

@@ -134,13 +134,13 @@
                    align: 'left',
                    bind: { key: "odrderStatus", data: [] }
                },
                {
                    field: 'creater',
                    title: '创建人',
                    type: 'string',
                    width: 90,
                    align: 'left'
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
@@ -149,21 +149,21 @@
                    align: 'left',
                    sort: true
                },
                {
                    field: 'modifier',
                    title: '修改人',
                    type: 'string',
                    width: 100,
                    align: 'left'
                },
                {
                    field: 'modifyDate',
                    title: '修改时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                }
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                // {
                //     field: 'modifyDate',
                //     title: '修改时间',
                //     type: 'datetime',
                //     width: 160,
                //     align: 'left',
                //     sort: true
                // }
            ]);
            const detail = ref({
                cnName: "历史入库单明细",

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder.vue

@@ -110,7 +110,7 @@
                [
                    { title: "出库单号", field: "out_no", type: "like" },
                    { title: "客户代码", field: "client_no", type: "like" },
                    { title: "客户代码", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
                    { title: "库房号", field: "warehouse_no", type: "select", dataKey: "warehouseNuber", data: [] },
                    {
                        title: "出库单类型",
                        field: "out_type",
@@ -120,13 +120,13 @@
                    },
                ],
                [
                    {
                        title: "状态",
                        field: "outStatus",
                        type: "select",
                        dataKey: "outStatus",
                        data: [],
                    },
                    // {
                    //     title: "状态",
                    //     field: "outStatus",
                    //     type: "select",
                    //     dataKey: "outStatus",
                    //     data: [],
                    // },
                    { title: "客户名称", field: "client_name", type: "like" },
                    { title: "出库记账时间", field: "account_time", type: "datetime" },
                ]
@@ -200,13 +200,13 @@
                    // bind: { key: "outStatus", data: [] }
                    // edit:{type:""}
                },
                {
                    field: 'creater',
                    title: '创建人',
                    type: 'string',
                    width: 90,
                    align: 'left'
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
@@ -215,13 +215,13 @@
                    align: 'left',
                    sort: true
                },
                {
                    field: 'modifier',
                    title: '修改人',
                    type: 'string',
                    width: 100,
                    align: 'left'
                },
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                {
                    field: 'modifyDate',
                    title: '修改时间',

 н¨Îļþ¼Ð/WMS/src/views/outbound/outboundOrder_Hty.vue

@@ -138,13 +138,13 @@
                    align: 'left',
                    bind: { key: "outStatus", data: [] }
                },
                {
                    field: 'creater',
                    title: '创建人',
                    type: 'string',
                    width: 90,
                    align: 'left'
                },
                // {
                //     field: 'creater',
                //     title: '创建人',
                //     type: 'string',
                //     width: 90,
                //     align: 'left'
                // },
                {
                    field: 'createDate',
                    title: '创建时间',
@@ -153,21 +153,21 @@
                    align: 'left',
                    sort: true
                },
                {
                    field: 'modifier',
                    title: '修改人',
                    type: 'string',
                    width: 100,
                    align: 'left'
                },
                {
                    field: 'modifyDate',
                    title: '修改时间',
                    type: 'datetime',
                    width: 160,
                    align: 'left',
                    sort: true
                }
                // {
                //     field: 'modifier',
                //     title: '修改人',
                //     type: 'string',
                //     width: 100,
                //     align: 'left'
                // },
                // {
                //     field: 'modifyDate',
                //     title: '修改时间',
                //     type: 'datetime',
                //     width: 160,
                //     align: 'left',
                //     sort: true
                // }
            ]);
            const detail = ref({
                cnName: "历史出库单明细",

 н¨Îļþ¼Ð/WMS/src/views/stock/Dt_Inventory_Batch.vue

@@ -92,12 +92,12 @@
          field: "erpStockQuantity",
          type: "number",
        },
        {
          title: "库存差异",
          field: "status",
          type: "select",
          bind: { key: "stockDifference", data: [] }
        }
        // {
        //   title: "库存差异",
        //   field: "status",
        //   type: "select",
        //   bind: { key: "stockDifference", data: [] }
        // }
      ],
      [
        // {
@@ -129,9 +129,9 @@
    });
    const searchFormOptions = ref([
      [
        { title: "物料编号", field: "materielCode" },
        { title: "物料名称", field: "materielName" },
        { title: "批次号", field: "batchNo" },
        { title: "物料编号", field: "materielCode" ,type: "like" },
        { title: "物料名称", field: "materielName" ,type: "like"},
        { title: "批次号", field: "batchNo" ,type: "like"},
      ],
    ]);
    const columns = ref([
@@ -207,14 +207,14 @@
        width: 120,
        align: "left",
      },
      {
        field: "status",
        title: "库存差异",
        type: "select",
        width: 100,
        align: "left",
        bind: { key: "stockDifference", data: [] },
      },
      // {
      //   field: "status",
      //   title: "库存差异",
      //   type: "select",
      //   width: 100,
      //   align: "left",
      //   bind: { key: "stockDifference", data: [] },
      // },
      // {
      //   field: "productionDate",
      //   title: "生产日期",

 н¨Îļþ¼Ð/WMS/src/views/taskinfo/Dt_SupplyTask.vue

@@ -217,12 +217,27 @@
        align: "left",
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 120,
        align: "left",
      },
       {
        field: "palletCode",
        title: "托盘编号",
        type: "string",
        width: 120,
        align: "left",
      },
        {
        field: "materielCode",
        title: "物料编号",
        type: "string",
        width: 120,
        align: "left",
      },
     
      {
        field: "batchNo",
        title: "批次号",
@@ -230,13 +245,7 @@
        width: 120,
        align: "left",
      },
      {
        field: "materielCode",
        title: "物料编号",
        type: "string",
        width: 120,
        align: "left",
      },
    
      {
        field: "materielName",
        title: "物料名称",
@@ -299,13 +308,7 @@
        width: 100,
        align: "left",
      },
      {
        field: "orderNo",
        title: "单据编号",
        type: "string",
        width: 120,
        align: "left",
      },
      
      {
        field: "dispatchertime",
        title: "任务下发时间",