Merge branch 'develop' of https://hel.hand-china.com/hlcm/leaf-hlcm into develop

src/main/webapp/WEB-INF/classes/acp/ACP522/acp_invoice_inf_import.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    $Author: zhuxianfei
+    $Date: 2018/7/26 14:11
+    $Revision: 1.0
+-->
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+                begin
+                acp_invoice_import_pkg.acp_invoice_import(p_invoice_type    => ${@invoice_type},
+                                                          p_invoice_code    => ${@invoice_code},
+                                                          p_invoice_number  => ${@invoice_number},
+                                                          p_net_amount      => ${@net_amount},
+                                                          p_invoice_date    => ${@invoice_date},
+                                                          p_last_updated_by => ${/session/@user_id},
+                                                          p_contract_id     => ${@contract_id},
+                                                          p_invoice_line_id => ${@invoice_line_id});
+                end;
+                ]]>
+            </bm:update-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/classes/acp/ACP523/ap_invoice_confirm.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm" needAccessControl="false">
+    <bm:operations>
+        <bm:operation name="update">
+            <bm:update-sql><![CDATA[
+
+                ]]></bm:update-sql>
+        </bm:operation>
+
+    </bm:operations>
+</bm:model>
\ No newline at end of file

src/main/webapp/WEB-INF/classes/prj/PRJ500D/user_agent_description.lwm

+<?xml version="1.0" encoding="UTF-8"?>
+
+<bm:model xmlns:bm="http://www.leaf-framework.org/schema/bm">
+    <bm:operations>
+        <bm:operation name="query">
+            <bm:query-sql><![CDATA[
+                select h.bp_name agent_name,h.bp_id agent_id
+                from hls_bp_master h
+                where h.unit_id =
+                (select eo.unit_id
+                from exp_org_position eo
+                where eo.position_id =
+                (select ee.POSITION_ID
+                from EXP_EMPLOYEE_ASSIGNS ee
+                where ee.EMPLOYEE_ID =
+                (select s.employee_id
+                from sys_user s
+                where ${/session/@user_id} = s.user_id))
+                and (select eou.parent_unit_id
+                from EXP_ORG_UNIT eou
+                where eou.unit_id = eo.unit_id) = 1544)
+                ]]>
+            </bm:query-sql>
+        </bm:operation>
+    </bm:operations>
+</bm:model>

src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_confirm_g_ap_queryfields.js

+var override_queryfields = [
+];
+var add_datafilters = [ {
+    name : 'confirmation_status',
+    expression : "t1.confirmation_status is not null"
+} ];
+add_datafilter();
+override();

src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_import_detail_g_ap_queryfields.js

+var override_queryfields = [
+];
+var add_datafilters = [ {
+    name : 'confirmation_status',
+    expression : "t1.confirmation_status is null"
+} ];
+add_datafilter();
+override();

src/main/webapp/WEB-INF/server-script/layoutconfig/ap_invoice_import_g_ap_queryfields.js

+var override_queryfields = [
+];
+var add_datafilters = [ {
+    name : 'confirmation_status',
+    expression : "t1.confirmation_status is not null"
+} ];
+add_datafilter();
+override();

src/main/webapp/modules/acp/ACP522/ap_invoice_import.lview

@@ -4,23 +4,36 @@
     <a:view>
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
+        <a:link id="ap_invoice_import_detail_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_detail.lview"/>
         <script><![CDATA[
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
 
+        };
+
+        function ap_invoice_import_detail(){
+            var param = {};
+            param['function_code'] = 'ACP522I';
+            param['function_usage'] = 'MODIFY';
+            param['maintain_type'] = 'UPDATE';
+            param['url_title'] = '进项发票导入';
+            hls_doc_get_layout_code('hn9040_project_get_layout_code_link_id', param, 'ap_invoice_import_detail_link');
         }
 
         //超链接渲染
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {
-            //
             var link_function = '';
             var invoice_line_id = record.get('invoice_line_id');
             window['${/parameter/@bp_seq}${/parameter/@layout_code}_hls_link_render_record'][record.id + '---' + name] = record;
             if (name == 'attachment') {
                 return '<a href="javascript:attachment_window_open(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + '上传' + '</a>';
             }
+            if(name == 'contract_number'){
+                return '<a href="javascript:ap_invoice_import_detail(\'' + invoice_line_id + '\',\'' + record.id + '\',\'' + record.ds.id + '\');">' + value + '</a>';
+            }
         };
 
-            ]]></script>
+        ]]></script>
         <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
     </a:view>
 </a:screen>
