Merge pull request 'fix: 일본어 텍스트 수정' (#105) from feature/ja-text into dev
Reviewed-on: #105
This commit is contained in:
commit
508c06e1cd
@ -136,7 +136,8 @@ export async function POST(request: Request) {
|
||||
} else {
|
||||
finalResult = {
|
||||
code: 400,
|
||||
message: 'Login is Failed!!',
|
||||
/** 로그인에 실패했습니다. 아이디와 비밀번호를 확인해 주세요. */
|
||||
message: 'ログインに失敗しました。 IDとパスワードをご確認ください。',
|
||||
result: {},
|
||||
}
|
||||
}
|
||||
|
||||
@ -51,50 +51,52 @@ export async function POST(request: Request) {
|
||||
AND
|
||||
u.password = ?
|
||||
`
|
||||
// const sql = 'SELECT * FROM M_USER'
|
||||
const data = (await executeQuery(sql, [loginId, pwd])) as any[]
|
||||
console.log('🚀 ~ POST ~ data:', data)
|
||||
|
||||
if (data.length > 0) {
|
||||
console.log('start session edit!')
|
||||
session.langCd = null
|
||||
session.currPage = null
|
||||
session.rowCount = null
|
||||
session.startRow = null
|
||||
session.endRow = null
|
||||
session.compCd = null
|
||||
session.agencyStoreId = null
|
||||
session.storeId = null
|
||||
session.storeNm = null
|
||||
session.userId = data[0].user_login_id
|
||||
session.category = data[0].supplier_name
|
||||
session.userNm = `${data[0].user_sei} ${data[0].user_mei}`
|
||||
session.userNmKana = `${data[0].user_sei_kana} ${data[0].user_mei_kana}`
|
||||
session.telNo = data[0].tel
|
||||
session.fax = data[0].fax
|
||||
session.email = data[0].user_login_id
|
||||
session.lastEditUser = null
|
||||
session.storeGubun = null
|
||||
session.pwCurr = null
|
||||
session.pwdInitYn = null
|
||||
session.apprStatCd = null
|
||||
session.loginFailCnt = null
|
||||
session.loginFailMinYn = null
|
||||
session.priceViewStatCd = null
|
||||
session.groupId = null
|
||||
session.storeLvl = null
|
||||
session.custCd = null
|
||||
session.builderId = data[0].user_seko_id
|
||||
session.builderNo = data[0].user_seko_id
|
||||
session.builderNm = data[0].supplier_name
|
||||
session.isLoggedIn = true
|
||||
session.role = 'Partner'
|
||||
|
||||
console.log('end session edit!')
|
||||
|
||||
await session.save()
|
||||
if (data.length === 0) {
|
||||
/** 로그인에 실패했습니다. 아이디와 비밀번호를 확인해 주세요.*/
|
||||
return NextResponse.json({ code: 400, message: 'ログインに失敗しました。 IDとパスワードをご確認ください。' })
|
||||
}
|
||||
|
||||
console.log('start session edit!')
|
||||
session.langCd = null
|
||||
session.currPage = null
|
||||
session.rowCount = null
|
||||
session.startRow = null
|
||||
session.endRow = null
|
||||
session.compCd = null
|
||||
session.agencyStoreId = null
|
||||
session.storeId = null
|
||||
session.storeNm = null
|
||||
session.userId = data[0].user_login_id
|
||||
session.category = data[0].supplier_name
|
||||
session.userNm = `${data[0].user_sei} ${data[0].user_mei}`
|
||||
session.userNmKana = `${data[0].user_sei_kana} ${data[0].user_mei_kana}`
|
||||
session.telNo = data[0].tel
|
||||
session.fax = data[0].fax
|
||||
session.email = data[0].user_login_id
|
||||
session.lastEditUser = null
|
||||
session.storeGubun = null
|
||||
session.pwCurr = null
|
||||
session.pwdInitYn = null
|
||||
session.apprStatCd = null
|
||||
session.loginFailCnt = null
|
||||
session.loginFailMinYn = null
|
||||
session.priceViewStatCd = null
|
||||
session.groupId = null
|
||||
session.storeLvl = null
|
||||
session.custCd = null
|
||||
session.builderId = data[0].user_seko_id
|
||||
session.builderNo = data[0].user_seko_id
|
||||
session.builderNm = data[0].supplier_name
|
||||
session.isLoggedIn = true
|
||||
session.role = 'Partner'
|
||||
|
||||
console.log('end session edit!')
|
||||
|
||||
await session.save()
|
||||
|
||||
// qsp 유저 데이터 모양과 맞춰서 변환
|
||||
const result = {
|
||||
LANG_CD: null,
|
||||
@ -104,8 +106,8 @@ export async function POST(request: Request) {
|
||||
END_ROW: null,
|
||||
COMP_CD: null,
|
||||
AGENCY_STORE_ID: null,
|
||||
STORE_ID: data[0].supplier_code,
|
||||
STORE_NM: data[0].supplier_name,
|
||||
STORE_ID: null,
|
||||
STORE_NM: null,
|
||||
USER_ID: data[0].user_login_id,
|
||||
CATEGORY: data[0].supplier_name,
|
||||
USER_NM: `${data[0].user_sei} ${data[0].user_mei}`,
|
||||
|
||||
@ -78,7 +78,8 @@ export default function Login() {
|
||||
|
||||
const validateLogin = () => {
|
||||
if (account.loginId === '' || account.pwd === '') {
|
||||
alert('Please enter your ID and password.')
|
||||
/** 아이디와 비밀번호를 입력해 주세요.*/
|
||||
alert('IDとパスワードをご入力ください。')
|
||||
return false
|
||||
}
|
||||
return true
|
||||
|
||||
@ -134,7 +134,7 @@ export default function SurveySalePdf({ survey }: { survey: SurveyBasicInfo }) {
|
||||
<Page size="A4" style={styles.page}>
|
||||
{/* Header */}
|
||||
<View style={styles.header}>
|
||||
<Text style={styles.title}>HWJ 現地調査シート1/2</Text>
|
||||
<Text style={styles.title}>HWJ 現地調査シート</Text>
|
||||
<View style={styles.headerRight}>
|
||||
<View style={styles.headerLeft}>
|
||||
<Text style={styles.headerLabel}>現地明登施工店名</Text>
|
||||
|
||||
@ -110,7 +110,8 @@ export default function ZipCodePopup() {
|
||||
{addressInfo?.length === 0 && (
|
||||
<tr>
|
||||
<td colSpan={3} className="al-c">
|
||||
<div className="nodata">조회된 데이터가 없습니다.</div>
|
||||
{/* 조회된 데이터가 없습니다.*/}
|
||||
<div className="nodata">照会されたデータがありません。</div>
|
||||
</td>
|
||||
</tr>
|
||||
)}
|
||||
|
||||
@ -75,6 +75,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba
|
||||
<div className="sale-frame">
|
||||
<div className="data-form-wrap">
|
||||
<div className="data-input-form-bx">
|
||||
{/* 현지 조사일*/}
|
||||
<div className="data-input-form-tit">現地調査日</div>
|
||||
{['CREATE', 'EDIT'].includes(mode as 'CREATE' | 'EDIT') ? (
|
||||
<div className="date-input">
|
||||
@ -90,7 +91,7 @@ export default function BasicForm({ basicInfo, setBasicInfo, mode, session }: Ba
|
||||
/>
|
||||
</div>
|
||||
) : (
|
||||
<input type="text" className="input-frame" disabled defaultValue={basicInfo?.investigationDate?.toString()} />
|
||||
<input type="text" className="input-frame" readOnly defaultValue={basicInfo?.investigationDate?.toString()} />
|
||||
)}
|
||||
</div>
|
||||
<div className="data-input-form-bx">
|
||||
|
||||
@ -62,7 +62,7 @@ export default function Main() {
|
||||
</div>
|
||||
<div className="grid-bx-body">
|
||||
<div className="grid-bx-body-tit">お問い合わせ登録</div>
|
||||
<div className="grid-bx-body-txt">新規お問い合わせの 作成</div>
|
||||
<div className="grid-bx-body-txt">新規お問い合わせの作成</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -100,7 +100,7 @@ export default function Header() {
|
||||
}}
|
||||
>
|
||||
<div className="side-swiper-icon icon02"></div>
|
||||
<div className="side-swiper-infor">私は作成したお問 い合わせ</div>
|
||||
<div className="side-swiper-infor">私は作成したお問い合わせ</div>
|
||||
</div>
|
||||
</SwiperSlide>
|
||||
<SwiperSlide>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user