From 38456b4a0e139b46af3497642fbd0e7da3039238 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期三, 23 六月 2021 08:22:48 +0800
Subject: [PATCH] 生产汇报单常用字段过滤
---
WebTM/views/生产管理/生产汇报单/Sc_Add_ICMOReportBillList.html | 362 +++++++++++++++++-------
WebTM/views/生产管理/生产汇报单/Sc_ICMOReportBillList.html | 1
WebTM/views/PublicPage/PartInformation.html | 250 ++++++++++++++++
WebTM/Properties/PublishProfiles/JFTM.pubxml.user | 18
WebTM/views/PublicPage/UnitInformation.html | 250 ++++++++++++++++
WebTM/WebTM.csproj | 2
6 files changed, 771 insertions(+), 112 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
index bcfee04..1df121a 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml.user
@@ -5,7 +5,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</_PublishTargetUrl>
- <History>True|2021-06-21T08:59:10.6036312Z;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
+ <History>True|2021-06-22T08:31:58.5748348Z;True|2021-06-22T16:07:48.5148267+08:00;True|2021-06-22T16:04:36.2503739+08:00;True|2021-06-22T16:00:43.0264206+08:00;True|2021-06-22T15:55:42.9093385+08:00;True|2021-06-22T15:51:18.0421904+08:00;True|2021-06-22T15:35:01.7574201+08:00;True|2021-06-22T15:24:15.7962812+08:00;True|2021-06-22T14:56:52.6270438+08:00;True|2021-06-22T14:10:54.9406106+08:00;True|2021-06-22T14:08:15.2618916+08:00;True|2021-06-22T14:05:33.6975571+08:00;True|2021-06-22T13:55:28.6215051+08:00;True|2021-06-22T11:25:10.9245123+08:00;True|2021-06-22T08:50:34.2405585+08:00;True|2021-06-21T16:59:10.6036312+08:00;True|2021-06-21T16:50:55.4709721+08:00;True|2021-06-21T16:40:58.8244269+08:00;True|2021-06-21T16:31:18.9628094+08:00;True|2021-06-21T15:51:17.3693666+08:00;True|2021-06-21T13:24:17.0235835+08:00;True|2021-06-21T13:22:25.7262124+08:00;True|2021-06-21T10:47:52.4425428+08:00;True|2021-06-21T08:45:43.5963620+08:00;True|2021-06-21T08:45:04.0743894+08:00;True|2021-06-21T08:43:41.0159366+08:00;True|2021-06-19T15:09:31.9416629+08:00;True|2021-06-18T15:55:47.3043005+08:00;True|2021-06-18T15:54:51.9110069+08:00;True|2021-06-18T15:53:36.5475712+08:00;True|2021-06-18T15:46:27.7565979+08:00;True|2021-06-18T15:43:05.4125819+08:00;True|2021-06-18T15:37:01.5738408+08:00;</History>
</PropertyGroup>
<ItemGroup>
<File Include="bin/layuiadmin/style/admin.css">
@@ -15,10 +15,10 @@
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>06/21/2021 16:59:03</publishTime>
+ <publishTime>06/22/2021 16:31:51</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>06/21/2021 16:59:03</publishTime>
+ <publishTime>06/22/2021 16:31:51</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1055,6 +1055,9 @@
<File Include="views/PublicPage/MouldInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
+ <File Include="views/PublicPage/PartInformation.html">
+ <publishTime>06/22/2021 08:50:13</publishTime>
+ </File>
<File Include="views/PublicPage/RepairItemInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
</File>
@@ -1063,6 +1066,9 @@
</File>
<File Include="views/PublicPage/SupplierInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
+ </File>
+ <File Include="views/PublicPage/UnitInformation.html">
+ <publishTime>06/22/2021 11:18:06</publishTime>
</File>
<File Include="views/PublicPage/UserInformation.html">
<publishTime>06/10/2021 11:10:38</publishTime>
@@ -1548,10 +1554,10 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_Add_ICMOReportBillList.html">
- <publishTime>06/21/2021 16:58:52</publishTime>
+ <publishTime>06/22/2021 16:30:14</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇姹囨姤鍗�/Sc_ICMOReportBillList.html">
- <publishTime>06/21/2021 16:42:20</publishTime>
+ <publishTime>06/22/2021 14:07:55</publishTime>
</File>
<File Include="views/鐢熶骇绠＄悊/鐢熶骇缁勮杩芥函鍗�/Sc_AssemblyBillList.html">
<publishTime>06/10/2021 11:10:39</publishTime>
@@ -1890,7 +1896,7 @@
<publishTime>06/10/2021 11:10:39</publishTime>
</File>
<File Include="Web.config">
- <publishTime>06/21/2021 16:59:08</publishTime>
+ <publishTime>06/22/2021 16:31:57</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 3abae08..ab12dbe 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -417,9 +417,11 @@
<Content Include="views\PublicPage\FaultTypeInformation.html" />
<Content Include="views\PublicPage\GroupInformation.html" />
<Content Include="views\PublicPage\MouldInformation.html" />
+ <Content Include="views\PublicPage\PartInformation.html" />
<Content Include="views\PublicPage\RepairItemInformation.html" />
<Content Include="views\PublicPage\SourceInformation.html" />
<Content Include="views\PublicPage\SupplierInformation.html" />
+ <Content Include="views\PublicPage\UnitInformation.html" />
<Content Include="views\PublicPage\UserInformation.html" />
<Content Include="views\PublicPage\WareHouseInformation.html" />
<Content Include="views\senior\echarts\bar.html" />
diff --git a/WebTM/views/PublicPage/PartInformation.html b/WebTM/views/PublicPage/PartInformation.html
new file mode 100644
index 0000000..9e9528f
--- /dev/null
+++ b/WebTM/views/PublicPage/PartInformation.html
@@ -0,0 +1,250 @@
+锘�<!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/treeTable.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/layui/lay/modules/util.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </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-form-item" style="border-top: solid 1px #F6F6F6;">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+ <div id="treePart" lay-filter="treePart" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+ </div>
+ <div class="layui-col-xs9 layui-inline">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </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>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', '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
+ , tree = layui.tree
+ var sWhere = "";
+
+ tree.render({
+ elem: '#treePart',
+ data: getData(sWhere),
+ showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ id: 'demoId',
+ isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+ showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+ onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
+ click: function (obj) {
+ //鐐瑰嚮楂樺厜
+ if (obj.data.id !== treeCkData.id) {
+ $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+ $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ treeCkData = obj.data;
+ TagId = obj.data.id;
+ TagParentId = obj.data.ParentID;
+ }
+ else {
+ $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ treeCkData = { id: 0 };
+ TagId = "";
+ TagParentId = "";
+ }
+
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaintenanceMode/PartCX',
+ type: "GET",
+ data: { "HInterID": obj.data.id },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+ , { field: 'HNumber', title: '鐗╂枡浠ｇ爜' }
+ , { field: 'HName', title: '鐗╂枡鍚嶇О' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/PartList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/PartList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ //鏌ヨ鏍戠姸鏁版嵁
+ function getData(sWhere) {
+ var treeData;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaintenanceMode/PartLoadTree',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ async: false,
+ success: function (result) {
+ var data = result.data;
+ //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ treeData = LoadTree(data);
+
+ }
+ });
+ return treeData;
+ }
+ /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ function LoadTree(data) {
+ let map = {};
+ let treeData = [];
+ data.forEach(it => {
+ map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data.forEach(it => {
+ const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ return treeData;
+ }
+
+
+ </script>
+
+</body>
+</html>
diff --git a/WebTM/views/PublicPage/UnitInformation.html b/WebTM/views/PublicPage/UnitInformation.html
new file mode 100644
index 0000000..e45ee86
--- /dev/null
+++ b/WebTM/views/PublicPage/UnitInformation.html
@@ -0,0 +1,250 @@
+锘�<!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/treeTable.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/layui/lay/modules/util.js"></script>
+ <style media="screen">
+ .custom-tree-item-clicked {
+ color: #FC9003
+ }
+ </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-form-item" style="border-top: solid 1px #F6F6F6;">
+ <div class="layui-row" style="padding:10px 0">
+ <div class="layui-col-xs3 layui-inline" style="width: 23%;">
+ <div id="treeUnit" lay-filter="treeUnit" class="demo-tree demo-tree-box" style="height: 580px; overflow: scroll;"></div>
+ </div>
+ <div class="layui-col-xs9 layui-inline">
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label">浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HNumber" id="HNumber">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HName" id="HName">
+ </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>
+ </div>
+ <div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script src="../../layuiadmin/layui/zgqlayui.js"></script>
+ <script src="../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script>
+ var treeCkData = { id: 0 };
+ var TagId = "";
+ var TagParentId = "";
+
+ layui.config({
+ base: '../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['tree', '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
+ , tree = layui.tree
+ var sWhere = "";
+
+ tree.render({
+ elem: '#treeUnit',
+ data: getData(sWhere),
+ showCheckbox: false, //鏄惁鏄剧ず澶嶉�夋
+ id: 'demoId',
+ isJump: false, //鏄惁鍏佽鐐瑰嚮鑺傜偣鏃跺脊鍑烘柊绐楀彛璺宠浆
+ showLine: true,//鏄惁寮�鍚繛鎺ョ嚎
+ onlyIconControl: true, //鐐瑰嚮鍚庝笉鏀剁缉
+ click: function (obj) {
+ //鐐瑰嚮楂樺厜
+ if (obj.data.id !== treeCkData.id) {
+ $('div[data-id="' + obj.data.id + '"] span').eq(1).last().addClass("custom-tree-item-clicked");
+ $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ treeCkData = obj.data;
+ TagId = obj.data.id;
+ TagParentId = obj.data.ParentID;
+ }
+ else {
+ $('div[data-id="' + treeCkData.id + '"] span').eq(1).last().removeClass('custom-tree-item-clicked');
+ treeCkData = { id: 0 };
+ TagId = "";
+ TagParentId = "";
+ }
+
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaintenanceMode/UnitCX',
+ type: "GET",
+ data: { "HInterID": obj.data.id },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ });
+
+
+ var option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 'full-120'
+ , page: true
+ , cellMinWidth: 90
+ , cols: [[
+ { type: 'radio', fixed: 'left' }
+ , { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
+ , { field: 'ParentID', title: 'ParentID', sort: true, hide: true }
+ , { field: 'HNumber', title: '鍗曚綅浠ｇ爜' }
+ , { field: 'HName', title: '鍗曚綅鍚嶇О' }
+ ]]
+ };
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/UnitList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ var HNumber = $("#HNumber").val();
+ var HName = $("#HName").val();
+ if (HNumber) {
+ sWhere += " and HNumber like '%" + HNumber + "%'";
+ }
+ if (HName) {
+ sWhere += " and HName like '%" + HName + "%'";
+ }
+ $.ajax({
+ url: GetWEBURL() + '/PublicPageMethod/UnitList',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+ //鏌ヨ鏍戠姸鏁版嵁
+ function getData(sWhere) {
+ var treeData;
+
+ $.ajax({
+ url: GetWEBURL() + '/Gy_MaintenanceMode/UnitLoadTree',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ async: false,
+ success: function (result) {
+ var data = result.data;
+ //鐢熸垚鏁版嵁瀵硅薄闆嗗悎
+ treeData = LoadTree(data);
+
+ }
+ });
+ return treeData;
+ }
+ /**澶勭悊鏍戝舰灞曠ず鏁版嵁锛岃姹傛湁ID鍜孭arentID銆乼itle瀛楁**/
+ function LoadTree(data) {
+ let map = {};
+ let treeData = [];
+ data.forEach(it => {
+ map[it.id] = it; //ID涓烘瘡涓妭鐐圭殑id
+ })
+ //鐢熸垚缁撴灉闆�
+ data.forEach(it => {
+ const parent = map[it.ParentID]; //ParentID涓虹埗鑺傜偣鐨刬d
+ if (parent) {
+ if (!Array.isArray(parent.children)) parent.children = [];
+ parent.children.push(it);
+ } else {
+ treeData.push(it)
+ }
+ })
+ return treeData;
+ }
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
index 8c51b34..f057151 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_Add_ICMOReportBillList.html"
@@ -58,8 +58,8 @@
<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="0" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
+ <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 layui-btn-primary" lay-filter="HShopList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -68,8 +68,8 @@
<div class="layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
- <input type="text" name="HGroupName" id="HGroupName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HGroupID" id="HGroupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <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 layui-btn-primary" lay-filter="HGroupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -80,8 +80,8 @@
<div class="layui-inline">
<label class="layui-form-label">缁熻鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="0" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
+ <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 layui-btn-primary" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -99,7 +99,7 @@
<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="0" style="float:left;width:150px;">
+ <input type="text" name="XDH" id="XDH" class="layui-input" value="" style="float:left;width:150px;">
</div>
</div>
<div class="layui-inline">
@@ -140,8 +140,8 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script>
-
- //鑾峰彇鍙傛暟
+
+ //鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -193,14 +193,18 @@
, cols: [[ //琛ㄥご
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: 'HMaterID', title: '鐗╂枡浠ｇ爜', edit: 'text', width: 100 }
+ , { field: 'HMaterID', title: 'HMaterID', edit: 'text', width: 100, hide: true }
+ , { field: 'HMaterCode', title: '鐗╂枡浠ｇ爜', edit: 'text', event: 'HMaterCode', width: 100 }
, { field: 'HMaterName', title: '鐗╂枡鍚嶇О', edit: 'text', width: 100 }
, { field: 'HMaterSpec', title: '瑙勬牸鍨嬪彿', edit: 'text', width: 100 }
- , { field: 'HUnitID', title: '鍗曚綅浠ｇ爜', edit: 'text', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', edit: 'text', width: 100, hide: true }
+ , { field: 'HUnitCode', title: '鍗曚綅浠ｇ爜', edit: 'text', event: 'HUnitCode', width: 100 }
, { field: 'HUnitName', title: '鍗曚綅鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HSourceID', title: '璧勬簮浠ｇ爜', edit: 'text', width: 100 }
+ , { field: 'HSourceID', title: 'HSourceID', edit: 'text', width: 100, hide: true }
+ , { field: 'HSourceCode', title: '璧勬簮浠ｇ爜', edit: 'text', event: 'HSourceCode', width: 100 }
, { field: 'HSourceName', title: '璧勬簮鍚嶇О', edit: 'text', width: 100 }
- , { field: 'HWorkerid', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', width: 100 }
+ , { field: 'HWorkerid', title: 'HWorkerid', edit: 'text', width: 100, hide: true }
+ , { field: 'HWorkerCode', title: '鎿嶄綔鍛樹唬鐮�', edit: 'text', event: 'HWorkerCode', width: 100 }
, { field: 'HWorkerName', title: '鎿嶄綔鍛樺悕绉�', edit: 'text', width: 100 }
, { field: 'HQty', title: '鐢熶骇鏁伴噺', edit: 'text', width: 100 }
, { field: 'HRemark', title: '琛ㄤ綋澶囨敞', edit: 'text', width: 100 }
@@ -211,7 +215,7 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鍒濆鍔犺浇琛ㄦ牸{ "ID": 0, "HWasterReasonName": " ","HBadReasonID":0,"HEmpName": " ", "HSQProcName": " ","HProcID":0, "HZRProcName": " ", "HMRBChecker": " ", "HRemark": " ", "HPSProcName": " ", "HCloseMan": " " }
- option.data = [{ "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitName": "", "HSourceID": 0, "HSourceName": "", "HWorkerid": 0, "HWorkerName": "","HQty":0,"HRemark":""}];
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" }];
table.render(option);
}
else {
@@ -247,7 +251,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HMaterID": 0, "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitName": "", "HSourceID": 0, "HSourceName": "", "HWorkerid": 0, "HWorkerName": "", "HQty": 0, "HRemark": "" };
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HSourceID": 0, "HSourceCode": "", "HSourceName": "", "HWorkerid": 0, "HWorkerCode": "", "HWorkerName": "", "HQty": 0, "HRemark": "" };
switch (obj.event) {
case 'btn-AddLine':
//table.cache["mainTable"].push(AddRow[rows]);
@@ -278,6 +282,7 @@
});
//琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
+
var data = obj.data;
var rowIndex = $(obj.tr).attr("data-index");
if (obj.event === 'del') {
@@ -295,42 +300,185 @@
}
});
}
- if (obj.event === 'ReasonNameEvent') {
- var _obj = obj;
- console.log(obj,rowIndex)
- }
- });
- //鐩戝惉鍗曞厓鏍肩紪杈�
- table.on('edit(mainTable)', function (obj) {
-
- // 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
- var oldText = $(this).prev().text();
- console.log(oldText,obj);
- if (obj.data.IsPost == 1) {
- //閲嶆柊璧嬪��
- $(this).val(oldText);
- layer.msg('宸查偖瀵勪俊鎭笉鍙慨鏀�', { icon: 5, time: 2000 });
- return;
- }
- var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
- , data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
- , field = obj.field; //寰楀埌瀛楁
- })
+
+ $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
+ if (event.key == "F7")
+ {
+ if (obj.event === 'HMaterCode') //鐗╂枡淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鐗╂枡鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/PartInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
- $(document).on('keydown', '.layui-table-edit', function (e) {
- //console.log(e);
- var td = $(this).parent('td');
- var index = td.index();
- var tr = td.parent('tr');
- if (event.key == "F7") {
- switch (index) {
- case 2://鐗╂枡
- console.log(index);
- break;
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ 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({
+ HMaterID: checkStatus.data[0].HItemID,
+ HMaterCode: checkStatus.data[0].HNumber,
+ HMaterName: checkStatus.data[0].HName,
+ HMaterSpec: checkStatus.data[0].HModel,
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ if (obj.event === 'HUnitCode') //鍗曚綅淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '鍗曚綅鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UnitInformation.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({
+ HUnitID: checkStatus.data[0].HItemID,
+ HUnitCode: checkStatus.data[0].HNumber,
+ HUnitName: checkStatus.data[0].HName
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ if (obj.event === 'HSourceCode') //璧勬簮淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ 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('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HSourceID: checkStatus.data[0].HItemID,
+ HSourceCode: checkStatus.data[0].HNumber,
+ HSourceName: checkStatus.data[0].HName
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+
+ if (obj.event === 'HWorkerCode') //浜哄憳淇℃伅
+ {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璧勬簮鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['80%', '80%'],
+ maxmin: true,
+ content: ['../../PublicPage/UserInformation.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+
+ //鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
+ obj.update({
+ HWorkerid: checkStatus.data[0].HItemID,
+ HWorkerCode: checkStatus.data[0].HNumber,
+ HWorkerName: checkStatus.data[0].HName
+ });
+
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ }
+ });
+ }
+ obj.event = "";
+ return false;
+
}
- }
+ })
+ });
- })
+
+
+
+
@@ -348,7 +496,7 @@
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
var data = result.data.h_v_IF_ICMOReportBillList_Edit[0];
-
+
console.info(data);
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
"HBillNo": data.鍗曟嵁鍙�
@@ -385,19 +533,19 @@
//鍒ゆ柇鏄惁鏂板
if (hID == null || hID == 0) {
//鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '3711' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val(0);
- }
- });
+ //$("#HInterID").val("0");
+ //$("#HBillNo").val("");
+ //$.ajax({
+ // url: GetWEBURL() + "/Web/GetMAXNum",
+ // type: "GET",
+ // data: { "HBillType": '3711' },
+ // success: function (d) {
+ // //console.log(d.data);
+ // $("#HBillNo").val(d.data[0].HBillNo);
+ // $("#HDate").val(shijian);
+ // $("#HInterID").val(0);
+ // }
+ //});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
RoadBillMain(hID);
@@ -518,8 +666,8 @@
});
});
-
-
+
+
form.on('submit(Exit)', function (data) {//
@@ -550,19 +698,29 @@
}
form.on('submit(Saver)', function (data) {//淇濆瓨
+ var refSav = "";
+ if (hID == "" || hID == null) {
+ refSav = "Add";
+ }
+ if (hID != "" && hID != null) {
+ refSav = "Update";
+ }
+
//debugger;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(table.cache['mainTable']);
- var sMainSub = sMainStr + ';' + sSubStr;
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + refSav;
+ AllowLoadData(sSubStr);//鏁版嵁楠岃瘉
+ return false;
$.ajax(
{
type: "POST",
url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainSub },
+ data: { "msg": sMainSub},
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -660,56 +818,48 @@
//$("#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: "娓╅Θ鎻愮ず" });
+
+ if ($("#HDeptID").val() == '' || $("#HDeptID").val() == null) {
+ layer.msg("杞﹂棿涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, 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: "娓╅Θ鎻愮ず" });
+ if ($("#HGroupID").val() == '' || $("#HGroupID").val() == null) {
+ layer.msg("鐝粍涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, 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: "娓╅Θ鎻愮ず" });
+ if ($("#HEmpID").val() == '' || $("#HEmpID").val() == null) {
+ layer.msg("缁熻鍛樹笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, 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: "娓╅Θ鎻愮ず" });
+ layer.msg("娌℃湁鐗╂枡鏄庣粏璁板綍", { icon: 5, btn: ['纭'], time: 2000, 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 false;
}
- }
- if (s == 0) {
- layer.msg("浜у搧鍏ュ簱璁板綍鏈壂鐮�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+ if (sSubStr[i].HUnitID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鍗曚綅淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HSourceID == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,璧勬簮淇℃伅涓虹┖!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (sSubStr[i].HWorkerid == "") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鎿嶄綔鍛樹俊鎭负绌�!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
+ if (parseFloat(sSubStr[i].HQty) <= 0 || sSubStr[i].HQty=="") {
+ layer.msg("鏄庣粏璁板綍绗�" + (i + 1) + "琛�,鐢熶骇鏁伴噺涓嶈兘涓虹┖鎴�0鎴栬�呭皬浜�0!", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return false;
+ }
}
}
else {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
index 00196b7..07dfb9e 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\261\207\346\212\245\345\215\225/Sc_ICMOReportBillList.html"
@@ -259,6 +259,7 @@
else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
}
+ break;
case 'btn-Audit':
var checkStatus = table.checkStatus('mainTable')
--
Gitblit v1.9.1