Merge branch 'refs/heads/feature/ap_invoice_import' into develop

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

@@ -203,12 +203,12 @@
                               renderer="con560_render_contractMaintainDs_grid" width="150"/>
                     <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="100"/>
                     <a:column name="inception_of_lease" prompt="起租日期" renderer="Leaf.formatDate" width="100"/>
-                    <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="100"/>
+<!--                    <a:column name="lease_end_date" prompt="合同预计结束日期" renderer="Leaf.formatDate" width="100"/>-->
                     <a:column name="is_terminate" prompt="租金是否结清" width="100"/>
                     <a:column name="residual_value" align="right" prompt="留购价" renderer="Leaf.formatMoney" width="50"/>
                     <!--<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="signing_date" prompt="签约时间" renderer="Leaf.formatDate" width="100"/>-->
+<!--                    <a:column name="signing_location" prompt="签约地点" width="100"/>-->
                     <!--<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"/>

src/main/webapp/modules/hls/HLS303/bp_agent_create.lview

@@ -417,24 +417,23 @@
                 var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hls_bp_master');
                 var bp_record = $(ds_id).getCurrentRecord();
                 if (ds_id == ds.id) {
-                    // record.set('taxpayer_type','Y');
-                    // record.set('taxpayer_type_n','否');
-                    if (record.get('taxpayer_type') == 'Y') {
-                        record.getField('tax_registry_num').setRequired(true);
-                        record.getField('invoice_bp_address').setRequired(true);
-                        record.getField('invoice_title').setRequired(true);
-                        record.getField('invoice_bp_phone_num').setRequired(true);
-                        record.getField('invoice_bp_bank').setRequired(true);
-                        record.getField('invoice_bp_bank_account_id').setRequired(true);
-                    } else {
-                        record.getField('tax_registry_num').setRequired(false);
-                        record.getField('invoice_bp_address').setRequired(false);
-                        record.getField('invoice_title').setRequired(false);
-                        record.getField('invoice_bp_phone_num').setRequired(false);
-                        record.getField('invoice_bp_bank').setRequired(false);
-                        record.getField('invoice_bp_bank_account_id').setRequired(false);
-                    }
-
+                    record.set('taxpayer_type','GENERAL_TAXPAYER');
+                    record.set('taxpayer_type_n','一般纳税人');
+                    // if (record.get('taxpayer_type') == 'Y') {
+                    //     record.getField('tax_registry_num').setRequired(true);
+                    //     record.getField('invoice_bp_address').setRequired(true);
+                    //     record.getField('invoice_title').setRequired(true);
+                    //     record.getField('invoice_bp_phone_num').setRequired(true);
+                    //     record.getField('invoice_bp_bank').setRequired(true);
+                    //     record.getField('invoice_bp_bank_account_id').setRequired(true);
+                    // } else {
+                    //     record.getField('tax_registry_num').setRequired(false);
+                    //     record.getField('invoice_bp_address').setRequired(false);
+                    //     record.getField('invoice_title').setRequired(false);
+                    //     record.getField('invoice_bp_phone_num').setRequired(false);
+                    //     record.getField('invoice_bp_bank').setRequired(false);
+                    //     record.getField('invoice_bp_bank_account_id').setRequired(false);
+                    // }
                     bp_record.set('employee_id', '${/model/employee_id_path/record/@employee_id}');
                     bp_record.set('employee_id_n', '${/model/employee_id_path/record/@employee_name}');
 

src/main/webapp/modules/hls/HLS303/bp_agent_entrance.lview

@@ -216,7 +216,7 @@
                     <a:column name="bp_name" align="center" prompt="代理店名称" width="280"/>
                     <a:column name="extra_nam" align="center" prompt="代理店简称" width="130"/>
                     <a:column name="enabled_flag" align="center" prompt="代理店状态" width="100"/>
-                    <a:column name="sbo_bp_message" align="left" prompt="SBO反馈信息" width="100"/>
+                    <a:column name="sbo_bp_message" align="left" prompt="SBO反馈信息" width="350"/>
 <!--                    <a:column name="agent_instance_status_n" align="center" prompt="工作流状态" width="150"/>-->
                 </a:columns>
             </a:grid>