From 6fd166278c81964f03bb62f03ff95ea08fa209cc Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 31 三月 2022 17:28:44 +0800
Subject: [PATCH] 页面合并 代码优化
---
/dev/null | 179 -----------------------------------
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 4
WebTM/views/生产管理/生产叫料平台/JIT_ComplementGoodBillMain.html | 2
WebTM/views/生产管理/生产叫料平台/JIT_HlpBillList.html | 72 +++++++------
WebTM/WebTM.csproj | 2
5 files changed, 41 insertions(+), 218 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index b444193..691c3d4 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -797,9 +797,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\鐢熶骇绠＄悊\鎷ｆ枡閰嶉�佸崟\JIT_SendGoodsBillList_Xc.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList - 澶嶅埗.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇涓婃枡鍗昞Sc_MaterToSourceBillList.html" />
<Content Include="views\鐢熶骇绠＄悊\鐢熶骇鍋滃伐鍗昞Sc_Add_MESStopWorkBillList - 澶嶅埗.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_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"
deleted file mode 100644
index bd2787d..0000000
--- "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"
+++ /dev/null
@@ -1,189 +0,0 @@
-锘�<!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 HMaterID = 0;
- //#endregion
-
- //#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //鑾峰彇椤甸潰璺宠浆鍙傛暟
- var params = get_UrlVars();
- if (typeof (params[params[0]]) != "undefined") {
- HInterID= params[params[0]];
- HMaterID= 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, "HMaterID": HMaterID},
- 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 14482fa..f78867f 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"
@@ -554,7 +554,7 @@
, area: ['80%', '80%']
, title: '鍙枡鍗曟竻鍗�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill_Sc.html?HSourceInterID=' + HInterID + '&&HMaterID=' + HMaterID
+ , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=2'
})
}
}
@@ -575,7 +575,7 @@
, area: ['80%', '80%']
, title: '閰嶉�佸崟娓呭崟'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎷ｆ枡閰嶉�佸崟/JIT_SendGoodsBillList_Xc.html?HSourceInterID=' + HInterID + '&&HMaterID=' + HMaterID
+ , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=3'
})
}
}
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_SendGoodsBillList_Xc.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_SendGoodsBillList_Xc.html"
deleted file mode 100644
index baefd79..0000000
--- "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_SendGoodsBillList_Xc.html"
+++ /dev/null
@@ -1,179 +0,0 @@
-锘�<!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>
- </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 HMaterID = 0;
- //#endregion
-
- //#region 杩涘叆椤甸潰鍗冲姞杞�
-
- //鑾峰彇椤甸潰璺宠浆鍙傛暟
- var params = get_UrlVars();
- if (typeof (params[params[0]]) != "undefined") {
- HInterID= params[params[0]];
- HMaterID= 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();
- }
-
- function set_InitGrid() {
- option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- , height: 550
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , cols: [[
- { 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() {
- var ajaxLoad = layer.load();
- $.ajax({
- url: GetWEBURL() + '/Sc_ComplementGoods/JIT_SendGoodsBillList_Xc',
- type: "GET",
- data: { "HInterID": HInterID, "HMaterID": HMaterID},
- 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/\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 c226e29..cbf8f83 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"
@@ -761,7 +761,7 @@
, area: ['80%', '80%']
, title: '鍙枡鎷ｆ枡淇℃伅鏌ヨ'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID
+ , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HSouceInterID + '&HSourceEntryID=' + HSourceEntryID + '&Type=1'
})
}
}
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 787f982..3fa9d72 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"
@@ -53,8 +53,7 @@
//鏌ヨ鏉′欢
var sWhere = "";
var option = [];
- HSouceInterID = 0;
- HSourceEntryID = 0;
+ var col = [];
var HMaker = sessionStorage["HUserName"];
//#endregion
@@ -66,6 +65,7 @@
sWhere = {
HSouceInterID: params[params[0]],
HSourceEntryID: params[params[1]],
+ Type: params[params[2]],
user: HMaker
}
sWhere = JSON.stringify(sWhere);
@@ -94,35 +94,7 @@
}
function set_InitGrid() {
- option = {
- elem: '#mainTable'
- //, toolbar: '#toolbarDemo'
- , height: 550
- , page: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , cols: [[
- /* { type: 'checkbox', fixed: 'left' }*/
- { field: 'HBillType', title: 'HBillType',width: 150 }
- , { field: '鏄惁妫�鏂�', title: '鏄惁妫�鏂�', width: 170}
- , { field: '鍙枡鍗曞崟鍙�', title: '鍙枡鍗曞崟鍙�', width: 170 }
- , { field: '缁勭粐', title: '缁勭粐', width: 260, }
- , { field: '璋冨嚭缁勭粐', title: '璋冨嚭缁勭粐', width: 160 }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '閿�鍞鍗�', title: '閿�鍞鍗�', width: 160 }
- , { field: '鐢熶骇璁㈠崟', title: '鐢熶骇璁㈠崟', width: 160}
- , { field: '鐢ㄦ枡娓呭崟鍙�', title: '鐢ㄦ枡娓呭崟鍙�', width: 160 }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
- , { field: '鍙枡鏁伴噺', title: '鍙枡鏁伴噺', width: 160 }
- , { field: '鍙枡浜�', title: '鍙枡浜�', width: 160}
- , { field: '鍙枡鏃ユ湡', title: '鍙枡鏃ユ湡', width: 160, templet: "<div>{{d.鍙枡鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍙枡鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 160}
- , { field: '浠撳簱', title: '浠撳簱', width: 160 }
- , { field: '宸ユ', title: '宸ユ', width: 160}
- ]]
- };
+
}
//鏌ヨ鍔犺浇鏁版嵁
@@ -131,11 +103,43 @@
$.ajax({
url: GetWEBURL() + '/Sc_ComplementGoodBill/HlpBillList',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere },
success: function (data1) {
if (data1.count == 1) {
- option.data = data1.data;
- table.render(option);
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+
+ for (var i = 0; i < data.length; i++) {
+ if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200});
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ table.render({
+ elem: '#mainTable'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ });
+
layer.close(ajaxLoad);
//layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
} else {
--
Gitblit v1.9.1