From d4a6d65f5e449c3e5464aa18ae97bf8953987217 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 15:44:14 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
index 1493ec9..c1d9ded 100644
--- a/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/SalaryCheck/Employee.cshtml
@@ -75,7 +75,7 @@
{ label: '宸ヤ綔琛ヨ创', name: 'Gongzuobutie', labtype: 'txt', hidden: false, width: 100 },
{ label: '鍔犵彮宸ヨ祫', name: 'Jiabangongzi', labtype: 'txt', hidden: false, width: 100 },
{ label: '绀句繚', name: 'Shebao', labtype: 'txt', hidden: false, width: 100 },
- { label: '鐢佃瘽琛ヨ创', name: 'DianhuabutieChs', labtype: 'txt', hidden: false, width: 100 },
+ { label: '鐢佃瘽琛ヨ创', name: 'Dianhuabutie', labtype: 'txt', hidden: false, width: 100 },
{ label: '鍏ㄥ嫟濂�', name: 'Quanqinjiang', labtype: 'txt', hidden: false, width: 100 },
{ label: '浜ら�氳ˉ璐�', name: 'Jiaotngbutie', labtype: 'txt', hidden: false, width: 100 },
{ label: '缁╂晥鎻愭垚', name: 'Jixiaoticheng', labtype: 'txt', hidden: false, width: 100 },
@@ -196,7 +196,7 @@
toastr.error("閿欒鎻愮ず锛氭鏈堜唤宸插畬鎴愮‘璁�,涓嶈兘鐢宠瘔锛�");
}
else {
- OpenWindow('鐢宠瘔', '40%', '60%', '/SalaryCheck/Appeal?id=' + dt);
+ OpenWindow('鐢宠瘔', '80%', '80%', '/SalaryCheck/Appeal?salaryId=' + dt);
}
}
else {
--
Gitblit v1.9.1