From 3aa2fd51bdc2cff4257e2ebbbd7237e263ddfa1a Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期三, 28 八月 2024 10:58:10 +0800
Subject: [PATCH] 采购模块新增部分bug修复
---
WebTM/views/基础资料/公用基础资料/Gy_Warehouse.html | 2
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_PoStockStyle.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 38 +++++--
WebTM/views/基础资料/基础资料/Gy_SettleStyle.html | 30 ++++++
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 6 +
WebTM/Vlog/webapi20240827.txt | 18 +++
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 4
WebTM/views/采购管理/应付单/Cg_PayableBill.html | 66 +++++++-----
WebTM/views/采购管理/付款单/YF_PayMentBill.html | 21 +++-
WebTM/views/基础资料/公用基础资料/Gy_Unit.html | 20 +++
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 7
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 59 +++++++----
15 files changed, 201 insertions(+), 78 deletions(-)
diff --git a/WebTM/Vlog/webapi20240827.txt b/WebTM/Vlog/webapi20240827.txt
index 3c50fd4..bc6cfae 100644
--- a/WebTM/Vlog/webapi20240827.txt
+++ b/WebTM/Vlog/webapi20240827.txt
@@ -7,3 +7,21 @@
2024/8/27 10:01:34 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
2024/8/27 10:01:34 ReportDataSet:1
+
+2024/8/27 16:34:49 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 0 order by hmainid desc
+
+2024/8/27 16:34:49 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:34:49 ReportDataSet:0
+
+2024/8/27 16:34:59 鎵撳嵃sql:select * from h_v_IF_POOrderBillList where hmainid = 0 order by hmainid desc
+
+2024/8/27 16:34:59 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:34:59 ReportDataSet:0
+
+2024/8/27 16:37:36 鎵撳嵃sql:select * from h_v_IF_POInStockBillList where hmainid =1000343580 order by hmainid desc
+
+2024/8/27 16:37:36 SqlConnStr:Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;
+
+2024/8/27 16:37:36 ReportDataSet:1
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
index bf5f0aa..52664e5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_DepartmentList.html"
@@ -1104,7 +1104,7 @@
var addSWhere = "";
- if (openType == 2 && HOrgName != undefined) {
+ if (openType == 2 && HOrgName != "undefined") {
addSWhere = " and 绂佺敤鏍囪 = '' ";
Organization = HOrgName.toString();
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
index 8a3ddeb..2e470ab 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_EmployeeList.html"
@@ -957,9 +957,13 @@
var HOrgID = params[params[1]];
if (typeof (openType) != "undefined") {
sWhere += " and 绂佺敤鏍囪 = '' ";
- //Organ(HOrgID);
+ if (typeof (HOrgID) != "undefined") {
+ Organ(HOrgID);
+ }
+
}
+
}
//#endregion
//#region 銆愯繃婊ゆ柟妗堛��
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
index dca547d..8766011 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_PoStockStyle.html"
@@ -929,7 +929,7 @@
var addSWhere = "";
- if (openType == 2 && HOrgName != undefined) {
+ if (openType == 2 && HOrgName != "undefined") {
addSWhere = " and 绂佺敤鏍囧織 = '鍚�' and 浣跨敤缁勭粐 = '" + HOrgName + "'";
}
return addSWhere;
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
index 084ceb0..cd4df9c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Unit.html"
@@ -194,7 +194,9 @@
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
- var ajaxLoad = layer.load();
+
+ var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_Unit/list1',
type: "GET",
@@ -770,6 +772,22 @@
return vars;
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType != undefined && HOrgName != "undefined") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ Organization = HOrgName.toString();
+ }
+ return addSWhere;
+ }
+ //#endregion
layer.close(index)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
index a63ac98..6967340 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Warehouse.html"
@@ -1220,7 +1220,7 @@
var addSWhere = "";
- if (openType == "2" && HOrgName != undefined) {
+ if ((openType != undefined) && HOrgName != "undefined") {
addSWhere = " and 绂佺敤鏍囪 = '' ";
Organization = HOrgName.toString();
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
index 1ad40a6..947a45c 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/Gy_SettleStyle.html"
@@ -258,6 +258,7 @@
function get_Display(sWhere) {
var wait = layer.load();//閬僵
var ajaxLoad = layer.load();
+ sWhere += addSWhereByOpenType();
$.ajax({
url: GetWEBURL() + '/Gy_SettleStyle/SettleStyleList',
type: "GET",
@@ -849,6 +850,35 @@
})
}
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ var HOrgName = decodeURI(params[params[1]]);
+
+ var addSWhere = "";
+
+ if (openType == "2") {
+ addSWhere = " and 绂佺敤鏍囪 = '' ";
+ /*Organization = HOrgName.toString();*/
+ }
+ return addSWhere;
+ }
+ //#endregion
+
//#endregion
});
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
index 3bfaa19..b191d1b 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\207\207\350\264\255\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Supplier.html"
@@ -1129,7 +1129,7 @@
var addSWhere = "";
- if (openType == "HSup" && HOrgName != undefined) {
+ if (openType != undefined && HOrgName != "undefined") {
addSWhere = " and 绂佺敤鏍囪 = '' ";
Organization = HOrgName.toString();
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
index bef09c9..a0f96aa 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\344\273\230\346\254\276\345\215\225/YF_PayMentBill.html"
@@ -819,13 +819,14 @@
//#region 寮圭獥椤甸潰鏂规硶
//#region 閫夋嫨閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -843,13 +844,14 @@
//#endregion
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -873,7 +875,7 @@
, area: ['90%', '90%']//澶у皬
, title: '甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -894,13 +896,14 @@
//#region 涓氬姟鍗曚綅閫夋嫨椤甸潰
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍗曚綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1086,7 +1089,7 @@
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1120,13 +1123,14 @@
//#region 缁撶畻鍗曚綅閫夋嫨椤甸潰
function get_checkAccSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鍗曚綅鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HAccSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1232,6 +1236,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { time: 1 * 1000, icon: 1 }, function () {
$('#btnSave').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
layer.msg("鎻愪氦鎴愬姛");
});
}
@@ -1733,6 +1738,10 @@
//#endregion
});
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
//#region 鑾峰彇鍙傛暟_浼犻�掔殑JSON鏍煎紡鍙傛暟
function getUrlVars_JSON() {
var datajson;
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 5b57107..3074712 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"
@@ -778,13 +778,14 @@
//#region 寮圭獥閫夋嫨鏂规硶
//#region 閫夋嫨閲囪喘閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -803,13 +804,14 @@
//#region 閫夋嫨閲囪喘涓荤
function get_checkManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘涓荤鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HManager&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -828,13 +830,14 @@
//#region 閫夋嫨涓氬姟鍛�
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -866,13 +869,14 @@
//#region 閫夋嫨閲囪喘鏂瑰紡
function get_checkSellS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -892,13 +896,14 @@
//#region 缁撶畻鏂瑰紡閫夋嫨椤甸潰
function get_checkSS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -923,7 +928,7 @@
, area: ['90%', '90%']//澶у皬
, title: '閲囪喘甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -2077,6 +2082,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -2085,30 +2091,30 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
- //鎸夐挳涓� 鐨勫洖璋�
- var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
- var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
+ //鎸夐挳涓� 鐨勫洖璋�
+ var iframeWindow = window["layui-layer-iframe" + index];//鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus("mainTable");//鑾峰彇閫変腑鐨勬暟鎹�
- if (checkStatus.data.length != 1) {
- return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ if (checkStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�");
+ }
+ OptionData = checkStatus.data[0];
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HUnitID": checkStatus.data[0].HItemID
+ , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
+ })
+ layer.close(index);//鍏抽棴寮圭獥
}
- OptionData = checkStatus.data[0];
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HUnitID": checkStatus.data[0].HItemID
- , "璁￠噺鍗曚綅": checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О
- })
- layer.close(index);//鍏抽棴寮圭獥
- }
- , end: function () {
- obj.update({
- "HUnitID": OptionData.HItemID
- , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
- })
- }
+ , end: function () {
+ obj.update({
+ "HUnitID": OptionData.HItemID
+ , "璁￠噺鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ })
+ }
})
}
obj.event = "";
@@ -2868,6 +2874,10 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
// 鍩虹璧勬枡杩斿洖鏁版嵁
function GetHEmpValue(obj) //杩斿洖涓氬姟鍛�
{
@@ -2943,8 +2953,8 @@
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[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 bab2c8f..2906ada 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"
@@ -966,6 +966,9 @@
//#region 鎵撳嵃
function get_PrintReport() {
+ if (linterid == null || linterid == "") {
+ linterid = $("#HInterID").val();
+ }
layer.open({
type: 2
, area: ['50%', '50%']
@@ -973,7 +976,7 @@
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: false //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOOrderBillByID', 'yes']
+ , content: ['../../BaseSet/SRM_OpenTmpList.html?linterid=' + linterid.toString() + '&MyMsg=' + linterid.toString() + '&Type=HPOInStockBillByID', 'yes']
, resize: false
})
}
@@ -1184,6 +1187,7 @@
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');//鎵撳嵃鏍煎紡
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
}
@@ -1360,13 +1364,14 @@
}
//渚涘簲鍟�
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1383,13 +1388,14 @@
}
//浠撳簱
function get_checkWH() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1423,7 +1429,7 @@
, area: ['90%', '90%']//澶у皬
, title: '甯佸埆鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Currency.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1442,13 +1448,14 @@
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1466,13 +1473,14 @@
}
//閮ㄩ棬
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1718,6 +1726,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1726,7 +1735,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1754,6 +1763,7 @@
}
//鏀舵枡浠撳簱
if (obj.event == "HWHID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1762,7 +1772,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1824,6 +1834,7 @@
}
//杈呭姪鍗曚綅
if (obj.event == "HSecUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1832,7 +1843,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2428,8 +2439,8 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
@@ -2447,7 +2458,10 @@
function GetAuxiliaryUnitValue(data) {
OptionData = data
}
-
+ //鍙屽嚮杩斿洖璐у竵
+ function GetGyCur(data) {
+ OptionData = data
+ }
//椤圭洰
function GetProjectBillValue(data) {
$("#HProjectName").val(data[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/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/Cg_POInStockBillList.html"
index 414abd8..ee92f1c 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/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/Cg_POInStockBillList.html"
@@ -565,7 +565,7 @@
content: '../../閲囪喘绠＄悊/鏀舵枡閫氱煡鍗�/Add_Edit_Cg_POInStockBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
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_POOrderBillEdit.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_POOrderBillEdit.html"
index a9d280d..5484d63 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_POOrderBillEdit.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_POOrderBillEdit.html"
@@ -1737,13 +1737,14 @@
}
//缁撶畻鏂瑰紡
function get_checkSS() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '缁撶畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍩虹璧勬枡/Gy_SettleStyle.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -2070,8 +2071,8 @@
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖璐у竵
function GetGyCur(data) {
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
index 04c14eb..4dc9552 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Add_Edit_Kf_POStockInBillList.html"
@@ -458,7 +458,7 @@
, data = checkStatus.data;
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
- "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "", "HQty": "", "HRemark": "",
+ "HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HQtyMust": "0", "HQty": "0", "HRemark": "",
"HPrice": "0", "HMoney": "0", "HOrderPrice": "0", "HWHID": 0, "鏀舵枡浠撳簱": "",
"HSPID": 0, "浠撲綅鍚嶇О": "", "HBatchNo": "", "HPOOrderInterID": 0, "HPOOrderEntryID": 0,
"HPOOrderBillNo": "", "HSeOrderInterID": 0, "HSeOrderEntryID": 0, "HSeOrderBillNo": "",
@@ -986,7 +986,7 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text' }
, { field: 'HMoney', title: '閲戦', width: 100, edit: 'text', totalRow: true }
, { field: 'HOrderPrice', title: '閲囪喘閲戦', width: 100, edit: 'text', totalRow: true}
- , { field: 'HWHID ', title: 'HWHID ', width: 100, hide: true }
+ , { field: 'HWHID', title: 'HWHID', width: 100, hide: true }
, { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 100, edit: 'text', event: "HWHID" }//f7
, { field: 'HSPID', title: 'HSPID', width: 100, hide: true }
, { field: '浠撲綅鍚嶇О', title: '浠撲綅鍚嶇О', width: 100, edit: 'text', event: "HSPID" }//f7
@@ -1114,8 +1114,11 @@
var HSourceBillData = getPushSource_POOrderBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID!=0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
+
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1137,8 +1140,10 @@
var HSourceBillData = getPushSource_POInStockBillInit(option.data[i].HSourceInterID, option.data[i].HSourceEntryID); //鑾峰彇婧愬崟鏁版嵁
if (HSourceBillData != "none") {
if (HSourceBillData == null) {
- layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
- return;
+ if (option.data[i].HSourceInterID != 0) {
+ layer.alert("淇濆瓨澶辫触!绗�" + (i + 1) + "琛岋細鏈煡璇㈠埌婧愬崟鍗曟嵁!", { icon: 5 });
+ return;
+ }
} else if (HSourceBillData.鐘舵�� != "宸插鏍�") {
var err = "淇濆瓨澶辫触!鍘熷洜锛氱" + (i + 1) + "琛�-婧愬崟鍗曟嵁鐘舵�佷负鈥�" + HSourceBillData.鐘舵�� + "鈥濓紝涓嶅厑璁镐繚瀛橈紒";
layer.alert(err, { icon: 5 });
@@ -1337,7 +1342,8 @@
});
//瀛愯〃 璧嬪��
- var rowdata = [];
+ var rowdata = [];
+
for (var i = 0; i < dataArray.length; i++) {
rowdata.push(
{
@@ -1347,9 +1353,11 @@
, "瑙勬牸鍨嬪彿": dataArray[i].瑙勬牸鍨嬪彿
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
- , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 1)
+ , "HQty": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
, "HPrice": dealDoubleToFixed(dataArray[i].鍗曚环, 3)
, "HTaxPrice": dealDoubleToFixed(dataArray[i].鍚◣鍗曚环, 3)
+ , "HQtyMust": dealDoubleToFixed(dataArray[i].鏁伴噺, 2)
+ , "HOrderPrice": dealDoubleToFixed(dataArray[i].鏁伴噺 * dataArray[i].鍗曚环, 2)
, 'HDiscountRate': "0" //
, 'HRelTaxPrice': "0"
, "HTaxRate": dataArray[i].绋庣巼
@@ -1467,6 +1475,7 @@
$('#add-btn').addClass("layui-btn-disabled").attr("disabled", true);
//淇濆瓨鍚庢祻瑙�
//ReRoadBillMain();
+ $('#print-btn').prop('disabled', false).removeClass('layui-btn-disabled');
}
else {
layer.alert(data.Message, { icon: 5 });
@@ -1484,13 +1493,14 @@
////#endregion
function get_checkEmp() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '涓氬姟鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1506,13 +1516,14 @@
})
}
function get_checkSup() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '渚涘簲鍟嗗垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup', 'yes']
+ , content: ['../../鍩虹璧勬枡/閲囪喘鍩虹璧勬枡/Gy_Supplier.html?Type=HSup&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1529,13 +1540,14 @@
}
//宸ョ▼椤圭洰
function get_btnHProjectID() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '椤圭洰鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html', 'yes']
+ , content: ['../../椤圭洰绠＄悊/宸ョ▼椤圭洰/PM_ProjectBillList.html?Type=2&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1552,13 +1564,14 @@
})
}
function get_checkWH() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?Type=HWH&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1585,13 +1598,14 @@
})
}
function get_checkSecManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '楠屾敹鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HSecManager&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1607,13 +1621,14 @@
})
}
function get_checkKeeper() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '淇濈鍛樺垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HKeeper&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1629,13 +1644,14 @@
})
}
function get_checkDept() {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '閮ㄩ棬鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1652,13 +1668,14 @@
}
function get_checkManager() {
+ var HOrgID = $("#HOrgID").val();
layer.open({
type: 2//寮圭獥绫诲瀷
, skin: 'layui-layer-rim' //鍔犱笂杈规
, area: ['90%', '90%']//澶у皬
, title: '璐熻矗浜哄垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HWorker&HOrgID=' + HOrgID, 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1829,6 +1846,7 @@
}
//璁￠噺鍗曚綅
if (obj.event == "HUnitID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1837,7 +1855,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?Type=2&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1864,6 +1882,7 @@
}
//鏀舵枡浠撳簱
if (obj.event == "HWHID") {
+ var HOrgName = $('select[name="HOrgID"] option:selected').text();
layer.open({
type: 2
, skin: "layui-layer-rim" //鍔犱笂杈规
@@ -1872,7 +1891,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=Warehouse&HOrgName=' + HOrgName, 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -2669,8 +2688,8 @@
OptionData = data
}
//鍙屽嚮杩斿洖璁￠噺鍗曚綅
- function GetGyUnit(data) {
- OptionData = data
+ function GetUnitValue(data) {
+ OptionData = data[0]
}
//鍙屽嚮杩斿洖鏀舵枡浠撳簱
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
index be8f68b..a8c6e55 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\244\226\350\264\255\345\205\245\345\272\223/Kf_POStockInBillList.html"
@@ -543,8 +543,8 @@
maxmin: true,
content: '../../楠屾敹鍏ュ簱/澶栬喘鍏ュ簱/Add_Edit_Kf_POStockInBillList.html?OperationType=1&linterid=0&HSouceBillType=0&closeType=1',
end: function () {
- //鍒锋柊椤甸潰,
- location.reload();
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ $("#btnSearch").trigger('click');
},
success: function (layero, index) {
--
Gitblit v1.9.1