From bffaabec5e6c7bb5a70995462b1561234abc4db5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期日, 28 四月 2024 17:31:24 +0800
Subject: [PATCH] 1.供应商列表增加显示字段(已隐藏) 2.采购订单,收料通知单,采购入库单修复bug,选单后,表头信息带出
---
WebTM/views/基础资料/采购基础资料/Gy_Supplier_Edit.html | 44 +++
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 61 ++-
WebTM/views/验收入库/外购入库/Kf_POStockInBillList.html | 128 ++++++--
WebTM/views/基础资料/公用基础资料/Gy_DepartmentList.html | 2
WebTM/views/采购管理/收料通知单/Add_Edit_Cg_POInStockBillList.html | 173 +++++++-----
WebTM/views/采购管理/收料通知单/Cg_POInStockBillList.html | 48 ++-
WebTM/views/采购管理/采购订单/Cg_POOrderBillEdit.html | 230 +++++++++------
WebTM/views/基础资料/采购基础资料/Gy_Supplier.html | 2
WebTM/views/验收入库/外购入库/Add_Edit_Kf_POStockInBillList.html | 98 ++++--
9 files changed, 499 insertions(+), 287 deletions(-)
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 cfc78ac..03e0999 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"
@@ -130,7 +130,7 @@
var Organization = sessionStorage["Organization"]
var HModName = "Gy_DepartmentList";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID", "HUSEORGID"];
+ var titleData = ["HItemID", "HUSEORGID", "HEmpID","璐熻矗浜�"];
var ins; //鐢ㄤ簬瀵煎嚭excel
//#endregion
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 fd06c13..4778743 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"
@@ -134,7 +134,7 @@
var Organization = sessionStorage["Organization"]
var HModName = "Gy_Supplier";
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
- var titleData = ["HItemID"];
+ var titleData = ["HItemID", "HCurID", "璐у竵", "姹囩巼", "HSSID", "缁撶畻鏂瑰紡", "HAreaID", "鍦板尯","HPSStyleID","閲囪喘鏂瑰紡"];
var params = getUrlVars();
var Type = params[params[0]];
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_Edit.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_Edit.html"
index 0fec9f0..313b2d6 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_Edit.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_Edit.html"
@@ -220,10 +220,20 @@
</div>
</div>
<div class="layui-row" style="margin-bottom:5px">
- <div class="layui-inline" style="width: 53%;">
+ <div class="layui-inline" style="width: 585px;">
<label class="layui-form-label">澶囨敞</label>
- <div class="layui-input-inline" style="width: 53%;">
+ <div class="layui-input-inline" >
<input type="text" name="HRemark" id="HRemark" lay-verify="HRemark" autocomplete="off" placeholder="" class="layui-input">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;padding: 9px 13px;">閲囪喘鏂瑰紡</label>
+ <div class="layui-input-block" style="margin-left: 77px;">
+ <input type="text" class="layui-input" name="HPSStyleName" id="HPSStyleName" style="background-color: #efefef4d; width: 64%; display: inline-block;" readonly>
+ <input type="hidden" name="HPSStyleID" id="HPSStyleID" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearchPss" id="btnSearchPss" style="padding: 0 10px;float: right;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
<div class="layui-inline">
@@ -409,6 +419,29 @@
}
});
+ });
+ //閫夋嫨閲囪喘鏂瑰紡鎸夐挳
+ form.on('submit(btnSearchPss)', function () {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: '閲囪喘鏂瑰紡鍒楄〃'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡鍚嶇О);
+ $("#HPSStyleID").val(checkStatus.data[0].HItemID);
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
});
//榛樿璐у竵寮圭獥
form.on('submit(btnCurrency)', function () {
@@ -640,6 +673,8 @@
$("#HSSName").val(d.data[0].缁撶畻鏂瑰紡);
$("#HBankAccount").val(d.data[0].閾惰璐﹀彿);
$("#HName").val(d.data[0].鍚嶇О);
+ $("#HPSStyleID").val(d.data[0].閲囪喘鏂瑰紡ID);
+ $("#HPSStyleName").val(d.data[0].閲囪喘鏂瑰紡鍚嶇О);
$("#HRemark").val(d.data[0].澶囨敞);
$("#HUpDater").val(sessionStorage["HUserName"]);//淇敼浜�
$("input[name='HStopflag']").prop("checked", d.data[0].绂佺敤鏍囧織);//true:閫変腑 false:涓嶉�変腑
@@ -761,6 +796,11 @@
})
}
+ function GetHPSStyleNameValue(obj) //杩斿洖閲囪喘鏂瑰紡
+ {
+ $("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡鍚嶇О);
+ $("#HPSStyleID").val(obj[0].HItemID);
+ }
//#endregion
});
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 1a98a71..65228fe 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"
@@ -62,7 +62,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
@@ -70,7 +70,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -88,18 +88,18 @@
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width:750px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float: left; width: 700px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱</label>
+ <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -112,7 +112,7 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆</label>
+ <label class="layui-form-label">甯佸埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -122,13 +122,13 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囩巼</label>
+ <label class="layui-form-label">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;"readonlys>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -141,7 +141,7 @@
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓荤</label>
+ <label class="layui-form-label">涓荤<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -346,6 +346,7 @@
var shijian = year + "-" + month + "-" + day;
var allVal;
+ window.OptionData = [];
//#endregion
@@ -581,7 +582,7 @@
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
- //#endregion
+
switch (field) {
case "HQty": //鏁伴噺
@@ -790,56 +791,56 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HWHID": data.涓昏〃浠撳簱ID
- , "HWHName": data.涓昏〃浠撳簱
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HManagerName": data.涓荤
- , "HManagerID": data.HManagerID
- , "HSourceBillType": data.婧愬崟绫诲瀷
- , "HAddress": data.浜よ揣鍦扮偣
- , "HExRate": data.姹囩巼
- , "HProjectID": data.HProjectID
- , "HProjectNumber": data.椤圭洰浠ｇ爜
- , "HProjectName": data.椤圭洰鍚嶇О
- , "HInvoiceBillNo": data.鍙戠エ缂栧彿
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
+ , "HInnerBillNo": data[0].鍐呴儴鍗曟嵁鍙�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].涓氬姟鍛�
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HWHID": data[0].涓昏〃浠撳簱ID
+ , "HWHName": data[0].涓昏〃浠撳簱
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HManagerName": data[0].涓荤
+ , "HManagerID": data[0].HManagerID
+ , "HSourceBillType": data[0].婧愬崟绫诲瀷
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HExRate": data[0].姹囩巼
+ , "HProjectID": data[0].HProjectID
+ , "HProjectNumber": data[0].椤圭洰浠ｇ爜
+ , "HProjectName": data[0].椤圭洰鍚嶇О
+ , "HInvoiceBillNo": data[0].鍙戠エ缂栧彿
, "Box2": ""
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
- , "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID, "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HWHID": data.HWHID, "鏀舵枡浠撳簱": data.鏀舵枡浠撳簱,
- "HSPID": data.HSPID, "浠撲綅鍚嶇О": data.浠撲綅鍚嶇О, "HSecUnitID": data.HSecUnitID, "杈呭姪鍗曚綅": data.杈呭姪鍗曚綅, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HTaxPrice": data.鍚◣鍗曚环, "HMoney": data.閲戦, "HDiscountRate": data.鎶樻墸鐜�, "HTaxRate": data.绋庣巼, "HTaxMoney": data.绋庨,
- "HSourceBillNo": data.婧愬崟鍗曞彿, //婧愬崟鍙�
- "HSourceBillType": data.婧愬崟绫诲瀷, //婧愬崟绫诲瀷
- "HSourceInterID": data.婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
- "HSourceEntryID": data.婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID, "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HWHID": data[i].HWHID, "鏀舵枡浠撳簱": data[i].鏀舵枡浠撳簱,
+ "HSPID": data[i].HSPID, "浠撲綅鍚嶇О": data[i].浠撲綅鍚嶇О, "HSecUnitID": data[i].HSecUnitID, "杈呭姪鍗曚綅": data[i].杈呭姪鍗曚綅, "HQty": data[i].鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HTaxPrice": data[i].鍚◣鍗曚环, "HMoney": data[i].閲戦, "HDiscountRate": data[i].鎶樻墸鐜�, "HTaxRate": data[i].绋庣巼, "HTaxMoney": data[i].绋庨,
+ "HSourceBillNo": data[i].婧愬崟鍗曞彿, //婧愬崟鍙�
+ "HSourceBillType": data[i].婧愬崟绫诲瀷, //婧愬崟绫诲瀷
+ "HSourceInterID": data[i].婧愬崟涓诲唴鐮�, //婧愬崟涓诲唴鐮�
+ "HSourceEntryID": data[i].婧愬崟瀛愬唴鐮� //婧愬崟瀛愬唴鐮�
}
)
}
@@ -912,7 +913,7 @@
- //#region 淇濆瓨鎸夐挳
+ //#region 淇濆瓨鎸夐挳
form.on('submit(Saver)', function (data) {
//#region 鍒ゆ柇婧愬崟鐘舵��
if (OperationType == 1 || OperationType == 4) {
@@ -963,7 +964,7 @@
//#endregion
- //#region 涓嬫帹椤甸潰鍒濆鍖�
+ //#region 涓嬫帹椤甸潰鍒濆鍖�
function setInit_PushBill() {
//鐢熸垚鍗曟嵁鍙峰拰鍐呯爜
get_MAXNum();
@@ -1012,9 +1013,13 @@
, "HCurID": dataArray[0].HCurID
, "HCurName": dataArray[0].甯佸埆
, "HExRate": dataArray[0].姹囩巼
- , "HAddress": data.浜よ揣鍦扮偣
- , "HRemark": data.琛ㄥご澶囨敞
- , "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
+ , "HAddress": dataArray[0].浜よ揣鍦扮偣
+ , "HRemark": dataArray[0].琛ㄥご澶囨敞
+ , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HProjectID": dataArray[0].HProjectID
+
});
//瀛愯〃 璧嬪��
@@ -1029,7 +1034,7 @@
, "HUnitID": dataArray[i].HUnitID
, "璁￠噺鍗曚綅": dataArray[i].璁￠噺鍗曚綅
, "HWHID": dataArray[i].HWHID
- , "鏀舵枡浠撳簱": dataArray[i].鏀舵枡浠撳簱
+ , "鏀舵枡浠撳簱": dataArray[i].浠撳簱鍚嶇О
, "HSPID": dataArray[i].HSPID
, "浠撲綅鍚嶇О": dataArray[i].浠撲綅鍚嶇О
, "HSecUnitID": dataArray[i].HSecUnitID
@@ -1132,7 +1137,7 @@
//#endregion
- //#region 鏁版嵁鏍￠獙
+ //#region 鏁版嵁鏍￠獙
function AllowLoadData(data) {
//鏁板�兼牸寮忔牎楠屽伐鍏�
var ref = /^\d+(\.\d+)?$/; //闈炶礋鏁版鍒欒〃杈惧紡
@@ -1261,7 +1266,7 @@
}
//#endregion
-
+ //涓氬姟鍛�
function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1284,6 +1289,7 @@
, btn2: function (index, layero) { }
})
}
+ //渚涘簲鍟�
function get_checkSup() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1306,6 +1312,7 @@
, btn2: function (index, layero) { }
})
}
+ //浠撳簱
function get_checkWH() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1339,6 +1346,7 @@
, btn2: function (index, layero) { }
})
}
+ //璐у竵
function get_checkCur() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1387,7 +1395,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //閮ㄩ棬
function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1410,7 +1418,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //涓荤
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1435,7 +1443,7 @@
}
- //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
+ //#region 鍙嶅鏍�/瀹℃牳鏁版嵁
function set_CheckBill(num) {
var InterID = $("#HInterID").val();
//閫昏緫瀹℃牳鏂规硶
@@ -1660,7 +1668,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -1679,8 +1687,8 @@
}
, end: function () {
obj.update({
- "HSecUnitID": OptionData.HItemID
- , "杈呭姪鍗曚綅": OptionData.璁￠噺鍗曚綅鍚嶇О
+ "HSecUnitID": OptionData[0].HItemID
+ , "杈呭姪鍗曚綅": OptionData[0].璁￠噺鍗曚綅鍚嶇О
})
}
})
@@ -1713,6 +1721,7 @@
}
}
+
//琛ㄥご淇℃伅閫夋嫨鍗曟嵁寮圭獥
form.on('submit(XDHList)', function () {
var HOrgID = $("#HOrgID").val();
@@ -1756,15 +1765,30 @@
$("#HProjectName").val(checkStatus.data[0].椤圭洰鍚嶇О);
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(checkStatus.data[0].HProjectID);
-
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HWHID").val(checkStatus.data[0].HWHID);
+ $("#HWHName").val(checkStatus.data[0].浠撳簱);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].甯佸埆);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HAddress").val(checkStatus.data[0].浜よ揣鍦扮偣);
+ $("HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿)
+
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
option.data.push({
"HMaterID": checkStatus.data[j].HMaterID, "鐗╂枡浠ｇ爜": checkStatus.data[j].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": checkStatus.data[j].鐗╂枡鍚嶇О, "瑙勬牸鍨嬪彿": checkStatus.data[j].瑙勬牸鍨嬪彿,
"HUnitID": checkStatus.data[j].HUnitID, "璁￠噺鍗曚綅": checkStatus.data[j].璁￠噺鍗曚綅,
"HQty": checkStatus.data[j].鏁伴噺-checkStatus.data[j].鍏宠仈鏁伴噺, "HPrice": checkStatus.data[j].鍗曚环,
- "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨,"HWHID": checkStatus.data[j].HWHID,
- "鏀舵枡浠撳簱": checkStatus.data[j].鏀舵枡浠撳簱,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
+ "HMoney": checkStatus.data[j].閲戦, "HTaxPrice": checkStatus.data[j].鍚◣鍗曚环, "HTaxRate": checkStatus.data[j].绋庣巼, "HTaxMoney": checkStatus.data[j].绋庨, "HDiscountRate": checkStatus.data[j].鎶樻墸鐜�, "HWHID": checkStatus.data[j].HWHID,
+ "鏀舵枡浠撳簱": checkStatus.data[j].浠撳簱鍚嶇О,"HSPID": checkStatus.data[j].HSPID,"浠撲綅鍚嶇О": checkStatus.data[j].浠撲綅鍚嶇О,"HSecUnitID": checkStatus.data[j].HSecUnitID,"杈呭姪鍗曚綅": checkStatus.data[j].杈呭姪鍗曚綅,
"HSourceBillNo": checkStatus.data[j].鍗曟嵁鍙�, "HSourceBillType": checkStatus.data[j].HBillType, "HSourceInterID": checkStatus.data[j].hmainid, "HSourceEntryID": checkStatus.data[j].hsubid,
})
j++;
@@ -1974,6 +1998,11 @@
OptionData = data
}
+ //鍙屽嚮杩斿洖杈呭姪鍗曚綅
+ function GetAuxiliaryUnitValue(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 59dab72..2de4ee2 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"
@@ -297,6 +297,10 @@
, { field: '涓氬姟鍛樹唬鐮�', title: '涓氬姟鍛樹唬鐮�', width: 120, sort: true }
, { field: '涓氬姟鍛�', title: '涓氬姟鍛�', sort: true }
, { field: '鎽樿', title: '鎽樿', sort: true }
+ , { field: '鍐呴儴鍗曟嵁鍙�', title: '鍐呴儴鍗曟嵁鍙�', sort: true, hide: true }
+ , { field: '鍙戠エ缂栧彿', title: '鍙戠エ缂栧彿', sort: true, hide: true }
+ , { field: '涓昏〃浠撳簱ID', title: '涓昏〃浠撳簱ID', width: 120, hide: true, sort: true }
+ , { field: '涓昏〃浠撳簱', title: '涓昏〃浠撳簱', width: 120, hide: true, sort: true }
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', sort: true }
, { field: 'hsubid', title: 'hsubid', hide: true, sort: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true, sort: true }
@@ -432,28 +436,32 @@
var HSourceEntryID = data[0].婧愬崟瀛愬唴鐮�;
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": HInterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "Cg_POInStockBill/DeltetPOInStockBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": HInterID, "HsupId": HsupId, "HQty": HQty, "HSourceInterID": HSourceInterID, "HSourceEntryID": HSourceEntryID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- }, error: function () {
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
})
}
else {
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 86f37dd..0013626 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"
@@ -61,7 +61,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
@@ -69,7 +69,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -82,8 +82,18 @@
</div>
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">甯佸埆</label>
+ <div class="layui-inline" >
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width:440px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:400px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:400px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width:50px">甯佸埆<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HCurName" id="HCurName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HCurID" id="HCurID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -92,22 +102,17 @@
</button>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">姹囩巼</label>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="margin-left: 238px">姹囩巼<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;">
+ <input class="layui-input" name="HExRate" id="HExRate" autocomplete="off" value="0" style="background-color:#efefef4d;"readonlys>
</div>
</div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浜よ揣鍦扮偣</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
- </div>
- </div>
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閲囪喘鍛�</label>
+ <label class="layui-form-label">閲囪喘鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HEmpID" id="HEmpID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -117,7 +122,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閲囪喘閮ㄩ棬</label>
+ <label class="layui-form-label">閲囪喘閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -127,15 +132,16 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
+ <label class="layui-form-label">閲囪喘鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
+ <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
+
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
@@ -149,17 +155,13 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閲囪喘鏂瑰紡</label>
+ <label class="layui-form-label">浜よ揣鍦扮偣</label>
<div class="layui-input-inline">
- <input type="text" name="HPSStyleName" id="HPSStyleName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HPSStyleID" id="HPSStyleID" class="layui-input" value="0" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HPSStyleList" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
- </button>
+ <input class="layui-input" name="HAddress" id="HAddress" autocomplete="off">
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">缁撶畻鏂瑰紡</label>
+ <label class="layui-form-label">缁撶畻鏂瑰紡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSSName" id="HSSName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSSID" id="HSSID" class="layui-input" value="0" style="float:left;width:150px;">
@@ -383,9 +385,9 @@
var params = get_UrlVars();
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 1娣诲姞 淇濆瓨 2澶嶅埗 3 缂栬緫
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
-
+
$("#HUSEORGID").val(sessionStorage["OrganizationID"]);
-
+
//#region 鍒濆鍖栫粍缁�
Organ();
//#endregion
@@ -435,6 +437,30 @@
$("#HSSDate").val(Format(new Date(), "yyyy-MM-dd")); //缁撶畻鏂瑰紡
}
});
+ //椤甸潰鍒濆鍖栧姞杞�
+ $("#HDeptID").val(sessionStorage["HDeptID"]);
+ $("#HDeptName").val(sessionStorage["HDept"]);
+ $("#HEmpName").val(sessionStorage["HUserName"]);
+ $("#HEmpID").val(sessionStorage["HEmpID"]);
+
+ //鏍规嵁褰撳墠鐧诲綍鐢ㄦ埛鐨勯儴闂� 鑾峰彇 涓荤
+ if ($("#HDeptID").val()!=0) {
+ $.ajax({
+ url: GetWEBURL() + "Gy_Department/list",
+ async: false,
+ type: "GET",
+ data: {
+ "sWhere": "and HItemID = '" + $("#HDeptID").val() + "'", "user": sessionStorage["HUserName"], "Organization": sessionStorage["Organization"]
+ },
+ success: function (result) {
+ $("#HManagerID").val(result.data[0].HEmpID);
+ $("#HManagerName").val(result.data[0].璐熻矗浜�);
+ }, error: function () {
+ layer.alert("鍙戠敓閿欒!", { icon: 5 });
+ }
+ });
+ }
+
} else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
$("#HInterID").val(linterid);
RoadBillMain(linterid);
@@ -443,7 +469,7 @@
var rowdata = [{
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0,"HWHName":"", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": 1, "HRelTaxPrice": "", "HTaxRate": 1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd"),
}];
// 鍒濆鍖栫晫
@@ -456,7 +482,7 @@
//鏂板琛岃〃鏍兼暟鎹�
var NewRow = {
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "", "HRelTaxPrice": "", "HTaxRate": "", "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "","HDate":"2022-12-05"
+ , "HPrice": "", "HTaxPrice": "", "HMoney": "", "HDiscountRate": "1", "HRelTaxPrice": "", "HTaxRate":1, "HTaxMoney": "", "HlineTotal": "", "HlineTotalBB": "", "HDate": Format(new Date, "yyyy- MM - dd")
};
switch (obj.event) {
case 'btn-AddLine':
@@ -507,7 +533,7 @@
form.on('submit(HSupList)', function () {
get_checkSup();
});
- //閫夋嫨閿�鍞柟寮忔寜閽�
+ //閫夋嫨閲囪喘鏂瑰紡鎸夐挳
form.on('submit(HPSStyleList)', function () {
get_checkPSStyle();
});
@@ -584,8 +610,6 @@
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
, data = obj.data //寰楀埌鎵�鍦ㄨ鎵�鏈夐敭鍊�
, field = obj.field; //寰楀埌瀛楁
- //#endregion
-
switch (field) {
case "HQty": //鏁伴噺
//鏁版嵁鏍煎紡鏍￠獙
@@ -830,7 +854,7 @@
, { field: 'HPrice', title: '鍗曚环', width: 100, edit: 'text'}
, { field: 'HTaxPrice', title: '鍚◣鍗曚环', width: 100, edit: 'text'}
, { field: 'HMoney', title: '閲戦', width: 100, totalRow: true , style: 'background-color:#efefef4d;'}
- , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, edit: 'text'}
+ , { field: 'HDiscountRate', title: '鎶樻墸鐜�', width: 100, style: 'background-color:#efefef4d;'}
, { field: 'HRelTaxPrice', title: '瀹為檯鍚◣鍗曚环', width: 110, style: 'background-color:#efefef4d;' }
, { field: 'HTaxRate', title: '绋庣巼', width: 100, edit: 'text' }
, { field: 'HTaxMoney', title: '绋庨', width: 100, style: 'background-color:#efefef4d;'}
@@ -858,47 +882,47 @@
},
success: function (result) {
if (result.code == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = result.data[0];
+ var data = result.data;
allVal = result.data[0];
form.val("component-form-group", { //formTest 鍗� class="layui-form" 鎵�鍦ㄥ厓绱犲睘鎬� lay-filter="" 瀵瑰簲鐨勫��
- "HBillNo": data.鍗曟嵁鍙�
- , "HDate": formatDate(data.鏃ユ湡)
- , "HSSDate": formatDate(data.缁撶畻鏃ユ湡)
+ "HBillNo": data[0].鍗曟嵁鍙�
+ , "HDate": formatDate(data[0].鏃ユ湡)
+ , "HSSDate": formatDate(data[0].缁撶畻鏃ユ湡)
//, "HInnerBillNo": data.鍐呴儴鍗曟嵁鍙�
- , "HAddress": data.浜よ揣鍦扮偣
- , "HDeptName": data.閮ㄩ棬
- , "HDeptID": data.HDeptID
- , "HSupID": data.HSupID
- , "HSupName": data.渚涘簲鍟�
- , "HEmpID": data.HEmpID
- , "HEmpName": data.涓氬姟鍛�
- , "HCurID": data.HCurID
- , "HCurName": data.甯佸埆
- , "HExRate": data.姹囩巼
- , "HManagerName": data.涓荤
- , "HManagerID": data.HManagerID
- , "HPSStyleID": data.HPSStyleID
- , "HPSStyleName": data.閲囪喘鏂瑰紡
- , "HSSID": data.HSSID
- , "HSSName": data.缁撶畻鏂瑰紡
- , "HLinkMan": data.鑱旂郴浜�
- , "HLinkPhone": data.鑱旂郴鐢佃瘽
- , "HInnerBillNo": data.杈呭姪瀛楁
- , "HProjectID": data.HProjectID
- , "HProjectNumber": data.椤圭洰浠ｇ爜
- , "HProjectName": data.椤圭洰鍚嶇О
- , "HWHID": data.HWHID
- , "HOrgID": data.HOrgID
- , "HWHName": data.浠撳簱
- , "HRemark": data.琛ㄥご澶囨敞
- , "HMaker": data.鍒跺崟浜�
- , "HChecker": data.瀹℃牳浜�
- , "HCloseMan": data.鍏抽棴浜�
- , "HMakeDate": data.鍒跺崟鏃ユ湡
- , "HCheckDate": data.瀹℃牳鏃ユ湡
- , "HCloseDate": data.鍏抽棴鏃ユ湡
- , "HUpDateDate": data.淇敼鏃ユ湡
- , "HDeleteDate": data.浣滃簾鏃ユ湡
+ , "HAddress": data[0].浜よ揣鍦扮偣
+ , "HDeptName": data[0].閮ㄩ棬
+ , "HDeptID": data[0].HDeptID
+ , "HSupID": data[0].HSupID
+ , "HSupName": data[0].渚涘簲鍟�
+ , "HEmpID": data[0].HEmpID
+ , "HEmpName": data[0].涓氬姟鍛�
+ , "HCurID": data[0].HCurID
+ , "HCurName": data[0].甯佸埆
+ , "HExRate": data[0].姹囩巼
+ , "HManagerName": data[0].涓荤
+ , "HManagerID": data[0].HManagerID
+ , "HPSStyleID": data[0].HPSStyleID
+ , "HPSStyleName": data[0].閲囪喘鏂瑰紡
+ , "HSSID": data[0].HSSID
+ , "HSSName": data[0].缁撶畻鏂瑰紡
+ , "HLinkMan": data[0].鑱旂郴浜�
+ , "HLinkPhone": data[0].鑱旂郴鐢佃瘽
+ , "HInnerBillNo": data[0].杈呭姪瀛楁
+ , "HProjectID": data[0].HProjectID
+ , "HProjectNumber": data[0].椤圭洰浠ｇ爜
+ , "HProjectName": data[0].椤圭洰鍚嶇О
+ , "HWHID": data[0].HWHID
+ , "HOrgID": data[0].HOrgID
+ , "HWHName": data[0].浠撳簱
+ , "HRemark": data[0].琛ㄥご澶囨敞
+ , "HMaker": data[0].鍒跺崟浜�
+ , "HChecker": data[0].瀹℃牳浜�
+ , "HCloseMan": data[0].鍏抽棴浜�
+ , "HMakeDate": data[0].鍒跺崟鏃ユ湡
+ , "HCheckDate": data[0].瀹℃牳鏃ユ湡
+ , "HCloseDate": data[0].鍏抽棴鏃ユ湡
+ , "HUpDateDate": data[0].淇敼鏃ユ湡
+ , "HDeleteDate": data[0].浣滃簾鏃ユ湡
});
//缁勭粐鐨勫�糎OrgID鍙樺寲锛岄噸鏂版覆鏌�
@@ -906,16 +930,16 @@
//瀛愯〃 璧嬪��
var rowdata = [];
- for (var i = 0; i < 1; i++) {
+ for (var i = 0; i < data.length; i++) {
rowdata.push(
{
- "HMaterID": data.HMaterID, "鐗╂枡浠ｇ爜": data.鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data.鐗╂枡鍚嶇О
- , "瑙勬牸鍨嬪彿": data.瑙勬牸鍨嬪彿, "HUnitID": data.HUnitID
- , "璁￠噺鍗曚綅": data.璁￠噺鍗曚綅, "HWHID": data.HWHID, "HWHName": data.浠撳簱鍚嶇О, "HQty": data.鏁伴噺, "HRemark": data.琛ㄤ綋澶囨敞
- , "HPrice": data.鍗曚环, "HMoney": data.閲戦, "HTaxRate": data.绋庣巼
- , "HTaxMoney": data.閲戦 * data.绋庣巼, "HlineTotal": data.閲戦 + data.绋庨, "HlineTotalBB": (data.閲戦 + data.绋庨) * data.姹囩巼
- , "HTaxPrice": data.鍚◣鍗曚环, "HDiscountRate": data.鎶樻墸鐜�, "HRelTaxPrice": data.瀹為檯鍚◣鍗曚环
- , "HDate": Format(new Date(data.浜よ揣鏃ユ湡), "yyyy-MM-dd")
+ "HMaterID": data[i].HMaterID, "鐗╂枡浠ｇ爜": data[i].鐗╂枡浠ｇ爜, "鐗╂枡鍚嶇О": data[i].鐗╂枡鍚嶇О
+ , "瑙勬牸鍨嬪彿": data[i].瑙勬牸鍨嬪彿, "HUnitID": data[i].HUnitID
+ , "璁￠噺鍗曚綅": data[i].璁￠噺鍗曚綅, "HWHID": data[i].HWHID, "HWHName": data[i].浠撳簱鍚嶇О, "HQty": data[i].鏁伴噺, "HRemark": data[i].琛ㄤ綋澶囨敞
+ , "HPrice": data[i].鍗曚环, "HMoney": data[i].閲戦, "HTaxRate": data[i].绋庣巼
+ , "HTaxMoney": data[i].閲戦 * data[i].绋庣巼, "HlineTotal": data[i].閲戦 + data[i].绋庨, "HlineTotalBB": (data[i].閲戦 + data[i].绋庨) * data[i].姹囩巼
+ , "HTaxPrice": data[i].鍚◣鍗曚环, "HDiscountRate": data[i].鎶樻墸鐜�, "HRelTaxPrice": data[i].瀹為檯鍚◣鍗曚环
+ , "HDate": Format(new Date(data[i].浜よ揣鏃ユ湡), "yyyy-MM-dd")
}
)
}
@@ -961,6 +985,10 @@
}
if ($("#HPSStyleID").val() == 0) {
layer.msg("璇烽�夋嫨閲囪喘鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSSID").val() == 0) {
+ layer.msg("璇烽�夋嫨缁撶畻鏂瑰紡锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
}
@@ -1038,7 +1066,7 @@
if (rowIndex + i >= option.data.length) {
var NewRow = {
"HMaterID": 0, "鐗╂枡浠ｇ爜": "", "鐗╂枡鍚嶇О": "", "瑙勬牸鍨嬪彿": "", "HUnitID": 0, "璁￠噺鍗曚綅": "", "HWHID": 0, "HWHName": "", "鏁伴噺": "", "HRemark": ""
- , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "0", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": "2022-12-05"
+ , "HPrice": "0", "HTaxPrice": "0", "HMoney": "0", "HDiscountRate": "1", "HRelTaxPrice": "0", "HTaxRate": "0", "HTaxMoney": "0", "HlineTotal": "0", "HlineTotalBB": "0", "HDate": Format(new Date, "yyyy- MM - dd")
};
table.cache["mainTable"].push(NewRow);
@@ -1177,7 +1205,7 @@
});
}
}
-
+ //閲囪喘鍛�
function get_checkEmp() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1200,7 +1228,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //渚涘簲鍟�
function get_checkSup() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1218,12 +1246,21 @@
}
$("#HSupName").val(checkStatus.data[0].渚涘簲鍟嗗悕绉�);
$("#HSupID").val(checkStatus.data[0].HItemID);
+ $("#HCurID").val(checkStatus.data[0].HCurID);
+ $("#HCurName").val(checkStatus.data[0].璐у竵);
+ $("#HExRate").val(checkStatus.data[0].姹囩巼);
+ $("#HSSID").val(checkStatus.data[0].HSSID);
+ $("#HSSName").val(checkStatus.data[0].缁撶畻鏂瑰紡);
+ $("#HAddress").val(checkStatus.data[0].鍦板尯);
+ $("#HPSStyleName").val(checkStatus.data[0].閲囪喘鏂瑰紡);
+ $("#HPSStyleID").val(checkStatus.data[0].HPSStyleID);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
-
+ //璐у竵
function get_checkCur() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1247,7 +1284,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //閲囪喘閮ㄩ棬
function get_checkDept() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1264,13 +1301,15 @@
return layer.msg('璇烽�夋嫨鏁版嵁');
}
$("#HDeptName").val(checkStatus.data[0].閮ㄩ棬鍚嶇О);
- $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HDeptID").val(checkStatus.data[0].HItemID);
+ $("#HManagerID").val(checkStatus.data[0].HEmpID);
+ $("#HManagerName").val(checkStatus.data[0].璐熻矗浜�);
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
}
-
+ //涓荤
function get_checkManager() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1293,7 +1332,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //閲囪喘鏂瑰紡
function get_checkPSStyle() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1316,7 +1355,7 @@
, btn2: function (index, layero) { }
})
}
-
+ //缁撶畻鏂瑰紡
function get_checkSS() {
layer.open({
type: 2//寮圭獥绫诲瀷
@@ -1426,6 +1465,7 @@
}
//#endregion
+
//#region 淇濆瓨鍚庢祻瑙堟柟娉�
function ReRoadBillMain() {
location.replace('Add_Edit_Cg_POInStockBillList.html?OperationType=4&linterid=' + linterid + '&HSouceBillType=');
@@ -1467,8 +1507,16 @@
function GetHSupNameValue(obj) //杩斿洖渚涘簲鍟�
{
- $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
- $("#HSupID").val(obj[0].HItemID);
+ $("#HSupName").val(obj[0].渚涘簲鍟嗗悕绉�);
+ $("#HSupID").val(obj[0].HItemID);
+ $("#HCurID").val(obj[0].HCurID);
+ $("#HCurName").val(obj[0].璐у竵);
+ $("#HExRate").val(obj[0].姹囩巼);
+ $("#HSSID").val(obj[0].HSSID);
+ $("#HSSName").val(obj[0].缁撶畻鏂瑰紡);
+ $("#HAddress").val(obj[0].鍦板尯);
+ $("#HPSStyleName").val(obj[0].閲囪喘鏂瑰紡);
+ $("#HPSStyleID").val(obj[0].HPSStyleID);
}
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_POOrderBillList.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_POOrderBillList.html"
index 9836951..1b43457 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_POOrderBillList.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_POOrderBillList.html"
@@ -176,7 +176,7 @@
<div class="layui-input-block" style="width:190px;">
<select name="HFinishStatus" lay-filter="HFinishStatus">
<option value="" selected>鍏ㄩ儴</option>
- <option value="鏈畬鎴�" selected>鏈畬鎴�</option>
+ <option value="鏈畬鎴�" >鏈畬鎴�</option>
<option value="宸插畬鎴�">宸插畬鎴�</option>
</select>
</div>
@@ -496,6 +496,9 @@
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
//鍒濆鍖栬〃鏍�
function set_InitGrid() {
@@ -575,7 +578,9 @@
, { field: '涓荤浠ｇ爜', title: '涓荤浠ｇ爜', width: 100, hide: true }
, { field: '涓荤', title: '涓荤', width: 100}
, { field: 'HEmpID', title: 'HEmpID', hide: true }
- , { field: '鎽樿', title: '鎽樿', width: 100}
+ , { field: '鎽樿', title: '鎽樿', width: 100 }
+ , { field: 'HWHID', title: '涓昏〃浠撳簱ID', width: 120, hide: true}
+ , { field: '浠撳簱', title: '涓昏〃浠撳簱', width: 100, hide: true}
, { field: '琛ㄥご澶囨敞', title: '琛ㄥご澶囨敞', width: 100}
, { field: 'hsubid', title: 'hsubid', hide: true }
, { field: 'HMaterID', title: 'HMaterID', hide: true }
@@ -749,31 +754,37 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Cg_POOrderBill/DeltetCg_POOrderBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+
+ }, error: function () {
+
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+
+ }
+
})
}
else {
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 bd92cde..0b0495f 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"
@@ -66,7 +66,7 @@
<div class="layui-form-item" style="padding-top: 10px;">
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�</label>
+ <label class="layui-form-label">鍗曟嵁鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
<input type="hidden" name="HInterID" id="HInterID" value="0">
@@ -74,7 +74,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">鏃ユ湡<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input class="layui-input" name="HDate" id="HDate" autocomplete="off" model="datetime" dateFormat="yyyy-MM-dd" placeholder="yyyy-MM-dd">
</div>
@@ -89,28 +89,18 @@
</div>
<div class="layui-row">
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">渚涘簲鍟�</label>
- <div class="layui-input-inline">
- <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:150px;">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label">渚涘簲鍟�<label style="color:red"> * </label></label>
+ <div class="layui-input-inline" style="width:750px">
+ <input type="text" name="HSupName" id="HSupName" class="layui-input" value="" style="float:left;width:700px;">
+ <input type="hidden" name="HSupID" id="HSupID" class="layui-input" value=0 style="float:left;width:700px;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSupList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">涓氬姟鍛�</label>
- <div class="layui-input-inline">
- <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
- <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>
- </button>
- </div>
- </div>
- <div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">浠撳簱</label>
+ <label class="layui-form-label">浠撳簱<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HWHName" id="HWHName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HWHID" id="HWHID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -119,11 +109,10 @@
</button>
</div>
</div>
-
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">楠屾敹鍛�</label>
+ <label class="layui-form-label">楠屾敹鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HSecManagerName" id="HSecManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HSecManagerID" id="HSecManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -133,7 +122,7 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">淇濈鍛�</label>
+ <label class="layui-form-label">淇濈鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HKeeperName" id="HKeeperName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HKeeperID" id="HKeeperID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -143,17 +132,16 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">閮ㄩ棬</label>
+ <label class="layui-form-label">涓氬姟鍛�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
- <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <input type="text" name="HEmpName" id="HEmpName" class="layui-input" value="" style="float:left;width:150px;">
+ <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>
</button>
</div>
</div>
</div>
-
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">婧愬崟绫诲瀷</label>
@@ -178,7 +166,7 @@
</div>-->
</div>
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">璐熻矗浜�</label>
+ <label class="layui-form-label">璐熻矗浜�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
<input type="text" name="HManagerName" id="HManagerName" class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HManagerID" id="HManagerID" class="layui-input" value=0 style="float:left;width:150px;">
@@ -192,9 +180,13 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
- <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <label class="layui-form-label">閮ㄩ棬<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
+ <input type="text" name="HDeptName" id="HDeptName" class="layui-input" value="" style="float:left;width:150px;">
+ <input type="hidden" name="HDeptID" id="HDeptID" class="layui-input" value=0 style="float:left;width:150px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HDeptList" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
+ </button>
</div>
</div>
<div class="layui-col-xs4 layui-inline">
@@ -228,6 +220,12 @@
<label class="layui-form-label">澶囨敞</label>
<div class="layui-input-block">
<input class="layui-input" name="HRemark" id="HRemark" autocomplete="off">
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline" style="margin-left: 135px;">
+ <label class="layui-form-label">鍙戠エ缂栧彿</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HInvoiceBillNo" id="HInvoiceBillNo" autocomplete="off">
</div>
</div>
</div>
@@ -1051,7 +1049,7 @@
if ($("#HSourceBillType").val() == "1102") {
- //鑾峰彇
+ //鑾峰彇 閿�鍞鍗�
var data = getUrlVars_JSON().data;
var dataArray = [];
for (var i = 0; i < data.length; i++) {
@@ -1071,8 +1069,8 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HMangerID": dataArray[0].HManagerID
- , "HMangerName": dataArray[0].璐熻矗浜�
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
, "HWHID": dataArray[0].HWHID
, "HWHName": dataArray[0].浠撳簱
, "HEmpID": dataArray[0].HEmpID
@@ -1090,6 +1088,11 @@
, "HSSName": dataArray[0].缁撶畻鏂瑰紡
, "HPSStyleID": dataArray[0].HPSStyleID
, "HPSStyleName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
});
//瀛愯〃 璧嬪��
@@ -1146,7 +1149,7 @@
table.render(option);
}
else if ($("#HSourceBillType").val() == "1103") {
- //鑾峰彇
+ //鑾峰彇 鏀舵枡閫氱煡鍗�
var data = getUrlVars_JSON().data;
var dataArray = [];
for (var i = 0; i < data.length; i++) {
@@ -1166,8 +1169,8 @@
, "HDeptID": dataArray[0].HDeptID
, "HDeptName": dataArray[0].閮ㄩ棬
- , "HManagerID": dataArray[0].hmanagerid
- , "HMangerName": dataArray[0].涓荤
+ , "HManagerID": dataArray[0].HManagerID
+ , "HManagerName": dataArray[0].涓荤
, "HEmpID": dataArray[0].HEmpID
, "HEmpName": dataArray[0].涓氬姟鍛�
, "HSupID": dataArray[0].HSupID
@@ -1177,8 +1180,11 @@
, "HExRate": dataArray[0].姹囩巼
, "HSSID": "0"
, "HSSName": ""
- , "HPSStyleID": dataArray[0].HPSStyleID
- , "HPSStyleSName": dataArray[0].閲囪喘鏂瑰紡
+ , "HProjectID": dataArray[0].HProjectID
+ , "HProjectNumber": dataArray[0].椤圭洰浠ｇ爜
+ , "HProjectName": dataArray[0].椤圭洰鍚嶇О
+ , "HInvoiceBillNo": dataArray[0].鍙戠エ缂栧彿
+ , "HInnerBillNo": dataArray[0].鍐呴儴鍗曟嵁鍙�
});
//瀛愯〃 璧嬪��
@@ -1793,7 +1799,7 @@
if (checkStatus.data.length == 0) {
return layer.msg("璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�!");
}
- layer.alert("浣犲凡閫夋嫨" + checkStatus.data.length + "鏉℃暟鎹�");
+
//鑾峰彇鏀舵枡閫氱煡鍗曚唬鐮�
var ProcessNumber = [];
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1808,7 +1814,19 @@
$("#HProjectNumber").val(checkStatus.data[0].椤圭洰浠ｇ爜);
$("#HProjectID").val(checkStatus.data[0].HProjectID);
- if (getSupType().name == "閲囪喘璁㈠崟") {
+ $("#HDeptID").val(checkStatus.data[0].HDeptID);
+ $("#HDeptName").val(checkStatus.data[0].閮ㄩ棬);
+ $("#HWHID").val(checkStatus.data[0].涓昏〃浠撳簱ID);
+ $("#HWHName").val(checkStatus.data[0].涓昏〃浠撳簱);
+ $("#HSupID").val(checkStatus.data[0].HSupID);
+ $("#HSupName").val(checkStatus.data[0].渚涘簲鍟�);
+ $("#HEmpID").val(checkStatus.data[0].HEmpID);
+ $("#HEmpName").val(checkStatus.data[0].涓氬姟鍛�);
+ $("#HManagerID").val(checkStatus.data[0].HManagerID);
+ $("#HManagerName").val(checkStatus.data[0].涓荤);
+ $("#HInvoiceBillNo").val(checkStatus.data[0].鍙戠エ缂栧彿);
+ $("#HInnerBillNo").val(checkStatus.data[0].鍐呴儴鍗曟嵁鍙�);
+ if ($("#HSourceBillType").val() == "1102") {
var j = 0;
for (var i = 0; i < checkStatus.data.length; i++) {
@@ -1825,7 +1843,7 @@
}
table.render(option);
layer.close(index);
- } else if (getSupType().name == "鏀舵枡閫氱煡鍗�") {
+ } else if ($("#HSourceBillType").val() == "1103") {
var j = 0;
for (var i = 0; i < ProcessNumber.length; i++) {
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 5d8e197..c215bc1 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"
@@ -59,12 +59,6 @@
</select>
</div>
</div>
- <div class="layui-row">
- <!--鏄剧ず褰撳墠杩囨护鏂规-->
- <div class="layui-inline" style="margin-left:5px;">
- <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
- </div>
- </div>
<div class="layui-inline">
<label class="layui-form-label">鍗曟嵁鍙�</label>
<div class="layui-input-block">
@@ -75,6 +69,12 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-row">
+ <!--鏄剧ず褰撳墠杩囨护鏂规-->
+ <div class="layui-inline" style="margin-left:5px;">
+ <div style="text-align:center;font-size:15px;font-weight:bold;color:#fc9393" id="HFilterScheme_Now"></div>
+ </div>
+ </div>
<div class="layui-colla-content">
<div class="layui-inline">
<div class="layui-inline">
@@ -241,12 +241,16 @@
DisPlay_HideColumn();
//浠绘剰瀛楁杩囨护涓嬫媺妗嗗垵濮嬪寲
ColFilter();
+
+ //鏌ヨ褰撳墠鐧诲綍鐢ㄦ埛鏈夋病鏈夊湪褰撳墠妯″潡璁剧疆榛樿杩囨护鏂规
+ get_DefaultModule();
}
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
+
function set_InitGrid() {
option = {
elem: '#mainTable'
@@ -316,6 +320,7 @@
]]
};
}
+
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
function get_Display(sWhere) {
var ajaxLoad = layer.load();
@@ -344,6 +349,7 @@
}
});
}
+
//澶村伐鍏锋爮浜嬩欢
table.on('toolbar(mainTable)', function (obj) {
var checkStatus = table.checkStatus(obj.config.id);
@@ -487,7 +493,6 @@
})
}
-
//#region 蹇�熻繃婊�
function get_FastQuery(table, option,number) {
var HDate = $("#HBeginDate").val();//寮�濮嬫棩鏈�
@@ -556,6 +561,7 @@
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
//#endregion
+
//#region 閲嶇疆杩囨护鏉′欢
function set_ClearQuery() {
$("#HDate").val("");//寮�濮嬫棩鏈�
@@ -580,7 +586,6 @@
get_Display(sWhere);
}
//#endregion
-
//#region 鐐瑰嚮琛岄�変腑楂樹寒
table.on('row(mainTable)', function (obj) {
@@ -631,7 +636,7 @@
}
}
- //鍒犻櫎
+ //鍒犻櫎
function set_DeleteBill() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -639,31 +644,36 @@
var InterID = data[0].hmainid.toString();
//閫昏緫鍒犻櫎鏂规硶
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
- var wait = layer.load();
- $.ajax({
- type: "GET",
- url: GetWEBURL() + "/Kf_POStockInBill/DeltetKf_POStockInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
- data: { "HInterID": InterID, "user": sessionStorage["HUserName"]},
- success: function (result) {
- if (result.count == 1) {
- layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
- // 寰楀埌frame绱㈠紩
- var index = layer.getFrameIndex(window.name);
- //鍏抽棴褰撳墠frame
- layer.close(index);
- //淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
- });
+ if (data[0].鐘舵�� == "鍒涘缓") {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Kf_POStockInBill/DeltetKf_POStockInBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
- } else {
- layer.alert(result.code + result.Message, { icon: 5 });
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
- layer.close(wait);
- }, error: function () {
- layer.close(wait);
- layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- }
- });
+ });
+ } else {
+ layer.msg('璇ユ潯鏁版嵁涓嶆槸鍒涘缓鐘舵��,鏃犳硶鍒犻櫎锛�');
+ }
+
})
}
else {
@@ -808,7 +818,7 @@
//#endregion
- //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
+ //#region 琛屽弽鍏抽棴/琛屽叧闂暟鎹�
function set_CloseRow(num) {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
@@ -1040,7 +1050,7 @@
})
}
- //#region 鑾峰彇鍙傛暟
+ //#region 鑾峰彇鍙傛暟
function getUrlVars() {
var vars = [], hash;
var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
@@ -1083,7 +1093,54 @@
}
//#endregion
- //淇濆瓨鏂规
+ //#region 銆愯繃婊ゆ柟妗堛��
+
+ //鑾峰彇褰撳墠鐢ㄦ埛鐨勯粯璁よ繃婊ゆ柟妗�
+ function get_DefaultModule() {
+ $.ajax({
+ url: GetWEBURL() + '/Xt_FastICScheme/Chooselist',
+ type: "GET",
+ data: { "user": sessionStorage["Czybm"], "HModuleName": HModuleName, "HInterID": 0, "Type": "Default" },
+ success: function (data1) {
+ if (data1.count == 1) {
+ //褰撳墠鐢ㄦ埛璁剧疆鏈夐粯璁ょ殑杩囨护鏂规
+ var data = data1.data;
+ //褰撳墠閫夋嫨鐨勮繃婊ゆ柟妗�
+ HInterID_Choose = data[0].hmainid;
+ //杩囨护鏂规鍐呯爜
+ HInterID = data[0].hmainid
+ //杩囨护鏂规鍚嶇О
+ HDefaultFilter = data[0].鏂规鍚嶇О
+ //杩囨护鏂规鐨勫娉紙鏂规淇℃伅鎻忚堪锛�
+ var HRemark = data[0].澶囨敞
+ //鏄剧ず鍑哄綋鍓嶇殑榛樿杩囨护鏂规
+ document.getElementById("HFilterScheme_Now").style.display = "block";
+ document.getElementById('HFilterScheme_Now').innerHTML = "褰撳墠杩囨护鏂规锛�" + HDefaultFilter + '<span style="font-size: 15px; font-weight: bold; color:#7b90fb"> ' + "(" + HRemark + ")" + '</span>';
+ //鎶婅繃婊ゆ潯浠跺�煎洖鍐欏埌椤甸潰涓�
+ for (let i = 0; i < data.length; i++) {
+ $("#" + data[i].杩囨护瀛楁ID).val(data[i].杩囨护鍊�);
+ if (data[i].杩囨护鏍囩绫诲瀷 == 'SELECT') {
+ $("#" + data[i].杩囨护瀛楁ID).find("option[value='" + data[i].杩囨护鍊� + "']").attr("selected", true);
+ }
+ }
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ } else {
+ //褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
+ //闅愯棌鏄剧ず杩囨护鏂规鐨勬爣绛句俊鎭�
+ document.getElementById("HFilterScheme_Now").style.display = "none";
+ //鎵ц鏌ヨ鏂规硶
+ get_FastQuery()
+ form.render("select");
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //淇濆瓨鏂规
function set_SaveScheme() {
var index = layer.open()
//鍒ゆ柇鐢ㄦ埛鏄惁鐐瑰嚮浜嗗彸涓婅鐨勨�滃弶鍙封�濆叧闂脊绐楅〉闈�
@@ -1243,6 +1300,7 @@
}
//#endregion
+ //#endregion
--
Gitblit v1.9.1