From be7ddfe0456fc4eb2ca49fa364e7967f66e5eb00 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期四, 25 四月 2024 13:46:18 +0800
Subject: [PATCH] 1
---
WebTM/views/仓存管理/仓库调拨/Add_Edit_Kf_MoveStockBill.html | 140 ++++++++--
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockRequestBillList.html | 3
WebTM/views/车间管理/工序流转卡/MES_ColorRecordBillList.html | 5
WebTM/views/基础资料/生产基础资料/Gy_SOPBillEdit.html | 186 +++++++++-----
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 79 ++++-
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillList.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 2
WebTM/views/领料发货/分步式调出单/Fb_StepFoldOutBillEdit.html | 81 +++--
WebTM/views/生产管理/作业指导书/Gy_SOPBill_Video.html | 92 +++++-
WebTM/views/仓存管理/分步式调入单/Fb_StepFoldinBillEdit.html | 131 +++++++--
10 files changed, 513 insertions(+), 208 deletions(-)
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
index a0314a6..b873acc 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Add_Edit_Kf_MoveStockBill.html"
@@ -1198,15 +1198,19 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HMaterID": OptionData.HMaterID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
});
}
@@ -1232,17 +1236,20 @@
}
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
-
"HPropertyID": checkStatus.data[0].HItemID,
"杈呭姪灞炴��": checkStatus.data[0].杈呭姪灞炴�у悕绉�
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HPropertyID": OptionData.HItemID
- , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HPropertyID": OptionData.HItemID
+ , "杈呭姪灞炴��": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -1277,10 +1284,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -1312,11 +1323,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
@@ -1350,10 +1365,14 @@
layer.close(index);//鍏抽棴寮圭獥
}
, end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -1385,11 +1404,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSPID": OptionData.HItemID
- , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSPID": OptionData.HItemID
+ , "浠撲綅鍚嶇О": OptionData.浠撲綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -1517,7 +1540,29 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
+ //鏈鏍� 宸插叧闂殑鍗曞瓙涓嶅厑璁镐笅鎺�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = getPushSource_MoveStockRequestInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ if (temp != "none") {
+ if (temp.鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ if (temp.琛岀姸鎬� != "") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ } else {
+ return;
+ }
+ }
+
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1654,6 +1699,33 @@
}
//#endregion
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曡皟鎷ㄧ敵璇峰崟鏁版嵁
+ function getPushSource_MoveStockRequestInBillInit(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Kf_MoveStockBill/loadKf_MoveStockBillMain_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
//#endregion
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
index dc196fe..ee82b3f 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\344\273\223\345\272\223\350\260\203\346\213\250/Kf_MoveStockRequestBillList.html"
@@ -254,6 +254,8 @@
, { field: 'HBillSubType', title: '鍗曟嵁绫诲瀷', hide: true, sort: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 160, sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 160, sort: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 160, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 160, sort: true }
, { field: 'HEmpID', title: 'HEmpID', width: 160, hide: true, sort: true }
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 200, sort: true }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', width: 200, sort: true }
@@ -281,6 +283,7 @@
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 200, sort: true }
, { field: '搴旀敹鏁伴噺', title: '搴旀敹鏁伴噺', width: 115, sort: true, totalRow: true}
, { field: '瀹炴敹鏁伴噺', title: '瀹炴敹鏁伴噺', width: 200, sort: true, totalRow: true }
+ , { field: '鍏宠仈鏁伴噺', title: '鍏宠仈鏁伴噺', width: 200, sort: true, totalRow: true }
, { field: '鍗曚环', title: '鍗曚环', width: 200, sort: true, totalRow: true }
, { field: '閲戦', title: '閲戦', width: 200, sort: true, totalRow: true }
, { field: 'HWHID', title: 'HWHID', width: 115, hide: true, sort: true }
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
index 1582188..8b37334 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\345\210\206\346\255\245\345\274\217\350\260\203\345\205\245\345\215\225/Fb_StepFoldinBillEdit.html"
@@ -758,15 +758,19 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HMaterID": OptionData.HMaterID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -797,11 +801,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -832,11 +840,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSecUnitID": OptionData.HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -867,11 +879,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -902,11 +918,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -956,7 +976,29 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+ //layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
+ //鏈鏍� 宸插叧闂殑鍗曞瓙涓嶅厑璁镐笅鎺�
+ for (var i = 0; i < checkStatus.data.length; i++) {
+ var temp = getPushSource_ICStockInBillInit(checkStatus.data[i].hmainid, checkStatus.data[i].hsubid);
+ if (temp != "none") {
+ if (temp.鐘舵�� != "宸插鏍�") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戝崟鎹姸鎬佷笉涓哄凡瀹℃牳鐘舵��!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ if (temp.琛岀姸鎬� != "") {
+ layer.msg("涓嬫帹澶辫触!鍗曟嵁鍙枫��" + temp.鍗曟嵁鍙� + "銆戜笅閫変腑鐨勮褰曚腑瀛樺湪宸插叧闂姸鎬佺殑璁板綍!");
+ layer.close(index);//鍏抽棴寮圭獥
+ return;
+ }
+
+ } else {
+ return;
+ }
+ }
+
//鑾峰彇鍒嗘寮忚皟鍏ュ崟閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -990,7 +1032,7 @@
, "HSecManagerName": data.楠屾敹
, "HKeeperID": data.HKeeperID
, "HKeeperName": data.淇濈鍛�
- , "HSourceBillType": data.鍗曟嵁绫诲瀷
+ //, "HSourceBillType": data.鍗曟嵁绫诲瀷
});
@@ -1271,6 +1313,33 @@
}
//#endregion
+ //#region 鏍规嵁涓诲唴鐮佷笌瀛愬唴鐮佽幏鍙栨簮鍗曢噰璐叆搴撳崟鏁版嵁
+ function getPushSource_ICStockInBillInit(HSourceInterID, HSourceEntryID) {
+ var res = "none";
+ $.ajax({
+ url: GetWEBURL() + "/Kf_StepFoldInBill/loadKf_ICStockBillMain_Push",
+ async: false,
+ type: "GET",
+ data: {
+ "HInterID": HSourceInterID
+ , "HSubID": HSourceEntryID
+ },
+ success: function (result) {
+ if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ res = result.data[0];
+ } else {
+ res = result.data;
+ //layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
+ }
+ }, error: function () {
+ res = "none";
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ return res;
+ }
+ //#endregion
+
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
index 6c11c1c..230a5b5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SOPBillEdit.html"
@@ -66,20 +66,20 @@
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HBillNo" style="width:190px;">
+ <input type="text" class="layui-input" id="HBillNo" name="HBillNo" style="width:190px;">
<input type="hidden" name="HInterID" id="HInterID" class="layui-input" value="0">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鏃ユ湡</label>
<div class="layui-input-inline">
- <input type="date" class="layui-input" id="HDate" style="width:190px;">
+ <input type="date" class="layui-input" id="HDate" name="HDate" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">鎸囧涔﹀悕绉�</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HName" style="width:190px;">
+ <input type="text" class="layui-input" id="HName" name="HName" style="width:190px;">
</div>
</div>
</div>
@@ -97,13 +97,13 @@
<div class="layui-inline">
<label class="layui-form-label">浜у搧鍚嶇О</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HMaterName" style="width:190px;">
+ <input type="text" class="layui-input" id="HMaterName" name="HMaterName" style="width:190px;">
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label">瑙勬牸鍨嬪彿</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HMaterModel" style="width:190px;">
+ <input type="text" class="layui-input" id="HMaterModel" name="HMaterModel" style="width:190px;">
</div>
</div>
</div>
@@ -122,7 +122,7 @@
<div class="layui-inline">
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-inline">
- <input type="text" class="layui-input" id="HRemark" style="width:514px;">
+ <input type="text" class="layui-input" id="HRemark" name="HRemark" style="width:514px;" value="">
</div>
</div>
</div>
@@ -151,32 +151,18 @@
<table id="right_table" border="1" style="border-collapse: collapse;">
<thead>
<tr>
- <!--<th>娆″簭鍙�</th>
- <th>闄勪欢璺緞</th>
- <th>闄勪欢鏂囦欢绫诲瀷</th>
- <th>闄勪欢鍚�</th>
- <th>涓婁紶鏃ユ湡</th>
- <th>涓婁紶浜�</th>-->
<th style="min-width:100PX">鏂囦欢鍚�</th>
<th style="min-width:100PX">澶у皬</th>
<th style="min-width:100PX">鐘舵��</th>
<th style="min-width:100PX">鎿嶄綔</th>
- </tr>
- <!--<tr>
- <td><input type="text" class="layui-input" id="test" style="max-width:50px" readonly></td>
- <td>2</td>
- <td>3</td>
- <td>4</td>
- <td>5</td>
- <td>6</td>
- </tr>-->
+ </tr>
</thead>
<tbody id="ProImgByList">
</tbody>
</table>
</div>
- <div class="right-button">
- <button type="button" class="layui-btn layui-btn-primary" id="ChoseFile" lay-submit="" lay-filter="Add_Row" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>
+ <div class="right-button" id="submitbtngroup">
+ <!--<button type="button" class="layui-btn layui-btn-primary" id="ChoseFile" lay-submit="" lay-filter="Add_Row" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>-->
<!--<button type="button" class="layui-btn layui-btn-primary" id="delete" lay-submit="" lay-filter="Add_Row" style="color:#232389">鍒犻櫎</button>-->
</div>
</div>
@@ -276,7 +262,7 @@
});
set_AddFNew();
set_AddFNew2();
- PicUpload();
+ //PicUpload();
}
else if (OperationType == 3) {//缂栬緫
set_EditFromGrid(linterid);
@@ -287,7 +273,11 @@
//琛岀洃鍚簨浠�
table.on('row(mainTable)', function (obj) {
+ $("#ChoseFile").remove();
HEntryID = Number($(obj.tr).attr("data-index")) + Number(1);
+ //submitbtngroup 杩欎釜鏄笂浼犳寜閽殑鐖惰妭鐐� 鍔ㄦ�佹坊鍔犱笂浼犳寜閽� 瑙ｅ喅涓婁紶涓�娆′箣鍚巆hoose鏂规硶涓嶆墽琛岀殑bug
+ $("#submitbtngroup").append('<button type = "button" class="layui-btn layui-btn-primary" lay-submit lay-filter="ChoseFile" id="ChoseFile" style="color:#232389;background-color:#D4D2CF">閫夋嫨鏂囦欢</button>');
+
var flag = !obj.tr.find(':checkbox:first').prop('checked');
obj.tr.find(':checkbox').prop('checked', flag);
if (flag) {
@@ -313,7 +303,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "娴佹按鍙�": "", "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "澶囨敞": "" };
+ var NewRow = { "娴佹按鍙�": "", "HProcID": 0, "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "HWorkStationID": 0, "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HRemark": "" };
console.log(NewRow);
switch (obj.event) {
//鏂板涓�琛�
@@ -426,6 +416,9 @@
$("#HMaterName").val(checkStatus.data[0].鐗╂枡鍚嶇О);
$("#HMaterModel").val(checkStatus.data[0].瑙勬牸鍨嬪彿);
$("#HMaterID").val(checkStatus.data[0].HItemID);
+ $("#HUnitID").val(checkStatus.data[0].HUnitID);
+ $("#HUnitNumber").val(checkStatus.data[0].璁￠噺鍗曚綅浠ｇ爜)
+ $("#HUnitName").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) {
@@ -440,40 +433,39 @@
}
});
});
-
+
//淇濆瓨
form.on('submit(Saver)', function (data) {//淇濆瓨
- var HMaterNumber = $('#HMaterNumber').val();
- var HUnitName = $('#HUnitName').val();
- //瀵硅薄娣诲姞灞炴��
- data.field.HBillNo = $("#HBillNo").val();
- data.field.HProcID = HProcID;
- data.field.HWorkStationID = HWorkStationID;
- data.field.HCenterID = HCenterID;
- data.field.HProcNo = HProcNo;
- data.field.HRemark = HRemark;
- var user = sessionStorage["HUserName"];
- var oMain = JSON.stringify(data.field)
- var sMainSub = oMain + ';' + 0 + ';' + user;
-
- if (HMaterNumber == "") {
- layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
+
+ var num = [];
+ for (var i = 0; i < table.cache["mainTable"].length; i++) {
+ if (table.cache["mainTable"][i] != "") {
+ table.cache["mainTable"][i].LAY_TABLE_INDEX = i;
+ num.push(table.cache["mainTable"][i])
+ }
}
- if (HUnitName == "") {
- layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
- layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
- if (option.data[0].宸ヤ綔涓績 == "") {
- layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return false;
- }
+
+ var sMainStr = JSON.stringify(data.field);
+ var sSubStr = JSON.stringify(num);
+ var sMainSub = sMainStr + ';' + sSubStr + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ //if (HMaterNumber == "") {
+ // layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (HUnitName == "") {
+ // layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
+ // layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
+ //if (option.data[0].宸ヤ綔涓績 == "") {
+ // layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ //}
$.ajax({
- url: GetWEBURL() + '/Gy_SOPBill/ModifyByID',
+ url: GetWEBURL() + '/Gy_SOPBill/Save',
type: "POST",
data: { "oMain": sMainSub },
success: function (data1) {
@@ -483,7 +475,7 @@
//layer.close(wait);
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
$('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);
- $('#delete').removeClass("layui-btn-disabled").attr("disabled", false);
+ $('#delete').removeClass("layui-btn-disabled").attr("disabled", false);
document.getElementById("ChoseFile").style.backgroundColor = 'white'
layer.msg("鍗曟嵁瀛樼洏瀹屾瘯锛佸崟鎹彿锛�" + $("#HBillNo").val())
} else {
@@ -496,6 +488,63 @@
}
});
});
+
+ ////淇濆瓨
+ //form.on('submit(Saver)', function (data) {//淇濆瓨
+ // var HMaterNumber = $('#HMaterNumber').val();
+ // var HUnitName = $('#HUnitName').val();
+ // //瀵硅薄娣诲姞灞炴��
+ // data.field.HBillNo = $("#HBillNo").val();
+ // data.field.HProcID = HProcID;
+ // data.field.HWorkStationID = HWorkStationID;
+ // data.field.HCenterID = HCenterID;
+ // data.field.HProcNo = HProcNo;
+ // data.field.HRemark = HRemark;
+ // var user = sessionStorage["HUserName"];
+ // var oMain = JSON.stringify(data.field)
+
+ // var sMainSub = oMain + ';' + 0 + ';' + user;
+
+ // if (HMaterNumber == "") {
+ // layer.msg("浜у搧娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (HUnitName == "") {
+ // layer.msg("鍗曚綅娌℃湁閫夋嫨!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (option.data[0].娴佹按鍙� == "" && option.data[0].宸ュ簭浠ｇ爜 == "" && option.data[0].宸ュ簭 == "" && option.data[0].宸ヤ綅 == "" && option.data[0].宸ヤ綅浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績浠ｇ爜 == "" && option.data[0].宸ヤ綔涓績 == "" && option.data[0].澶囨敞 == "") {
+ // layer.msg("娌℃湁鏄庣粏琛�!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // if (option.data[0].宸ヤ綔涓績 == "") {
+ // layer.msg("宸ヤ綔涓績涓嶈兘涓虹┖!", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return false;
+ // }
+ // $.ajax({
+ // url: GetWEBURL() + '/Gy_SOPBill/ModifyByID',
+ // type: "POST",
+ // data: { "oMain": sMainSub },
+ // success: function (data1) {
+ // if (data1.count == 1) {
+ // option.data = arr;
+ // table.render(option);
+ // //layer.close(wait);
+ // $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ // $('#ChoseFile').removeClass("layui-btn-disabled").attr("disabled", false);
+ // $('#delete').removeClass("layui-btn-disabled").attr("disabled", false);
+ // document.getElementById("ChoseFile").style.backgroundColor = 'white'
+ // layer.msg("鍗曟嵁瀛樼洏瀹屾瘯锛佸崟鎹彿锛�" + $("#HBillNo").val())
+ // } else {
+ // //layer.close(wait);
+ // layer.alert(data1.Message, { icon: 5 });
+ // }
+ // }, error: function () {
+ // //layer.close(wait);
+ // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ // }
+ // });
+ //});
//鏀惧純
form.on('submit(Give_Up)', function (data) {//鏀惧純
layer.alert('鍗曟嵁灏氭湭淇濆瓨锛屾槸鍚︽斁寮冿紵', {
@@ -512,9 +561,7 @@
$('#HUnitName').val("");
$('#HRemark').val("");
- option.data = [{
- "娴佹按鍙�": "", "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "澶囨敞": ""
- }];
+ option.data = [{ "娴佹按鍙�": "", "HProcID": 0, "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "HWorkStationID": 0, "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HRemark": "" }];
table.render(option);
layer.close(index);
@@ -587,14 +634,17 @@
, cols: [[
{ type: 'checkbox', fixed: 'left' }
, { templet: '#xuhao', title: '搴忓彿', sort: true, fixed: 'left', event: "qwe", width: 100 }
- , { field: '娴佹按鍙�', title: '娴佹按鍙�', width: 200, edit: 'text' }
+ , { field: 'HProcNo', title: '娴佹按鍙�', width: 200, edit: 'text' }
+ , { field: 'HProcID', title: 'HProcID', width: 200, hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜', width: 200, sort: true, edit: 'text', event: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭', title: '宸ュ簭', width: 200 }
+ , { field: 'HWorkStationID', title: 'HWorkStationID', width: 200, hide: true }
, { field: '宸ヤ綅', title: '宸ヤ綅', width: 200, event: '宸ヤ綅', edit: 'text' }
, { field: '宸ヤ綅浠ｇ爜', title: '宸ヤ綅浠ｇ爜', width: 200 }
+ , { field: 'HCenterID', title: 'HCenterID', width: 200, hide: true }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜', width: 110, event: '宸ヤ綔涓績浠ｇ爜', edit: 'text' }
, { field: '宸ヤ綔涓績', title: '宸ヤ綔涓績', width: 110 }
- , { field: '澶囨敞', title: '澶囨敞', width: 110, edit: 'text' }
+ , { field: 'HRemark', title: '澶囨敞', width: 110, edit: 'text' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width:80 }
]]
, limits: [50, 500, 5000, 20000]
@@ -632,9 +682,7 @@
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
- option.data = [{
- "娴佹按鍙�": "", "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "澶囨敞": ""
- }];
+ option.data = [{ "娴佹按鍙�": "", "HProcID": 0, "宸ュ簭浠ｇ爜": "", "宸ュ簭": "", "HWorkStationID": 0, "宸ヤ綅": "", "宸ヤ綅浠ｇ爜": "", "HCenterID": 0, "宸ヤ綔涓績浠ｇ爜": "", "宸ヤ綔涓績": "", "HRemark": "" }];
table.render(option);
}
function set_AddFNew2() {
@@ -704,6 +752,7 @@
return;
}
, choose: function (obj) {
+
// 娓呯┖鍘嗗彶涓婁紶鏂囦欢锛岃В鍐砪hoose鍙墽琛屼竴娆＄殑闂锛侊紒锛�
uploadListIns.config.elem.next()[0].value = '';
@@ -738,7 +787,7 @@
ProImgByList.append(tr);
});
}
- , done: function (res, index, upload) {
+ , done: function (res, index, upload) {
if (res.code == 1) { //涓婁紶鎴愬姛
var tr = ProImgByList.find('tr#upload-' + index)
, tds = tr.children();
@@ -746,7 +795,7 @@
tds.eq(3).html(''); //娓呯┖鎿嶄綔
//tds.eq(3).find('.demo-reload').addClass('layui-hide'); //闅愯棌涓婁紶
return delete this.files[index]; //鍒犻櫎鏂囦欢闃熷垪宸茬粡涓婁紶鎴愬姛鐨勬枃浠�
- }
+ }
this.error(index, upload);
}
, error: function (index, upload) {
@@ -806,6 +855,7 @@
}
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ HProcID: checkStatus.data[0].HItemID,
宸ュ簭浠ｇ爜: checkStatus.data[0].宸ュ簭浠ｇ爜,
宸ュ簭: checkStatus.data[0].宸ュ簭鍚嶇О,
});
@@ -846,6 +896,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ HWorkStationID: checkStatus.data[0].HItemID,
宸ヤ綅: checkStatus.data[0].宸ヤ綅鍚嶇О,
宸ヤ綅浠ｇ爜: checkStatus.data[0].宸ヤ綅浠ｇ爜,
});
@@ -886,6 +937,7 @@
//鍚屾鏇存柊琛ㄦ牸鍜岀紦瀛樺搴旂殑鍊�
obj.update({
+ HCenterID: checkStatus.data[0].HItemID,
宸ヤ綔涓績浠ｇ爜: checkStatus.data[0].宸ヤ綔涓績浠ｇ爜,
宸ヤ綔涓績: checkStatus.data[0].宸ヤ綔涓績鍚嶇О,
});
@@ -912,8 +964,6 @@
table.cache["mainTable"].push(NewRow);
option.data = table.cache["mainTable"];
table.render(option);
- //rows++;
- layer.msg('澧炲姞涓�琛屾寜閽紒')
}
//澶嶅埗涓�琛�
function btnCopyLine(data) {
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
index 10938a3..c0f2480 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\275\234\344\270\232\346\214\207\345\257\274\344\271\246/Gy_SOPBill_Video.html"
@@ -48,13 +48,13 @@
<div class="layui-colla-item">
<!--top-->
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393">閫�鍑�</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit" style="background-color:#959393" onclick="Exit(event,this)">閫�鍑�</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto">鑷姩鎾斁</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Autoplay" style="background-color:#959393;margin-left:15px" id="auto" onclick="Autoplay(event,this)">鑷姩鎾斁</button>
</div>
<div class="layui-inline">
- <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo">闅愯棌瑙嗛</button>
+ <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="HideVideo" style="background-color:#959393;margin-left:15px" id="HideVideo" onclick="HideVideo(event,this)">闅愯棌瑙嗛</button>
</div>
<div class="layui-inline">
<h1 style="text-align: center;margin-left:100px"><b>宸ヤ綅浣滀笟鎸囧涔�</b></h1>
@@ -181,20 +181,9 @@
});
//#endregion
- var vvv = '';
- vvv += '<source src="../../../Files/flower.webm" type="video/webm" />'
- //$("#video").append(vvv);
-
- var video = document.querySelector("video");
-
- //寮�濮嬫挱鏀捐棰�
- video.addEventListener("play", (event) => {
- $('#test1').css('opacity', 0.5);
- });
- //缁撴潫鎾斁瑙嗛
- video.addEventListener("pause", (event) => {
- $('#test1').css('opacity', 1);
- });
+ //var vvv = '';
+ //vvv += '<source src="../../../Files/flower.webm" type="video/webm" />'
+ ////$("#video").append(vvv);
//#region 鍒ゆ柇鎿嶄綔绫诲瀷(杩欓噷娌＄敤鍒�)
if (OperationType == 1 || OperationType == 2) {//鏃犳簮鏂板
@@ -214,6 +203,17 @@
layer.alert("鏈煡鎿嶄綔绫诲瀷锛�", { icon: 5 });
}
//#endregion
+
+ var video = document.querySelector("video");
+
+ //寮�濮嬫挱鏀捐棰�
+ video.addEventListener("play", (event) => {
+ $('#test1').css('opacity', 0.5);
+ });
+ //缁撴潫鎾斁瑙嗛
+ video.addEventListener("pause", (event) => {
+ $('#test1').css('opacity', 1);
+ });
//鑾峰彇褰撳墠鐢熶骇璧勬簮鐨勭敓浜ц鍗�
get_Display(sWhere, HID);
@@ -317,21 +317,33 @@
}
option.data = data1.data;
table.render(option);
+ //鏀寔鎾斁鐨勮棰戞牸寮�
+ var videoExtensions = ['.mp4', '.webm', '.Ogg'];
for (let i = 0; i < data1.data.length; i++) {
var html = '';
if (data1.data[i].鏂囦欢绫诲瀷 == '.jpeg' || data1.data[i].鏂囦欢绫诲瀷 == '.jpg') {
var FileName = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath = data1.data[i].鏂囦欢鍦板潃;
//html += '<img src=`../../../Files/${FileName}` style="width:100%;height:100%">'
- html += '<div><img src=../SOP浣滀笟鎸囧涔�/' + FileName + ' alt="" style="width:100%;height:100%"></div>'
+ html += '<div><img src=../../../' + FilePath + ' alt="" style="width:100%;height:100%"></div>'
$("#file").append(html);
}
if (data1.data[i].鏂囦欢绫诲瀷 == '.pdf') {
var FileName2 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath2 = data1.data[i].鏂囦欢鍦板潃;
//<embed src="Test PDF.pdf" type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" />
- html += '<div><embed src="../SOP浣滀笟鎸囧涔�/' + FileName2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
+ html += '<div><embed src="../../../' + FilePath2 + '"' + ' type="application/pdf" style="width:100%;height:100%" internalinstanceid="81" /></div>'
$("#file").append(html);
}
+ if (videoExtensions.includes(data1.data[i].鏂囦欢绫诲瀷)) {
+ var FileName3 = data1.data[i].鏂囦欢鍚嶇О;
+ var FilePath3 = data1.data[i].鏂囦欢鍦板潃;
+ var vvv = '';
+ vvv += '<source src=../../../' + FilePath3 + ' type="video/webm" />'
+ $("#video").append(vvv);
+ }
+
}
if (data1.data.length == 0) {
@@ -469,6 +481,48 @@
function GetICMOBillValue(obj) {
get_Display_All(obj[0].HSourceID_b, obj[0].hmainid);
}
+
+ //閫�鍑烘寜閽偣鍑讳簨浠�
+ function Exit(event, obj) {
+ if (linterid == undefined) {
+ //鍏抽棴椤电
+ Pub_Close(2);
+ }
+ else {
+ //鍏抽棴椤电
+ Pub_Close(1);
+ }
+ }
+
+ //闅愯棌瑙嗛
+ function HideVideo(event, obj) {
+ if (document.getElementById("HideVideo").innerHTML == "闅愯棌瑙嗛") {
+ document.getElementById("IsHide").style.display = "none";//闅愯棌瑙嗛
+ document.getElementById("HideVideo").innerHTML = "鏄剧ず瑙嗛";
+ } else {
+ document.getElementById("IsHide").style.display = "inherit";//闅愯棌瑙嗛
+ document.getElementById("HideVideo").innerHTML = "闅愯棌瑙嗛";
+ }
+ }
+
+ //鑷姩鎾斁
+ function Autoplay(event, obj) {
+ var num = 0;
+ if (document.getElementById("auto").innerHTML == "鑷姩鎾斁") {
+ //ins.reload({ autoplay: true }) //杞挱鍥炬挱鏀炬柟寮忔敼涓鸿嚜鍔ㄦ挱鏀�
+ document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁";
+ var timer = setInterval(function () {
+ set_LoadAgain();
+ if (document.getElementById("auto").innerHTML === "鑷姩鎾斁") {
+ clearInterval(timer); //鏆傚仠鍛ㄦ湡鍑芥暟
+ }
+ }, 120000) //姣忛殧涓ゅ垎閽熸墽琛屼竴娆�
+ num = 1;
+ } else if (document.getElementById("auto").innerHTML = "鎵嬪姩鎾斁" && num == 0) {
+ //ins.reload({ autoplay: false }) //杞挱鍥炬挱鏀炬柟寮忔敼涓烘墜鍔ㄦ挱鏀�
+ document.getElementById("auto").innerHTML = "鑷姩鎾斁";
+ }
+ }
</script>
</body>
</html>
\ No newline at end of file
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/MES_ColorRecordBillList.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/MES_ColorRecordBillList.html"
index 60b8c3e..1d0df64 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/MES_ColorRecordBillList.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/MES_ColorRecordBillList.html"
@@ -231,7 +231,7 @@
//鍔犺浇鏁版嵁鍒扮綉鏍�
get_FastQuery();
- DisPlay_HideColumn();
+
}
//鍒楁槑鏄剧ず涓嬫媺妗�
@@ -250,6 +250,7 @@
//鍔犺浇缃戞牸
function get_Display(sWhere) {
+ sWhere += " order by 鏃ユ湡 desc ";
//鍔ㄦ�佸垪-缂撳瓨鍒楄〃
$.ajax({
url: GetWEBURL() + "/ColorRecord/ColorRecordList",
@@ -307,6 +308,8 @@
if ($("#Comparator").val() == 0 && $("#ColContent").val() == "") {
ColFilter();
}
+
+ DisPlay_HideColumn();
}
},
error: function (err) {
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
index 380504e..5c6541a 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\345\272\224\344\273\230\345\215\225/Cg_PayableBill.html"
@@ -77,10 +77,13 @@
<div class="layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
<div class="layui-input-inline">
- <select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
+ <select name="BillType" id="BillType" lay-verify="BillType">
+ <!--鍔ㄦ�佹覆鏌撴簮鍗曠被鍨�-->
+ </select>
+ <!--<select name="BillType" id="BillType" lay-filter="BillType" style="width: 180px; ">
<option style="color:blue;" selected="selected" value="1102">閲囪喘璁㈠崟</option>
<option style="color:blue;" value="1201">閲囪喘鍏ュ簱鍗�</option>
- </select>
+ </select>-->
</div>
</div>
<div class="layui-inline">
@@ -108,9 +111,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">閲囪喘鍛�</label>
+ <label class="layui-form-label">涓氬姟鍛�</label>
<div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" " class="layui-input" value="" style="background-color:#efefef4d;" readonly>
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HEmpList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -180,7 +183,7 @@
<div class="layui-inline">
<label class="layui-form-label">浠樻鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-block">
- <input type="date" class="layui-input" lay-verify="HPayDate" name="HPayDate" id="HPayDate" style="width:190px;">
+ <input type="date" class="layui-input" lay-verify="HReceiveDate" name="HReceiveDate" id="HReceiveDate" style="width:190px;">
</div>
</div>
</div>
@@ -379,6 +382,12 @@
//鍒濆鍖栧瓙琛�
set_InitGrid();
+ //鍒濆鍖栫粍缁�
+ Organ();
+
+ //鍒濆鍖� 鑾峰彇婧愬崟绫诲瀷
+ HSourceBillType();
+
//#region 鍒ゆ柇鎿嶄綔绫诲瀷骞跺垵濮嬪寲鐣岄潰
if (OperationType == 1) { //鏃犳簮鍗曟柊澧�
/* $("#HItemID").val(0);*/
@@ -411,8 +420,9 @@
DisPlay_HideColumn();
- //鍒濆鍖栫粍缁�
- Organ();
+
+
+
//#endregion
@@ -508,7 +518,7 @@
});
//#endregion
- //#region 閫夋嫨閲囪喘鍛樻寜閽�
+ //#region 閫夋嫨涓氬姟鍛樻寜閽�
form.on('submit(HEmpList)', function () {
get_checkEmp();
});
@@ -711,10 +721,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HOrgID").append(Organization);
- if (OperationType == 1 || OperationType == 4) {
- HOrgIDBar = sessionStorage["OrganizationID"];
- }
- $("#HOrgID").val(HOrgIDBar);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
form.render('select');
}
layer.closeAll("loading");
@@ -781,13 +788,13 @@
}
//#endregion
- //#region 閫夋嫨閲囪喘鍛�
+ //#region 閫夋嫨涓氬姟鍛�
function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
- , title: '閲囪喘鍛樺垪琛�'//鏍囬
+ , title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
, content: ['../../Baseset/鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
})
@@ -867,6 +874,30 @@
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
+ })
+ }
+ //#endregion
+
+ //#region 鑾峰彇婧愬崟绫诲瀷
+ function HSourceBillType() {
+ var HName = '搴斾粯鍗�';
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ async: false,
+ data: { "HName": HName, "Num": 2 }, //0钃濆崟 1绾㈠崟 2涓嶅垎绾㈣摑鍗�
+ url: GetWEBURL() + "/Web/GetHSourceBillType",
+ success: function (result) {
+ var HSourceBillTypes = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ HSourceBillTypes += '<option style="color:blue;" value="' + data[i].HSourceBillType + '">' + data[i].HSourceBillTypeName + '</option>';
+ }
+ $("#BillType").append(HSourceBillTypes);
+ form.render('select');
+ }
+ }
})
}
//#endregion
@@ -1024,7 +1055,7 @@
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
- //#endregion
+
switch (field) {
case "HQty": //鏁伴噺
@@ -1183,7 +1214,7 @@
default:
}
});
- //#endregion
+ //#endregion
//#endregion
//#endregion
@@ -1227,7 +1258,7 @@
, "HSSName": data.缁撶畻鏂瑰紡
, "HPSStyleID": data.HPSStyleID
, "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HPayDate": formatDate(data.浠樻鏃ユ湡)
+ , "HReceiveDate": formatDate(data.浠樻鏃ユ湡)
, "HRemark": data.琛ㄥご澶囨敞
, "HExplanation": data.鎽樿
, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
@@ -1346,7 +1377,7 @@
, "HMangerID": dataArray[0].HManagerID
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
- , "HEmpName": dataArray[0].閲囪喘鍛�
+ , "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
, "HCurID": dataArray[0].HCurID
@@ -1427,7 +1458,7 @@
, "HManagerID": dataArray[0].hmanagerid
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
- , "HEmpName": dataArray[0].閲囪喘鍛�
+ , "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
, "HSupName": dataArray[0].渚涘簲鍟�
, "HCurID": dataArray[0].HCurID
@@ -1442,7 +1473,7 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
@@ -2134,7 +2165,7 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].hmanagerid
+ , "HMangerID": dataArray[0].hmanagerid == null ? "0" : dataArray[0].hmanagerid
, "HMangerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
@@ -2154,13 +2185,13 @@
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
- "HMaterID": dataArray[i].hmaterid
+ "HMaterID": dataArray[i].HMaterID
, "鐗╂枡浠ｇ爜": dataArray[i].鐗╂枡浠ｇ爜
, "鐗╂枡鍚嶇О": dataArray[i].鐗╂枡鍚嶇О
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
- , "HUnitID": dataArray[i].hunitid
+ , "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].瀹炴敹鏁伴噺-dataArray[i].鍏宠仈鏁伴噺, 1)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
index 47a5695..1a98a71 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\346\224\266\346\226\231\351\200\232\347\237\245\345\215\225/Add_Edit_Cg_POInStockBillList.html"
@@ -1114,7 +1114,7 @@
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
- $('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
index 72d9d68..61f79f5 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillEdit.html"
@@ -710,15 +710,19 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HMaterID" :OptionData.HMaterID
- ,"鐗╂枡浠ｇ爜" : OptionData.鐗╂枡浠ｇ爜
- , "鐗╂枡鍚嶇О" :OptionData.鐗╂枡鍚嶇О
- ,"瑙勬牸鍨嬪彿" : OptionData.瑙勬牸鍨嬪彿
- ,"HUnitID" :OptionData.HUnitID
- ,"璁￠噺鍗曚綅" : OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length>0) {
+ obj.update({
+ "HMaterID": OptionData.HItemID
+ , "鐗╂枡浠ｇ爜": OptionData.鐗╂枡浠ｇ爜
+ , "鐗╂枡鍚嶇О": OptionData.鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": OptionData.瑙勬牸鍨嬪彿
+ , "HUnitID": OptionData.HUnitID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -749,11 +753,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -784,12 +792,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
- })
- }
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSecUnitID": OptionData.HItemID
+ , "杈呭姪璁￠噺鍗曚綅": OptionData.杈呭姪灞炴�у悕绉�
+ })
+ OptionData = [];
+ }
+
+ }
})
}
//璋冨叆浠撳簱
@@ -819,11 +831,15 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HWHID": OptionData.HItemID
- , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HWHID": OptionData.HItemID
+ , "璋冨叆浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
}
})
}
@@ -854,11 +870,16 @@
})
layer.close(index);//鍏抽棴寮圭獥
}
- , end: function () {
- obj.update({
- "HSCWHID": OptionData.HItemID
- , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
- })
+ , end: function () {
+ if (OptionData.length > 0) {
+ obj.update({
+ "HSCWHID": OptionData.HItemID
+ , "璋冨嚭浠撳簱": OptionData.浠撳簱鍚嶇О
+ })
+ OptionData = [];
+ }
+
+
}
})
}
diff --git "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html" "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
index 5e8e3d7..10465de 100644
--- "a/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
+++ "b/WebTM/views/\351\242\206\346\226\231\345\217\221\350\264\247/\345\210\206\346\255\245\345\274\217\350\260\203\345\207\272\345\215\225/Fb_StepFoldOutBillList.html"
@@ -266,6 +266,8 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 125, templet: "<div>{{d.鏃ユ湡 ==null ?'':layui.util.toDateString(d.鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 195, sort: true }
, { field: '鍗曟嵁绫诲瀷', title: '鍗曟嵁绫诲瀷', width: 110, sort: true, hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 195, sort: true }
+ , { field: '琛岀姸鎬�', title: '琛岀姸鎬�', width: 195, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 110, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 110, sort: true }
//, { field: '浠撳簱浠ｇ爜', title: '浠撳簱浠ｇ爜', width: 125, sort: true }
--
Gitblit v1.9.1