From 6fef3b4776389b1973eed5d03be510d006c83d87 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 19 十月 2022 15:22:18 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/车间管理/委外工序接收单/Cj_StationEntrustOutBill.html | 80 ++
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 4
WebTM/views/系统管理/用户管理/Gy_UserCustomer.html | 443 ++++++++++++++++
WebTM/views/系统管理/用户管理/Gy_UserMater.html | 443 ++++++++++++++++
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill.html | 56 ++
WebTM/views/车间管理/工序进站接收单/Cj_StationInBill.html | 104 +++
WebTM/views/index.html | 3
WebTM/WebTM.csproj | 3
WebTM/views/系统管理/用户管理/Gy_UserByUser.html | 444 ++++++++++++++++
9 files changed, 1,566 insertions(+), 14 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 11adbd0..9241518 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -948,10 +948,13 @@
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_Xtgnb_Edit.html" />
<Content Include="views\绯荤粺绠＄悊\妯″潡绠＄悊\Xt_XtgnbList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByOrg.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByUser.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserByWorkStation.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserCustomer.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserDept.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserEmployee.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserGroup.html" />
+ <Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserMater.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Gy_UserStock.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserGroupList.html" />
<Content Include="views\绯荤粺绠＄悊\鐢ㄦ埛绠＄悊\Xt_UserList.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 42521b6..7927610 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -1036,6 +1036,9 @@
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserGroup.html">鐢ㄦ埛鍏宠仈鐝粍</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserDept.html">鐢ㄦ埛鍏宠仈閮ㄩ棬</a></dd>
<dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserEmployee.html">鐢ㄦ埛鍏宠仈鑱屽憳</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserByUser.html">鐢ㄦ埛鍏宠仈鐢ㄦ埛</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserMater.html">鐢ㄦ埛鍏宠仈鐗╂枡</a></dd>
+ <dd><a lay-href="绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Gy_UserCustomer.html">鐢ㄦ埛鍏宠仈瀹㈡埛</a></dd>
<dd><a lay-href="">鏉冮檺鏌ヨn</a></dd>
<dd><a lay-href="set/user/password.html">瀵嗙爜璁剧疆</a></dd>
</dl>
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/Gy_UserByUser.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/Gy_UserByUser.html"
new file mode 100644
index 0000000..766f02a
--- /dev/null
+++ "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/Gy_UserByUser.html"
@@ -0,0 +1,444 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢ㄦ埛鍏宠仈鐢ㄦ埛</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ float: left;
+ display: block;
+ padding: 9px 15px;
+ width: 31px;
+ font-weight: 400;
+ line-height: 20px;
+ text-align: left;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢ㄦ埛</label>
+ <div class="layui-input-inline">
+ <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ TabRow = { "HUserID2": 0, "HUserNumber2": "", "HUserName2": "" };
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鏂板
+ //鏃犳簮鏂板
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = TabRow;
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //鐢ㄦ埛淇℃伅寮圭獥
+ form.on('submit(UserList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '楠屾敹鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/PeopleInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#UserName").val(checkStatus.data[0].HName);
+ $("#UserID").val(checkStatus.data[0].HNumber);
+
+ $.ajax({
+ url: GetWEBURL() + "/Xt_User/UserPlaylist",
+ type: "GET",
+ data: { "HUserID": checkStatus.data[0].HNumber },
+ success: function (data) {
+ if (data.data != null && data.data != "") {
+ option.data = data.data;
+ table.render(option);
+ }
+ else {
+ table.reload("mainTable", {});
+ table.reload('mainTable', { data: [] });
+ }
+
+ }
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //鐢ㄦ埛浠ｇ爜
+ if (obj.event === 'HUserNumber2') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ {
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨渚涘簲鍟�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐢ㄦ埛鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../绯荤粺绠＄悊/鐢ㄦ埛绠＄悊/Xt_UserList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //console.log(obj.data);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ console.log(checkStatus.data[0])
+ obj.update({
+ HUserID2: checkStatus.data[0].HEmpID,
+ HUserNumber2: checkStatus.data[0].鐢ㄦ埛缂栫爜,
+ HUserName2: checkStatus.data[0].鐢ㄦ埛鍚嶇О
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {
+ if ($("#UserName").val() == "") {
+ layer.msg("鐢ㄦ埛涓嶈兘涓虹┖锛�");
+ return false;
+ }
+ var UserID = $("#UserID").val(); //鑾峰彇閫夋嫨鐨勭敤鎴风紪鐮�
+ //debugger;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ var list = [];
+ for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
+ list.push(JSON.parse(sSubStr)[i].HUserNumber2)
+ }
+ if (isAllEqual(list)) {
+ layer.msg("鏈夐噸澶嶇殑鐢ㄦ埛淇℃伅锛�");
+ return false;
+ }
+
+ var sMainSub = sSubStr + ';' + UserID
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xt_User/SaveUserUser", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ layer.alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ layer.alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HUserID2', title: 'HUserID2', edit: 'text', hide: true }
+ , { field: 'HUserNumber2', title: '鐢ㄦ埛浠ｇ爜', edit: 'text', event: 'HUserNumber2' }
+ , { field: 'HUserName2', title: '鐢ㄦ埛鍚嶇О', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 680
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ option.data = [TabRow];
+ table.render(option);
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ });
+ }
+ }
+ //#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+ function isAllEqual(list) {
+ var s = list.join(",") + ",";
+ for (var i = 0; i < list.length; i++) {
+ if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
+ return true;
+ }
+ }
+ }
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ var Result = true;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].鐢ㄦ埛浠ｇ爜 == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢ㄦ埛浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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/Gy_UserCustomer.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/Gy_UserCustomer.html"
new file mode 100644
index 0000000..72e046a
--- /dev/null
+++ "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/Gy_UserCustomer.html"
@@ -0,0 +1,443 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢ㄦ埛鍏宠仈瀹㈡埛</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ float: left;
+ display: block;
+ padding: 9px 15px;
+ width: 31px;
+ font-weight: 400;
+ line-height: 20px;
+ text-align: left;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢ㄦ埛</label>
+ <div class="layui-input-inline">
+ <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ TabRow = { "HCusID": 0, "HCustomerNumber": "", "HCustomerName": "" };
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鏂板
+ //鏃犳簮鏂板
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = TabRow;
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //鐢ㄦ埛淇℃伅寮圭獥
+ form.on('submit(UserList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '楠屾敹鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/PeopleInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#UserName").val(checkStatus.data[0].HName);
+ $("#UserID").val(checkStatus.data[0].HNumber);
+
+ $.ajax({
+ url: GetWEBURL() + "/Xt_User/CustomerPlaylist",
+ type: "GET",
+ data: { "HUserID": checkStatus.data[0].HNumber },
+ success: function (data) {
+ if (data.data != null && data.data != "") {
+ option.data = data.data;
+ table.render(option);
+ }
+ else {
+ table.reload("mainTable", {});
+ table.reload('mainTable', { data: [] });
+ }
+
+ }
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //渚涘簲鍟嗕唬鐮�
+ if (obj.event === 'HCustomerNumber') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ {
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨渚涘簲鍟�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '瀹㈡埛鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/CustomerInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ //console.log(obj.data);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HCusID: checkStatus.data[0].HItemID,
+ HCustomerNumber: checkStatus.data[0].HNumber,
+ HCustomerName: checkStatus.data[0].HName
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {
+ if ($("#UserName").val() == "") {
+ layer.msg("鐢ㄦ埛涓嶈兘涓虹┖锛�");
+ return false;
+ }
+ var UserID = $("#UserID").val(); //鑾峰彇閫夋嫨鐨勭敤鎴风紪鐮�
+ //debugger;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ var list = [];
+ for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
+ list.push(JSON.parse(sSubStr)[i].HCustomerNumber)
+ }
+ if (isAllEqual(list)) {
+ layer.msg("鏈夐噸澶嶇殑瀹㈡埛淇℃伅锛�");
+ return false;
+ }
+
+ var sMainSub = sSubStr + ';' + UserID
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xt_User/SaveUserCustomer", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ layer.alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ layer.alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HCusID', title: 'HCusID', edit: 'text', hide: true }
+ , { field: 'HCustomerNumber', title: '瀹㈡埛浠ｇ爜', edit: 'text', event: 'HCustomerNumber' }
+ , { field: 'HCustomerName', title: '瀹㈡埛鍚嶇О', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 680
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ option.data = [TabRow];
+ table.render(option);
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ });
+ }
+ }
+ //#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+ function isAllEqual(list) {
+ var s = list.join(",") + ",";
+ for (var i = 0; i < list.length; i++) {
+ if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
+ return true;
+ }
+ }
+ }
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ var Result = true;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁瀹㈡埛鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].瀹㈡埛浠ｇ爜 == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,瀹㈡埛浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
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/Gy_UserMater.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/Gy_UserMater.html"
new file mode 100644
index 0000000..50a4e86
--- /dev/null
+++ "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/Gy_UserMater.html"
@@ -0,0 +1,443 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐢ㄦ埛鍏宠仈鐗╂枡</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></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>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
+ .layui-form-item .layui-inline {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
+ }
+
+ .layui-form-label {
+ float: left;
+ display: block;
+ padding: 9px 15px;
+ width: 31px;
+ font-weight: 400;
+ line-height: 20px;
+ text-align: left;
+ }
+ </style>
+</head>
+<body>
+ <div id="layout1" class="layui-fluid">
+ <div class="layui-row layui-col-space15">
+ <div class="layui-col-md12">
+ <div class="layui-card">
+ <form id="form0" class="layui-form" lay-filter="component-form-group" action="">
+ <div class="layui-card-header">
+ <div class="layui-btn-group">
+ <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
+ <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
+ </div>
+ </div>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item">
+ <div class="layui-inline">
+ <label class="layui-form-label">鐢ㄦ埛</label>
+ <div class="layui-input-inline">
+ <input type="text" name="UserName" id="UserName" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="UserID" id="UserID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="UserList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <script type="text/html" id="toolbarDemo">
+ <div class="layui-btn-container">
+
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-AddLine"><i class="layui-icon layui-icon-form"></i>澧炲姞涓�琛�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-CopyLine"><i class="layui-icon layui-icon-form"></i>澶嶅埗涓�琛�</button>
+
+ </div>
+ </script>
+ <script type="text/html" id="xuhao">
+ {{d.LAY_TABLE_INDEX+1}}
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <script type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <script>
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ var OperationType = 1;//鎿嶄綔绫诲瀷
+ var closeType = 2; //鍏抽棴绫诲瀷
+ } else {
+ var OperationType = params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]];//婧愬崟id
+ var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
+ var closeType = params[params[3]]; //鍏抽棴绫诲瀷
+ }
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var option = [];
+ TabRow = { "HMaterID": 0, "HMaterNumber": "", "HMaterName": "" };
+ //#endregion
+
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //鍒ゆ柇鎿嶄綔绫诲瀷
+ if (OperationType == 1) {//鏃犳簮鏂板
+ //鏃犳簮鏂板
+ set_AddFNew();
+ }
+ else if (OperationType == 3) {//缂栬緫
+ set_EditFromGrid(linterid);
+ }
+ else {
+ layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
+ }
+ //#endregion
+
+ //#region 鐐瑰嚮浜嬩欢锛屽寘鎷琽n鍜宖orm浜嬩欢
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = TabRow;
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ set_GridDelete(obj); //琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ });
+ //鐢ㄦ埛淇℃伅寮圭獥
+ form.on('submit(UserList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '楠屾敹鍛樺垪琛�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/PeopleInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+ $("#UserName").val(checkStatus.data[0].HName);
+ $("#UserID").val(checkStatus.data[0].HNumber);
+
+ $.ajax({
+ url: GetWEBURL() + "/Xt_User/MaterPlaylist",
+ type: "GET",
+ data: { "HUserID": checkStatus.data[0].HNumber },
+ success: function (data) {
+ if (data.data != null && data.data != "") {
+ option.data = data.data;
+ table.render(option);
+ }
+ else {
+ table.reload("mainTable", {});
+ table.reload('mainTable', { data: [] });
+ }
+
+ }
+ });
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+ //琛ㄦ牸琛屽唴浜嬩欢蹇嵎閿瓫閫�
+ function set_GridCellCheck(obj) {
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ //渚涘簲鍟嗕唬鐮�
+ if (obj.event === 'HMaterNumber') //妯″叿淇℃伅 濡傛灉鍦ㄦā鍏蜂唬鐮佸垪 鎸塅7
+ {
+ //椤甸潰灞�-鑷畾涔� //F7閫夋嫨渚涘簲鍟�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterList.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('璇烽�夋嫨鏁版嵁');
+ }
+ //console.log(obj.data);
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterNumber: checkStatus.data[0].鐗╂枡浠ｇ爜,
+ HMaterName: checkStatus.data[0].鐗╂枡
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ obj.event = "";
+ return false;
+ }
+ })
+ }
+
+ //淇濆瓨
+ form.on('submit(Saver)', function (data) {
+ if ($("#UserName").val() == "") {
+ layer.msg("鐢ㄦ埛涓嶈兘涓虹┖锛�");
+ return false;
+ }
+ var UserID = $("#UserID").val(); //鑾峰彇閫夋嫨鐨勭敤鎴风紪鐮�
+ //debugger;
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
+ var list = [];
+ for (var i = 0; i < JSON.parse(sSubStr).length; i++) {
+ list.push(JSON.parse(sSubStr)[i].HMaterNumber)
+ }
+ if (isAllEqual(list)) {
+ layer.msg("鏈夐噸澶嶇殑鐗╂枡淇℃伅锛�");
+ return false;
+ }
+
+ var sMainSub = sSubStr + ';' + UserID
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xt_User/SaveUserMater", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ var index = parent.layer.getFrameIndex(window.name); //鍏堝緱鍒板綋鍓峣frame灞傜殑绱㈠紩
+ parent.layer.close(index); //鍐嶆墽琛屽叧闂� 聽 聽 聽 聽 聽聽 聽聽聽 聽
+ });
+ }
+ else {
+
+ layer.alert(data.Message);
+ console.log("Reason" + sMainSub + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+
+ layer.alert("閿欒:" + err);
+ console.log("Reason" + sMainStr);
+ }
+ });
+ });
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ if (OperationType == 1) {
+ Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ }
+ else if (OperationType == 3) {
+ Pub_Close(closeType);
+ }
+ else {
+ Pub_Close(2);
+ }
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夋柟娉�
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe" }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterNumber' }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 680
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ option.data = [TabRow];
+ table.render(option);
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+
+ buttonArr = [];//娓呯┖鏁扮粍
+ for (var i = 0; i < tableBak.length; i++) {
+ buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ }
+ buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ table.reload("mainTable", {
+ data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ })
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+ // 琛ㄦ牸琛屽唴浜嬩欢鍒犻櫎
+ function set_GridDelete(obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1);
+ table.reload('mainTable', { data: oldData });
+ layer.close(index);
+ });
+ }
+ }
+ //#region 鍒ゆ柇鏁版嵁鏁扮粍涓殑鍊兼槸鍚︾浉鍚�
+ function isAllEqual(list) {
+ var s = list.join(",") + ",";
+ for (var i = 0; i < list.length; i++) {
+ if (s.replace(list[i] + ",", "").indexOf(list[i] + ",") > -1) {
+ return true;
+ }
+ }
+ }
+ //#region 闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ var Result = true;
+ if (typeof (sSubStr) == "undefined" || sSubStr == "") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].鐗╂枡浠ｇ爜 == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐗╂枡浠ｇ爜涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ }
+ }
+ else {
+ return Result = true;
+ }
+ return Result;
+ }
+
+ });
+ </script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
index ca6730b..a50c002 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\345\217\221\345\207\272\345\215\225/Cj_StationEntrustInBill.html"
@@ -139,6 +139,7 @@
<label class="layui-form-label">娴佽浆鍗″彿</label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" class="layui-input" name="HProcExchHinteID" id="HProcExchHinteID">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -162,7 +163,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">娴佹按鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -390,6 +391,7 @@
</div>
</div>
</div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey" value="0">
@@ -415,6 +417,9 @@
, element = layui.element;
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
@@ -598,11 +603,60 @@
"HGroup": data.鐝粍,
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"],
+ "HProcExchHinteID": data.hmainid,
"HPRDOrg": data.缁勭粐
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ data: { "HProcExchHinteID": HProcExchHinteID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [col]
+ , height: 500
+ }
+ table.render(option)
+ }
+ })
+
layer.close(index);
}
else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
index a44fc39..713e8d9 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\247\224\345\244\226\345\267\245\345\272\217\346\216\245\346\224\266\345\215\225/Cj_StationEntrustOutBill.html"
@@ -145,7 +145,10 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">褰撳墠宸ュ簭</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="CurrPro-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
<input type="hidden" name="HProcID" id="HProcID" value="0">
</div>
</div>
@@ -360,6 +363,7 @@
</div>
</div>
</div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngBillKey" id="lngBillKey">
<input type="hidden" name="lngBillSubKey" id="lngBillSubKey">
@@ -394,6 +398,9 @@
, element = layui.element;
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
/*鍥哄畾浠ｇ爜锛屾瘡寮犲崟鎹兘瑕乥egin*/
/* 1.鏃犳簮鍗曟柊澧�
@@ -687,6 +694,7 @@
"HGroup": data.鐝粍,
"HDeptID": sessionStorage["HDeptID"],
"HDept": sessionStorage["HDept"],
+ "HProcExchHinteID": data.hmainid,
"HPRDOrg": data.缁勭粐
});
if ($("#eventType").val() === "Add") {
@@ -701,6 +709,54 @@
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ data: { "HProcExchHinteID": HProcExchHinteID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [col]
+ , height: 500
+ }
+ table.render(option)
+ }
+ })
+
layer.close(index);
}
else {
@@ -932,6 +988,23 @@
})
});
+ //閫夋嫨褰撳墠宸ュ簭寮圭獥
+ form.on('submit(CurrPro-BT)', function () {//閫夋嫨褰撳墠宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '褰撳墠宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ //layer.msg('绂佹閫夋嫨');
+ });
+
//#region 鏂板鎸夐挳
form.on('submit(set_AddNew)', function () {//鎻愪氦
layer.confirm('鏂板鍚庨〉闈㈡暟鎹皢娑堝け锛�', { icon: 3, title: '鎻愮ず' }, function (index) {
@@ -991,6 +1064,11 @@
$("#HSupName").val(obj[0].HName);
$("#HSupID").val(obj[0].HItemID);
}
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ }
</script>
</body>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
index 03e2bf2..65942fc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill.html"
@@ -169,7 +169,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="SerialNum-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
- <input type="hidden" value="0" name="HSourceID" id="HSourceID">
+ <input type="hidden" value="0" name="HProcID" id="HProcID">
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
@@ -814,7 +814,7 @@
"HProcExchHinteID": data.hmainid,
"HICMOQty": data.浠诲姟鍗曟暟閲�,
"HOrderProcNO": data.璁㈠崟璺熻釜鍙�,
- "HPRDOrg": data.缁勭粐
+ "HPRDOrgID": data.缁勭粐
});
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
index 6c2cd9d..b01e99e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBill.html"
@@ -141,7 +141,10 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>褰撳墠宸ュ簭</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="background-color:#efefef4d;" readonly>
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="CurrPro-BT" id="SerialNum-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
<input type="hidden" name="HProcID" id="HProcID" value="0">
</div>
</div>
@@ -156,7 +159,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label"><span style="color:red;">*</span>娴佹按鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcNo" id="HProcNo">
+ <input type="text" class="layui-input" name="HProcNo" id="HProcNo" placeholder="璇烽敭鍏ュ悗鍥炶溅">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -209,12 +212,12 @@
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
- <input type="hidden" name="HCenterID" id="HCenterID" value="0">
- </div>
- </div>-->
+ <label class="layui-form-label"><span style="color:red;">*</span>宸ヤ綔涓績</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCenterName" id="HCenterName" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HCenterID" id="HCenterID" value="0">
+ </div>
+ </div>-->
</div>
<div class="layui-row">
<div class="layui-col-xs8 layui-inline">
@@ -384,6 +387,7 @@
</div>
</div>
</div>
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
<!--闅愯棌瀛楁-->
<input type="hidden" name="lngICMOEntryID" id="lngICMOEntryID">
<input type="hidden" name="lngBillKey" id="lngBillKey" value="0">
@@ -410,6 +414,10 @@
, upload = layui.upload
, element = layui.element;
var params = get_UrlVars();
+
+ //涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+ var titleData = [];
+
if (typeof (params[params[0]]) == "undefined") {
var OperationType = 1;//鎿嶄綔绫诲瀷
var closeType = 2; //鍏抽棴绫诲瀷
@@ -478,8 +486,6 @@
//杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ潯褰㈢爜涓�
$("#HBarCode").focus();
-
-
//#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
@@ -855,6 +861,61 @@
$("#HBarCode").attr("readonly", "readonly");//鏉″舰鐮佸彧璇�
$("#HBarCode").css("background-color", "#efefef4d");
HProcExchBillNoFlag = true;
+
+ var HProcExchHinteID = $('#HProcExchHinteID').val();
+
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ data: { "HProcExchHinteID": HProcExchHinteID },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+ option = {
+ elem: '#mainTable',
+ url: GetWEBURL() + "/Cj_StationEntrustInBill/DisBillEntryList",
+ type: "GET",
+ //, cellMinWidth: 80
+ toolbar: '#toolbarDemo'
+ , where: { HProcExchHinteID: HProcExchHinteID }
+ , cols: [col]
+ , height: 500
+ }
+ table.render(option)
+ }
+ })
+ //layer.close(index);
+ //set_InitGrid();
+ //table.render(option);
+
+ //鍒锋柊琛ㄦ牸鏁版嵁
+ //DisPlay_HideColumn();
+
layer.close(index);
}
else {
@@ -957,6 +1018,7 @@
//閫夋嫨鐢熶骇璧勬簮寮圭獥
form.on('submit(ProductionResources-BT)', function () {//鐢熶骇璧勬簮
+ console.log($('#HProcNo').val())
layer.open({
type: 2
, area: ['80%', '80%']
@@ -1024,6 +1086,23 @@
//, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
, content: ['../../Baseset/鍩虹璧勬枡/Gy_WorkCenterList.html', 'yes']
+ , resize: false
+ , cancel: function (index, layero) {
+ }
+ })
+ //layer.msg('绂佹閫夋嫨');
+ });
+
+ //閫夋嫨褰撳墠宸ュ簭寮圭獥
+ form.on('submit(CurrPro-BT)', function () {//閫夋嫨褰撳墠宸ュ簭
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '褰撳墠宸ュ簭'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ //, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes']
, resize: false
, cancel: function (index, layero) {
}
@@ -1103,6 +1182,11 @@
$("#HCenterName").val(obj[0].宸ヤ綔涓績);
$("#HCenterID").val(obj[0].HItemID);
}
+ //杩斿洖褰撳墠宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖褰撳墠宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ }
</script>
</body>
--
Gitblit v1.9.1