From 928399eceec50e3d37ea08669a12789a9410a9d2 Mon Sep 17 00:00:00 2001
From: 沙世明 <shashiming@prec-tech.com>
Date: 星期二, 22 十一月 2022 16:51:16 +0800
Subject: [PATCH] 111
---
force-app/main/default/pages/ChoiceAsset.page | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git a/force-app/main/default/pages/ChoiceAsset.page b/force-app/main/default/pages/ChoiceAsset.page
index a484ad7..f7b3221 100644
--- a/force-app/main/default/pages/ChoiceAsset.page
+++ b/force-app/main/default/pages/ChoiceAsset.page
@@ -13,6 +13,32 @@
function saveJs(){
save();
}
+ // //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start
+ // function checkPartSupplyFinishDateJs(){
+ // var today = new Date();
+ // var todayNew = today.toLocaleDateString();
+ // var check;
+ // var num = 100000;
+ // for (var i = 0; i < 100; i++) {
+ // check = j$(escapeVfId('allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsTable:'+i+':consumablesCountproRowCheckbox')).attr('checked');
+ // if (check == 'checked'){
+ // num = i;
+ // }
+ // }
+ // if (num != 100000){
+ // var partSupplyFinishDate = new Date(j$(escapeVfId('allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsTable:' + num + ':partSupplyFinishDate')).value());
+ // if (partSupplyFinishDate != 'Invalid Date'){
+ // var partSupplyFinishDateNew = partSupplyFinishDate.toLocaleDateString();
+ // if (partSupplyFinishDateNew > todayNew){
+ // alert('棰勮'+ partSupplyFinishDateNew +'闆朵欢鍗冲皢鍋滀骇锛岃閫佷慨鍓嶄笌宸ュ巶鍙奟C鑱旂粶');
+ // }
+ // if (partSupplyFinishDateNew <= todayNew){
+ // alert('璇ュ瀷鍙烽浂浠跺凡缁忓仠浜э紝鏈夌壒娈婇渶姹傦紝璇烽�佷慨鍓嶄笌宸ュ巶RC鑱旂粶');
+ // }
+ // }
+ // }
+ // }
+ // //XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end
function ClearJs(){
blockme();
@@ -29,6 +55,7 @@
</apex:actionFunction>
<apex:actionFunction name="save" action="{!save}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter();SumCompute()">
</apex:actionFunction>
+
<apex:outputPanel id="allPanel">
<apex:pageBlock id="allBlock">
@@ -64,6 +91,7 @@
<!-- <td>
<apex:commandButton onclick="saveJs();" value="纭畾" rerender="dummy" />
</td> -->
+
</tr>
<!-- <td>
@@ -102,19 +130,23 @@
<th>閫夋嫨</th>
<th>淇濇湁璁惧鍚嶇О</th>
- <th>鐘舵��</th>
+ <!-- 20220927 ljh XLIU-CJN62G update start-->
+ <!-- <th>鐘舵��</th> -->
<th>鏈鸿韩缂栫爜</th>
- <th>璁惧鍨嬪彿</th>
- <!-- <th>淇℃伅鏉ユ簮</th> -->
- <th>闆嗕腑绠＄悊搴撳瓨</th>
<th>鍖婚櫌</th>
<th>鎴樼暐绉戝</th>
<th>绉戝</th>
+ <th>鍙戣揣鏃�</th>
+ <th>澶氬勾淇濅慨鏈熻嚦</th>
+ <th>鏈�杩戜竴鏈熺淮淇悎鍚岀粨鏉熸棩</th>
+ <!-- <th>闆嗕腑绠＄悊搴撳瓨</th> -->
+ <!-- 20220927 ljh XLIU-CJN62G update end-->
</tr>
<apex:repeat value="{!choiceAssetInfoRecordsview}" var="records" id="ConsumableorderdetailsTable">
<tr class="dataRow">
<td>
+ <!-- <apex:inputCheckbox value="{!records.check}" onclick="CheckSize(this);" id="consumablesCountproRowCheckbox" onchange="checkPartSupplyFinishDateJs(); return false;" disabled="{!!records.canSelect}"/> -->
<apex:inputCheckbox value="{!records.check}" onclick="CheckSize(this);" id="consumablesCountproRowCheckbox" disabled="{!!records.canSelect}"/>
</td>
@@ -126,21 +158,12 @@
<td class="dataCell">
<apex:outputText value="{!records.ast.Name}"/>
</td>
- <td class="dataCell">
+ <!-- <td class="dataCell">
<apex:outputText value="{!records.ast.Status}"/>
- </td>
+ </td> -->
<td class="dataCell">
<apex:outputText value="{!records.ast.SerialNumber}"/>
- </td>
- <!-- <td class="dataCell">
- <apex:outputText value="{!records.ast.Product2.Asset_Model_No__c}"/>
- </td> -->
- <td class="dataCell">
- <apex:outputText value="{!records.ast.Information_From__c}"/>
- </td>
- <td class="dataCell">
- <apex:outputText value="{!records.ast.Ji_Zhong_Guan_Li_Ku_Cun__c}"/>
</td>
<td class="dataCell">
<apex:outputText value="{!records.ast.Hospital__r.Name}"/>
@@ -151,6 +174,24 @@
<td class="dataCell">
<apex:outputText value="{!records.ast.Account.Name}"/>
</td>
+ <!-- <td class="dataCell">
+ <apex:outputText value="{!records.ast.Product2.Asset_Model_No__c}"/>
+ </td> -->
+ <td class="dataCell">
+ <apex:outputField value="{!records.ast.Posting_Date__c}"/>
+ </td>
+ <td class="dataCell">
+ <apex:outputField value="{!records.ast.Extend_Gurantee_DateTo__c}"/>
+ </td>
+ <td class="dataCell">
+ <apex:outputField value="{!records.ast.CurrentContract_End_Date__c}"/>
+ </td>
+ <!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 start -->
+ <!-- <td>
+ <apex:inputField value="{!records.ast.PartSupplyFinishDate__c}" id="partSupplyFinishDate" style="display: none" showDatePicker="false"/>
+ </td> -->
+ <!--XLIU-CJM7Z9 銆愬鎵樸�戞柊寤轰慨鐞嗘彁绀轰俊鎭紙鍋滀骇鍙婇潪淇悊瀵硅薄鍝侊級LY 20221012 end -->
+
</tr>
</apex:repeat>
</table>
--
Gitblit v1.9.1