From 11829270e82650e249257bff58dff0e6142b7e14 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 29 三月 2022 13:16:25 +0800
Subject: [PATCH] 查询过滤 仓库发料 拣料配送列表上查 页面优化
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 84 +++++++-
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill.html | 45 ++++
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 26 ++
WebTM/views/采购管理/委外订单/WW_EntrustOrderBillList.html | 84 +++++++-
WebTM/views/车间管理/叫料管理/叫料退料单/JIT_BackGoods.html | 23 +-
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 4
WebTM/views/生产管理/生产叫料平台/JIT_HlpBillList.html | 48 -----
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsBill_Sc.html | 189 +++++++++++++++++++++
WebTM/WebTM.csproj | 1
9 files changed, 407 insertions(+), 97 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index abe7921..ae1964e 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -796,6 +796,7 @@
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBindStep.html" />
<Content Include="views\鐢熶骇绠＄悊\鎶ュ伐骞冲彴鍔熻兘椤礬LineBind.html" />
<Content Include="views\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\JIT_ComplementGoodsBill.html" />
+ <Content Include="views\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\JIT_ComplementGoodsBill_Sc.html" />
<Content Include="views\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\JIT_ComplementGoodsList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
index df0427f..bd93413 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill.html"
@@ -146,7 +146,7 @@
//浠撳簱鍙戞枡
form.on('submit(Ckfl)', function () {
-
+ get_Ckfl();
})
//琛屽唴浜嬩欢
@@ -172,7 +172,7 @@
option = {
elem: '#mainTable'
//, toolbar: '#toolbarDemo'
- , height: 400
+ , height: 420
, page: true
, cellMinWidth: 90
, limit: 50
@@ -262,7 +262,7 @@
option1 = {
elem: '#mainTable1'
//, toolbar: '#toolbarDemo'
- , height: 350
+ , height: 420
, page: true
, cellMinWidth: 90
, limit: 50
@@ -336,6 +336,45 @@
return vars;
}
+ //浠撳簱鍙戞枡
+ function get_Ckfl() {
+ if (table.cache['mainTable1'].length == 0) {
+ return layer.msg("鏃犳暟鎹�,鏃犳硶鍙戞枡!");
+ }
+ else {
+ layer.confirm("纭畾瑕侀厤閫佺敓鎴愯皟鎷ㄥ崟", {
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function () {
+
+ var sMainStr = JSON.stringify(table.cache['mainTable1']) + ";" + sessionStorage["HUserName"] + ";" + $("#HInterID").val() + ";" + $("#HRemark").val();//sessionStorage["HUserName"]
+
+ $.ajax(
+ {
+ type: "POST",
+ url: GetWEBURL() + "Sc_ComplementGoods/JIT_SendGoodsBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ async: true,
+ data: { "msg": sMainStr },
+ dataType: "json",
+ success: function (data) {
+ if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ layer.msg(data.Message, { icon: 1 });
+ }
+ else {
+ layer.alert(data.Message, { icon: 5 });
+ console.log("Reason" + sMainStr + "sub:" + JSON.stringify(layui.table.cache.mainTable));
+ }
+ layer.closeAll("loading");
+ },
+ error: function (err) {
+ layer.alert("閿欒:" + err, { icon: 5 });
+ console.log("Reason" + sMainStr);
+ }
+ });
+ }
+ })
+ }
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill_Sc.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill_Sc.html"
new file mode 100644
index 0000000..7408615
--- /dev/null
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsBill_Sc.html"
@@ -0,0 +1,189 @@
+锘�<!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/zgqCustom/zgqCustom.js"></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 src="../../../layuiadmin/PubCustom.js"></script>
+</head>
+<body>
+ <div class="layui-fluid" style="padding: 0;">
+ <div class="layui-card" style="padding: 2px;background-color: #efefef;">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
+ <div style="padding: 10px; ">
+ <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Cancel" id="Cancel">閫�鍑�</button>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <!--<div class="layui-tab" lay-filter="tab-POStockInBill">
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show">
+ <div class="layui-form-item" style="padding-top: 10px;">
+
+ </div>
+ </div>
+ </div>
+ </div>-->
+ </form>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index' //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var HInterID = 0;
+ var HEntryID = 0;
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鍗冲姞杞�
+
+ //鑾峰彇椤甸潰璺宠浆鍙傛暟
+ var params = get_UrlVars();
+ if (typeof (params[params[0]]) != "undefined") {
+ HInterID= params[params[0]];
+ HEntryID= params[params[2]];
+ }
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
+ //閫�鍑�
+ form.on('submit(Cancel)', function () {
+ Pub_Close(1);
+ })
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill()
+ {
+ set_InitGrid();
+ get_Display(sWhere);
+ }
+
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ /* { field: 'hmainid', title: 'hmainid', width: 110 }*/
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+ , { 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: 215 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 170 }
+ , { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 170 }
+ , { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О', width: 170 }
+ , { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 170 }
+ , { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷' }
+ , { 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: '鍒跺崟浜�' }
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { 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: 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: '婧愬崟绫诲瀷', 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 }
+ ]]
+ };
+ }
+
+ //鏌ヨ鍔犺浇鏁版嵁
+ function get_Display(sWhere) {
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Sc_ComplementGoods/ComplementGoodsList_Sc',
+ type: "GET",
+ data: { "HInterID": HInterID, "HEntryID": HEntryID},
+ success: function (data1) {
+ if (data1.count == 1) {
+ option.data = data1.data;
+ table.render(option);
+ layer.close(ajaxLoad);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鑾峰彇浼犻�掓暟鎹�
+ function get_UrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+
+ //#endregion
+
+ });
+
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index 460e26a..aeba0f6 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -207,6 +207,11 @@
set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
})
+ //涓婃煡
+ form.on('submit(Sc)', function () {
+ set_Sc();
+ })
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -527,6 +532,27 @@
})
}
+ //涓婃煡
+ function set_Sc() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+ var HEntryID = CheckStatus.data[0].Hsubid;
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '鍙枡鍗曟竻鍗�'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill_Sc.html?HSourceInterID=' + HInterID + '&&HEntryID=' + HEntryID
+ })
+ }
+ }
+
//#endregion
});
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
index d8a0fa9..00b5a8f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_ComplementGoodBillMain.html"
@@ -295,8 +295,8 @@
, cellMinWidth: 90
, limit: 500
, cols: [[
- //{ type: 'checkbox', fixed: 'left' }
- { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
+ { type: 'checkbox', fixed: 'left' }
+ , { field: '閿�鍞鍗曞彿', title: '閿�鍞鍗曞彿',width: 150 }
, { field: '鐢熶骇璁㈠崟鍙�', title: '鐢熶骇璁㈠崟鍙�', width: 170}
, { field: '浜у搧浠ｇ爜', title: '浜у搧浠ｇ爜', width: 170 }
, { field: '浜у搧鍚嶇О', title: '浜у搧鍚嶇О', width: 260, }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html"
index 7e1eaa0..787f982 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\217\253\346\226\231\345\271\263\345\217\260/JIT_HlpBillList.html"
@@ -82,16 +82,6 @@
form.on('submit(Cancel)', function () {
Pub_Close(1);
})
-
- //琛屽唴浜嬩欢
- table.on('tool(mainTable)', function (obj) {
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
- })
-
- //鏂板鍙枡鍗�
- form.on('submit(Jl)', function () {
- set_AddNew_Jl();
- })
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -157,44 +147,6 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
- }
-
- //琛屽唴蹇嵎閿�
- function set_GridCellCheck(obj) {
- $(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
- if (event.key == "F7") {
- if (obj.event == "Warehouse") {
- //鎵撳紑缁翠慨椤圭洰灏忕獥浣�
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "浠撳簱鍒楄〃" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["90%", "90%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
- , btn: ["纭畾", "鍙栨秷"]
- , btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
-
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
- }
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "璋冨嚭浠撳簱": checkStatus.data[0].HName
- , "璋冨嚭浠撳簱id": checkStatus.data[0].HItemID
- })
- console.log(checkStatus.data[0].HItemID)
- layer.close(index);//鍏抽棴寮圭獥
- }
- })
- }
- }
- })
}
//鑾峰彇浼犻�掓暟鎹�
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/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/JIT_BackGoods.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/JIT_BackGoods.html"
index 9b7947a..68d6309 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/\345\217\253\346\226\231\351\200\200\346\226\231\345\215\225/JIT_BackGoods.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/JIT_BackGoods.html"
@@ -28,8 +28,6 @@
<form class="layui-form" action="" lay-filter="formData" style="background-color:white;">
<div style="padding: 10px; ">
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Edit" id="Edit">閫�鍑�</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="PZQR" id="PZQR">鍝佽川纭</button>
- <button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="CKJS" id="CKJS">浠撳簱鎺ユ敹</button>
<!--<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Xc" id="Xc">涓嬫煡</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Ylan" id="Ylan">棰勮</button>
<button class="layui-btn layui-btn-normal" style="margin-left: 0px" type="button" lay-submit="" lay-filter="Dyin" id="Dyin">鎵撳嵃</button>-->
@@ -44,20 +42,17 @@
<label class="layui-form-label" style="width: 80px;font-size:25px;">閫�鏂欏崟</label>
</div>
</div>
- <!--<div class="layui-row">
+ <div class="layui-row">
<div class="layui-inline">
- <label class="layui-form-label" style="width: 80px;">鎷ｆ枡閰嶉�佸崟鍙�</label>
+ <label class="layui-form-label" style="width: 80px;">閫�鏂欏崟鍙�</label>
<div class="layui-input-block">
- <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;">
- </div>
- <label class="layui-form-label"></label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;">
+ <input type="text" class="layui-input" lay-verify="HRemark" name="HRemark" id="HRemark" style="display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HInterID" lay-verify="HInterID" id="HInterID" style="display: inline-block;display:none">
</div>
</div>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ppkc" id="Ppkc">鍖归厤搴撳瓨</button>
- <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="Ckfl" id="Ckfl">浠撳簱鍙戞枡</button>
- </div>-->
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="PZQR" id="PZQR">鍝佽川纭</button>
+ <button class="layui-btn layui-btn-normal" type="button" lay-submit="" lay-filter="CKJS" id="CKJS">浠撳簱鎺ユ敹</button>
+ </div>
<div class="layui-tab" lay-filter="">
<div class="layui-tab-content">
<div class="layui-tab-item layui-show">
@@ -200,6 +195,8 @@
data: { "HInterID": HInterID, "user": sessionStorage["HUserName"] },//
success: function (data1) {
if (data1.count == 1) {
+ $("#HRemark").val(data1.data[0].鍗曟嵁鍙�);
+ $("#HInterID").val(data1.data[0].hmainid);
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
@@ -241,7 +238,7 @@
layer.confirm("纭畾瑕佹帴鏀剁敓鎴愯皟鎷ㄥ崟?", {
btn:['纭畾', '鍙栨秷']
, btn1: function (index) {
- sWhere = JSON.stringify(table.cache['mainTable']);
+ sWhere = JSON.stringify(table.cache['mainTable']) + ";" + sessionStorage["HUserName"];
$.ajax({
url: GetWEBURL() + '/Sc_CallGoodsBackRequestBill/JIT_BackGoodsList_CKJS',
type: "POST",
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
index 92be04b..2882cde 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\247\224\345\244\226\350\256\242\345\215\225/WW_EntrustOrderBillList.html"
@@ -59,10 +59,10 @@
<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">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -71,8 +71,9 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -85,12 +86,12 @@
</select>
</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="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
</div>
- </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -107,6 +108,24 @@
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" 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="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFeedback" lay-filter="HFeedback">
+ <option value="" selected>鍏ㄩ儴</option>
+ <option value="鎺ユ敹">鎺ユ敹</option>
+ <option value="澶囨枡">澶囨枡</option>
+ <option value="鐢熶骇">鐢熶骇</option>
+ <option value="鍙戣揣">鍙戣揣</option>
+ </select>
</div>
</div>
@@ -163,6 +182,8 @@
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_Display(sWhere);
+ //鍔犺浇涓氬姟鍛�
+ get_HEmpName();
//#endregion
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
@@ -271,9 +292,9 @@
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
, { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
, { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
- , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 100 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 130 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 130 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120 }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100}
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120}
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
@@ -281,7 +302,7 @@
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
, { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
@@ -960,8 +981,10 @@
var HMaterNumber = $("#HMaterNumber").val();
var HMaterName = $("#HMaterName").val();
var HXTStatus = $("select[name='HXTStatus']").val();
- var HXTFKStatus = $("#HXTFKStatus").val();
+ //var HXTFKStatus = $("#HXTFKStatus").val();
var HMaterShortNumber = $("#HMaterShortNumber").val();
+ var HSupName = $("#HSupName").val();//渚涘簲鍟�
+ var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
if (HStatus) {
switch (HStatus) {
@@ -1005,8 +1028,16 @@
sWhere += " and 渚涘簲鍟嗗崗鍚岀姸鎬� like '%" + HXTStatus + "%'";
}
- if (HXTFKStatus) {
- sWhere += " and 鍙嶉鐘舵�� like '%" + HXTFKStatus + "%'";
+ //if (HXTFKStatus) {
+ // sWhere += " and 鍙嶉鐘舵�� like '%" + HXTFKStatus + "%'";
+
+ //}
+ if (HSupName) {
+ sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
+
+ }
+ if (HFeedback) {
+ sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
var index = layer.load(0);
@@ -1023,6 +1054,8 @@
$("#HEmpName").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
+ $("#HSupName").val("");//渚涘簲鍟�
+ $("select[name='HFeedback']").val(""); //渚涘簲鍟嗗弽棣堢姸鎬�
sWhere = "";
get_Display(sWhere);
}
@@ -1031,7 +1064,26 @@
function set_Refresh() {
$("#btnSearch").click();
}
-
+ //鑾峰彇涓氬姟鍛樻暟鎹�
+ function get_HEmpName() {
+ var HEmpName = '<option value="">鍏ㄩ儴</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetEmployeeList_Json",
+ data: { "Employee": '', "HGroupID": 0 },
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HEmpName += '<option value="' + data[i].HName + '">' + data[i].HName + '</option>';
+ }
+ $("#HEmpName").append(HEmpName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index e80d2db..f59ff0d 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -76,8 +76,10 @@
</div>
<div class="layui-inline">
<label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="width:190px;">
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HEmpName" lay-filter="HEmpName" id="HEmpName">
+
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -90,12 +92,12 @@
</select>
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label">鍙嶉鐘舵��</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HXTFKStatus" id="HXTFKStatus" 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="HXTFKStatus" id="HXTFKStatus" style="width:190px;">
+ </div>
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡缂栫爜</label>
<div class="layui-input-block">
@@ -112,6 +114,24 @@
<label class="layui-form-label">鐗╂枡鍚嶇О</label>
<div class="layui-input-block">
<input type="text" class="layui-input" name="HMaterName" id="HMaterName" 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="HSupName" id="HSupName" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:30px">
+ <label class="layui-form-label">渚涘簲鍟嗗弽棣堢姸鎬�</label>
+ <div class="layui-input-block" style="width:190px;">
+ <select name="HFeedback" lay-filter="HFeedback">
+ <option value="" selected>鍏ㄩ儴</option>
+ <option value="鎺ユ敹">鎺ユ敹</option>
+ <option value="澶囨枡">澶囨枡</option>
+ <option value="鐢熶骇">鐢熶骇</option>
+ <option value="鍙戣揣">鍙戣揣</option>
+ </select>
</div>
</div>
</div>
@@ -265,6 +285,8 @@
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_Display(sWhere);
+ //鍔犺浇涓氬姟鍛�
+ get_HEmpName();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -280,9 +302,9 @@
, { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100 }
, { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
, { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
- , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 100 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
, { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
, { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
, { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
@@ -292,7 +314,7 @@
, { field: 'HUnitID', title: 'HUnitID', hide: true }
, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 100 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
, { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
, { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
@@ -962,7 +984,9 @@
var HMaterShortNumber = $("#HMaterShortNumber").val();
var HMaterName = $("#HMaterName").val();
var HXTStatus = $("select[name='HXTStatus']").val();
- var HXTFKStatus = $("#HXTFKStatus").val();
+ //var HXTFKStatus = $("#HXTFKStatus").val();
+ var HSupName = $("#HSupName").val();//渚涘簲鍟�
+ var HFeedback = $("select[name='HFeedback']").val(); //渚涘簲鍟嗗弽棣堢姸鎬�
if (HStatus) {
switch (HStatus) {
@@ -1006,8 +1030,16 @@
sWhere += " and 渚涘簲鍟嗗崗鍚岀姸鎬� like '%" + HXTStatus + "%'";
}
- if (HXTFKStatus) {
- sWhere += " and 鍙嶉鐘舵�� like '%" + HXTFKStatus + "%'";
+ //if (HXTFKStatus) {
+ // sWhere += " and 鍙嶉鐘舵�� like '%" + HXTFKStatus + "%'";
+
+ //}
+ if (HSupName) {
+ sWhere += " and 渚涘簲鍟� like '%" + HSupName + "%'";
+
+ }
+ if (HFeedback) {
+ sWhere += " and 鍙嶉鐘舵�� like '%" + HFeedback + "%'";
}
var index = layer.load(0);
@@ -1024,6 +1056,8 @@
$("#HEmpName").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
+ $("#HSupName").val("");
+ $("select[name='HFeedback']").val("");
sWhere = "";
get_Display(sWhere);
}
@@ -1061,6 +1095,26 @@
$("#btnSearch").click();
}
+ //鑾峰彇涓氬姟鍛樻暟鎹�
+ function get_HEmpName() {
+ var HEmpName= '<option value="">鍏ㄩ儴</option>';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetEmployeeList_Json",
+ data: { "Employee": '', "HGroupID": 0},
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HEmpName += '<option value="' + data[i].HName + '">' + data[i].HName + '</option>';
+ }
+ $("#HEmpName").append(HEmpName);
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
//浠ヤ笂鏄痩ayui妯″潡
});
</script>
--
Gitblit v1.9.1