perbaikan modal
This commit is contained in:
AJISETIAJI
@@ -236,9 +236,16 @@
|
||||
let showAcknowledgedModal = false;
|
||||
let acknowledgedForm = {
|
||||
po_number: "",
|
||||
reject_comment: "",
|
||||
acknowledged: "",
|
||||
acknowledged_by: "",
|
||||
acknowledged_date: "",
|
||||
po_remark: "",
|
||||
approved_quantity: 0,
|
||||
approved_vendor: "",
|
||||
approved_price: 0,
|
||||
po_item: "",
|
||||
total_approved_order_amount: 0,
|
||||
};
|
||||
let selectedVillaId: string | null = null;
|
||||
let searchTerm: string = "";
|
||||
@@ -269,15 +276,29 @@
|
||||
let receivedForm = {
|
||||
po_number: "",
|
||||
received: "",
|
||||
reject_comment: "",
|
||||
received_by: "",
|
||||
received_date: "",
|
||||
approved_quantity: 0,
|
||||
approved_vendor: "",
|
||||
approved_price: 0,
|
||||
po_item: "",
|
||||
total_approved_order_amount: 0,
|
||||
|
||||
};
|
||||
let showCompletedModal = false;
|
||||
let completedForm = {
|
||||
po_number: "",
|
||||
completed: "",
|
||||
reject_comment: "",
|
||||
completed_by: "",
|
||||
completed_date: "",
|
||||
po_remark: "",
|
||||
approved_quantity: 0,
|
||||
approved_vendor: "",
|
||||
approved_price: 0,
|
||||
po_item: "",
|
||||
total_approved_order_amount: 0,
|
||||
};
|
||||
let showModal = false;
|
||||
let isEditing = false;
|
||||
@@ -402,6 +423,12 @@
|
||||
acknowledged: row.acknowledged ? "acknowledged" : "reject",
|
||||
acknowledged_by: currentUserId,
|
||||
acknowledged_date: new Date().toISOString().split("T")[0],
|
||||
po_remark: row.po_remark || "",
|
||||
approved_quantity: row.approved_quantity || 0,
|
||||
approved_vendor: row.approved_vendor || "",
|
||||
approved_price: row.approved_price || 0,
|
||||
po_item: row.po_item || "",
|
||||
total_approved_order_amount: row.total_approved_order_amount || 0,
|
||||
};
|
||||
|
||||
showAcknowledgedModal = true;
|
||||
@@ -415,6 +442,11 @@
|
||||
received: row.received ? "received" : "reject",
|
||||
received_by: currentUserId,
|
||||
received_date: new Date().toISOString().split("T")[0],
|
||||
approved_quantity: row.approved_quantity || 0,
|
||||
approved_vendor: row.approved_vendor || "",
|
||||
approved_price: row.approved_price || 0,
|
||||
po_item: row.po_item || "",
|
||||
total_approved_order_amount: row.total_approved_order_amount || 0,
|
||||
};
|
||||
|
||||
showReceivedModal = true;
|
||||
@@ -428,8 +460,17 @@
|
||||
completed: row.completed ? "completed" : "reject",
|
||||
completed_by: currentUserId,
|
||||
completed_date: new Date().toISOString().split("T")[0],
|
||||
po_remark: row.po_remark || "",
|
||||
approved_quantity: row.approved_quantity || 0,
|
||||
approved_vendor: row.approved_vendor || "",
|
||||
approved_price: row.approved_price || 0,
|
||||
po_item: row.po_item || "",
|
||||
total_approved_order_amount: row.total_approved_order_amount || 0,
|
||||
};
|
||||
|
||||
console.log("Opening completed modal with form:", completedForm);
|
||||
|
||||
|
||||
showCompletedModal = true;
|
||||
}
|
||||
// Update total amount in prepared form
|
||||
@@ -2150,6 +2191,69 @@
|
||||
<option value="acknowledged">Acknowledged</option>
|
||||
<option value="reject">Reject</option>
|
||||
</select>
|
||||
<!-- Reject Comment -->
|
||||
{#if acknowledgedForm.acknowledged === "reject"}
|
||||
<label>Reject Comment</label>
|
||||
<textarea
|
||||
bind:value={acknowledgedForm.reject_comment}
|
||||
class="w-full border p-2"
|
||||
rows="3"
|
||||
placeholder="Enter reason for rejection..."
|
||||
></textarea>
|
||||
{/if}
|
||||
|
||||
<!-- PO Item -->
|
||||
{#if approvalForm.po_item}
|
||||
<label>PO Item</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.po_item}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Quantity -->
|
||||
{#if approvalForm.approved_quantity != null}
|
||||
<label>Approved Quantity</label>
|
||||
<input
|
||||
type="number"
|
||||
value={approvalForm.approved_quantity}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Price -->
|
||||
{#if approvalForm.approved_price != null}
|
||||
<label>Approved Price</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.approved_price}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Total Approved Order Amount -->
|
||||
{#if approvalForm.total_approved_order_amount != null}
|
||||
<label>Total Approved Order Amount</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.total_approved_order_amount}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Vendor -->
|
||||
{#if approvalForm.approved_vendor}
|
||||
<label>Approved Vendor</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.approved_vendor}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Hidden fields -->
|
||||
<input type="hidden" value={acknowledgedForm.acknowledged_by} />
|
||||
@@ -2205,6 +2309,70 @@
|
||||
<option value="reject">Reject</option>
|
||||
</select>
|
||||
|
||||
<!-- Reject Comment -->
|
||||
{#if completedForm.completed === "reject"}
|
||||
<label>Reject Comment</label>
|
||||
<textarea
|
||||
bind:value={completedForm.reject_comment}
|
||||
class="w-full border p-2"
|
||||
rows="3"
|
||||
placeholder="Enter reason for rejection..."
|
||||
></textarea>
|
||||
{/if}
|
||||
|
||||
<!-- PO Item -->
|
||||
{#if approvalForm.po_item}
|
||||
<label>PO Item</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.po_item}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Quantity -->
|
||||
{#if approvalForm.approved_quantity != null}
|
||||
<label>Approved Quantity</label>
|
||||
<input
|
||||
type="number"
|
||||
value={approvalForm.approved_quantity}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Price -->
|
||||
{#if approvalForm.approved_price != null}
|
||||
<label>Approved Price</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.approved_price}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Total Approved Order Amount -->
|
||||
{#if approvalForm.total_approved_order_amount != null}
|
||||
<label>Total Approved Order Amount</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.total_approved_order_amount}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Vendor -->
|
||||
{#if approvalForm.approved_vendor}
|
||||
<label>Approved Vendor</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.approved_vendor}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Hidden -->
|
||||
<input type="hidden" value={completedForm.completed_by} />
|
||||
<input type="hidden" value={completedForm.completed_date} />
|
||||
@@ -2255,6 +2423,59 @@
|
||||
<option value="reject">Reject</option>
|
||||
</select>
|
||||
|
||||
<!-- PO Item -->
|
||||
{#if approvalForm.po_item}
|
||||
<label>PO Item</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.po_item}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Quantity -->
|
||||
{#if approvalForm.approved_quantity != null}
|
||||
<label>Approved Quantity</label>
|
||||
<input
|
||||
type="number"
|
||||
value={approvalForm.approved_quantity}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Price -->
|
||||
{#if approvalForm.approved_price != null}
|
||||
<label>Approved Price</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.approved_price}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Total Approved Order Amount -->
|
||||
{#if approvalForm.total_approved_order_amount != null}
|
||||
<label>Total Approved Order Amount</label>
|
||||
<CurrencyInput
|
||||
value={approvalForm.total_approved_order_amount}
|
||||
disabled
|
||||
className="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Approved Vendor -->
|
||||
{#if approvalForm.approved_vendor}
|
||||
<label>Approved Vendor</label>
|
||||
<input
|
||||
type="text"
|
||||
value={approvalForm.approved_vendor}
|
||||
disabled
|
||||
class="w-full border p-2 bg-gray-100"
|
||||
/>
|
||||
{/if}
|
||||
|
||||
<!-- Hidden -->
|
||||
<input type="hidden" value={receivedForm.received_by} />
|
||||
<input type="hidden" value={receivedForm.received_date} />
|
||||
|
||||
Reference in New Issue
Block a user