From 2e7473a2bebf2465f587459cf8c66bed7795e1d5 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期六, 30 七月 2022 15:19:12 +0800
Subject: [PATCH] 凯贝
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 176 ++++++++++++++++-------------------
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 12 +-
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 41 +++++++
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 4
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 50 ++++++---
5 files changed, 161 insertions(+), 122 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index db6dc29..85f1cd5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -306,9 +306,9 @@
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
- url: GetWEBURL() + 'Gy_Group/EditBill',
+ url: GetWEBURL() + '/Gy_Group/DeltetGy_Group',
type: "GET",
- data: { "HItemID": ItemID },
+ data: { "HItemID": ItemID, "user": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 }, function () {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
index ae3c428..564537e 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBillList.html"
@@ -56,27 +56,34 @@
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
<div class="layui-colla-content">
- <div class="layui-inline">
+ <div class="layui-row">
<div class="layui-inline">
- <span>鍏朵粬鏉′欢></span>
+ <div class="layui-inline">
+ <span>鍏朵粬鏉′欢></span>
+ </div>
</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="HWorkBillNo" id="HWorkBillNo">
+ <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="HWorkBillNo" id="HWorkBillNo">
+ </div>
</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 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>
- <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="HProcExchBillNo" id="HProcExchBillNo">
+ <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="HProcExchBillNo" id="HProcExchBillNo">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 10px;">
+ <input type="checkbox" name="checkHWasterQty" id="checkHWasterQty" lay-skin="primary" lay-filter="checkHWasterQty" title="鎶ュ簾鏁伴噺涓嶄负0">
+ </div>
</div>
</div>
</div>
@@ -187,6 +194,7 @@
, { field: 'hmainid', title: 'hmainid', sort: true, hide: true }
, { field: '浠诲姟鍗�', title: '浠诲姟鍗�', width: 125 }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 190 }
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�' }
, { field: '宸ュ簭娴佽浆鍗″彿', title: '宸ュ簭娴佽浆鍗″彿', width: 125 }
, { field: 'HProcID', title: 'HProcID', hide: true }
, { field: '褰撳墠宸ュ簭浠ｇ爜', title: '褰撳墠宸ュ簭浠ｇ爜', width: 125 }
@@ -434,6 +442,8 @@
var HWorkBillNo = $("#HWorkBillNo").val();
var HBillNo = $("#HBillNo").val();
var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var checkHWasterQty = $("input[name='checkHWasterQty']").prop("checked");//澶嶉�夋
+
if (HBeginDate) {
sWhere += " and CONVERT(varchar(100),鍑虹珯鏃堕棿, 23) >= '" + HBeginDate + "'";
}
@@ -449,6 +459,12 @@
if (HProcExchBillNo) {
sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
}
+ if (HProcExchBillNo) {
+ sWhere += " and 宸ュ簭娴佽浆鍗″彿 like '%" + HProcExchBillNo + "%'";
+ }
+ if (checkHWasterQty) {
+ sWhere += " and 鎶ュ簾鏁伴噺>0 ";
+ }
if (HStatus) {
switch (HStatus) {
case '-1': //鍏ㄩ儴
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 9c2e203..7a1df58 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -235,8 +235,28 @@
</div>
</div>
+ <div class="layui-row">
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">婧愬崟瀹㈡埛浠ｇ爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HCusNumber" id="HCusNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPickLabel" id="HPickLabel" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ <div class="layui-col-xs6 layui-inline">
+ <label class="layui-form-label" style="width:12.5%">鍖呰鏍囪瘑缂栫爜</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HPickLabelNumber" id="HPickLabelNumber" placeholder="璇疯緭鍏ュ唴瀹�" onmouseover="this.title=this.value" style="width:610px;">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
- </div>
<!--鍏朵粬淇℃伅-->
<div class="layui-tab-item">
<div class="layui-form-item">
@@ -351,7 +371,18 @@
<input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
</div>
</div>
-
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
+ <div class="layui-col-xs3 layui-inline">
+ <label class="layui-form-label">鐗堟湰</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HVerNum" id="HVerNum" style="background-color:#efefef4d;" readonly>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -1648,6 +1679,9 @@
, "HDeleteMan": data.浣滃簾浜�
, "HUpDateDate": formatDate(data.淇敼鏃ユ湡)
, "HDeleteDate": formatDate(data.浣滃簾鏃ユ湡)
+ , "HCusNumber": data.婧愬崟瀹㈡埛缂栫爜
+ , "HPickLabel": data.鍖呰鏍囪瘑
+ , "HPickLabelNumber": data.鍖呰鏍囪瘑缂栫爜
});
@@ -1741,6 +1775,9 @@
$("#HMaterTexture").val(data.鏉愯川);
$("#HProductNum").val(data.鎴愬搧缂栧彿);
$("#HVerNum").val(data.鐗堟湰);
+ $("#HCusNumber").val(data.婧愬崟瀹㈡埛缂栫爜);
+ $("#HPickLabel").val(data.鍖呰鏍囪瘑);
+ $("#HPickLabelNumber").val(data.鍖呰鏍囪瘑缂栫爜);
$("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
btnHMaterID = data.hmaterid;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
index 6b3900a..9eb234f 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBillList.html"
@@ -363,6 +363,10 @@
, { field: 'HProcID', title: 'HProcID', hide: true}
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�', width:100 }
+ , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺', width: 120 }
+ , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺', width: 120 }
+ , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', width: 150 }
, { field: '杩斿伐鏍囪', title: '杩斿伐鏍囪' }
, { field: '鍔犲伐璇存槑', title: '鍔犲伐璇存槑' }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 115 }
@@ -370,9 +374,9 @@
, { field: '璁″垝鏁伴噺', title: '璁″垝鏁伴噺' }
, { field: 'hmainid', title: 'hmainid', hide: true}
, { field: '鏃ユ湡', title: '鏃ユ湡', sort: true }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
, { field: 'hicmointerid', title: 'hicmointerid', hide: true}
- , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿' }
+ , { field: '浠诲姟鍗曞彿', title: '浠诲姟鍗曞彿', width: 100}
, { field: 'HWorkShopID', title: 'HWorkShopID', hide: true}
, { field: '鐢熶骇杞﹂棿浠ｇ爜', title: '鐢熶骇杞﹂棿浠ｇ爜', width: 115 }
, { field: '鐢熶骇杞﹂棿', title: '鐢熶骇杞﹂棿' }
@@ -394,10 +398,6 @@
, { field: '濮斿鍔犲伐鍗曚綅', title: '濮斿鍔犲伐鍗曚綅' }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞' }
, { field: 'HBillType', title: 'HBillType', hide: true}
- , { field: '娴佽浆鍗℃暟閲�', title: '娴佽浆鍗℃暟閲�' }
- , { field: '杩涚珯鍏宠仈鏁伴噺', title: '杩涚珯鍏宠仈鏁伴噺' }
- , { field: '鍑虹珯鍏宠仈鏁伴噺', title: '鍑虹珯鍏宠仈鏁伴噺' }
- , { field: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺', title: '鍑虹珯鎶ュ簾鍏宠仈鏁伴噺' }
, { field: '琛屽叧闂汉', title: '琛屽叧闂汉' }
, { field: '鍏抽棴绫诲瀷', title: '鍏抽棴绫诲瀷' }
, { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞' }
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 deb3112..fcb1c9a 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,6 +76,8 @@
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnResCnz" id="btnReSearch" style="padding:0 5px">閲嶆柊鍚屾</button>-->
+
+
<div class="layui-colla-content">
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
@@ -194,7 +196,7 @@
, util = layui.util
//鏌ヨ鏉′欢
var sWhere = "";
- var option = []; var columns = [];
+ var option = [];
var Name = "MouldProdInHouseCellWidth";
//#endregion
@@ -296,6 +298,7 @@
});
//#endregion
+
//#region 姝ら〉闈㈡墍鏈夋柟娉�
function set_ClearBill() {
//鍒濆鍖栬〃鏍�
@@ -305,103 +308,87 @@
//鍔犺浇涓氬姟鍛�
get_HEmpName();
}
-
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
$("#HBeginDate").val("2022-03-14");
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- //columns = [
- // { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
- // ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
- // , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
- // , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
- // , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
- // , { field: 'HBillType', title: 'HBillType', hide: true }
- // , { field: 'HSupID', title: 'HSupID', hide: true }
- // , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100, hide: true }
- // , { field: '鍒嗛厤鐘舵��', title: '鍒嗛厤鐘舵��', width: 100 }
- // , { field: '鍙戝竷鐘舵��', title: '鍙戝竷鐘舵��', width: 100 }
- // , { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
- // , { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
- // , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120 }
- // , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
- // , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
- // , { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
- // , { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
- // , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
- // , { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
- // , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
- // , { field: 'HUnitID', title: 'HUnitID', hide: true }
- // , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
- // , { field: 'HUnitID', title: 'HUnitID', hide: true }
- // , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
- // , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
- // , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
- // , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
- // , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
- // , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120, hide: true}
- // , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
- // , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
- // , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 }
- // , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100}
- // , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
- // , { field: '閲囪喘鏂瑰紡浠ｇ爜', title: '閲囪喘鏂瑰紡浠ｇ爜', width: 120}
- // , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100}
- // , { field: 'HSSID', title: 'HSSID', hide: true }
- // , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 120}
- // , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100}
- // , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撶畻鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: 'HCurID', title: 'HCurID', hide: true }
- // , { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', width: 100}
- // , { field: '甯佸埆', title: '甯佸埆', width: 100}
- // , { field: '姹囩巼', title: '姹囩巼', width: 100}
- // , { field: 'HDeptID', title: 'HDeptID', hide: true }
- // , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100}
- // , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100}
- // , { field: 'HManagerID', title: 'HManagerID', hide: true }
- // , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 100}
- // , { field: '涓荤', title: '涓荤', width: 100}
- // , { field: 'HEmpID', title: 'HEmpID', hide: true }
- // , { field: '鎽樿', title: '鎽樿', width: 100}
- // , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
- // , { field: 'hsubid', title: 'hsubid', hide: true }
- // , { field: 'HMaterID', title: 'HMaterID', hide: true }
- // , { field: '鍗曚环', title: '鍗曚环', width: 100}
- // , { field: '閲戦', title: '閲戦', width: 100}
- // , { field: '绋庣巼', title: '绋庣巼', width: 100}
- // , { field: '绋庨', title: '绋庨', width: 100}
- // , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100}
- // , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100}
- // , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100}
- // , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
- // , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100}
- // , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '淇敼浜�', title: '淇敼浜�', width: 100}
- // , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100}
- // , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- // , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100}
- // , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
- //];
- $.ajax({
- url: GetWEBURL() + '/Cg_POOrderBill/list2',
- type: "GET",
- async: false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
- success: function (data1) {
- if (data1.count == 1) {
- columns = data1.data;
- columns.unshift({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- } else {
- layer.alert(data1.Message, { icon: 5 });
- }
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ var columns = [
+ { type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' }
+ ,{ field: 'hmainid', title: 'hmainid', sort: true, hide: true }
+ , { field: '鏃ユ湡', title: '鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 150 }
+ , { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 100 }
+ , { field: 'HBillType', title: 'HBillType', hide: true }
+ , { field: 'HSupID', title: 'HSupID', hide: true }
+ , { field: '涓氬姟鐘舵��', title: '涓氬姟鐘舵��', width: 100, hide: true }
+ , { field: '鍒嗛厤鐘舵��', title: '鍒嗛厤鐘舵��', width: 100 }
+ , { field: '鍙戝竷鐘舵��', title: '鍙戝竷鐘舵��', width: 100 }
+ , { field: '渚涘簲鍟嗗崗鍚岀姸鎬�', title: '渚涘簲鍟嗗崗鍚岀姸鎬�', width: 135 }/*鐗╂枡浠ｇ爜锛岀墿鏂欏悕绉帮紝瑙勬牸鍨嬪彿锛屾壒鍙凤紝鏁伴噺锛屽崟浣嶏紝婧愬崟鍗曞彿*/
+ , { field: '鍙嶉鐘舵��', title: '渚涘簲鍟嗗弽棣堢姸鎬�', width: 135 }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 200 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 130 }
+ , { field: '鏁伴噺', title: '璁㈠崟鏁伴噺', width: 100 }
+ , { field: '鎵撳嵃鏉＄爜鏁伴噺', title: '鎵撳嵃鏉＄爜鏁伴噺', width: 120 }
+ , { field: '鍏宠仈鏁伴噺', title: '宸插彂璐ф暟閲�', width: 120 }
+ , { field: '鏈叧鑱旀暟閲�', title: '鏈凡鍙戣揣鏁伴噺', width: 120 }
+ , { field: '瀹屾垚鐘舵��', title: '瀹屾垚鐘舵��', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: 'HUnitID', title: 'HUnitID', hide: true }
+ , { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 120 }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 100 }
+ , { field: '鎵瑰彿', title: '鎵瑰彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 100 }
+ , { field: '渚涘簲鍟嗕唬鐮�', title: '渚涘簲鍟嗕唬鐮�', width: 120, hide: true}
+ , { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 100, hide: true}
+ , { field: 'HPriority', title: 'HPriority', width: 100, hide: true }
+ , { field: '浼樺厛绾�', title: '浼樺厛绾�', width: 100 }
+ , { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', width: 100}
+ , { field: 'HPSStyleID', title: 'HPSStyleID', hide: true }
+ , { field: '閲囪喘鏂瑰紡浠ｇ爜', title: '閲囪喘鏂瑰紡浠ｇ爜', width: 120}
+ , { field: '閲囪喘鏂瑰紡', title: '閲囪喘鏂瑰紡', width: 100}
+ , { field: 'HSSID', title: 'HSSID', hide: true }
+ , { field: '缁撶畻鏂瑰紡浠ｇ爜', title: '缁撶畻鏂瑰紡浠ｇ爜', width: 120}
+ , { field: '缁撶畻鏂瑰紡', title: '缁撶畻鏂瑰紡', width: 100}
+ , { field: '缁撶畻鏃ユ湡', title: '缁撶畻鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.缁撶畻鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: 'HCurID', title: 'HCurID', hide: true }
+ , { field: '甯佸埆浠ｇ爜', title: '甯佸埆浠ｇ爜', width: 100}
+ , { field: '甯佸埆', title: '甯佸埆', width: 100}
+ , { field: '姹囩巼', title: '姹囩巼', width: 100}
+ , { field: 'HDeptID', title: 'HDeptID', hide: true }
+ , { field: '閮ㄩ棬浠ｇ爜', title: '閮ㄩ棬浠ｇ爜', width: 100}
+ , { field: '閮ㄩ棬', title: '閮ㄩ棬', width: 100}
+ , { field: 'HManagerID', title: 'HManagerID', hide: true }
+ , { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 100}
+ , { field: '涓荤', title: '涓荤', width: 100}
+ , { field: 'HEmpID', title: 'HEmpID', hide: true }
+ , { field: '鎽樿', title: '鎽樿', width: 100}
+ , { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
+ , { field: 'hsubid', title: 'hsubid', hide: true }
+ , { field: 'HMaterID', title: 'HMaterID', hide: true }
+ , { field: '鍗曚环', title: '鍗曚环', width: 100}
+ , { field: '閲戦', title: '閲戦', width: 100}
+ , { field: '绋庣巼', title: '绋庣巼', width: 100}
+ , { field: '绋庨', title: '绋庨', width: 100}
+ , { field: '浠风◣鍚堣', title: '浠风◣鍚堣', width: 100}
+ , { field: '浜よ揣鏃ユ湡', title: '浜よ揣鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浜よ揣鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', width: 100}
+ , { field: '琛ㄤ綋澶囨敞', title: '琛ㄤ綋澶囨敞', width: 100}
+ , { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 100}
+ , { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '瀹℃牳浜�', title: '瀹℃牳浜�', width: 100}
+ , { field: '瀹℃牳鏃ユ湡', title: '瀹℃牳鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.瀹℃牳鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '淇敼浜�', title: '淇敼浜�', width: 100}
+ , { field: '淇敼鏃ユ湡', title: '淇敼鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.淇敼鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '鍏抽棴浜�', title: '鍏抽棴浜�', width: 100}
+ , { field: '鍏抽棴鏃ユ湡', title: '鍏抽棴鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍏抽棴鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: '浣滃簾浜�', title: '浣滃簾浜�', width: 100}
+ , { field: '浣滃簾鏃ユ湡', title: '浣滃簾鏃ユ湡', width: 120, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.浣滃簾鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+
+ ];
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
@@ -427,7 +414,6 @@
// });
//}
}
-
//鍔犺浇缃戞牸
function get_Display(sWhere) {
var wait = layer.load();//閬僵
--
Gitblit v1.9.1