\ No newline at end of file

src/main/webapp/modules/acp/ACP522/ap_invoice_import_detail.lview

+<?xml version="1.0" encoding="UTF-8"?>
+<a:screen xmlns:a="http://www.leaf-framework.org/application" customizationEnabled="true" dynamiccreateenabled="true"
+          trace="true">
+    <a:view>
+        <a:link id="ap_invoice_import_scanning_link"
+                url="${/request/@context_path}/modules/acp/ACP522/ap_invoice_import_scanning.lview"/>
+        <script><![CDATA[
+
+        window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
+            var url = $('ap_invoice_import_scanning_link').getUrl();
+            var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'acp_invoice_ln');
+            var rs = $(ds_id).getSelected();
+            var contract_id = rs[0].get('contract_id');
+            var invoice_line_id = rs[0].get('invoice_line_id');
+            Leaf.Window({
+                id: 'ap_invoice_import_scanning',
+                url: url,
+                params: {
+                    contract_id: contract_id,
+                    invoice_line_id: invoice_line_id
+                },
+                title:'${l:HLS.SUPPORTING_DOCUMENT}',
+                width: 300,
+                height:100
+            }).on('close', function() {
+                $('AP_INVOICE_IMPORT_DETAIL_G_AP_acp_invoice_ln_ds').query();
+            });
+        };
+
+
+        ]]></script>
+        <a:screen-include screen="modules/cont/CON500/con_contract_get_layout_code.lview"/>
+    </a:view>
+</a:screen>
\ No newline at end of file

src/main/webapp/modules/acp/ACP522/ap_invoice_import_scanning.lview

+<?xml version="1.0" encoding="UTF-8"?>
+
+
+<a:screen xmlns:a="http://www.leaf-framework.org/application">
+    <a:init-procedure/>
+    <a:view>
+        <a:link id="acp_invoice_inf_import_link" model="acp.ACP522.acp_invoice_inf_import" modelaction="update"/>
+        <script><![CDATA[
+
+        function invoice_inf_process(dataset, record, name, value, oldvalue) {
+            debugger;
+            var test = $('acp522_acp_invoice_import_ds').getAt(0).get('invoice');
+            var strs = new Array();
+            strs = test.split(',');
+            var invoice_type = strs[1];
+            var invoice_code = strs[2];
+            var invoice_number = strs[3];
+            var net_amount = strs[4];
+            var invoice_date = strs[5];
+            if (strs.length == 8) {
+                Leaf.request({
+                    url: $('acp_invoice_inf_import_link').getUrl(),
+                    para: {
+                        invoice_type: invoice_type,
+                        invoice_code: invoice_code,
+                        invoice_number: invoice_number,
+                        net_amount: net_amount,
+                        invoice_date: invoice_date,
+                        contract_id: '${/parameter/@contract_id}',
+                        invoice_line_id: '${/parameter/@invoice_line_id}'
+                    },
+                    success: function (res) {
+                        Leaf.SideBar.show({
+                            msg: '导入成功',
+                            duration: 2000
+                        });
+                    },
+                    scope: this
+                });
+                $('ap_invoice_import_scanning').close();
+            } else {
+                // $('acp600_acp_invoice_hd_ds').getAt(0).setReadOnly(true);
+                Leaf.showMessage('提示', '发票信息误！');
+            }
+        }
+
+        ]]></script>
+        <a:dataSets>
+            <a:dataSet id="acp522_acp_invoice_import_ds">
+                <a:fields>
+                    <a:field name="invoice" required="true"/>
+                </a:fields>
+                <a:events>
+                    <a:event name="update" handler="invoice_inf_process"/>
+                </a:events>
+            </a:dataSet>
+        </a:dataSets>
+        <a:screenBody>
+            <a:form title="请扫描发票二维码">
+                <a:textField name="invoice" width="270" bindTarget="acp522_acp_invoice_import_ds"/>
+            </a:form>
+        </a:screenBody>
+    </a:view>
+</a:screen>

