From f7edef0ed54d8fa8894ac00ddace3828166d442b Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期日, 18 十二月 2022 23:57:30 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/PublicPage/HSourceReportHtml.html | 39 +++++++++----------
WebTM/views/模治具管理/器具维修派工单/Sc_MouldRepairSendWorkBillEdit.html | 5 +-
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill.html | 25 ++++++++----
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 32 +++++----------
WebTM/views/user/login.html | 2
WebTM/views/userfiles/images/1.jpg | 0
WebTM/views/设备管理/设备档案/Gy_EquipFileBillResume.html | 2
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 4 +-
WebTM/views/基础资料/工资基础资料/Add_Edit_Gy_WorkDay.html | 2
9 files changed, 54 insertions(+), 57 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 8cb53a7..0fe673e 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -199,10 +199,11 @@
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
+ layer.close(ajaxLoad);
for (var key in data1.list) {
resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- set_InitGrid(sWhere);
+ set_InitGrid(data1);
}, error: function (err) {
layer.alert(err.Message, { icon: 5 });
}
@@ -212,7 +213,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid(sWhere) {
+ function set_InitGrid(data1) {
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
@@ -238,24 +239,22 @@
}
//濉厖琛ㄦ牸鏁版嵁
table.render({
- elem: '#layTable',
- url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
- //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- title: '' + HSouceBillType + '',
- cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
- id: 'layTable', //琛ㄦ牸id
- where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
- page: true, //寮�鍚垎椤�
- totalRow: false, //寮�鍚悎璁�
- limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
- limits: [50, 500, 2000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
- method: 'get', //鎻愪氦鏂瑰紡
- layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
- height:600,
- response: {
- statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
- },
- done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ id: 'layTable'
+ , elem: '#layTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [cols_arr[0]]
+ , data: data1.data == null ? [] : data1.data
+ , title: '' + HSouceBillType + ''
+ , page: true //寮�鍚垎椤�
+ , totalRow: false //寮�鍚悎璁�
+ , cellMinWidth: 120
+ , height: 520
+ , limit: 50 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ , limits: [50, 500, 5000, 20000]
+ , method: 'get' //鎻愪氦鏂瑰紡
+ , layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
+ , loading: false
+ , done: function (res, curr, count) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
}
});
diff --git a/WebTM/views/user/login.html b/WebTM/views/user/login.html
index 63337dd..8ca4119 100644
--- a/WebTM/views/user/login.html
+++ b/WebTM/views/user/login.html
@@ -25,7 +25,7 @@
<div class="layadmin-user-login-main" style="margin: -5.8% auto;">
<div class="layadmin-user-login-box layadmin-user-login-header">
<h2 style="color:white;">L-MES</h2>
- <p style="color: white;">鏅轰簯杩堟�滾MES绠＄悊绯荤粺</p>
+ <p style="color: white;">瀹夌憺LMES绠＄悊绯荤粺</p>
</div>
<div class="layadmin-user-login-box layadmin-user-login-body layui-form">
<div class="layui-form-item">
diff --git a/WebTM/views/userfiles/images/1.jpg b/WebTM/views/userfiles/images/1.jpg
new file mode 100644
index 0000000..9b39f8d
--- /dev/null
+++ b/WebTM/views/userfiles/images/1.jpg
Binary files differ
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 95abda5..1ae50ff 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -99,7 +99,7 @@
<div class="layui-inline">
<label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -606,7 +606,7 @@
$("#HOrgID").append(Organization);
form.render('select');
}
- $('#HOrgID').find("option[value=" + result.data[0].ID + "]").attr("selected", true);
+ $('#HOrgID').find("option[value=" + sessionStorage["OrganizationID"] + "]").attr("selected", true);
form.render('select') //鍐嶆娓叉煋
layer.closeAll("loading");
}
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/Add_Edit_Gy_WorkDay.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/Add_Edit_Gy_WorkDay.html"
index 473c9c7..5aa4a49 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/Add_Edit_Gy_WorkDay.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/Add_Edit_Gy_WorkDay.html"
@@ -313,7 +313,7 @@
, "HNightbreakEnd": data.HNightbreakEnd
, "HNoonbreakBegin2": data.HNoonbreakBegin2
, "HNoonbreakEnd2": data.HNoonbreakEnd2
- , "HNightbreakEnd2": data.HNightbreakEnd2
+ , "HNightbreakBegin2": data.HNightbreakBegin2
, "HNightbreakEnd2": data.HNightbreakEnd2
});
layer.close(ajaxLoad);
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
index 61aefc0..2cb1e38 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\345\231\250\345\205\267\347\273\264\344\277\256\346\264\276\345\267\245\345\215\225/Sc_MouldRepairSendWorkBillEdit.html"
@@ -586,7 +586,7 @@
, area: ['90%', '90%'] //澶у皬
, title: '渚涘簲鍟嗚〃' //鏍囬
, shift: 2 //寮瑰嚭鍔ㄧ敾
- , content: ['../../Baseset/鍩虹璧勬枡/Gy_SupplierList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳涓� 鐨勫洖璋�
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮圭獥椤甸潰
@@ -597,7 +597,7 @@
//鑾峰彇鏁版嵁
$("#HSupID").val(checkStatus.data[0].HItemID);//渚涘簲鍟唅d
- $("#HSupIDName").val(checkStatus.data[0].HName);//渚涘簲鍟嗗悕绉�
+ $("#HSupIDName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);//渚涘簲鍟嗗悕绉�
//鍏抽棴椤甸潰
layer.close(index);
@@ -735,6 +735,7 @@
dataType: "json",
success: function (data) {
if (data.count == 1) {
+ $('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
layer.close(index);
layer.msg("鎻愪氦鎴愬姛");
}
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
index 5c51329..b236776 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\346\241\243\346\241\210/Gy_EquipFileBillResume.html"
@@ -395,7 +395,7 @@
sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + BenginHCreateDate + "'";
}
if (EndHCreateDate) {
- sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + EndHCreateDate + "'";
+ sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) <= '" + EndHCreateDate + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
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_StationOutBill.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_StationOutBill.html"
index 45c9c9f..6b1c21c 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_StationOutBill.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_StationOutBill.html"
@@ -147,19 +147,25 @@
</div>
</div>
<!--<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">褰撳墠宸ュ簭</label>
- <div class="layui-input-inline">
- <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <input type="hidden" name="HProcID" id="HProcID" value="0">
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">褰撳墠宸ュ簭</label>
+ <div class="layui-input-inline">
+ <input type="text" class="layui-input" name="HProcName" id="HProcName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
+ <input type="hidden" name="HProcID" id="HProcID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSQProcID-BT" id="HSQProcID-BT" style="width: 40px; padding: 0 10px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">娴佽浆鍗℃暟閲�</label>
<div class="layui-input-block">
<input type="text" class="layui-input" value="0" name="HPlanQty" style="width:190px;" id="HPlanQty">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">鏈嚭绔欐暟閲�</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" value="0" name="NoOutboundHqty" style="width:190px;" id="NoOutboundHqty">
</div>
</div>
</div>
@@ -990,6 +996,7 @@
"HProcID": data.HProcID
, "HCenterName": data.宸ヤ綔涓績
, "HCenterID": data.HCenterID
+ , "NoOutboundHqty": (data.娴佽浆鍗℃暟閲� - data.鍑虹珯鎶ュ簾鍏宠仈鏁伴噺 - data.鍑虹珯鍏宠仈鏁伴噺)
});
if (data.棣栭亾宸ュ簭 == "鏄�") {
FirstEndHProcNo = 1;
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 9c9a0c4..30d99ed 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -68,13 +68,9 @@
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
- <label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-inline">
- <input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
- <input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <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="HMaterNumber" id="HMaterNumber">
</div>
</div>
<div class="layui-inline">
@@ -83,14 +79,6 @@
<input type="text" class="layui-input" name="HBillNo" id="HBillNo">
</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="HModel" id="HModel" style="background-color:#efefef4d;" readonly>
- </div>
- </div>
- </div>
- <div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
<label class="layui-form-label">鐝粍</label>
<div class="layui-input-inline">
@@ -101,6 +89,8 @@
</button>
</div>
</div>
+ </div>
+ <div class="layui-row" style="margin: 10px 0 10px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍞竴ID</label>
<div class="layui-input-block" style="margin-left: 120px;">
@@ -220,10 +210,10 @@
});
});
- //鐗╂枡
- form.on('submit(btnHMaterID)', function (data) {//閫夋嫨浠撲綅
- get_btnHMaterID();
- });
+ ////鐗╂枡
+ //form.on('submit(btnHMaterID)', function (data) {
+ // get_btnHMaterID();
+ //});
//#endregion
@@ -232,7 +222,7 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
//鍒濆鍖栨椂闂�
- $("#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 * 10), "yyyy-MM-dd"));//寮�濮嬫棩鏈�
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));//缁撴潫鏃ユ湡
//鍒濆鍖栬〃鏍�
set_InitGrid();
@@ -374,6 +364,7 @@
$("#HProcExchBillNo").val("");
$("#HName").val("");
$("#HBillNo").val("");
+ $("#HMaterNumber").val("");
$("#F_BSV_WYID").val("");
$("#HState").val("0")
$("input[name='checkWRuku']").prop("checked", false);
@@ -402,7 +393,6 @@
}
$("#HMaterID").val(checkStatus.data[0].HItemID);
$("#HMaterNumber").val(checkStatus.data[0].HNumber);
- $("#HModel").val(checkStatus.data[0].HModel);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
})
--
Gitblit v1.9.1