租赁物导入调整05

src/main/webapp/modules/prj/PRJ501N/prj_project_lease_import_details.lview

@@ -56,7 +56,7 @@
                 Leaf.showMessage('${l:PROMPT}','请选择一条记录！');
                 return;
             }
-         Leaf.showConfirm('提示', '您确认提交吗', function() {
+         Leaf.showConfirm('提示', '您确认删除吗', function() {
              for (var i = 0;i < records.length;i++) {
                  $(ds_id).remove(records[i]);
              }
@@ -100,6 +100,7 @@
                     url: $('prj501N_lease_item_list_save_link').getUrl(),
                     para:param,
                     success: function() {
+                        $(ds_id).query();
                     },
                     error: function() {
                     },

src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview

@@ -16,6 +16,8 @@
         <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
         <a:model-query fetchAll="true" model="prj.PRJ500D.prj_project_get_description" rootPath="description"/>
         <a:model-query fetchAll="true"  model="prj.PRJ500D.prj_project_residual_value" rootPath="residual_value"/>
+        <a:model-query fetchAll="true"  model="prj.PRJ500D.prj_project_residual_value_from" rootPath="prj_residual_value"/>
+
         <s:server-script import="contract_print_path.js"><![CDATA[
         $ctx.parameter.file_path = con_print_path['con_print_path'];
         $ctx.parameter.tomcat_source = con_print_path['tomcat_source'];
@@ -912,6 +914,7 @@
         };
 
 
+
         //加载时调用(grid,table,gridBox)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_load'] = function (ds, record, config_records, bp_seq) {
             var bp_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_BP', 'prj_project_bp');
@@ -995,9 +998,7 @@
         var division='';
         //新增和加载时调用(form)
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function (ds, record, config_records, bp_seq) {
-
             var tenant_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_BASIC_INFO_1', 'prj_project');
-
             if(tenant_ds_id == ds.id){
                 //debugger;
                 if (Leaf.isEmpty(record.get('send_message'))){
@@ -1582,7 +1583,8 @@
                                         var lease_item_amount=record.get('lease_item_amount');
                                         var  residual_value=record.get('residual_value');
                                         var  q_value='${/model/residual_value/record/@residual_value}';
-                                        if(total_price!=lease_item_amount){
+                                        debugger;
+                                        if(total_price!=lease_item_amount &&total_price!=null){
                                             Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
                                             return;
                                         }else if(q_value!=residual_value){
@@ -1636,7 +1638,8 @@
                                 var lease_item_amount=record.get('lease_item_amount');
                                 var  residual_value=record.get('residual_value');
                                 var  q_value='${/model/residual_value/record/@residual_value}';
-                                if(total_price!=lease_item_amount){
+                                debugger;
+                                if(total_price!=lease_item_amount &&total_price!=null){
                                     Leaf.showMessage('${l:PROMPT}', '支付计划页面“设备价格”字段值与租赁物明细“设备单价（总）”合计不相等，无法进行提交!');
                                     return;
                                 }else if(q_value!=residual_value){