From f77ffc3481ce95c0eac82c2887ac23d7bc66778d Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 27 七月 2022 10:53:04 +0800
Subject: [PATCH] 销售订单隐藏列 齐套分析明细
---
WebTM/views/销售管理/销售订单/Xs_SeOrderBillDyColList.html | 133 ++++-----------------
WebTM/views/生产管理/齐套分析/JIT_CompleteDetailList.html | 196 +++++++++++++++++++++++---------
WebTM/views/生产管理/生产计划平台/JIT_DayPlanPlatForm.html | 22 +++
WebTM/views/生产管理/提料计划/JIT_LiftMaterPlanBillEdit.html | 1
WebTM/layuiadmin/Scripts/webConfig.js | 4
WebTM/views/index.html | 1
6 files changed, 193 insertions(+), 164 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 71aa844..e7c8fe3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -8,7 +8,7 @@
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
//var WEBURL = "http://183.129.128.86:9090/API/"; //鍑礉濂堢壒瀹㈡埛鏈嶅姟鍣ㄥ缃�
@@ -17,7 +17,7 @@
//var WEBURL = "http://192.168.0.214/API/"; //鐟炰笌绁烘湇鍔″櫒
//var WEBURL = "http://192.168.10.66/API/"; //妫シ鏈嶅姟鍣�
//var WEBURL = "http://localhost/API/";
- var WEBURL = "http://60.191.27.141:8090/API/";
+ //var WEBURL = "http://60.191.27.141:8090/API/";
return WEBURL
}
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 56f91a1..f17b386 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -376,6 +376,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatForm.html" style="margin: 0 0 0 13px;">鐢熶骇璁″垝骞冲彴</a></dd>
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/JIT_DayPlanPlatFormImport.html" style="margin: 0 0 0 13px;">瀵煎叆</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html" style="margin: 0 0 0 13px;">榻愬鍒嗘瀽淇℃伅鏄庣粏鍒楄〃</a></dd>
</dl>
</dd>
<dd>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
index 758c667..a6faca9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\217\220\346\226\231\350\256\241\345\210\222/JIT_LiftMaterPlanBillEdit.html"
@@ -788,7 +788,6 @@
success: function (data1) {
if (data1.data.length != 0) {
-
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = ["HMaterID", "HUnitID", "HWorkShopID", "HPurchaseDeptID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
index 0ac634c..2b077fe 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\350\256\241\345\210\222\345\271\263\345\217\260/JIT_DayPlanPlatForm.html"
@@ -208,6 +208,11 @@
});
})
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus('mainTable')
@@ -715,7 +720,6 @@
}
, btn2: function (index, layero) { }
})
-
}
//蹇�熻繃婊�
@@ -752,6 +756,22 @@
sWhere = ""//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
+ //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
+ function btnrowDouble(obj) {
+ HMainICMOEntryID = obj["HICMOEntryID"];
+ HMainICMOInterID = obj["HICMOInterID"];
+ HICMOInterID = obj["HInterID"];
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '榻愬鍒嗘瀽鏄庣粏琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteDetailList.html?OperationType=1&HMainICMOEntryID=' + HMainICMOEntryID+'&HMainICMOInterID=' + HMainICMOInterID+'&HICMOInterID=' + HICMOInterID, 'yes']
+ })
+ }
+
//閲嶇疆
function set_ClearQuery() {
$("#HPlanBeginDate").val(Format(new Date(), "yyyy-MM-dd"));//寮�宸ヨ捣濮嬫棩鏈�
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
index e1095fa..c82f50a 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\351\275\220\345\245\227\345\210\206\346\236\220/JIT_CompleteDetailList.html"
@@ -5,6 +5,7 @@
<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>
@@ -25,48 +26,73 @@
</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">
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐢熶骇杞﹂棿</label>
+ <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">鐗╂枡缂栫爜</label>
<div class="layui-input-block" style="margin-left: 77px;">
- <input type="hidden" class="layui-input" lay-verify="HWorkShopID" name="HWorkShopID" id="HWorkShopID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <input type="text" class="layui-input" lay-verify="HWorkShopIDName" name="HWorkShopIDName" id="HWorkShopIDName" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHWorkShopID" id="btnHWorkShopID" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterNumber" id="btnHMaterNumber" style="padding: 0 10px;float: right;margin-right: 3px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
</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="HComplete" id="HComplete" lay-filter="HComplete">
+ <option value="">鍏ㄩ儴</option>
+ <option value="榻愬">榻愬</option>
+ <option value="鏈綈濂�">鏈綈濂�</option>
+ </select>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏃ヨ鍒掓棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HPlanDate" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">鏌ヨ</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
- <!--<div class="layui-colla-content">
- <div class="layui-inline">
- <div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
- </div>
- </div>
- <div class="layui-inline">
- <label class="layui-form-label" style="width: 85px;">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="鐗╂枡浠ｇ爜" id="鐗╂枡浠ｇ爜">
- </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="璧勬簮浠ｇ爜" id="璧勬簮浠ｇ爜">
- </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="閮ㄩ棬浠ｇ爜" id="閮ㄩ棬浠ｇ爜">
- </div>
- </div>
- </div>-->
+ <div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
+ <div class="layui-row" style="margin-top:10px;">
+ <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="HMaterName" id="HMaterName" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </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="" id="">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 100px;">鏈夋棤閲囪喘璁㈠崟</label>
+ <div class="layui-input-block" style="width: 190px; margin-left: 130px;">
+ <select name="" lay-filter="">
+ <option value="鍏ㄩ儴" selected>鍏ㄩ儴</option>
+ <option value="鏈夐噰璐鍗�">鏈夐噰璐鍗�</option>
+ <option value="鏃犻噰璐鍗�">鏃犻噰璐鍗�</option>
+ </select>
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px;">
+ <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="HMaterModel" id="HMaterModel" style="background-color:#efefef4d;display: inline-block;" readonly>
+ </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="" id="">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -100,8 +126,30 @@
, util = layui.util
var sWhere = "";
var option = [];
- //鍒濆鍖栫晫闈�
+ var HMainICMOEntryID = -1;//涓荤敓浜ц鍗曞瓙鍐呯爜
+ var HMainICMOInterID = -1;//涓荤敓浜ц鍗曚富鍐呯爜
+ var HICMOInterID = -1;//鏃ヨ鍒掕鍗曚富鍐呯爜
+ //#endregion
+
+ //#region 鍒濆鍖栫晫闈�
+
+ var params = getUrlVars();
+ var OperationType = params[params[0]];
+
+ //鍒ゆ柇鏄惁鏈夊弬鏁颁紶閫�
+ if (!isNaN(OperationType)) {
+ HMainICMOEntryID = params[params[1]];
+ HMainICMOInterID = params[params[2]];
+ HICMOInterID = params[params[3]];
+ }
+
set_ClearBill();
+
+
+ //#endregion
+
+ //#region 瑙﹀彂浜嬩欢锛氬寘鎷琭orm.on(){}鏍煎紡鐨勬墍鏈夌偣鍑讳簨浠躲�侀�夋嫨浜嬩欢绛�
+
//#region 澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
switch (obj.event) {
@@ -116,11 +164,14 @@
break;
};
});
- //#region 鐢熶骇杞﹂棿
- form.on('submit(btnHWorkShopID)', function (data) {
- btnHWorkShopID();
+ //#endregion
+
+ //#region 鐗╂枡
+ form.on('submit(btnHMaterNumber)', function (data) {
+ btnHMaterNumber();
});
//#endregion
+
//#region 閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
set_ClearQuery();
@@ -132,9 +183,15 @@
get_FastQuery();
});
//#endregion
+
+ //#endregion
+
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
+
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ //鍒濆鍖栨棩鏈�
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
@@ -160,11 +217,12 @@
, { field: '鏃ヨ鍒掕鍗曚富鍐呯爜', title: '鏃ヨ鍒掕鍗曚富鍐呯爜', hide: true }
, { field: '涓荤敓浜ц鍗曞瓙鍐呯爜', title: '涓荤敓浜ц鍗曞瓙鍐呯爜', hide: true }
, { field: '涓荤敓浜ц鍗曚富鍐呯爜', title: '涓荤敓浜ц鍗曚富鍐呯爜', hide: true }
- , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�' }
+ , { field: '鏃ヨ鍒掓棩鏈�', title: '鏃ヨ鍒掓棩鏈�', templet: "<div>{{d.鏃ヨ鍒掓棩鏈� =='' ?'':layui.util.toDateString(d.鏃ヨ鍒掓棩鏈�, 'yyyy-MM-dd')}}</div>" }
, { field: '鐗╂枡ID', title: '鐗╂枡ID', hide: true }
, { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜' }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
, { field: '璁″垝鍙戞枡鏁伴噺', title: '璁″垝鍙戞枡鏁伴噺' }
+ , { field: '榻愬鐘舵��', title: '榻愬鐘舵��' }
, { field: '榻愬鏁伴噺', title: '榻愬鏁伴噺' }
, { field: '缂烘枡鏁伴噺', title: '缂烘枡鏁伴噺' }
, { field: '棰嗘枡鍗犵敤鏁伴噺', title: '棰嗘枡鍗犵敤鏁伴噺' }
@@ -189,7 +247,7 @@
$.ajax({
url: GetWEBURL() + '/JIT_Complete/JIT_CompleteDetailList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "HMainICMOEntryID": HMainICMOEntryID, "HMainICMOInterID": HMainICMOInterID, "HICMOInterID": HICMOInterID },
success: function (result) {
if (result.count == 1) {
option.data = result.data;
@@ -211,14 +269,22 @@
//#region 蹇�熻繃婊�
function get_FastQuery() {
- var HBillNo = $("#HBillNo").val();
- var HWorkShopIDName = $("#HWorkShopIDName").val();
+ var HMaterID = $("#HMaterID").val();
+ var HMaterNumber = $("#HMaterNumber").val();
+ var HComplete = $("#HComplete").val();
+ var HPlanDate = $("#HPlanDate").val();
- if (HBillNo) {
- sWhere += " and 鍗曟嵁鍙� like '%" + HBillNo + "%'";
+ if (HMaterID!="0") {
+ sWhere += " and 鐗╂枡ID = '" + HMaterID + "'";
}
- if (HWorkShopIDName) {
- sWhere += " and 杞﹂棿鍚嶇О = '" + HWorkShopIDName + "'";
+ if (HMaterNumber) {
+ sWhere += " and 鐗╂枡缂栫爜 = '" + HMaterNumber + "'";
+ }
+ if (HComplete) {
+ sWhere += " and 榻愬鐘舵�� = '" + HComplete + "'";
+ }
+ if (HPlanDate) {
+ sWhere += " and 鏃ヨ鍒掓棩鏈� = '" + HPlanDate + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -227,22 +293,26 @@
//#region 閲嶇疆杩囨护鏉′欢鏂规硶
function set_ClearQuery() {
- $("#HWorkShopIDName").val("");
- $("#HBillNo").val("");
- $("#HWorkShopID").val("");
+ $("#HMaterID").val("0");
+ $("#HMaterNumber").val("");
+ $('#HComplete').val("");
+ $("#HPlanDate").val(Format(new Date(), 'yyyy-MM-dd'));
+ $("#HMaterName").val("");
+ $("#HMaterModel").val("");
+ form.render('select');
sWhere = "";
}
//#endregion
- //鐢熶骇杞﹂棿鍒楄〃
- function btnHWorkShopID() {
+ //鐗╂枡鍒楄〃
+ function btnHMaterNumber() {
layer.open({
type: 2 //绫诲瀷
, skin: 'layui-layer-rim'//鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '鐢熶骇杞﹂棿鍒楄〃'//鏍囬
+ , title: '鐗╂枡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../Baseset/鍩虹璧勬枡/Gy_MaterialList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -251,14 +321,28 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
//鑾峰彇鏁版嵁
- $("#HWorkShopID").val(checkStatus.data[0].HItemID);//杞﹂棿id
- $("#HWorkShopIDName").val(checkStatus.data[0].HName);//杞﹂棿鍚嶇О
+ $("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HMaterNumber").val(checkStatus.data[0].HNumber);
+ $("#HMaterName").val(checkStatus.data[0].HName);
+ $("#HMaterModel").val(checkStatus.data[0].HModel);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ 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
//浠ヤ笂鏄痩ayui妯″潡
});
diff --git "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html" "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
index 0c17851..88cee18 100644
--- "a/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
+++ "b/WebTM/views/\351\224\200\345\224\256\347\256\241\347\220\206/\351\224\200\345\224\256\350\256\242\345\215\225/Xs_SeOrderBillDyColList.html"
@@ -2,13 +2,12 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <title>閿�鍞鍗曞垪琛�</title>
+ <title>閿�鍞鍗曞姩鎬佸垪琛�</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
- <!--<script src="../../../layuiadmin/layui/layui.js"></script>-->
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/layui/layui.js"></script>
<script src="../../../layuiadmin/Scripts/json2.js"></script>
@@ -58,14 +57,6 @@
<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-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" name="HBillno2" id="HBillno2" style="width:190px;">
- </div>
- </div>
-
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -99,10 +90,6 @@
</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/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -160,66 +147,6 @@
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
- , cols: [[
- { type: 'checkbox', fixed: 'left' }
- ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- , { field: '鏃ユ湡', title: '鏃ユ湡', width: 125}
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 125 }
- , { field: 'HBillType', title: 'HBillType', hide: true }
- , { field: 'HCusID', title: 'HCusID', hide: true }
- , { field: '瀹㈡埛浠ｇ爜', title: '瀹㈡埛浠ｇ爜', width: 125 }
- , { field: '瀹㈡埛', title: '瀹㈡埛' }
- , { field: '浜よ揣鍦板潃', title: '浜よ揣鍦板潃', width: 125 }
- , { field: 'HSSID', title: 'HSSID', hide: true }
- , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 125 }
- , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 125}
- , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 170}
- , { field: 'HCurID', title: 'HCurID', hide: true }
- , { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜' }
- , { field: '甯佸埆', title: '甯佸埆' }
- , { field: '姹囩巼', title: '姹囩巼' }
- , { field: 'HDeptID', title: 'HDeptID', hide: true }
- , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 125 }
- , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 125 }
- , { field: '閿�鍞柟寮�', title: '閿�鍞柟寮�' }
- , { field: 'HManagerID', title: 'HManagerID', hide: true }
- , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜' }
- , { field: '涓荤', title: '涓荤' }
- , { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�' }
- , { field: '涓氬姟鍛�', title: '涓氬姟鍛�' }
- , { field: '鎽樿', title: '鎽樿' }
- , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
- , { field: 'hsubid', title: 'hsubid', hide: true }
- , { field: 'HMaterID', title: 'HMaterID', hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜' }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О' }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿' }
- , { field: '鎵瑰彿', title: '鎵瑰彿' }
- , { field: 'HUnitID', title: 'HUnitID', hide: true }
- , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜' }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅' }
- , { field: '鏁伴噺', title: '鏁伴噺' }
- , { field: '鍗曚环', title: '鍗曚环' }
- , { field: '閲戦', title: '閲戦' }
- , { field: '绋庣巼', title: '绋庣巼' }
- , { field: '绋庨', title: '绋庨' }
- , { field: '浠风◣鍚堣', title: '浠风◣鍚堣' }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿' }
- , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�' }
- , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
- , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 125 }
- , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 200, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 125 }
- , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 200, templet: "<div>{{d.瀹℃牳鏃ユ湡 ==null ? '':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '淇敼浜�', title: '淇敼浜�', width: 125 }
- , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 200, templet: "<div>{{d.淇敼鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 125 }
- , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 200, templet: "<div>{{d.鍏抽棴鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
- , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 125 }
- , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 200, templet: "<div>{{d.浣滃簾鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd HH:mm:ss')}}</div>" }
-
- ]]
};
}
@@ -227,15 +154,40 @@
function get_Display(sWhere) {
var ajaxLoad = layer.load();
$.ajax({
- url: GetWEBURL() + '/Xs_SeOrderBill/list',
+ url: GetWEBURL() + '/Xs_SeOrderBill/DyColList',
type: "GET",
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": "admin" },
success: function (data1) {
+ var col = [];
if (data1.count == 1) {
+ var data = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍒ゆ柇鏄惁鏄函鑻辨枃
+ var patrn = new RegExp("[\u4E00-\u9FA5]+");//涓枃
+ for (var i = 0; i < data.length; i++) {
+ if (!patrn.test(data[i].name)) {
+ col.push({ field: data[i].name, title: data[i].name, hide: true }); //闅愯棌鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ case 'DateTime':
+ col.push({ field: data[i].name, 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].name, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ option.cols = [col];
option.data = data1.data;
table.render(option);
layer.close(ajaxLoad);
- } else {
+ }
+ else
+ {
layer.close(ajaxLoad);
layer.alert(data1.code + data1.Message, { icon: 5 });
}
@@ -286,33 +238,6 @@
$("#HDeptID").val("");
$("#HMangerID").val("");
sWhere = "";
- }
- //閲嶆柊鍚屾鎸夐挳
- function set_ResCnz() {
- var HBillno2 = $('#HBillno2').val();
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/Resynchronize',
- type: "GET",
- data: { "HBillNo": HBillno2, "HBillType": 1401 },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
-
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
- }
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
}
//#endregion
--
Gitblit v1.9.1