From 7883ec5dbbb7c9ce1007b9b2c47e355b779cc0f3 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 30 十一月 2021 18:16:30 +0800
Subject: [PATCH] 安瑞供应商基础资料去掉组织过滤
---
WebTM/views/PublicPage/SupplierInformation.html | 1
WebTM/views/模治具管理/模治具管理/Sb_Add_MouldRepairWorkBillList.html | 145 +++++++++++++++++++++++------------------------
WebTM/views/index.html | 2
3 files changed, 73 insertions(+), 75 deletions(-)
diff --git a/WebTM/views/PublicPage/SupplierInformation.html b/WebTM/views/PublicPage/SupplierInformation.html
index 57d124d..409f22f 100644
--- a/WebTM/views/PublicPage/SupplierInformation.html
+++ b/WebTM/views/PublicPage/SupplierInformation.html
@@ -194,6 +194,7 @@
}
});
sWhere1 = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere1 = " where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + sessionStorage["OrganizationID"] + " "; //鍒楄〃
});
//浠ヤ笂鏄痩ayui妯″潡
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 31efd80..6333e07 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -541,7 +541,7 @@
<dl class="layui-nav-child">
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">鍣ㄥ叿搴撳瓨鏌ヨ</a></dd>
<dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMaterialReceipt.html">鐗╂枡鏀跺彂鏄庣粏鍙婃眹鎬�</a></dd>
- <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportMouldStock.html">搴撳瓨鍙拌处</a></dd>
+ <dd><a lay-href="妯℃不鍏风鐞�/鍣ㄥ叿鎶ヨ〃/ReportInventoryAccount.html">搴撳瓨鍙拌处</a></dd>
<dd><a lay-href="">鍣ㄥ叿灞ュ巻琛╪</a></dd>
</dl>
</dd>
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
index 742e92d..90190b3 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sb_Add_MouldRepairWorkBillList.html"
@@ -354,7 +354,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;;
var AddRow = table.cache['mainTable'];
- var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
+ var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " "};
switch (obj.event) {
//澧炲姞涓�琛�
case 'btn-AddLine': set_AddLine(NewRow);
@@ -650,14 +650,10 @@
content: ['../../PublicPage/PurchOrder.html', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
- var checkStatus = "";
- $.ajax({
- success:
- checkStatus = data;
- })
+
//option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
//table.render(option);
- var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
+ //var NewRow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " };
//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
@@ -672,69 +668,70 @@
$("#HMainSourceBillNo").val(checkStatus.data[0].鍗曟嵁鍙�);
$("#HMainSourceInterID").val(checkStatus.data[0].hmainid);
$("#HMainSourceEntryID").val(checkStatus.data[0].hsubid);
- var list = [];
- for (var i = 0; i < checkStatus.data.length; i++) {
- list.push(checkStatus.data[i].鍗曟嵁鍙�)
- }
- if (isAllEqual(list)) //鐩稿悓鍗曞彿
- {
- var rowdate = layui.table.cache["mainTable"];
- if (rowdate.length == 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
- {
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < checkStatus.data.length; i++) {
- var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
- buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
- if (rowdate.length > 0 && rowdate.length <= checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate.length; i++) {
- var checkrow = {
- "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
- "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
- "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
- "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,
- "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷
- };
- buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
- if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
- {
- console.log(checkStatus.data.length);
- buttonArr = [];//娓呯┖鏁扮粍
- for (var i = 0; i < rowdate.length; i++) {
- var checkrow = {
- "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
- "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
- "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
- "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,
- "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[0].鍗曟嵁绫诲瀷
- };
- buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
- }
- //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
- table.reload("mainTable", {
- data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
- })
- }
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //var list = [];
+ //for (var i = 0; i < checkStatus.data.length; i++) {
+ // list.push(checkStatus.data[i].鍗曟嵁鍙�)
+ //}
+ //if (isAllEqual(list)) //鐩稿悓鍗曞彿
+ //{
+ // var rowdate = layui.table.cache["mainTable"];
+ // if (rowdate.length == 0) //琛ㄤ綋鏁版嵁涓虹┖鏃�
+ // {
+ // buttonArr = [];//娓呯┖鏁扮粍
+ // for (var i = 0; i < checkStatus.data.length; i++) {
+ // var checkrow = { "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid, "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷 };
+ // buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ // }
+ // //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ // table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ // })
+ // }
+ // if (rowdate.length > 0 && rowdate.length <= checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板皬浜庣瓑浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+ // {
+ // buttonArr = [];//娓呯┖鏁扮粍
+ // for (var i = 0; i < rowdate.length; i++) {
+ // var checkrow = {
+ // "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+ // "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+ // "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+ // "HSourceInterID": checkStatus.data[i].hmainid, "HSourceEntryID": checkStatus.data[i].hsubid,
+ // "HSourceBillNo": checkStatus.data[i].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[i].鍗曟嵁绫诲瀷
+ // };
+ // buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ // }
+ // //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ // table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ // })
+ // }
+ // if (rowdate.length > 0 && rowdate.length > checkStatus.data.length) //琛ㄤ綋鏁版嵁涓嶄负绌�,涓旇〃浣撴暟鎹鏁板ぇ浜庨�変腑甯﹀洖鏁版嵁琛屾暟
+ // {
+ // console.log(checkStatus.data.length);
+ // buttonArr = [];//娓呯┖鏁扮粍
+ // for (var i = 0; i < rowdate.length; i++) {
+ // var checkrow = {
+ // "HRepairID": rowdate[i].HRepairID, "HRepairCode": rowdate[i].HRepairCode, "HRepairName": rowdate[i].HRepairName,
+ // "HRepairExplanation": rowdate[i].HRepairExplanation, "HManagerID": rowdate[i].HManagerID, "HManagerCode": rowdate[i].HManagerCode,
+ // "HManagerName": rowdate[i].HManagerName, "HMoney": rowdate[i].HMoney, "HRemark": rowdate[i].HRemark,
+ // "HSourceInterID": checkStatus.data[0].hmainid, "HSourceEntryID": checkStatus.data[0].hsubid,
+ // "HSourceBillNo": checkStatus.data[0].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[0].鍗曟嵁绫诲瀷
+ // };
+ // buttonArr.push(checkrow); //灏嗕箣鍓嶇殑鏁版嵁瀛樺偍
+ // }
+ // //buttonArr.push(NewRow); //鍦ㄥ熬閮ㄥ姞涓�琛�
+ // table.reload("mainTable", {
+ // data: buttonArr //灏嗘暟鎹噸鏂拌浇鍏ヨ〃鏍�
+ // })
+ // }
- //console.log(rowdate.length);
- layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
- }
- else {
- layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
- }
+ // //console.log(rowdate.length);
+ // layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ //}
+ //else {
+ // layer.msg("璇烽�夋嫨鐩稿悓鍗曞彿!", { time: 1 * 2000, icon: 5 });
+ //}
}
, btn2: function (index, layero) {
@@ -838,10 +835,10 @@
, { field: 'HManagerName', title: '璐熻矗浜�', edit: 'text' }
, { field: 'HMoney', title: '缁翠慨璐圭敤', event: "", edit: 'text' }
, { field: 'HRemark', title: '澶囨敞', event: "", edit: 'text' }
- , { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�' }
- , { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�' }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' }
+ //, { field: 'HSourceInterID', title: '婧愬崟涓诲唴鐮�' }
+ //, { field: 'HSourceEntryID', title: '婧愬崟瀛愬唴鐮�' }
+ //, { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿' }
+ //, { field: 'HSourceBillType', title: '婧愬崟绫诲瀷' }
, { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo', width: 150 }
];
option = {
@@ -886,7 +883,7 @@
function set_EditFromGrid() {
set_EditForm(linterid); //缂栬緫鑾峰彇琛ㄥご
set_EditGrid(linterid); //缂栬緫鑾峰彇琛ㄤ綋
- option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " ", "HSourceInterID": 0, "HSourceEntryID": 0, "HSourceBillNo": " ", "HSourceBillType": " " }];
+ option.data = [{ "HRepairID": 0, "HRepairCode": "", "HRepairName": " ", "HRepairExplanation": " ", "HManagerID": 0, "HManagerCode": "", "HManagerName": " ", "HMoney": 0, "HRemark": " " }];
table.render(option);
}
//缂栬緫鍔犺浇琛ㄥご
--
Gitblit v1.9.1