parent: df6be329 | 补丁 | 提交 | ignore whitespace
zhangzhengmei
2023-08-06 68ec9682be0289965f7e1494a7f7082a64576048 
合同点检报告书页面调整及课题同步
2个文件已修改
246 ■■■■■ 已修改文件
force-app/main/default/classes/OFSInsReportLayoutForVmController.cls 27 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/OFSInsReportLayoutForVm.page 219 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 force-app/main/default/classes/OFSInsReportLayoutForVmController.cls


@@ -358,6 +358,20 @@


            }




            List < Inspection_Report__c > queryIrs = [select Id, RecordType.DeveloperName, RecordType.Name, Name, Status__c, Inspection_StartTime__c, Inspection_EndTime__c, Contract__c,


            //zzm 230727 add start


            Department_Leakage_Frequency__c


            ,Original_Leakage_Device__c


            ,Leakage_Status__c


            ,Disinfectant_type__c


            ,Cleaning_Solution_Brand__c


            ,Disinfection_Method__c


            ,Escrow__c


            ,Third_Party_Maintenance__c


            ,CustomerSuggestion__c


            ,Agency__c


            ,Agency_Contact_Id__c,


            //zzm 230727 add end


            


            //add by rentx 


            Disinfectant__c, UsedMachine__c, SterilizationMethod__c, Used_ET__c, Others__c, CleaningFluid__c,Inspectup_Plan__c,Mode__c from Inspection_Report__c where Id = :pReportId];


            if (queryIrs.size() <= 0) {


@@ -535,6 +549,7 @@


        this.settingSoql = 'select Id, Name, Name_Manual__c, Next_StartHour_Page__c, Next_StartMinute_Page__c ';


        this.settingSoql += ',Next_EndHour_Page__c, Next_EndMinute_Page__c,Disinfectant__c ,UsedMachine__c ,SterilizationMethod__c ,Used_ET__c, Mode__c ';


        this.settingSoql += ',Others__c, Remarks__c, CleaningFluid__c  ';


        this.settingSoql += ',Department_Leakage_Frequency__c,Original_Leakage_Device__c,Leakage_Status__c,Disinfectant_type__c,Cleaning_Solution_Brand__c,Disinfection_Method__c,Escrow__c,Third_Party_Maintenance__c,CustomerSuggestion__c,Agency__c,Agency_Contact_Id__c ';


        // 重複な項目を追加しないためのセット


        Set < String > apiTempSet = new Set < String > ();


        apiTempSet.add('Id');


@@ -545,6 +560,18 @@


        apiTempSet.add('Next_EndHour_Page__c');


        apiTempSet.add('Next_EndMinute_Page__c');




        apiTempSet.add('Department_Leakage_Frequency__c');


        apiTempSet.add('Original_Leakage_Device__c');


        apiTempSet.add('Leakage_Status__c');


        apiTempSet.add('Disinfectant_type__c');


        apiTempSet.add('Cleaning_Solution_Brand__c');


        apiTempSet.add('Disinfection_Method__c');


        apiTempSet.add('Escrow__c');


        apiTempSet.add('Third_Party_Maintenance__c');


        apiTempSet.add('CustomerSuggestion__c');


        apiTempSet.add('Agency__c');


        apiTempSet.add('Agency_Contact_Id__c');




        for (List < String > apiList: sectionApiList) {


            for (String apiStr: apiList) {


                if (String.isBlank(apiStr) == false && apiTempSet.contains(apiStr) == false) {




 force-app/main/default/pages/OFSInsReportLayoutForVm.page


@@ -1,4 +1,4 @@


<apex:page id="Page" showHeader="false" sidebar="false" controller="OFSInsReportLayoutForVmController" applyBodyTag="false" applyHtmlTag="false" action="{!init}" >


<apex:page id="Page" showHeader="false" sidebar="false" controller="OFSInsReportLayoutForVmController" applyBodyTag="false" applyHtmlTag="false" action="{!init}" lightningStylesheets="true">


    <!-- <apex:page id="Page" showHeader="false" sidebar="false" standardcontroller="Inspection_Item__c" extensions="OFSInsReportLayoutController" applyBodyTag="false" applyHtmlTag="false" action="{!init}"> -->


    <html>




@@ -9,6 +9,8 @@


        <apex:includeScript value="{!URLFOR($Resource.connection20)}" />


        <apex:includeScript value="{!URLFOR($Resource.apex20)}" />


        <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}" />


    <apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />


    <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>


        <style type="text/css">


            table#AssetTable select {


                width: 98%;


@@ -35,6 +37,60 @@


            .dateFormat {


                display: none;


            }


        body label, .slds-vf-scope label {


            font-size: .875rem;


        }


        table.detailList th, table.detailList td{


            


            vertical-align: middle;


        }


        body .bPageBlock .detailList .labelCol label, .slds-vf-scope .bPageBlock .detailList .labelCol label {


            margin-top: -0.125rem;


        }


      


        body .bPageBlock .detailList .dataCol {


            width: auto;


        }


        


       


        table.detailList td.dataCol.last input  {


            width: 150px;


        }


        div[field-api="Reporter__c"] .lookupInput {


            margin-left: 10px;


        }


        body .detailList .dataCol input[type="text"] {


            min-width: 71px;


            margin-top: -4px;


        }


        /*table.detailList td.dataCol.last input[field-api="Responsible_Person__c"] {


            margin-left: -5px;


        }*/


        table.detailList td.dataCol input[field-api="Manual_Department__c"] {


            min-width: 373px;


        }


         table.detailList td.dataCol input[field-api="Hospital__c"] {


            min-width: 373px;


        }


      


        /*20230719 ljh start*/


        .mytable .pbSubsection .detailList tr td,.mytable .pbSubsection .detailList th td{


            height: 40px;


            line-height: 40px;


        }


        .mytable tr td label{


            margin-right: 0;


            margin-left: 5px;


        }


        body .bPageBlock .mytable .detailList .labelCol{


            width:10%;


            height: 40px;


            line-height: 40px;


        }


        .mytable .dataCol select{


            margin-bottom: 0;


        } 


        /*20230719 ljh end*/       


        </style>


        <script type="text/javascript">


            function setFocusOnLoad() {}


@@ -212,7 +268,7 @@


        <input type="hidden" id="havedjEnd" value="{!havedjnotEnd}" />


        <!-- HWAG-B4Q3G5 20180918Start -->


        <!-- <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}" rendered="{!isdjTime != 'TRUE' && djid != ''}">> -->


        <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}" rendered="{!isdjTime = 'FALSE' && havedjnotEnd = 'FALSE' && djid != ''}">>


        <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}" rendered="{!isdjTime = 'FALSE' && havedjnotEnd = 'FALSE' && djid != ''}">


        <!-- <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}">> -->


        


        <!-- <input id="candj" value="{!isdjTime}" />


