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/IntentionVisit/Index.cshtml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
index f094a68..544c922 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionVisit/Index.cshtml
@@ -1,6 +1,9 @@
锘緻{
ViewBag.Title = "IntentionVisit";
Layout = "~/Views/Shared/_Layout_Search.cshtml";
+ string Viscustomer = ViewBag.Viscustomer as string;
+ string IsYwjl = ViewBag.IsYwjl as string;
+
}
@section headerStyle{
<script type="text/javascript">
@@ -8,20 +11,22 @@
var khlys = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.khly))';
var hyfls = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.hyfl))';
var users = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.users))';
+ var creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.creater))';
+
var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
loseherght = 60;
gridConfig = { multiselect: true, selectcol: "Id" };
dataCol = [
{ label: 'id', name: 'Id', labtype: 'txt', hidden: true },
-
+
{
label: '鎷滆鏃堕棿', name: 'VistimeName', labtype: 'txt', hidden: false, width: 100,
formatter: function (cellvalue, options, rowObject) {
- return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/IntentionVisit/Edit?id=" + rowObject.Id + "')\" >" + cellvalue + "</a>";
+ return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/IntentionVisit/Edit?id=" + rowObject.Id + "&Viscustomer=@Viscustomer&IsYwjl=@IsYwjl')\" >" + cellvalue + "</a>";
}
},
- { label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
+ //{ label: '鎵�灞炲尯鍩�', name: 'ShengName', labtype: 'txt', hidden: false, width: 100 },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎷滆鏂瑰紡', name: 'VisTypeName', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎺ュ緟浜�', name: 'Jdr', labtype: 'txt', hidden: false, width: 100},
@@ -30,9 +35,10 @@
{ label: '瀹㈡埛鍙嶉', name: 'Khfk', labtype: 'txt', hidden: false, width: 100 },
{ label: '鎴愪氦鎰忓悜', name: 'YxName', labtype: 'txt', hidden: false, width: 100 },
{ label: '璺熻釜寤鸿', name: 'JyName', labtype: 'txt', hidden: false, width: 100 },
+ { label: '璁块棶浜�', name: 'CreaterName', labtype: 'txt', hidden: false, width: 100 },
];
- dataUrl = "/IntentionVisit/GetList";
+ dataUrl = "/IntentionVisit/GetList?Viscustomer=@Viscustomer";
searchCol = [
{ label: '瀹㈡埛鏉ユ簮', name: 'Khly', labtype: 'combox', hidden: false, data: JSON.parse(khlys), cwidth: '5%', cccwidth: '8%' },
{ label: '琛屼笟鍒嗙被', name: 'Hyfl', labtype: 'combox', hidden: false, data: JSON.parse(hyfls), cwidth: '5%', cccwidth: '15%' },
@@ -44,16 +50,18 @@
{ label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
{ label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
{ label: '鎷滆鏃堕棿', name: 'Vistime', labtype: 'datearea', hidden: false },
+ { label: '璁块棶浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(creater), cwidth: '5%', cccwidth: '8%'},
+
];
var _pageAdd = function () {
- OpenWindow("鏂板鎰忓悜瀹㈡埛鎷滆", "98%", "90%", "/IntentionVisit/Edit/");
+ OpenWindow("鏂板鎰忓悜瀹㈡埛鎷滆", "98%", "90%", "/IntentionVisit/Edit?Viscustomer=@Viscustomer&IsYwjl=@IsYwjl");
}
-
+
var _afterSave = function (result) {
if (result) {
--
Gitblit v1.9.1