From a7c8dbe0a77839bae288815792e57374e4c9aaa5 Mon Sep 17 00:00:00 2001
From: 杨乐 <杨乐@DESKTOP-5CU1TNO>
Date: 星期一, 28 二月 2022 10:43:02 +0800
Subject: [PATCH] 叫料单列表 拣料配送单 叫料退料单 生产日计划单列表
---
WebTM/views/车间管理/叫料管理/Jl_CallGoodsBillMain.html | 20 ++--
WebTM/views/车间管理/叫料管理/叫料退料单/Jl_CallGoodsBillBackMain.html | 73 +++++++-------
WebTM/views/车间管理/叫料管理/拣料配送单/Jl_ComplementGoodsBillMain.html | 52 ++++-----
WebTM/views/index.html | 6
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 10 +-
WebTM/views/车间管理/叫料管理/生产日计划单/Sc_WorkBillAutoSortBillMain.html | 102 ++++++++------------
WebTM/WebTM.csproj | 6
7 files changed, 125 insertions(+), 144 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index fdf6894..c1fc81e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -874,7 +874,10 @@
<Content Include="views\璐ㄩ噺绠＄悊\妫�楠屾柟妗堝崟\QC_CheckProjectList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_FirstPieceCheckBillList.html" />
<Content Include="views\璐ㄩ噺绠＄悊\棣栦欢妫�楠屽崟\QC_Add_Edit_FirstPieceCheckBill.html" />
- <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\Ji_CallGoodsBillMain.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\Jl_CallGoodsBillMain.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鍙枡閫�鏂欏崟\Jl_CallGoodsBillBackMain.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鎷ｆ枡閰嶉�佸崟\Jl_ComplementGoodsBillMain.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鐢熶骇鏃ヨ鍒掑崟\Sc_WorkBillAutoSortBillMain.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_PDA.html" />
<Content Include="views\杞﹂棿绠＄悊\濮斿宸ュ簭鍙戝嚭鍗昞Cj_StationEntrustInBill_Mul.html" />
@@ -1201,7 +1204,6 @@
<ItemGroup>
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曟牳瀵筡" />
<Folder Include="views\浠撳瓨绠＄悊\璋冩嫧鍗曠ń鏍竆" />
- <Folder Include="views\杞﹂棿绠＄悊\鍙枡绠＄悊\鎷ｆ枡閰嶉�佸崟\" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 4d9174d..785566f 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -411,8 +411,10 @@
<dd>
<a>鍙枡绠＄悊</a>
<dl class="layui-nav-child append" id="append">
- <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/Ji_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
- <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鎷ｆ枡閰嶉�佸崟/Ji_CallGoodsBillMain.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/Jl_CallGoodsBillMain.html">鍙枡鍗曞垪琛�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鎷ｆ枡閰嶉�佸崟/Jl_ComplementGoodsBillMain.html">鎷ｆ枡閰嶉�佸崟鍒楄〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鍙枡閫�鏂欏崟/Jl_CallGoodsBillBackMain.html">鍙枡閫�鏂欏崟鍒楄〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍙枡绠＄悊/鐢熶骇鏃ヨ鍒掑崟/Sc_WorkBillAutoSortBillMain.html">鐢熶骇鏃ヨ鍒掑崟鍒楄〃</a></dd>
</dl>
</dd>
</dl>
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 16dc875..c32ae56 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"
@@ -133,10 +133,7 @@
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
- $("#WorkCenter").val("");//鍗曟嵁鍙�
- $("#hnumber").val("");//鐗╂枡
- $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
- $("#btnSearch").click();
+
set_ClearQuery();
});
//#endregion
@@ -217,7 +214,10 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HNumber").val("");
+ $("#WorkCenter").val("");//鍗曟嵁鍙�
+ $("#hnumber").val("");//鐗╂枡
+ $("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
+ $("#btnSearch").click();
$("#HName").val("");
sWhere = "";
}
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
similarity index 96%
rename from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
rename to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
index c1fbc68..f1ace3f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Jl_CallGoodsBillMain.html"
@@ -297,16 +297,16 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val("");//寮�濮嬫椂闂�
- var HEndDate = $("#HEndDate").val("");//缁撴潫鏃堕棿
- var HBillNo = $("#HBillNo").val("");//鍗曟嵁鍙�
- var HDeptID =$("#HDeptID").val("");//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
- var MaterialName =$("#MaterialName").val("");//鐗╂枡鍚嶇О
- var SpecificationModel =$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- var Warehouse = $("#Warehouse").val("");//鍙戞枡浠撳簱
- var HSourceBillNo = $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- var Hmaker =$("#Hmaker").val("");//鍒跺崟浜�
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫椂闂�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID =$("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName =$("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel =$("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var Warehouse = $("#Warehouse").val();//鍙戞枡浠撳簱
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Hmaker =$("#Hmaker").val();//鍒跺崟浜�
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
similarity index 86%
copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
index c1fbc68..5912146 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/Jl_CallGoodsBillBackMain.html"
@@ -2,15 +2,15 @@
<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>
+ <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>
</head>
<body>
<div class="layui-fluid">
@@ -117,7 +117,7 @@
</div>
<script>
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
-
+
var sWhere = "";
var option = [];
//#endregion
@@ -178,6 +178,7 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -228,13 +229,13 @@
, { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 170 }
, { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 170 }
, { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 170 }
- , { field: '鍙枡浜轰唬鐮�', title: '鍙枡浜轰唬鐮�', width: 170 }
- , { field: '鍙枡浜�', title: '鍙枡浜�', width: 170 }
+ , { field: '閫�鏂欎汉浠ｇ爜', title: '閫�鏂欎汉浠ｇ爜', width: 170 }
+ , { field: '閫�鏂欎汉', title: '閫�鏂欎汉', width: 170 }
, { field: '閰嶉�佷汉浠ｇ爜', title: '閰嶉�佷汉浠ｇ爜', width: 170 }
, { field: '閰嶉�佷汉', title: '閰嶉�佷汉', width: 170 }
, { field: '淇濈浜轰唬鐮�', title: '淇濈浜轰唬鐮�', width: 170 }
, { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
- , { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
+ , { field: '閫�鏂欐ā寮�', title: '閫�鏂欐ā寮�', width: 170 }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
, { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
@@ -245,9 +246,16 @@
, { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
- , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
+ , { field: '璋冨叆浠撳簱浠ｇ爜', title: '璋冨叆浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨叆浠撳簱鍚嶇О', title: '璋冨叆浠撳簱鍚嶇О', width: 170 }
+ , { field: '璋冨嚭浠撳簱浠ｇ爜', title: '璋冨嚭浠撳簱浠ｇ爜', width: 170 }
+ , { field: '璋冨嚭浠撳簱鍚嶇О', title: '璋冨嚭浠撳簱鍚嶇О', width: 170 }
+ , { field: '璋冨叆浠撲綅鍚嶇О', title: '璋冨叆浠撲綅鍚嶇О', width: 170 }
+ , { field: '璋冨嚭浠撲綅鍚嶇О', title: '璋冨嚭浠撲綅鍚嶇О', width: 170 }
+ , { field: '鍝佽川鍒ゅ畾', title: '鍝佽川鍒ゅ畾', width: 170 }
+ , { field: '閫�鏂欏師鍥�', title: '閫�鏂欏師鍥�', width: 170 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 170 }
+ , { field: '渚涘簲鍟嗗悕绉�', title: '渚涘簲鍟嗗悕绉�', width: 170 }
]]
};
}
@@ -274,7 +282,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
+ url: GetWEBURL() + '/Cj_CallGoodsBillBack/CallGoodsBillBackMainList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -297,16 +305,16 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val("");//寮�濮嬫椂闂�
- var HEndDate = $("#HEndDate").val("");//缁撴潫鏃堕棿
- var HBillNo = $("#HBillNo").val("");//鍗曟嵁鍙�
- var HDeptID =$("#HDeptID").val("");//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
- var MaterialName =$("#MaterialName").val("");//鐗╂枡鍚嶇О
- var SpecificationModel =$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- var Warehouse = $("#Warehouse").val("");//鍙戞枡浠撳簱
- var HSourceBillNo = $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- var Hmaker =$("#Hmaker").val("");//鍒跺崟浜�
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫椂闂�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var Warehouse = $("#Warehouse").val();//鍙戞枡浠撳簱
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -330,7 +338,7 @@
sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
}
if (Warehouse) {
- sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+ sWhere += " and 璋冨叆浠撳簱鍚嶇О like '%" + Warehouse + "%'";
}
if (HSourceBillNo) {
sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
@@ -342,13 +350,6 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
- ////#region 鍒锋柊
- //function get_Refresh() {
- // set_ClearQuery();
- // get_Display(sWhere);
- //}
- ////#endregion
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/Jl_ComplementGoodsBillMain.html"
similarity index 91%
copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/Jl_ComplementGoodsBillMain.html"
index c1fbc68..decc57e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/Jl_ComplementGoodsBillMain.html"
@@ -2,15 +2,15 @@
<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>
+ <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>
</head>
<body>
<div class="layui-fluid">
@@ -117,7 +117,7 @@
</div>
<script>
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
-
+
var sWhere = "";
var option = [];
//#endregion
@@ -178,6 +178,7 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -274,7 +275,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
+ url: GetWEBURL() + '/Cj_ComplementGoodsBill/ComplementGoodsBillMainList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -297,16 +298,16 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val("");//寮�濮嬫椂闂�
- var HEndDate = $("#HEndDate").val("");//缁撴潫鏃堕棿
- var HBillNo = $("#HBillNo").val("");//鍗曟嵁鍙�
- var HDeptID =$("#HDeptID").val("");//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
- var MaterialName =$("#MaterialName").val("");//鐗╂枡鍚嶇О
- var SpecificationModel =$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- var Warehouse = $("#Warehouse").val("");//鍙戞枡浠撳簱
- var HSourceBillNo = $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- var Hmaker =$("#Hmaker").val("");//鍒跺崟浜�
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫椂闂�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID =$("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName =$("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel =$("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ var Warehouse = $("#Warehouse").val();//鍙戞枡浠撳簱
+ var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Hmaker =$("#Hmaker").val();//鍒跺崟浜�
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -342,13 +343,6 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
- ////#region 鍒锋柊
- //function get_Refresh() {
- // set_ClearQuery();
- // get_Display(sWhere);
- //}
- ////#endregion
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\215\225/Sc_WorkBillAutoSortBillMain.html"
similarity index 81%
copy from "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
copy to "WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\215\225/Sc_WorkBillAutoSortBillMain.html"
index c1fbc68..d107dd5 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/Ji_CallGoodsBillMain.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\217\253\346\226\231\347\256\241\347\220\206/\347\224\237\344\272\247\346\227\245\350\256\241\345\210\222\345\215\225/Sc_WorkBillAutoSortBillMain.html"
@@ -2,15 +2,15 @@
<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>
+ <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>
</head>
<body>
<div class="layui-fluid">
@@ -73,7 +73,7 @@
<input type="text" class="layui-input" name="SpecificationModel" id="SpecificationModel" style="width:190px;">
</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="Warehouse" id="Warehouse" style="width:190px;">
@@ -84,7 +84,7 @@
<div class="layui-input-block">
<input type="text" class="layui-input" name="HSourceBillNo" id="HSourceBillNo" style="width:190px;">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍒跺崟浜�</label>
@@ -117,7 +117,7 @@
</div>
<script>
layui.config({
- base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ base: '../../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
@@ -131,7 +131,7 @@
, element = layui.element
, laypage = layui.laypage
, laydate = layui.laydate
-
+
var sWhere = "";
var option = [];
//#endregion
@@ -178,6 +178,7 @@
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
});
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -212,7 +213,6 @@
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 170 }
, { field: '閫�鍥炰汉', title: '閫�鍥炰汉', width: 170 }
, { field: '閫�鍥炴棩鏈�', title: '閫�鍥炴棩鏈�', width: 200, templet: "<div>{{d.閫�鍥炴棩鏈� ==null ?'':layui.util.toDateString(d.閫�鍥炴棩鏈�, 'yyyy-MM-dd')}}</div>" }
- , { field: '閫�鍥炲師鍥�', title: '閫�鍥炲師鍥�', width: 170 }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�' }
, { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
@@ -224,30 +224,19 @@
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷', width: 170 }
, { field: '浣滃簾浜�', title: '浣滃簾浜�' }
, { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 170 }
- , { field: '婧愬崟瀛愬唴鐮�', title: '婧愬崟瀛愬唴鐮�', width: 170 }
- , { field: '婧愬崟鍙�', title: '婧愬崟鍙�', width: 170 }
- , { field: '鎵撳嵃娆℃暟', title: '鎵撳嵃娆℃暟', width: 170 }
- , { field: '鍙枡浜轰唬鐮�', title: '鍙枡浜轰唬鐮�', width: 170 }
- , { field: '鍙枡浜�', title: '鍙枡浜�', width: 170 }
- , { field: '閰嶉�佷汉浠ｇ爜', title: '閰嶉�佷汉浠ｇ爜', width: 170 }
- , { field: '閰嶉�佷汉', title: '閰嶉�佷汉', width: 170 }
- , { field: '淇濈浜轰唬鐮�', title: '淇濈浜轰唬鐮�', width: 170 }
- , { field: '淇濈浜�', title: '淇濈浜�', width: 170 }
- , { field: '鍙枡妯″紡', title: '鍙枡妯″紡', width: 170 }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 170 }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 170 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
, { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 170 }
, { field: '閮ㄩ棬鍚嶇О', title: '閮ㄩ棬鍚嶇О', width: 170 }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 170 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 170 }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 215 }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
- , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
- , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
- , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
- , { field: '浠撳簱鍚嶇О', title: '浠撳簱鍚嶇О', width: 170 }
- , { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 170 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 170 }
+ , { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜', width: 170 }
+ , { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О', width: 170 }
+ , { field: '璧勬簮鏁�', title: '璧勬簮鏁�', width: 170 }
+ , { field: '鏈�杩熷紑宸�', title: '鏈�杩熷紑宸�', width: 170 }
+ , { field: '鏈�杩熷畬宸�', title: '鏈�杩熷畬宸�', width: 170 }
+ , { field: '灏忔椂浜ц兘', title: '灏忔椂浜ц兘', width: 170 }
]]
};
}
@@ -261,8 +250,8 @@
$("#MaterialCode").val("");//鐗╂枡浠ｇ爜
$("#MaterialName").val("");//鐗╂枡鍚嶇О
$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- $("#Warehouse").val("");//鍙戞枡浠撳簱
- $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
+ //$("#Warehouse").val("");//鍙戞枡浠撳簱
+ //$("#HSourceBillNo").val("");//婧愬崟鍗曞彿
$("#Hmaker").val("");//鍒跺崟浜�
$("#btnSearch").click();//鍒锋柊
@@ -274,7 +263,7 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Cj_CallGoodsBillMain/CallGoodsBillMainList',
+ url: GetWEBURL() + '/Sc_WorkBillAutoSortBillMain/WorkBillAutoSortBillMainList',
type: "GET",
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
success: function (data1) {
@@ -297,16 +286,16 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBeginDate = $("#HBeginDate").val("");//寮�濮嬫椂闂�
- var HEndDate = $("#HEndDate").val("");//缁撴潫鏃堕棿
- var HBillNo = $("#HBillNo").val("");//鍗曟嵁鍙�
- var HDeptID =$("#HDeptID").val("");//閮ㄩ棬
- var MaterialCode = $("#MaterialCode").val("");//鐗╂枡浠ｇ爜
- var MaterialName =$("#MaterialName").val("");//鐗╂枡鍚嶇О
- var SpecificationModel =$("#SpecificationModel").val("");//瑙勬牸鍨嬪彿
- var Warehouse = $("#Warehouse").val("");//鍙戞枡浠撳簱
- var HSourceBillNo = $("#HSourceBillNo").val("");//婧愬崟鍗曞彿
- var Hmaker =$("#Hmaker").val("");//鍒跺崟浜�
+ var HBeginDate = $("#HBeginDate").val();//寮�濮嬫椂闂�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃堕棿
+ var HBillNo = $("#HBillNo").val();//鍗曟嵁鍙�
+ var HDeptID = $("#HDeptID").val();//閮ㄩ棬
+ var MaterialCode = $("#MaterialCode").val();//鐗╂枡浠ｇ爜
+ var MaterialName = $("#MaterialName").val();//鐗╂枡鍚嶇О
+ var SpecificationModel = $("#SpecificationModel").val();//瑙勬牸鍨嬪彿
+ //var Warehouse = $("#Warehouse").val();//鍙戞枡浠撳簱
+ //var HSourceBillNo = $("#HSourceBillNo").val();//婧愬崟鍗曞彿
+ var Hmaker = $("#Hmaker").val();//鍒跺崟浜�
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + HBeginDate + "'";
@@ -329,12 +318,12 @@
if (SpecificationModel) {
sWhere += " and 瑙勬牸鍨嬪彿 like '%" + SpecificationModel + "%'";
}
- if (Warehouse) {
- sWhere += " and 浠撳簱鍚嶇О like '%" + Warehouse + "%'";
- }
- if (HSourceBillNo) {
- sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
- }
+ //if (Warehouse) {
+ // sWhere += " and 璋冨叆浠撳簱鍚嶇О like '%" + Warehouse + "%'";
+ //}
+ //if (HSourceBillNo) {
+ // sWhere += " and 婧愬崟鍗曞彿 like '%" + HSourceBillNo + "%'";
+ //}
if (Hmaker) {
sWhere += " and 鍒跺崟浜� like '%" + Hmaker + "%'";
}
@@ -342,13 +331,6 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
-
- ////#region 鍒锋柊
- //function get_Refresh() {
- // set_ClearQuery();
- // get_Display(sWhere);
- //}
- ////#endregion
//#endregion
--
Gitblit v1.9.1