@@ -247,19 +303,22 @@


                                <td>


                                    <apex:outputLabel value="{!$ObjectType.Inspection_Report__c.Label}:" style="font-size:18px;font-weight:bold;padding-right: 5px;" />


                                </td>


                                <td>（


                                <td>（&nbsp;


                                    <apex:inputCheckBox value="{!ir.Name_Manual__c}" id="Name_Manual" onchange="toggleIrNameDisabled(this);return false;" />


                                    <apex:outputLabel value="{!$ObjectType.Inspection_Report__c.fields.Name_Manual__c.Label}" for="Name_Manual" />）


                                    <apex:inputField value="{!ir.Name}" id="Ir_Name" html-disabled="disabled" style="border-width:0px;font-size:18px;font-weight:bold;padding-right:20px;-webkit-text-fill-color:black;" />


                                    <apex:inputField value="{!ir.Name}" id="Ir_Name" html-disabled="disabled" style="border-width:1px;font-size:18px;font-weight:bold;padding-right:20px;margin-right: 10px;-webkit-text-fill-color:black;" />


                                </td>


                                <td style="text-align: center;padding-right: 100px;">


                                <td>


                                    <label rendered="{!htNumber}">合同编码 : <apex:outputText value="{!htNumber}" /> </label>


                                </td>


                                <td style="text-align: center;padding-left: 60px;padding-right: 80px;">


                                    <apex:commandButton style="width:80px;" value="保存" action="{!saveBtn}" onclick="blockme();" rerender="Form" onComplete="unblockUI();" />


                                </td>


                                <td style="text-align: center;padding-right: 100px;">


                                <td style="text-align: center;padding-right: 80px;">


                                    <apex:commandButton value="提交" action="{!submit}" onclick="blockme();" style="width:80px" rerender="Form" id="submitButton" onComplete="unblockUI();" />


                                </td>


                                <td style="text-align: center;padding-right: 100px;">


                                    <apex:commandButton style="width:80px;" value="关闭窗口" onclick="location.href='/apex/OFSWindowClose';return false;" id="closeButton" />


                                <td style="text-align: center;padding-right: 80px;">


                                    <apex:commandButton  style="width:90px;" value="关闭窗口" onclick="location.href='/apex/OFSWindowClose';return false;" id="closeButton" />


                                </td>


                                <td style="text-align: center;">


                                    <!-- update by rentx 20210913 start -->