src/main/webapp/modules/acp/ACP523/ap_invoice_confirm.lview

@@ -4,9 +4,25 @@
     <a:view>
         <a:link id="hn9040_project_get_layout_code_link_id" model="cont.CON500.con_contract_get_layout_code"
                 modelaction="update"/>
+        <a:link id="ap_invoice_confirm_link" model="acp.ACP523.ap_invoice_confirm" modelaction="update"/>
         <script><![CDATA[
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {
-        }
+
+
+            Leaf.request({
+                url: $('ap_invoice_confirm_link').getUrl(),
+                scope: this,
+                success: function (res) {
+                    if (res.result.record) {
+                        var datas = res.result.record.overdue_amount;
+                        $jq("#con-overdue-week").append(formatCurrency(datas));
+                    } else {
+                        $jq("#con-overdue-week").append('￥3400.00');
+                    }
+                }
+            })
+
+        };
 
         //超链接渲染
         window['${/parameter/@bp_seq}${/parameter/@layout_code}_dynamic_link_renderer'] = function (value, record, name, config_record, bp_seq) {

src/main/webapp/modules/acr/ACR510N/acr_invoice_condition_n.lview

@@ -109,7 +109,6 @@
                 winNoMask();
                 return;
             }
-            debugger
             var datas = ds.getJsonData(true);
             for (var i = 0; i < datas.length; i++) {
                 datas[i].final_bill_flag = final_bill_flag;

src/main/webapp/modules/acr/ACR512/acr_invoice_update_query.lview

@@ -17,11 +17,11 @@
             function acr512_invoice_query() {
                 $('acr512_invoice_result_ds').query();
             }
-            
+
             function acr512_invoice_reset() {
                 $('acr512_invoice_query_ds').reset();
             }
-            
+
             function acr512_grid_update(reocrd_id, invoice_hd_id, status) {
                 var maintain_type = 'UPDATE';
                 var currency_reocrd = $('acr512_invoice_result_ds').findById(reocrd_id);
@@ -33,15 +33,15 @@
                 param['url_title'] = '销项发票明细';
                 hls_doc_get_layout_code('con_contract_get_layout_code_link_id', param, 'acr512_invoice_update_page', 'acr512_invoice_result_ds');
             }
-            
+
             function acr512_document_number_render(value, record, name) {
                 return '<a href="javascript:acr512_grid_update(' + record.id + ',' + record.get('invoice_hd_id') + ',\'' + record.get('invoice_status') + '\');">' + value + '</a>';
             }
-            
+
             function acr512_formatMoney(value, record, name) {
                 return Leaf.formatNumber(value);
             }
-            
+
             function acr512_invoice_query_Onupdate(ds, record, name, value, oldVlaue) {
                 if (name == 'document_number_f') {
                     if (Leaf.isEmpty(record.get('document_number_t'))) {
@@ -76,7 +76,7 @@
                         record.set('accounting_date_t', value);
                     }
                 }
-                
+
                 if(Ext.isEmpty(record.get('project_number_f'))&&Ext.isEmpty(record.get('project_number_t')))
                 {
                     record.set('query_project_number','');
@@ -94,7 +94,7 @@
                     record.set('query_contract_number','Y');
                 }
             }
-            
+
             function acr512_invoice_delete(){
                 $('acr512_invoice_update_grid_ds').remove();
             }

src/main/webapp/modules/acr/ACR517/acr_invoice_claim_confirm.lview

@@ -23,7 +23,7 @@
             Leaf.request({
                 url: $("bmLink_acr_invoice_claim_confirm").getUrl(),
                 para: {
-                    invoice_hd_id:invoice_hd_id,
+                    invoice_hd_id:invoice_hd_id
                 },
                 success:function(){
                     Leaf.SideBar.show({

src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_authorize.lview

@@ -56,7 +56,7 @@
                     id: 'fixed_user_win',
                     url: $('aut_owner_user_batch_fix_link').getUrl(),
                     title: '${l:AUT106.ADD_FIX_PERSON}',
-                    width: 480,
+                    width: 1200,
                     height: 500
                 });
             }

src/main/webapp/modules/aut/AUT106/aut_owner_user_batch_fix.lview

@@ -20,6 +20,10 @@
                 Leaf.request({
                     url: $('bmLink_vat_delete').getUrl(),
                     success: function(res) {
+                        //关闭窗口
+
+                        $('fixed_user_win').close();
+
                         Leaf.SideBar.show({
                             msg: '${l:HLS.SUBMIT_SUCCESS}',
                             duration: 2000
@@ -96,18 +100,18 @@
                 <a:gridButton click="fix_save" text="HLS.SAVE"/>
                 <a:gridButton click="fix_query" text="查询"/>
             </a:screenTopToolbar>
-            <a:form column="3" marginWidth="100" title="查询条件">
-                <a:textField name="bp_category" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="账号类型" />
-                <a:textField name="employee_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="员工姓名" />
-                <a:textField name="extra_nam" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴简称" />
-                <a:textField name="bp_code" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴编码" />
-                <a:textField name="bp_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴名称" />
-                <a:textField name="unit_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="部门" />
-                <a:textField name="position_desc" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="主岗位" />
+            <a:form column="3" labelWidth="200" title="查询条件" width="900">
+                <a:textField name="bp_category" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="账号类型" width="150"/>
+                <a:textField name="employee_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="员工姓名" width="150"/>
+                <a:textField name="extra_nam" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴简称" width="150"/>
+                <a:textField name="bp_code" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴编码" width="150"/>
+                <a:textField name="bp_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="商业伙伴名称" width="150"/>
+                <a:textField name="unit_name" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="部门" width="150"/>
+                <a:textField name="position_desc" bindTarget="aut_woner_user_batch_fix_form_ds" prompt="主岗位" width="150"/>
             </a:form>
             <a:grid bindTarget="aut_woner_user_batch_fix_ds" height="400" navBar="true" width="1100">
                 <a:toolBar>
-                    <!-- <a:button type="add"/> -->
+<!--                     <a:button type="add"/>-->
                     <!-- <a:button type="delete"/> -->
                     <!--  <a:button type="save"/> --><![CDATA[
                     

src/main/webapp/modules/cont/CON350/con350_insurance_entrance.lview

@@ -27,7 +27,7 @@
         <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
 
         <script type="text/javascript"><![CDATA[
-        stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_INSUR', 'con_contract');
+        // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_INSUR', 'con_contract');
 
         //变更为宏菱代办
         window['${/parameter/@layout_code}_user_button1_layout_dynamic_click'] = function () {

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

@@ -143,9 +143,9 @@
                         </a:mapping>
                     </a:field> -->
                     <a:field name="contract_number" typeCase="Upper"/>
-                    <a:field name="lease_organization_name" displayField="description"
-                             options="con560_lease_organization_name_ds" returnField="lease_organization"
-                             valueField="lease_organization"/>
+<!--                    <a:field name="lease_organization_name" displayField="description"-->
+<!--                             options="con560_lease_organization_name_ds" returnField="lease_organization"-->
+<!--                             valueField="lease_organization"/>-->
                     <a:field name="owner_user_id_n" lovGridHeight="350" lovHeight="475"
                              lovService="cont.CON560.sys_user_for_lov" lovWidth="520" title="出单人选择">
                         <a:mapping>
@@ -153,9 +153,12 @@
                             <a:map from="description" to="owner_user_id_n"/>
                         </a:mapping>
                     </a:field>
+                    <a:field name="contract_status_n" displayField="code_value_name"
+                             options="con560_contract_status_ds" returnField="contract_status"
+                             valueField="code_value"/>
                 </a:fields>
             </a:dataSet>
-            <a:dataSet id="con560_contract_result_ds" autoPageSize="true" autoQuery="true"
+            <a:dataSet id="con560_contract_result_ds" autoPageSize="true" autoQuery="true" pageSize="4"
                        model="cont.CON560.con_contract_finish_for_query" queryDataSet="con560_contract_query_ds"
                        queryUrl="${/request/@context_path}/autocrud/cont.CON560.con_contract_finish_for_query/query"
                        selectable="true" selectionModel="single">
@@ -181,21 +184,22 @@
                 <a:textField name="contract_number" bindTarget="con560_contract_query_ds" prompt="HLS.CONTRACT_NUMBER"/>
                 <a:lov name="bp_name" bindTarget="con560_contract_query_ds" prompt="HLS.TENANT_CODE"/>
                 <!--<a:lov name="owner_user_id_n" bindTarget="con560_contract_query_ds" prompt="出单人"/>-->
-                <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>
+<!--                <a:comboBox name="lease_organization_name" bindTarget="con560_contract_query_ds" prompt="事业部"/>-->
+                <a:comboBox name="contract_status_n" bindTarget="con560_contract_query_ds" prompt="合同状态"/>
             </a:form>
             <a:grid id="con560_con_contract_grid_ds" bindTarget="con560_contract_result_ds" height="250"
                     marginWidth="30" navBar="true">
                 <a:columns>
                     <a:column name="contract_number" lock="true" prompt="HLS.CONTRACT_NUMBER"
                               renderer="con560_render_contractMaintainDs_grid" width="150"/>
-                    <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="100"/>
+                    <a:column name="bp_name" prompt="HLS.TENANT_NAME" width="240"/>
                     <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="140"/>
                     <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/cont/CON560/con_contract_finish_maintain_wfl.lview

@@ -202,7 +202,7 @@
                     <a:column name="down_payment" align="right" footerRenderer="summaryRenderer" prompt="首付款"
                               renderer="Leaf.formatMoney" width="120"/>
                     <!--<a:column name="owner_user_id_n" prompt="出单人" width="60"/>-->
-                    <a:column name="contract_status" prompt="合同状态" width="80"/>
+                    <a:column name="contract_status_n" prompt="合同状态" width="80"/>
                 </a:columns>
             </a:grid>
             <a:tabPanel marginHeight="420" marginWidth="30">

src/main/webapp/modules/hls/HLS213N/hls_bp_master_create.lview

@@ -305,8 +305,9 @@
             var regax = /^[A-Z]+$/;
             //alert('${/parameter/@unbrand}');
             if (bp_class == 'NP') {
+                debugger
                 if (card_identity_flag == 'N' || sp_identity_flag == 'N') {
-                    if (regax.test(extra_nam) && extra_nam.length == 3) {
+                    //if (regax.test(extra_nam) && extra_nam.length == 3) {
                         window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                         var check_flag = false;
                         if (head_record.get('bp_code')) {
@@ -343,11 +344,12 @@
                             sync: true,
                             scope: this
                         });
-                    } else {
-                        Leaf.showMessage('${l:HLS.PROMPT}', '简称不合规！');
-                        window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
-                        return false;
-                    }
+                  //  }
+                // else {
+                //         Leaf.showMessage('${l:HLS.PROMPT}', '简称不合规！');
+                //         window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();
+                //         return false;
+                //     }
                 } else {
                     Leaf.showMessage('${l:HLS.PROMPT}', '身份证校验未通过，不能保存!');
                     window['${/parameter/@layout_code}_unlock_layout_dynamic_window']();

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

@@ -15,6 +15,7 @@
                        rootPath="prj_project_invoice_agent_id_dafault_value_path"/>
         <a:model-query defaultWhereClause="t1.company_id=${/session/@company_id}" fetchAll="true"
                        model="prj.PRJ500D.get_company_info" rootPath="company_info_path"/>
+        <a:model-query fetchAll="true" model="prj.PRJ500D.user_agent_description" rootPath="user_agent_description"/>
     </a:init-procedure>
     <a:view>
         <a:link id="prj_chance_create_link"
@@ -32,7 +33,7 @@
                 record.set('function_usage', 'CREATE');
                 record.set('document_category', 'PROJECT');
                 record.set('default_value_dsid', ds_id);
-                record.data['url_title'] = '租赁申请创建';
+                record.data['url_title'] = '报价申请创建';
                 var param = record.data;
                 record.set('winid', 'prj_porject_create_win_id');
 
@@ -44,13 +45,29 @@
         Leaf.onReady(function () {
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'prj_project');
             var head_record = $(ds_id).getAt(0);
+            head_record.getField('invoice_agent_id_n').setRequired(true);
+            var invoice_agent_id =  '${/model/user_agent_description/record/@agent_id}';
+            var invoice_agent_id_n = '${/model/user_agent_description/record/@agent_name}';
 
             head_record.set('unit_id', '${/model/4s_root_path/record/@value_code}');
             head_record.set('unit_id_n', '${/model/4s_root_path/record/@value_name}');
             head_record.set('company_id', '${/model/company_info_path/record/@company_id}');
             head_record.set('company_id_n', '${/model/company_info_path/record/@company_short_name}');
             head_record.set('invoice_agent_id', '${/model/prj_project_invoice_agent_id_dafault_value_path/record/@bp_id}');
-            head_record.set('invoice_agent_id_n', '${/model/prj_project_invoice_agent_id_dafault_value_path/record/@bp_id_n}');
+            // head_record.set('invoice_agent_id', '${/model/prj_project_invoice_agent_id_dafault_value_path/record/@bp_id}');
+            // head_record.set('invoice_agent_id_n', '${/model/prj_project_invoice_agent_id_dafault_value_path/record/@bp_id_n}');
+            head_record.set('invoice_agent_id', invoice_agent_id);
+            head_record.set('invoice_agent_id_n', invoice_agent_id_n);
+
+            if(!invoice_agent_id){
+                head_record.getField('invoice_agent_id_n').setReadOnly(false);
+                // head_record.getField('invoice_agent_id_n').setRequired(false);
+
+            }
+
+
+
+            // alert('${/session/@user_id}');
         });
 
 
@@ -59,10 +76,11 @@
             //
             if (name == 'division') {
 
-           //     record.set('bp_class_n', '');
-                record.set('invoice_agent_id_n', '');
-             //   record.getField('bp_class_n').setReadOnly(false);
-                record.getField('invoice_agent_id_n').setRequired(true);
+                // record.set('bp_class_n', '');
+
+                // record.set('invoice_agent_id_n', '');
+                record.getField('bp_class_n').setReadOnly(false);
+                // record.getField('invoice_agent_id_n').setRequired(true);
 
             } else if (name == 'lease_channel') {
                 record.set('division', '');

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

@@ -39,7 +39,7 @@
                 param['bp_class'] = 'NP';
                 param['prj_bp_id'] = record.get('prj_bp_id');
                 param['maintain_type'] = maintain_type;
-                param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
+                param['url_title'] = '报价申请维护';
                 param['layout_debugger_flag'] = 'Y';
                 hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'prj_project_modify_link', ds_id);
             } else if (record.get('document_type') == 'CARLS') {
@@ -54,7 +54,7 @@
                     param['bp_class'] = 'NP';
                     param['maintain_type'] = maintain_type;
                     param['prj_bp_id'] = record.get('prj_bp_id');
-                    param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
+                    param['url_title'] = '报价申请维护';
                     hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
                 } else {
                     maintain_type = 'UPDATE';
@@ -67,7 +67,7 @@
                     param['bp_id'] = record.get('bp_id');
                     param['prj_bp_id'] = record.get('prj_bp_id');
                     param['bp_id_tenant'] = record.get('bp_id_tenant');
-                    param['url_title'] = '${l:HLS.PROJECT_MAITAIN}';
+                    param['url_title'] = '报价申请维护';
                     hls_doc_get_layout_code('prj_project_get_layout_code_link_id', param, 'car_modify_link', ds_id);
                 }
             }

src/main/webapp/modules/prj/PRJ502N/prj_project_modify_entrance.lview

@@ -18,7 +18,7 @@
         <a:link id="document_history_query_link_id" url="${/request/@context_path}/modules/prj/PRJ502N/prj_document_history_query.lview"/>
         <script src="${/request/@context_path}/javascripts/hap/dynamicStopAutoQuery.js" type="text/javascript"/>
         <script type="text/javascript"><![CDATA[
-        stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_PROJECT_RESULT', 'prj_project');
+        // stopDymanicAutoQuery('${/parameter/@layout_code}', 'G_PROJECT_RESULT', 'prj_project');
             function open_project_modify_win(record_id, ds_id) {
 
                 var record = $(ds_id).findById(record_id);