~huangqianlong/OlyMEBG.git

			@@ -479,9 +479,11 @@
			<td class="col_HP_NAME">
			<a href="#" onclick="sortTableJs('1');return false;" style="text-decoration: underline;">{!$ObjectType.Statu_Achievements__c.fields.Opp_Hospital__c.Label}</a>{!sortOrder[1]}
			</td>

			<td class="col_DEPT">
			<a href="#" onclick="sortTableJs('13');return false;" style="text-decoration: underline;">科室</a>{!sortOrder[13]}
			</td>

			<!-- <td class="col_Status_2">
			<a href="#" onclick="sortTableJs('10');return false;" style="text-decoration: underline;">注残<br/>状态2</a>{!sortOrder[10]}
			</td> -->
			@@ -495,9 +497,10 @@
			<td class="header1 col_CurrentStatus">
			<a href="#" onclick="sortTableJs('27');return false;" style="text-decoration: underline;">目前状态</a>{!sortOrder[27]}
			</td>
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_EndUserContract">
			<a href="#" onclick="sortTableJs('30');return false;" style="text-decoration: underline;">最终用户合同状态</a>{!sortOrder[30]}
			</td>
			</td>-->
			<!-- <td class="col_PaymentStatus">
			<a href="#" onclick="sortTableJs('30');return false;" style="text-decoration: underline;">付款状态</a>{!sortOrder[30]}
			</td> -->
			@@ -523,10 +526,11 @@
			<td class="col_ShippingScheduledDate"></td>
			<!-- <td class="col_SalesIncharge"></td> -->
			<td class="col_Agency1"></td>

			<td class="col_CreateActivity"></td>
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_CreateActivity"></td> -->
			<!-- <td class="col_CreateTask"></td> -->
			<td class="col_FollowUpComment"></td>
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_FollowUpComment"></td> -->
			<!-- <td class="col_ReasonNotCollectMoney"></td>
			<td class="col_ReasonNotShip"></td>
			<td class="col_ManagerFeedback"></td>
			@@ -540,8 +544,9 @@
			<td class="col_PCL_NAME"></td>
			<td class="col_QuotationCode"></td>
			<td class="col_OrderNo"></td> -->
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_SalesDepartment"></td>
			<td class="col_Province"></td>
			<td class="col_Province"></td>-->
			<!-- <td class="col_OCM"></td>
			<td class="col_OpportunityCategory"></td>
			<td class="col_ForecastShipMonthlyMannual"></td>
			@@ -589,16 +594,17 @@
			<td class="col_Agency1">
			<a href="#" onclick="sortTableJs('3');return false;" style="text-decoration: underline;">{!$ObjectType.Statu_Achievements__c.fields.Agency1_Name_F__c.Label}</a>{!sortOrder[3]}
			</td>

			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_CreateActivity">
			<a href="#" onclick="sortTableJs('45');return false;" style="text-decoration: underline;">新建计划</a>{!sortOrder[45]}
			</td>
			</td> -->
			<!-- <td class="col_CreateTask">
			<a href="#" onclick="sortTableJs('46');return false;" style="text-decoration: underline;">新建任务</a>{!sortOrder[46]}
			</td> -->
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_FollowUpComment">
			<a href="#" onclick="sortTableJs('41');return false;" style="text-decoration: underline;">跟进情况</a>{!sortOrder[41]}
			</td>
			</td> -->
			<!-- <td class="col_ReasonNotCollectMoney">
			<a href="#" onclick="sortTableJs('42');return false;" style="text-decoration: underline;">未付款原因</a>{!sortOrder[42]}
			</td>
			@@ -638,6 +644,7 @@
			<td class="col_OrderNo">
			<a href="#" onclick="sortTableJs('8');return false;" style="text-decoration: underline;">凭证号码</a>{!sortOrder[8]}
			</td> -->
			<!-- SWAG-CCK9LV yc 20220321
			<td class="col_SalesDepartment">
			<a href="#" onclick="sortTableJs('4');return false;" style="text-decoration: underline;">销售本部
			<br/>（SAP业绩）</a>{!sortOrder[4]}
			@@ -646,6 +653,7 @@
			<a href="#" onclick="sortTableJs('5');return false;" style="text-decoration: underline;">省
			<br/>(SAP业绩)</a>{!sortOrder[5]}
			</td>
			-->
			<!-- <td class="col_OCM">
			<a href="#" onclick="sortTableJs('12');return false;" style="text-decoration: underline;">OCM分类</a>{!sortOrder[12]}
			</td>
			@@ -735,11 +743,13 @@
			<apex:outputField value="{!or.rec.Current_status__c}" />
			</span>
			</td>
			<!-- SWAG-CCK9LV yc 20220321
			<td class="dataCellBorder1 col_CurrentStatus">
			<span>
			<apex:outputField value="{!or.rec.End_User_contract__c}" />
			</span>
			</td>
			-->
			<!-- <td class="dataCellBorder1 col_AssignmentStatus" id="{!cnt-1}:col_AssignmentStatus"><span>
			<apex:outputField value="{!or.rec.AssignmentStatus__c}" id="col_AssignmentStatus" />
			<apex:outputText id="id_Last_update_AssignmentStatus" value="{0, date, yyyy/MM/dd}" style="display:none">
			@@ -816,15 +826,17 @@
			<apex:outputField value="{!or.rec.Agency1_Name_F__c}" style="width:90%;" />
			</span>
			</td>

			<!-- SWAG-CCK9LV yc 20220321
			<td class="dataCellBorder1 col_CreateActivity">
			<span>
			<apex:outputField value="{!or.rec.Create_Activity__c}" />
			</span>
			</td>
			-->
			<!-- <td class="dataCellBorder1 col_CreateTask"><span>
			<apex:outputField value="{!or.rec.Create_task__c}" />
			</span></td> -->
			<!-- SWAG-CCK9LV yc 20220321
			<td class="dataCellBorder1 col_FollowUpComment" id="{!cnt-1}:col_FollowUpComment" style="padding:0;">
			<span>
			<apex:inputField value="{!or.rec.Follow_up_comment__c}" id="col_FollowUpComment" style="width:95%;" onchange="setChangeFlg('{!or.lineNo}')"
			@@ -834,6 +846,7 @@
			</apex:outputText>
			</span>
			</td>
			-->
			<!-- <td class="dataCellBorder1 col_ReasonNotCollectMoney" id="{!cnt-1}:col_ReasonNotCollectMoney" style="padding:0;"><span>
			<apex:inputField value="{!or.rec.Reason_not_collect_money__c}" id="col_ReasonNotCollectMoney" style="width:95%;" onchange="setChangeFlg('{!or.lineNo}')"/>
			<apex:outputText id="id_Last_update_Reason_not_collect_money" value="{0, date, yyyy/MM/dd}" style="display:none">
			@@ -882,6 +895,7 @@
			<td class="dataCellBorder1 col_OrderNo"><span>
			<apex:outputField value="{!or.rec.Order_no_without_0__c}"/>
			</span></td> -->
			<!-- SWAG-CCK9LV yc 20220321
			<td class="dataCellBorder1 col_SalesDepartment">
			<span>
			<apex:outputField value="{!or.rec.Opportunity_Salesdepartment_SAP__c}" />
			@@ -892,6 +906,7 @@
			<apex:outputField value="{!or.rec.SaleProvince_SAP__c}" />
			</span>
			</td>
			-->
			<!-- <td class="dataCellBorder1 col_OCM"><span>
			<apex:outputField value="{!or.rec.Opp_OCM__c}"/>
			</span></td>
			@@ -922,8 +937,8 @@
			<td class="dataCellBorder1 col_CurrentShippingDate"><span>
			<apex:outputField value="{!or.rec.Current_shipping_date__c}" />
			</span></td> -->
			<td class="dataCellBorder1 col_MonthlyForecast" id="{!cnt-1}:col_MonthlyForecast" style="padding:0;width:80px">
			<span style="width:80px">
			<td class="dataCellBorder1 col_MonthlyForecast" id="{!cnt-1}:col_MonthlyForecast" style="padding:0;width:200px">
			<span style="width:200px">
			<apex:inputField value="{!or.rec.Monthly_forecast_shipping__c}" id="col_MonthlyForecast" onchange="setChangeFlg('{!or.lineNo}')"/>
			</span>
			</td>