Merge branch 'feature/con_contract_finish_maintain' into develop

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

@@ -29,13 +29,13 @@
                 records[i].set('_status', 'update');
                 TerminateData.push(records[i].data);
             }
-            Leaf.showConfirm('${l:PROMPT}', '确认要结束?', function () {
+            Leaf.showConfirm('${l:PROMPT}', '确认提交合同结束工作流?', function () {
                 Leaf.request({
                     url: $('con_contract_terminate_link_id').getUrl(),
                     para: TerminateData,
                     success: function () {
                         Leaf.SideBar.show({
-                            msg: '合同已结束',
+                            msg: '提交成功',
                             duration: 2000
                         });
                         $('con560_contract_result_ds').query();
@@ -43,7 +43,7 @@
                     scope: this
                 });
             }, function () {
-                return;
+                return false;
             }, null, null);
         }
 
@@ -196,14 +196,12 @@
                     <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->
                     <a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/>
                     <a:column name="signing_location" prompt="签约地点" width="100"/>
-                    <a:column name="lease_channel_desc" prompt="商业模式" width="70"/>
                     <!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>-->
                     <a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价"
                               renderer="Leaf.formatMoney" width="120"/>
                     <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="lease_organization_desc" prompt="事业部" width="80"/>
                     <a:column name="contract_status_n" prompt="合同状态" width="80"/>
                 </a:columns>
             </a:grid>

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

@@ -35,7 +35,7 @@
                     para: TerminateData,
                     success: function () {
                         Leaf.SideBar.show({
-                            msg: '合同已结束',
+                            msg: '提交成功',
                             duration: 2000
                         });
                         $('con560_contract_result_ds').query();
@@ -190,14 +190,12 @@
                     <!--<a:column name="signing_user_id_n" prompt="签约人" width="100"/>-->
                     <a:column name="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/>
                     <a:column name="signing_location" prompt="签约地点" width="100"/>
-                    <a:column name="lease_channel_desc" prompt="商业模式" width="70"/>
                     <!--<a:column name="bp_vender" align="center" footerRenderer="summaryRenderer" prompt="主供应商名称" width="200"/>-->
                     <a:column name="lease_item_amount" align="right" footerRenderer="summaryRenderer" prompt="租赁物总价"
                               renderer="Leaf.formatMoney" width="120"/>
                     <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="lease_organization_desc" prompt="事业部" width="80"/>
                     <a:column name="contract_status" prompt="合同状态" width="80"/>
                 </a:columns>
             </a:grid>