Resolved merge conflicts

This commit is contained in:
Senthamilselvi 2025-11-03 13:25:47 +05:30
commit 7744f9c31e
2 changed files with 6 additions and 8 deletions

View File

@ -83,7 +83,7 @@ export const SurveyStatus = ({ data = null, loading = false, error = '' }) => {
: 'Complete your quarterly industrial production data submission'; : 'Complete your quarterly industrial production data submission';
return ( return (
<section className="max-w-[1280px] mx-auto px-0"> <section className="max-w-[1340px] mx-auto px-0">
<div className="p-6"> <div className="p-6">
{loading ? ( {loading ? (
<div className="text-center text-gray-500 text-sm py-10">Loading survey status...</div> <div className="text-center text-gray-500 text-sm py-10">Loading survey status...</div>

View File

@ -698,17 +698,15 @@ const ProductData = ({
onChange={(e) => updateProductField(p.id, 'aprQuantity', e.target.value)} onChange={(e) => updateProductField(p.id, 'aprQuantity', e.target.value)}
/> />
</div> </div>
<div className="flex flex-col whitespace-nowrap"> <div>
<label className="block text-sm font-medium text-gray-700 mb-1 whitespace-nowrap"> <label className="block text-sm font-medium text-gray-700 mb-1">May Qty<span className="text-red-600">*</span></label>
May Cost (AED)<span className="text-red-600">*</span>
</label>
<Input <Input
className="w-28" // Slightly wider input for balance className="w-24"
type="number" type="number"
required required
placeholder="Enter" placeholder="Enter"
value={p.mayCost || ''} value={p.mayQuantity || ''}
onChange={(e) => updateProductField(p.id, 'mayCost', e.target.value)} onChange={(e) => updateProductField(p.id, 'mayQuantity', e.target.value)}
/> />
</div> </div>