@@ -270,10 +329,14 @@


                                </td>


                            </tr>


                        </table>


                        


                        <apex:pageBlockSection title="{!sectionList[0].title}" columns="{!sectionList[0].column}" showHeader="{!sectionList[0].showHeader}" rendered="{!sectionList.size>0}">


                            


                            <apex:repeat value="{!sectionList[0].sectionItemList}" var="sectionItem" id="SectionItemList">




                                <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}" />


                                <apex:inputField style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&sectionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}" />


                                <!-- <apex:inputField  html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&sectionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}" /> -->


                                <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&sectionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}"/>


                                <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&Not(isNull(sectionItem.customizeLable))}">


                                    <apex:outputLabel value="{!sectionItem.customizeLable}" />


                                    <apex:outputPanel layout="none">


@@ -284,7 +347,7 @@


                                            </apex:outputPanel>


                                            <apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">


                                                <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}" />


                                                <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                <apex:inputField html-field-api="{!api}" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">


                                                    <apex:outputField value="{!ir[api]}" />


                                                </apex:outputPanel>


@@ -296,7 +359,7 @@


                                    <apex:outputPanel layout="none">


                                        <apex:repeat value="{!sectionItem.apiList}" var="api">


                                            <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}" />


                                            <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                            <apex:inputField html-field-api="api" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                            <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">


                                                <apex:outputField value="{!ir[api]}" />


                                            </apex:outputPanel>


@@ -307,13 +370,14 @@


                            </apex:repeat>


                        </apex:pageBlockSection>


                    </div>


                    


                    <div style="position: relative;top:0;height:700px;overflow:hidden;overflow-y:auto;-webkit-overflow-scrolling: touch;">


                        <!-- <input type="hidden" value="{!ir.Id}" id="IrId" /> -->


                        <apex:repeat value="{!sectionList}" var="section" id="SectionList">


                            <apex:pageBlockSection title="{!section.title}" columns="{!section.column}" showHeader="{!section.showHeader}" rendered="{!!section.isTop}">


                        <apex:repeat value="{!sectionList}" var="section" id="SectionList" >


                            <apex:pageBlockSection title="{!section.title}" columns="{!section.column}" showHeader="{!section.showHeader}" rendered="{!!section.isTop}"  html-class="mytable">


                                <apex:repeat value="{!section.sectionItemList}" var="sectionItem" id="SectionItemList">


                                    <apex:outputField value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}" />


                                    <apex:inputField style="width:{!sectionItem.width};height:{!sectionItem.height};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&sectionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}" />


                                    <apex:outputField  value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&NOT(sectionItem.isInput)}" />


                                    <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};margin-left: 10px;" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&&sectionItem.isInput}" required="{!sectionItem.isRequired}" html-tabindex="{!sectionItem.index}" />


                                    <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&Not(isNull(sectionItem.customizeLable))}">


                                        <apex:outputLabel value="{!sectionItem.customizeLable}" />


                                        <apex:outputPanel layout="none">


