From 67a0042c5f29e4bb0e0b82f6190f2bc51480b45c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 28 二月 2023 13:25:09 +0800
Subject: [PATCH] 工资绩效改版

---
 zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml |   40 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
index fa116f2..8ac2ca2 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccountIncome/PrintAll.cshtml
@@ -18,9 +18,11 @@
             },
             { label: '绉戠洰鍚嶇О', name: 'SubjectName', labtype: 'txt', hidden: false, width: 100  },
             { label: '閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 100  },
-            { label: '浣欓', name: 'Balance', labtype: 'txt', hidden: false, width: 100 },
+            { label: '浣欓', name: 'AccountMoney', labtype: 'txt', hidden: false, width: 100 },
             { label: '鏀�(鏀�)娆惧崟浣�', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 200 },
-            { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200  },
+            { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200 },
+            { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false, width: 60 },
             { label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100 },
              
         ];
@@ -32,7 +34,7 @@
             { label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
             { label: '璁板綍绫诲瀷', name: 'RecordTypeId', labtype: 'combox', hidden: false, data: JSON.parse(RecordTypeId) },
             { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
-
+            { label: '璁㈠崟鍙�', name: 'Remark', labtype: 'txt', hidden: false },
             { label: '浠樻浜�(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false },
             { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
 
@@ -51,7 +53,7 @@
             var PaymentUnit = $("#PBSPaymentUnit").val();
             var CreaterName = $("#PBSCreaterName").val();
 
-
+            var Remark = $("#PBSRemark").val();
 
             var Createtimestart = $("#PBSCreatetimestart").val();
 
@@ -62,12 +64,40 @@
             }
 
 
-            var url = "/FiAccountIncome/print?Accounttype=" + Accounttype + "&AccountId=" + AccountId + "&SubjectId=" + SubjectId + "&RecordTypeId=" + RecordTypeId + "&OperationalMatters=" + OperationalMatters + "&PaymentUnit=" + PaymentUnit + "&CreaterName=" + CreaterName + "&Createtime=" + Createtime;
+            var url = "/FiAccountIncome/print?Accounttype=" + Accounttype + "&AccountId=" + AccountId + "&SubjectId=" + SubjectId + "&RecordTypeId=" + RecordTypeId + "&OperationalMatters=" + OperationalMatters + "&PaymentUnit=" + PaymentUnit + "&CreaterName=" + CreaterName + "&Createtime=" + Createtime + "&Remark=" + Remark;
             var me = window.open(url, "鎵撳嵃");  //鎵撳紑鏂扮獥鍙�
 
 
         }
 
+
+        var _pageDaochu = function () {
+
+
+            var Accounttype = $("#PBSAccounttype").val();
+            var AccountId = $("#PBSAccountId").val();
+            var SubjectId = $("#PBSSubjectId").val();
+            var RecordTypeId = $("#PBSRecordTypeId").val();
+            var OperationalMatters = $("#PBSOperationalMatters").val();
+            var PaymentUnit = $("#PBSPaymentUnit").val();
+            var CreaterName = $("#PBSCreaterName").val();
+
+            var Remark = $("#PBSRemark").val();
+
+            var Createtimestart = $("#PBSCreatetimestart").val();
+
+            var Createtimeend = $("#PBSCreatetimeend").val();
+            var Createtime = '';
+            if (Createtimestart != '' && Createtimeend != '') {
+                Createtime = Createtimestart + '|' + Createtimeend;
+            }
+
+
+            var url = "/FiAccountIncome/GetDaochu?Accounttype=" + Accounttype + "&AccountId=" + AccountId + "&SubjectId=" + SubjectId + "&RecordTypeId=" + RecordTypeId + "&OperationalMatters=" + OperationalMatters + "&PaymentUnit=" + PaymentUnit + "&CreaterName=" + CreaterName + "&Createtime=" + Createtime + "&Remark=" + Remark;
+            var me = window.open(url, "瀵煎嚭");  //鎵撳紑鏂扮獥鍙�
+
+
+        }
       
 
         var _afterSave = function (result) {

--
Gitblit v1.9.1