【建机运维】资管费进项票录入报错税率错误

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

+var add_datafilters=[
+    {
+        name:'fee_id',
+        expression:"(t1.fee_id in (select hl.fee_id from hl_payment_journal_batch_ln hl where hl.batch_id = ${/parameter/@batch_id}))"
+    }
+];
+
+add_datafilter();
\ No newline at end of file

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

 var add_datafilters=[
     {
-        name:'payment_batch_id',
-        expression:"(t1.payment_batch_id=${/parameter/@payment_batch_id})"
+        name:'payment_journal_id',
+        expression:"(t1.payment_journal_id in (select hl.payment_journal_id from hl_payment_journal_ln hl where hl.batch_id = ${/parameter/@payment_batch_id}))"
     }
 ];
 

src/main/webapp/modules/csh/CSH1500/csh_asset_reconciliation.lview

@@ -29,10 +29,16 @@
             var ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hl_asset_manage_fee');
             var records = $(ds_id).getSelected();
             var ParaData = [];
+            var ParaData2 = [];
+            var seen = {};
+            var contractNumber = '';
+            var errLog='';
             if(records.length ==0){
                 $L.showMessage("提示",'请至少选择一条数据！');
                 return;
             }
+            var pe_count = 0;
+            var count = 0;
             for(var i=0; i<records.length;i++){
                 if(records[i].data.wfl_status_n == 'APPROVING' || records[i].data.wfl_status_n == 'APPROVED'){
                     $L.showMessage("提示",'请选择新建或者审批拒绝的单据！');
@@ -52,12 +58,33 @@
                    $L.showMessage("提示",'当前代理店的进项票税率到期日为'+Leaf.formatDate(records[i].data.vat_rate_date)+'，请前往“租前管理-主数据管理-代理店管理”功能重新维护！');
                      return;
                 }
-                records[i].set('_status','execute');
+                if(records[i].data.contract_status_n == 'PENDING'){
+                    pe_count = pe_count + 1;
+                    var con = records[i].data.contract_number;
+                    if(!seen[con]){
+                        seen[con] = true;
+                        ParaData2.push(con);
+                    }
+                }else {
+                    count = count + 1;
+                    records[i].set('_status', 'execute');
                     ParaData.push(records[i].data);
                 }
+            }
+            if(pe_count != 0){
+                for(var j=0;j<ParaData2.length;j++){
+                    contractNumber = ParaData2[j]+'，'+contractNumber;
+                }
+                errLog='，<br/>本次提交含'+ParaData2.length+'个暂挂合同：'+contractNumber+'不会被提交';
+            }
+            if(count == 0){
+                $L.showMessage("提示",'待提交的合同状态都为暂挂，请重新选择合同！');
+                return;
+
+            }
             var vat_rate =records[0].get('vat_rate');
             var vat_rate_date =Leaf.formatDate(records[0].get('vat_rate_date'));
-            Leaf.showConfirm('${l:PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+'，<br/>确认提交资产管理费对账工作流?', function () {
+            Leaf.showConfirm('${l:PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+errLog+'<br/>确认提交资产管理费对账工作流?', function () {
                 Leaf.request({
                     url: $('asset_check_wfl_link_id').getUrl(),
                     para: ParaData,
@@ -71,6 +98,7 @@
                     scope: this
                 });
             }, function () {
+                $(ds_id).query();
             }, null, null);
         };
 

src/main/webapp/modules/csh/CSH551/con_comsn_reconcilia_query.lview

@@ -152,11 +152,15 @@
             var temp_ds_id = get_dsid_by_basetable(window['${/parameter/@layout_code}_layoutDataSetList'], 'hlcm_comsn_reconcilia_temp');
             var n_record = $(n_ds).getCurrentRecord();
             var records = $(temp_ds_id).getSelected();
+            var contractNumber='';
+            var errLog='';
 
             if (records.length == 0) {
                 Leaf.showMessage('${l:PROMPT}', '请选择一条未计提的记录');
                 return;
             }
+            var pe_count = 0;
+            var count = 0;
 
             if (records.length > 100) {
                 Leaf.showMessage('${l:PROMPT}', '选择未计提的记录不可超过100条');
@@ -192,14 +196,27 @@
                    $L.showMessage("提示",'当前代理店的进项票税率到期日为'+Leaf.formatDate(records[i].data.vat_rate_date)+'，请前往“租前管理-主数据管理-代理店管理”功能重新维护！');
                    return;
                 }
-
+                if(records[i].data.con_contract_status == 'PENDING'){
+                    pe_count = pe_count + 1;
+                    contractNumber = records[i].data.contract_number+'，'+contractNumber;
+                }else {
+                    count = count + 1;
                     param.push({
                         'contract_id': records[i].get('contract_id')
                     });
                 }
+            }
+            if(pe_count != 0){
+                errLog='，<br/>本次提交含'+pe_count+'个暂挂合同：'+contractNumber+'不会被提交';
+            }
+            if(count == 0){
+                $L.showMessage("提示",'待提交的合同状态都为暂挂，请重新选择合同！');
+                return;
+
+            }
              var vat_rate =records[0].get('vat_rate');
              var vat_rate_date =Leaf.formatDate(records[0].get('vat_rate_date'));
-            Leaf.showConfirm('${l:HLS.PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+'，<br/>确认提交佣金计提工作流?', function() {
+            Leaf.showConfirm('${l:HLS.PROMPT}', '当前代理店的进项票税率为'+vat_rate+'%，有效期到'+vat_rate_date+errLog+'，<br/>确认提交佣金计提工作流?', function() {
                 window['${/parameter/@layout_code}_lock_layout_dynamic_window']();
                 Leaf.request({
                     url: $('${/parameter/@layout_code}_submit_comsn_selected_link_id').getUrl(),