From f0892b93ea156d99b908d2620d330c4b765fa50d Mon Sep 17 00:00:00 2001
From: zrg <z1873@LAPTOP-EAVL132E>
Date: 星期一, 09 六月 2025 12:04:11 +0800
Subject: [PATCH] 1
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 182 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 138 insertions(+), 44 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
index 6ba475e..5d70606 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Gy_WorkWarehouseBill_Add.html"
@@ -103,6 +103,7 @@
<script>
+ var HDataEmp = {};
layui.config({
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
@@ -143,11 +144,9 @@
var OperationType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鏁版嵁绫诲瀷 娣诲姞 淇濆瓨
var linterid = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鍗曟嵁鍐呯爜
var lSourceBillType = params[params[2]]; //浠庡崟鎹幏鍙� 婧愬崟绫诲瀷
- var linteridSub = params[params[3]]; //浠庡弬鏁拌幏鍙� 瀛愯〃绾у埆
//鍒ゆ柇鏄惁鏂板
if (linterid == null || linterid == 0) {
- linteridSub = -1;
OperationType = 1;
$.ajax({
url: GetWEBURL() + "/Web/GetMAXNum",
@@ -161,7 +160,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -171,16 +170,18 @@
, limit: 500 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
, cellMinWidth: 120
, height: 'full-170'
+ , totalRow: true
, cols: [[ //琛ㄥご
{ type: 'checkbox', totalRowText: '鍚堣琛�' }
, { type: 'numbers', title: '搴忓彿', totalRow: true }
- , { field: 'HWorkShopID', title: 'HWorkShopID', hide: true }
- , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿', edit: 'text', event: "HWorkShopID" }
- , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О' }
- , { field: 'HWHID', title: 'HWHID', hide: true }
- , { field: 'HWHNumber', title: '浠撳簱', edit: 'text', event: "HWHID" }
- , { field: 'HWHName', title: '浠撳簱鍚嶇О' }
+ , { field: 'HWorkShopID', title: 'HWorkShopID<label style="color:red"> * </label>', hide: true }
+ , { field: 'HWorkShopNumber', title: '鐢熶骇杞﹂棿<label style="color:red"> * </label>', edit: 'text', event: "HWorkShopID" }
+ , { field: 'HWorkShopName', title: '杞﹂棿鍚嶇О<label style="color:red"> * </label>' }
+ , { field: 'HWHID', title: 'HWHID<label style="color:red"> * </label>', hide: true }
+ , { field: 'HWHNumber', title: '浠撳簱<label style="color:red"> * </label>', edit: 'text', event: "HWHID" }
+ , { field: 'HWHName', title: '浠撳簱鍚嶇О<label style="color:red"> * </label>' }
, { field: 'HRemark', title: '澶囨敞', edit: 'text' }
+ , { fixed: 'right', title: '鎿嶄綔', toolbar: '#barDemo' }
]]
}
@@ -240,16 +241,21 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
- Pub_Close(1);
- } else {
- Pub_Close(2);
- }
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("閫�鍑哄墠璇风‘淇濇暟鎹凡淇濆瓨锛屾槸鍚︾户缁��鍑猴紵", { title: "閫�鍑虹‘璁�" }, function (index) {
+ if((OperationType == 1) || OperationType == 3) {
+ Pub_Close(1);
+ } else {
+ Pub_Close(2);
+ }
+ })
})
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
});
//鐩戝惉鎻愪氦
@@ -271,7 +277,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -282,6 +288,7 @@
Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
}
$("#HPRDORGID").append(Organization);
+ $("#HPRDORGID").val(sessionStorage["OrganizationID"]);
form.render('select');
}
layer.closeAll("loading");
@@ -311,9 +318,10 @@
if (rowIndex === '0') {
layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
} else {
- obj.del();
- option.data = table.cache["mainTable"];//灏嗘暟鎹粦瀹氬埌data涓�
- table.reload(option);
+ var oldData = table.cache["mainTable"];
+ oldData.splice(obj.tr.data('index'), 1)
+ option.data = oldData;//灏嗘暟鎹粦瀹氬埌data涓�
+ table.render(option);
layer.close(index);
}
});
@@ -335,7 +343,7 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_DepartmentList.html", "yes"]
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_DepartmentList.html', 'yes']
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
@@ -348,10 +356,20 @@
//鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
obj.update({
"HWorkShopID": checkStatus.data[0].HItemID
- , "HWorkShopNumber": checkStatus.data[0].HNumber
- , "HWorkShopName": checkStatus.data[0].HName
+ , "HWorkShopNumber": checkStatus.data[0].閮ㄩ棬浠ｇ爜
+ , "HWorkShopName": checkStatus.data[0].閮ㄩ棬鍚嶇О
})
layer.close(index);//鍏抽棴寮圭獥
+ }, end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWorkShopID": HDataEmp.HItemID
+ , "HWorkShopNumber": HDataEmp.閮ㄩ棬浠ｇ爜
+ , "HWorkShopName": HDataEmp.閮ㄩ棬鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
}
@@ -366,27 +384,69 @@
, shift: 2 //寮瑰嚭鍔ㄧ敾
, area: ["90%", "90%"] //绐椾綋澶у皬
, maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ["../../Baseset/鍩虹璧勬枡/Gy_WarehouseList.html", "yes"]
+ , content: ["../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Warehouse.html?type=HWHSub", "yes"]
, btn: ["纭畾", "鍙栨秷"]
, btn1: function (index, laero) {
//鎸夐挳涓� 鐨勫洖璋�
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 == 0) {
+ return layer.msg("璇烽�夋嫨鏁版嵁");
}
+ //鑾峰彇鏁版嵁
+ var NumData = checkStatus.data;
+ //鑾峰彇褰撳墠浣嶇疆鎵�鍦ㄨ鏁�
+ var NowNum = obj.tr.data('index') + 1;
- //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
- obj.update({
- "HWHID": checkStatus.data[0].HItemID
- , "HWHNumber": checkStatus.data[0].HNumber
- , "HWHName": checkStatus.data[0].HName
- })
+ //鍒ゆ柇閫夋嫨鐨勬暟鎹�绘暟 鏄惁澶т簬琛ㄦ牸鐜版湁鐨勬暟鎹�
+ if (NumData.length > option.data.length - (NowNum - 1)) {
+ //鑾峰彇琛ㄦ牸鍓╀綑琛屾暟閲�
+ var num = NumData.length - option.data.length + (NowNum - 1);
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < option.data.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+
+ //鍦ㄤ笅鏂规坊鍔犳柊鐨勮〃鏍兼暟鎹�
+ for (var i = 0; i < num; i++) {
+ option.data.push({
+ "HWorkShopID": "", "HWorkShopNumber": "", "HWorkShopName": "", "HWHID": NumData[j]["HItemID"], "HWHNumber": NumData[j]["浠撳簱浠ｇ爜"], "HWHName": NumData[j]["浠撳簱鍚嶇О"], "HRemark": ""
+ })
+ j++;
+ }
+ } else {
+ //寰幆璧嬪�� 鍦ㄥ凡鏈夌殑琛ㄦ牸璧嬪��
+ var j = 0;
+ for (var i = (NowNum - 1); i < (NowNum - 1) + NumData.length; i++) {
+ option.data[i]["HWHID"] = NumData[j]["HItemID"];
+ option.data[i]["HWHNumber"] = NumData[j]["浠撳簱浠ｇ爜"];
+ option.data[i]["HWHName"] = NumData[j]["浠撳簱鍚嶇О"];
+ j++;
+ }
+ }
+ table.render(option);
+
layer.close(index);//鍏抽棴寮圭獥
+ }
+ , end: function () {
+ if (typeof (HDataEmp.HItemID) != "undefined") {
+ //鏇存柊琛ㄦ牸缂撳瓨鐨勬暟鎹�
+ obj.update({
+ "HWHID": HDataEmp.HItemID
+ , "HWHNumber": HDataEmp.浠撳簱浠ｇ爜
+ , "HWHName": HDataEmp.浠撳簱鍚嶇О
+ })
+ HDataEmp = {};
+ }
}
})
}
+ obj.event = "";
return false;
}
@@ -394,9 +454,9 @@
}
//缂栬緫 椤甸潰璧嬪��
- function RoadBillMain(linterid, linteridSub)//鍔犺浇琛ㄥご
+ function RoadBillMain(linterid)//鍔犺浇琛ㄥご
{
- var sWhere = " and hmainid='" + linterid + "' and hsubid='" + linteridSub + "'";
+ var sWhere = " and hmainid='" + linterid + "'";
$.ajax({
url: GetWEBURL() + "/Sc_JIT_ComplementGoodBill/ComplementGoodBillList",
type: "GET",
@@ -409,15 +469,16 @@
, "HInterID": d.data[0].hmainid
, "HPRDORGID": d.data[0].缁勭粐
});
-
- //瀛愯〃 璧嬪��
- var rowdata = [{
- "HWorkShopID": d.data[0].HWorkShopID, "HWorkShopNumber": d.data[0].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[0].杞﹂棿鍚嶇О, "HWHID": d.data[0].HWHID
- , "HWHNumber": d.data[0].浠撳簱浠ｇ爜, "HWHName": d.data[0].浠撳簱鍚嶇О, "HRemark": d.data[0].琛ㄤ綋澶囨敞
- }];
- option.data = rowdata;
- table.render(option);
- form.render('select');
+ var rowdata = [];
+ for (var i = 0; i < d.data.length; i++) {
+ //瀛愯〃 璧嬪��
+ rowdata.push({
+ "HWorkShopID": d.data[i].HWorkShopID, "HWorkShopNumber": d.data[i].杞﹂棿浠ｇ爜, "HWorkShopName": d.data[i].杞﹂棿鍚嶇О, "HWHID": d.data[i].HWHID
+ , "HWHNumber": d.data[i].浠撳簱浠ｇ爜, "HWHName": d.data[i].浠撳簱鍚嶇О, "HRemark": d.data[i].琛ㄤ綋澶囨敞
+ });
+ option.data = rowdata;
+ table.render(option);
+ }
}
})
}
@@ -436,8 +497,7 @@
var sMainStr = JSON.stringify(data.field);
var sSubStr = JSON.stringify(num);
- var hentryid = linteridSub;//瀛愯〃 鎺掑簭id
- var sMainSub = sMainStr + ';' + sSubStr + ';' + hentryid + ';' + OperationType + ";" + sessionStorage["HUserName"];
+ var sMainSub = sMainStr + ';' + sSubStr + ';'+ OperationType + ";" + sessionStorage["HUserName"];
var index = layer.load();
$.ajax({
@@ -463,10 +523,44 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HPRDORGID").val() == "0") {
+ layer.msg("缁勭粐娌℃湁閫夋嫨");
+ return false;
+ }
+
+ for (var i = 0; i < option.data.length; i++) {
+ //鐢熶骇杞﹂棿
+ if (option.data[i]["HWorkShopID"] == "") {
+ layer.msg("绗�" + (i + 1) + "琛�:鐢熶骇杞﹂棿涓嶈兘涓虹┖!");
+ return false;
+ }
+
+ //浠撳簱
+ if (option.data[i]["HWHID"] == "0") {
+ layer.msg("绗�" + (i + 1) + "琛�:浠撳簱涓嶈兘涓虹┖!");
+ return false;
+ }
+ }
+
+ return true;
+ }
+
//#endregion
});
+ function GetHDeptNameValue(obj) //杩斿洖鐢熶骇杞﹂棿
+ {
+ HDataEmp = obj[0];
+ }
+
+ //鍙屽嚮杩斿洖浠撳簱
+ function GetHWHSubValue(data) {
+ HDataEmp = data[0]
+ }
</script>
</body>
--
Gitblit v1.9.1