From 90cf9f1950acbae2b71b31f93ae3aff40f8db50a Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 30 六月 2022 08:42:38 +0800
Subject: [PATCH] 隐藏列完善 用户新增完善
---
WebTM/views/系统管理/用户管理/Xt_UserListEdit.html | 320 +++++++++++++++++++++++++++++------
WebTM/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 86 ++++++--
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 104 ++++++++++-
3 files changed, 416 insertions(+), 94 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index fbd3f6e..1376953 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -5,10 +5,12 @@
<title>闅愯棌鍒楄缃�</title>
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js" type="text/javascript"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js" type="text/javascript"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
<style>
/* 闃叉涓嬫媺妗嗙殑涓嬫媺鍒楄〃琚殣钘�---蹇呴』璁剧疆--- */
.layui-table-cell {
@@ -58,15 +60,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鏍囬琛岄珮</label>
+ <label class="layui-form-label" style="width: 85px;">鍒楀</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HHeadTextHeight" name="HHeadTextHeight" id="HHeadTextHeight">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鍐呭琛岄珮</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" lay-verify="HTextHeight" name="HTextHeight" id="HTextHeight">
+ <input type="text" class="layui-input" lay-verify="HColumnWidth" name="HColumnWidth" id="HColumnWidth">
</div>
</div>
</div>
@@ -137,10 +133,9 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
var params = getUrlVars();
- var HModName = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
- //var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
- //var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
-
+ var HModName = params[params[0]]; //妯″潡鍚嶇О
+ var colName = params[params[1]]; //鍒楀悕
+ colName = decodeURI(colName);//瀵筓RI 杩涜瑙ｇ爜
//鍒濆鍖栫晫闈�
set_ClearBill();
@@ -196,7 +191,7 @@
});
//閫�鍑�
- form.on('submit(Cancel)', function () {
+ form.on('submit(Exit)', function () {
Pub_Close(1);
})
@@ -210,7 +205,7 @@
get_Display();
}
- //#region 鏌ヨ
+ //鏌ヨ
function get_Display() {
var ajaxLoad = layer.load();
$.ajax({
@@ -218,13 +213,58 @@
type: "GET",
data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
+ //鍐荤粨鍒�
+ $("#HFixCols").val(data1.data[0].HFixCols);
+ //瀛椾綋澶у皬
+ $("#HFontSize").val(data1.data[0].HFontSize);
+ //鍒楀
+ $("#HColumnWidth").val(data1.data[0].HColumnWidth);
+
+ var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
+ var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
+
+ colNames = colName.split(',');
+
+ if (data1.data.length != 0) {
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ //琛ㄦ牸鐨勬暟鎹～鍏�
+ for (var i = 0; i < colNames.length; i++) {
+ var dataCols = dataCol[i].split('|');
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2] })
+ }
+ option.data = cols;
table.render(option);
+
+ //椤甸潰澶氶�夋 涓嬫媺妗� 閲嶆柊娓叉煋
+ for (var i = 0; i < colNames.length; i++) {
+ var dataCols = dataCol[i].split('|');
+ if (dataCols[1] == 1) {
+ $("#IsHide" + (i + 1)).attr("checked", true);
+ }
+ $('#Alignment' + (i + 1)).find("option[value='" + dataCols[2] + "']").attr("selected", true);
+ }
+ form.render('checkbox');
+ form.render('select');
layer.close(ajaxLoad);
} else {
+ //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
+ for (var i = 0; i < colNames.length; i++) {
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L" })
+ }
+ option.data = cols;
+ table.render(option);
+
+ //榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 椤甸潰澶氶�夋 涓嬫媺妗� 閲嶆柊娓叉煋
+ for (var i = 0; i < colNames.length; i++) {
+ $('#IsHide' + (i + 1)).prop("checked", false);
+ $('#Alignment' + (i + 1)).find("option[value='L']").attr("selected", true);
+ }
+ form.render('checkbox');
+ form.render('select');
layer.close(ajaxLoad);
- layer.alert(data1.code + data1.Message, { icon: 5 });
}
}, error: function () {
layer.close(ajaxLoad);
@@ -238,18 +278,15 @@
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 690
+ , height: 420
, cellMinWidth: 90
, limit: 500
- , loading: false
, cols: [[
{ field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
]]
};
- option.data = [{ "ColumnName": "111", "IsHide": false, "Alignment": "L" }, { "ColumnName": "222", "IsHide": false, "Alignment": "R" }];
- table.render(option);
}
//淇濆瓨HMaker
@@ -265,9 +302,8 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var HModName = "1";//妯″潡鍚嶇О
var OperationType = "1";
- var sMainSub = sMainStr + ';' + sSubStr + ';' + HModName + ';' + OperationType + ";" + 2;//sessionStorage["HUserName"]
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + HModName + ';' + OperationType + ";" + sessionStorage["HUserName"];//sessionStorage["HUserName"]
var index = layer.load();
$.ajax({
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 48eb1e5..758c667 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -254,6 +254,7 @@
, element = layui.element;
//鍒濆琛ㄦ牸鏁版嵁
+ var HModName = "JIT_Cg_PODemandPlanBill";
var rowdata = [{
"HLaterReason": "", "HMaterID": "", "HMaterNumber": "", "HMaterName": "", "HMaterModel": "", "HUnitID": "", "HUnitIDName": ""
, "HErpClsID": "", "HQty": "", "HRemark": "", "HPURCHASEORGID": "", "HStatus": "", "HFixleadTime": ""
@@ -294,7 +295,6 @@
type: "GET",
data: { "HBillType": '4608' },
success: function (d) {
- //console.log(d.data);
$("#HInterID").val(d.data[0].HInterID);
$("#HBillNo").val(d.data[0].HBillNo);
$("#HDate").val(Format(new Date(), "yyyy-MM-dd"));
@@ -303,7 +303,6 @@
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(linterid);
- //RoadBillSub(linterid);
}
var option = {
@@ -365,7 +364,8 @@
//鍒濆鍔犺浇琛ㄦ牸
option.data = rowdata;
- table.render(option);
+ DisPlay_HideColumn();
+
//#endregion
@@ -754,30 +754,110 @@
//闅愯棌鍒楄缃�
function get_HideColumn() {
+ var colName = "";
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ colName += option.cols[0][i]["title"] + ",";
+ }
+
+ colName = encodeURI(colName.substring(0, colName.length - 1));//瀵� URI 杩涜缂栫爜
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "甯佸埆鍒楄〃" //鏍囬
+ , title: "闅愯棌鍒楄缃�" //鏍囬
, closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["50%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName="+1, "yes"]
+ , content: ['../../鍩虹璧勬枡/闅愯棌鍒楄缃�/Gy_GridView_Hide.html?HModName=' + HModName+'&colName=' + colName, "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ DisPlay_HideColumn();
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
layer.close(index);//鍏抽棴寮圭獥
}
})
}
+ //鏄剧ず鍒楁暟鎹�
+ function DisPlay_HideColumn() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
+ type: "GET",
+ data: { "HModName": HModName, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.data.length != 0) {
+
+
+ var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ var titleData = ["HMaterID", "HUnitID", "HWorkShopID", "HPurchaseDeptID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ dataCol = data1.data[0].HGridString.split(',');
+
+ for (var i = 0; i < option.cols[0].length - 2; i++) {
+ var dataCols = dataCol[i].split('|');
+ //闅愯棌鍒�
+ if (dataCols[1] == 1) {
+ option.cols[0][i+1]["hide"] = true;
+ }
+ //璁剧疆鍐呭瀛椾綋澶у皬
+ if (data1.data[0].HFontSize != 0) {
+ option.cols[0][i + 1]["style"] = "font-size:" + data1.data[0].HFontSize + "px;";
+ } else {
+ option.cols[0][i + 1]["style"] = "font-size:100%";
+ }
+ //璁剧疆鍒楀
+ if (data1.data[0].HColumnWidth != 0) {
+ option.cols[0][i + 1]["width"] = data1.data[0].HColumnWidth + "px;";
+ } else {
+ option.cols[0][i + 1]["width"] = "";
+ }
+ //鏄剧ず鍒�
+ if (dataCols[1] == 0 && $.inArray(option.cols[0][i + 1]["title"], titleData) == -1) {
+ option.cols[0][i + 1]["hide"] = false;
+ }
+ //瀛椾綋鎵�鍦ㄤ綅缃�(宸� 灞呬腑 鍙�)
+ switch (dataCols[2]) {
+ case "L":
+ option.cols[0][i + 1]["align"] = "left";
+ break;
+ case "M":
+ option.cols[0][i + 1]["align"] = "center";
+ break;
+ case "R":
+ option.cols[0][i + 1]["align"] = "right";
+ break;
+ }
+ }
+
+ //鍙栨秷鍐荤粨鍒�
+ for (var i = 1; i < option.cols[0].length - 1; i++) {
+ if (option.cols[0][i]["fixed"] != null) {
+ option.cols[0][i]["fixed"] = null;
+ }
+ else {
+ break;
+ }
+ }
+ //鍐荤粨鍒�
+ if (data1.data[0].HFixCols != 0) {
+ for (var i = 0; i < data1.data[0].HFixCols; i++) {
+ if ($.inArray(option.cols[0][i + 1]["title"], titleData) != -1) {
+ data1.data[0].HFixCols += 1;
+ }
+ option.cols[0][i + 1]["fixed"] = "left";
+ }
+ }
+ table.render(option);
+ } else {
+ table.render(option);
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ })
+ }
+
//琛屽揩鎹烽敭
function set_GridCellCheck(obj) {
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
diff --git "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html" "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
index 345c9fd..fd5e346 100644
--- "a/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
+++ "b/WebTM/views/\347\263\273\347\273\237\347\256\241\347\220\206/\347\224\250\346\210\267\347\256\241\347\220\206/Xt_UserListEdit.html"
@@ -40,13 +40,12 @@
<div class="layui-card-body">
<div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
<h1 style="text-align:center;"><b>鏂板/缂栬緫鐢ㄦ埛淇℃伅</b></h1>
-
<div class="layui-tab-content">
<div class="layui-tab layui-tab-card">
<ul class="layui-tab-title">
- <li class="layui-this">鍩烘湰淇℃伅</li>
- <li style="display:none;">瀵瑰簲閲戣澏淇℃伅</li>
- <li style="display:none;">CLOUD璐﹀彿璁剧疆</li>
+ <li style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li style="padding:1px;">瀵瑰簲閲戣澏淇℃伅</li>
+ <li style="padding:1px;">CLOUD璐﹀彿璁剧疆</li>
</ul>
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -93,7 +92,7 @@
<label class="layui-form-label">瀵瑰簲鑱屽憳</label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -110,7 +109,6 @@
<label class="layui-form-label">瀵瑰簲缁勭粐</label>
<div class="layui-input-inline">
<select name="HOrgID" id="HOrgID" >
- <option value="">璇烽�夋嫨</option>
</select>
</div>
</div>
@@ -118,7 +116,8 @@
<label class="layui-form-label">瀵瑰簲K3鐢ㄦ埛</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HK3UserID" id="HK3UserID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HK3UserName" id="HK3UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HK3UserID" id="HK3UserID" value="0" hidden>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HK3UserList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -131,7 +130,8 @@
<label class="layui-form-label">瀵瑰簲淇濈</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HKeeperID" id="HKeeperID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HKeeper" id="HKeeper" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HKeeperID" id="HKeeperID" value="0" hidden >
<button type="button" lay-submit="" class="layui-btn" lay-filter="HKeeperList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -142,7 +142,8 @@
<label class="layui-form-label">瀵瑰簲楠屾敹</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HSecManagerID" id="HSecManagerID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSecManager" id="HSecManager" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSecManagerID" id="HSecManagerID" value="0" hidden >
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSecManagerList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -155,7 +156,8 @@
<label class="layui-form-label">瀵瑰簲涓氬姟鍛�</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HSellManID" id="HSellManID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSellMan" id="HSellMan" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSellManID" id="HSellManID" value="0" hidden >
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSellManList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -166,7 +168,8 @@
<label class="layui-form-label">瀵瑰簲閮ㄩ棬</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HDeptID" id="HDeptID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDept" id="HDept" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptID" id="HDeptID" value="0" hidden >
<button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -179,7 +182,8 @@
<label class="layui-form-label">瀵瑰簲浠撳簱</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HWhID" id="HWhID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HWHName" id="HWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HWhID" id="HWhID" value="0" hidden>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWhList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -190,7 +194,8 @@
<label class="layui-form-label">璋冨叆浠撳簱</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HSCWH" id="HSCWH" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSCWHName" id="HSCWHName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSCWHID" id="HSCWHID" value="0" hidden>
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSCWHList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -203,7 +208,8 @@
<label class="layui-form-label">瀵瑰簲渚涘簲鍟�</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
- <input type="text" name="HSupID" id="HSupID" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSupName" id="HSupName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSupID" id="HSupID" value="0" hidden >
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -218,13 +224,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width:110px;">瀵瑰簲CLOUD璐﹀彿</label>
<div class="layui-input-inline">
- <input class="layui-input" name="" lay-verify="" id="" >
+ <input class="layui-input" name="HCloudUserName" lay-verify="" id="HCloudUserName" >
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width:110px;">瀵瑰簲CLOUD瀵嗙爜</label>
<div class="layui-input-inline">
- <input class="layui-input" name="" id="">
+ <input class="layui-input" name="HCloudUserPsd" id="HCloudUserPsd">
</div>
</div>
</div>
@@ -277,6 +283,7 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+ Organ();//鍔犺浇缁勭粐
//鍒ゆ柇鎿嶄綔绫诲瀷
if (OperationType == 1) {//鏃犳簮鏂板
@@ -314,47 +321,49 @@
Psv="Update"
});
- //琛ㄥご淇℃伅鑱屽憳寮圭獥
+ //琛ㄥご淇℃伅 鑱屽憳寮圭獥
form.on('submit(HEmpList)', function () {
- //椤甸潰灞�-鑷畾涔�
- layer.open({
- type: 2,
- skin: 'layui-layer-rim', //鍔犱笂杈规
- title: '鑱屽憳鍒楄〃',
- closeBtn: 1,
- shift: 2,
- area: ['80%', '80%'],
- maxmin: true,
- content: ['../../PublicPage/UserInformation.html', 'yes'],
- btn: ['纭畾', '鍙栨秷']
- , btn1: function (index, layero) {
-
- //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
- var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
- if (checkStatus.data.length === 0) {
- return layer.msg('璇烽�夋嫨鏁版嵁');
- }
- $("#HEmpName").val(checkStatus.data[0].HName);
- $("#HEmpID").val(checkStatus.data[0].HItemID);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- , btn2: function (index, layero) {
- //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
- //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
- },
- end: function () {
-
- },
- success: function (layero, index) {
-
- }
- });
+ Gy_Employee(1);
});
+
+ //琛ㄥご淇℃伅 淇濈寮圭獥
+ form.on('submit(HKeeperList)', function () {
+ Gy_Employee(2);
+ });
+
+ //琛ㄥご淇℃伅 楠屾敹寮圭獥
+ form.on('submit(HSecManagerList)', function () {
+ Gy_Employee(3);
+ });
+
+ //琛ㄥご淇℃伅 涓氬姟鍛樺脊绐�
+ form.on('submit(HSellManList)', function () {
+ Gy_Employee(4);
+ });
+
+ //琛ㄥご淇℃伅 閮ㄩ棬寮圭獥
+ form.on('submit(HDeptList)', function () {
+ Gy_DepartmentList();
+ });
+
+ //琛ㄥご淇℃伅 浠撳簱寮圭獥
+ form.on('submit(HWhList)', function () {
+ Gy_Warehouse(1);
+ });
+
+ //琛ㄥご淇℃伅 璋冨叆浠撳簱寮圭獥
+ form.on('submit(HSCWHList)', function () {
+ Gy_Warehouse(2);
+ });
+
+ //琛ㄥご淇℃伅 渚涘簲鍟嗗脊绐�
+ form.on('submit(HSupList)', function () {
+ Gy_Supplier();
+ });
+
//淇濆瓨
form.on('submit(Saver)', function (data) {
- //debugger;
var sMainStr = JSON.stringify(data.field) + ';' + Sav;
if (!AllowLoadData())//鏁版嵁楠岃瘉
{
@@ -377,15 +386,13 @@
}
else {
- f_alert(data.Message);
- console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ layer.msg(data.Message);
}
layer.closeAll("loading");
},
error: function (err) {
- f_alert("閿欒:" + err);
- console.log("Reason" + sMainStr);
+ layer.msg("閿欒:" + err);
}
});
});
@@ -404,6 +411,183 @@
//#endregion
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
+ //鑱屽憳鍒楄〃
+ function Gy_Employee(num) {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ switch (num) {
+ case 1:
+ $("#HEmpName").val(checkStatus.data[0].HName);
+ $("#HEmpID").val(checkStatus.data[0].HItemID);
+ break;
+ case 2:
+ $("#HKeeper").val(checkStatus.data[0].HName);
+ $("#HKeeperID").val(checkStatus.data[0].HItemID);
+ break;
+ case 3:
+ $("#HSecManager").val(checkStatus.data[0].HName);
+ $("#HSecManagerID").val(checkStatus.data[0].HItemID);
+ break;
+ case 4:
+ $("#HSellMan").val(checkStatus.data[0].HName);
+ $("#HSellManID").val(checkStatus.data[0].HItemID);
+ break;
+ }
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ });
+ }
+
+ //閮ㄩ棬鍒楄〃
+ function Gy_DepartmentList() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HDept").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ });
+ }
+
+ //浠撳簱鍒楄〃
+ function Gy_Warehouse(num) {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ switch (num) {
+ case 1:
+ $("#HWHName").val(checkStatus.data[0].HName);
+ $("#HWhID").val(checkStatus.data[0].HItemID);
+ break;
+ case 2:
+ $("#HSCWHName").val(checkStatus.data[0].HName);
+ $("#HSCWHID").val(checkStatus.data[0].HItemID);
+ break;
+ }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ });
+ }
+
+ //渚涘簲鍟嗗垪琛�
+ function Gy_Supplier() {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '渚涘簲鍟嗗垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ });
+ }
//缂栬緫鑾峰彇琛ㄥご淇℃伅
function set_EditFromGrid(linterid)
@@ -417,7 +601,6 @@
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_IF_UserList_Edit[0];
- console.info(data);
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"Czybm": data.鐢ㄦ埛缂栫爜 //鐢ㄦ埛缂栫爜
, "Czymc": data.鐢ㄦ埛鍚嶇О //鐢ㄦ埛鍚嶇О
@@ -426,6 +609,25 @@
, "Explain": data.璇存槑 //璇存槑
, "HEmpID": data.HEmpID //
, "HEmpName": data.瀵瑰簲鑱屽憳 //
+ , "HK3UserName": data.HK3UserID
+ , "HK3UserID": data.HK3UserID
+ , "HKeeper": data.HKeeper
+ , "HKeeperID": data.HKeeperID
+ , "HSecManager": data.HSecManager
+ , "HSecManagerID": data.HSecManagerID
+ , "HSellManID": data.HSellManID
+ , "HSellMan": data.HSellMan
+ , "HDept": data.HDept
+ , "HDeptID": data.HDeptID
+ , "HWHName": data.HWHName
+ , "HWhID": data.HWhID
+ , "HSCWHName": data.HSCWHName
+ , "HSCWHID": data.HSCWHID
+ , "HSupName": data.HSupName
+ , "HSupID": data.HSupID
+ , "HCloudUserName": data.瀵瑰簲CLOUD璐﹀彿
+ , "HCloudUserPsd": data.HCloudUserPsd
+ , "HOrgID": data.HUSEORGID
});
} else {
@@ -483,6 +685,10 @@
layer.msg("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if ($("#HWHName").val() == $("#HSCWHName").val() && $("#HWHName").val() != "" && $("#HSCWHName").val() != "") {
+ layer.msg("瀵瑰簲浠撳簱鍜岃皟鍏ヤ粨搴撲笉鑳界浉鍚岋紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
else {
return Result = true;
}
--
Gitblit v1.9.1