From 1382e7f901677dce9db97ba25d9095668c1cb67f Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 10 三月 2021 19:49:36 +0800
Subject: [PATCH] 2021-03-10统一更新
---
WebTM/views/仓存管理/仓库调拨/Kf_LookingForBillList.html | 179 +++++++++++++++++++++++++++++------------------------------
1 files changed, 88 insertions(+), 91 deletions(-)
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/Cc_LookingForBillList.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_LookingForBillList.html"
similarity index 60%
rename from "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/Cc_LookingForBillList.html"
rename to "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_LookingForBillList.html"
index 6af06c4..5e10fc2 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/Cc_LookingForBillList.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_LookingForBillList.html"
@@ -2,14 +2,18 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<title>涓嬫灦鎵捐揣鍗曞垪琛�</title>
+<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>
-
+ <style type="text/css">
+ input.layui-input.layui-unselect {
+ padding-right: 0;
+ }
+ </style>
</head>
<body>
<div class="layui-fluid">
@@ -25,9 +29,10 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width:60px;padding-left:0px;">鍗曟嵁绫诲瀷</label>
+ <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>
@@ -40,26 +45,19 @@
</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="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo">
+ <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">
<div class="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="HCreateBy" id="HCreateBy">
</div>
</div>
<div class="layui-inline">
@@ -99,79 +97,54 @@
<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/zgqCustom/zgqCustom.js"></script>
<script>
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage','laydate'], function () {
+ }).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 = " 浜у搧浠ｇ爜 = 'BX0002'";
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ //鏌ヨ鏉′欢
var sWhere = "";
var option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- ,height: 'full-50'
+ , height: 'full-50'
, page: true
- ,cellMinWidth: 90
+ , cellMinWidth: 90
, cols: [[
- //{ field: 'hmainid', title: 'hmainid', width: 110 }
- { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
- , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170 }
- //, { field: 'hmaterid', title: 'hmaterid', width: 165 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 115 }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '榛樿宸ヨ壓', title: '榛樿宸ヨ壓' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- //, { field: 'hsubid', title: 'hsubid', width: 80 }
- , { field: '宸ュ簭鍙�', title: '宸ュ簭鍙�' }
- , { field: '濮斿鏍囪', title: '濮斿鏍囪' }
- //, { field: 'hprocid', title: 'hprocid', width: 105 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
- , { field: '宸ュ簭', title: '宸ュ簭' }
- //, { field: 'HSupID', title: 'HSupID', width: 105 }
- , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�' }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�' }
- //, { field: 'HCenterID', title: 'HCenterID', width: 105 }
- , { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
- , { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О', width: 115 }
- , { field: '鏃堕棿鍗曚綅', title: '鏃堕棿鍗曚綅' }
- , { field: '杩愯鏃堕棿', title: '杩愯鏃堕棿' }
- , { field: '鍔犲伐鏁伴噺', title: '鍔犲伐鏁伴噺' }
- , { field: '鍑嗗鏃堕棿', title: '鍑嗗鏃堕棿' }
- , { field: '鎺掗槦鏃堕棿', title: '鎺掗槦鏃堕棿' }
- , { field: '杞Щ鏃堕棿', title: '杞Щ鏃堕棿' }
- , { field: '鑹巼', title: '鑹巼' }
- , { field: '绱鑹巼', title: '绱鑹巼' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '淇敼浜�', title: '淇敼浜�' }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡' }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
- //, { field: 'HDayWorkQty', title: 'HDayWorkQty', width: 105 }
- //, { field: 'HGroupID', title: 'HGroupID', width: 105 }
- //, { field: 'HWorkerID', title: 'HWorkerID', width: 105 }
- //, { field: 'HSourceID', title: 'HSourceID', width: 105 }
- , { field: '鍔犲伐鍗曚环', title: '鍔犲伐鍗曚环' }
- //, { field: 'HNextProcFlag', title: 'HNextProcFlag', width: 105 }
- , { field: '涓嬮亾娴佽浆宸ュ簭', title: '涓嬮亾娴佽浆宸ュ簭'}
- , { field: '娴佽浆宸ュ簭', title: '娴佽浆宸ュ簭' }
+ { field: 'HInterID', title: '鍗曟嵁ID', hide: true }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�',width: 160 }
+ , { field: 'HStatus', title: '鍦ㄥ簱鐘舵��', width: 200 }
+ , { field: 'HGroupID', title: '鐝粍ID', hide: true }
+ , { field: 'HGroup', title: '鐝粍' }
+ , { field: 'HSourceID', title: '鐢熶骇璧勬簮ID', hide: true }
+ , { field: 'HSource', title: '鐢熶骇璧勬簮', width: 115 }
+ , { field: 'HCreateBy', title: '鍒跺崟浜�' }
+ , {
+ field: 'HCreateDate', title: '鍒跺崟鏃堕棿', width: 110, templet: function (d) {
+ if (d.HCreateDate == null) {
+ return "";
+ }
+ return util.toDateString(d.HCreateDate, "yyyy-MM-dd");
+ }
+ }
+ , { field: 'HMaterID', title: '鐗╂枡ID', hide: true }
+ , { field: 'HMaterNumber', title: '鐗╂枡缂栫爜', width: 130 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 120 }
+ , { field: 'HMaterModel', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'HBarCode', title: '鏉＄爜', width: 175 }
+ , { field: 'HBarCodeType', title: '鏉＄爜绫诲瀷' }
]]
};
@@ -179,9 +152,9 @@
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: GetWEBURL() + '/LookingFor/GetLookingForBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "HBillType": "" },
success: function (data1) {
if (data1.count == 1) {
option.data = data1.data;
@@ -195,48 +168,72 @@
layer.close(index);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- });
+ });
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#hnumber").val("");//鐗╂枡
- $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#HBillType").val("");//鍗曟嵁绫诲瀷
+ $("#HBillNo").val("");//鍗曟嵁鍙�
+ $("#HSourceBillNo").val("");//婧愬崟鍙�
+ $("#HCreateBy").val("");//鍒跺崟浜�
+ $("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ $("#EndHCreateDate").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 + "%'";
+ 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 (hnumber) {
- sWhere += " and 鐗╂枡浠ｇ爜 like '%" + hnumber + "%' or 鐗╂枡鍚嶇О like '%" + hnumber + "%'"
+ if (HCreateBy) {
+ sWhere += " and HCreateBy like '%" + HCreateBy + "%'";
}
- if (WorkCenter) {
- sWhere += " and 鍗曟嵁鍙� like '%" + WorkCenter + "%'";
+ 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() + '/LEMS/MES_Gy_RoutingBillList_Json',
+ url: GetWEBURL1() + '/LookingFor/GetLookingForBillList',
type: "GET",
- data: { "sWhere": sWhere },
+ data: { "sWhere": sWhere, "HBillType": HBillType },
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 });
}
});
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ //$("#HBillType").val("");//鍗曟嵁绫诲瀷
+ //$("#HBillNo").val("");//鍗曟嵁鍙�
+ //$("#HSourceBillNo").val("");//婧愬崟鍙�
+ //$("#HCreateBy").val("");//鍒跺崟浜�
+ //$("#BenginHCreateDate").val("");//寮�濮嬪埗鍗曟椂闂�
+ //$("#EndHCreateDate").val("");//缁撴潫鍒跺崟鏃堕棿
+ });
+
+ //鐩戝惉琛屽弻鍑讳簨浠�
+ table.on('rowDouble(mainTable)', function (obj) {
+ layer.alert("鍙屽嚮浜嬩欢", { icon: 1 });
});
@@ -251,7 +248,7 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
+
</script>
--
Gitblit v1.9.1