建行两方

src/main/webapp/modules/ccb/CCB600/ccb_ebank_create.lview

@@ -165,6 +165,7 @@
                 <a:datas>
 <!--                    <a:record code_value="AGRI_THREE" code_value_name="农行扣款（三方）"/>-->
                     <a:record code_value="CCB_THREE" code_value_name="建行扣款（三方）"/>
+                    <a:record code_value="CCB_TWO" code_value_name="建行扣款（两方）"/>
 <!--                    <a:record code_value="AGRI_TWO" code_value_name="农行扣款（两方）"/>-->
                 </a:datas>
             </a:dataSet>
@@ -192,7 +193,7 @@
                     </a:field>
                     <a:field name="bp_id_agent" />
                     <a:field name="bp_id_tenant"/>
-                    <a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov?pay_method=CCB_THREE" lovWidth="470" title="合同">
+                    <a:field name="contract_number" lovGridHeight="350" lovHeight="500" lovService="ccb.CCB600.con_contract_lov?pay_method=${@pay_method}" lovWidth="470" title="合同">
                         <a:mapping>
                             <a:map from="contract_id" to="contract_id"/>
                             <a:map from="contract_number" to="contract_number"/>
@@ -226,8 +227,8 @@
                         </a:mapping>
                     </a:field>
                     <a:field name="currency_name" readOnly="true"/>
-                    <a:field name="pay_method_desc" defaultValue="建行扣款（三方）" required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
-                    <a:field name="pay_method" defaultValue="CCB_THREE"/>
+                    <a:field name="pay_method_desc"  required="true" prompt="支付方式" displayField="code_value_name" options="pay_methods_ds" returnField="pay_method" valueField="code_value"/>
+                    <a:field name="pay_method" />
                     <a:field name="bank_account_name" readOnly="true"/>
                     <a:field name="bank_name" readOnly="true"/>
                     <a:field name="currency" readOnly="true"/>
@@ -245,7 +246,7 @@
                        selectable="true">
             </a:dataSet>
 
-            <a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query?pay_method=CCB_THREE">
+            <a:dataSet id="hls_ccb_grid_ln_ds" fetchAll="true" queryDataSet="hls_ccb_form_query_ds" model="ccb.CCB600.hls_ebank_batch_ln" queryUrl="${/request/@context_path}/autocrud/ccb.CCB600.con_contract_cashflow_query/query?pay_method=${@pay_method}">
                 <a:fields>
                     <a:field name="cashflow_id"/>
                     <a:field name="bp_tenant_name" readOnly="true"/>

src/main/webapp/modules/ccb/CCB600/ccb_ebank_manager.lview

