From aa6b34099bad59f908aecc3720143f6b5617b84b Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 14 十月 2021 18:09:53 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
/dev/null | 268 -------
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBillList.html | 342 +++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBillList.html | 10
WebTM/views/工资管理/考勤汇报单/Pay_WorkTimesBill.html | 1089 +++++++++++++++++++++++++++++
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepInBill.html | 167 +++-
WebTM/views/Baseset/基础资料/Gy_WarehouseList.html | 4
WebTM/layuiadmin/Scripts/webConfig.js | 2
WebTM/views/index.html | 7
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBillList.html | 8
WebTM/WebTM.csproj | 3
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldMoveStockStepOutBill.html | 313 ++++++--
11 files changed, 1,809 insertions(+), 404 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index e06d93e..beef544 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -587,7 +587,8 @@
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28涓汉%29\Pay_SingleBalBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBill.html" />
<Content Include="views\宸ヨ祫绠＄悊\宸ヨ祫缁撶畻鍗�%28鍏朵粬%29\Pay_OtherBalBillList.html" />
- <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Kf_BarCodeEditDlg.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBill.html" />
+ <Content Include="views\宸ヨ祫绠＄悊\鑰冨嫟姹囨姤鍗昞Pay_WorkTimesBillList.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿澶勭悊鍑哄簱鍗昞Sc_MouldScrapOutBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿瀵垮懡璋冩暣鍗昞Sc_MouldLifeChangeBill_PDA.html" />
<Content Include="views\妯℃不鍏风鐞哱妯″叿鐢熶骇閫�搴撳崟\Sc_MouldProdBackBill_PDA.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index f6d4f0e..68bfdb0 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -2,7 +2,7 @@
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
//var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴
- //var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
+ var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
diff --git "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html" "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
index 4b67f6b..ea9d7d2 100644
--- "a/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
+++ "b/WebTM/views/Baseset/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WarehouseList.html"
@@ -47,6 +47,7 @@
}
var params = getUrlVars();
var Type = params[params[0]];
+ var HOtherOrgID = params[params[1]];
layui.use(['table', 'form', 'layer'], function () {
var table = layui.table
@@ -93,6 +94,9 @@
if (Value == null) {
Value = '';
}
+ if (HOtherOrgID > 0) {
+ Value = HOtherOrgID;
+ }
$.ajax({
type: "get",
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetWarehouseList_Json",
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 81f2072..66d1138 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -609,6 +609,13 @@
</dl>
</dd>
<dd>
+ <a>鑰冨嫟姹囨姤鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html">鑰冨嫟姹囨姤鍗�</a></dd>
+ <dd><a lay-href="宸ヨ祫绠＄悊/鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBillList.html">鑰冨嫟姹囨姤鍗曠淮鎶�</a></dd>
+ </dl>
+ </dd>
+ <dd>
<a>鎵ｈˉ璧勬枡</a>
<dl class="layui-nav-child">
<dd><a lay-href="宸ヨ祫绠＄悊/Gy_DuSubsidyItemBillList.html">鎵ｈˉ宸ヨ祫璧勬枡缁存姢</a></dd>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Kf_BarCodeEditDlg.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Kf_BarCodeEditDlg.html"
deleted file mode 100644
index 4bdb342..0000000
--- "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Kf_BarCodeEditDlg.html"
+++ /dev/null
@@ -1,268 +0,0 @@
-锘�<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; 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">
-</head>
-<body>
- <div class="layui-fluid">
- <div class="layui-card" style="padding: 1%">
- <div class="layui-card-body" style="padding: 15px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div class="layui-form-item">
- <label class="layui-form-label">鏁伴噺</label>
- <div class="layui-input-inline">
- <input type="text" name="HQty" id="HQty" lay-verify="HQty" autocomplete="off" style="width:100%" class="layui-input">
- </div>
- </div>
- <div class="layui-tab">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1">鏉＄爜鏄庣粏</li>
- <li lay-id="2">鏉＄爜妗ｆ</li>
- </ul>
- <div class="layui-tab-content">
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
- <div class="layui-card-header"></div>
- <div class="layui-form-item">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdChange">璋冩暣</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdDel">鍒犻櫎</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="cmdCancel">閫�鍑�</button>
- </div>
- </div>
- <div class="layui-tab-item">
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鏉″舰鐮�</label>
- <div class="layui-input-inline">
- <input type="text" name="HBarcode" id="HBarcode" lay-verify="HBarcode" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鐗╂枡妗ｆ</label>
- <div class="layui-input-inline">
- <input type="text" name="HM" id="HM" lay-verify="HM" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">寰�鏉ュ崟浣�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" lay-verify="HSupName" autocomplete="off" class="layui-input">
- <input type="hidden" name="HSupID" id="HSupID" lay-verify="HSupID" autocomplete="off" class="layui-input">
- </div>
-
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">閮ㄩ棬</label>
- <div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" lay-verify="HDeptName" autocomplete="off" class="layui-input">
- <input type="hidden" name="HDeptID" id="HDeptID" lay-verify="HDeptID" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撳簱</label>
- <div class="layui-input-inline mobile">
- <input type="text" name="HWHNAME" id="HWHNAME" lay-verify="HWHNAME" autocomplete="off" class="layui-input">
- <input type="hidden" name="HWHID" id="HWHID" lay-verify="HWHID" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">浠撲綅</label>
- <div class="layui-input-inline mobile">
- <input type="text" name="HSCWHNAME" id="HSCWHNAME" lay-verify="HSCWHNAME" autocomplete="off" class="layui-input">
- <input type="hidden" name="HSCWID" id="HSCWID" lay-verify="HSCWID" autocomplete="off" class="layui-input">
- </div>
- </div>
- <div class="layui-form-item" style="margin-bottom: 20px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="button1">杩斿洖</button>
- </div>
- </div>
- </div>
- </div>
- </form>
- </div>
- </div>
- </div>
- <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>
- function getUrlVars() {
- var vars = [], hash;
- var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
- for (var i = 0; i < hashes.length; i++) {
- hash = hashes[i].split('=');
- vars.push(hash[0]);
- vars[hash[0]] = hash[1];
- }
- return vars;
- }
- //鑾峰彇椤甸潰璺宠浆鍙傛暟
- var params = get_UrlVars();
- if (typeof (params[params[0]]) == "undefined") {
- var OperationType = 1;//鎿嶄綔绫诲瀷
- } else {
- var HInterID = params[params[0]];//鍗曟嵁ID
- var HMaterID = params[params[1]];//鐗╂枡ID
- var HAuxPropID = params[params[2]];//杈呭姪灞炴��
- var HMTONo = params[params[3]];//璁″垝璺熻釜鍙�
- var HWhID = params[params[4]];//浠撳簱ID
- var HSPID = params[params[5]];//浠撲綅ID
- var HSCWHID = params[params[6]];//璋冨嚭浠撳簱ID
- var HSCSPID = params[params[7]];//璋冨嚭浠撲綅ID
- var HBatchNo = params[params[8]];//鎵规
- var HSourceInterID = params[params[9]];//婧愬崟涓籌D
- var HSourceEntryID = params[params[10]];//婧愬崟瀛怚D
- var HBillType = params[params[11]];//鍗曟嵁绫诲瀷
- var HBarCode = params[params[12]];//鏉＄爜
- }
-
- layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
- }).extend({
- index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table'], function () {
- var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form;
-
-
- table.render({
- elem: '#mx-table'
- //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
- ,url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
- , where: {
- "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
- , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
- },
- cols: [[
- { type: 'radio' }
- , { field: 'HSonNo', title: '搴忓彿', width: 100 }
- , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
- ]]
- // , data: [linterid]
- });
-
-
- //#region 鍒犻櫎
- function set_DeleteBill() {
- var checkStatus = table.checkStatus('mx-table')
- , data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var HBarCode = data[0].HBarCode.toString();
- //閫昏緫鍒犻櫎鏂规硶
- layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Kf_BarCodeEditDlg/DeltetBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "HBarCode": HBarCode, "HBillType": HBillType },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼鎴愬姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
- })
- }
- else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
- }
- }
-
-
- //缂栬緫
- form.on('submit(cmdChange)', function () {//缂栬緫
- var checkStatus = table.checkStatus('mx-table')
- , data = checkStatus.data;
- var sQty = data[0].HQty.toString();
- var iQty = $('#HQty').val()
- $.ajax(
- {
- type: "Get",
- //url: "http://61.130.49.162:9090/WMSAPI///ProductIn/Delete_Json", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- url: GetWEBURL() + "/Kf_BarCodeEditDlg/GetCheckQtyByBarCodeBill",
- async: true,
- data: {
- "HInterID": HInterID, "HBillType": HBillType, "sBatchNo": HBatchNo, "sBarCode": HBarCode, "sSCWhID": HSCWHID
- , "sSCSPID": HSCSPID, "sAuxPropID": HAuxPropID, "sMTONo": HMTONo, "iQty": iQty
- , "HMaterID": HMaterID, "sWhID": HWhID, "sSPID": HSPID, "HSourceInterID": HSourceInterID
- , "HSourceEntryID": HSourceEntryID, "EndQty": EndQty, "sQty": sQty
- },
- dataType: "json",
- success: function (data) {
- if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜�
- table.render({
- elem: '#mx-table'
- //, url: 'http://localhost:8083/Web/GetHBarCodeShowBillSub'
- , url: GetWEBURL() + "/Web/GetHBarCodeShowBillSub"
- , where: {
- "HInterID": HInterID, "HMaterID": HMaterID, "HAuxPropID": HAuxPropID, "HMTONo": HMTONo, "HWhID": HWhID, "HSPID": HSPID, "HSCWHID": HSCWHID
- , "HSCSPID": HSCSPID, "HBatchNo": HBatchNo, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "HBillType": HBillType
- },
- cols: [[
- { type: 'radio' }
- , { field: 'HSonNo', title: '搴忓彿', width: 100 }
- , { field: 'HBarCode', title: '鏉″舰鐮�', width: 200 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HBatchNo', title: '鎵规', width: 150 }
- , { field: 'HMTONo', title: '璁″垝璺熻釜鍗曞彿', width: 150 }
- ]]
- // , data: [linterid]
- });
- alert("缂栬緫鎴愬姛锛�");
- }
- else {
- layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- },
- error: function (err) {
- layer.msg('閿欒' + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- }
- });
- }
-
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏄庣粏鍒楄〃'
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/鍏叡椤甸潰/Kf_BarCodeEditDlg.html?HInterID=' + HInterID + '&HMaterID = ' + HMaterID + '&HAuxPropID = ' + HAuxPropID + '& HMTONo = ' + HMTONo + '&HWhID = ' + HWhID + '&HSPID = ' + HSPID + '&HSCWHID = ' + HSCWHID + '&HSCSPID= ' + HSCSPID + '&HBatchNo= ' + HBatchNo + '&HSourceInterID= ' + HSourceInterID + '&HSourceEntryID= ' + HSourceEntryID + '&HBillType= ' + HBillType + '&HBarCode= ' + HBarCode + ''
- , 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
- })
- } else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
- }
- })
-
-
- });
- </script>
-</body>
-</html>
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html"
new file mode 100644
index 0000000..4f84de1
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBill.html"
@@ -0,0 +1,1089 @@
+锘�<!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/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">
+ .layui-form-item .layui-inline {
+ margin-right: 0;
+ }
+
+ html {
+ background-color: white;
+ color: white;
+ }
+
+ .layui-table-cell {
+ overflow: visible !important;
+ }
+
+ td .layui-form-select {
+ margin-top: -10px;
+ margin-left: -15px;
+ margin-right: -15px;
+ }
+ </style>
+</head>
+<body>
+
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 15px;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form 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-tab" lay-filter="tab-POStockInBill">
+ <h1 style="text-align: center; padding: 10px 0;"><b>鑰冨嫟姹囨姤鍗�</b></h1>
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鍩烘湰淇℃伅</li>
+ <li lay-id="2" style="padding:1px;">鍒跺崟淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+ <div class="layui-row">
+ <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="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
+ <input type="hidden" name="HInterID" id="HInterID" value="0">
+ <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏃ユ湡</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鐝粍</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HGroupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-col-xs7 layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鑱屽憳</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HEmpName" id="HEmpName" 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;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Employee" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <!--</div>-->
+ <!--<div class="layui-row">-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="浜у搧鍏ュ簱鍗�">浜у搧鍏ュ簱鍗�</option>
+ <option value="浜у搧鍏ュ簱鍗�(绾㈠崟)">浜у搧鍏ュ簱鍗�(绾㈠崟)</option>
+ <option value="璋冩嫧鍗�">璋冩嫧鍗�</option>
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="宸ュ簭姹囨姤鍗�">宸ュ簭姹囨姤鍗�</option>
+ <option value="鐢熶骇姹囨姤鍗�">鐢熶骇姹囨姤鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="Box2" id="Box2" autocomplete="off">
+ </div>
+ </div>-->
+ <!--</div>-->
+ <!--<div class="layui-row">
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">宸ヨ祫绫诲瀷</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HPayTypeName" id="HPayTypeName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPayID" id="HPayID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="PayType" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <!--<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="HPayType" id="HPayType" style="padding-left: 32px;">
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExplanation" id="HExplanation" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">-->
+
+ </div>
+ </div>
+ </div>
+
+
+ <!--鍒跺崟淇℃伅-->
+ <div class="layui-tab-item">
+ <div class="layui-form-item">
+ <div class="layui-row">
+ <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" name="HMaker" id="HMaker" style="background-color:#efefef4d;" readonly>
+ </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" name="HChecker" id="HChecker" style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseMan" id="HCloseMan" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <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" name="HUpDater" id="HUpDater" style="background-color:#efefef4d;" readonly>
+ </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" name="HDeleteMan" id="HDeleteMan" style="background-color:#efefef4d;" readonly>
+ </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" name="HMakeDate" id="HMakeDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+
+ <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" name="HCheckDate" id="HCheckDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HCloseDate" id="HCloseDate" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ </div>
+
+ <div class="layui-row">
+ <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" name="HUpDateDate" id="HUpDateDate" style="background-color:#efefef4d;" readonly>
+ </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" name="HDeleteDate" id="HDeleteDate" style="background-color:#efefef4d;" readonly>
+ </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>
+ <script type="text/html" id="barDemo">
+ <!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </script>
+ <!--<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>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , laydate = layui.laydate
+ , element = layui.element;
+
+ 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]]; //鍏抽棴绫诲瀷
+ }
+ var hID = params[params[1]];//缂栬緫鏌ョ湅
+ //甯歌鐢ㄦ硶
+ laydate.render({
+ elem: '#HDate'
+
+ });
+
+
+ var tableReload = table.reload;
+ var option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ //,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
+ , page: true //寮�鍚垎椤�
+ , cols: [[ //琛ㄥご
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
+ , { field: 'HEmpID', title: 'HEmpID', edit: 'text', width: 100, hide: true }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', edit: 'text', event: 'HEmpCheck', width: 150 }
+ , { field: 'HEmpName', title: '鑱屽憳鍚嶇О', edit: 'text', width: 100 }
+ , { field: 'HEmpRate', title: '鑱屽憳绯绘暟', edit: 'text', width: 100 }
+ , { field: 'HPMTimes', title: '涓嬪崍宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HAMTimes', title: '涓婂崍宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HBaseTimes', title: '鍩烘湰宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HBaseDays', title: '鍩烘湰澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HOverTimes', title: '鍔犵彮宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HOverDays', title: '鍔犵彮澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HLeaveTimes', title: '璇峰亣宸ユ椂', edit: 'text', width: 100 }
+ , { field: 'HLeaveDays', title: '璇峰亣澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HLateQty', title: '杩熷埌娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HLateTimes', title: '杩熷埌鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HEarlyQty', title: '鏃╅��娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HEarlyTimes', title: '鏃╅��鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HOutForEmpQty', title: '绉佸嚭娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HOutForEmpTimes', title: '绉佸嚭鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HOutForComQty', title: '鍏嚭娆℃暟', edit: 'text', width: 100 }
+ , { field: 'HOutForComTimes ', title: '鍏嚭鏃堕棿', edit: 'text', width: 100 }
+ , { field: 'HAbsentDays ', title: '鏃峰伐澶╂暟', edit: 'text', width: 100 }
+ , { field: 'HRestFlag ', title: '鍘備紤', edit: 'text', width: 100 }
+ , { field: 'HSchClassID ', title: '鐝', edit: 'text', width: 100 }
+ //, { field: 'HNeedTimes ', title: '搴斾笂鐝伐鏃�', edit: 'text', width: 100 }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { field: 'HMainSourceInterID ', title: '婧愬崟涓诲唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HMainSourceEntryID', title: '婧愬崟瀛愬唴鐮�', edit: 'text', width: 100, hide: true }
+ , { field: 'HMainSourceBillNo', title: '婧愬崟鍗曞彿', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', edit: 'text', width: 100, hide: true }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ]]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ };
+ //鍒ゆ柇鏄惁鏂板
+ if (OperationType == 1) {
+ $("#HMakeDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ $("#HCheckDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HChecker").val(sessionStorage["HUserName"]);
+ $("#HUpDateDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HUpDater").val(sessionStorage["HUserName"]);
+ $("#HCloseDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeleteDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HDeleteMan").val(sessionStorage["HUserName"]);
+ $("#HCloseMan").val(sessionStorage["HUserName"]);
+ //鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
+ option.data = [{
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": 0
+ , "HPMTimes": 0, "HAMTimes": 0, "HBaseTimes":0, "HBaseDays":0, "HOverTimes": 0
+ , "HOverDays": 0, "HLeaveTimes": 0, "HLeaveDays": 0, "HLateQty": 0, "HLateTimes":0, "HEarlyQty": 0
+ , "HEarlyTimes": 0, "HOutForEmpQty": 0, "HOutForEmpTimes": 0, "HOutForComQty": 0, "HOutForComTimes": 0, "HAbsentDays": 0
+ , "HRestFlag": 0, "HSchClassID": 0, "HNeedTimes": 0, "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+ , "HSourceBillType": "","HRemark": ""
+ }];
+ table.render(option);
+ }
+ else {
+ $("#HInterID").val(hID);//淇敼鏃朵富琛↖D
+ //缂栬緫鍔犺浇鏁版嵁
+ $.ajax({
+ url: GetWEBURL() + 'Pay_WorkTimesBill/Pay_WorkTimesBillListProjectDetai',
+ type: "GET",
+ data: { "sqlWhere": "and hmainid=" + hID },
+ success: function (result) {
+
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ }
+
+
+ //澶村伐鍏锋爮浜嬩欢
+ var rowid = 0;
+ var rows = 0;
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = {
+ "HEmpID": "", "HEmpNumber": "", "HEmpName": "", "HEmpID": "", "HEmpRate": ""
+ , "HPMTimes": "", "HAMTimes": "", "HBaseTimes": "", "HBaseDays": "", "HOverTimes": ""
+ , "HOverDays": "", "HLeaveTimes": "", "HLeaveDays": "", "HLateQty": "", "HLateTimes": "", "HEarlyQty": ""
+ , "HEarlyTimes": "", "HOutForEmpQty": "", "HOutForEmpTimes": "", "HOutForComQty": "", "HOutForComTimes": "", "HAbsentDays": ""
+ , "HRestFlag": "", "HSchClassID": 0, "HNeedTimes": "", "HMainSourceInterID": 0, "HMainSourceEntryID": 0, "HMainSourceBillNo": 0
+ , "HSourceBillType": "", "HRemark": "" };
+ switch (obj.event) {
+ case 'btn-AddLine':
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ //layer.msg('澧炲姞涓�琛屾寜閽紒')
+ break;
+ case 'btn-CopyLine':
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.alert("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.alert("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ 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);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ //layer.alert(copyrow);
+ }
+ break;
+ }
+ });
+ //琛屽唴浜嬩欢
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ var rowIndex = $(obj.tr).attr("data-index");
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ console.log("绱㈠紩涓�:" + rowIndex);
+ if (rowIndex === '0') {
+ layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
+ } else {
+ obj.del();
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.reload(option);
+ layer.close(index);
+ }
+ });
+ }
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7") {
+ if (obj.event === 'HEmpCheck') {//鑱屽憳
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鑱屽憳鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index];
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ obj.update({
+ HEmpName: checkStatus.data[0].HName
+ , HEmpID: checkStatus.data[0].HItemID
+ , HEmpNumber: checkStatus.data[0].HNumber
+ });
+ layer.close(layer.index);
+ }
+ , btn2: function (index, layero) {
+ },
+ end: function () {
+
+ }
+ });
+ }
+ //if (obj.event === 'HMaterCheck') //妯″叿淇℃伅
+ //{
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '鐗╂枡鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HMaterID: checkStatus.data[0].HItemID,
+ // HMaterCode: checkStatus.data[0].HNumber,
+ // HMaterName: checkStatus.data[0].HName,
+
+ // HDesignLife: 0, //璁捐瀵垮懡
+ // HLeaveLife: 0, //鍓╀綑瀵垮懡
+ // HQty: 1, //瀹炴敹鏁伴噺
+ // HMoney: 0, //閲戦
+ // });
+
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+
+ //if (obj.event == 'HProcCheck') {
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '宸ュ簭鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['90%', '90%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ProcList.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index];
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+ // obj.update({
+ // HProcName: checkStatus.data[0].宸ュ簭
+ // , HProcID: checkStatus.data[0].HItemID
+ // , HProcNumber: checkStatus.data[0].宸ュ簭浠ｇ爜
+ // });
+ // layer.close(layer.index);
+ // }
+ // , btn2: function (index, layero) {
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+ //if (obj.event === 'HSourceCheck') //璧勬簮浠ｇ爜
+ //{
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '璧勬簮鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../PublicPage/SourceInformation.html', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ // if (checkStatus.data.length === 0) {
+ // return layer.msg('璇烽�夋嫨鏁版嵁');
+ // }
+
+ // //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ // obj.update({
+ // HSourceID: checkStatus.data[0].HItemID,
+ // HSourceName: checkStatus.data[0].HName,
+ // });
+
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // }
+ // });
+ //}
+
+
+ obj.event = "";
+ return false;
+
+ }
+ })
+ });
+
+ //鐩戝惉鍗曞厓鏍肩紪杈�
+ table.on('edit(mainTable)', function (obj) {
+ // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
+ var oldText = $(this).prev().text();
+ var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
+ , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
+ , field = obj.field; //寰楀埌瀛楁
+ //layer.msg('[ID: ' + data.id + '] ' + field + ' 瀛楁鏇存敼涓猴細' + value);
+
+ switch (field) {
+ case "HDesignLife": //璁捐瀵垮懡
+ value = isNaN(value) ? 0 : value;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HDesignLife: value, //璁捐瀵垮懡
+ HLeaveLife: value - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HLeaveLife": //鍓╀綑瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ var HUseLife = isNaN(data.HUseLife) ? 0 : data.HUseLife;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.tr.find('td[data-field=HLeaveLife] input').val(HDesignLife - HUseLife);
+ obj.update({
+ HLeaveLife: HDesignLife - HUseLife, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HUseLife": //浣跨敤瀵垮懡
+ var HDesignLife = isNaN(data.HDesignLife) ? 0 : data.HDesignLife;
+ value = isNaN(value) ? 0 : value;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HLeaveLife: HDesignLife - value, //鍓╀綑瀵垮懡=璁捐瀵垮懡-浣跨敤瀵垮懡
+ });
+ break;
+ case "HQty": //瀹炲彂鏁伴噺
+ value = isNaN(value) ? 0 : value;
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HPrice, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HPrice": //鍗曚环
+ value = isNaN(value) ? 0 : value;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: value * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ case "HMoney": //閲戦
+ var HPrice = isNaN(data.HPrice) ? 0 : data.HPrice;
+ var HQty = isNaN(data.HQty) ? 0 : data.HQty;
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HMoney: HPrice * HQty, //閲戦=瀹炴敹鏁伴噺*鍗曚环
+ });
+ break;
+ default:
+ }
+ });
+
+
+ function RoadBillMain(hID)//鍔犺浇琛ㄥご
+ {
+ //alert(hID);
+ //鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
+ $.ajax({
+ url: GetWEBURL() + "Pay_WorkTimesBill/Pay_WorkTimesBillListCheckDetail",
+ type: "GET",
+ data: {
+ "HID": hID
+ },
+ success: function (result) {
+
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data.h_v_Pay_WorkTimesBillList[0];
+ console.info(data);
+ form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
+ "HBillNo": data.鍗曟嵁鍙�
+ , "HDate": formatDate(data.鏃ユ湡)
+ //, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HGroupID": data.HGroupID //鐝粍ID
+ , "HGroupName": data.鐝粍 //鐝粍鍚嶇О
+ , "HEmpID": data.HEmpID //涓荤ID
+ , "HEmpName": data.鑱屽憳 //涓荤鍚嶇О
+ , "HDeptID": data.HDeptID //閮ㄩ棬ID
+ , "HDeptName": data.閮ㄩ棬 //閮ㄩ棬鍚嶇О
+ , "HSourceBillType": "" //婧愬崟绫诲瀷
+ , "HExplanation": data.鎽樿 //鎽樿
+ , "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HMaker": data.鍒跺崟浜�
+ , "HChecker": data.瀹℃牳浜�
+ , "HCloseMan": data.鍏抽棴浜�
+ , "HMakeDate": data.鍒跺崟鏃ユ湡
+ , "HCheckDate": data.瀹℃牳鏃ユ湡
+ , "HCloseDate": data.鍏抽棴鏃ユ湡
+ , "HUpDateDate": data.淇敼鏃ユ湡
+ , "HDeleteDate": data.浣滃簾鏃ユ湡
+ });
+
+ } else {
+ layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
+
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (hID == null || hID == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '2203' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val(d.data[0].HInterID);
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(hID);
+ /* RoadBillSub(linterid);*/
+ }
+
+ //琛ㄥご淇℃伅鐝粍寮圭獥
+ form.on('submit(HGroupList)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐝粍鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_GetProductionTeamList.html?Type=HGroupID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HGroupName").val(checkStatus.data[0].鐝粍);
+ $("#HGroupID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
+
+ ////琛ㄥご淇℃伅涓荤寮圭獥
+ //form.on('submit(Employee)', function () {
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '鑱屽憳鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmpID', 'yes'],
+ // btn: ['纭畾', '鍙栨秷']
+ // , btn1: function (index, layero) {
+
+ // //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ // var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ // var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇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) {
+
+ // }
+ // });
+ //});
+ //琛ㄥご淇℃伅閮ㄩ棬寮圭獥
+ form.on('submit(Department)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '閮ㄩ棬鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_DepartmentList.html?Type=HDeptID', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HDeptName").val(checkStatus.data[0].HName);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+ ////琛ㄥご淇℃伅宸ヨ祫绫诲瀷寮圭獥
+ //form.on('submit(PayType)', function () {
+ // //椤甸潰灞�-鑷畾涔�
+ // layer.open({
+ // type: 2,
+ // skin: 'layui-layer-rim', //鍔犱笂杈规
+ // title: '宸ヨ祫绫诲瀷鍒楄〃',
+ // closeBtn: 1,
+ // shift: 2,
+ // area: ['80%', '80%'],
+ // maxmin: true,
+ // content: ['../../../views/宸ヨ祫绠＄悊/Gy_WorkPayTypeBillList.html?Type=HPayTypeID', '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('璇烽�夋嫨鏁版嵁');
+ // }
+ // $("#HPayTypeName").val(checkStatus.data[0].宸ヨ祫绫诲瀷鍚嶇О);
+ // $("#HPayID").val(checkStatus.data[0].HItemID);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ // }
+ // , btn2: function (index, layero) {
+ // //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ // //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ // },
+ // end: function () {
+
+ // },
+ // success: function (layero, index) {
+
+ // }
+ // });
+ //});
+ //閫�鍑�
+ 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);
+ }
+ });
+
+
+ function formatDate(date) {
+ var d = new Date(date),
+ month = '' + (d.getMonth() + 1),
+ day = '' + d.getDate(),
+ year = d.getFullYear();
+
+ if (month.length < 2) month = '0' + month;
+ if (day.length < 2) day = '0' + day;
+
+ return [year, month, day].join('-');
+ }
+ //淇濆瓨鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ //var tableData = data.field;
+ data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//缁勭粐
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(table.cache['mainTable']);
+ var sMainSub = sMainStr + ';' + sSubStr;
+ var index = layer.load();
+ $.ajax({
+ type: "POST",
+ url: GetWEBURL() + "/Pay_WorkTimesBill/AddBill",
+ async: true,
+ data: { "sMainSub": sMainSub },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) {
+
+ layer.close(index);
+ layer.msg("鎻愪氦鎴愬姛");
+ }
+ else {
+ layer.close(index);
+ layer.msg(data.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ },
+ error: function (err) {
+ layer.close(index);
+ layer.msg("閿欒:" + err, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //鐩戝惉鎻愪氦
+ form.verify({
+ numberOrEmpty: function (value, item) {
+ // if (value != '') {
+ if (!/^\d+$/.test(value)) {
+ return '涓嶈兘涓虹┖鎴栨暟瀛楁垨鑰�0';
+ }
+ //}
+ }
+ });
+
+
+ });
+ //瀹氫箟鍏ㄥ眬鍙橀噺
+ var HReasonName, ReasonID, EmpName, SQProcName,
+ ProcID, ZRProcName, QRName
+ ;
+ function GetHReasonValue(obj) //杩斿洖涓嶈壇鍘熷洜
+ {
+ HReasonName = obj[0].HName;
+ ReasonID = obj[0].HItemID;
+ }
+ //杩斿洖鐗╂枡
+ function GetHMaterNameValue(obj) { //杩斿洖鐗╂枡
+ $("#HMater").val(obj[0].HName);
+ $("#HMaterID").val(obj[0].HItemID);
+ $("#HMaterNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖宸ュ簭
+ function GetHProcValue(obj) { //杩斿洖宸ュ簭
+ $("#HProcName").val(obj[0].宸ュ簭);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ }
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ $("#HDepName").val(obj[0].HName);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].HNumber);
+ }
+ //杩斿洖鍗曚綅
+ function GetHUnitNameValue(obj) {
+ $("#HUName").val(obj[0].HName);
+ $("#HUnitID").val(obj[0].HItemID);
+ $("#HUnitNumber").val(obj[0].HNumber);
+ }
+
+ function GetHKeeperValue(obj) { //杩斿洖璐ｄ换浜�
+ EmpName = obj[0].HName;
+ // $("#HEmpName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //function GetHProcValue(obj) { //杩斿洖鐢宠宸ュ簭
+ // SQProcName = obj[0].宸ュ簭;
+ // ProcID = obj[0].HItemID;
+ // //$("#HSQProcName").val(obj[0].宸ュ簭);
+ // //$("#HProcID").val(obj[0].HItemID);
+ //}
+ function GetHZRValue(obj) { //杩斿洖璐ｄ换宸ュ簭
+ ZRProcName = obj[0].宸ュ簭;
+ //$("#HZRProcName").val(obj[0].宸ュ簭);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ //HWorker
+ function GetHWorkerValue(obj) { //杩斿洖涓嶈壇纭浜�
+ QRName = obj[0].HName;
+ //$("#HQRName").val(obj[0].HName);
+ //$("#HItemID").val(obj[0].HItemID);
+ }
+ function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
+ //if ($("#HSourceBillNo").val() == '') {
+ // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HDeptName").val() == '') {
+ layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HSecManager").val() == '') {
+ layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HKeeper").val() == '') {
+ layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ //if ($("#HWHNAME").val() == '') {
+ // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
+ // return false;
+ //}
+ if ($("#HBillNo").val() == '') {
+ layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if ($("#HInterID").val() == '') {
+ layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (typeof (sSubStr) == "undefined") {
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (!typeof (sSubStr) == "undefined") {
+ //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
+ // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
+ // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
+ // {
+ // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
+ // return false;
+ // }
+ // }
+ //}
+ for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
+ if (parseFloat(sSubStr[i].HQty) > 0) {
+ s = 1;
+ }
+ }
+ if (s == 0) {
+ layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ }
+ else {
+ return true;
+ }
+ }</script>
+</body>
+</html>
\ No newline at end of file
diff --git "a/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html" "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
new file mode 100644
index 0000000..404047b
--- /dev/null
+++ "b/WebTM/views/\345\267\245\350\265\204\347\256\241\347\220\206/\350\200\203\345\213\244\346\261\207\346\212\245\345\215\225/Pay_WorkTimesBillList.html"
@@ -0,0 +1,342 @@
+锘�<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; 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, maximum-scale=1">
+ <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/layui/layui.js"></script>
+ <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">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <!--<div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <!--<div class="layui-colla-content">
+ <div class="layui-inline">
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>
+
+ </div>-->
+ </div>
+ </div>
+ <table class="" 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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_Exit"><i class="layui-icon layui-icon-logout"></i>閫�鍑�</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+ <!--<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>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery(table, option);
+ });
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ }
+ //#endregion
+ //#region 鍒濆鍖栬〃鏍兼柟娉�
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , height: 'full-50'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'checkbox', fixed: 'left' }
+ , { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 200, hide: true }
+ , { field: 'HEmpNumber', title: '鑱屽憳浠ｇ爜', width: 180 }
+ , { field: 'HEmpName', title: '鑱屽憳', width: 125 }
+ //, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
+ , { field: 'HGroupID', title: 'HGroupID', width: 200, hide: true }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 125 }
+ , { field: '鐝粍', title: '鐝粍', width: 125 }
+ , { field: 'HDeptID', title: 'HDeptID', width: 200, hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 180 }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
+ , { field: '鎽樿', title: '鎽樿', width: 125 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 125 }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 125 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 125 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 125 }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 125 }
+ ]]
+ };
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Pay_WorkTimesBill/GetWorkTimesBill',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-Add':
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鏂板鑰冨嫟姹囨姤鍗�',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ break;
+ case 'btn-Edit':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var hID = data[0].hmainid.toString();
+ //if (AllowLoadData(sSubStr) != false) {//闈炵┖楠岃瘉
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '缂栬緫鑰冨嫟姹囨姤鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../鑰冨嫟姹囨姤鍗�/Pay_WorkTimesBill.html?OperationType=3&linterid=' + hID + '&HSouceBillType=0&closeType=1'
+ , resize: false,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ location.reload();
+ }
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+ })
+
+ } else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
+ }
+
+ break;
+ case 'btn-Delete':
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Pay_WorkTimesBill/DeltetWorkTimesBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
+ break;
+ //鍒锋柊
+ case 'get_Refresh': get_Refresh();
+ break;
+ //閫�鍑烘寜閽�
+ case 'get_Exit': Pub_Close(2);
+ break;
+ };
+ });
+
+ //#region 蹇�熻繃婊�
+ function get_FastQuery(table, option) {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ if (HDate) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HDate + "'";
+ }
+ if (HDate1) {
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + HDate1 + "'";
+ }
+ if (HBillNo) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ //#endregion
+ //#region 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HDate").val("");//寮�濮嬫棩鏈�
+ $("#HDate1").val("");//缁撴潫鏃ユ湡
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ sWhere = "";
+ }
+ //#endregion
+
+ //#region 鍒锋柊
+ function get_Refresh() {
+ set_ClearQuery();
+ get_Display(sWhere);
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
index 86be75b..faa766e 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBill.html"
@@ -113,58 +113,66 @@
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
- </div>
- <div class="layui-form-item">
-
<div class="layui-inline">
- <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <label class="layui-form-label">璋冩嫧绫诲瀷</label>
<div class="layui-input-inline">
- <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
- <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
- <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
+ <option value="鍚岀粍缁囪皟鎷�">鍚岀粍缁囪皟鎷�</option>
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ <div class="layui-form-item">
+
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HSourceBillType" lay-filter="aihao" id="HSourceBillType">
+ <option value="鐢熶骇浠诲姟鍗�">鐢熶骇浠诲姟鍗�</option>
+ <option value="鎵嬪伐褰曞叆">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">鎽樿</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
+ </div>
</div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline">
- <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎽樿</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ユ憳瑕�" class="layui-textarea" name="HExplanation" id="HExplanation"></textarea>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">澶囨敞</label>
+ <div class="layui-input-inline">
+ <textarea placeholder="璇疯緭鍏ョ淮澶囨敞" class="layui-textarea" name="HRemark" id="HRemark"></textarea>
+ </div>
</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>
+ <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>
@@ -174,7 +182,6 @@
<!--<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>-->
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
</script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
@@ -222,6 +229,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 500
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
//,url: '/demo/table/user/' //鏁版嵁鎺ュ彛
, page: true //寮�鍚垎椤�
, cols: [[ //琛ㄥご
@@ -239,9 +247,13 @@
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
+ , { field: 'HOtherOrgCode', title: '璋冨嚭缁勭粐浠ｇ爜', edit: 'text', event: 'HOtherOrgCode', width: 120 }
+ , { field: 'HOtherOrgName', title: '璋冨嚭缁勭粐', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
, { field: 'HWHCode', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
- , { field: 'HWHName', title: '璋冨叆浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HWHName', title: '璋冨叆浠撳簱', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
, { field: 'HSPCode', title: '璋冨叆浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
, { field: 'HSPName', title: '璋冨叆浠撲綅', edit: 'text', width: 100 }
@@ -254,12 +266,11 @@
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
- , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
};
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -292,13 +303,14 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HStockOrgID": sessionStorage["OrganizationID"], "HOtherOrgID": 0, "HOtherOrgCode": "", "HOtherOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
+
rows++;
//layer.msg('澧炲姞涓�琛屾寜閽紒')
break;
@@ -316,7 +328,7 @@
table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
- //layer.alert(copyrow);
+
}
break;
}
@@ -388,6 +400,59 @@
});
}
+ if (obj.event === 'HOtherOrgCode') //缁勭粐
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁勭粐鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/Organizations.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('璇烽�夋嫨鏁版嵁');
+ }
+ var HStockStyle = $("#HStockStyle").val();
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁� {
+ {
+ if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屽綋鍓嶇粍缁囷細' + sessionStorage["Organization"] + '璇烽�夋嫨鍏朵粬缁勭粐');
+ }
+ }
+ else {
+ if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛岃閫夋嫨褰撳墠缁勭粐锛�' + sessionStorage["Organization"]);
+ }
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HOtherOrgID: checkStatus.data[0].HItemID,
+ HOtherOrgCode: checkStatus.data[0].HNumber,
+ HOtherOrgName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
if (obj.event === 'HWHCode') //璋冨叆浠撳簱浠ｇ爜
{
//椤甸潰灞�-鑷畾涔�
@@ -399,7 +464,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -470,6 +535,10 @@
}
if (obj.event === 'HSCWHCode') //璋冨嚭浠撳簱浠ｇ爜
{
+ var HOtherOrgID = obj.data.HOtherOrgID;
+ if (HOtherOrgID == 0 || HOtherOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨嚭缁勭粐');
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -479,7 +548,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HOtherOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -674,7 +743,7 @@
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
, "HWHID": data.HWHID1 //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
, "HKeeperID": data.hkeeperid //淇濈鍛業D
@@ -685,6 +754,7 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
});
} else {
@@ -955,6 +1025,8 @@
//}
}
});
+
+
});
//瀹氫箟鍏ㄥ眬鍙橀噺
var HReasonName, ReasonID, EmpName, SQProcName,
@@ -1000,6 +1072,7 @@
}
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
+ var HStockStyle = $("#HStockStyle").val();
var Result = true;
if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1016,7 +1089,7 @@
if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
- }
+ }
if (typeof (sSubStr) == "undefined" || sSubStr == "") {
layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
@@ -1036,6 +1109,14 @@
layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨嚭缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
index 85c81b1..6e782d4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepInBillList.html"
@@ -152,9 +152,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- //, { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125 }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
@@ -175,6 +174,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100}
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
@@ -187,8 +189,6 @@
, { field: 'HSCSPID', title: 'HSCSPID', width: 200, hide: true }
, { field: '璋冨嚭浠撲綅浠ｇ爜', title: '璋冨嚭浠撲綅浠ｇ爜', width: 125, hide: true }
, { field: '璋冨嚭浠撲綅', title: '璋冨嚭浠撲綅', width: 125, hide: true }
- , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
- , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: '搴斿彂鏁伴噺', title: '搴斿彂鏁伴噺', width: 125 }
, { field: '瀹炲彂鏁伴噺', title: '瀹炲彂鏁伴噺', width: 125 }
, { field: '鍗曚环', title: '鍗曚环', width: 125 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
index c288cb9..97f188f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBill.html"
@@ -65,17 +65,19 @@
<div class="layui-inline">
<label class="layui-form-label">鍣ㄥ叿浠撳簱</label>
<div class="layui-input-inline">
- <input type="text" name="HWHName" id="HWHName" 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="hidden" name="HWHID" id="HWHID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="WareHouse" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">棰嗘枡浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSecManagerName" readonly id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value="" style="float:left;width:150px;">
<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>
@@ -85,27 +87,34 @@
<div class="layui-inline">
<label class="layui-form-label">鍙戞枡浜�</label>
<div class="layui-input-inline">
- <input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HKeeperName" id="HKeeperName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value="" style="float:left;width:150px;">
<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>
</div>
</div>
- </div>
- <div class="layui-form-item">
-
-
<div class="layui-inline">
<label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HDeptName" id="HDeptName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="" style="float:left;width:150px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璋冩嫧绫诲瀷</label>
+ <div class="layui-input-inline">
+ <select name="HStockStyle" lay-filter="aihao" id="HStockStyle">
+ <option value="鍚岀粍缁囪皟鎷�">鍚岀粍缁囪皟鎷�</option>
+ <option value="璺ㄧ粍缁囪皟鎷�">璺ㄧ粍缁囪皟鎷�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
@@ -121,8 +130,6 @@
<input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
- </div>
- <div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">鎽樿</label>
<div class="layui-input-inline">
@@ -223,17 +230,27 @@
, { field: 'HBatchNo', title: '鎵规', edit: 'text', width: 100 }
, { field: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
, { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
- , { field: 'HUseLife', title: '绱Н浣跨敤瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HUseLife', title: '绱浣跨敤瀵垮懡', edit: 'text', width: 120 }
, { field: 'HQtyMust', title: '搴斿彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HQty', title: '瀹炲彂鏁伴噺', edit: 'text', width: 100 }
, { field: 'HPrice', title: '鍗曚环', edit: 'text', width: 100 }
, { field: 'HMoney', title: '閲戦', edit: 'text', width: 100 }
+ , { field: 'HOtherOrgID', title: 'HOtherOrgID', width: 100, hide: true }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HStockOrgCode', title: '璋冨叆缁勭粐浠ｇ爜', edit: 'text', event: 'HStockOrgCode', width: 120 }
+ , { field: 'HStockOrgName', title: '璋冨叆缁勭粐', width: 100 }
, { field: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
- , { field: 'HWHCode', title: '鍙戞枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 100 }
- , { field: 'HWHName', title: '鍙戞枡浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HWHCode', title: '璋冨叆浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: 'HWHName', title: '璋冨叆浠撳簱', width: 100 }
, { field: 'HSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
- , { field: 'HSPCode', title: '浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 100 }
- , { field: 'HSPName', title: '浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HSPCode', title: '璋冨叆浠撲綅浠ｇ爜', edit: 'text', event: 'HSPCode', width: 120 }
+ , { field: 'HSPName', title: '璋冨叆浠撲綅', edit: 'text', width: 100 }
+ , { field: 'HSCWHID', title: 'HSCWHID', edit: 'text', width: 100, hide: true }
+ , { field: 'HSCWHCode', title: '璋冨嚭浠撳簱浠ｇ爜', edit: 'text', event: 'HSCWHCode', width: 120 }
+ , { field: 'HSCWHName', title: '璋冨嚭浠撳簱', edit: 'text', width: 100 }
+ , { field: 'HSCSPID', title: 'HSPID', edit: 'text', width: 100, hide: true }
+ , { field: 'HSCSPCode', title: '璋冨嚭浠撲綅浠ｇ爜', edit: 'text', event: 'HSCSPCode', width: 120 }
+ , { field: 'HSCSPName', title: '璋冨嚭浠撲綅', edit: 'text', width: 100 }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
@@ -242,7 +259,7 @@
//鍒ゆ柇鏄惁鏂板
if (OperationType == 1) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" }];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" }];
table.render(option);
}
else {
@@ -278,7 +295,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HOtherOrgID": sessionStorage["OrganizationID"], "HStockOrgID": 0, "HStockOrgCode": "", "HStockOrgName": "", "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HSCWHID": 0, "HSCWHCode": "", "HSCWHName": "", "HSCSPID": 0, "HSCSPCode": "", "HSCSPName": "", "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -373,9 +390,65 @@
}
});
}
-
- if (obj.event === 'HWHCode') //浠撳簱浠ｇ爜
+ if (obj.event === 'HStockOrgCode') //缁勭粐
{
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '缁勭粐鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/Organizations.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('璇烽�夋嫨鏁版嵁');
+ }
+ var HStockStyle = $("#HStockStyle").val();
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�") //false 鍚岀粍缁� true 璺ㄧ粍缁� {
+ {
+ if (sessionStorage["OrganizationID"] == checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屽綋鍓嶇粍缁囷細' + sessionStorage["Organization"] + '璇烽�夋嫨鍏朵粬缁勭粐');
+ }
+ }
+ else {
+ if (sessionStorage["OrganizationID"] != checkStatus.data[0].HItemID) {
+ layer.close(layer.index);
+ return layer.msg('璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛岃閫夋嫨褰撳墠缁勭粐锛�' + sessionStorage["Organization"]);
+ }
+ }
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HStockOrgID: checkStatus.data[0].HItemID,
+ HStockOrgCode: checkStatus.data[0].HNumber,
+ HStockOrgName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HWHCode') //璋冨叆浠撳簱浠ｇ爜
+ {
+ var HStockOrgID = obj.data.HStockOrgID;
+ if (HStockOrgID == 0 || HStockOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨叆缁勭粐');
+ }
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -385,7 +458,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID', 'yes'],
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + HStockOrgID, 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -441,6 +514,90 @@
HSPID: checkStatus.data[0].HItemID,
HSPCode: checkStatus.data[0].HNumber,
HSPName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HSCWHCode') //璋冨嚭浠撳簱浠ｇ爜
+ {
+ var HOtherOrgID = obj.data.HOtherOrgID;
+ if (HOtherOrgID == 0 || HOtherOrgID == "") {
+ return layer.msg('璇烽�夋嫨璋冨嚭缁勭粐');
+ }
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撳簱鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WarehouseList.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"], 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('ck-table');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSCWHID: checkStatus.data[0].HItemID,
+ HSCWHCode: checkStatus.data[0].HNumber,
+ HSCWHName: checkStatus.data[0].HName,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ if (obj.event === 'HSCSPCode') //璋冨嚭浠撲綅浠ｇ爜
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '浠撲綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/WareLocationInformation.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('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSCSPID: checkStatus.data[0].HItemID,
+ HSCSPCode: checkStatus.data[0].HNumber,
+ HSCSPName: checkStatus.data[0].HName,
});
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
@@ -581,8 +738,8 @@
"HBillNo": data.鍗曟嵁鍙�
, "HDate": formatDate(data.鏃ユ湡)
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HWHID": data.HWHID //浠撳簱ID
- , "HWHName": data.浠撳簱 //浠撳簱鍚嶇О
+ , "HWHID": data.HWHID1 //浠撳簱ID
+ , "HWHName": data.鍣ㄥ叿浠撳簱 //浠撳簱鍚嶇О
, "HSecManagerID": data.hsecmanagerid //楠屾敹鍛業D
, "HSecManagerName": data.棰嗘枡浜� //楠屾敹鍛樺悕绉�
, "HKeeperID": data.hkeeperid //淇濈鍛業D
@@ -593,6 +750,7 @@
, "XDH": "" //閫夊崟鍙�
, "HExplanation": data.鎽樿 //鎽樿
, "HRemark": data.琛ㄥご澶囨敞 //澶囨敞
+ , "HStockStyle": data.璋冩嫧绫诲瀷
});
} else {
@@ -800,18 +958,6 @@
}
});
-
-
-
-
-
-
- //form.on('submit(Cancel)', function () {
- // //sessionStorage["SourceFlag"] = false;
- // parent.location.href = "../../../views/index.html"
- // //window.close();//鍏抽棴褰撳墠椤�
- //})
-
function formatDate(date) {
var d = new Date(date),
month = '' + (d.getMonth() + 1),
@@ -830,8 +976,10 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
var sMainSub = sMainStr + ';' + sSubStr + ';' + sessionStorage["HUserName"];
-
-
+ if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
+ {
+ return false;
+ }
$.ajax(
{
type: "POST",
@@ -934,62 +1082,61 @@
//$("#HQRName").val(obj[0].HName);
//$("#HItemID").val(obj[0].HItemID);
}
- function AllowLoadData(sSubStr) { //闈炵┖楠岃瘉
- //if ($("#HSourceBillNo").val() == '') {
- // layer.msg("璇峰厛鎵簮鍗�!", { icon: 5 });
- // return false;
- //}
- if ($("#HDeptName").val() == '') {
- layer.msg("閮ㄩ棬娌℃湁閫夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ //闈炵┖楠岃瘉
+ function AllowLoadData(sSubStr) {
+ var HStockStyle = $("#HStockStyle").val();
+ var Result = true;
+ if ($("#HWHID").val() == '' || $("#HWHID").val() == null) {
+ layer.msg("鍣ㄥ叿浠撳簱涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HSecManager").val() == '') {
- layer.msg("楠屾敹浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HSecManagerID").val() == '' || $("#HSecManagerID").val() == null) {
+ layer.msg("棰嗘枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HKeeper").val() == '') {
- layer.msg("淇濈浜烘病鏈夐�夋嫨", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HKeeperID").val() == '' || $("#HKeeperID").val() == null) {
+ layer.msg("鍙戞枡浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- //if ($("#HWHNAME").val() == '') {
- // layer.msg("浠撳簱娌℃湁閫夋嫨!", { icon: 5 });
- // return false;
- //}
- if ($("#HBillNo").val() == '') {
- layer.msg("閿欒鐨勫崟鎹彿", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("閮ㄩ棬涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- if ($("#HInterID").val() == '') {
- layer.msg("閿欒鐨勫唴鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ 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") {
- layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (!typeof (sSubStr) == "undefined") {
- //for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺
- // if (parseFloat(sSubStr[i].HQtyMust) > 0) {
- // if (parseFloat(sSubStr[i].HQty) > parseFloat(sSubStr[i].HQtyMust))
- // {
- // layer.msg("鏁伴噺涓嶈兘澶т簬搴旀敹鏁伴噺", { icon: 5, btn: ['纭畾'], time: 100000, offset: 't' });
- // return false;
- // }
- // }
- //}
- for (var i = 0; i <= sSubStr.length - 1; i++) { //鍒ゆ柇鎵爜鏁伴噺涓嶈兘涓�0
- if (parseFloat(sSubStr[i].HQty) > 0) {
- s = 1;
+ if (typeof (sSubStr) != "undefined" && typeof (sSubStr) != "") {
+ sSubStr = JSON.parse(sSubStr);
+ for (var i = 0; i < sSubStr.length; i++) {
+ if (sSubStr[i].HMaterID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍣ㄥ叿淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨叆浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (sSubStr[i].HSCWHID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璋冨嚭浠撳簱涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "璺ㄧ粍缁囪皟鎷�" && sSubStr[i].HStockOrgID == sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓鸿法缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨叆缁勭粐鍜屽綋鍓嶇粍缁囦竴鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
+ if (HStockStyle == "鍚岀粍缁囪皟鎷�" && sSubStr[i].HStockOrgID != sSubStr[i].HOtherOrgID) {
+ layer.msg("璋冩嫧绫诲瀷涓哄悓缁勭粐璋冩嫧锛屾槑缁嗚褰曠" + (i + 1) + "琛�,璋冨叆缁勭粐鍜屽綋鍓嶇粍缁囦笉涓�鑷� !", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return Result = false;
+ }
}
}
else {
- return true;
+ return Result = true;
}
- }</script>
+ return Result;
+ }
+
+ </script>
</body>
</html>
\ No newline at end of file
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
index 0d59bab..761acc4 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldMoveStockStepOutBillList.html"
@@ -153,9 +153,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195 }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110 }
- //, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
- //, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125 }
- //, { field: '浠撳簱', title: '浠撳簱', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱浠ｇ爜', title: '鍣ㄥ叿浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鍣ㄥ叿浠撳簱', title: '鍣ㄥ叿浠撳簱', width: 125 }
, { field: 'HSecManagerID', title: 'HSecManagerID', width: 200, hide: true }
, { field: '棰嗘枡浜轰唬鐮�', title: '棰嗘枡浜轰唬鐮�', width: 180 }
, { field: '棰嗘枡浜�', title: '棰嗘枡浜�', width: 125 }
@@ -176,6 +175,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
+ , { field: '璋冩嫧绫诲瀷', title: '璋冩嫧绫诲瀷', width: 100 }
+ , { field: '璋冨叆缁勭粐', title: '璋冨叆缁勭粐', width: 125 }
+ , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 125 }
, { field: 'HWHID', title: 'HWHID', width: 200, hide: true }
, { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 125 }
, { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 125 }
--
Gitblit v1.9.1