diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js index 6adc974..9516bf9 100644 --- a/ruoyi-ui/src/lang/en.js +++ b/ruoyi-ui/src/lang/en.js @@ -1407,6 +1407,66 @@ export default { }, + // ***************客户管理************** + basCustomer: { + customerNo: 'customerNo', + customerGroupNo: 'customerGroupNo', + customerName: 'customerName', + simpleName: 'simpleName', + useable: 'useable', + remark: 'remark', + businessDepartment: 'businessDepartment', + salesman: 'salesman', + mnemonicCode: 'mnemonicCode', + type: 'type', + taxpayerRegistrationNumber: 'taxpayerRegistrationNumber', + organization: 'organization', + supCustomer: 'supCustomer', + retailInvestor: 'retailInvestor', + country: 'country', + timeZone: 'timeZone', + dataFormat: 'dataFormat', + contactName: 'contactName', + shipment: 'shipment', + taxCategory: 'taxCategory', + operation: 'operation', + inputCustomerNo: 'inputCustomerNo', + inputCustomerGroupNo: 'inputCustomerGroupNo', + inputCustomerName: 'inputCustomerName', + inputSimpleName: 'inputSimpleName', + inputUseable: 'inputUseable', + inputRemark: 'inputRemark', + inputBusinessDepartment: 'inputBusinessDepartment', + inputSalesman: 'inputSalesman', + inputMnemonicCode: 'inputMnemonicCode', + inputTaxpayerRegistrationNumber: 'inputTaxpayerRegistrationNumber', + inputOrganization: 'inputOrganization', + inputSupCustomer: 'inputSupCustomer', + inputRetailInvestor: 'inputRetailInvestor', + inputCountry: 'inputCountry', + inputTimeZone: 'inputTimeZone', + inputDataFormat: 'inputDataFormat', + inputContactName: 'inputContactName', + inputShipment: 'inputShipment', + inputTaxCategory: 'inputTaxCategory', + search: 'search', + reset: 'reset', + add: 'add', + modify: 'modify', + delete: 'delete', + export: 'export', + confirm: 'confirm', + cancel: 'cancel', + idRequired: 'idRequired', + customerNoRequired: 'customerNoRequired', + addTitle: 'addTitle', + editTitle: 'editTitle', + addSuccess: 'addSuccess', + editSuccess: 'editSuccess', + deleteSuccess: 'deleteSuccess', + deleteConfirm: 'Are you sure to delete the customerNo with ID {ids}?' + }, + @@ -1932,6 +1992,5 @@ export default { cancel: '取 消' }, - - } + diff --git a/ruoyi-ui/src/lang/zh.js b/ruoyi-ui/src/lang/zh.js index 927c576..e5fe7b6 100644 --- a/ruoyi-ui/src/lang/zh.js +++ b/ruoyi-ui/src/lang/zh.js @@ -727,6 +727,7 @@ export default { deleteSuccess: '删除成功', deleteConfirm: '是否确认删除所选库存冻结记录?' }, + menu: { InboundManagement: "入库管理", //收货单据新增 @@ -785,7 +786,7 @@ export default { customerManagement:'客户管理', supplierManagement:'供应商管理', materialManagement:'物料管理', - + basicPointLocation:'基础点位' }, @@ -1185,7 +1186,6 @@ export default { //--------------二级窗口标题-------------- addMenuItem: '添加角色', editMenuItem: '修改角色', - parentMenu: '上级菜单', menuType: '菜单类型', menuTypeOptions1: '目录', @@ -1946,5 +1946,63 @@ export default { cancel: '取 消' }, - + // ***************客户管理************** + basCustomer: { + customerNo: '客户编号', + customerGroupNo: '客户基本分类', + customerName: '客户名称', + simpleName: '客户简称', + useable: '是否可用', + remark: '备注', + businessDepartment: '业务部门', + salesman: '业务员', + mnemonicCode: '助忆码', + type: '客户类型', + taxpayerRegistrationNumber: '纳税人登记号', + organization: '对应财务组织', + supCustomer: '上级客户', + retailInvestor: '散户', + country: '国家/地区', + timeZone: '时区', + dataFormat: '数据格式', + contactName: '联系人姓名', + shipment: '发货国家', + taxCategory: '税类', + operation: '操作', + inputCustomerNo: '请输入客户编号', + inputCustomerGroupNo: '请输入客户基本分类', + inputCustomerName: '请输入客户名称', + inputSimpleName: '请输入客户简称', + inputUseable: '请输入是否可用', + inputRemark: '请输入备注', + inputBusinessDepartment: '请输入业务部门', + inputSalesman: '请输入业务员', + inputMnemonicCode: '请输入助忆码', + inputTaxpayerRegistrationNumber: '请输入纳税人登记号', + inputOrganization: '请输入对应财务组织', + inputSupCustomer: '请输入上级客户', + inputRetailInvestor: '请输入散户', + inputCountry: '请输入国家/地区', + inputTimeZone: '请输入时区', + inputDataFormat: '请输入数据格式', + inputContactName: '请输入联系人姓名', + inputShipment: '请输入发货国家', + inputTaxCategory: '请输入税类', + search: '搜索', + reset: '重置', + add: '新增', + modify: '修改', + delete: '删除', + export: '导出', + confirm: '确定', + cancel: '取消', + idRequired: 'ID不能为空', + customerNoRequired: '客户编号不能为空', + addTitle: '添加客户管理', + editTitle: '修改客户管理', + addSuccess: '新增成功', + editSuccess: '修改成功', + deleteSuccess: '删除成功', + deleteConfirm: '是否确认删除客户编号为"{ids}"的数据项?' + } } diff --git a/ruoyi-ui/src/views/bas/BasCustomer/index.vue b/ruoyi-ui/src/views/bas/BasCustomer/index.vue index e80de6c..96c98e9 100644 --- a/ruoyi-ui/src/views/bas/BasCustomer/index.vue +++ b/ruoyi-ui/src/views/bas/BasCustomer/index.vue @@ -1,240 +1,109 @@