From be5648427c2fefe9593b1a2c458e1745e926d99a Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 06 一月 2022 08:18:37 +0800
Subject: [PATCH] 扫码异常记录查询
---
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBillList.html | 440 +++++++++-------
WebTM/views/仓存管理/扫码异常记录表/KF_PonderationBillList.html | 327 ++++++++++++
WebTM/views/模治具管理/器具报表/ReportInventoryAccount.html | 1
WebTM/views/index.html | 2
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 74 +-
WebTM/views/销售管理/销售退货单/Add_Edit_Kf_ICStockBillMainList.html | 657 ++++++++++++------------
WebTM/WebTM.csproj | 1
7 files changed, 952 insertions(+), 550 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index d4d5a20..16efc16 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -128,6 +128,7 @@
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockRequestBillList.html" />
<Content Include="views\浠撳瓨绠＄悊\浠撳簱璋冩嫧\Kf_MoveStockStepOutBill_Fast.html" />
<Content Include="views\浠撳瓨绠＄悊\鍒嗘寮忚皟鍏ュ崟\Fb_StepFoldinBillList.html" />
+ <Content Include="views\浠撳瓨绠＄悊\鎵爜寮傚父璁板綍琛╘KF_PonderationBillList.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderBackInfo.html.html" />
<Content Include="views\鍩虹璧勬枡\鍏敤鍩虹璧勬枡\Add_Edit_Gy_OrderLev.html" />
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 9b3ef31..cba6f87 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -236,7 +236,7 @@
<dd>
<a>浠撳簱鎶ヨ〃</a>
<dl class="layui-nav-child">
- <dd><a lay-href="">鎵爜寮傚父璁板綍鏌ヨn</a></dd>
+ <dd><a lay-href="浠撳瓨绠＄悊/鎵爜寮傚父璁板綍琛�/KF_PonderationBillList.html">鎵爜寮傚父璁板綍鏌ヨ</a></dd>
<dd><a lay-href="">鏉＄爜鍑哄叆搴撹褰曡〃n</a></dd>
<dd><a lay-href="">鏉＄爜搴撳瓨鏌ヨn</a></dd>
</dl>
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
index 3b1e4ba..b6de80d 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockBillList.html"
@@ -1,14 +1,19 @@
锘�<!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 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/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;
@@ -28,64 +33,87 @@
<span>鏇村</span>
</div>
</div>
- <!--<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁绫诲瀷</label>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <select name="HBillType" id="HBillType">
- <option value="">鎵�鏈�</option>
- <option value="ZHXJ">涓嬫灦鎵捐揣鍗�</option>
- <option value="ZHSJ">涓婃灦褰掕繕鍗�</option>
- </select>
+ <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>
<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">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍒跺崟浜�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HCreateBy" id="HCreateBy">
- </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">
+ <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 class="layui-inline">
- <label class="layui-form-label">寮�濮嬫椂闂�</label>
+ <label class="layui-form-label">閮ㄩ棬</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" name="BenginHCreateDate" id="BenginHCreateDate">
+ <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">缁撴潫鏃堕棿</label>
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" name="EndHCreateDate" id="EndHCreateDate">
+ <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
</div>
</div>
- </div>-->
+ <!--<hr />-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
+ </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-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>
-
+ <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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></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>
@@ -93,16 +121,16 @@
</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 () {
+
+ //#region 鍏叡鍙橀噺
+
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -114,147 +142,28 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
+ var option = [];
- var option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cellMinWidth: 90
- , cols: [[
- { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
- , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
- , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 200 }
- , { field: '涓荤', title: '涓荤', width: 200 }
- , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
- , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
- , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160 }
- , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
- , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 }
- , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
- , { field: '鎽樿', title: '鎽樿', width: 200 }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
- , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
- , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
- , { field: 'hunitid', title: 'hunitid', width: 115, hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
- , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 }
- , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 }
- , { field: '鍗曚环', title: '鍗曚环', width: 200 }
- , { field: '閲戦', title: '閲戦', width: 200 }
- , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 200 }
- , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 115 }
- , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 200 }
- , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 200 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 115 }
- , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
- , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 115 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 }
- , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
- , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
- ]]
- };
+ //#endregion
- var index = layer.load(0);
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Kf_MoveStockBill/GetMoveStockBillList',
- 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 });
- }
+ //#region 杩涘叆椤甸潰鍔犺浇
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
});
- //閲嶇疆鎸夐挳
- //form.on('submit(btnReSearch)', function (data) {
- // $("#HBillType").val("");//鍗曟嵁绫诲瀷
- // $("#HBillNo").val("");//鍗曟嵁鍙�
- // $("#HSourceBillNo").val("");//婧愬崟鍙�
- // $("#HCreateBy").val("");//鍒跺崟浜�
- // $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- // $("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
- // $("#btnSearch").click();
- //});
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- //var HBillType = $("#HBillType").val();//鍗曟嵁绫诲瀷
- //var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
- //var HCreateBy = $("#HCreateBy").val();//鍒跺崟浜�
- //var BenginHCreateDate = $("#BenginHCreateDate").val();//寮�濮嬪埗鍗曟椂闂�
- //var EndHCreateDate = $("#EndHCreateDate").val();//缁撴潫鍒跺崟鏃堕棿
- //if (HBillNo) {
- // sWhere += " and HBillNo like '%" + HBillNo + "%'";
- //}
- //if (HCreateBy) {
- // sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
- //}
- //if (BenginHCreateDate) {
- // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) >= '" + BenginHCreateDate + "'";
- //}
- //if (EndHCreateDate) {
- // sWhere += " and CONVERT(varchar(100),HCreateDate, 23) <= '" + EndHCreateDate + "'";
- //}
- var index = layer.load(0);
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL1() + '/Kf_MoveStockBill/GetMoveStockBillList',
- type: "GET",
- data: { "sWhere": sWhere},
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = "";
- //$("#HBillType").val("");//鍗曟嵁绫诲瀷
- //$("#HBillNo").val("");//鍗曟嵁鍙�
- //$("#HSourceBillNo").val("");//婧愬崟鍙�
- //$("#HCreateBy").val("");//鍒跺崟浜�
- //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
- //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
});
//鐩戝惉琛屽弻鍑讳簨浠�
@@ -262,14 +171,179 @@
layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
});
+ //#endregion
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+ //鏌ヨ
+ get_Display(sWhere);
+ //鍒濆鍖栨棩鏈�
+ $("#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: [[
+ { field: 'hmainid', title: '鍗曟嵁ID', hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ , { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true }
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200 }
+ , { field: 'hmanagerid', title: 'hmanagerid', width: 200, hide: true }
+ , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 200 }
+ , { field: '涓荤', title: '涓荤', width: 200 }
+ , { field: 'hsecmanagerid', title: 'hsecmanagerid', width: 200, hide: true }
+ , { field: '楠屾敹鍛樹唬鐮�', title: '楠屾敹鍛樹唬鐮�', width: 200 }
+ , { field: '楠屾敹鍛�', title: '楠屾敹鍛�', width: 160 }
+ , { field: 'hkeeperid', title: 'hkeeperid', width: 160, hide: true }
+ , { field: '淇濈鍛樹唬鐮�', title: '淇濈鍛樹唬鐮�', width: 160 }
+ , { field: '淇濈鍛�', title: '淇濈鍛�', width: 200 }
+ , { field: '鎽樿', title: '鎽樿', width: 200 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 200 }
+ , { field: '绾㈣摑鍗曟爣璁�', title: '绾㈣摑鍗曟爣璁�', width: 200 }
+ , { field: 'hsubid', title: 'hsubid', width: 200, hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
+ , { field: 'hunitid', title: 'hunitid', width: 115, hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 200 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200 }
+ , { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115 }
+ , { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200 }
+ , { field: '鍗曚环', title: '鍗曚环', width: 200 }
+ , { field: '閲戦', title: '閲戦', width: 200 }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 200 }
+ , { field: '璋冨叆浠撳簱', title: '璋冨叆浠撳簱', width: 115 }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 200 }
+ , { field: '璋冨嚭浠撳簱', title: '璋冨嚭浠撳簱', width: 200 }
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 200 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 115 }
+ , { field: '閲囪喘璁㈠崟鍙�', title: '閲囪喘璁㈠崟鍙�', width: 200 }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿', width: 200 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 200 }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200 }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 115 }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200 }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 200 }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200 }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 200 }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200 }
+ , { field: '琛屽叧闂汉', title: '琛屽叧闂汉', width: 200 }
+ , { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 200 }
+ ]]
+ };
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var index = layer.load();
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Kf_MoveStockBill/GetMoveStockBillList',
+ 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 });
+ }
+ });
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
+ var HDate1 = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Warehouse = $("#Warehouse").val();//浠撳簱
+ var Hmaker = $("#Hmaker").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 + "%'";
+ }
+ if (HDeptID) {
+ sWhere += " and 閮ㄩ棬 like '%" + HDeptID + "%'";
+ }
+ if (MaterialCode) {
+ sWhere += " and 鐗╂枡浠ｇ爜 like '%" + MaterialCode + "%'";
+ }
+ if (MaterialName) {
+ sWhere += " and 鐗╂枡鍚嶇О like '%" + MaterialName + "%'";
+ }
+ if (SpecificationModel) {
+ sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
+ }
+ if (HSourceBillNo) {
+ sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ }
+ if (Warehouse) {
+ sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+ }
+ if (Hmaker) {
+ sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
+ }
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HDeptID").val();//閮ㄩ棬
+ $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ $("#MaterialName").val();//鐗╂枡鍚嶇О
+ $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ $("#Warehouse").val();//浠撳簱
+ $("#Hmaker").val();//鍒跺崟浜�
+ sWhere = "";
+ get_Display(sWhere);
+ }
+
+ //#endregion
+
+
+
+
+
+
+
+
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225\350\241\250/KF_PonderationBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225\350\241\250/KF_PonderationBillList.html"
new file mode 100644
index 0000000..571769d
--- /dev/null
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\211\253\347\240\201\345\274\202\345\270\270\350\256\260\345\275\225\350\241\250/KF_PonderationBillList.html"
@@ -0,0 +1,327 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鎵爜寮傚父璁板綍鏌ヨ</title>
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/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="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>
+ <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" style="width:190px;">
+ </div>
+ </div>-->
+ <div class="layui-inline">
+ <label class="layui-form-label">鏉″舰鐮�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HBarCode" id="HBarCode" 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">
+ <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="MaterialCode" id="MaterialCode" style="width:190px;">
+ </div>
+ </div>-->
+ <!--<hr />-->
+ <!--<div class="layui-inline">
+ <label class="layui-form-label">鐗╂枡鍚嶇О</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="MaterialName" id="MaterialName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">瑙勬牸鍨嬪彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">婧愬崟鍗曞彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Warehouse" id="Warehouse" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="Hmaker" id="Hmaker" style="width:190px;">
+ </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-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ </div>
+ </script>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <script>
+ var cols_arr = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var cols_arr1 = []; //瀛樺偍琛ㄦ牸澶寸殑鏁扮粍
+ var table = null;
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ //#region 鍏叡鍙橀噺
+ 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 HBarCode = "";
+ //var HEndDate = "";
+ //var HSupName = "";
+ var resultTableHead = []; //鑾峰彇鍒楄〃澶村瓧娈佃嚜瀹氫箟鍒楁暟缁�
+
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍔犺浇
+
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
+ //鍒濆鍖栫晫闈�
+ set_ClearBill(HBarCode);
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ // 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+ // 閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ // 鍒濆鍖栫晫闈�
+ function set_ClearBill(HBarCode) {
+ resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
+ //鍒濆鏌ヨ
+ get_Display(HBarCode);
+
+ }
+
+ // 鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ //laydate.render({
+ // elem: '#HStartDate'
+ //});
+ //laydate.render({
+ // elem: '#HEndDate'
+ //});
+ //$("#HStartDate").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(HBarCode) {
+ //#region
+ //option = {
+ // elem: '#mainTable'
+ // , toolbar: '#toolbarDemo'
+ // , height: 'full-50'
+ // , page: true
+ // , cellMinWidth: 90
+ // , limits: [50, 500, 1000, 5000, 10000]
+ // , limit: 50
+ // , cols: [[
+ // { field: 'HitemID', title: '鍗曟嵁ID', hide: true }
+ // , { field: '妯″潡绫诲瀷', title: '妯″潡绫诲瀷', width: 160 }
+ // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160 }
+ // , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 160}
+ // , { field: '鏉″舰鐮�', title: '鏉″舰鐮�', width: 200 }
+ // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 200 }
+ // , { field: '浠撳簱', title: '浠撳簱', width: 200 }
+ // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200 }
+ // , { field: '鐘舵��', title: '鐘舵��', width: 200 }
+ // , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ // , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 200 }
+ // , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 115 }
+ // , { field: '鏁伴噺', title: '鏁伴噺', width: 120}
+ // , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 200 }
+ // , { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 200 }
+ // , { field: '婧愬崟涓诲唴鐮�', title: '婧愬崟涓诲唴鐮�', width: 200 }
+ // , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 200 }
+ // , { field: '鎵规', title: '鎵规', width: 200 }
+ // ]]
+ //};
+ //#endregion
+
+ //濉厖琛ㄦ牸澶存暟缁�
+ var data = resultTableHead;
+
+ cols_arr[0] = [];
+ cols_arr[0][0] = { checkbox: true, fixed: true, totalRowText: '鍚堣' };
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'HItemID') {
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', hide: true }; //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].name) {
+ //int
+ case '鏁伴噺':
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ break;
+ //Decimal
+ //case 'Decimal':
+ // cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', totalRow: true, sort: true };
+ // break;
+ default:
+ cols_arr[0][i + 1] = { field: data[i].id, title: data[i].name, align: 'center', sort: true };
+ }
+ }
+ }
+ //濉厖琛ㄦ牸鏁版嵁
+ table.render({
+ elem: '#mainTable',
+ url: GetWEBURL() + '/KF_PonderationBill/PonderationBillList',
+ toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
+ title: '鎵爜寮傚父璁板綍鏄庣粏琛�',
+ cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
+ id: 'mainTable', //琛ㄦ牸id
+ where: { "HbarCode": HBarCode }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
+ page: false, //鍏抽棴鍒嗛〉
+ totalRow: true, //寮�鍚悎璁�
+ limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ limits: [50, 100, 300, 500, 1000, 5000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
+ method: 'get', //鎻愪氦鏂瑰紡
+ layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
+ parseData: function (res) { //res 涓鸿繑鍥炵殑鏁版嵁
+ if (res.code == "0") {
+ return {
+ "msg": res.Message
+ }
+ }
+ },
+ response: {
+ statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
+ },
+ done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
+ }
+ });
+ }
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(HBarCode) {
+ var ajaxLoad = layer.load();
+
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/KF_PonderationBill/PonderationBillList',
+ type: "GET",
+ data: { "HbarCode": HBarCode },
+ async: false,
+ dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
+ success: function (data1) {
+ for (var key in data1.list) {
+ resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ set_InitGrid(HBarCode);
+ }, error: function (err) {
+ layer.alert(err.Message, { icon: 5 });
+ }
+ });
+ }
+
+ // 閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ //$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ //$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+ //$("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HBarCode").val();//鏉″舰鐮�
+ //$("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ //$("#MaterialName").val();//鐗╂枡鍚嶇О
+ //$("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ //$("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ //$("#Warehouse").val();//浠撳簱
+ //$("#Hmaker").val();//鍒跺崟浜�
+ /* sWhere = "";*/
+ get_FastQuery();
+ }
+
+ // 蹇�熻繃婊�
+ function get_FastQuery() {
+ var HBarCode = $("#HBarCode").val();//鏉″舰鐮�
+ set_ClearBill(HBarCode);
+
+ }
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+ </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/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
index c44fdc4..0f73204 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\346\212\245\350\241\250/ReportInventoryAccount.html"
@@ -236,6 +236,7 @@
}
}
}
+
//濉厖琛ㄦ牸鏁版嵁
table.render({
elem: '#layTable',
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index 7a677dd..c11d630 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -56,6 +56,10 @@
<button type="button" class="layui-btn layui-btn-sm" lay-event="set_DeleteBill"><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>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-audit"><i class="layui-icon layui-icon-repeat"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Faudit"><i class="layui-icon layui-icon-refresh"></i>鍙嶅鏍�</button>
</div>
</script>
@@ -69,7 +73,9 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -81,7 +87,7 @@
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
var option = [];
-
+ //#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -89,6 +95,8 @@
set_ClearBill();
//#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
@@ -116,6 +124,24 @@
//#endregion
+ //#region 鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+
+ get_FastQuery();
+ });
+ //#endregion
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
+ set_ClearQuery();
+ });
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
@@ -124,6 +150,7 @@
get_Display(sWhere);
}
//#endregion
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -185,27 +212,6 @@
]]
};
}
- //var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- //$.ajax({
- // //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- // url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
- // 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 });
- // }
- //});
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
@@ -214,22 +220,6 @@
sWhere = "";
}
//#endregion
-
- //#region 鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
-
- get_FastQuery();
- });
- //#endregion
-
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#hnumber").val("");//鐗╂枡
- $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
- $("#btnSearch").click();
- set_ClearQuery();
- });
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -257,7 +247,6 @@
});
}
//#endregion
-
//#region 蹇�熻繃婊�
function get_FastQuery() {
@@ -291,7 +280,6 @@
})
}
//#endregion
-
//#region 缂栬緫
function set_ShowBill() {
@@ -356,8 +344,6 @@
}
//#endregion
-
-
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
@@ -365,6 +351,8 @@
}
//#endregion
+ //#endregion
+
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
index ea15dfa..43d122b 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\351\200\200\350\264\247\345\215\225/Add_Edit_Kf_ICStockBillMainList.html"
@@ -13,24 +13,15 @@
<script src="../../../layuiadmin/PubCustom.js"></script>
<script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
<style type="text/css">
+
+ /*begin 姝ゆ牱寮忕敤浜庢秷闄よ鍏冪礌涓竷灞�瀹藉害涓嶅鐨勯棶棰�*/
.layui-form-item .layui-inline {
- margin-right: 0;
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-right: 0px;
}
+ /*end*/
- 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>
@@ -44,219 +35,154 @@
<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="HEmpName" id="HEmpName" readonly class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
- </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="HSupName" readonly id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-card-body">
+ <div class="layui-tab layui-tab-brief" lay-filter="docDemoTabBrief">
+ <h1 style="text-align:center;"><b>閿�鍞��璐у崟</b></h1>
+ <div class="layui-tab-content">
+ <!--鍩烘湰淇℃伅-->
+ <div class="layui-tab-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>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱</label>
- <div class="layui-input-inline">
- <input type="text" name="HWHName" readonly id="HWHName" 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="HWHList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <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>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆</label>
- <div class="layui-input-inline">
- <input type="text" name="HCurName" readonly id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HCurList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <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" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</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 class="layui-input" name="HExRate" id="HExRate" 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="HDeptName" readonly 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="HDeptList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <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="HSupName" readonly id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>-->
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">浠撳簱</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HWHName" readonly id="HWHName" 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="HWHList" 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-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
- <div class="layui-input-inline">
- <input type="text" name="HManagerName" readonly id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鍒跺崟浜�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HMakerName" readonly id="HMakerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HMaker" id="HMaker" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
</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="HSourceBillType" id="HSourceBillType">
- <option value="2">閿�鍞换鍔″崟</option>
- <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
- </select>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閫夊崟鍙�</label>
- <div class="layui-input-inline">
- <input type="text" name="Hbillid" id="Hbillid" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="Hmainid" id="Hmainid" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" id="Xs_SeOutStockBackBillList" lay-filter="Xs_SeOutStockBackBillList" 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 class="layui-input" name="HAddress" id="HAddress" 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 class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
- </div>
- </div>
- </div>
- <div class="layui-row">
- <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>
- </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 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 class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">瀹㈡埛</label>
+ <div class="layui-input-inline">
+ <input type="text" name="HSupName" readonly id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupIDList" 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-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 class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">姹囩巼</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HExRate" id="HExRate" 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="HDeptName" readonly 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="HDeptList" 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" name="HManagerName" readonly id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HManagerList" 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="HSourceBillType" id="HSourceBillType">
+ <option value="2">閿�鍞换鍔″崟</option>
+ <option value="1" selected="selected">鎵嬪伐褰曞叆</option>
+ </select>
+ </div>
+ </div>-->
+ <!--<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">閫夊崟鍙�</label>
+ <div class="layui-input-inline">
+ <input type="text" name="Hbillid" id="Hbillid" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="Hmainid" id="Hmainid" class="layui-input" value="" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" id="Xs_SeOutStockBackBillList" lay-filter="Xs_SeOutStockBackBillList" 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 class="layui-input" name="HAddress" id="HAddress" 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 class="layui-input" name="HInnerBillNo" id="HInnerBillNo" autocomplete="off">
+ </div>
+ </div>-->
+ </div>
+ <div class="layui-row">
+ <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>
@@ -264,16 +190,28 @@
</div>
</div>
</div>
- </div>
- <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" lay-filter="TabTest">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏄庣粏淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <table class="layui-hide" id="mainTable" lay-filter="mainTable"></table>
+ </div>
+ <div class="layui-tab-item">
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+ </div>
<script type="text/html" id="toolbarDemo">
- <!--<div class="layui-btn-container">
+ <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>-->
+ </div>
</script>
<script type="text/html" id="xuhao">
{{d.LAY_TABLE_INDEX+1}}
@@ -299,12 +237,11 @@
, table = layui.table
, form = layui.form
, element = layui.element;
+
+ var option = [];
var sWhere = "";
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
+ var sBillType = "1247";
+
//#endregion
@@ -312,8 +249,8 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
//get_LoginIs();
-
-
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -325,27 +262,15 @@
var HSouceBillType = params[params[2]];//婧愬崟绫诲瀷
}
//鍒ゆ柇鎿嶄綔绫诲瀷
- if (OperationType == 1) {//鏃犳簮鍗曟柊澧�
- $("#HItemID").val(0);
+ if (OperationType == 1) {//鏃犳簮鏂板
+ set_AddFNew();
}
else if (OperationType == 3) {//缂栬緫
- $("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
- }
- else if (OperationType == 4) {//娴忚
- $("#HItemID").val(linterid);//
- //缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
- RoadBillMain(linterid);
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);//淇濆瓨鍚庡姞杞芥暟鎹椂淇濆瓨鎸夐挳绂佺敤
+ set_EditFromGrid(linterid);
}
else {
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
- $("#HUSEORGID").val(sessionStorage["OrganizationID"]);
- //鍒ゆ柇鏄惁婧愬崟鏂板銆佹垨鑰呯紪杈�
- set_CheckSelect();
-
//#endregion
@@ -361,19 +286,11 @@
form.on('submit(HEmpList)', function () {
get_checkEmp();
});
- //閫夋嫨渚涘簲鍟嗘寜閽�
- form.on('submit(HSupList)', function () {
- get_checkSup();
- });
- //閫夋嫨閮ㄩ棬鎸夐挳
+
+ //閫夋嫨浠撳簱鎸夐挳
form.on('submit(HWHList)', function () {
get_checkWH();
});
- //閫夋嫨甯佸埆鎸夐挳
- form.on('submit(HCurList)', function () {
- get_checkCur();
- });
-
//閫夋嫨閮ㄩ棬鎸夐挳
form.on('submit(HDeptList)', function () {
get_checkDept();
@@ -383,12 +300,10 @@
form.on('submit(HManagerList)', function () {
get_checkManager();
});
-
- //閫夋嫨閫夊崟鍙锋寜閽�
- form.on('submit(Xs_SeOutStockBackBillList)', function () {
- get_CheckSeOutStockBackBill();
+ //閫夋嫨瀹㈡埛鎸夐挳
+ form.on('submit(HSupIDList)', function () {
+ get_checkHSupIDList();
});
-
//淇濆瓨鎸夐挳
form.on('submit(set_SaveBill)', function (data) {
@@ -417,6 +332,23 @@
form.on('select(HSourceBillType)', function (data) {
set_CheckSelect();
})
+
+ //澶村伐鍏锋爮
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;;
+ var AddRow = table.cache['mainTable'];
+ var NewRow = { "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" };
+ console.log(NewRow);
+ switch (obj.event) {
+ //鏂板涓�琛�
+ case 'btn-AddLine': btnAddLine(NewRow);
+ break;
+ //澶嶅埗涓�琛�
+ case 'btn-CopyLine': btnCopyLine(data);
+ break;
+ }
+ });
//#endregion
@@ -490,33 +422,7 @@
});
}
- var date = new Date();
- var day = date.getDate();
- var month = date.getMonth() + 1;
- var year = date.getFullYear();
- var shijian = year + "-" + month + "-" + day;
- //鍒ゆ柇鏄惁鏂板
- if (linterid == null || linterid == 0) {
- //鑾峰彇鏈�澶у崟鎹彿 new
- $("#HInterID").val("0");
- $("#HBillNo").val("");
- $.ajax({
- url: GetWEBURL() + "/Web/GetMAXNum",
- type: "GET",
- data: { "HBillType": '1103' },
- success: function (d) {
- //console.log(d.data);
- $("#HBillNo").val(d.data[0].HBillNo);
- $("#HDate").val(shijian);
- $("#HInterID").val();
- }
- });
- }
- else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid);
- //RoadBillSub(linterid);
- }
//鏃ユ湡鏍煎紡鍖�
function formatDate(date) {
var d = new Date(date),
@@ -674,30 +580,6 @@
})
}
- //鐩戣涓嬫媺妗嗘槸鍚︽簮鍗�
- function set_CheckSelect() {
-
- Sctag = $("#HSourceBillType").val();
- form.render('select');
- switch (Sctag) {
- //鏃犳簮鍗曟柊澧�
- case '1':
- $("#Hmainid").val("0");//id
- $("#Hbillid").val("");//鏂囨湰
- $('#Hbillid').attr("disabled", false);//鏂囨湰妗嗕笉绂佺敤
- $('#Xs_SeOutStockBackBillList').addClass("layui-btn-disabled").attr("disabled", true);//鎸夐挳绂佺敤
- OperationType = 1;
- break;
- //鏈夋簮鍗曟柊澧�
- case '2':
- $("#Hmainid").val("0");//id
- $("#Hbillid").val("");//鏂囨湰
- $('#Hbillid').attr("disabled", true);//鏂囨湰妗嗙鐢�
- $('#Xs_SeOutStockBackBillList').removeClass("layui-btn-disabled").attr("disabled", false);//鎸夐挳涓嶇鐢�
- OperationType = 2;
- break;
- }
- }
//閫夊崟鍙�
function get_CheckSeOutStockBackBill() {
layer.open({
@@ -721,7 +603,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //閫夋嫨涓荤
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -744,7 +626,29 @@
, btn2: function (index, layero) { }
})
}
-
+ //閫夋嫨瀹㈡埛
+ function get_checkHSupIDList() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '瀹㈡埛鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../PublicPage/CustomerInformation.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HSupName").val(checkStatus.data[0].HName);
+ $("#HSupID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
//淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
@@ -753,21 +657,13 @@
}
//鏁版嵁楠岃瘉
function AllowLoadData() {
-
+
if ($("#HEmpID").val() == "" || $("#HEmpID").val() == null) {
layer.msg("涓氬姟鍛樹笉鑳戒负绌�");
return false;
}
- if ($("#HSupID").val() == "" || $("#HSupID").val() == null) {
- layer.msg("渚涘簲鍟嗕笉鑳戒负绌�");
- return false;
- }
if ($("#HWHID").val() == "" || $("#HWHID").val() == null) {
layer.msg("浠撳簱涓嶈兘涓虹┖");
- return false;
- }
- if ($("#HCurID").val() == "" || $("#HCurID").val() == null) {
- layer.msg("甯佸埆涓嶈兘涓虹┖");
return false;
}
if ($("#HDeptID").val() == "" || $("#HDeptID").val() == null) {
@@ -778,13 +674,128 @@
layer.msg("涓荤涓嶈兘涓虹┖");
return false;
}
- if ($("#Hbillid").val() == "" || $("#Hbillid").val() == null) {
- layer.msg("閫夊崟鍙蜂笉鑳戒负绌�");
- return false;
- }
return true;
}
+ //鍒濆鍖栨槑缁嗚〃鏍�
+ function set_InitGrid() {
+ columns = [
+ { type: 'checkbox', fixed: 'left' }
+ , { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", 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: 'HBatchNo', 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: 'HDesignLife', title: '璁捐瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HLeaveLife', title: '鍓╀綑瀵垮懡', edit: 'text', width: 100 }
+ , { field: 'HUseLife', title: '浣跨敤瀵垮懡', edit: 'text', width: 100 }
+ , { 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: 'HWHID', title: 'HWHID', edit: 'text', width: 100, hide: true }
+ , { field: 'HWHCode', title: '鏀舵枡浠撳簱浠ｇ爜', edit: 'text', event: 'HWHCode', width: 120 }
+ , { field: 'HWHName', title: '鏀舵枡浠撳簱鍚嶇О', edit: 'text', width: 120 }
+ , { 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: 120 }
+ , { field: 'HStockOrgID', title: 'HStockOrgID', width: 100, hide: true }
+ , { field: 'HRemark', title: '澶囨敞', edit: 'text', width: 100 }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
+ ];
+ option = {
+ id: 'mainTable'
+ , elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , page: false
+ , cellMinWidth: 120
+ , height: 500
+ , cols: [columns]
+ , limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , done: function (res, curr, count) {
+ }
+ };
+ }
+
+ //鏃犳簮鍗曟柊澧�
+ function set_AddFNew() {
+ //鑾峰彇鏈�澶у崟鎹彿
+ get_MAXNum();
+ option.data = [{ "HMaterID": 0, "HMaterCode": "", "HMaterName": "", "HMaterSpec": "", "HBatchNo": "", "HUnitID": 0, "HUnitCode": "", "HUnitName": "", "HDesignLife": 0, "HLeaveLife": 0, "HUseLife": 0, "HQtyMust": 0, "HQty": 0, "HPrice": 0, "HMoney": 0, "HWHID": 0, "HWHCode": "", "HWHName": "", "HSPID": 0, "HSPCode": "", "HSPName": "", "HStockOrgID": sessionStorage["OrganizationID"], "HRemark": "" }];
+ table.render(option);
+ }
+
+ //鑾峰彇鏈�澶у崟鎹彿
+ function get_MAXNum() {
+ var date = new Date();
+ var day = date.getDate();
+ var month = date.getMonth() + 1;
+ var year = date.getFullYear();
+ var shijian = year + "-" + month + "-" + day;
+
+ //鍒ゆ柇鏄惁鏂板
+ if (linterid == null || linterid == 0) {
+ //鑾峰彇鏈�澶у崟鎹彿 new
+ $("#HInterID").val("0");
+ $("#HBillNo").val("");
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ data: { "HBillType": '1247' },
+ success: function (d) {
+ //console.log(d.data);
+ $("#HBillNo").val(d.data[0].HBillNo);
+ $("#HDate").val(shijian);
+ $("#HInterID").val();
+ }
+ });
+ }
+ else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
+ RoadBillMain(linterid);
+ //RoadBillSub(linterid);
+ }
+ }
+
+ //澧炲姞涓�琛�
+ function btnAddLine(NewRow) {
+ //var tableBak = table.cache["mainTable"]; //鑾峰彇涔嬪墠缂栬緫杩囩殑琛ㄦ牸鏁版嵁
+ //buttonArr = [];//娓呯┖鏁扮粍
+ //for (var i = 0; i < tableBak.length; i++) {
+ // buttonArr.push(tableBak[i]); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ //}
+ //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ //table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ //})
+ //table.cache["mainTable"].push(AddRow[rows]);
+ table.cache["mainTable"].push(NewRow);
+ option.data = table.cache["mainTable"];
+ table.render(option);
+ rows++;
+ layer.msg('澧炲姞涓�琛屾寜閽紒')
+ }
+ //澶嶅埗涓�琛�
+ function btnCopyLine(data) {
+ var copydata = JSON.stringify(data);
+ if (data.length <= 0) {
+ layer.msg("璇烽�夋嫨闇�瑕佸鍒剁殑涓�琛岋紒");
+ }
+ else if (data.length > 1) {
+ layer.msg("鍙兘閫夋嫨澶嶅埗涓�琛岋紒");
+ }
+ else {
+ var copydata2 = copydata.substring(1, copydata.length);//鍘婚櫎棣栬瀛楃'['
+ var copyrow = copydata2.substring(0, copydata2.length - 1);//鍘婚櫎鏈熬瀛楃']'
+ table.cache["mainTable"].push(JSON.parse(copyrow));//灏嗗鍒剁殑琛屽己杞垚json杩藉姞鍒拌〃鏍间笂
+ option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);//灏嗘暟鎹覆鏌撳埌琛ㄦ牸涓�
+ }
+ }
+
//#endregion
--
Gitblit v1.9.1