From 5490d96baf0fe2606d63f74e7b52c8dfae916717 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 20 五月 2022 23:02:11 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/日计划基础资料/Gy_WorkWarehouseBill_Add.html | 48 +++++++++++++++++++++++++++++-------------------
1 files changed, 29 insertions(+), 19 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 980d784..e0d47b1 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"
@@ -143,11 +143,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 +159,7 @@
});
}
else {//濡傛灉淇敼鍒欒蛋涓嬮潰 new
- RoadBillMain(linterid, linteridSub);
+ RoadBillMain(linterid);
//RoadBillSub(linterid);
}
@@ -241,7 +239,7 @@
//閫�鍑�
form.on('submit(Cancel)', function () {
- if ((OperationType == 1 && linteridSub == -1) || OperationType == 3) {
+ if ((OperationType == 1) || OperationType == 3) {
Pub_Close(1);
} else {
Pub_Close(2);
@@ -250,7 +248,9 @@
//淇濆瓨鎻愪氦
form.on('submit(btnSave)', function (data) {//鎻愪氦
- set_AddNew(data);
+ if (AllowLoadData()) {
+ set_AddNew(data);
+ }
});
//鐩戝惉鎻愪氦
@@ -272,7 +272,7 @@
//缁勭粐閫夋嫨椤甸潰
function get_Organ() {
//鑾峰彇鐧诲綍椤电粍缁囧垪
- var Organization = '';
+ var Organization = '<option style="color:blue;" value="0">缁勭粐</option>';
$.ajax({
type: "get",
url: GetWEBURL() + "/Web/GetOrganizations",
@@ -395,9 +395,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",
@@ -410,15 +410,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);
+ }
}
})
}
@@ -437,8 +438,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({
@@ -464,6 +464,16 @@
});
}
+ //闈炵┖楠岃瘉
+ function AllowLoadData() {
+
+ if ($("#HPRDORGID").val() == "0") {
+ layer.msg("缁勭粐娌℃湁閫夋嫨");
+ return false;
+ }
+ return true;
+ }
+
//#endregion
});
--
Gitblit v1.9.1