fix: resolve all TypeScript build errors after Setting branch merge
This commit is contained in:
@@ -76,9 +76,9 @@ export function renderSwList(container: HTMLElement) {
|
||||
const corp = corpSelect ? corpSelect.value : '';
|
||||
|
||||
const filtered = fullList.filter(asset => {
|
||||
const matchKeyword = !keyword || (asset[ASSET_SCHEMA.PRODUCT.key] || '').toLowerCase().includes(keyword) || (asset.부서 || '').toLowerCase().includes(keyword);
|
||||
const matchKeyword = !keyword || ((asset as any)[ASSET_SCHEMA.PRODUCT.key] || '').toLowerCase().includes(keyword) || (asset.부서 || '').toLowerCase().includes(keyword);
|
||||
const matchField = !field || asset.분야 === field;
|
||||
const matchCorp = !corp || asset[ASSET_SCHEMA.CORP.key] === corp;
|
||||
const matchCorp = !corp || (asset as any)[ASSET_SCHEMA.CORP.key] === corp;
|
||||
return matchKeyword && matchField && matchCorp;
|
||||
});
|
||||
|
||||
@@ -90,14 +90,14 @@ export function renderSwList(container: HTMLElement) {
|
||||
|
||||
filtered.forEach((asset, idx) => {
|
||||
const assigned = state.masterData.swUsers.filter(u => u.sw_id === asset.id).length;
|
||||
const qty = typeof asset[ASSET_SCHEMA.QTY.key] === 'number' ? asset[ASSET_SCHEMA.QTY.key] : parseInt(asset[ASSET_SCHEMA.QTY.key]||'0', 10);
|
||||
const qty = typeof (asset as any)[ASSET_SCHEMA.QTY.key] === 'number' ? (asset as any)[ASSET_SCHEMA.QTY.key] : parseInt((asset as any)[ASSET_SCHEMA.QTY.key]||'0', 10);
|
||||
const avail = qty - assigned;
|
||||
|
||||
let statusBadge = '';
|
||||
if (isSub) {
|
||||
let isExpired = false;
|
||||
if (asset[ASSET_SCHEMA.EXPIRY.key]) {
|
||||
const parts = asset[ASSET_SCHEMA.EXPIRY.key].split('~');
|
||||
if ((asset as any)[ASSET_SCHEMA.EXPIRY.key]) {
|
||||
const parts = (asset as any)[ASSET_SCHEMA.EXPIRY.key].split('~');
|
||||
const endDateStr = parts[parts.length - 1].trim().replace(/\./g, '-');
|
||||
const endDate = new Date(endDateStr);
|
||||
if (!isNaN(endDate.getTime())) {
|
||||
@@ -117,12 +117,12 @@ export function renderSwList(container: HTMLElement) {
|
||||
<td style="text-align:center;">${idx+1}</td>
|
||||
<td style="text-align:center;">${statusBadge}</td>
|
||||
<td style="text-align:center;">${asset.분야||''}</td>
|
||||
<td style="text-align:center;">${asset[ASSET_SCHEMA.CORP.key]}</td>
|
||||
<td style="text-align:center;">${(asset as any)[ASSET_SCHEMA.CORP.key]}</td>
|
||||
<td style="text-align:center;">${asset.부서||''}</td>
|
||||
<td>${asset[ASSET_SCHEMA.PRODUCT.key]}</td>
|
||||
<td style="text-align:center;">${asset[ASSET_SCHEMA.PURCHASE_YM.key]||''}</td>
|
||||
${isSub ? `<td style="text-align:center;">${asset[ASSET_SCHEMA.EXPIRY.key]||''}</td>` : ''}
|
||||
<td style="text-align:right;">${Number(asset[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()}</td>
|
||||
<td>${(asset as any)[ASSET_SCHEMA.PRODUCT.key]}</td>
|
||||
<td style="text-align:center;">${(asset as any)[ASSET_SCHEMA.PURCHASE_YM.key]||''}</td>
|
||||
${isSub ? `<td style="text-align:center;">${(asset as any)[ASSET_SCHEMA.EXPIRY.key]||''}</td>` : ''}
|
||||
<td style="text-align:right;">${Number((asset as any)[ASSET_SCHEMA.PRICE.key]||0).toLocaleString()}</td>
|
||||
<td style="text-align:center;">${qty}</td>
|
||||
<td style="text-align:center;"><strong style="color: ${avail > 0 ? 'var(--primary-color)' : 'var(--danger)'}">${avail}</strong></td>
|
||||
`;
|
||||
|
||||
Reference in New Issue
Block a user