Skip to content

J
jinfa-platform
Commit f41c8893 authored by Bill's avatar Bill
Browse files
Options

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

parents 25ee0096 a2d04d2d
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 43 deletions
src/locales/ko_KR.ts → src/locales/ko-KR.ts
View file @ f41c8893
import common from './ko_KR/common'
import menu from './ko_KR/menu'
import home from './ko_KR/home'
import order from './ko_KR/order'
import shop from './ko_KR/shop'
import priceManage from './ko_KR/priceManage'
import handling from './ko_KR/handling'
import classAndProperty from './ko_KR/classAndProperty'
import member from './ko_KR/member'
import purchase from './ko_KR/purchase'
import editor from './ko_KR/editor'
import authConfig from './ko_KR/system/authConfig'
import systemSetting from './ko_KR/system/systemSetting'
import accountSetting from './ko_KR/system/accountSetting'
import activityPage from './ko_KR/marketingAbility/activityPage'
import merchantCoupon from './ko_KR/marketingAbility/merchantCoupon'
import paltformSign from './ko_KR/marketingAbility/paltformSign'
import selfManagement from './ko_KR/marketingAbility/selfManagement'
import logistics from './ko_KR/logistics'
import dealAbility from './ko_KR/dealAbility'
import purchaserEvaluation from './ko_KR/purchaserEvaluation'
import stockSellStorage from './ko_KR/stockSellStorage'
import supplierEvaluation from './ko_KR/supplierEvaluation'
import transactionComponents from './ko_KR/transaction_components'
import user from './ko_KR/user'
import contract from './ko_KR/contract'
import components from './ko_KR/components'
import content from './ko_KR/content'
import commodity from './ko_KR/commodity'
import trademark from './ko_KR/trademark'
import repositories from './ko_KR/repositories'
import payandSettle from './ko_KR/payandSettle'
import balance from './ko_KR/balance'
import processRuleSetting from './ko_KR/system/processRuleSetting'
import afterService from './ko_KR/afterService';
import marketing from './ko_KR/marketing'
import common from './ko-KR/common'
import menu from './ko-KR/menu'
import home from './ko-KR/home'
import order from './ko-KR/order'
import shop from './ko-KR/shop'
import priceManage from './ko-KR/priceManage'
import handling from './ko-KR/handling'
import classAndProperty from './ko-KR/classAndProperty'
import member from './ko-KR/member'
import purchase from './ko-KR/purchase'
import editor from './ko-KR/editor'
import authConfig from './ko-KR/system/authConfig'
import systemSetting from './ko-KR/system/systemSetting'
import accountSetting from './ko-KR/system/accountSetting'
import activityPage from './ko-KR/marketingAbility/activityPage'
import merchantCoupon from './ko-KR/marketingAbility/merchantCoupon'
import paltformSign from './ko-KR/marketingAbility/paltformSign'
import selfManagement from './ko-KR/marketingAbility/selfManagement'
import logistics from './ko-KR/logistics'
import dealAbility from './ko-KR/dealAbility'
import purchaserEvaluation from './ko-KR/purchaserEvaluation'
import stockSellStorage from './ko-KR/stockSellStorage'
import supplierEvaluation from './ko-KR/supplierEvaluation'
import transactionComponents from './ko-KR/transaction_components'
import user from './ko-KR/user'
import contract from './ko-KR/contract'
import components from './ko-KR/components'
import content from './ko-KR/content'
import commodity from './ko-KR/commodity'
import trademark from './ko-KR/trademark'
import repositories from './ko-KR/repositories'
import payandSettle from './ko-KR/payandSettle'
import balance from './ko-KR/balance'
import processRuleSetting from './ko-KR/system/processRuleSetting'
import afterService from './ko-KR/afterService';
import marketing from './ko-KR/marketing'
export default {
'global.siteName': '瓴犀',
......
src/locales/ko_KR/repositories.ts → src/locales/ko-KR/repositories.ts
View file @ f41c8893
......@@ -14,11 +14,11 @@ export default {
'repositories.columns.option.button' : '재고 조달',
'repositories.modalSchema.type.1' : '창고 재고 직접 수정(기본값)',
'repositories.modalSchema.type.2' : '비율에 따라 창고 재고를 조정하다.',
'repositories.modalSchema.inventoryAmount' : ''재고품', '창고 재고를 입력한 후, 확인을 클릭하여 새로 입력한 창고 재고로 원래의 창고 재고를 대량으로 조정합니다'',
'repositories.modalSchema.inventoryAmount' : "'재고품', '창고 재고를 입력한 후, 확인을 클릭하여 새로 입력한 창고 재고로 원래의 창고 재고를 대량으로 조정합니다'",
'repositories.modalSchema.inventoryAmount.placeholder' : '창고 재고를 기입해 주십시오',
'repositories.modalSchema.inventoryAmount.message.1' : '창고 재고를 기입해 주십시오',
'repositories.modalSchema.inventoryAmount.message.2' : '소수점 세 자리만',
'repositories.modalSchema.inventoryRate' : ''창고 재고 조정 비율', '백분율을 입력하면 원래 창고의 재고에 따라 백분율을 증가하거나 감소할 수 있습니다. 감소는 마이너스를 입력하십시오.'',
'repositories.modalSchema.inventoryRate' : "'창고 재고 조정 비율', '백분율을 입력하면 원래 창고의 재고에 따라 백분율을 증가하거나 감소할 수 있습니다. 감소는 마이너스를 입력하십시오.'",
'repositories.modalSchema.inventoryRate.placeholder' : '창고 재고 조정 비율을 기입해 주십시오',
'repositories.modalSchema.inventoryRate.message.1' : '창고 재고 조정 비율을 기입해 주십시오',
'repositories.modalSchema.inventoryRate.message.2' : '숫자를 기입하시고, 최대 3자리의 소수점을 보존하십시오',
......
src/locales/ko_KR/supplierEvaluation.ts → src/locales/ko-KR/supplierEvaluation.ts
View file @ f41c8893
......@@ -11,7 +11,7 @@ export default {
'supplierEvaluation.zhichiJPGPNGJPEG': 'JPG/PNG/JPEG 지원',
'supplierEvaluation.meizhangzuidabuchaoguo': '매 장당 최대 10M 이하, 사이즈 제한 없음',
'supplierEvaluation.zuidashuliangxianzhi4': '최대 수량 4장 제한',
'supplierEvaluation.ninhaiyouweibaocunde': ''아직 저장하지 않은 내용이 있습니다. 떠나시겠습니까?'',
'supplierEvaluation.ninhaiyouweibaocunde': "'아직 저장하지 않은 내용이 있습니다. 떠나시겠습니까?'",
'supplierEvaluation.fabu': '발포',
'supplierEvaluation.dingdanhao': '주문 번호',
'supplierEvaluation.waibuzhuangtai': '외부 상태',
......
src/pages/afterService/constants.ts
View file @ f41c8893
......@@ -330,6 +330,10 @@ export const RETURN_GOODS_OUTER_DELIVERY_CONTRACT = 43;
*/
export const RETURN_GOODS_MANUAL_DELIVERY_CONTRACT = 44;
/**
* 售后退货简单流程-平台审核
*/
export const RETURN_GOODS_SIMPLE_PLATFORM = 63;
/**
* 售后换货默认流程-合同订单
*/
export const EXCHANGE_GOODS_OUTER_DELIVERY_CONTRACT = 45;
......
src/pages/afterService/returnApplication/returnPrDeliver/verify.tsx
View file @ f41c8893
......@@ -12,7 +12,7 @@ import { postAsReturnGoodsManualReturnDeliveryGoods } from '@/services/AfterServ
import { SettingOutlined } from '@ant-design/icons';
import moment from 'moment';
import { usePageStatus } from '@/hooks/usePageStatus';
import { RETURN_GOODS_MANUAL_DELIVERY, RETURN_GOODS_MANUAL_DELIVERY_CONTRACT } from '../../constants';
import { RETURN_GOODS_MANUAL_DELIVERY, RETURN_GOODS_MANUAL_DELIVERY_CONTRACT, RETURN_GOODS_SIMPLE_PLATFORM } from '../../constants';
import DetailInfo from '../components/DetailInfo';
import ReturnDeliverDrawer, { ValuesType } from '../../components/DeliverDrawer';
......@@ -68,7 +68,13 @@ const ReturnPrDeliverVerify: React.FC = () => {
id={id}
headExtra={info => (
<>
{(info && (info.taskType === RETURN_GOODS_MANUAL_DELIVERY || info.taskType === RETURN_GOODS_MANUAL_DELIVERY_CONTRACT)) && (
{(
info
&& (
info.taskType === RETURN_GOODS_MANUAL_DELIVERY
|| info.taskType === RETURN_GOODS_MANUAL_DELIVERY_CONTRACT
|| info.taskType === RETURN_GOODS_SIMPLE_PLATFORM
)) && (
<Button
type="default"
icon={<SettingOutlined />}
......
src/pages/transaction/marketingAbility/merchantCoupon/common/schemas/verify.tsx
View file @ f41c8893
......@@ -57,7 +57,7 @@ const schema: ISchema = {
},
},
},
'[startTime2, endTime2]': {
'[effectiveTimeStart, effectiveTimeEnd]': {
type: 'object',
'x-component': 'RangePicker',
'x-component-props': {
......
src/pages/transaction/marketingAbility/merchantCoupon/merchantCouponQuery/schema.ts
View file @ f41c8893
......@@ -51,7 +51,7 @@ export const querySchema: ISchema = {
type: 'string',
'x-component': 'RangePicker',
'x-component-props': {
placeholder: [intl.formatMessage({ id: 'merchantCoupon.giveCouponStartTime' }) + ',' + intl.formatMessage({ id: 'merchantCoupon.giveCouponEndTime' })],
placeholder: [intl.formatMessage({ id: 'merchantCoupon.giveCouponStartTime' }), intl.formatMessage({ id: 'merchantCoupon.giveCouponEndTime' })],
allowEmpty: [true, true],
},
},
......
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