647556386
2024-12-28 6db8e7dcbb1bfe368a88a21f8856449ed40935f5
更新前端
已修改8个文件
220 ■■■■ 文件已修改
代码管理/WMS/WIDESEA_WMSClient/src/api/http.js 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue 9 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue 16 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue 35 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue 59 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
代码管理/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue 27 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/api/http.js
@@ -19,7 +19,7 @@
}
else if (process.env.NODE_ENV == 'production') {
    axios.defaults.baseURL = 'http://115.159.85.185:9291/';
    axios.defaults.baseURL = 'http://10.30.4.92:9293/';
}
if (!axios.defaults.baseURL.endsWith('/')) {
    axios.defaults.baseURL+="/";
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/customerInfo.vue
@@ -32,7 +32,14 @@
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
               [
                    {title:"客户编码", field:"code", type:"like"},
                    {title:"客户名称", field:"name", type:"like"},
                    {title:"客户全称", field : "nickName", type:"like"},
                    {title:"状态", field:"state",type:"select",dataKey:"",data:[]}
               ]
            ]);
            const columns = ref([{field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'code',title:'客户编码',type:'string',width:110,align:'left',sort:true},
                       {field:'name',title:'客户名称',type:'string',width:110,align:'left'},
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/supplierInfo.vue
@@ -30,9 +30,21 @@
                sortName: "id"
            });
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const editFormOptions = ref([
            ]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
               [
                 {title:"供应商编码", field:"supplierCode", type:"like"},
                 {title:"供应商名称", field:"supplierName", type:"like"},
                 {title:"供应商简称", field:"supplierShortName", type:"like"}
                ],
                [
                 {title:"库存组织", field:"invOrgId", type:"like"},
                 {title:"状态", field:"status",type:"select",dataKey:"",data:[]},
                ]
            ]);
            const columns = ref([{field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'supplierCode',title:'供应商编码',type:'string',width:110,align:'left',sort:true},
                       {field:'supplierName',title:'供应商名称',type:'string',width:180,align:'left'},
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/basic/userInfo.vue
@@ -32,7 +32,18 @@
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
                [
                    {title:"员工号", field:"code", type:"like"},
                    {title:"部门编码", field:"deptNo", type:"like"},
                    {title:"部门名称", field : "name", type:"like"}
                ],
                [
                    {title:"状态", field:"state",type:"select",dataKey:"",data:[]},
                    {title:"库存组织", field:"invOrgId", type:"like"},
                    {title:"类型", field:"type", type:"select", dataKey:"", data:[]},
                ]
            ]);
            const columns = ref([{field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'code',title:'员工号',type:'string',width:110,align:'left',sort:true},
                       {field:'deptNo',title:'部门编码',type:'string',width:110,align:'left'},
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/check/checkOrder.vue
@@ -32,7 +32,19 @@
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
                [
                    {title:"检验单号", field:"checkOrderNo",type:"like"},
                    {title:"收货单号", field:"receiveOrderNo",type:"like"},
                    {title:"质检单状态", field:"checkOrderStatus",type:"select",dataKey:"",data:[]},
                    {title:"审批状态", field:"auditStatus",type:"select",dataKey:"",data:[]},
                ],
                [
                    {title:"收货单明细行号", field:"receiveDetailRowNo",type:"like"},
                    {title:"物料编号", field:"materielCode",type:"like"},
                    {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'},
@@ -53,11 +65,22 @@
                       {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                       {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}]);
            const detail = ref({
                cnName: "#detailCnName",
                table: "#detailTable",
                columns: [],
                sortName: "",
                key: ""
                cnName: "检验结果",
                table: "CheckOrderResult",
                columns: [
                    {field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                    {field:'checkOrderId',title:'检验单主键',type:'int',width:110,require:true,align:'left',sort:true},
                    {field:'defectCode',title:'缺陷代码',type:'string',width:110,require:true,align:'left'},
                    {field:'result',title:'检验结果',type:'string',width:110,require:true,align:'left'},
                    {field:'quantity',title:'数量',type:'float',width:110,require:true,align:'left'},
                    {field:'note',title:'备注',type:'string',width:220,align:'left'},
                    {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'},
                    {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}
                ],
                sortName: "id",
                key: "id"
            });
            return {
                table,
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/inbound/inboundOrder_Hty.vue
@@ -32,7 +32,37 @@
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
                [
                    { title: "单据编号", field: "orderNo", type: "like" },
                    { title: "上游单据编号", field: "upperOrderNo", type: "like" },
                    {
                    title: "单据类型",
                    field: "orderType",
                    type: "select",
                    dataKey: "inOrderType",
                    data: [],
                    },
                    {
                    title: "单据状态",
                    field: "orderStatus",
                    type: "select",
                    dataKey: "inboundState",
                    data: [],
                    },
                ],
                [
                    {
                    title: "创建方式",
                    field: "createType",
                    type: "select",
                    dataKey: "createType",
                    data: [],
                    },
                    { title: "创建者", field: "creater", type: "like" },
                    { title: "创建时间", field: "createDate", type: "datetime" },
                ],
            ]);
            const columns = ref([{field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'orderNo',title:'单据编号',type:'string',width:110,require:true,align:'left',sort:true},
                       {field:'upperOrderNo',title:'上游单据编号',type:'string',width:110,align:'left'},
@@ -47,11 +77,28 @@
                       {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                       {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}]);
            const detail = ref({
                cnName: "#detailCnName",
                table: "#detailTable",
                columns: [],
                sortName: "",
                key: ""
                cnName: "历史入库单明细",
                table: "InboundOrderDetail_Hty",
                columns: [
                    {field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'orderId',title:'入库单主键',type:'int',width:110,require:true,align:'left',sort:true},
                       {field:'materielCode',title:'物料编号',type:'string',width:110,require:true,align:'left'},
                       {field:'materielName',title:'物料名称',type:'string',width:180,require:true,align:'left'},
                       {field:'batchNo',title:'批次号',type:'string',width:110,require:true,align:'left'},
                       {field:'orderQuantity',title:'单据数量',type:'decimal',width:110,require:true,align:'left'},
                       {field:'receiptQuantity',title:'组盘数量',type:'decimal',width:110,require:true,align:'left'},
                       {field:'overInQuantity',title:'上架数量',type:'decimal',width:110,require:true,align:'left'},
                       {field:'orderDetailStatus',title:'订单明细状态',type:'int',width:110,require:true,align:'left'},
                       {field:'remark',title:'备注',type:'string',width:220,align:'left'},
                       {field:'sourceId',title:'源主键',type:'int',width:110,require:true,align:'left'},
                       {field:'operateType',title:'备注',type:'string',width:110,require:true,align:'left'},
                       {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'},
                       {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}
                ],
                sortName: "id",
                key: "id"
            });
            return {
                table,
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/outbound/outboundOrder_Hty.vue
@@ -32,7 +32,37 @@
            const editFormFields = ref({});
            const editFormOptions = ref([]);
            const searchFormFields = ref({});
            const searchFormOptions = ref([]);
            const searchFormOptions = ref([
                [
                    { title: "单据编号", field: "orderNo", type: "like" },
                    { title: "上游单据编号", field: "upperOrderNo", type: "like" },
                    {
                    title: "单据类型",
                    field: "orderType",
                    type: "select",
                    dataKey: "outOrderType",
                    data: [],
                    },
                    {
                    title: "单据状态",
                    field: "orderStatus",
                    type: "select",
                    dataKey: "inboundState",
                    data: [],
                    },
                ],
                [
                    {
                    title: "创建方式",
                    field: "createType",
                    type: "select",
                    dataKey: "createType",
                    data: [],
                    },
                    { title: "创建者", field: "creater", type: "like" },
                    { title: "创建时间", field: "createDate", type: "datetime" },
                ]
            ]);
            const columns = ref([{field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                       {field:'orderNo',title:'单据编号',type:'string',width:110,require:true,align:'left',sort:true},
                       {field:'upperOrderNo',title:'上游单据编号',type:'string',width:110,align:'left'},
@@ -47,11 +77,28 @@
                       {field:'modifier',title:'修改人',type:'string',width:100,align:'left'},
                       {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}]);
            const detail = ref({
                cnName: "#detailCnName",
                table: "#detailTable",
                columns: [],
                sortName: "",
                key: ""
                cnName: "历史出库单明细",
                table: "OutboundOrderDetail_Hty",
                columns: [
                    {field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
                    {field:'orderId',title:'出库单主键',type:'int',width:110,require:true,align:'left',sort:true},
                    {field:'materielCode',title:'物料编号',type:'string',width:110,require:true,align:'left'},
                    {field:'materielName',title:'物料名称',type:'string',width:180,align:'left'},
                    {field:'batchNo',title:'批次号',type:'string',width:110,require:true,align:'left'},
                    {field:'orderQuantity',title:'单据数量',type:'decimal',width:110,require:true,align:'left'},
                    {field:'lockQuantity',title:'锁定数量',type:'decimal',width:110,require:true,align:'left'},
                    {field:'overOutQuantity',title:'已出数量',type:'decimal',width:110,require:true,align:'left'},
                    {field:'orderDetailStatus',title:'订单明细状态',type:'int',width:110,require:true,align:'left'},
                    {field:'remark',title:'备注',type:'string',width:220,align:'left'},
                    {field:'sourceId',title:'源主键',type:'int',width:110,require:true,align:'left'},
                    {field:'operateType',title:'备注',type:'string',width:110,require:true,align:'left'},
                    {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'},
                    {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}
                ],
                sortName: "id",
                key: "id"
            });
            return {
                table,
´úÂë¹ÜÀí/WMS/WIDESEA_WMSClient/src/views/stock/stockInfo.vue
@@ -37,7 +37,11 @@
        deviceRemark: "",
      });
      const editFormOptions = ref([
       [
        {field:'palletCode',title:'托盘编号',type:'string'},
        {field:'locationCode',title:'货位编号',type:'string'},
        {field:'isFull',title:'是否满盘',type:'select',dataKey:"yesno",data:[]},
       ]
      ]);
      const searchFormFields = ref({
        palletCode: "",
@@ -119,10 +123,23 @@
        },
      ]);
      const detail = ref({
        cnName: "#detailCnName",
        table: "",
        columns: [],
        sortName: "",
        cnName: "历史库存信息",
        table: "StockInfo_Hty",
        columns: [
          {field:'id',title:'主键',type:'int',width:110,hidden:true,readonly:true,require:true,align:'left'},
          {field:'palletCode',title:'托盘编号',type:'string',width:110,require:true,align:'left',sort:true},
          {field:'locationCode',title:'货位编号',type:'string',width:110,align:'left'},
          {field:'isFull',title:'是否满盘',type:'bool',width:110,require:true,align:'left'},
          {field:'stockStatus',title:'库存状态',type:'int',width:110,require:true,align:'left'},
          {field:'remark',title:'备注',type:'string',width:220,align:'left'},
          {field:'sourceId',title:'源主键',type:'int',width:110,require:true,align:'left'},
          {field:'operateType',title:'备注',type:'string',width:110,require:true,align:'left'},
          {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'},
          {field:'modifyDate',title:'修改日期',type:'datetime',width:150,align:'left',sort:true}
        ],
        sortName: "id",
      });
      return {
        table,