@@ -253,7 +253,7 @@
         function export_batch() {
             var r = $('hls_ccb_batch_result_ds').getCurrentRecord();
             if (r) {
-                if (r.get('pay_method') == 'CCB_THREE') {//建行
+                if (r.get('pay_method') == 'CCB_THREE'||r.get('pay_method') == 'CCB_TWO') {//建行
                     $('hls_ccb_batch_merge_result_grid')._export();
                 } else if (r.get('pay_method') == 'AGRI_TWO' || r.get('pay_method') == 'AGRI_THREE') {
                     $('hls_abc_batch_merge_result_grid')._export();
@@ -272,7 +272,7 @@
             var pay_method = record.get('pay_method');
             var due_date_to = new Date(record.get('due_date')).format('yyyy-mm-dd').toString();
             var bank_type;
-            if (pay_method == 'CCB_THREE') {
+            if (pay_method == 'CCB_THREE'||pay_method == 'CCB_TWO') {
                 bank_type = 'CCB';
                 str = '建行';
             } else if (pay_method == 'AGRI_TWO' || pay_method == 'AGRI_THREE') {
@@ -372,6 +372,7 @@
                               width="100"/>
                     <a:column name="total_success_count" align="right" prompt="扣款成功账号数" width="100"/>
                     <a:column name="message" align="right" prompt="错误消息" width="150"/>
+                    <a:column name="pay_method_desc" align="center" prompt="支付方式" width="120"/>
                 </a:columns>
             </a:grid>
             <a:grid hidden="true" width="1" height="1" id="hls_ccb_batch_merge_result_grid"
@@ -390,23 +391,23 @@
                     <a:column prompt="备注（选填）"/>
                 </a:columns>
             </a:grid>
-<!--            <a:grid hidden="true" width="1" height="1" id="hls_abc_batch_merge_result_grid"-->
-<!--                    bindTarget="hls_ccb_batch_merge_result_ds">-->
-<!--                <a:columns>-->
-<!--                    <a:column name="abc_sequence_num" prompt="serial-no"/>-->
-<!--                    <a:column name="abc_pay_type" prompt="pay-type"/>-->
-<!--                    <a:column name="abc_transaction_type" prompt="transaction-type"/>-->
-<!--                    <a:column name="csh_bank_account_num" prompt="account-no"/>-->
-<!--                    <a:column name="csh_bank_account_name" prompt="account-name"/>-->
-<!--                    <a:column name="bank_account_num" prompt="payee-account-to"/>-->
-<!--                    <a:column name="bank_account_name" prompt="payee-name"/>-->
-<!--                    <a:column name="abc_payee_bank" prompt="payee-bank"/>-->
-<!--                    <a:column name="abc_usage" prompt="usage"/>-->
-<!--                    <a:column name="abc_fen_code" prompt="fen-code"/>-->
-<!--                    <a:column name="abc_curr_flag" prompt="curr-flag"/>-->
-<!--                    <a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="amount"/>-->
-<!--                </a:columns>-->
-<!--            </a:grid>-->
+            <!--            <a:grid hidden="true" width="1" height="1" id="hls_abc_batch_merge_result_grid"-->
+            <!--                    bindTarget="hls_ccb_batch_merge_result_ds">-->
+            <!--                <a:columns>-->
+            <!--                    <a:column name="abc_sequence_num" prompt="serial-no"/>-->
+            <!--                    <a:column name="abc_pay_type" prompt="pay-type"/>-->
+            <!--                    <a:column name="abc_transaction_type" prompt="transaction-type"/>-->
+            <!--                    <a:column name="csh_bank_account_num" prompt="account-no"/>-->
+            <!--                    <a:column name="csh_bank_account_name" prompt="account-name"/>-->
+            <!--                    <a:column name="bank_account_num" prompt="payee-account-to"/>-->
+            <!--                    <a:column name="bank_account_name" prompt="payee-name"/>-->
+            <!--                    <a:column name="abc_payee_bank" prompt="payee-bank"/>-->
+            <!--                    <a:column name="abc_usage" prompt="usage"/>-->
+            <!--                    <a:column name="abc_fen_code" prompt="fen-code"/>-->
+            <!--                    <a:column name="abc_curr_flag" prompt="curr-flag"/>-->
+            <!--                    <a:column name="actual_amount" align="right" renderer="Leaf.formatMoney" prompt="amount"/>-->
+            <!--                </a:columns>-->
+            <!--            </a:grid>-->
         </a:screenBody>
     </a:view>
 </a:screen>

src/main/webapp/modules/cont/CON731/hls_con_contract_change_detail.lview

@@ -247,7 +247,7 @@
                             record.getField('bank_account_id').setRequired(true);
                             record.getField('bank_account_id_n').setRequired(true);
                             record.set('withhold_way', 'ABC_2');
-                        } else if (value == 'CCB_THREE') {
+                        } else if (value == 'CCB_THREE'||value == 'CCB_TWO') {
                             record.getField('bank_account_id').setReadOnly(false);
                             record.getField('bank_account_id_n').setReadOnly(false);
                             record.getField('bank_account_id').setRequired(true);
@@ -258,7 +258,7 @@
                     //新增 “限制金额”字段；
                     //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
                     if (name == 'pay_method') {
-                        if (value == 'CCB_THREE') {
+                        if (value == 'CCB_THREE'||value == 'CCB_TWO') {
                             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'block';
                             record.getField('deduction_limit').setRequired(true);
@@ -300,7 +300,7 @@
                             record.getField('bank_account_id').setRequired(true);
                             record.getField('bank_account_id_n').setRequired(true);
                             record.set('withhold_way', 'ABC_2');
-                        } else if (value == 'CCB_THREE') {
+                        } else if (value == 'CCB_THREE'||value == 'CCB_TWO') {
                             record.getField('bank_account_id').setReadOnly(false);
                             record.getField('bank_account_id_n').setReadOnly(false);
                             record.getField('bank_account_id').setRequired(true);
@@ -311,7 +311,7 @@
                     //新增 “限制金额”字段；
                     //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
                     if (name == 'pay_method') {
-                        if (value == 'CCB_THREE') {
+                        if (value == 'CCB_THREE'|| value == 'CCB_TWO') {
                             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                             document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'block';
                             record.getField('deduction_limit').setRequired(true);
@@ -399,7 +399,7 @@
                 if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY' || '${/parameter/@layout_code}' == 'CON_TENANT_CHANGE_MODIFY') {
                     //新增 “限制金额”字段；
                     //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
-                    if (record.get('pay_method') == 'CCB_THREE') {
+                    if (record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') {
                         document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                         document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT').style.display = 'block';
                         record.getField('deduction_limit').setRequired(true);
@@ -411,7 +411,7 @@
                 }
                 //原楼扣款限额隐藏
                 if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY') {
-                    if (record.get('pay_method_old') == 'CCB_THREE') {
+                    if (record.get('pay_method_old') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') {
                         document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT_S_prompt').style.display = 'block';
                         document.getElementById('${/parameter/@layout_code}_F_QUOTATION_01_CON_CONTRACT_DEDUCTION_LIMIT_S').style.display = 'block';
                     } else {
@@ -839,7 +839,7 @@
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'con_contract');
             if (ds_id == ds.id && ds_id) {
                 if ('${/parameter/@layout_code}' == 'CON_ACCOUNT_CHANGE_MODIFY' || '${/parameter/@layout_code}' == 'CON_TENANT_CHANGE_MODIFY') {
-                    if (record.get('pay_method') == 'CCB_THREE') {
+                    if (record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') {
                         if (record.get('deduction_limit') <= 0) {
                             Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额应大于0');
                             return false;

src/main/webapp/modules/prj/PRJ500N/prj_project_create.lview

@@ -370,7 +370,7 @@
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
             if (prj_project_ds_id == ds.id && prj_project_ds_id) {
-                if (record.get('pay_method') == 'CCB_THREE' && record.get('deduction_limit') <=0) {
+                if ((record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') && record.get('deduction_limit') <=0) {
                     Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额应大于0');
                     return false;
                 }
@@ -614,8 +614,27 @@
             return returnAge;//返回周岁年龄  
         }
         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 ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
+            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'))){
+                    record.set('send_message', 'YES');
+                    record.set('send_message_n', '是');
+                    record.getField('cell_phone').setRequired(true);
+                } else if( record.get('send_message') == 'YES'){
+                    record.getField('cell_phone').setRequired(true);
+                }
+
+                if (Leaf.isEmpty(record.get('cell_phone'))){
+                    record.set('cell_phone', record.get('phone_number'));
+                }
+
+
+            }
             var prj_quotation_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_quotation');
             if (prj_quotation_ds_id == ds.id && prj_quotation_ds_id) {
                 debugger;
@@ -734,8 +753,8 @@
                     document.getElementById('${/parameter/@layout_code}_F_BASIC_INFO_1_PRJ_PROJECT_CREDIT_LINE').style.display = 'none';
                 }
                 //新增 “限制金额”字段；
-                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
-                if (record.get('PAY_METHOD') == 'CCB_THREE') {
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”或"建行扣款（两方）"时展示，必填，大于0，默认20万，可修改；
+                if (record.get('PAY_METHOD') == 'CCB_THREE'||record.get('PAY_METHOD') == 'CCB_TWO') {
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
                     record.getField('deduction_limit').setRequired(true);
@@ -765,6 +784,31 @@
 
             var prj_project_history_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'T_HISTORY_INGO', 'hls_bp_master');
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
+            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&&tenant_ds_id){
+
+                if(name == 'send_message_n'){
+                    if(value=='是'){
+                        record.getField('cell_phone').setRequired(true);
+                    } else if(value=='否'){
+                        record.getField('cell_phone').setRequired(false);
+                    }
+                }
+
+            }
+
+            var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
+            if (lease_item_ds_id == ds.id && lease_item_ds_id) {
+                if(division=='30'||division=='50'||division=='80'){
+                    record.getField('set_number').setRequired(true);
+                }else{
+                    record.getField('set_number').setReadOnly(true);
+                    if(Ext.isEmpty(record.get('set_number'))){
+                        record.set('set_number',1);
+                    }
+                }
+            }
             var lease_item_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'G_LEASE_HEAD_CAR', 'prj_project_lease_item');
             if (lease_item_ds_id == ds.id && lease_item_ds_id) {
                 if(division=='70'){
@@ -918,9 +962,10 @@
 
                 }
                 //新增 “限制金额”字段；
-                //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
+                //“扣款限额”：“租金支付方式”为“建行扣款（三方）或建行扣款（两方）”时展示，必填，大于0，默认20万，可修改；
                 if (name=='pay_method') {
-                    if(value=='CCB_THREE'){
+                    debugger;
+                    if(value=='CCB_THREE'||value=='CCB_TWO'){
                         document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                         document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
                         record.getField('deduction_limit').setRequired(true);
@@ -1020,6 +1065,7 @@
                         record.getField('modelcd').setReadOnly(true);
                     }
                 }
+
             }
             if (bp_ds_id == ds.id && bp_ds_id) {
                 if (record.get('bp_category') == 'TENANT') {

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

@@ -812,7 +812,7 @@
                 //新增 “限制金额”字段；
                 //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
                 if (name=='pay_method') {
-                    if(value=='CCB_THREE'){
+                    if(value=='CCB_THREE'||value=='CCB_TWO'){
                         document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                         document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
                         record.getField('deduction_limit').setRequired(true);
@@ -996,7 +996,7 @@
 
                 //新增 “限制金额”字段；
                 //“扣款限额”：“租金支付方式”为“建行扣款（三方）”时展示，必填，大于0，默认20万，可修改；
-                if (record.get('pay_method') == 'CCB_THREE') {
+                if (record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') {
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT_prompt').style.display = 'block';
                     document.getElementById('${/parameter/@layout_code}_F_PAY_INFO_PRJ_PROJECT_DEDUCTION_LIMIT').style.display = 'block';
                     record.getField('deduction_limit').setRequired(true);
@@ -1651,7 +1651,7 @@
             var score_ds_id = get_dsid_by_tabcode_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'F_TENANT_SCORE_INFO', 'bp_tenant_rate_detail');
             var bp_tenant_detail_r = $(score_ds_id).getCurrentRecord();
             if (prj_project_ds_id == ds.id && prj_project_ds_id) {
-                if (record.get('pay_method') == 'CCB_THREE' && record.get('deduction_limit') <= 0) {
+                if ((record.get('pay_method') == 'CCB_THREE'||record.get('pay_method') == 'CCB_TWO') && record.get('deduction_limit') <= 0) {
                     Leaf.showMessage('${l:HLS.PROMPT}', '扣款限额应大于0');
                     return false;
                 }