From 577d524f4b59d7434f2403061477d37159dfd1c0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 六月 2023 09:21:35 +0800
Subject: [PATCH] 出站单列表增加多选审核功能，增加判断条件，反审核人和审核人必须是同一个
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 2
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html | 4
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 3
WebTM/views/index.html | 124 +++++++++++++++++++++-------------------
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBillList.html | 24 +++++---
WebTM/views/车间管理/工序进站接收单/Cj_StationInBillList.html | 6 +-
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html | 16 -----
7 files changed, 88 insertions(+), 91 deletions(-)
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 622194b..b2cc4c0 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -304,7 +304,70 @@
<dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎/Gy_RoutingBillimport.html">宸ヨ壓璺嚎鏁版嵁瀵煎叆</a></dd>
</dl>
<dd>
- <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+ <dd>
+ <a>宸ヨ壓璺嚎澶х被</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="璁″垝绠＄悊/宸ヨ壓璺嚎澶х被/Gy_RoutingGroupList.html">宸ヨ壓璺嚎澶х被</a></dd>
+ </dl>
+ <dd>
+ <dd>
+ <a>鏃ヨ鍒掑钩鍙�</a>
+ <dl class="layui-nav-child">
+ <dd>
+ <a>鐢熶骇璁″垝骞冲彴</a>
+ <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>
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鏃ヨ鍒掑伐鍗�</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
+ <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
+ </dl>
+ </dd>
+ <dd>
+ <a>瑕佹枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎻愭枡璁″垝</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鍩虹璧勬枡</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鍗虫椂搴撳瓨</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
+ </dl>
+ </dd>
+ <dd>
+ <a>鎶ヨ〃</a>
+ <dl class="layui-nav-child">
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
+ <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
+ </dl>
+ </dd>
+ </dl>
+ </dd>
</dl>
</li>
<!-- 鐢熶骇绠＄悊 -->
@@ -378,64 +441,7 @@
<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鍖呰鍗�/Sc_PackUnionBill.html">缁勬墭鍗曠淮鎶�</a></dd>
</dl>
</dd>
- <dd>
- <a>鏃ヨ鍒掑钩鍙�</a>
- <dl class="layui-nav-child">
- <dd>
- <a>鐢熶骇璁″垝骞冲彴</a>
- <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>
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇璁″垝骞冲彴/Sc_ICMOSortBillList.html" style="margin: 0 0 0 13px;">鐢熶骇鏃ヨ鍒掓煡璇�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鏃ヨ鍒掑伐鍗�</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillList.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗曞垪琛�</a></dd>
- <!--<dd><a lay-href="鐢熶骇绠＄悊/鐢熶骇鏃ヨ鍒掑伐鍗�/JIT_DayPlanBillEdit.html" style="margin: 0 0 0 13px;">鏃ヨ鍒掑伐鍗�</a></dd>-->
- </dl>
- </dd>
- <dd>
- <a>瑕佹枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/瑕佹枡璁″垝/JIT_NeedMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎻愭枡璁″垝</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlaBillnList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗曞垪琛�</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鎻愭枡璁″垝/JIT_LiftMaterPlanBillEdit.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鍗�</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鍩虹璧勬枡</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Gy_WorkWarehouseBillList.html" style="margin: 0 0 0 13px;">杞﹂棿浠撳簱瀵圭収鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/Cg_PODemandPlanConfigBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝淇℃伅鍒楄〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掑熀纭�璧勬枡/JIT_NeedMaterPlanConfigBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝淇℃伅鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鍗虫椂搴撳瓨</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鍗虫椂搴撳瓨/JIT_InventoryList.html" style="margin: 0 0 0 13px;">鍗虫椂搴撳瓨鍒楄〃</a></dd>
- </dl>
- </dd>
- <dd>
- <a>鎶ヨ〃</a>
- <dl class="layui-nav-child">
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃(閲囪喘璁㈠崟缁村害)</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportPODemandPlanBillList_S.html" style="margin: 0 0 0 13px;">鎻愭枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportWorkDemandPlanBillList.html" style="margin: 0 0 0 13px;">瑕佹枡璁″垝鎶ヨ〃</a></dd>
- <dd><a lay-href="鐢熶骇绠＄悊/鏃ヨ鍒掓姤琛�/ReportMOMaterReadysBillList.html" style="margin: 0 0 0 13px;">榻愬鎶ヨ〃</a></dd>
- </dl>
- </dd>
- </dl>
- </dd>
+
</dl>
</li>-->
<!-- 杞﹂棿绠＄悊 -->
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 237b48a..a43bd46 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -400,7 +400,7 @@
//鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
for (var i = 0; i < num; i++) {
option.data.push({
- "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HWHID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
+ "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
})
j++;
}
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
index bae83ae..074204d 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillList.html"
@@ -570,22 +570,6 @@
//, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', hide: true}
//, { field: '璁″垝璺熻釜鍙�', title: '璁″垝璺熻釜鍙�', hide: true}
]]
- , done: function (res, curr, count) {
- var $data = $('div[lay-id="mainTable"]').find('.layui-table-body').find('tr').eq(0).find('td');
- var $head = $('div[lay-id="mainTable"]').find('.layui-table-header').find('tr').eq(0).find('th');
- var $total = $('div[lay-id="mainTable"]').find('.layui-table-total').find('tr').eq(0).find('td');
- for (var i = 0; i < $data.length; i++) {
- var l1 = $data.eq(i).find('div').width();
- var l2 = $head.eq(i).find('div').width();
- if (l1 > l2) {
- $head.eq(i).find('div').width(l1);
- $total.eq(i).find('div').width(l1);
- } else {
- $data.eq(i).find('div').width(l2);
- $total.eq(i).find('div').width(l2);
- }
- }
- }
};
}
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 0b5da50..ae8b64f 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"
@@ -482,14 +482,17 @@
function set_CheckBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length > 0) {
+ var InterID = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID.push(data[i].hmainid.toString());
+ }
//閫昏緫瀹℃牳鏂规硶
var wait = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_CheckBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -505,7 +508,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
}
}
@@ -513,14 +516,17 @@
function set_AbandonCheck() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1) {
- var InterID = data[0].hmainid.toString();
+ if (checkStatus.data.length > 0) {
+ var InterID = [];
+ for (var i = 0; i < data.length; i++) {
+ InterID.push(data[i].hmainid.toString());
+ }
//閫昏緫瀹℃牳鏂规硶
var wait = layer.load();
$.ajax({
type: "GET",
url: GetWEBURL() + "/Cj_StationOutBill/set_AbandonCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": InterID.toString(), "CurUserName": sessionStorage["HUserName"] },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -536,7 +542,7 @@
});
}
else {
- layer.msg('璇烽�夋嫨涓�琛屾暟鎹鏍革紒');
+ layer.msg('璇烽�夋嫨鑷冲皯涓�琛屾暟鎹鏍革紒');
}
}
@@ -626,7 +632,7 @@
function set_ClearQuery() {
$("#HWorkBillNo").val("");
$("#HBillNo").val("");
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#HProcExchBillNo").val("");
$("#ColContent").val("");
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 04a0ebd..8f2c989 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"
@@ -1740,7 +1740,8 @@
"HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "HSupFlag": data[i].濮斿鏍囪 == 0 ? "false" : "true",
"HQty": HLZQty, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�,
+ "HRelationQty_OutBad":"0"
});
}
option.data = Tablerow;
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 bb4ba90..1813655 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"
@@ -387,7 +387,7 @@
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
function set_ClearBill() {
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栦富琛ㄥ垪琛�
set_InitGrid();
@@ -408,7 +408,7 @@
$("#SHPrintQty").val("");//鎵撳嵃鐘舵��
$("input[type='checkbox'][name='wybj']").prop('checked', false);
form.render("checkbox");//濮斿鏍囪
- $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
+ $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
$("#HOrderProcNO").val("");//璁㈠崟璺熻釜鍙�
$("#SHname").val("");//鐗╂枡|瀛愪欢鍚嶇О|瀛愪欢瑙勬牸
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
index 529a4e0..49986f1 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\350\277\233\347\253\231\346\216\245\346\224\266\345\215\225/Cj_StationInBillList.html"
@@ -341,7 +341,7 @@
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
option = {
elem: '#mainTable'
@@ -437,7 +437,7 @@
, toolbar: '#toolbarDemo'
, cols: [col]
, data: data1.data
- , height: 550
+ , height: 'full-50'
, page: true
, cellMinWidth: 90
, limit: 50
@@ -547,7 +547,7 @@
$("#HWorkBillNo").val("");
$("#HBillNo").val("");
$("#宸ュ簭娴佽浆鍗″彿").val("");
- $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
+ $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 7), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
$("#ColContent").val("");
$("#ColName").val("0");
--
Gitblit v1.9.1