From 73ffdd29452e978bd4e7ef79580116f96e1ae33b Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期四, 17 六月 2021 13:45:55 +0800
Subject: [PATCH] 裁切派工优化
---
WebTM/Properties/PublishProfiles/webtm.pubxml.user | 13
WebTM/views/仓存管理/裁切派工单/Xs_CutWorkSendBillList.html | 190 +++++++++++++
WebTM/views/仓存管理/裁切派工单/Xs_CutWorkSendBill.html | 594 +++++++++++++++++++++--------------------
WebTM/layuiadmin/Scripts/webConfig.js | 8
WebTM/views/index.html | 2
WebTM/WebTM.csproj | 1
6 files changed, 505 insertions(+), 303 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/webtm.pubxml.user b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
index 1280624..c3d3e38 100644
--- a/WebTM/Properties/PublishProfiles/webtm.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/webtm.pubxml.user
@@ -13,10 +13,10 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="bin/WebTM.dll">
- <publishTime>06/08/2021 15:44:33</publishTime>
+ <publishTime>06/10/2021 14:45:20</publishTime>
</File>
<File Include="bin/WebTM.pdb">
- <publishTime>06/08/2021 15:44:33</publishTime>
+ <publishTime>06/10/2021 14:45:20</publishTime>
</File>
<File Include="layuiadmin/config.js">
<publishTime>01/14/2021 10:06:23</publishTime>
@@ -583,7 +583,7 @@
<publishTime>01/14/2021 10:06:23</publishTime>
</File>
<File Include="layuiadmin/Scripts/webConfig.js">
- <publishTime>06/08/2021 15:47:30</publishTime>
+ <publishTime>06/17/2021 13:45:05</publishTime>
</File>
<File Include="layuiadmin/style/admin.css">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -955,7 +955,7 @@
<publishTime>01/14/2021 10:06:24</publishTime>
</File>
<File Include="views/index.html">
- <publishTime>06/08/2021 15:52:16</publishTime>
+ <publishTime>06/10/2021 14:51:26</publishTime>
</File>
<File Include="views/senior/echarts/bar.html">
<publishTime>01/14/2021 10:06:24</publishTime>
@@ -1108,7 +1108,10 @@
<publishTime>02/25/2021 14:28:42</publishTime>
</File>
<File Include="views/浠撳瓨绠＄悊/瑁佸垏娲惧伐鍗�/Xs_CutWorkSendBill.html">
- <publishTime>06/09/2021 11:34:36</publishTime>
+ <publishTime>06/17/2021 13:44:16</publishTime>
+ </File>
+ <File Include="views/浠撳瓨绠＄悊/瑁佸垏娲惧伐鍗�/Xs_CutWorkSendBillList.html">
+ <publishTime>06/17/2021 13:12:12</publishTime>
</File>
<File Include="views/浠撳簱璋冩嫧/浠撳簱璋冩嫧/Kf_MoveStockBill_Fast.html">
<publishTime>01/14/2021 10:06:24</publishTime>
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 49aa3e4..a7efeea 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -421,6 +421,7 @@
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_UpMoveStockBill.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockBill_FastList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\瑁佸垏娲惧伐鍗昞Xs_CutWorkSendBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\瑁佸垏娲惧伐鍗昞Xs_CutWorkSendBill.html" />
<Content Include="views\鍏叡椤甸潰\Kf_BarCodeEditDlg.html" />
<Content Include="views\鍩虹璧勬枡\鐢熶骇鍩虹璧勬枡\H_ProcessDetail.html" />
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index eff56b2..050e8c6 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,8 +1,8 @@
锘縡unction GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = "http://124.70.129.242/WebAPI/"; //闆呯惇璇�
+ var WEBURL = "http://124.70.129.242/WebAPI/"; //闆呯惇璇�
//var WEBURL = "http://124.70.129.242:9090/WebAPI/"; //闆呯惇璇烘祴璇�
- var WEBURL = "http://localhost:8084/WebAPI/";
+ //var WEBURL = "http://localhost:8084/WebAPI/";
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
@@ -10,9 +10,9 @@
function GetWEBURL1() {
//var WEBURL = 'http://192.168.16.80:8011/'; //鍔炲叕瀹ゆ湇鍔″櫒
- //var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
+ var WEBURL = 'http://124.70.129.242/WebAPI/'; //闆呯惇璇�
//var WEBURL = 'http://124.70.129.242:9090/WebAPI/'; //闆呯惇璇烘祴璇�
- var WEBURL = 'http://localhost:8084/WebAPI/';
+ //var WEBURL = 'http://localhost:8084/WebAPI/';
//61.130.49.162:9090
//WEBURL = "";
return WEBURL
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index fbad7cd..d8941c3 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -123,7 +123,7 @@
<a>瑁佸垏娲惧伐鍗�</a>
<dl class="layui-nav-child">
<dd><a href="浠撳瓨绠＄悊/瑁佸垏娲惧伐鍗�/Xs_CutWorkSendBill.html" target="main_self_frame">瑁佸垏娲惧伐鍗�</a></dd>
- <dd><a href="浠撳瓨绠＄悊/瑁佸垏娲惧伐鍗�/Xs_CutWorkSendBill.html" target="main_self_frame">瑁佸垏娲惧伐鍗曞垪琛�</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/瑁佸垏娲惧伐鍗�/Xs_CutWorkSendBillList.html">瑁佸垏娲惧伐鍗曞垪琛�</a></dd>
</dl>
</dd>
</dl>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBill.html"
index 630bcd8..84e4cc6 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBill.html"
@@ -1,293 +1,301 @@
-锘�<!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">
-</head>
-
-<body>
- <div class="layui-fluid" style="padding:0">
- <div class="layui-card">
- <div class="layui-card-body" style="padding: 5px; height:800px;">
- <form class="layui-form" action="" lay-filter="component-form-group">
- <div style="background-color:#0085E8;">
- <span style="color: white;"><i class="layui-icon layui-icon-form"></i>瑁佸垏娲惧伐鍗�</span>
- </div>
- <div class="layui-form-item" style="padding:15px;margin:0px">
- <div class="layui-row">
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鐝粍</label>
- </div>
- <div class="layui-col-xs8">
- <select name="HGroup" id="HGroup" lay-verify="required" lay-search class="layui-input">
- <!--鍔ㄦ�佹覆鏌撶彮缁�-->
- </select>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵捐揣鍗曞彿</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HSEOrderBillNo" id="HSEOrderBillNo" autocomplete="off" class="layui-input">
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">娲惧伐鍗曞彿</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HBillNo" id="HBillNo" autocomplete="off" class="layui-input" readonly>
- </div>
- <div class="layui-col-xs3">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">娲惧伐鍗旾D</label>
- </div>
- <div class="layui-col-xs8">
- <input type="text" name="HInterID" id="HInterID" autocomplete="off" class="layui-input" readonly>
- </div>
- </div>
- </div>
- <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
- <ul class="layui-tab-title" lay-filter="tab-all">
- <li lay-id="1" style="padding:1px;" class="layui-this">鎵爜璁板綍</li>
- </ul>
- <div class="layui-tab-content">
- <!--鏄庣粏淇℃伅-->
- <div class="layui-tab-item layui-show">
- <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
- </div>
- </div>
- </div>
- <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
- </div>
- <input type="hidden" name="HMaker" id="HMaker">
- </form>
- </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 type="text/html" id="barDemo">
- <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
- </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
- , element = layui.element;
-
- //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
- if (sessionStorage.login != "login") {
- layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
- icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
- }, function () { window.location.href = "../../user/login.html"; });
- }
-
- $("#HMaker").val(sessionStorage["HUserName"]);
- var load = layer.load(1, {
- content: '鐝粍鍔犺浇涓�傘�傘��',
- shade: [0.4, '#393D49'],
- // time: 10 * 1000,
- success: function (layero) {
- layero.css('padding-left', '30px');
- layero.find('.layui-layer-content').css({
- 'padding-top': '40px',
- 'width': '120px',
- 'color': 'white',
- 'background-position-x': '16px'
- });
- }
- })
- //鑾峰彇鐧诲綍椤电粍缁囧垪
- var HGroup = '<option value="" style="color:red;">璇烽�夋嫨鐝粍</option>';
- $.ajax({
- type: "get",
- url: GetWEBURL() + "/Web/GetHGroup",
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data;
- for (var i = 0; i < data.length; i++) {
- HGroup += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
- }
- $("#HGroup").append(HGroup);
- form.render('select');
- }
- layer.closeAll("loading");
- }
- })
-
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '9191' },
- success: function (d) {
- //console.log(d.data);
- $("#HInterID").val(d.data[0].HInterID);
- $("#HBillNo").val(d.data[0].HBillNo);
- }
- });
-
- //涓昏〃鍒楄〃
- var option = {
- elem: '#smjl-table'
- //, toolbar: '#toolbarDemo'
- , page: true
- , totalRow: true
- //, height: 256
- , cellMinWidth: 90
- , limit: 500
- , cols: [[
- { type: 'numbers', title: '搴忓彿', totalRowText: '鍚堣琛�', width: 60 }
- , { field: 'HMainSourceBillNo', title: '鎵捐揣鍗曞彿' }
- , { field: 'HMainSourceInterID', title: '鎵捐揣鍗旾D', hide: true }
- , { field: 'pages', title: '寮犳暟', totalRow: true }
- , { field: 'HMaker', title: '鍒跺崟浜�', hide: true }
- , { field: 'HGroupID', title: '鐝粍', hide: true }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', hide: true }
- , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
- ]]
- , text: {
- none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔壘璐у崟鍙凤紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
- }
- };
- //鍒濆鍔犺浇琛ㄦ牸
- option.data = [];
- table.render(option);
-
- //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓�
- $("#HSourceBillNo").focus();
-
- //鎵壘璐у崟锛堥攢鍞鍗曪級
- $('#HSEOrderBillNo').on('keydown', function (event) {
- var HSEOrderBillNo = $('#HSEOrderBillNo').val();
- if (event.keyCode == 13) {
- var index = layer.load();
- $.ajax({
- url: GetWEBURL() + "/Xs_CutWorkSendBill/getHSEOrderBillNo",
- type: "GET",
- data: { "HSEOrderBillNo": HSEOrderBillNo },
- success: function (result) {
- if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var sSubStr = result.data;
- var tableStr = table.cache['smjl-table'];
- for (var i = 0; i < tableStr.length; i++) {
- if (tableStr[i].HMainSourceBillNo == sSubStr[0].HMainSourceBillNo) {
- layer.close(index);
- $('#HSEOrderBillNo').val("");
- layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return;
- }
- }
- var last = tableStr.length;
- sSubStr[0].HMaker = $("#HMaker").val();
- option.data.push(sSubStr[0]);
- table.render(option);
- option.data = table.cache["smjl-table"];
- table.render(option);
- layer.close(index);
- $('#HSEOrderBillNo').val("");
- layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
- }
- else {
- layer.close(index);
- layer.msg(result.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.on('submit(Cancel)', function () {
- parent.location.href = "../../../views/index.html"
- //window.close();//鍏抽棴褰撳墠椤�
- })
-
- //鎻愪氦
- form.on('submit(Saver)', function (data) {//鎻愪氦
- var tableStr = table.cache['smjl-table'];
- for (var i = 0; i < tableStr.length; i++) {
- tableStr[i].HGroupID = $("#HGroup").val();
- tableStr[i].HBillNo = $("#HBillNo").val();
- tableStr[i].HInterID = $("#HInterID").val();
- }
- var tableData = tableStr;
- var sSubStr = JSON.stringify(tableData);
- sSubStr = "{\"oSub\": " + sSubStr + "}";
- var index = layer.load();
- $.ajax(
- {
- type: "POST",
- url: GetWEBURL() + "/Xs_CutWorkSendBill/set_SaveCutWorkSendBill",
- //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
- async: true,
- data: { "oMain": sSubStr },
- dataType: "json",
- success: function (result) {
- if (result.count == 1) {
- layer.confirm(result.Message, {
- icon: 1, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['鏂板'],
- btn2: function () {
- //parent.layui.admin.events.closeThisTabs();鍏抽棴椤电
- //window.close();//鍏抽棴椤甸潰锛屾祻瑙堝櫒鏈夋晥锛孭DA鏃犳晥
- parent.location.href = "../../../views/index.html"
- }//鍏抽棴
- }, function () { window.location.reload(); });//鏂板
- }
- 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: "娓╅Θ鎻愮ず" });
- }
- });
- });
-
- //琛屽唴浜嬩欢
- table.on('tool(smjl-table)', function (obj) {
- if (obj.event === 'del') {
- layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
- obj.del();
- option.data = table.cache["smjl-table"];
- table.reload(option);
- layer.close(index);
- });
- }
- });
-
-
-
- });
-
-
-
-
- </script>
-
-</body>
-</html>
+锘�<!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">
+</head>
+
+<body>
+ <div class="layui-fluid" style="padding:0">
+ <div class="layui-card">
+ <div class="layui-card-body" style="padding: 5px; height:800px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div style="background-color:#0085E8;">
+ <span style="color: white;"><i class="layui-icon layui-icon-form"></i>瑁佸垏娲惧伐鍗�</span>
+ </div>
+ <div class="layui-form-item" style="padding:15px;margin:0px">
+ <div class="layui-row">
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鐝粍</label>
+ </div>
+ <div class="layui-col-xs8">
+ <select name="HGroup" id="HGroup" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撶彮缁�-->
+ </select>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">鎵捐揣鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HSEOrderBillNo" id="HSEOrderBillNo" autocomplete="off" class="layui-input">
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娲惧伐鍗曞彿</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HBillNo" id="HBillNo" autocomplete="off" class="layui-input" readonly>
+ </div>
+ <div class="layui-col-xs3">
+ <label class="layui-form-label" style="width:60px;padding-left:0px;">娲惧伐鍗旾D</label>
+ </div>
+ <div class="layui-col-xs8">
+ <input type="text" name="HInterID" id="HInterID" autocomplete="off" class="layui-input" readonly>
+ </div>
+ </div>
+ </div>
+ <div class="layui-tab layui-col-xs12" lay-filter="tab-LookingForBill">
+ <ul class="layui-tab-title" lay-filter="tab-all">
+ <li lay-id="1" style="padding:1px;" class="layui-this">鎵爜璁板綍</li>
+ </ul>
+ <div class="layui-tab-content">
+ <!--鏄庣粏淇℃伅-->
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="smjl-table" lay-filter="smjl-table"></table>
+ </div>
+ </div>
+ </div>
+ <div class="layer-footer" style="z-index: 10; position: fixed; text-align: center; bottom: 0; width:100%; height:50px">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Saver">鎻愪氦</button>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Cancel">閫�鍑�</button>
+ </div>
+ <input type="hidden" name="HMaker" id="HMaker">
+ </form>
+ </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 type="text/html" id="barDemo">
+ <a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
+ </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
+ , element = layui.element;
+
+ //鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
+ if (sessionStorage.login != "login") {
+ layer.confirm("鐧诲綍澶辨晥锛岃閲嶆柊鐧诲綍锛�", {
+ icon: 4, skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず", closeBtn: 0, btn: ['閲嶆柊鐧诲綍']
+ }, function () { window.location.href = "../../user/login.html"; });
+ }
+
+ $("#HMaker").val(sessionStorage["HUserName"]);
+ var load = layer.load(1, {
+ content: '鐝粍鍔犺浇涓�傘�傘��',
+ shade: [0.4, '#393D49'],
+ // time: 10 * 1000,
+ success: function (layero) {
+ layero.css('padding-left', '30px');
+ layero.find('.layui-layer-content').css({
+ 'padding-top': '40px',
+ 'width': '120px',
+ 'color': 'white',
+ 'background-position-x': '16px'
+ });
+ }
+ })
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var HGroup = '<option value="0" style="color:red;">璇烽�夋嫨鐝粍</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetHGroup",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HGroup += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HGroup").append(HGroup);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '9191' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HInterID").val(d.data[0].HInterID);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ }
+ });
+
+ //涓昏〃鍒楄〃
+ var option = {
+ elem: '#smjl-table'
+ //, toolbar: '#toolbarDemo'
+ , page: true
+ , totalRow: true
+ //, height: 256
+ , cellMinWidth: 90
+ , limit: 500
+ , cols: [[
+ { type: 'numbers', title: '搴忓彿', totalRowText: '鍚堣琛�', width: 60 }
+ , { field: 'HMainSourceBillNo', title: '鎵捐揣鍗曞彿' }
+ , { field: 'HMainSourceInterID', title: '鎵捐揣鍗旾D', hide: true }
+ , { field: 'pages', title: '寮犳暟', totalRow: true }
+ , { field: 'HMaker', title: '鍒跺崟浜�', hide: true }
+ , { field: 'HGroupID', title: '鐝粍', hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', hide: true }
+ , { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛岃鍏堟壂鎻忔壘璐у崟鍙凤紒' //榛樿锛氭棤鏁版嵁銆傛敞锛氳灞炴�т负 layui 2.2.5 寮�濮嬫柊澧�
+ }
+ };
+ //鍒濆鍔犺浇琛ㄦ牸
+ option.data = [];
+ table.render(option);
+
+ //杩涘叆椤甸潰榛樿鍏夋爣鍦ㄦ簮鍗曞彿涓�
+ $("#HSourceBillNo").focus();
+
+ //鎵壘璐у崟锛堥攢鍞鍗曪級
+ $('#HSEOrderBillNo').on('keydown', function (event) {
+ if ($('#HGroup').val()=="0") {
+ layer.msg("璇峰厛閫夋嫨鐝粍");
+ $('#HSEOrderBillNo').val("");
+ return;
+ }
+ var HSEOrderBillNo = $('#HSEOrderBillNo').val();
+ if (event.keyCode == 13) {
+ var index = layer.load();
+ $.ajax({
+ url: GetWEBURL() + "/Xs_CutWorkSendBill/getHSEOrderBillNo",
+ type: "GET",
+ data: { "HSEOrderBillNo": HSEOrderBillNo },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var sSubStr = result.data;
+ var tableStr = table.cache['smjl-table'];
+ for (var i = 0; i < tableStr.length; i++) {
+ if (tableStr[i].HMainSourceBillNo == sSubStr[0].HMainSourceBillNo) {
+ layer.close(index);
+ $('#HSEOrderBillNo').val("");
+ layer.msg("璇ュ疄鐗╁凡鎵爜锛岃鍕块噸澶嶆壂鐮�", { icon: 0, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ }
+ var last = tableStr.length;
+ sSubStr[0].HMaker = $("#HMaker").val();
+ option.data.push(sSubStr[0]);
+ table.render(option);
+ option.data = table.cache["smjl-table"];
+ table.render(option);
+ layer.close(index);
+ $('#HSEOrderBillNo').val("");
+ layer.msg("鎵爜鎴愬姛锛�", { icon: 1, time: 1000 });
+ }
+ else {
+ layer.close(index);
+ layer.msg(result.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.on('submit(Cancel)', function () {
+ parent.location.href = "../../../views/index.html"
+ //window.close();//鍏抽棴褰撳墠椤�
+ })
+
+ //鎻愪氦
+ form.on('submit(Saver)', function (data) {//鎻愪氦
+ var tableStr = table.cache['smjl-table'];
+ for (var i = 0; i < tableStr.length; i++) {
+ tableStr[i].HGroupID = $("#HGroup").val();
+ tableStr[i].HBillNo = $("#HBillNo").val();
+ tableStr[i].HInterID = $("#HInterID").val();
+ }
+ var tableData = tableStr;
+ var sSubStr = JSON.stringify(tableData);
+ if (sSubStr == "[]") {
+ layer.msg("娌℃湁鏄庣粏琛岋紒");
+ return;
+ }
+ sSubStr = "{\"oSub\": " + sSubStr + "}";
+ var index = layer.load();
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "/Xs_CutWorkSendBill/set_SaveCutWorkSendBill",
+ //url:"http://localhost:12761/LookingFor/set_SaveLookingForBill_Json",
+ async: true,
+ data: { "oMain": sSubStr },
+ dataType: "json",
+ success: function (result) {
+ if (result.count == 1) {
+ layer.confirm(
result.Message,
{
+ icon: 1,
+ skin: 'layui-layer-lan',
title: "娓╅Θ鎻愮ず",
closeBtn: 0,
btn: ['鏂板', '鍏抽棴'],
btn2: function () {//鍏抽棴
+ parent.location.href = "../../../views/index.html";
+ }
+ }, function () {//鏂板
window.location.reload();
+ }
);
+ }
+ 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: "娓╅Θ鎻愮ず" });
+ }
+ });
+ });
+
+ //琛屽唴浜嬩欢
+ table.on('tool(smjl-table)', function (obj) {
+ if (obj.event === 'del') {
+ layer.confirm('鐪熺殑鍒犻櫎琛屽悧锛�', function (index) {
+ obj.del();
+ option.data = table.cache["smjl-table"];
+ table.reload(option);
+ layer.close(index);
+ });
+ }
+ });
+
+
+
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBillList.html"
new file mode 100644
index 0000000..2fd929f
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\350\243\201\345\210\207\346\264\276\345\267\245\345\215\225/Xs_CutWorkSendBillList.html"
@@ -0,0 +1,190 @@
+锘�<!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>
+
+</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="WorkCenter" id="WorkCenter">
+ </div>
+ </div>
+ <!--<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="HOrderProcNO" id="HOrderProcNO">
+ </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>
+ </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-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></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
+ var sWhere = "";
+
+ var option = {
+ elem: '#mainTable'
+ ,height: 'full-50'
+ , page: true
+ ,cellMinWidth: 90
+ , cols: [[
+ { field: '鍗曟嵁涓诲唴鐮�', title: '鍗曟嵁涓诲唴鐮�',hide:true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃堕棿', title: '鍒跺崟鏃堕棿' }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: '鐝粍涓诲唴鐮�', title: '鐝粍涓诲唴鐮�' }
+ , { field: '鍗曟嵁瀛愬唴鐮�', title: '鍗曟嵁瀛愬唴鐮�' }
+ , { field: '閿�鍞鍗曚富鍐呯爜', title: '閿�鍞鍗曚富鍐呯爜' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿' }
+ ]]
+ };
+
+
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Xs_CutWorkSendBill/List',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.close(index);
+ } else {
+ layer.close(index);
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ var HOrderProcNO = $("#HOrderProcNO").val();//鍗曟嵁绫诲瀷
+ var hnumber = $("#hnumber").val();//鐗╂枡
+ var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
+ if (HOrderProcNO) {
+ sWhere += " and 鍗曟嵁绫诲瀷 like '%" + HOrderProcNO + "%'";
+ }
+ if (hnumber) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ }
+ if (WorkCenter) {
+ sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ }
+ $.ajax({
+ url: GetWEBURL1() + '/Xs_CutWorkSendBill/List',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (result) {
+ if (result.count == 1) {
+ option.data = result.data;
+ table.render(option);
+ layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
+ }
+ });
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ });
+
+
+ //laydate.render({
+ // elem: '#HDate'
+ // , type: 'datetime'
+ // , trigger: 'click'
+ // , format:'yyyy-MM-dd HH:mm'
+ //});
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
+
+
+ </script>
+
+</body>
+</html>
--
Gitblit v1.9.1