【fix】合同结束

src/main/webapp/WEB-INF/classes/cont/CON560/con_contract_finish_for_query.lwm

@@ -25,6 +25,7 @@
         <bm:field name="et_date" databaseType="DATE" datatype="java.util.Date" physicalName="ET_DATE" prompt="CON_CONTRACT.ET_DATE"/>
         <bm:field name="lease_item_amount" databaseType="NUMBER" datatype="java.lang.Long" physicalName="LEASE_ITEM_AMOUNT" prompt="CON_CONTRACT.LEASE_ITEM_AMOUNT"/>
         <bm:field name="contract_status" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="CONTRACT_STATUS" prompt="CON_CONTRACT.CONTRACT_STATUS"/>
+        <bm:field name="contract_status_desc" databaseType="VARCHAR2" datatype="java.lang.String"  prompt="CON_CONTRACT.CONTRACT_STATUS"/>
         <!--<bm:field name="signing_user_id" databaseType="NUMBER" datatype="java.lang.Long" physicalName="SIGNING_USER_ID" prompt="CON_CONTRACT.SIGNING_USER_ID"/>-->
         <bm:field name="signing_location" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="SIGNING_LOCATION" prompt="CON_CONTRACT.SIGNING_LOCATION"/>
         <bm:field name="residual_value" databaseType="VARCHAR2" datatype="java.lang.String" physicalName="RESIDUAL_VALUE" prompt="CON_CONTRACT.RESIDUAL_VALUE"/>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain.lview

@@ -75,6 +75,12 @@
                 Leaf.showMessage('${l:PROMPT}', '请至少选择一条记录');
                 return;
             }
+            //判断数据有没有修改
+            var datas=$('con560_contract_result_ds').getJsonData();
+            if(datas.length>0){
+                $L.showInfoMessage("提示",'页面数据存在改动，请先保存数据！');
+                return;
+            }
             var TerminateData = [];
             for (var i = 0; i < records.length; i++) {
                 records[i].set('_status', 'update');
@@ -94,7 +100,6 @@
                     scope: this
                 });
             }, function () {
-                return false;
             }, null, null);
         }
 
@@ -226,11 +231,11 @@
                        model="cont.CON560.con_contract_finish_for_query" queryDataSet="con560_contract_query_ds"
                        queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
                        selectable="true" selectionModel="single">
-                <a:fields>
-                    <a:field name="contract_status_n" displayField="code_value_name"
-                             options="con560_contract_status_grid_ds" returnField="contract_status"
-                             valueField="code_value"/>
-                </a:fields>
+<!--                <a:fields>-->
+<!--                    <a:field name="contract_status_n" displayField="code_value_name"-->
+<!--                             options="con560_contract_status_grid_ds" returnField="contract_status"-->
+<!--                             valueField="code_value"/>-->
+<!--                </a:fields>-->
                 <a:events>
                     <a:event name="indexChange" handler="onIndexChange"/>
                     <a:event name="query" handler="aut_authority_list_validate_query"/>
@@ -275,7 +280,7 @@
                     <a:column name="down_payment" align="right" footerRenderer="summaryRenderer" prompt="首付款"
                               renderer="Leaf.formatMoney" width="120"/>
                     <!--<a:column name="owner_user_id_n" prompt="出单人" width="60"/>-->
-                    <a:column name="contract_status_n" prompt="合同状态" width="80"/>
+                    <a:column name="contract_status_desc" prompt="合同状态" width="80"/>
                     <a:column name="et_date" prompt="合同结束日" width="80" editorFunction="date_editor_func" renderer="Leaf.formatDate"/>
                 </a:columns>
                 <a:editors>

src/main/webapp/modules/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -20,6 +20,10 @@
         <a:link id="con_contract_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
         <script type="text/javascript"><![CDATA[
+        Leaf.onReady(function(){
+            console.log('${/parameter/@custom_code}');
+            console.log('1111');
+        })
         function con560_con_contract_detail() {debugger;
             var records = $('con560_contract_result_ds').getSelected();
             if (!records.length) {
@@ -131,7 +135,7 @@
         ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
         <a:screen-include
-                screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON560"/>
+                screen="modules/cont/CON500/con_contract_authority_list_validate.lview?document_category=CONTRACT&amp;function_code=CON560N&amp;custom_code=c"/>
         <a:dataSets>
             <a:dataSet id="receivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_received_amount"/>
             <a:dataSet id="unreceivedAmountDs" autoQuery="true" model="cont.CON560.con_contract_unreceived_amount"/>
@@ -216,7 +220,7 @@
                               renderer="Leaf.formatMoney" width="120"/>
                     <!--<a:column name="owner_user_id_n" prompt="出单人" width="60"/>-->
                     <a:column name="contract_status_n" prompt="合同状态" width="80"/>
-                    <a:column name="et_date" prompt="合同结束日" width="80"/>
+                    <a:column name="et_date" prompt="合同结束日" width="80" renderer="Leaf.formatDate"/>
 
                 </a:columns>
             </a:grid>