From e15f4679a2b71a186aa9e87cd49b4ab9c249cc63 Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 08 八月 2023 18:20:47 +0800
Subject: [PATCH] 新品收货样式、颜色、显示margin

---
 force-app/main/default/pages/ReceivingNoteWaitingReceipt.page |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
index bfe496e..1ad77b2 100644
--- a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
+++ b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
@@ -12,7 +12,7 @@
         table.list .col_Fixture_Model_No_F__c {width:100px;}
         table.list .col_Fixture_Model_Name_F__c {width:100px;}
         table.list .col_Fixture_Arrival_Process__c {width:100px;}
-        table.list .col_Fixture_Arrival_Product__c {width:100px;}
+        table.list .col_Fixture_Arrival_Product__c {width:200px;}
         table.list .col_Internal_Asset_number_key__c {width:100px;}
         table.list .col_SerialNumber_Origin__c {width:100px;}
         table.list .col_SerialNumber__c {width:100px;}
@@ -21,7 +21,7 @@
         table.list .col_Packing_list_Fixture_F__c {width:100px;}
         table.list .col_RND_Status__c {width:100px;}
         table.list .col_Asset_loaner_category_F__c {width:100px;}
-        table.list .col_EquipmentSet_Managment_Code__c {width:200px;}
+        table.list .col_EquipmentSet_Managment_Code__c {width:100px;}
         table.list .col_Salesdepartment__c {width:100px;}
         table.list .col_SalesProvince__c {width:100px;}
         table.list .col_Product_category__c {width:100px;}
@@ -86,12 +86,22 @@
                     result = sforce.connection.update([es]);
                 // 瀛樺湪qr鏃讹紝缁戝埌娓呭崟涓�
                 } else {
-                    
                     var records = record.getArray("records");
+                    var version = new sforce.SObject("ContentVersion");
+                    version = sforce.connection.query("select Id,ContentDocumentId from ContentVersion where ContentDocumentId = \'" + records[0].id + "\'");
+                    version = version.getArray("records"); 
+                    
                     var es = new sforce.SObject("ReceivingNote__c");
                     es.Id = "{!pageB.rn.Id}";
-                    es.QRId__c = records[0].Id;
+                    es.QRId__c = versionResult[0].id;
                     result = sforce.connection.update([es]);
+                    
+                    
+                    // var records = record.getArray("records");
+                    // var es = new sforce.SObject("ReceivingNote__c");
+                    // es.Id = "{!pageB.rn.Id}";
+                    // es.QRId__c = records[0].Id;
+                    // result = sforce.connection.update([es]);
                 }
 
             }
@@ -769,7 +779,7 @@
                                     </apex:outputPanel>
 
                                     <!-- <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!info.value != 'Asset_loaner_category__c' || var.haveAsset }" style="{!IF('Fixture_Arrival_Product__c' == info.value, 'width:70%;', '')}"/> -->
-                                    <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!(info.value != 'Asset_loaner_category__c' || var.haveAsset) && ((var.rnd['Asset_loaner_category_F__c'] =='鍥哄畾璧勪骇' && info.value != 'unknow_serial_NO_product__c' && info.value != 'Manage_type__c') || var.rnd['Asset_loaner_category_F__c'] !='鍥哄畾璧勪骇')}" style="{!IF('Fixture_Arrival_Product__c' == info.value, 'width:70%;', '')}"/>
+                                    <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" rendered="{!(info.value != 'Asset_loaner_category__c' || var.haveAsset) && ((var.rnd['Asset_loaner_category_F__c'] =='鍥哄畾璧勪骇' && info.value != 'unknow_serial_NO_product__c' && info.value != 'Manage_type__c') || var.rnd['Asset_loaner_category_F__c'] !='鍥哄畾璧勪骇')}" style="{!IF('Fixture_Arrival_Product__c' == info.value || 'EquipmentSet_Managment_Code__c' == info.value, 'width:90%;', '')}"/>
                                     <!-- 20210804 ljh add id -->
                                 <!-- update by rentx 20210727 end 鏂板搧鏀惰揣_闆嗕腑澶囧搧_寤虹珛鏁版嵁閫昏緫闄愬埗  -->
                                 </apex:outputPanel>

--
Gitblit v1.9.1