@@ -324,7 +388,7 @@


                                                </apex:outputPanel>


                                                <apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">


                                                    <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}" />


                                                    <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                    <apex:inputField html-field-api="{!api}"  value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                    <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">


                                                        <apex:outputField value="{!ir[api]}" />


                                                    </apex:outputPanel>


@@ -336,7 +400,7 @@


                                        <apex:outputPanel layout="none">


                                            <apex:repeat value="{!sectionItem.apiList}" var="api">


                                                <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}" />


                                                <apex:inputField value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                <apex:inputField html-field-api="{!api}" value="{!ir[api]}" style="{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && (sectionItem.isInput || sectionItem.apiInputMap[api])}" required="{!sectionItem.apiRequireMap[api]}" html-tabindex="{!sectionItem.index}" />


                                                <apex:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">


                                                    <apex:outputField value="{!ir[api]}" />


                                                </apex:outputPanel>


@@ -347,7 +411,19 @@


                                </apex:repeat>


                            </apex:pageBlockSection>


                        </apex:repeat>




<!-- zzm add 230726 start -->


<apex:outputPanel html-class="mytable">


    <table class="edittable detailList" border="0" style="border-collapse: collapse;  table-layout:fixed;margin-bottom:20px;margin-top: -10px;">


    <tr>


        <th style='text-align: right;' class='labelCol '><label>{!$ObjectType.Inspection_Report__c.fields.Agency__c.Label}</label></th>


        <td style='width: 430px;'><apex:inputField value="{!ir.Agency__c}"  style='min-width: 373px;margin-left: 10px;'/></td>


        <th style='text-align: right;' class='labelCol '>


            <label>{!$ObjectType.Inspection_Report__c.fields.Agency_Contact_Id__c.Label}</label></th>


        <td style='padding-left: 20px;'><apex:inputField value="{!ir.Agency_Contact_Id__c}" style='width:161px;'/></td> 


    </tr>


</table>


</apex:outputPanel>


<!-- zzm add 230726 end -->


                        <script type="text/javascript">


                            // 病院の左側「刷新」ボタン追加


                            var labels = document.getElementsByTagName("label");


@@ -355,21 +431,77 @@


                                var lbl = labels[i];


                                if (lbl.innerText == "医院" || lbl.innerText == "病院") {


                                    var html = lbl.parentNode.innerHTML;


                                    html = "<input type='button' value='刷新' class='btn' onclick='blockme();getAssetFromHp();' />&nbsp;&nbsp;&nbsp;&nbsp;合同编码 : <apex:outputText value="{!htNumber}" /> &nbsp;&nbsp;&nbsp;&nbsp;" + html;


                                    html = "<input type='button' value='刷新' class='btn' onclick='blockme();getAssetFromHp();' /> &nbsp;&nbsp;&nbsp;&nbsp;" + html;


                                    lbl.parentNode.innerHTML = html;


                                    break;


                                }


                            }


                        </script>


                        <apex:pageBlockSection title="已选保有设备字段历史" columns="1" id="CheckSection">


                        <!-- zzm add 230726 start -->


