From d77b6353ca9b59a6398df3eae9912f9fd766946d Mon Sep 17 00:00:00 2001
From: zhangzhengmei <zhangzhengmei@prec-tech.com>
Date: 星期六, 05 八月 2023 17:04:22 +0800
Subject: [PATCH] fix: lightning 页面确认
---
force-app/main/default/pages/OFSInsReportLayout.page | 304 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 209 insertions(+), 95 deletions(-)
diff --git a/force-app/main/default/pages/OFSInsReportLayout.page b/force-app/main/default/pages/OFSInsReportLayout.page
index 5d2d335..0c79451 100644
--- a/force-app/main/default/pages/OFSInsReportLayout.page
+++ b/force-app/main/default/pages/OFSInsReportLayout.page
@@ -9,6 +9,7 @@
<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%;
@@ -30,7 +31,59 @@
.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: 368px;
+ }
+ table.detailList td.dataCol input[field-api="Hospital__c"] {
+ min-width: 362px;
+ }
+
+ /*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">
var tmpaid = "";
@@ -143,9 +196,6 @@
blockme();
//callback();return;
//<input type="hidden" value="{!ir.Id}" id="IrId"/>
-
- //<input type="hidden" value="{!ir.Responsible_Person_Encrypted__c}" id="Responsible_Person_Encrypted__c"/>
- //<input type="hidden" value="{!ir.phone_Encrypted__c}" id="phone_Encrypted__c"/>
let e_id = document.getElementById("IrId");
let url = staticResource.newUrl;
@@ -172,9 +222,7 @@
document.getElementById("Page:Form:Block:AWS_Data_Id__c").value = aws_data1.dataId;
j$("[field-api='phone__c']").val(aws_data1.phone);
- //document.getElementById("Page:Form:Block:phone_Encrypted__c").value = aws_data1.phoneEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
j$("[field-api='Responsible_Person__c']").val(aws_data1.responsiblePerson);
- //document.getElementById("Page:Form:Block:Responsible_Person_Encrypted__c").value = aws_data1.responsiblePersonEncrypt; //zhj 鏂版柟妗堟敼閫� 2022-12-05
if (callback) {
callback();
@@ -185,6 +233,7 @@
function saveBtnJs(){
Encrypt(saveBtn);
}
+
function submitJs(){
Encrypt(submit);
}
@@ -279,7 +328,7 @@
</head>
<body>
<!-- HWAG-B4Q3G5 20180918Start -->
- <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}">>
+ <apex:form id="Form" style="margin:0 5px;" onkeydown="if(event.keyCode==13){return false;}">
<!-- HWAG-B4Q3G5 20180918End -->
<script type="text/javascript">
// 淇濆瓨寰屻�佹柊瑕忋伄鍫卞憡鏇窱D銈掑彇寰�
@@ -315,19 +364,19 @@
<table>
<tr>
<td><apex:outputLabel value="{!$ObjectType.Inspection_Report__c.Label}:" style="font-size:18px;font-weight:bold;padding-right: 5px;"/></td>
- <td>锛�<apex:inputCheckBox value="{!ir.Name_Manual__c}" id="Name_Manual" onchange="toggleIrNameDisabled(this);return false;"/>
+ <td>锛� <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;"><input class="btn" type="Button" style="width:80px;" value="淇濆瓨" action="" onclick="saveBtnJs();" rerender="Form" onComplete="unblockUI();"/></td>
<td style="text-align: center;padding-right: 100px;"><input class="btn" type="Button" value="鎻愪氦" action="" onclick="submitJs();" 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>
+ <td style="text-align: center;padding-right: 100px;"><apex:commandButton style="width:90px;" value="鍏抽棴绐楀彛" onclick="location.href='/apex/OFSWindowClose';return false;" id="closeButton"/></td>
<td style="text-align: center;"><input class="btn" type="Button" style="width:80px;" value="PDF" action="" onclick="showPDFJs();" rerender="Form" onComplete="unblockUI();"/></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: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)&§ionItem.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}"/>
@@ -338,8 +387,8 @@
<apex:outputField value="{!ir[api]}"/>
</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: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:outputPanel style="display:inline-block;{!sectionItem.apiStyleMap[api]}" rendered="{!NOT(api=='') && NOT((sectionItem.isInput || sectionItem.apiInputMap[api]))}">
<apex:outputField value="{!ir[api]}"/>
</apex:outputPanel>
@@ -369,49 +418,64 @@
<apex:inputHidden value="{!ir.phone_Encrypted__c}" id="phone_Encrypted__c"/> -->
<!-- zhj 鏂版柟妗堟敼閫� 2022-12-05 end-->
<apex:inputHidden value="{!ir.AWS_Data_Id__c}" id="AWS_Data_Id__c"/>
-
-
-
<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="{!section.sectionItemList}" var="sectionItem" id="SectionItemList">
- <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};" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.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">
- <apex:repeat value="{!sectionItem.apiList}" var="api">
- <!-- 淇濆瓨寰屻�佺梾闄€伅寮峰埗outputField -->
- <apex:outputPanel layout="none" rendered="{!api == 'Hospital__c' && ir.Id != ''}">
- <apex:outputField value="{!ir[api]}"/>
-</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 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>
-</apex:outputPanel>
+ <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)}"/>
+ <!-- 20230719 ljh -->
+ <!-- <apex:inputField html-field-api="{!sectionItem.api}" style="width:{!sectionItem.width};height:{!sectionItem.height};margin-left:17px;" value="{!ir[sectionItem.api]}" rendered="{!NOT(sectionItem.isDummy)&&NOT(sectionItem.isCustomize)&§ionItem.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)&§ionItem.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">
+ <apex:repeat value="{!sectionItem.apiList}" var="api">
+ <!-- 淇濆瓨寰屻�佺梾闄€伅寮峰埗outputField -->
+ <apex:outputPanel layout="none" rendered="{!api == 'Hospital__c' && ir.Id != ''}">
+ <apex:outputField value="{!ir[api]}"/>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!NOT(api == 'Hospital__c' && ir.Id != '')}">
+ <!-- 20230719 ljh -->
+ <!-- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/> -->
+ <apex:outputLabel style="font-weight: bold;" value="{!sectionItem.apiLabelMap[api]}"/>
+ <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]}"/> -->
+ {!ir[api]}
+ </apex:outputPanel>
+ </apex:outputPanel>
+ </apex:repeat>
+ </apex:outputPanel>
+ </apex:pageblockSectionItem>
+ <apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&(isNull(sectionItem.customizeLable))}">
+ <apex:outputPanel layout="none">
+ <apex:repeat value="{!sectionItem.apiList}" var="api">
+ <!-- 20230719 ljh -->
+ <!-- <apex:outputLabel style="font-weight: bold; padding-right: 5px;" value="{!sectionItem.apiLabelMap[api]}"/> -->
+ <apex:outputLabel style="font-weight: bold;" value="{!sectionItem.apiLabelMap[api]}"/>
+ <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>
+ </apex:repeat>
+ </apex:outputPanel>
+ </apex:pageblockSectionItem>
+ <apex:pageBlockSectionItem rendered="{!sectionItem.isDummy}"/>
+ </apex:repeat>
+ </apex:pageBlockSection>
</apex:repeat>
+<!-- zzm add 230726 start -->
+<apex:outputPanel >
+ <table class="edittable" border="0" style="border-collapse: collapse; table-layout:fixed;margin-bottom:20px;margin-top: -10px;">
+ <tr>
+ <td style='width: 120px;text-align: right;'>{!$ObjectType.Inspection_Report__c.fields.Agency__c.Label}</td>
+ <td style='min-width: 360px;padding-left: 20px;'><apex:inputField value="{!ir.Agency__c}" style="min-width: 368px;"/></td>
+ <td style='width: 178px;text-align: right;'>{!$ObjectType.Inspection_Report__c.fields.Agency_Contact_Id__c.Label}</td>
+ <td style='min-width: 360px;padding-left: 20px;'><apex:inputField value="{!ir.Agency_Contact_Id__c}" style="width:161px;"/></td>
+ </tr>
+</table>
</apex:outputPanel>
-</apex:pageblockSectionItem>
-<apex:pageblockSectionItem rendered="{!NOT(sectionItem.isDummy)&&(sectionItem.isCustomize)&&(isNull(sectionItem.customizeLable))}">
-<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 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>
-</apex:repeat>
-</apex:outputPanel>
-</apex:pageblockSectionItem>
-<apex:pageBlockSectionItem rendered="{!sectionItem.isDummy}"/>
-</apex:repeat>
-</apex:pageBlockSection>
-</apex:repeat>
-
+<!-- zzm add 230726 end -->
<script type="text/javascript">
// 鐥呴櫌銇乏鍋淬�屽埛鏂般�嶃儨銈裤兂杩藉姞
var labels = document.getElementsByTagName("label");
@@ -425,15 +489,58 @@
}
}
</script>
-<apex:pageBlockSection title="宸查�変繚鏈夎澶囧瓧娈靛巻鍙�" columns="1" id="CheckSection">
+<!-- zzm add 230726 start -->
+<apex:pageBlockSection title="鍖婚櫌绉戝鎯呭喌璋冩煡" columns="1" id="UnCheckSection1" >
+ <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}" style="width: 90%" required="true"/></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%" required="true"/>
+ </td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Leakage_Status__c.Label}:</td>
+ <td>
+ <apex:inputField value="{!ir.Leakage_Status__c}" id="Leakage_Status" required="true" 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}" required="true" 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%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Disinfection_Method__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Disinfection_Method__c}" style="width: 90%" required="true"/></td>
+
+ </tr>
+ <tr>
+ <td>{!$ObjectType.Inspection_Report__c.fields.Escrow__c.Label}:</td>
+ <td><apex:inputField value="{!ir.Escrow__c}" style="width: 90%" required="true"/></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%" required="true"/></td>
+ <td>{!$ObjectType.Inspection_Report__c.fields.CustomerSuggestion__c.Label}:</td>
+ <td>
+ <apex:inputField value="{!ir.CustomerSuggestion__c}" style="width: 90%"/>
+ </td>
+
+ </tr>
+
+</table>
+<!-- zzm add 230726 end -->
+ </apex:outputPanel>
+</apex:pageBlockSection>
+<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> </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>
<!-- 榛樿鍏∣K -->
@@ -445,19 +552,19 @@
<!-- add by rentx 20210630 end -->
</select>
</td>
- <td width="500px"> </td>
+ <td width="485px"> </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 20210809 -->
- <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 202120809 -->
- <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>
@@ -471,18 +578,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"/>
@@ -494,7 +602,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}"
+ <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>
@@ -521,18 +629,18 @@
<apex:inputField value="{!cInfo.ah.Fault_Classification3__c}" id="cat3" />
</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>
@@ -543,7 +651,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)}"
@@ -566,12 +674,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>
@@ -579,13 +687,19 @@
<td style="width:85px" align="right"><apex:selectList value="{!text1}" id="text1" size="1" style="width:80px"><apex:selectOptions value="{!textOpts}"/></apex:selectList></td>
<td style="width:85px" align="center"><apex:selectList value="{!cond1}" id="cond1" size="1" style="width:80px"><apex:selectOptions value="{!equalOpts}"/></apex:selectList></td>
<td style="width:95px" align="left"><apex:inputText value="{!val1}" id="val1" style="width:100px"/></td>
- <td align="left">
+ <td align="left" style="width:450px">
<apex:commandButton value="妫�绱�" onclick="searchJs();return false;" style="width:130px" rerender="dummy"/>
<apex:commandButton value="娓呴櫎鏉′欢" onclick="clearAndSearch();" style="width:130px" rerender="dummy"/>
<span style="vertical-align: text-bottom;">浣跨敤涓�<apex:inputCheckBox value="{!activeOn}" /></span>
+ </td>
+ <td>
+ <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>
</td>
</tr>
</table>
@@ -683,32 +797,32 @@
</apex:outputPanel>
</apex:pageBlockSection>
<!-- fxk 2021/8/4 鏂板姞 Start-->
-<apex:pageBlockSection title="鎵撳嵃鏃舵礂娑堜俊鎭�" columns="1" id="UnCheckSection1" >
-<apex:outputPanel >
-<table class="edittable" border="0" style="border-collapse: collapse; width:600px; 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>
+<!-- <apex:pageBlockSection title="鎵撳嵃鏃舵礂娑堜俊鎭�" columns="1" id="UnCheckSection1" > -->
+<!-- <apex:outputPanel > -->
+<!-- <table class="edittable" border="0" style="border-collapse: collapse; width:600px; 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>
+ <!-- <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>
- <td><apex:inputText value="{!ir.Remarks__c}" style="width: 90%"/></td>
- </tr>
- <tr>
- <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant__c.Label}:</td>
- <td><apex:inputField value="{!ir.Disinfectant__c}" style="width: 90%"/></td>
- <td>{!$ObjectType.Inspection_Report__c.fields.UsedMachine__c.Label}:</td>
- <td><apex:inputField value="{!ir.UsedMachine__c}" style="width: 90%"/></td>
- <td>{!$ObjectType.Inspection_Report__c.fields.Used_ET__c.Label}:</td>
- <td><apex:inputText value="{!ir.Used_ET__c}" style="width: 90%"/></td>
- </tr>
-</table>
-</apex:outputPanel>
-</apex:pageBlockSection>
+ <!-- <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> -->
+ <!-- <td><apex:inputText value="{!ir.Remarks__c}" style="width: 90%"/></td> -->
+ <!-- </tr> -->
+ <!-- <tr> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Disinfectant__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.Disinfectant__c}" style="width: 90%"/></td> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.UsedMachine__c.Label}:</td> -->
+ <!-- <td><apex:inputField value="{!ir.UsedMachine__c}" style="width: 90%"/></td> -->
+ <!-- <td>{!$ObjectType.Inspection_Report__c.fields.Used_ET__c.Label}:</td> -->
+ <!-- <td><apex:inputText value="{!ir.Used_ET__c}" style="width: 90%"/></td> -->
+ <!-- </tr> -->
+<!-- </table> -->
+<!-- </apex:outputPanel> -->
+<!-- </apex:pageBlockSection> -->
<!-- fxk 2021/8/4 鏂板姞 End-->
</div>
</apex:pageBlock></div>
--
Gitblit v1.9.1