From 2eafe8be7e906512b7235cebdc2b5f4b56286c76 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 10 一月 2022 10:57:43 +0800
Subject: [PATCH] 完善 生产用料清单 组装追溯单 不良品处理单
---
WebTM/views/生产工序管理/增加不良评审单/QC_NoPassProdCheckBillList.html | 496 +++++++++++++----------
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 351 +++++++++++-----
WebTM/views/销售管理/销售退货单/Kf_ICStockBillMainList.html | 14
WebTM/views/生产管理/组装单/Sc_GroupOrderBillList.html | 387 +++++++++++------
4 files changed, 758 insertions(+), 490 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html" "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
index 9ad904b..3e63ecf 100644
--- "a/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\345\267\245\345\272\217\347\256\241\347\220\206/\345\242\236\345\212\240\344\270\215\350\211\257\350\257\204\345\256\241\345\215\225/QC_NoPassProdCheckBillList.html"
@@ -1,7 +1,7 @@
锘�<!DOCTYPE html>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+ <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">
@@ -9,7 +9,11 @@
<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>
</head>
<body>
<div class="layui-fluid">
@@ -27,49 +31,83 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" id="HDate">
+ <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="HDate1">
+ <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-inline">
+ <label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" name="HOrderProcNO" id="HOrderProcNO">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
- </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-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="text" class="layui-input" name="WorkCenter" id="WorkCenter">
+ <input type="text" class="layui-input" name="HDeptID" id="HDeptID" style="width:190px;">
</div>
</div>
- </div>-->
+ <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-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-Add"><i class="layui-icon layui-icon-form"></i>娣诲姞</button>
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="add"><i class="layui-icon"></i>娣诲姞</button>-->
-
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -78,72 +116,232 @@
</div>
</div>
- <script type="text/html" id="barDemo">
+ <!--<script type="text/html" id="barDemo">
<a class="layui-btn layui-btn-xs" lay-event="edit">缂栬緫</a>
<a class="layui-btn layui-btn-danger layui-btn-xs" lay-event="del">鍒犻櫎</a>
-</script>
- <script src="../../../layuiadmin/layui/layui.js"></script>
- <script src="../../../layuiadmin/Scripts/json2.js"></script>
- <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
- <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+</script>-->
+
+
<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 () {
+
+ //#region 鍏叡鍙橀噺
+
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , table = layui.table
- , form = layui.form
- , element = layui.element
- , laypage = layui.laypage
- , laydate = layui.laydate
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
//var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
+ var option = [];
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- ,height: 'full-50'
- , page: true
- ,cellMinWidth: 90
- , cols: [[
- //{ type: 'checkbox' }
-
- { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120 }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: '鐢熶骇璧勬簮鍚嶇О ', title: '鐢熶骇璧勬簮鍚嶇О ', width: 115 }
- , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
- , { field: '鐗╂枡鍐呯爜', title: '鐗╂枡鍐呯爜', width: 100 }
- , { 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: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
- , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
+ //#endregion
- //,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
- ]]
- };
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
-
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //澶村伐鍏锋爮浜嬩欢
+ table.on('toolbar(mainTable)', function (obj) {
+ var checkStatus = table.checkStatus(obj.config.id);
+ switch (obj.event) {
+ case 'btn-Add':
+ layer.open({
+ type: 2 //Page灞傜被鍨�
+ , area: ['100%', '100%']
+ , title: '鏂板娲惧伐鍗�'
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: ['../澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html', 'yes']
+ , resize: false
+ , cancel: function () {
+ //$(".layui-btn").removeClass("layui-btn-disabled");
+ }
+
+ });
+ break;
+ case '':
+ layer.msg('');
+ break;
+
+ };
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
+ get_FastQuery();
+ });
+
+ //#endregion
+
+ //#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: [[
+ //{ type: 'checkbox' }
+ { field: 'hmainid', title: 'hmainid', sort: true, fixed: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 170 }
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
+ , { field: '鐢熶骇璧勬簮鍚嶇О ', title: '鐢熶骇璧勬簮鍚嶇О ', width: 115 }
+ , { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
+ , { field: '鐗╂枡鍐呯爜', title: '鐗╂枡鍐呯爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: '妫�楠屽憳浠ｇ爜', title: '妫�楠屽憳浠ｇ爜' }
+ , { field: '妫�楠屽憳鍚嶇О', title: '妫�楠屽憳鍚嶇О' }
+ , { field: '鍗曚綅浠ｇ爜', title: '鍗曚綅浠ｇ爜' }
+ , { field: '鍗曚綅鍚嶇О', title: '鍗曚綅鍚嶇О' }
+ , { field: '涓嶈壇鍘熷洜浠ｇ爜 ', title: '涓嶈壇鍘熷洜浠ｇ爜' }
+ , { field: '涓嶈壇鍘熷洜', title: '涓嶈壇鍘熷洜' }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>"}
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
+ , { field: '淇敼浜�', title: '淇敼浜�' }
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�' }
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡' }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�' }
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡' }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { field: 'hsubid', title: 'hsubid', fixed: true, hide: true }
+
+ //,{fixed: 'right', title:'鎿嶄綔', toolbar: '#barDemo', width:150}
+ ]]
+ };
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var index0 = layer.load(0, { shade: false });
+ $.ajax({
+ //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
+ url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(index0);
+ } else {
+ layer.close(index0);
+ layer.msg(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(index0);
+ 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 = "";
+ }
+
+ //#endregion
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+
//鐩戝惉琛屽伐鍏蜂簨浠�
//table.on('tool(mainTable)', function(obj){
// var data = obj.data;
@@ -166,154 +364,6 @@
// //layer.alert('鎴戞槸缂栬緫涓�');
// }
//});
- //澶村伐鍏锋爮浜嬩欢
- table.on('toolbar(mainTable)', function (obj) {
- var checkStatus = table.checkStatus(obj.config.id);
- switch (obj.event) {
- case 'btn-Pushdown':
- // var checkStatus = table.checkStatus('mainTable')
- // , data = checkStatus.data;
- // ajaxLabelData = data;
- // var rows = '';
- // var HEntry = '';
- // for (var i = 0; i < data.length; i++) {
- // rows += data[i].hmainid.toString() + ',' ;
-
- // }
-
- // if (checkStatus.data.length < 1)
- // {
- // layer.msg('璇烽�夋嫨涓�琛屾暟鎹笅鎺�');
- // } else
- // {
-
- ////椤甸潰灞�
- //layer.open({
- // type: 2 //Page灞傜被鍨�
- // ,area: ['100%', '100%']
- // ,title: '鏂板娲惧伐鍗�'
- // ,shade: 0.6 //閬僵閫忔槑搴�
- // ,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- // , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- // , content: ['../宸ュ簭娲惧伐鍗�/Sc_Add_ProcessSendWork.html?HInterID=' + data[0].hmainid.toString() + '&lentryid=' + rows.toString().substring(0, rows.length - 1), '&PlanBeginDate=' + data[0].璁″垝寮�宸ユ棩鏈�.toString(), '&PlanEndDate=' + data[0].璁″垝瀹屽伐鏃ユ湡.toString(), 'yes']
- // , resize: false
- // , cancel: function () {
- // //$(".layui-btn").removeClass("layui-btn-disabled");
- // }
-
- // });
-
- // }
- layer.msg('鍝囧挃鍜旓紒锛侊紒锛侊紒锛�');
- break;
- case 'btn-Add':
- layer.open({
- type: 2 //Page灞傜被鍨�
- ,area: ['100%', '100%']
- ,title: '鏂板娲惧伐鍗�'
- ,shade: 0.6 //閬僵閫忔槑搴�
- ,maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../澧炲姞涓嶈壇璇勫鍗�/QC_Add_NoPassProdCheckBill.html' , 'yes']
- , resize: false
- , cancel: function () {
- //$(".layui-btn").removeClass("layui-btn-disabled");
- }
-
- });
- break;
- case '':
- layer.msg('');
- break;
-
- };
- });
-
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- var index0 = layer.load(0, { shade: false });
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index0);
- } else {
- layer.close(index0);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index0);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HDate").val("");//寮�濮嬫棩鏈�
- $("#HDate1").val("");//缁撴潫鏃ユ湡
- //$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
- //$("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#btnSearch").click();
- });
-
- //鏌ヨ鎸夐挳
- form.on('submit(btnSearch)', function (data) {//閫夋嫨浠撲綅
- var HDate = $("#HDate").val();//寮�濮嬫棩鏈�
- var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
- //var HOrderProcNO = $("#HOrderProcNO").val();//璁㈠崟璺熻釜鍙�
- //var WorkCenter = $("#WorkCenter").val();//鍗曟嵁鍙�
- if (HDate) {
- sWhere += " and 鏃ユ湡 >= '" + HDate + "'";
- }
- if (HDate1) {
- sWhere += " and 鏃ユ湡 <= '" + HDate1 + "'";
- }
- //if (HOrderProcNO) {
- // sWhere += " and 璁㈠崟璺熻釜鍙� like '%" + HOrderProcNO + "%'";
- //}
- //if (WorkCenter) {
- // sWhere += " and HBillNo like '%" + WorkCenter + "%'";
- //}
- var index = layer.load(0, { shade: false });
- $.ajax({
- url: GetWEBURL() + '/Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json',
- 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 });
- }
- });
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- });
-
-
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
-
-
- //浠ヤ笂鏄痩ayui妯″潡
- });
-
-
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index fc2fc1d..600e092 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -1,15 +1,20 @@
锘�<!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>
+
</head>
<body>
<div class="layui-fluid">
@@ -21,26 +26,76 @@
<div class="layui-colla-item">
<div class="layui-colla-title layui-inline">
<div class="layui-inline">
- <span></span>
+ <span>鏇村</span>
</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="HBillNo" id="HBillNo">
+ <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" style="width: 85px;">鐗╂枡鍚嶇О</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HMaterialName" id="HMaterialName">
+ <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>
<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="HDeptID" id="HDeptID" 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="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>
@@ -52,6 +107,13 @@
<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-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
@@ -61,112 +123,114 @@
</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 () {
+ }).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
+ , 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 = [];
+ //#endregion
- var option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- ,height: 'full-50'
- , page: true
- ,cellMinWidth: 90
- , cols: [[
- { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡' }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜' }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
- , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
- , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: '涓昏〃璁￠噺鍗曚綅浠ｇ爜', title: '涓昏〃璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '涓昏〃璁￠噺鍗曚綅', title: '涓昏〃璁￠噺鍗曚綅' }
- , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
- , { field: 'hsubid', title: 'hsubid', hide: true }
- , { field: 'hmaterid2', title: 'hmaterid2', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: 'hunitid2', title: 'hunitid2', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '鎹熻�楃巼', title: '鎹熻�楃巼' }
- , { field: 'HWHID', title: 'HWHID', hide: true }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
- , { field: '浠撳簱', title: '浠撳簱' }
- , { field: 'HSPID', title: 'HSPID', hide: true }
- , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜' }
- , { field: '浠撲綅', title: '浠撲綅' }
- , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡' }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- , { field: '璁″垝妯″紡', title: '璁″垝妯″紡' }
- ]]
- };
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
- var index = layer.load(0, { shade: false });
- //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
- $.ajax({
- //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
- url: GetWEBURL() + '/Sc_PPBomBill/list',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.close(index);
- } else {
- layer.close(index);
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(index);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
-
- //閲嶇疆鎸夐挳
- form.on('submit(btnReSearch)', function (data) {
- $("#HNumber").val("");
- $("#HName").val("");
- $("#btnSearch").click();
- });
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var HBillNo = $("#HBillNo").val();
- var HMaterialName = $("#HMaterialName").val();
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
- }
- if (HMaterialName) {
- sWhere += " and 鐗╂枡鍚嶇О like '%" + HMaterialName + "%'";
- }
+ get_FastQuery();
+ });
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
+ });
+
+ //#endregion
+
+ //#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: 'hmainid', sort: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HDeptID', title: 'HDeptID', hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 150 }
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬' }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜' }
+ , { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О' }
+ , { field: '浜у搧瑙勬牸', title: '浜у搧瑙勬牸' }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 150 }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: '涓昏〃璁￠噺鍗曚綅浠ｇ爜', title: '涓昏〃璁￠噺鍗曚綅浠ｇ爜' }
+ , { field: '涓昏〃璁￠噺鍗曚綅', title: '涓昏〃璁￠噺鍗曚綅' }
+ , { field: '鐢熶骇鏁伴噺', title: '鐢熶骇鏁伴噺' }
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: 'hmaterid2', title: 'hmaterid2', hide: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
+ , { field: 'hunitid2', title: 'hunitid2', hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
+ , { field: '鏁伴噺', title: '鏁伴噺' }
+ , { field: '鎹熻�楃巼', title: '鎹熻�楃巼' }
+ , { field: 'HWHID', title: 'HWHID', hide: true }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜' }
+ , { field: '浠撳簱', title: '浠撳簱' }
+ , { field: 'HSPID', title: 'HSPID', hide: true }
+ , { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜' }
+ , { field: '浠撲綅', title: '浠撲綅' }
+ , { field: '鐢熶骇浠诲姟鍗曞彿', title: '鐢熶骇浠诲姟鍗曞彿', width: 150 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 150, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 150, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
+ , { field: '璁″垝妯″紡', title: '璁″垝妯″紡' }
+ ]]
+ };
+ }
+
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ var index = layer.load(0, { shade: false });
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
//url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",
url: GetWEBURL() + '/Sc_PPBomBill/list',
@@ -176,31 +240,84 @@
if (data1.count == 1) {
option.data = data1.data;
table.render(option);
- layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ 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("");//鍒跺崟浜�
- //laydate.render({
- // elem: '#HDate'
- // , type: 'datetime'
- // , trigger: 'click'
- // , format:'yyyy-MM-dd HH:mm'
- //});
+ sWhere = "";
+ }
-
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
</script>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
index f22b022..e93dec6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\273\204\350\243\205\345\215\225/Sc_GroupOrderBillList.html"
@@ -1,15 +1,17 @@
锘�<!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/PubCustom.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+
</head>
<body>
<div class="layui-fluid">
@@ -27,19 +29,19 @@
<div class="layui-inline">
<label class="layui-form-label">寮�濮嬫椂闂�</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" name="寮�濮嬫椂闂�" id="寮�濮嬫椂闂�">
+ <input type="date" class="layui-input" name="HBeginDate" id="HBeginDate">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">缁撴潫鏃堕棿</label>
<div class="layui-input-block">
- <input type="date" class="layui-input" name="缁撴潫鏃堕棿" id="缁撴潫鏃堕棿">
+ <input type="date" class="layui-input" name="HEndDate" id="HEndDate">
</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="缁勬墭鍗曞彿" id="缁勬墭鍗曞彿">
+ <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
@@ -49,27 +51,9 @@
<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="text" class="layui-input" name="鍒跺崟浜�" id="鍒跺崟浜�">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label">缁勬墭鍗曞敮涓�鏉＄爜</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="缁勬墭鍗曞敮涓�鏉＄爜" id="缁勬墭鍗曞敮涓�鏉＄爜">
- </div>
- </div>
- </div>
- <div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <input type="text" class="layui-input" name="缁勬墭鍗曞彿" id="缁勬墭鍗曞彿">
</div>
</div>
<div class="layui-inline">
@@ -84,21 +68,71 @@
<input type="text" class="layui-input" name="鍖呰鍗曞敮涓�鏉＄爜" id="鍖呰鍗曞敮涓�鏉＄爜">
</div>
</div>
- <!--<div class="layui-inline">
+ <div class="layui-inline">
+ <label class="layui-form-label">缁勬墭鍗曞敮涓�鏉＄爜</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" name="缁勬墭鍗曞敮涓�鏉＄爜" id="缁勬墭鍗曞敮涓�鏉＄爜">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">閮ㄩ棬</label>
+ <div class="layui-input-block">
+ <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>
+ <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="hmodel" id="hmodel">
+ <input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
</div>
- </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="layui-form-item" id="mainTable" lay-filter="mainTable"></table>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container layui-form-item">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print">
- <i class="layui-icon layui-icon-file"></i>鎵撳嵃
- </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="Print" id="Print"><i class="layui-icon layui-icon-file"></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-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></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-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
</div>
</script>
</form>
@@ -119,6 +153,9 @@
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+
+ //#region 鍏叡鍙橀噺
+
var $ = layui.$
, admin = layui.admin
, layer = layui.layer
@@ -128,122 +165,27 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util;
- //var sWhere = " 浜у搧浠ｇ爜 = 'BX0002'";
var sWhere = "";
+ var option = [];
- var option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , height: 'full-50'
- , page: true
- , cols: [[
- { type: 'radio' }
- , { field: '缁勬墭鍗曠被鍨�', title: '缁勬墭鍗曠被鍨�', sort: true, hide: true }
- , { field: '缁勬墭鍗曚富ID', title: '缁勬墭鍗曚富ID', sort: true, hide: true }
- , { field: '缁勬墭鍗曞彿', title: '缁勬墭鍗曞彿', sort: true, width:155 }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
- , {
- field: '鍒跺崟鏃堕棿', title: '缁勬墭鏃堕棿', sort: true, templet: function (d) {
- if (d.鍒跺崟鏃堕棿 == null) {
- return "";
- }
- return util.toDateString(d.鍒跺崟鏃堕棿, "yyyy-MM-dd");
- }
- }
- , { field: '缁勬墭鍗曞敮涓�鏉＄爜', title: '缁勬墭鐮�', sort: true }
- , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', sort: true }
- , { field: '鍖呰鍗曠被鍨�', title: '鍖呰鍗曠被鍨�', hide: true }
- , { field: '鍖呰鍗曞敮涓�鏉＄爜', title: '鍖呰鐮�', width: 165 }
- , { toolbar: '#toolBar', title: '鎿嶄綔', width: 115, fixed: 'right' }
- ]]
- , text: {
- none: '鏆傛棤鐩稿叧鏁版嵁锛�'
- }
- };
+ //#endregion
- option.data = [];
- table.render(option);
+ //#region 鍒濆鍖栫晫闈�
+ set_ClearBill();
+ //#endregion
-
- //杩涘叆椤甸潰鏄剧ず鐨勫垪琛�
- layer.load(3);
- $.ajax({
- url: GetWEBURL() + '/GroupOrderBill/List',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- layer.closeAll("loading");
- } else {
- layer.closeAll("loading");
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#寮�濮嬫椂闂�").val("");
- $("#缁撴潫鏃堕棿").val("");
- $("#缁勬墭鍗曞彿").val("");
- $("#鍒跺崟浜�").val("");
- $("#缁勬墭鍗曞敮涓�鏉＄爜").val("");
- $("#鍖呰鍗曞彿").val("");
- $("#鍖呰鍗曞敮涓�鏉＄爜").val("");
- $("#btnSearch").click();
+ //娓呯┖杩囨护鏉′欢
+ set_ClearQuery();
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- var 寮�濮嬫椂闂� = $("#寮�濮嬫椂闂�").val();
- var 缁撴潫鏃堕棿 = $("#缁撴潫鏃堕棿").val();
- var 缁勬墭鍗曞彿 = $("#缁勬墭鍗曞彿").val();
- var 鍒跺崟浜� = $("#鍒跺崟浜�").val();
- var 缁勬墭鍗曞敮涓�鏉＄爜 = $("#缁勬墭鍗曞敮涓�鏉＄爜").val();
- var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
- var 鍖呰鍗曞敮涓�鏉＄爜 = $("#鍖呰鍗曞敮涓�鏉＄爜").val();
- if (寮�濮嬫椂闂�) {
- sWhere += " and 鍒跺崟鏃堕棿 > '" + 寮�濮嬫椂闂� + "'";
- }
- if (缁撴潫鏃堕棿) {
- sWhere += " and 鍒跺崟鏃堕棿 < '" + 缁撴潫鏃堕棿 + "'";
- }
- if (缁勬墭鍗曞彿) {
- sWhere += " and 缁勬墭鍗曞彿 like '%" + 缁勬墭鍗曞彿 + "%'";
- }
- if (鍒跺崟浜�) {
- sWhere += " and 鍒跺崟浜� like '%" + 鍒跺崟浜� + "%'";
- }
- if (缁勬墭鍗曞敮涓�鏉＄爜) {
- sWhere += " and 缁勬墭鍗曞敮涓�鏉＄爜 like '%" + 缁勬墭鍗曞敮涓�鏉＄爜 + "%'";
- }
- if (鍖呰鍗曞彿) {
- sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
- }
- if (鍖呰鍗曞敮涓�鏉＄爜) {
- sWhere += " and 鍖呰鍗曞敮涓�鏉＄爜 like '%" + 鍖呰鍗曞敮涓�鏉＄爜 + "%'";
- }
- $.ajax({
- url: GetWEBURL() + '/GroupOrderBill/List',
- type: "GET",
- data: { "sWhere": sWhere },
- success: function (data1) {
- if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
- //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
- } else {
- layer.alert(data1.code + data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛澶辨晥!", { icon: 5 });
- }
- });
- sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ get_FastQuery();
+
});
//鑾峰彇閫変腑琛屾暟鎹�
table.on('row(mainTable)', function (obj) {
@@ -317,14 +259,173 @@
}
});
+ //#endregion
+ //#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: [[
+ { type: 'radio' }
+ , { field: '缁勬墭鍗曠被鍨�', title: '缁勬墭鍗曠被鍨�', sort: true, hide: true }
+ , { field: '缁勬墭鍗曚富ID', title: '缁勬墭鍗曚富ID', sort: true, hide: true }
+ , { field: '缁勬墭鍗曞彿', title: '缁勬墭鍗曞彿', sort: true, width: 155 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
+ , {
+ field: '鍒跺崟鏃堕棿', title: '缁勬墭鏃堕棿', sort: true, templet: function (d) {
+ if (d.鍒跺崟鏃堕棿 == null) {
+ return "";
+ }
+ return util.toDateString(d.鍒跺崟鏃堕棿, "yyyy-MM-dd");
+ }
+ }
+ , { field: '缁勬墭鍗曞敮涓�鏉＄爜', title: '缁勬墭鐮�', sort: true }
+ , { field: '鍖呰鍗曞彿', title: '鍖呰鍗曞彿', sort: true }
+ , { field: '鍖呰鍗曠被鍨�', title: '鍖呰鍗曠被鍨�', hide: true }
+ , { field: '鍖呰鍗曞敮涓�鏉＄爜', title: '鍖呰鐮�', width: 165 }
+ , { toolbar: '#toolBar', title: '鎿嶄綔', width: 115, fixed: 'right' }
+ ]]
+ , text: {
+ none: '鏆傛棤鐩稿叧鏁版嵁锛�'
+ }
+ };
+ }
+
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ function get_Display(sWhere) {
+ layer.load(3);
+ $.ajax({
+ url: GetWEBURL() + '/GroupOrderBill/List',
+ type: "GET",
+ data: { "sWhere": sWhere },
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.closeAll("loading");
+ } else {
+ layer.closeAll("loading");
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ 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();//鍒跺崟浜�
+
+ var 缁勬墭鍗曞彿 = $("#缁勬墭鍗曞彿").val();
+ var 缁勬墭鍗曞敮涓�鏉＄爜 = $("#缁勬墭鍗曞敮涓�鏉＄爜").val();
+ var 鍖呰鍗曞彿 = $("#鍖呰鍗曞彿").val();
+ var 鍖呰鍗曞敮涓�鏉＄爜 = $("#鍖呰鍗曞敮涓�鏉＄爜").val();
+
+ if (缁勬墭鍗曞彿) {
+ sWhere += " and 缁勬墭鍗曞彿 like '%" + 缁勬墭鍗曞彿 + "%'";
+ }
+
+ if (缁勬墭鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 缁勬墭鍗曞敮涓�鏉＄爜 like '%" + 缁勬墭鍗曞敮涓�鏉＄爜 + "%'";
+ }
+ if (鍖呰鍗曞彿) {
+ sWhere += " and 鍖呰鍗曞彿 like '%" + 鍖呰鍗曞彿 + "%'";
+ }
+ if (鍖呰鍗曞敮涓�鏉＄爜) {
+ sWhere += " and 鍖呰鍗曞敮涓�鏉＄爜 like '%" + 鍖呰鍗曞敮涓�鏉＄爜 + "%'";
+ }
+
+
+ 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() {
+ $("#缁勬墭鍗曞彿").val("");
+ $("#缁勬墭鍗曞敮涓�鏉＄爜").val("");
+ $("#鍖呰鍗曞彿").val("");
+ $("#鍖呰鍗曞敮涓�鏉＄爜").val("");
+ $("#btnSearch").click();
+
+ $("#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 = "";
+ }
+
+ function Print(data) {
+ console.log("data=", data);
+ }
+ //#endregion
+ //option.data = [];
+ //table.render(option);
//浠ヤ笂鏄痩ayui妯″潡
});
-
- function Print(data) {
- console.log("data=", data);
- }
-
</script>
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/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/Kf_ICStockBillMainList.html"
index b1dd755..684760c 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/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/Kf_ICStockBillMainList.html"
@@ -359,13 +359,13 @@
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HBillNo").val("");//鍗曟嵁鍙�
$("#HCusID").val("");//瀹㈡埛
- $("#HDeptID").val();//閮ㄩ棬
- $("#MaterialCode").val();//鐗╂枡浠ｇ爜
- $("#MaterialName").val();//鐗╂枡鍚嶇О
- $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
- $("#HSourceBillNo").val();//婧愬崟鍗曞彿
- $("#Warehouse").val();//浠撳簱
- $("#Hmaker").val();//鍒跺崟浜�
+ $("#HDeptID").val("");//閮ㄩ棬
+ $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
+ $("#MaterialName").val("");//鐗╂枡鍚嶇О
+ $("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
+ $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
+ $("#Warehouse").val("");//浠撳簱
+ $("#Hmaker").val("");//鍒跺崟浜�
sWhere = "";
}
--
Gitblit v1.9.1