<apex:pageBlockSection title="医院科室情况调查" columns="1" id="UnCheckSection5" >


    <apex:outputPanel >


        <table class="edittable" border="0" style="border-collapse: collapse;  table-layout:fixed;">


    <tr>


        <td>{!$ObjectType.Inspection_Report__c.fields.Department_Leakage_Frequency__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Department_Leakage_Frequency__c}" id='Department_Leakage_Frequency' style="width: 90%" />


        </td>


        <td>{!$ObjectType.Inspection_Report__c.fields.Original_Leakage_Device__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Original_Leakage_Device__c}" style="width: 90%"/>


        </td>   


        <td>{!$ObjectType.Inspection_Report__c.fields.Leakage_Status__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Leakage_Status__c}" style="width: 90%"/>


        </td> 


        


    </tr>




     <tr>


        <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant_type__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Disinfectant_type__c}" style="width: 90%"/>


        </td> 


        <td>{!$ObjectType.Inspection_Report__c.fields.Cleaning_Solution_Brand__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Cleaning_Solution_Brand__c}" style="width: 90%"/>


        </td>


        <td>{!$ObjectType.Inspection_Report__c.fields.Disinfection_Method__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Disinfection_Method__c}" style="width: 90%"/>


           


        </td>


        


    </tr>


    <tr>


        <td>{!$ObjectType.Inspection_Report__c.fields.Escrow__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Escrow__c}" style="width: 90%"/>


        </td> 


        <td>{!$ObjectType.Inspection_Report__c.fields.Third_Party_Maintenance__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.Third_Party_Maintenance__c}" style="width: 90%"/>


        </td>


        <td>{!$ObjectType.Inspection_Report__c.fields.CustomerSuggestion__c.Label}:</td>


        <td>


            <apex:inputField value="{!ir.CustomerSuggestion__c}" style="width: 90%"/>


        </td>


        


    </tr>




</table>


</apex:outputPanel >


</apex:pageBlockSection>


<!-- zzm add 230726 end -->


                        <apex:pageBlockSection title="设备点检结果" columns="1" id="CheckSection">


                            <input type="hidden" id="ProductCnt" value="{!productCount}" />




                            <apex:outputPanel >


                            <apex:outputPanel style="padding-top:0px;">


                                <table width="100%">


                                    <tr>


                                        <td>&nbsp;</td>


                                        <td width="100px">


                                            <span>全</span>


                                        <td width="120px">


                                            <span style='display: inline-block;line-height: 30px; vertical-align: middle; margin-top: -18px;'>全</span>


                                            <select style="vertical-align:text-bottom"  id="allCheckResult" size="1" onchange="changeAllCheckResult(this.value);">


                                                <option value=" ">--无--</option>


                                                <option value="OK" selected = "selected">OK</option>


@@ -379,20 +511,20 @@


                                                <!-- add by rentx 20210630 end -->


                                            </select>


                                        </td>


                                        <td width="500px">&nbsp;</td>


                                        <td width="485px">&nbsp;</td>


                                    </tr>


                                </table>


                                <!-- TODO minus scroll with -->


                                <table id="AssetTableHeader" class="list" style="border-bottom-width: 0px; font-size:13px;" border="0" cellspacing="0" cellpadding="0">


                                    <tr style="border-bottom: 1px groove rgba(254, 254, 254, 0.48);background: #f2f3f3;">


                                        <!-- add by rentx 20210630  -->


                                        <th class="headerCell" style="width:14px"> <apex:inputCheckbox id="checkAll1" onclick="checkAll(this)" /> </th>


                                        <th class="headerCell" style="width:14px"> <apex:inputCheckbox id="checkAll1" onclick="checkAll(this)" style="margin-left: 5px;"/> </th>


                                        <!-- <th class="headerCell" style="width:14px" /> -->


                                        <!-- add by rentx 20210630  -->




                                        <th class="headerCell" style="width:24px"/>


                                        <th class="headerCell" style="width:24px">No.</th>


                                        <th class="headerCell" style="width:60px">{!$ObjectType.Asset.fields.Asset_situation__c.label}</th>


                                        <th class="headerCell">{!$ObjectType.Asset.fields.Name.label}</th>


                                        <th class="headerCell" style="width:302px">{!$ObjectType.Asset.fields.Name.label}</th>


                                        <th class="headerCell" style="width:100px">{!$ObjectType.Inspection_Item__c.Fields.SerialNumber__c.Label}</th>


                                        <!-- TODO 項目の作成 -->


                                        <th class="headerCell" style="width:80px">上次点检日</th>


