Skip to content

J
jinfa-platform
Commit 6daba067 authored by wzy's avatar wzy
Browse files
Options

feat: 价格库 国际化

parent 2b56d9e0
Hide whitespace changes
Inline Side-by-side
Showing with 258 additions and 152 deletions
src/locales/en-US/priceManage.ts
View file @ 6daba067
......@@ -114,4 +114,19 @@ export default {
'priceManage.schema.formProduct.customerCategoryId':'Product category',
'priceManage.schema.formProduct.brandId':'Please select a brand',
'priceManage.schema.formProduct.submit':'Query',
'priceManage.schema.formProduct.wuliaobianhao': 'Material number',
'priceManage.schema.formProduct.wuliaomingcheng': 'Material name',
'priceManage.schema.formProduct.guigexinghao': 'Specification model',
'priceManage.schema.formProduct.pinlei': 'Category',
'priceManage.schema.formProduct.pinpai': 'brand',
'priceManage.schema.formProduct.danwei': 'Unit',
'priceManage.schema.formProduct.mulujia': 'catalog price',
'priceManage.schema.formProduct.shichangjia': 'market price',
'priceManage.schema.formProduct.hetongdingdanjia': 'Contract/Order Price',
'priceManage.schema.formProduct.hetongdingdan': 'Contract/Order',
'priceManage.schema.formProduct.gongyinghuiyuanID': 'Supply member ID',
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng': 'Supply member name',
'priceManage.schema.formProduct.jiageyouxiaocong': 'Price is valid from',
'priceManage.schema.formProduct.jiageyouxiaodao': 'The price is valid until',
'priceManage.schema.formProduct.zhakanlishijiage': 'View historical prices',
}
src/locales/en-US/stockSellStorage.ts
View file @ 6daba067
......@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju':'New document',
'stockSellStorage.bianjidanju':'Edit documents',
'stockSellStorage.zhakandanju':'View documents',
'stockSellStorage.danjubianhao': 'document number',
'stockSellStorage.baocun':'Save',
'stockSellStorage.xuanzehuopin':'Select goods',
'stockSellStorage.ninhaiyouweibaocundenei':'You still have unsaved content. Are you sure you want to leave? ',
......
src/locales/ko-KR/priceManage.ts
View file @ 6daba067
......@@ -114,4 +114,19 @@ export default {
'priceManage.schema.formProduct.customerCategoryId' : '상품류',
'priceManage.schema.formProduct.brandId' : '브랜드 선택',
'priceManage.schema.formProduct.submit' : '조회',
'priceManage.schema.formProduct.wuliaobianhao': '재료 번호',
'priceManage.schema.formProduct.wuliaomingcheng': '재료 이름',
'priceManage.schema.formProduct.guigexinghao': '사양 모델',
'priceManage.schema.formProduct.pinlei': '범주',
'priceManage.schema.formProduct.pinpai': '브랜드',
'priceManage.schema.formProduct.danwei': '단위',
'priceManage.schema.formProduct.mulujia': '카탈로그 가격',
'priceManage.schema.formProduct.shichangjia': '시장 가격',
'priceManage.schema.formProduct.hetongdingdanjia': '계약/주문 가격',
'priceManage.schema.formProduct.hetongdingdan': '계약/주문',
'priceManage.schema.formProduct.gongyinghuiyuanID': '공급 회원 ID',
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng': '공급 회원 이름',
'priceManage.schema.formProduct.jiageyouxiaocong': '가격은 유효합니다',
'priceManage.schema.formProduct.jiageyouxiaodao': '가격 유효 기간',
'priceManage.schema.formProduct.zhakanlishijiage': '이전 가격 보기',
}
src/locales/ko-KR/stockSellStorage.ts
View file @ 6daba067
......@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju': '새 영수증',
'stockSellStorage.bianjidanju': '영수증 편집',
'stockSellStorage.zhakandanju': '영수증 보기',
'stockSellStorage.danjubianhao': '문서 번호',
'stockSellStorage.baocun': '보존',
'stockSellStorage.xuanzehuopin': '상품을 고르다',
'stockSellStorage.ninhaiyouweibaocundenei': '아직 저장하지 않은 내용이 있습니다. 떠나시겠습니까?',
......
src/locales/zh-CN/priceManage.ts
View file @ 6daba067
export default {
'priceManage.constant.columnsSetMember.name' : '会员名称',
'priceManage.constant.columnsSetMember.memberTypeName' : '会员类型',
'priceManage.constant.columnsSetMember.roleName' : '会员角色',
'priceManage.constant.columnsSetMember.levelTag' : '会员等级',
'priceManage.constant.columnsSetProduct.code' : '商品编号',
'priceManage.constant.columnsSetProduct.name' : '商品名称',
'priceManage.constant.columnsSetProduct.customerCategory' : '品类',
'priceManage.constant.columnsSetProduct.brand' : '品牌',
'priceManage.constant.columnsSetProduct.unitName' : '单位',
'priceManage.constant.columnsSetProduct.priceType' : '商品定价',
'priceManage.constant.columnsSetProduct.priceType.1' : '现货价格',
'priceManage.constant.columnsSetProduct.priceType.2' : '价格需要询问',
'priceManage.constant.columnsUnitProduct.index' : '索引',
'priceManage.constant.columnsUnitProduct.goodsId' : '货品ID',
'priceManage.constant.columnsUnitProduct.name' : '商品名称',
'priceManage.constant.memberColumns.name' : '会员名称',
'priceManage.constant.memberColumns.memberTypeName' : '会员类型',
'priceManage.constant.memberColumns.roleName' : '角色',
'priceManage.constant.memberColumns.ctl' : '操作',
'priceManage.effect.goods' : '对应货品',
'priceManage.effect.unitPrice' : '单价',
'priceManage.effect.index' : '索引',
'priceManage.effect.goodsId' : '货品ID',
'priceManage.effect.goodsName' : '商品名称',
'priceManage.priceStrategy.columns.id' : '价格策略ID',
'priceManage.priceStrategy.columns.name' : '价格策略名称',
'priceManage.priceStrategy.columns.commodityCode' : '商品编号',
'priceManage.priceStrategy.columns.commodityName' : '商品名称',
'priceManage.priceStrategy.columns.customerCategory' : '品类',
'priceManage.priceStrategy.columns.brand' : '品牌',
'priceManage.priceStrategy.columns.unitName' : '单位',
'priceManage.priceStrategy.columns.priceType' : '商品定价',
'priceManage.priceStrategy.columns.priceType.1' : '现货价格',
'priceManage.priceStrategy.columns.priceType.2' : '价格需要询价',
'priceManage.priceStrategy.columns.priceType.3' : '积分兑换商品',
'priceManage.priceStrategy.columns.min' : '价格',
'priceManage.priceStrategy.columns.currency' : '￥',
'priceManage.priceStrategy.columns.isEnable' : '状态',
'priceManage.priceStrategy.columns.isEnable.1' : '有效',
'priceManage.priceStrategy.columns.isEnable.2' : '无效',
'priceManage.priceStrategy.columns.option' : '操作',
'priceManage.priceStrategy.popconfirm.title' : '确定要执行该操作？',
'priceManage.priceStrategy.popconfirm.okText' : '确定',
'priceManage.priceStrategy.popconfirm.cancelText' : '取消',
'priceManage.priceStrategy.popconfirm.link' : '删除',
'priceManage.priceStrategy.controllerBtns' : '新建',
'priceManage.priceStrategy.setStrategy.description' : '返回',
'priceManage.priceStrategy.setStrategy.title1' : '查看商品价格策略',
'priceManage.priceStrategy.setStrategy.title2' : '新建商品价格策略',
'priceManage.priceStrategy.setStrategy.title3' : '编辑商品价格策略',
'priceManage.priceStrategy.setStrategy.extra' : '保存',
'priceManage.priceStrategy.memberModal.modalTitle' : '选择会员',
'priceManage.priceStrategy.priceModal.unitPrice' : '单价',
'priceManage.priceStrategy.priceModal.index' : '索引',
'priceManage.priceStrategy.priceModal.error.1' : '请正确输入阶梯数量范围',
'priceManage.priceStrategy.priceModal.error.2' : '阶段的起始值必须为最小起订数',
'priceManage.priceStrategy.priceModal.title.1' : '批量设置价格',
'priceManage.priceStrategy.priceModal.title.2' : '设置价格',
'priceManage.priceStrategy.priceModal.ladderPrice' : '阶梯价格',
'priceManage.priceStrategy.priceModal.ladderPrice.rule' : '阶梯范围为必填项',
'priceManage.priceStrategy.priceModal.numberMin' : '最小数量',
'priceManage.priceStrategy.priceModal.numberMin.rule.1' : '阶梯最小数量为必填项',
'priceManage.priceStrategy.priceModal.numberMin.rule.2' : '阶梯数值仅限三位小数',
'priceManage.priceStrategy.priceModal.numberMax' : '最大数量',
'priceManage.priceStrategy.priceModal.numberMax.rule.1' : '阶梯最大数量为必填项',
'priceManage.priceStrategy.priceModal.numberMax.rule.2' : '阶梯数值仅限三位小数',
'priceManage.priceStrategy.priceModal.numberPrice' : '请输入单价',
'priceManage.priceStrategy.priceModal.numberPrice.rule.1' : '阶梯单价为必填项',
'priceManage.priceStrategy.priceModal.numberPrice.rule.2' : '阶梯单价仅限四位小数',
'priceManage.priceStrategy.priceModal.uniquePrice' : '请输入价格',
'priceManage.priceStrategy.priceModal.uniquePrice.label' : '单价',
'priceManage.priceStrategy.priceModal.uniquePrice.rule.1' : '请输入价格',
'priceManage.priceStrategy.priceModal.uniquePrice.rule.2' : '小数点后仅限四位',
'priceManage.priceStrategy.priceSetting.error.1' : '请先选择适用商城或商品',
'priceManage.priceStrategy.priceSetting.error.2' : '请先选择适用商城',
'priceManage.priceStrategy.priceSetting.error.3' : '请先选择适用商城或商品',
'priceManage.priceStrategy.priceSetting.ctl' : '操作',
'priceManage.priceStrategy.priceSetting.ctl.button' : '设置价格',
'priceManage.priceStrategy.priceSetting.unitPrice' : '单价',
'priceManage.priceStrategy.priceSetting.delete' : '删除',
'priceManage.priceStrategy.priceSetting.tableAddMemberButton' : '会员名称',
'priceManage.priceStrategy.priceSetting.tableAddMemberButton.button' : '选择指定会员',
'priceManage.priceStrategy.priceSetting.batchPriceButton.button' : '批量设置价格',
'priceManage.priceStrategy.priceSetting.connectProduct.button' : '选择',
'priceManage.priceStrategy.priceSetting.questionNameLabel' : '价格策略名称',
'priceManage.priceStrategy.priceSetting.questionNameLabel.tooltip' : '建议名称 ：商品名称+会员名称',
'priceManage.priceStrategy.priceSetting.questionPriceTypeLabel' : '商品定价',
'priceManage.priceStrategy.priceSetting.questionPriceTypeLabel.tooltip' : '现货价格：表示是现货销售的价格，价格明码标价，采购时按照标价下单，价格需要询价：表示价格未设定，需要询价报价后再下单采购',
'priceManage.priceStrategy.productModal.modalTitle' : '选择商品',
'priceManage.schema.schema.name' : '价格策略名称',
'priceManage.schema.schema.commodityName' : '商品编号或名称',
'priceManage.schema.schema.priceType' : '商品定价',
'priceManage.schema.schema.priceType.1' : '所有',
'priceManage.schema.schema.priceType.2' : '现货价格',
'priceManage.schema.schema.priceType.3' : '价格需要询价',
'priceManage.schema.schema.brandId' : '商品品牌',
'priceManage.schema.schema.customerCategoryId' : '商品品类',
'priceManage.schema.schema.min' : '最低价格',
'priceManage.schema.schema.max' : '最高价格',
'priceManage.schema.schema.submit' : '查询',
'priceManage.schema.setPriceSchema.tab-1' : '选择商品',
'priceManage.schema.setPriceSchema.name' : '最长60个字符，30字汉字',
'priceManage.schema.setPriceSchema.name.rule' : '请填写价格策略名称',
'priceManage.schema.setPriceSchema.shopId' : '适用商城',
'priceManage.schema.setPriceSchema.productName' : '商品名称',
'priceManage.schema.setPriceSchema.priceType.1' : '现货价格',
'priceManage.schema.setPriceSchema.priceType.2' : '价格需要询问',
'priceManage.schema.setPriceSchema.tab-2' : '价格设置',
'priceManage.schema.setPriceSchema.tab-3' : '适用会员',
'priceManage.schema.formSearch.name' : '请输入会员名字',
'priceManage.schema.formSearch.submit' : '查询',
'priceManage.schema.formProduct.name' : '请输入商品编号/名称',
'priceManage.schema.formProduct.customerCategoryId' : '商品品类',
'priceManage.schema.formProduct.brandId' : '请选择品牌',
'priceManage.schema.formProduct.submit' : '查询',
'priceManage.constant.columnsSetMember.name': '会员名称',
'priceManage.constant.columnsSetMember.memberTypeName': '会员类型',
'priceManage.constant.columnsSetMember.roleName': '会员角色',
'priceManage.constant.columnsSetMember.levelTag': '会员等级',
'priceManage.constant.columnsSetProduct.code': '商品编号',
'priceManage.constant.columnsSetProduct.name': '商品名称',
'priceManage.constant.columnsSetProduct.customerCategory': '品类',
'priceManage.constant.columnsSetProduct.brand': '品牌',
'priceManage.constant.columnsSetProduct.unitName': '单位',
'priceManage.constant.columnsSetProduct.priceType': '商品定价',
'priceManage.constant.columnsSetProduct.priceType.1': '现货价格',
'priceManage.constant.columnsSetProduct.priceType.2': '价格需要询问',
'priceManage.constant.columnsUnitProduct.index': '索引',
'priceManage.constant.columnsUnitProduct.goodsId': '货品ID',
'priceManage.constant.columnsUnitProduct.name': '商品名称',
'priceManage.constant.memberColumns.name': '会员名称',
'priceManage.constant.memberColumns.memberTypeName': '会员类型',
'priceManage.constant.memberColumns.roleName': '角色',
'priceManage.constant.memberColumns.ctl': '操作',
'priceManage.effect.goods': '对应货品',
'priceManage.effect.unitPrice': '单价',
'priceManage.effect.index': '索引',
'priceManage.effect.goodsId': '货品ID',
'priceManage.effect.goodsName': '商品名称',
'priceManage.priceStrategy.columns.id': '价格策略ID',
'priceManage.priceStrategy.columns.name': '价格策略名称',
'priceManage.priceStrategy.columns.commodityCode': '商品编号',
'priceManage.priceStrategy.columns.commodityName': '商品名称',
'priceManage.priceStrategy.columns.customerCategory': '品类',
'priceManage.priceStrategy.columns.brand': '品牌',
'priceManage.priceStrategy.columns.unitName': '单位',
'priceManage.priceStrategy.columns.priceType': '商品定价',
'priceManage.priceStrategy.columns.priceType.1': '现货价格',
'priceManage.priceStrategy.columns.priceType.2': '价格需要询价',
'priceManage.priceStrategy.columns.priceType.3': '积分兑换商品',
'priceManage.priceStrategy.columns.min': '价格',
'priceManage.priceStrategy.columns.currency': '￥',
'priceManage.priceStrategy.columns.isEnable': '状态',
'priceManage.priceStrategy.columns.isEnable.1': '有效',
'priceManage.priceStrategy.columns.isEnable.2': '无效',
'priceManage.priceStrategy.columns.option': '操作',
'priceManage.priceStrategy.popconfirm.title': '确定要执行该操作？',
'priceManage.priceStrategy.popconfirm.okText': '确定',
'priceManage.priceStrategy.popconfirm.cancelText': '取消',
'priceManage.priceStrategy.popconfirm.link': '删除',
'priceManage.priceStrategy.controllerBtns': '新建',
'priceManage.priceStrategy.setStrategy.description': '返回',
'priceManage.priceStrategy.setStrategy.title1': '查看商品价格策略',
'priceManage.priceStrategy.setStrategy.title2': '新建商品价格策略',
'priceManage.priceStrategy.setStrategy.title3': '编辑商品价格策略',
'priceManage.priceStrategy.setStrategy.extra': '保存',
'priceManage.priceStrategy.memberModal.modalTitle': '选择会员',
'priceManage.priceStrategy.priceModal.unitPrice': '单价',
'priceManage.priceStrategy.priceModal.index': '索引',
'priceManage.priceStrategy.priceModal.error.1': '请正确输入阶梯数量范围',
'priceManage.priceStrategy.priceModal.error.2': '阶段的起始值必须为最小起订数',
'priceManage.priceStrategy.priceModal.title.1': '批量设置价格',
'priceManage.priceStrategy.priceModal.title.2': '设置价格',
'priceManage.priceStrategy.priceModal.ladderPrice': '阶梯价格',
'priceManage.priceStrategy.priceModal.ladderPrice.rule': '阶梯范围为必填项',
'priceManage.priceStrategy.priceModal.numberMin': '最小数量',
'priceManage.priceStrategy.priceModal.numberMin.rule.1': '阶梯最小数量为必填项',
'priceManage.priceStrategy.priceModal.numberMin.rule.2': '阶梯数值仅限三位小数',
'priceManage.priceStrategy.priceModal.numberMax': '最大数量',
'priceManage.priceStrategy.priceModal.numberMax.rule.1': '阶梯最大数量为必填项',
'priceManage.priceStrategy.priceModal.numberMax.rule.2': '阶梯数值仅限三位小数',
'priceManage.priceStrategy.priceModal.numberPrice': '请输入单价',
'priceManage.priceStrategy.priceModal.numberPrice.rule.1': '阶梯单价为必填项',
'priceManage.priceStrategy.priceModal.numberPrice.rule.2': '阶梯单价仅限四位小数',
'priceManage.priceStrategy.priceModal.uniquePrice': '请输入价格',
'priceManage.priceStrategy.priceModal.uniquePrice.label': '单价',
'priceManage.priceStrategy.priceModal.uniquePrice.rule.1': '请输入价格',
'priceManage.priceStrategy.priceModal.uniquePrice.rule.2': '小数点后仅限四位',
'priceManage.priceStrategy.priceSetting.error.1': '请先选择适用商城或商品',
'priceManage.priceStrategy.priceSetting.error.2': '请先选择适用商城',
'priceManage.priceStrategy.priceSetting.error.3': '请先选择适用商城或商品',
'priceManage.priceStrategy.priceSetting.ctl': '操作',
'priceManage.priceStrategy.priceSetting.ctl.button': '设置价格',
'priceManage.priceStrategy.priceSetting.unitPrice': '单价',
'priceManage.priceStrategy.priceSetting.delete': '删除',
'priceManage.priceStrategy.priceSetting.tableAddMemberButton': '会员名称',
'priceManage.priceStrategy.priceSetting.tableAddMemberButton.button': '选择指定会员',
'priceManage.priceStrategy.priceSetting.batchPriceButton.button': '批量设置价格',
'priceManage.priceStrategy.priceSetting.connectProduct.button': '选择',
'priceManage.priceStrategy.priceSetting.questionNameLabel': '价格策略名称',
'priceManage.priceStrategy.priceSetting.questionNameLabel.tooltip': '建议名称 ：商品名称+会员名称',
'priceManage.priceStrategy.priceSetting.questionPriceTypeLabel': '商品定价',
'priceManage.priceStrategy.priceSetting.questionPriceTypeLabel.tooltip':
'现货价格：表示是现货销售的价格，价格明码标价，采购时按照标价下单，价格需要询价：表示价格未设定，需要询价报价后再下单采购',
'priceManage.priceStrategy.productModal.modalTitle': '选择商品',
'priceManage.schema.schema.name': '价格策略名称',
'priceManage.schema.schema.commodityName': '商品编号或名称',
'priceManage.schema.schema.priceType': '商品定价',
'priceManage.schema.schema.priceType.1': '所有',
'priceManage.schema.schema.priceType.2': '现货价格',
'priceManage.schema.schema.priceType.3': '价格需要询价',
'priceManage.schema.schema.brandId': '商品品牌',
'priceManage.schema.schema.customerCategoryId': '商品品类',
'priceManage.schema.schema.min': '最低价格',
'priceManage.schema.schema.max': '最高价格',
'priceManage.schema.schema.submit': '查询',
'priceManage.schema.setPriceSchema.tab-1': '选择商品',
'priceManage.schema.setPriceSchema.name': '最长60个字符，30字汉字',
'priceManage.schema.setPriceSchema.name.rule': '请填写价格策略名称',
'priceManage.schema.setPriceSchema.shopId': '适用商城',
'priceManage.schema.setPriceSchema.productName': '商品名称',
'priceManage.schema.setPriceSchema.priceType.1': '现货价格',
'priceManage.schema.setPriceSchema.priceType.2': '价格需要询问',
'priceManage.schema.setPriceSchema.tab-2': '价格设置',
'priceManage.schema.setPriceSchema.tab-3': '适用会员',
'priceManage.schema.formSearch.name': '请输入会员名字',
'priceManage.schema.formSearch.submit': '查询',
'priceManage.schema.formProduct.name': '请输入商品编号/名称',
'priceManage.schema.formProduct.customerCategoryId': '商品品类',
'priceManage.schema.formProduct.brandId': '请选择品牌',
'priceManage.schema.formProduct.submit': '查询',
'priceManage.schema.formProduct.wuliaobianhao': '物料编号',
'priceManage.schema.formProduct.wuliaomingcheng': '物料名称',
'priceManage.schema.formProduct.guigexinghao': '规格型号',
'priceManage.schema.formProduct.pinlei': '品类',
'priceManage.schema.formProduct.pinpai': '品牌',
'priceManage.schema.formProduct.danwei': '单位',
'priceManage.schema.formProduct.mulujia': '目录价',
'priceManage.schema.formProduct.shichangjia': '市场价',
'priceManage.schema.formProduct.hetongdingdanjia': '合同/订单价',
'priceManage.schema.formProduct.hetongdingdan': '合同/订单',
'priceManage.schema.formProduct.gongyinghuiyuanID': '供应会员ID',
'priceManage.schema.formProduct.gongyinghuiyuanmingcheng': '供应会员名称',
'priceManage.schema.formProduct.jiageyouxiaocong': '价格有效从',
'priceManage.schema.formProduct.jiageyouxiaodao': '价格有效到',
'priceManage.schema.formProduct.zhakanlishijiage': '查看历史价格',
}
src/locales/zh-CN/stockSellStorage.ts
View file @ 6daba067
......@@ -50,6 +50,7 @@ export default {
'stockSellStorage.xinjiandanju': '新建单据',
'stockSellStorage.bianjidanju': '编辑单据',
'stockSellStorage.zhakandanju': '查看单据',
'stockSellStorage.danjubianhao': '单据编号',
'stockSellStorage.baocun': '保存',
'stockSellStorage.xuanzehuopin': '选择货品',
'stockSellStorage.ninhaiyouweibaocundenei': '您还有未保存的内容，是否确定要离开？',
......
src/pages/priceManage/priceLibrary/detailLibrary.tsx
View file @ 6daba067
......@@ -3,7 +3,7 @@ import { Card } from 'antd';
import { PageHeaderWrapper } from '@ant-design/pro-layout';
import StandardTable from '@/components/StandardTable';
import { ColumnType } from 'antd/lib/table/interface';
import { history } from 'umi';
import { getIntl, history } from 'umi';
import { getProductPriceManagementGetGoodsPriceHistory } from '@/services/ProductV2Api';
const DetailLibrary: React.FC<{}> = () => {
......@@ -12,79 +12,106 @@ const DetailLibrary: React.FC<{}> = () => {
const columns: ColumnType<any>[] = [
{
title: '物料编号',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.wuliaobianhao',
}),
dataIndex: 'goodsCode',
key: 'goodsCode',
},
{
title: '物料名称',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.wuliaomingcheng',
}),
dataIndex: 'name',
key: 'name',
},
{
title: '规格型号',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.guigexinghao',
}),
dataIndex: 'type',
key: 'type',
},
{
title: '品类',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.pinlei',
}),
dataIndex: 'customerCategory',
key: 'customerCategory',
render: text => text?.name,
},
{
title: '品牌',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.pinpai',
}),
dataIndex: 'unitName',
key: 'unitName',
render: text => text?.name,
},
{
title: '单位',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.danwei',
}),
dataIndex: 'unitName',
key: 'unitName',
},
{
title: '目录价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.mulujia',
}),
dataIndex: 'costPrice',
key: 'costPrice',
},
{
title: '市场价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.shichangjia',
}),
dataIndex: 'marketPrice',
key: 'marketPrice',
},
{
title: '合同/订单价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.hetongdingdanjia',
}),
dataIndex: 'orderPrice',
key: 'orderPrice',
},
{
title: '合同/订单',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.hetongdingdan',
}),
dataIndex: 'code',
key: 'code',
},
{
title: '供应会员ID',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.gongyinghuiyuanID',
}),
dataIndex: 'upperMemberId',
key: 'upperMemberId',
},
{
title: '供应会员名称',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.gongyinghuiyuanmingcheng',
}),
dataIndex: 'upperMemberName',
key: 'upperMemberName',
},
{
title: '价格有效从',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.jiageyouxiaocong',
}),
dataIndex: 'effectiveStartTime',
key: 'effectiveStartTime',
},
{
title: '价格有效到',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.jiageyouxiaodao',
}),
dataIndex: 'effectiveEndTime',
key: 'effectiveEndTime',
},
];
const fetchData = (params: any) => {
return new Promise(resolve => {
getProductPriceManagementGetGoodsPriceHistory({
......
src/pages/priceManage/priceLibrary/index.tsx
View file @ 6daba067
......@@ -6,7 +6,7 @@ import { ColumnType } from 'antd/lib/table/interface';
import NiceForm from '@/components/NiceForm';
import { createFormActions } from '@formily/antd';
import { librarySearch } from '../schema';
import { history, useIntl } from 'umi';
import { getIntl, history, useIntl } from 'umi';
import {
getProductPriceManagementGetGoodsPriceList,
getProductPriceManagementAddGoodsPrice,
......@@ -21,44 +21,60 @@ const PriceLibrary: React.FC<{}> = () => {
const columns: ColumnType<any>[] = [
{
title: '物料编号',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.wuliaobianhao',
}),
dataIndex: 'goodsCode',
key: 'goodsCode',
},
{
title: '物料名称',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.wuliaomingcheng',
}),
dataIndex: 'name',
key: 'name',
},
{
title: '规格型号',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.guigexinghao',
}),
dataIndex: 'type',
key: 'type',
},
{
title: '品类',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.pinlei',
}),
dataIndex: 'customerCategory',
key: 'customerCategory',
render: text => text?.name,
},
{
title: '品牌',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.pinpai',
}),
dataIndex: 'unitName',
key: 'unitName',
render: text => text?.name,
},
{
title: '单位',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.danwei',
}),
dataIndex: 'unitName',
key: 'unitName',
},
{
title: '目录价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.mulujia',
}),
dataIndex: 'costPrice',
key: 'costPrice',
},
{
title: '市场价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.shichangjia',
}),
dataIndex: 'marketPrice',
key: 'marketPrice',
render: (text, record) => {
......@@ -79,32 +95,44 @@ const PriceLibrary: React.FC<{}> = () => {
},
},
{
title: '合同/订单价',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.hetongdingdanjia',
}),
dataIndex: 'orderPrice',
key: 'orderPrice',
},
{
title: '合同/订单',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.hetongdingdan',
}),
dataIndex: 'code',
key: 'code',
},
{
title: '供应会员ID',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.gongyinghuiyuanID',
}),
dataIndex: 'upperMemberId',
key: 'upperMemberId',
},
{
title: '供应会员名称',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.gongyinghuiyuanmingcheng',
}),
dataIndex: 'upperMemberName',
key: 'upperMemberName',
},
{
title: '价格有效从',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.jiageyouxiaocong',
}),
dataIndex: 'effectiveStartTime',
key: 'effectiveStartTime',
},
{
title: '价格有效到',
title: getIntl().formatMessage({
id: 'priceManage.schema.formProduct.jiageyouxiaodao',
}),
dataIndex: 'effectiveEndTime',
key: 'effectiveEndTime',
},
......@@ -122,7 +150,9 @@ const PriceLibrary: React.FC<{}> = () => {
className="padLeft0"
onClick={() => handleModify(record)}
>
查看历史价格
{getIntl().formatMessage({
id: 'priceManage.schema.formProduct.zhakanlishijiage',
})}
</Button>
</AuthButton>
);
......
src/pages/priceManage/schema/index.tsx
View file @ 6daba067
......@@ -491,25 +491,25 @@ export const librarySearch: ISchema = {
code: {
type: 'string',
'x-component-props': {
placeholder: '物料编号',
placeholder: getIntl().formatMessage({ id: 'priceManage.schema.formProduct.wuliaobianhao'}),
},
},
name: {
type: 'string',
'x-component-props': {
placeholder: '物料名称',
placeholder: getIntl().formatMessage({ id: 'priceManage.schema.formProduct.wuliaomingcheng'}),
},
},
customerCategoryId: {
type: 'string',
'x-component-props': {
placeholder: '品类',
placeholder: getIntl().formatMessage({ id: 'priceManage.schema.formProduct.pinlei'}),
},
},
uppreMemberName: {
type: 'string',
'x-component-props': {
placeholder: '供应会员名称',
placeholder: getIntl().formatMessage({ id: 'priceManage.schema.formProduct.gongyinghuiyuanmingcheng'}),
},
},
submit: {
......
src/pages/transaction/stockSellStorage/bills/components/BillsForm/schema/index.ts
View file @ 6daba067
......@@ -115,7 +115,7 @@ export const addBillSchema: ISchema = {
properties: {
invoicesNo: {
type: 'text',
title: '单据编号',
title: intl.formatMessage({id: 'stockSellStorage.danjubianhao'}),
},
invoicesTypeId: {
type: 'string',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment