Skip to content

L
leaf-hlcm
Commit 8a7b6826 authored by Darming's avatar Darming
Browse files
Options

Merge branch 'feature/start_bugs' into develop

parents 1722205b 20c696ad
Pipeline #3188 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 22 additions and 18 deletions
      src/main/webapp/WEB-INF/classes/csh/CSH531N/con_contract.lwm
      View file @ 8a7b6826
      ...@@ -55,7 +55,7 @@ select t.parent_company_id company_id ...@@ -55,7 +55,7 @@ select t.parent_company_id company_id
      <bm:query-field field="dd_bank_account_num" queryOperator="="/> <bm:query-field field="dd_bank_account_num" queryOperator="="/>
      <bm:query-field field="dd_bank_account_name" queryOperator="="/> <bm:query-field field="dd_bank_account_name" queryOperator="="/>
      <bm:query-field name="bp_id" <bm:query-field name="bp_id"
      queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id})"/> queryExpression="(t.bp_id_tenant = ${@bp_id} or t.bp_id_agent_level1 = ${@bp_id} or ((select bp_category from hls_bp_master where bp_id = ${@bp_id}) = 'VENDER'))"/>
      <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/> <bm:query-field name="bp_name" queryExpression="t.bp_name like '%' || ${@bp_name} || '%'"/>
      </bm:query-fields> </bm:query-fields>
      </bm:model> </bm:model>
      src/main/webapp/leafresource/leaf.ui.std/hap/base/Leaf-all-min.js
      View file @ 8a7b6826
      ...@@ -7771,8 +7771,11 @@ $L.ComboBox = Ext.extend($L.TriggerField, { ...@@ -7771,8 +7771,11 @@ $L.ComboBox = Ext.extend($L.TriggerField, {
      'select'); 'select');
      var self = this; var self = this;
      Ext.get(document.body)['on']("mousewheel", function(){ Ext.get(document.body)['on']("mousewheel", function(){
      self.collapse(); if(self.popup) {
      self.collapse();
      }
      }, self); }, self);
      }, },
      // onTriggerClick : function() { // onTriggerClick : function() {
      // this.doQuery(); // this.doQuery();
      ......
      src/main/webapp/modules/cont/CON1250/receipts_details_write.lview
      View file @ 8a7b6826
      ...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
      <a:column name="transaction_date" prompt="收款日期" width="100" renderer="Leaf.formatDate"/> <a:column name="transaction_date" prompt="收款日期" width="100" renderer="Leaf.formatDate"/>
      <a:column name="cf_item_n" prompt="核销现金流" /> <a:column name="cf_item_n" prompt="核销现金流" />
      <a:column name="times" prompt="核销期数" width="80"/> <a:column name="times" prompt="核销期数" width="80"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100" footerRenderer="summaryRenderer"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100" footerRenderer="summaryRenderer"/>-->
      <a:column name="write_off_due_amount" prompt="核销金额" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/> <a:column name="write_off_due_amount" prompt="核销金额" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
      <a:column name="write_off_principal" prompt="核销本金" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/> <a:column name="write_off_principal" prompt="核销本金" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
      <a:column name="write_off_interest" prompt="核销利息" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/> <a:column name="write_off_interest" prompt="核销利息" width="100" renderer="Leaf.formatMoney" footerRenderer="summaryRenderer"/>
      ......
      src/main/webapp/modules/cont/CON302N/con_cashflow_wirte_off_detail.lview
      View file @ 8a7b6826
      ...@@ -29,7 +29,7 @@ $Purpose: ...@@ -29,7 +29,7 @@ $Purpose:
      <a:grid marginHeight="300" marginWidth="30" bindtarget="con302n_con_cashflow_write_off_ds" id="con302n_con_cashflow_write_off_grid"> <a:grid marginHeight="300" marginWidth="30" bindtarget="con302n_con_cashflow_write_off_ds" id="con302n_con_cashflow_write_off_grid">
      <a:columns> <a:columns>
      <a:column name="write_off_type_desc" prompt="核销类型" width="120"/> <a:column name="write_off_type_desc" prompt="核销类型" width="120"/>
      <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/> <!-- <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>-->
      <a:column name="journal_date" prompt="核销日期" renderer="Leaf.formatDate" width="120"/> <a:column name="journal_date" prompt="核销日期" renderer="Leaf.formatDate" width="120"/>
      <a:column name="write_off_due_amount" prompt="核销金额" renderer="Leaf.formatMoney" width="120"/> <a:column name="write_off_due_amount" prompt="核销金额" renderer="Leaf.formatMoney" width="120"/>
      <a:column name="transaction_num" prompt="收款编号" width="120"/> <a:column name="transaction_num" prompt="收款编号" width="120"/>
      ......
      src/main/webapp/modules/csh/CSH1000/csh_agent_deposit_source.lview
      View file @ 8a7b6826
      ...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
      <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100"> <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
      <a:columns> <a:columns>
      <a:column name="write_off_type" prompt="核销类型" width="200"/> <a:column name="write_off_type" prompt="核销类型" width="200"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
      <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/> <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
      <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/> <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
      <a:column name="bp_name" prompt="退款/核销对象" width="250"/> <a:column name="bp_name" prompt="退款/核销对象" width="250"/>
      ...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
      <a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100"> <a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
      <a:columns> <a:columns>
      <a:column name="write_off_type_n" prompt="核销类型" width="100"/> <a:column name="write_off_type_n" prompt="核销类型" width="100"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
      <a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/> <a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/>
      <a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/> <a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/>
      <a:column name="contract_number" prompt="合同号" width="150"/> <a:column name="contract_number" prompt="合同号" width="150"/>
      ......
      src/main/webapp/modules/csh/CSH1000/csh_deposit_pool_source.lview
      View file @ 8a7b6826
      ...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
      <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100"> <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
      <a:columns> <a:columns>
      <a:column name="write_off_type" prompt="核销类型" width="200"/> <a:column name="write_off_type" prompt="核销类型" width="200"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
      <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/> <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
      <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/> <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
      <a:column name="bp_name" prompt="退款/核销对象" width="250"/> <a:column name="bp_name" prompt="退款/核销对象" width="250"/>
      ......
      src/main/webapp/modules/csh/CSH1000/csh_deposit_source.lview
      View file @ 8a7b6826
      ...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
      <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100"> <a:grid id="source_to_grid" bindTarget="source_to_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
      <a:columns> <a:columns>
      <a:column name="write_off_type" prompt="核销类型" width="200"/> <a:column name="write_off_type" prompt="核销类型" width="200"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
      <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/> <a:column name="write_off_date" prompt="日期" align="center" renderer="Leaf.formatDate"/>
      <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/> <a:column name="write_off_due_amount" align="right" prompt="金额" width="150" renderer="Leaf.formatMoney"/>
      <a:column name="bp_name" prompt="退款/核销对象" width="250"/> <a:column name="bp_name" prompt="退款/核销对象" width="250"/>
      ...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
      <a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100"> <a:grid id="source_from_grid" bindTarget="source_from_grid_ds" title="现金流信息" navbar="true" height="250" marginWidth="100">
      <a:columns> <a:columns>
      <a:column name="write_off_type_n" prompt="核销类型" width="100"/> <a:column name="write_off_type_n" prompt="核销类型" width="100"/>
      <a:column name="write_off_classification_n" prompt="核销分类" width="100"/> <!-- <a:column name="write_off_classification_n" prompt="核销分类" width="100"/>-->
      <a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/> <a:column name="write_off_date" prompt="核销日期" align="center" renderer="Leaf.formatDate"/>
      <a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/> <a:column name="write_off_due_amount" align="right" prompt="核销金额" width="150" renderer="Leaf.formatMoney"/>
      <a:column name="contract_number" prompt="合同号" width="150"/> <a:column name="contract_number" prompt="合同号" width="150"/>
      ......
      src/main/webapp/modules/csh/CSH301/csh_transaction_write_off_detail_query1.lview
      View file @ 8a7b6826
      ...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
      <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="110"/> <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="110"/>
      <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME" width="180"/> <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME" width="180"/>
      <a:column name="bp_name" prompt="CSH513.BP_TENANT" width="180"/> <a:column name="bp_name" prompt="CSH513.BP_TENANT" width="180"/>
      <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/> <!-- <a:column name="write_off_classification_desc" prompt="核销分类" width="120"/>-->
      </a:columns> </a:columns>
      </a:grid> </a:grid>
      </a:screenBody> </a:screenBody>
      ......
      src/main/webapp/modules/csh/CSH514/csh_transaction_receipt_write_off_reverse_detail.lview
      View file @ 8a7b6826
      ...@@ -129,12 +129,13 @@ ...@@ -129,12 +129,13 @@
      } }
      } }
      //排序
      saveData.sort(function (a, b) {
      return b.write_off_id - a.write_off_id;
      });
      } }
      //排序
      saveData.sort(function (a, b) {
      return b.write_off_id - a.write_off_id;
      });
      //区别批量核销和单笔核销 //区别批量核销和单笔核销
      var url; var url;
      // if ('${/parameter/@ref_n01}' && '${/parameter/@ref_n01}' != 'undefined') { // if ('${/parameter/@ref_n01}' && '${/parameter/@ref_n01}' != 'undefined') {
      ...@@ -285,7 +286,7 @@ ...@@ -285,7 +286,7 @@
      <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="150"/> <a:column name="contract_number" prompt="HLS.CONTRACT_NUMBER" width="150"/>
      <!-- <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME"/> --> <!-- <a:column name="project_name" prompt="PRJ501.PRJ_PROJECT.PROJECT_NAME"/> -->
      <a:column name="bp_name" prompt="CSH513.BP_TENANT"/> <a:column name="bp_name" prompt="CSH513.BP_TENANT"/>
      <a:column name="write_off_classification_desc" prompt="核销分类"/> <!-- <a:column name="write_off_classification_desc" prompt="核销分类"/>-->
      <a:column name="gld_batch_id" prompt="核销批次号"/> <a:column name="gld_batch_id" prompt="核销批次号"/>
      </a:columns> </a:columns>
      </a:grid> </a:grid>
      ......
      src/main/webapp/modules/csh/CSH532N/csh_write_off_assigns.lview
      View file @ 8a7b6826
      ...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
      <!--<a:map from="bp_name" to="write_off_bp_name"/>--> <!--<a:map from="bp_name" to="write_off_bp_name"/>-->
      <!--</a:mapping>--> <!--</a:mapping>-->
      <!--</a:field>--> <!--</a:field>-->
      <a:field name="write_off_classification_desc" prompt="核销分类" options="ds_csh_write_off_classification_ds" returnField="write_off_classification" valueField="code_value" displayField="code_value_name"/> <!-- <a:field name="write_off_classification_desc" prompt="核销分类" options="ds_csh_write_off_classification_ds" returnField="write_off_classification" valueField="code_value" displayField="code_value_name"/>-->
      <a:field name="write_off_cf_item" readOnly="true"/> <a:field name="write_off_cf_item" readOnly="true"/>
      <a:field name="write_off_cf_item_desc" displayField="cf_item_desc" options="write_off_cf_item_ds" returnField="write_off_cf_item" valueField="cf_item"/> <a:field name="write_off_cf_item_desc" displayField="cf_item_desc" options="write_off_cf_item_ds" returnField="write_off_cf_item" valueField="cf_item"/>
      </a:fields> </a:fields>
      ...@@ -507,7 +507,7 @@ ...@@ -507,7 +507,7 @@
      <!--<a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/>-->
      <!--&lt;!&ndash;<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>&ndash;&gt;--> <!--&lt;!&ndash;<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>&ndash;&gt;-->
      <!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>-->
      <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类" /> <!-- <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类" />-->
      <a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日期" width="120"/> <a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日期" width="120"/>
      <a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/> <a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/>
      <!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>-->
      ...@@ -537,7 +537,7 @@ ...@@ -537,7 +537,7 @@
      <a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/> <a:column name="left_amount" align="right" footerRenderer="summaryRenderer" prompt="剩余金额" renderer="Leaf.formatMoney" width="120"/>
      <!--<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="left_principal" align="right" footerRenderer="summaryRenderer" prompt="剩余本金" renderer="Leaf.formatMoney" width="120"/>-->
      <!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="left_interest" align="right" footerRenderer="summaryRenderer" prompt="剩余利息" renderer="Leaf.formatMoney" width="120"/>-->
      <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类"/> <!-- <a:column name="write_off_classification_desc" editorFunction="csh_edit_function" prompt="核销分类"/>-->
      <a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日" width="120"/> <a:column name="write_off_date" align="center" editorFunction="csh_edit_function" renderer="Leaf.formatDate" prompt="核销基准日" width="120"/>
      <a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/> <a:column name="write_off_amount" align="right" editorFunction="csh_edit_function" footerRenderer="summaryRenderer" prompt="CSH531.AMOUNT" renderer="Leaf.formatMoney" width="120"/>
      <!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>--> <!--<a:column name="write_off_principal" align="right" prompt="分配本金" renderer="Leaf.formatMoney" width="120"/>-->
      ......
      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