Skip to content

L
leaf-hlcm
Commit c1c3b7a4 authored by niminmin's avatar niminmin
Browse files
Options

Merge branch 'feature/报价刷新修改' into develop

parents 1ec364eb e278a8b5
Pipeline #2963 canceled with stages
      Show whitespace changes
      Inline Side-by-side
      Showing with 146 additions and 73 deletions
      src/main/java/com/hand/hls/hlcm/util/Test4.java 0 → 100644
      View file @ c1c3b7a4
      package com.hand.hls.hlcm.util;
      import java.io.File;
      import java.io.FileInputStream;
      import java.io.FileOutputStream;
      import java.io.IOException;
      import java.nio.channels.FileChannel;
      public class Test4 {
      public void fileChannelCopy(File s, File t) {
      FileInputStream fi = null;
      FileOutputStream fo = null;
      FileChannel in = null;
      FileChannel out = null;
      try {
      fi = new FileInputStream(s);
      fo = new FileOutputStream(t);
      in = fi.getChannel();//得到对应的文件通道
      out = fo.getChannel();//得到对应的文件通道
      in.transferTo(0, in.size(), out);//连接两个通道，并且从in通道读取，然后写入out通道
      } catch (IOException e) {
      e.printStackTrace();
      } finally {
      try {
      fi.close();
      in.close();
      fo.close();
      out.close();
      } catch (IOException e) {
      e.printStackTrace();
      }
      }
      }
      public static void main(String[] args) {
      Test4 test4=new Test4();
      File s=new File("D:\\ttt\\tt3.docx");
      File t=new File("D:\\ttt\\ttt4.docx");
      long start,end;
      start =System.currentTimeMillis();
      test4.fileChannelCopy(s,t);
      end =System.currentTimeMillis();
      System.out.println("用时"+(end-start)+"ms");
      }
      }
      src/main/webapp/modules/csh/CSH515/csh_transaction_returned_list.lview
      View file @ c1c3b7a4
      ...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
      <!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> --> <!-- <a:column name="bank_account_num" prompt="CSH511.BANK_ACCOUNT_NUM"/> -->
      <a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/> <a:column name="bp_name" prompt="HLS.BP_NAME" align="center"/>
      <a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/> <a:column name="bp_category_display" prompt="CSH511.CSH_TRANSACTION.BP_CATEGORY" align="center"/>
      <a:column name="bank_slip_num" prompt="CSH511.CSH_TRANSACTION.BANK_SLIP_NUM" align="center"/> <a:column name="bank_slip_num" prompt="银行流水号" align="center"/>
      <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/> <a:column name="user_desc" prompt="HLS.DOCUMENT_CREATED_BY" align="center"/>
      <a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/> <a:column align="center" prompt="附件查看" renderer="csh515_attachment_download" width="80"/>
      </a:columns> </a:columns>
      ......
      src/main/webapp/modules/prj/PRJ500N/prj_project_create_special.lview
      View file @ c1c3b7a4
      ...@@ -46,27 +46,27 @@ ...@@ -46,27 +46,27 @@
      var isLoaded = 'N'; var isLoaded = 'N';
      // set单元格颜色 load事件无法实现效果 // set单元格颜色 load事件无法实现效果
      //hongquan.dai 20180125 //hongquan.dai 20180125
      var check_isload = setInterval(function() { // var check_isload = setInterval(function() {
      if (isLoaded == 'N') { // if (isLoaded == 'N') {
      // var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds'); // // var ids = $('${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_ds');
      var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref'); // var ids = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_cdd_item_doc_ref');
      var idsRecord = $(ids).getAll(); // var idsRecord = $(ids).getAll();
      for (var i = 0;i < idsRecord.length;i++) { // for (var i = 0;i < idsRecord.length;i++) {
      var rowData = idsRecord[i]; // var rowData = idsRecord[i];
      var important_flag = rowData.get('important_flag'); // var important_flag = rowData.get('important_flag');
      //important_flag 是否必须上传 // //important_flag 是否必须上传
      if (important_flag == 'Y') { // if (important_flag == 'Y') {
      //普通动态布局 布局代码+组件名+基表名+_layout_grid_id-u- // //普通动态布局 布局代码+组件名+基表名+_layout_grid_id-u-
      //支撑文件 布局代码+组件名+基表名+_grid_id-u- // //支撑文件 布局代码+组件名+基表名+_grid_id-u-
      //tr_id = '#${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_layout_grid_id-u-' + rowData.id; // //tr_id = '#${/parameter/@layout_code}_ACY_prj_cdd_item_doc_ref_layout_grid_id-u-' + rowData.id;
      tr_id = '#${/parameter/@layout_code}_ACY_con_contract_grid_id-u-' + rowData.id; // tr_id = '#${/parameter/@layout_code}_ACY_con_contract_grid_id-u-' + rowData.id;
      jQuery(tr_id).addClass('redBG'); // jQuery(tr_id).addClass('redBG');
      } // }
      } // }
      } else { // } else {
      clearInterval(check_isload); // clearInterval(check_isload);
      } // }
      }, 1000); // }, 1000);
      window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() { window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function() {
      new Leaf.Window({ new Leaf.Window({
      id: 'contract_history_window', id: 'contract_history_window',
      ...@@ -659,57 +659,57 @@ ...@@ -659,57 +659,57 @@
      }; };
      Leaf.onReady(function() { // Leaf.onReady(function() {
      var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project'); // var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
      var head_record = $(ds_id).getAt(0); // var head_record = $(ds_id).getAt(0);
      head_record.set('owner_user_id', '${/model/user_name_path/record/@user_id}'); // head_record.set('owner_user_id', '${/model/user_name_path/record/@user_id}');
      head_record.set('owner_user_id_n', '${/model/user_name_path/record/@user_id_n}'); // head_record.set('owner_user_id_n', '${/model/user_name_path/record/@user_id_n}');
      head_record.set('owner_user_tel', '${/model/user_name_path/record/@phone}'); // head_record.set('owner_user_tel', '${/model/user_name_path/record/@phone}');
      Leaf.request({ // Leaf.request({
      url: $('get_car_organization_id').getUrl(), // url: $('get_car_organization_id').getUrl(),
      para: { // para: {
      unit_id: head_record.get('unit_id') // unit_id: head_record.get('unit_id')
      }, // },
      success: function(data) { // success: function(data) {
      if (data.result.record && !data.result.record.length) { // if (data.result.record && !data.result.record.length) {
      head_record.set('organization_id', data.result.record.organization_id); // head_record.set('organization_id', data.result.record.organization_id);
      head_record.set('organization_id_n', data.result.record.organization_name); // head_record.set('organization_id_n', data.result.record.organization_name);
      } else { // } else {
      //没有找到值置空 // //没有找到值置空
      head_record.set('organization_id', ''); // head_record.set('organization_id', '');
      head_record.set('organization_id_n', ''); // head_record.set('organization_id_n', '');
      } // }
      //
      }, // },
      failure: function() { // failure: function() {
      //
      }, // },
      error: function() { // error: function() {
      //
      }, // },
      scope: this // scope: this
      }); // });
      //公司带出区域 // //公司带出区域
      Leaf.request({ // Leaf.request({
      url: $('get_company_distrct_link').getUrl(), // url: $('get_company_distrct_link').getUrl(),
      para: { // para: {
      company_id: head_record.get('company_id') // company_id: head_record.get('company_id')
      }, // },
      success: function(data) { // success: function(data) {
      if (data.result.record && !data.result.record.length) { // if (data.result.record && !data.result.record.length) {
      head_record.set('district', data.result.record.district); // head_record.set('district', data.result.record.district);
      head_record.set('district_n', data.result.record.district_n); // head_record.set('district_n', data.result.record.district_n);
      } // }
      }, // },
      failure: function() { // failure: function() {
      //
      }, // },
      error: function() { // error: function() {
      //
      }, // },
      scope: this // scope: this
      }); // });
      }); // });
      //新增和加载时调用(form) //新增和加载时调用(form)
      window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records) { window['${/parameter/@layout_code}_on_layout_dynamic_form_add_and_load'] = function(ds, record, config_records) {
      ......
      src/main/webapp/modules/prj/PRJ501N/prj_project_maintain.lview
      View file @ c1c3b7a4
      ...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
      }); });
      win.on('close', function () { win.on('close', function () {
      alert(111);
      $(quotation_ds_id).query(); $(quotation_ds_id).query();
      $(history_ds_id).query(); $(history_ds_id).query();
      ...@@ -234,6 +235,7 @@ ...@@ -234,6 +235,7 @@
      draggable: true draggable: true
      }); });
      win.on('close', function () { win.on('close', function () {
      alert(222);
      $(quotation_ds_id).query(); $(quotation_ds_id).query();
      $(history_ds_id).query(); $(history_ds_id).query();
      }); });
      ...@@ -284,6 +286,7 @@ ...@@ -284,6 +286,7 @@
      draggable: true draggable: true
      }); });
      win.on('close', function () { win.on('close', function () {
      alert(333);
      $(quotation_ds_id).query(); $(quotation_ds_id).query();
      $(history_ds_id).query(); $(history_ds_id).query();
      ...@@ -558,6 +561,9 @@ function prj501n_contract_number_renderer(id, name, query_only){ ...@@ -558,6 +561,9 @@ function prj501n_contract_number_renderer(id, name, query_only){
      var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}'; var url='${/request/@context_path}/autocrud/prj.PRJ501N.prj_project_history_display/query?project_id=${/parameter/@project_id}&bp_id=${/parameter/@bp_id}';
      $(bp_ds_id).setQueryUrl(url); $(bp_ds_id).setQueryUrl(url);
      $(bp_ds_id).query(); $(bp_ds_id).query();
      var quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
      alert(111);
      $(quotation_ds_id).query();
      }) })
      //序号自增 add by lijingjing //序号自增 add by lijingjing
      window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) { window['${/parameter/@bp_seq}${/parameter/@layout_code}_on_layout_dynamic_grid_add'] = function(ds, record, config_records, bp_seq) {
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment