Skip to content

J
jinfa-platform
Commit 28503bbc authored by 卢均锐's avatar 卢均锐
Browse files
Options

Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2

* 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform: chore: 修改页面报错的问题 feat: 采购能力翻译文件 chore: 修复新值没有覆盖旧值的问题 chore: 删除多余的操作按钮 fix: 对接采购订单详情申请开票，销售订单详情修改商品单价和运费功能，原有待审核订单修改单价和运费添加修改原因，供应商收到的评价添加显示隐藏评价操作
parents 2fe2b566 a02a7950
Hide whitespace changes
Inline Side-by-side
Showing with 422 additions and 15 deletions
src/locales/zh-CN/purchase.ts 0 → 100644
View file @ 28503bbc
const PurchaseLocales = {
// 1.采购门户 -> menu
'menu.procurementAbility.purchasDoor': '采购门户',
// 创建采购门户 -> page
'menu.procurementAbility.purchasDoor.purchasInfo': '创建采购门户',
'purchasDoor.purchasInfo.save': '保存',
'purchasDoor.purchasInfo.basicInfo': '基本信息',
'purchasDoor.purchasInfo.swiper': '首页轮播图',
'purchasDoor.purchasInfo.attributRegion': '归属地市',
'purchasDoor.purchasInfo.logo': '公司LOGO',
'purchasDoor.purchasInfo.profile': '公司简介',
'purchasDoor.purchasInfo.photo': '公司照片',
'purchasDoor.purchasInfo.glory': '资质荣誉',
'purchasDoor.purchasInfo.adImage': '采购门户广告图',
'purchasDoor.purchasInfo.album': '宣传画册',
'purchasDoor.purchasInfo.links': '门户链接',
// 采购门户SEO设置 -> page
'menu.procurementAbility.purchasDoor.purchasSeo': '采购门户SEO设置',
'purchasDoor.purchasSeo.added': '新建',
'purchasDoor.purchasSeo.name': '页面名称',
'purchasDoor.purchasSeo.links': '访问链接',
'purchasDoor.purchasSeo.status': '状态',
'purchasDoor.purchasSeo.operate': '操作',
'purchasDoor.purchasSeo.basicInfo': '基本信息',
'purchasDoor.purchasSeo.title': '标题',
'purchasDoor.purchasSeo.describe': '描述',
'purchasDoor.purchasSeo.keyword': '关键字',
// 2.采购计划管理 -> menu
'menu.procurementAbility.purchasePlan': '采购计划管理',
'menu.procurementAbility.purchasePlan.demandPlanSummary': '待汇总需求计划',
'menu.procurementAbility.purchasePlan.purchasePlanSearch': '采购计划查询',
'menu.procurementAbility.purchasePlan.purchasePlanSubmit': '待提交审核采购计划',
'menu.procurementAbility.purchasePlan.purchasePlanOne': '待审核采购计划（一级）',
'menu.procurementAbility.purchasePlan.purchasePlanTwo': '待审核采购计划（二级）',
'menu.procurementAbility.purchasePlan.purchasePlanPerform': '待执行采购计划',
// 3.需求计划管理 -> menu
'menu.procurementAbility.demandPlan': '需求计划管理',
'menu.procurementAbility.demandPlan.demandPlanSearch': '需求计划查询',
'menu.procurementAbility.demandPlan.demandPlanAdded': '待新增需求计划',
'menu.procurementAbility.demandPlan.demandPlanOne': '待审核需求计划（一级）',
'menu.procurementAbility.demandPlan.demandPlanTwo': '待审核需求计划（二级）',
'menu.procurementAbility.demandPlan.demandPlanSubmit': '待提交需求计划',
// 4.投标 -> menu
'menu.procurementAbility.tender': '投标',
'menu.procurementAbility.tender.callForBidsSearch': '招标查询',
'menu.procurementAbility.tender.tenderSearch': '投标查询',
'menu.procurementAbility.tender.readyBidRegister': '待招标报名',
'menu.procurementAbility.tender.readyQualifityChecked': '待提交资格预审',
'menu.procurementAbility.tender.readyAddTender': '待新建投标',
'menu.procurementAbility.tender.firstCheckedTender': '待审核投标(一级)',
'menu.procurementAbility.tender.secondCheckedTender': '待审核投标(二级)',
'menu.procurementAbility.tender.readySubmitTender': '待提交投标',
// 5.招标 -> menu
'menu.procurementAbility.callForBids': '招标',
'menu.procurementAbility.callForBids.callForBidsSearch': '招标查询',
'menu.procurementAbility.callForBids.tenderSearch': '投标查询',
'menu.procurementAbility.callForBids.readyAddBid': '待新增招标',
'menu.procurementAbility.callForBids.firstCheckedBid': '待审核招标(一级)',
'menu.procurementAbility.callForBids.secondCheckedBid': '待审核招标(二级)',
'menu.procurementAbility.callForBids.readySubmitBid': '待提交招标',
'menu.procurementAbility.callForBids.readyCheckedRegister': '待审核报名',
'menu.procurementAbility.callForBids.readyQualifityChecked': '待资格预审',
'menu.procurementAbility.callForBids.readyExpertRemark': '待专家评标',
'menu.procurementAbility.callForBids.readyConfirmBid': '待定标',
'menu.procurementAbility.callForBids.readyCheckedConfirmFirst': '待审核定标(一级)',
'menu.procurementAbility.callForBids.readyCheckedConfirmSecond': '待审核定标(二级)',
'menu.procurementAbility.callForBids.readyPassBid': '待确认定标',
'menu.procurementAbility.callForBids.readySendBidNotice': '待发中标公示',
'menu.procurementAbility.callForBids.remarkBidTemplate': '评标模板',
'menu.procurementAbility.callForBids.remarkBidExpert': '评标专家库',
'menu.procurementAbility.callForBids.remarkBidCommittee': '专家抽取管理',
'menu.procurementAbility.callForBids.extractNoticeManage': '专家抽取通知管理',
'menu.procurementAbility.callForBids.readySubmitReport': '待提交评标报告',
// 6.采购询价 -> menu
'menu.procurementAbility.purchaseInquiry': '采购询价',
'menu.procurementAbility.purchaseInquiry.inquiry': '采购需求单查询',
'menu.procurementAbility.purchaseInquiry.addInquiry': '待新增采购需求单',
'menu.procurementAbility.purchaseInquiry.auditInquiryOne': '待审核采购需求单(一级)',
'menu.procurementAbility.purchaseInquiry.auditInquiryTwo': '待审核采购需求单(二级)',
'menu.procurementAbility.purchaseInquiry.submitInquiry': '待提交采购需求单',
// 7.采购询价报价 -> menu
'menu.procurementAbility.offter': '采购询价报价',
'menu.procurementAbility.offter.inquiry': '采购需求单查询',
'menu.procurementAbility.offter.offter': '报价单查询',
'menu.procurementAbility.offter.addOffter': '待新增报价单',
'menu.procurementAbility.offter.auditOffterOne': '待审核报价单(一级)',
'menu.procurementAbility.offter.auditOffterTwo': '待审核报价单(二级)',
'menu.procurementAbility.offter.submitOffter': '待提交报价单',
// 8.确认报价 -> menu
'menu.procurementAbility.confirmOffer': '确认报价',
'menu.procurementAbility.confirmOffer.offerInquire': '报价查询',
'menu.procurementAbility.confirmOffer.toComparePrices': '待比价',
'menu.procurementAbility.confirmOffer.auditResultsOne': '待审核授标结果(一级)',
'menu.procurementAbility.confirmOffer.auditResultsTwo': '待审核授标结果(二级)',
'menu.procurementAbility.confirmOffer.confirmResults': '待确认授标结果',
// 9. 采购竞价 -> menu
'menu.procurementAbility.purchaseBid': '采购竞价',
'menu.procurementAbility.purchaseBid.search': '采购竞价单查询',
'menu.procurementAbility.purchaseBid.readyAdd': '待新增采购竞价单',
'menu.procurementAbility.purchaseBid.readyExamineOne': '待审核采购竞价单一级',
'menu.procurementAbility.purchaseBid.readyExamineTwo': '待审核采购竞价单(二级)',
'menu.procurementAbility.purchaseBid.readySubmit': '待提交采购竞价单',
'menu.procurementAbility.purchaseBid.readyExamineSignUp': '待审核竞价报名',
'menu.procurementAbility.purchaseBid.readyBid': '待竞价',
'menu.procurementAbility.purchaseBid.readySubmitExamineResult': '待提交审核竞价结果',
'menu.procurementAbility.purchaseBid.readyExamineResultOne': '待审核竞价结果(一级)',
'menu.procurementAbility.purchaseBid.readyExamineResultTwo': '待审核竞价结果(二级)',
'menu.procurementAbility.purchaseBid.readyConfirm': '待确认竞价结果',
// 10.在线竞价 -> menu
'menu.procurementAbility.onlineBid': '在线竞价',
'menu.procurementAbility.onlineBid.search': '采购竞价单查询',
'menu.procurementAbility.onlineBid.readySignUp': '待竞价报名',
'menu.procurementAbility.onlineBid.readyBid': '待竞价',
// 11.采购请购单 -> menu
'menu.procurementAbility.purchaseRequisition': '采购请购单',
'menu.procurementAbility.purchaseRequisition.purchaseRequisitionList': '采购请购单查询',
'menu.procurementAbility.purchaseRequisition.readyAddBill': '待新增请购单',
'menu.procurementAbility.purchaseRequisition.firstApprovedBill': '待审核请购单 一级',
'menu.procurementAbility.purchaseRequisition.secondApprovedBill': '待审核请购单 二级',
'menu.procurementAbility.purchaseRequisition.readySubmitBill': '待提交请购单',
// 12.请购单转采购订单 -> menu
'menu.procurementAbility.requisitionOrder': '请购单转采购订单',
'menu.procurementAbility.requisitionOrder.readyRequisitionOrder': '待请购单转采购订单',
// table
'table.purchase.added': '新建',
'table.purchase.submit': '提交',
'table.purchase.delete': '删除',
'table.purchase.purchasePlanNo': '需求计划编号/摘要',
'table.purchase.startTime': '计划开始/截止时间',
'table.purchase.department': '编制部门',
'table.purchase.userName': '编制人',
'table.purchase.createTime': '编制时间',
'table.purchase.innerStatus': '内部状态',
'table.purchase.externalStatus': '外部状态',
'table.purchase.operate': '操作',
'table.purchase.id': '序号',
'table.purchase.code': '招标编号/项目',
'table.purchase.memberName': '招标会员',
'table.purchase.openTenderTime': '开标时间',
'table.purchase.bidCreateTime': '发布时间',
'table.purchase.registerStartTime': '报名开始/截止时间',
'table.purchase.inviteTenderStartTime': '投标开始/截止时间',
'table.purchase.tendeCode': '投标编号/项目',
'table.purchase.inviteTender': '招标编号/会员',
'table.purchase.tenderStartTime': '投标时间',
'table.purchase.inviteTenderEndTime': '招标开始/截止时间',
'table.purchase.isWin': '是否中标',
'table.purchase.preCheckStartTime': '资格预审开始/截止时间',
'table.purchase.purchaseType': '采购类型',
'table.purchase.inviteTenderType': '招标方式',
'table.purchase.callForBidsCode': '投标编号/会员',
'table.purchase.inviteMemberName': '报名会员',
'table.purchase.inviteTenderCreateTime': '提交时间',
'table.purchase.submitQualificationsCheckTime': '资格预审会员/提交时间',
'table.purchase.expertNumber': '专家号码',
'table.purchase.evaluationStartTime': '评标开始/结束时间',
'table.purchase.evaluationEndTime': '评标开始/评标时间',
'table.purchase.name': '模板名称',
'table.purchase.version': '版本号',
'table.purchase.remark': '模板说明',
'table.purchase.status': '状态',
'table.purchase.expert': '专家',
'table.purchase.orgName': '所属机构',
'table.purchase.userJobTitle': '职位',
'table.purchase.speciality': '专业类别',
'table.purchase.qualification': '资格证书',
'table.purchase.title': '专业职称',
'table.purchase.years': '从事年限',
'table.purchase.type': '专家类型',
'table.purchase.themeName': '主题名称',
'table.purchase.numbering': '招标编号',
'table.purchase.inviteTenderEvaluationStartTime': '评标开始/截止时间',
'table.purchase.expertCount': '专家抽取数',
'table.purchase.expertConfirmCount': '专家确认数',
'table.purchase.expertNumbering': '专家编码',
'table.purchase.projectName': '招标项目',
'table.purchase.purchaseInquiryNo': '需求单号/摘要',
'table.purchase.deliveryTime': '交付日期',
'table.purchase.quotedPriceTime': '报价截止时间',
'table.purchase.dementCreateTime': '单据时间',
'table.purchase.dementNo': '需求单号',
'table.purchase.member': '需求会员',
'table.purchase.purchaseInquiryNoDtails': '报价单号/摘要',
'table.purchase.purchaseInquiryNoMember': '需求单号/会员',
'table.purchase.purchaseInquiryNoCreateTime': '报价时间',
'table.purchase.turn': '报价轮次',
'table.purchase.details': '需求摘要',
'table.purchase.count': '有效报价数',
'table.purchase.biddingNo': '竞价单号/摘要',
'table.purchase.biddingStartTime': '竞价开始/结束时间',
'table.purchase.signUpTime': '报名会员/时间',
'table.purchase.startSignUp': '报名开始/结束时间',
'table.purchase..biddingMemberName': '授标会员',
'table.purchase.createMemberName': '采购会员',
'table.purchase.requisitionNo': '请购单号',
'table.purchase.digest': '请购单摘要',
'table.purchase.supplierName': '供应会员',
'table.purchase.deliverTime': '预付日期',
'table.purchase.requisitionment': '请购部门',
'table.purchase.purpose': '请购用途',
'table.purchase.quantity': '请购数量',
'table.purchase.transferQuantity': '已转订单数量',
// detail
'detail.purchase.progressLayout': '流转进度',
'detail.purchase.basicLayout': '基本信息',
'detail.purchase.materialLayout': '采购物料',
'detail.purchase.recordLyout': '流转记录',
'detail.purchase.purchasePlanNo': '采购计划编号',
'detail.purchase.summary': '采购计划摘要',
'detail.purchase.innerStatus': '内部状态',
'detail.purchase.startTime': '采购计划开始',
'detail.purchase.endTime': '采购计划截止',
'detail.purchase.operate': '编制部门',
'detail.purchase.department': '编制人',
'detail.purchase.createTime': '编制时间',
'detail.purchase.submit': '提交审核',
'detail.purchase.modelTitle': '单据审核',
// '需求计划编号',
// '需求计划摘要',
// '需求计划开始',
// '需求计划截止',
// '物料编号/名称',
// '规格型号',
// '品类',
// '品牌',
// '单位',
// '需求数量',
// '成本价',
// '需求金额',
// '到货日期',
// '计划采购数量',
// '计划采购金额',
// '操作',
// '添加方式',
// '招标物料',
// '招标要求',
// '报名要求',
// '报名信息',
// '资格预审要求',
// '资格预审信息',
// '评标要求',
// '评标报告',
// '其他要求',
// '招标方式',
// 这里到投标~~
}
export default PurchaseLocales
src/pages/transaction/logisticsAbility/logisticsAdminister/component/addressForm/index.tsx
View file @ 28503bbc
...@@ -9,7 +9,7 @@ import { SaveOutlined } from '@ant-design/icons'; ...@@ -9,7 +9,7 @@ import { SaveOutlined } from '@ant-design/icons';
import { useLinkEnumEffect } from '@/components/NiceForm/linkages/linkEnum'; import { useLinkEnumEffect } from '@/components/NiceForm/linkages/linkEnum';
import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect'; import { useAsyncSelect } from '@/formSchema/effects/useAsyncSelect';
import styles from './index.less'; import styles from './index.less';
import { getManageAreaAll, getManageCountryAreaGetTelCode } from '@/services/ManageV2Api'; import { getManageAreaAll, getManageAreaByPcode, getManageCountryAreaGetTelCode } from '@/services/ManageV2Api';
const formActions = createFormActions(); const formActions = createFormActions();
const { const {
...@@ -161,7 +161,7 @@ const AddressForm: React.FC<AddressFormProps> = (props: any) => { ...@@ -161,7 +161,7 @@ const AddressForm: React.FC<AddressFormProps> = (props: any) => {
}} }}
effects={($, { setFieldState, setFieldValue }) => { effects={($, { setFieldState, setFieldValue }) => {
$('onFormMount').subscribe(async () => { $('onFormMount').subscribe(async () => {
await getManageAreaAll().then(res => { await getManageAreaByPcode({pcode: ''}).then(res => {
if (res.code === 1000) { if (res.code === 1000) {
const { data } = res; const { data } = res;
addressData.current = data addressData.current = data
......
src/pages/transaction/logisticsAbility/logisticsAdminister/component/schema/index.tsx
View file @ 28503bbc
...@@ -362,3 +362,167 @@ export const receiverAddress: ISchema = { ...@@ -362,3 +362,167 @@ export const receiverAddress: ISchema = {
} }
} }
} }
export const SHIPPER_ADDRESS__ISCHEMA: ISchema = {
type: 'object',
properties: {
MEGA_LAYOUT: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
labelCol: 6,
wrapperCol: 16,
labelAlign: 'left',
},
properties: {
'shipperName': {
type: 'string',
title: '发货人',
'x-rules': [
{
required: true,
message: '请输入发货人',
},
{
limitByte: true, // 自定义校验规则
maxByte: 20,
}
]
},
MEGA_LAYOUT1: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
label: '{{AddressLabel}}',
wrapperCol: 24,
},
properties: {
MEGA_LAYOUT1_1: {
type: 'object',
'x-component': 'mega-layout',
'x-component-props': {
grid: true,
full: true,
columns: 4
},
properties: {
'provinceCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-省份/直辖市-',
},
},
'cityCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-市-',
},
},
'districtCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-区-',
},
},
'streetCode': {
type: 'string',
enum: [],
'x-component-props': {
placeholder: '-街道-',
},
}
// provinceCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-省份/直辖市-',
// },
// 'x-linkages': [
// {
// type: 'value:linkage',
// condition: '{{!!$self.value}}',
// origin: 'provinceCode',
// target: 'cityCode',
// },
// ],
// required: true,
// },
// cityCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-市-',
// },
// 'x-linkages': [
// {
// type: 'value:linkage',
// condition: '{{!!$self.value}}',
// origin: 'cityCode',
// target: 'districtCode',
// },
// ],
// required: true,
// },
// districtCode: {
// type: 'string',
// enum: [],
// 'x-component-props': {
// placeholder: '-区-',
// },
// required: true,
// },
}
},
}
},
'address': {
type: 'string',
title: '详细地址',
'x-component': 'TextArea',
'x-rules': [
{
required: true,
message: '请输入详细地址',
},
{
limitByte: true, // 自定义校验规则
maxByte: 60,
}
]
},
'postalCode': {
type: 'string',
title: '邮编',
'x-component-props': {},
'x-rules': [
{
limitByte: true, // 自定义校验规则
maxByte: 20,
}
]
},
'tel': {
type: 'string',
title: '电话号码',
'x-component-props': {
placeholder: '请输入你的电话号码',
},
'x-rules': [
{
pattern: PATTERN_MAPS.tel,
message: '请输入正确格式的电话号码',
},
],
},
'isDefault': {
title: '是否默认',
'x-component': 'Switch'
}
}
}
}
}
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponAnalysis/index.tsx
View file @ 28503bbc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-06-22 11:10:57 * @Date: 2021-06-22 11:10:57
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-08-02 16:49:39 * @LastEditTime: 2021-11-26 18:25:44
* @Description: 商家优惠劵执行 * @Description: 商家优惠劵执行
*/ */
import React, { useRef } from 'react'; import React, { useRef } from 'react';
...@@ -134,15 +134,7 @@ const MerchantCouponAnalysis: React.FC = () => { ...@@ -134,15 +134,7 @@ const MerchantCouponAnalysis: React.FC = () => {
return {}; return {};
}; };
const ControllerBtns = () => ( const ControllerBtns = () => null;
<Space size={16}>
<Button
onClick={() => {}}
>
批量审核通过
</Button>
</Space>
);
return ( return (
<Card> <Card>
......
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/components/ActionModal/index.tsx
View file @ 28503bbc
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Author: XieZhiXiong * @Author: XieZhiXiong
* @Date: 2021-07-02 15:30:48 * @Date: 2021-07-02 15:30:48
* @LastEditors: XieZhiXiong * @LastEditors: XieZhiXiong
* @LastEditTime: 2021-09-30 17:02:09 * @LastEditTime: 2021-11-26 18:15:44
* @Description: 操作 Modal * @Description: 操作 Modal
*/ */
import React, { useRef } from 'react'; import React, { useRef } from 'react';
...@@ -67,11 +67,11 @@ const ActionModal: React.FC<IProps> = (props) => { ...@@ -67,11 +67,11 @@ const ActionModal: React.FC<IProps> = (props) => {
const formRef = useRef<ReasonFormRefHandle | EditFormRefHandle | null>(null); const formRef = useRef<ReasonFormRefHandle | EditFormRefHandle | null>(null);
const handleReasonSubmit = (values: ReasonValueType) => { const handleReasonSubmit = (values: ReasonValueType) => {
onConfirm({ reason: values.reason, ...value }, modalName); onConfirm({ ...value, reason: values.reason }, modalName);
}; };
const handleEditSubmit = (values: EditSubmitValueType) => { const handleEditSubmit = (values: EditSubmitValueType) => {
onConfirm({ ...values, ...value }, modalName); onConfirm({ ...value, ...values }, modalName);
}; };
const handleConfirm = () => { const handleConfirm = () => {
......
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