@@ -406,18 +538,19 @@


                                        <th class="headerCell" style="width:100px">{!$ObjectType.Inspection_Item__c.Fields.Diagnosis__c.Label}</th>


                                        <!-- add by rentx 20210630  -->


                                        <th class="headerCell" style="width:85px">{!$ObjectType.Inspection_Item__c.Fields.Abandonment_Reasons__c.Label}</th>


                    <th class="headerCell" style="width:16px"></th>


                                        <!-- add by rentx 20210630 -->


                                        <th class="headerCell" style="width:35px">{!$ObjectType.Asset.Fields.Create_repair__c.Label}</th>


                                        <!-- <th class="headerCell" style="width:35px">{!$ObjectType.Asset.Fields.Create_repair__c.Label}</th> -->


                                        <!--                                 <td class="headerScroll"></td> -->


                                    </tr>


                                </table>




                                <div style="height:320px; width:100%; overflow:auto;">


                                <div style="height:340px; width:100%; overflow:auto;">


                                    <table style="border-collapse:collapse; width:100%;" id="AssetTable">


                                        <apex:variable value="{!1}" var="cnt" />


                                        <apex:repeat value="{!checkedInfoList}" var="cInfo" id="CheckedInfoList">


                                            <tr style="border-bottom: 1px groove rgba(254, 254, 254, 0.48);">


                                                <td style="width:14px">


                                                <td style="width:33px">


                                                    <apex:inputCheckbox value="{!cInfo.rec_checkBox_c}" id="AssetRowCheckbox1" rendered="{!Not(cInfo.IsManual)}" />


                                                    <apex:outputText value="{!cInfo.IsManual}" id="IsManual" style="display:none;" />


                                                    <input type="hidden" value="{!cInfo.rec.Id}" id="CheckAssetId" />


@@ -429,7 +562,7 @@


                                                <td class="dataCell">


                                                    <!-- HWAG-BDCA9J 添加了 onclick blurProduct 内容 start-->


                                                    <apex:outputField value="{!cInfo.rec.Name}" rendered="{!Not(cInfo.IsManual)}" />


                                                    <apex:inputField value="{!cInfo.ah.Product_Manual__c}" id="Assert" style="width:90%;" rendered="{!cInfo.IsManual}" onclick="if(!blurProduct(this))return false;" />


                                                    <apex:inputField value="{!cInfo.ah.Product_Manual__c}" id="Assert" style="width:100%;" rendered="{!cInfo.IsManual}" onclick="if(!blurProduct(this))return false;" />


                                                    <!-- HWAG-BDCA9J 添加了 onclick  blurProduct 内容 end-->


                                                </td>


                                                <td class="dataCell" style="width:100px">


@@ -455,18 +588,18 @@


                                                    <apex:inputField value="{!cInfo.ah.Fault_Classification3__c}" />


                                                </td>


                                                <td class="dataCell" style="width:100px">


                                                    <apex:inputField value="{!cInfo.ah.Diagnosis__c}" style="width:93%"  />


                                                    <apex:inputField value="{!cInfo.ah.Diagnosis__c}" style="width:98%"  />


                                                </td>


                                                <!-- add by rentx 20210630 -->


                                                <td class="dataCell" style="width:85px">


                                                    <apex:inputField value="{!cInfo.ah.Abandonment_Reasons__c}"  style="width:93%"   />


                                                </td>


                                                <!-- add by rentx 20210630 -->


                                                <td class="dataCell" style="width:35px">


                                                <!-- <td class="dataCell" style="width:35px">


                                                    <apex:outputPanel layout="none" rendered="{!Not(cInfo.IsManual)}">


                                                        <a href="#" onclick="saveByRepairJs('{!cInfo.rec.Id}', '{!JSENCODE(cInfo.rec.Name)}', '{!cInfo.rec.Hospital__r.Id}', '{!JSENCODE(cInfo.rec.Hospital__r.Name)}', '{!cInfo.rec.Department_Class__r.Id}', '{!JSENCODE(cInfo.rec.Department_Class__r.Name)}', '{!cInfo.rec.Account.Id}', '{!JSENCODE(cInfo.rec.Account.Name)}', '从点检报告书');">■</a>


                                                    </apex:outputPanel>


                                                </td>


                                                </td> -->


                                            </tr>


                                            <apex:variable value="{!cnt + 1}" var="cnt" />


                                        </apex:repeat>


