From ac4f98f9d24552d1c43935f20a969a2fda0723f0 Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期五, 25 六月 2021 10:40:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa

---
 zhengcaioa/zhengcaioa/Views/Project/Select.cshtml |   64 +++++++++++++++++++++++++++++--
 1 files changed, 59 insertions(+), 5 deletions(-)

diff --git a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
index f88d9fa..b5b4d19 100644
--- a/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/Project/Select.cshtml
@@ -7,6 +7,8 @@
         var projectDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ProjectDropDown))';
         var shengDropDown = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.ShengDropDown))';
         var Creater = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.Creater))';
+        var flbx = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.flbx))';
+        
         loseherght = 60;
         dataCol = [
             { label: 'id', name: 'Id', labtype: 'txt', hidden: true },
@@ -21,9 +23,58 @@
             {
                 label: '椤圭洰鍚嶇О', name: 'Name', labtype: 'txt', hidden: false, width: 400 ,
                 formatter: function (cellvalue, options, rowObject) {
-                    return "<a onclick=\"OpenWindow('" + cellvalue.replace(/'/g, '') + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
+                    return "<a onclick=\"OpenWindow('" + cellvalue + "','98%','100%', '/Project/Add?id=" + rowObject.Id + "')\"  >" + cellvalue + "</a>";
                 }
-            }, { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false, width: 100  },
+            }, { label: '椤圭洰缂栧彿', name: 'Number', labtype: 'txt', hidden: false, width: 100 },
+            {
+                label: '涓爣渚涘簲鍟�', name: 'Toubiaocishu', labtype: 'txt', hidden: false, width: 400,
+                formatter: function (cellvalue, options, rowObject) {
+                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+                        var ss = cellvalue.split('銆�');
+                        var result = "";
+                        for (var i = 0;i < ss.length; i++){
+                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
+                        }
+
+                        return result;
+                    } else {
+                        return "";
+                    }
+                }
+            },
+            {
+                label: '绗簩鍊欓��', name: 'Drhx', labtype: 'txt', hidden: false, width: 400,
+                formatter: function (cellvalue, options, rowObject) {
+                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+                        var ss = cellvalue.split('銆�');
+                        var result = "";
+                        for (var i = 0; i < ss.length; i++) {
+                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
+                        }
+
+                        return result;
+                    } else {
+                        return "";
+                    }
+
+                }
+            },
+            {
+                label: '绗笁鍊欓��', name: 'Dshx', labtype: 'txt', hidden: false, width: 400,
+                formatter: function (cellvalue, options, rowObject) {
+                    if (cellvalue != null && cellvalue != "null" && cellvalue != "") {
+                        var ss = cellvalue.split('銆�');
+                        var result = "";
+                        for (var i = 0; i < ss.length; i++) {
+                            result += "<a onclick=\"OpenWindow('" + ss[i] + "','98%','100%', '/IntentionCustomer/EditByName?name=" + ss[i] + "')\"  >" + ss[i] + "</a>&nbsp;";
+                        }
+
+                        return result;
+                    } else {
+                        return "";
+                    }
+                }
+            },
             { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false, width: 400 },
             { label: '鎶曟爣娆℃暟', name: 'Toubiaocishu', labtype: 'txt', hidden: true },
             { label: '涓爣娆℃暟', name: 'Zhongbiaocishu', labtype: 'txt', hidden: true },
@@ -39,10 +90,13 @@
 
             { label: '鐪�', name: 'Sheng', labtype: 'combox', hidden: false, data: JSON.parse(shengDropDown), cwidth: '5%', cccwidth: '8%' },
             { label: '甯�', name: 'City', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '1%', cccwidth: '8%'  },
-            { label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%'  },
-            { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false, cwidth: '8.5%', cccwidth: '15%' },
-            { label: '渚涘簲鍟�', name: 'Names', labtype: 'txt', hidden: false },
+            { label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
             { label: '閲囪喘鏂瑰紡', name: 'Cgfs', labtype: 'combox', hidden: false, data: JSON.parse(projectDropDown) },
+            { label: '涓爣渚涘簲鍟�', name: 'Names', labtype: 'txt', hidden: false },
+            { label: '鎶曟爣渚涘簲鍟�', name: 'NamesToubiao', labtype: 'txt', hidden: false },
+            { label: '璇勫涓撳', name: 'Zhuanjia', labtype: 'txt', hidden: false, cwidth: '8.5%', cccwidth: '15%' },
+
+            { label: '鏄惁搴熸爣', name: 'fblx', labtype: 'combox', hidden: false, data: JSON.parse(flbx), cwidth: '5%', cccwidth: '8%'  },
             { label: '褰曞叆鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
             { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
 

--
Gitblit v1.9.1