qcast3/onsitesurvey
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'feature/survey' (#99) from feature/survey into dev

Browse Source 
Reviewed-on: #99
This commit is contained in:
seul 2025-07-10 10:28:27 +09:00
commit 8a1ffc6076
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/survey-sale/detail/ButtonForm.tsx
View File

@ -233,7 +233,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
<ListButton /> <ListButton />
{(permissions.isWriter || permissions.isSubmiter || (permissions.isReceiver && isSubmit)) && <EditButton setMode={setMode} disabled={buttonDisabled} />} {(permissions.isWriter || permissions.isSubmiter || (permissions.isReceiver && isSubmit)) && <EditButton setMode={setMode} disabled={buttonDisabled} />}
{(permissions.isWriter || (permissions.isReceiver && isSubmit)) && <DeleteButton handleDelete={handleDelete} disabled={buttonDisabled} />} {(permissions.isWriter || (permissions.isReceiver && isSubmit)) && <DeleteButton handleDelete={handleDelete} disabled={buttonDisabled} />}
{!isSubmit && permissions.isSubmiter && <SubmitButton handleSubmit={handleSubmit} disabled={buttonDisabled} />} {!isSubmit && permissions.isSubmiter && !data.basic.srlNo?.includes('一時保存') && <SubmitButton handleSubmit={handleSubmit} disabled={buttonDisabled} />}
</div> </div>
</div> </div>
)} )}
@ -246,7 +246,7 @@ export default function ButtonForm({ mode, setMode, data }: ButtonFormProps) {
<div className="sale-form-btn-wrap"> <div className="sale-form-btn-wrap">
<div className="btn-flex-wrap"> <div className="btn-flex-wrap">
<ListButton /> <ListButton />
<TempButton handleSave={() => handleSave(true)} disabled={buttonDisabled} /> {(data.basic.srlNo?.includes('一時保存') || mode === 'CREATE') && <TempButton handleSave={() => handleSave(true)} disabled={buttonDisabled} />}
<SaveButton handleSave={() => handleSave(false)} disabled={buttonDisabled} /> <SaveButton handleSave={() => handleSave(false)} disabled={buttonDisabled} />
</div> </div>
</div> </div>

8
src/components/survey-sale/detail/DataTable.tsx
View File

@ -32,13 +32,7 @@ export default function DataTable({ surveyDetail }: { surveyDetail: SurveyBasicI
<tbody> <tbody>
<tr> <tr>
<th>登録番号</th> <th>登録番号</th>
{surveyDetail?.srlNo?.startsWith('一時保存') ? ( <td>{surveyDetail?.srlNo}</td>
<td>
<span className="text-red-500">仮保存</span>
</td>
) : (
<td>{surveyDetail?.srlNo}</td>
)}
</tr> </tr>
<tr> <tr>
<th>登録日</th> <th>登録日</th>