@@ -477,7 +610,7 @@


                        </apex:pageBlockSection>




                        <apex:outputPanel id="ButtonPanel">


                            <table style="width:100%;">


                            <table style="width:100%;margin:10px 0 10px 0;">


                                <tr>


                                    <td>


                                        <apex:commandButton value="行追加" action="{!addNewRows}" disabled="{!Not($ObjectType.Inspection_Item__c.createable)}" style="margin-left:10px;float:left;" onclick="blockme();" oncomplete="unblockUI();" rerender="Form" />


@@ -499,12 +632,12 @@


                            <!-- HWAG-B4Q3G5 20180918End -->


                            <input type="hidden" id="ProductCnt2" value="{!productCount2}" />


                            <apex:outputPanel >


                                <div align="center">


                                <!-- <div align="center">


                                    <apex:outputPanel id="countorder">第{!countorder}页</apex:outputPanel>


                                    <apex:commandButton value="上一页" action="{!UpPage}" onclick="blockme();" disabled="{!IF(countorder=1,true,false)}" oncomplete="unblockUI();" reRender="Form" />


                                    <apex:commandButton value="下一页" action="{!DownPage}" onclick="blockme();" disabled="{!IF(countorder >=nowAssetcount ,true,false)}" oncomplete="unblockUI();" rerender="Form" />


                                    <apex:outputPanel id="NowOrdercount">共{!nowAssetcount}页</apex:outputPanel>


                                </div>


                                </div> -->




                                <table>


                                    <tr>


@@ -530,6 +663,12 @@


                                            &nbsp;&nbsp;


                                            <span style="vertical-align: text-bottom;">使用中


                                                <apex:inputCheckBox value="{!activeOn}" /></span>


                    </td>


                    <td>


                        <apex:outputPanel id="countorder">第{!countorder}&nbsp;页</apex:outputPanel>


                                            <apex:commandButton value="上一页" action="{!UpPage}" onclick="blockme();" disabled="{!IF(countorder=1,true,false)}" oncomplete="unblockUI();" reRender="Form" />


                                            <apex:commandButton value="下一页" action="{!DownPage}" onclick="blockme();" disabled="{!IF(countorder >=nowAssetcount ,true,false)}" oncomplete="unblockUI();" rerender="Form" />


                                            <apex:outputPanel id="NowOrdercount">&nbsp;共{!nowAssetcount}页</apex:outputPanel>


                                        </td>


                                    </tr>


                                </table>


@@ -629,16 +768,14 @@


                            </apex:outputPanel>


                        </apex:pageBlockSection>


                    <!-- fxk 2021/8/4 新加 Start-->


                    <apex:pageBlockSection title="打印时洗消信息" columns="1" id="UnCheckSection1" >


                   <!--  <apex:pageBlockSection title="打印时洗消信息" columns="1" id="UnCheckSection1" >


                        <apex:outputPanel >


                            <table class="edittable" border="0" style="border-collapse: collapse; width:700px; table-layout:fixed;">


                                <tr>


                                    <td>{!$ObjectType.Inspection_Report__c.fields.CleaningFluid__c.Label}:</td>


                                    <td><apex:inputField value="{!ir.CleaningFluid__c}" style="width: 90%"/></td>


                                    <!-- 方式  add by rentx 20210927 start-->


                                    <td>{!$ObjectType.Inspection_Report__c.fields.Mode__c.Label}:</td>


                                    <td><apex:inputField value="{!ir.Mode__c}" style="width: 90%"/></td> 


                                    <!-- 方式 add by rentx 20210927 end -->


                                    <td>{!$ObjectType.Inspection_Report__c.fields.SterilizationMethod__c.Label}:</td>


                                    <td><apex:inputField value="{!ir.SterilizationMethod__c}" style="width: 90%"/></td> 


                                    <td>{!$ObjectType.Inspection_Report__c.fields.Remarks__c.Label}:</td>


@@ -654,7 +791,7 @@


                                </tr>


                            </table>


                        </apex:outputPanel>


                    </apex:pageBlockSection>


                    </apex:pageBlockSection> -->


                    <!-- fxk 2021/8/4 新加 End-->


                    </div>


                </apex:pageBlock>