diff --git a/application/views/FinalProduct.php b/application/views/FinalProduct.php index 4efdeda0..700dc167 100644 --- a/application/views/FinalProduct.php +++ b/application/views/FinalProduct.php @@ -970,7 +970,7 @@ $(function() { if(!empty($inv_final_product)) { foreach ($inv_final_product as $mat): - $options[$mat->product_id] =$mat->product_id.' '.' - '.' '.$mat->product_name; + $options[$mat->product_id] =$mat->product_id.' '.' - '.' '.$mat->product_name.' '.' ('.' '.$mat->product_description.')'; //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName; diff --git a/application/views/editFinalProduct.php b/application/views/editFinalProduct.php index 023fdc18..7b6f6532 100644 --- a/application/views/editFinalProduct.php +++ b/application/views/editFinalProduct.php @@ -108,7 +108,7 @@ $(function() { if($finProduct==$material->product_id) { - $options1[$material->product_id] = $material->product_id.' '.' - '.' '.$material->product_name; + $options1[$material->product_id] = $material->product_id.' '.' - '.' '.$material->product_name.' '.' ('.' '.$material->product_description.')'; } } @@ -1007,7 +1007,7 @@ $(function() { if(!empty($inv_final_product)) { foreach ($inv_final_product as $mat): - $options[$mat->product_id] =$mat->product_id.' '.' - '.' '.$mat->product_name; + $options[$mat->product_id] =$mat->product_id.' '.' - '.' '.$mat->product_name.' '.' ('.' '.$mat->product_description.')'; //$RL[$SID->ReqNo] = $SID->ReqNo.' '.' - '.' '.$SID->DepartmentName; @@ -1435,11 +1435,20 @@ $("#EditItem").on("shown.bs.modal", function(e) userid = $(e.relatedTarget).data('userid'); var tr= document.getElementById(userid); -//alert(userid) + + var materialcode = $('#rawmaterialcode'+userid).val(); + var materialname = $('#rawmaterialname'+userid).val(); + var rawtext = materialcode+'-'+materialname; + + var supid= $('#rawSupplierID'+userid).val(); + var supname = $('#rawSuppliername'+userid).val(); + + var rawsuppliertxt = supid+'-'+supname; + //document.getElementById('rawmateriallist'+userid).innerHTML = editroot; - $('#Editrawmaterialcode').val($('#rawmaterialcode'+userid).val()); - $('#EditrawSupplier').val($('#rawSupplierID'+userid).val()); + $('#Editrawmaterialcode').val(rawtext); + $('#EditrawSupplier').val(rawsuppliertxt); $('#Editrawqty').val($('#rawQty'+userid).val()); $('#Editrawprice').val($('#rawprice'+userid).val()); @@ -1563,8 +1572,17 @@ $("#EditRootCausemodal").on("shown.bs.modal", function(e) //alert(JSON.stringify(e)) rootuserid = $(e.relatedTarget).data('userid'); var tr= document.getElementById(rootuserid); - $('#Editconsumaterialcode').val($('#consumematerialcode'+rootuserid).val()); - $('#EditconsuSupplier').val($('#consumeSupplierID'+rootuserid).val()); + + var rootmaterialid = $('#consumematerialcode'+rootuserid).val(); + var rootmaterialname =$('#consumematerialname'+rootuserid).val(); + var materialval = rootmaterialid+'-'+rootmaterialname; + + var rootsupid = $('#consumeSupplierID'+rootuserid).val(); + var rootsupname = $('#consumeSuppliername'+rootuserid).val(); + var rootsupnameval = rootsupid+'-'+rootsupname; + + $('#Editconsumaterialcode').val(materialval); + $('#EditconsuSupplier').val(rootsupnameval); $('#Editconsuqty').val($('#consumeQty'+rootuserid).val()); $('#Editconsuprice').val($('#consumeprice'+rootuserid).val()); @@ -1667,9 +1685,18 @@ $("#EditCounter").on("shown.bs.modal", function(e) cuserid = $(e.relatedTarget).data('userid'); var tr= document.getElementById(cuserid); + + + var cmaterialid = $('#packmaterialcode'+cuserid).val(); + var cmaterialname =$('#packmaterialname'+cuserid).val(); + var cmaterialval = cmaterialid+'-'+cmaterialname; + + var csupid = $('#packSupplierID'+cuserid).val(); + var csupname = $('#packSuppliernamee'+cuserid).val(); + var csupnameval = csupid+'-'+csupname; - $('#Editpackumaterialcode').val($('#packmaterialcode'+cuserid).val()); - $('#EditpackSupplier').val($('#packSupplierID'+cuserid).val()); + $('#Editpackumaterialcode').val(cmaterialval); + $('#EditpackSupplier').val(csupnameval); $('#Editpackqty').val($('#packQty'+cuserid).val()); $('#Editpackprice').val($('#packprice'+cuserid).val()); @@ -1756,8 +1783,12 @@ $("#EditCoproduct").on("shown.bs.modal", function(e) cuserid = $(e.relatedTarget).data('userid'); var tr= document.getElementById(cuserid); + + var copproductid = $('#Copmaterialcode'+cuserid).val(); + var copproductname = $('#Copmaterialname'+cuserid).val(); + var cproductval = copproductid+'-'+copproductname; - $('#Editcoproduct_id').val($('#Copmaterialcode'+cuserid).val()); + $('#Editcoproduct_id').val(cproductval); $('#EditCopDate').val($('#CopDate'+cuserid).val()); $('#EditCoqty').val($('#CopQty'+cuserid).val()); $('#EditCoprice').val($('#Copprice'+cuserid).val());