From 274fb67703d0ffcc7e3398d41855c5c8bfb3383b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 六月 2021 13:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
index 117c4b6..9552c9e 100644
--- a/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/AdmPieceCheck/Index.cshtml
@@ -4,7 +4,7 @@
}
@section headerStyle{
<script type="text/javascript">
- var PayType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PayType))';
+ @*var PayType = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.PayType))';*@
var DeptId = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.DeptId))';
loseherght = 30;
@@ -31,7 +31,7 @@
dataUrl = "/AdmPieceCheck/GetList";
searchCol = [
{ label: '宸ヤ綔鏃堕棿', name: 'WorkTime', labtype: 'datearea', hidden: false },
- { label: '绫诲埆', name: 'PayType', labtype: 'combox', hidden: false, data: JSON.parse(PayType), cwidth: '5%', cccwidth: '8%' },
+ //{ label: '绫诲埆', name: 'PayType', labtype: 'combox', hidden: false, data: JSON.parse(PayType), cwidth: '5%', cccwidth: '8%' },
{ label: '閮ㄩ棬', name: 'DeptId', labtype: 'combox', hidden: false, data: JSON.parse(DeptId), cwidth: '5%', cccwidth: '8%' },
{ label: '濮撳悕', name: 'UserName', labtype: 'txt', hidden: false },
--
Gitblit v1.9.1