From 43b272c3de309c45b4f8c1ff00f038e2841ceebe Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 15 六月 2022 09:24:11 +0800
Subject: [PATCH] 基础资料的功能完善
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 57 +++++-
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 54 +++++
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 53 +++++
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html | 108 +++++++----
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter_Add_Edit.html | 44 ++++
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 38 ++++
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 52 +++++
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 39 ++++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 2
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 52 +++++
10 files changed, 432 insertions(+), 67 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_WorkCenter.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_WorkCenter.html"
index d876cf9..cd6c5e9 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_WorkCenter.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_WorkCenter.html"
@@ -35,6 +35,14 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -126,7 +134,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//#endregion
@@ -190,10 +198,11 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery(1);
}
//#endregion
@@ -213,6 +222,7 @@
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' }
, { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' }
+ , { field: '缁勭粐', title: '缁勭粐' }
//, { field: '鏉″舰鐮�', title: '鏉″舰鐮�' }
, { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
@@ -226,6 +236,29 @@
};
}
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -254,14 +287,25 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
+ var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ if (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
+
if (HNumber) {
sWhere += " and 宸ヤ綔涓績浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
sWhere += " and 宸ヤ綔涓績鍚嶇О like '%" + HName + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -272,6 +316,8 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
sWhere = "";
}
//#endregion
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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
index a50b5b6..79fa47f 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_WorkCenter_Add_Edit.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_WorkCenter_Add_Edit.html"
@@ -97,6 +97,20 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </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="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -148,7 +162,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
-
+ Organ();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -163,6 +177,8 @@
$("#HItemID").val(0);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -263,6 +279,7 @@
, "HDeptID": data.HDeptID
, "HStopflag": data.HStopflag
, "HRemark": data.HRemark
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
@@ -279,7 +296,7 @@
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
- var sMainStr = JSON.stringify(data.field);
+ //var sMainStr = JSON.stringify(data.field);
if (!$("#HDeptName").val()) {
layer.msg("璇烽�夋嫨閮ㄩ棬锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return;
@@ -319,6 +336,29 @@
}
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 閫夋嫨宸ュ簭鏂规硶
function get_checkProc() {
layer.open({
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
index 6fdc648..db6dc29 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group.html"
@@ -35,6 +35,14 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -122,7 +130,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//#endregion
@@ -132,10 +140,11 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery(1);
}
//#endregion
@@ -154,6 +163,7 @@
, { field: 'HDeptID', title: 'HDeptID', sort: true, hide: true }
, { field: '鐝粍浠ｇ爜', title: '鐝粍浠ｇ爜' }
, { field: '鐝粍鍚嶇О', title: '鐝粍鍚嶇О' }
+ , { field: '缁勭粐', title: '缁勭粐' }
, { field: '鏄庣粏鏍囪', title: '鏄庣粏鏍囪' }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
, { field: '绂佺敤鏍囪', title: '绂佺敤鏍囪' }
@@ -166,6 +176,29 @@
};
}
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -195,14 +228,25 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
+ var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ if (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
+
if (HNumber) {
sWhere += " and 鐝粍浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
sWhere += " and 鐝粍鍚嶇О like '%" + HName + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -213,6 +257,8 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
index dba5a96..2d38f57 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\267\245\350\265\204\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Group_Add_Edit.html"
@@ -95,6 +95,18 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -148,6 +160,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
+ Organ();
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
@@ -163,6 +176,8 @@
$("#HItemID").val(0);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -263,6 +278,7 @@
, "HProcName": data.宸ュ簭
, "HStopflag": data.绂佺敤鏍囪
, "HRemark": data.澶囨敞
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
@@ -277,6 +293,28 @@
}
//#endregion
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 淇濆瓨鏂规硶
function set_SaveBill(data) {
if (!$("#HProcID").val()) {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
index 4dd76cc..1e65966 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Process.html"
@@ -144,6 +144,18 @@
</div>
<div class="layui-row">
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ <div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">绂佺敤鏍囧織</label>
<div class="layui-input-inline">
<input type="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -226,7 +238,7 @@
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
-
+ Organ();//鏄剧ず缁勭粐
//鑾峰彇椤甸潰璺宠浆鍙傛暟
var params = get_UrlVars();
if (typeof (params[params[0]]) == "undefined") {
@@ -241,6 +253,8 @@
$("#HItemID").val(0);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -325,6 +339,28 @@
}
//#endregion
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid) {
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -379,6 +415,7 @@
, "HAutoTrunFlag": data.鑷姩绉昏浆
, "HRemark": data.澶囨敞
, "HProcCheckNote": data.鏈伐搴忕‘璁よ褰�
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
index d6fe2b5..27273b4 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Source.html"
@@ -158,6 +158,20 @@
</div>
</div>
<div class="layui-col-xs4 layui-inline">
+ <label class="layui-form-label">缁勭粐</label>
+ <div class="layui-input-inline" style="margin-bottom: -15px;">
+ <div class="layui-form">
+ <div class="layui-form-item">
+ <select name="HUSEORGID" id="HUSEORGID" lay-verify="HUSEORGID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </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="checkbox" name="checkboxHStopflag" id="checkboxHStopflag" lay-skin="primary" lay-filter="checkboxHStopflag" value="true" title="鏄惁绂佺敤">
@@ -165,16 +179,16 @@
</div>
</div>
</div>
- <div class="layui-row">
- <div class="layui-col-xs8 layui-inline">
- <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
- <div class="layui-input-block">
- <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ <div class="layui-row">
+ <div class="layui-col-xs8 layui-inline">
+ <label class="layui-form-label" style="width: 12.5%;">澶囨敞</label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="HRemark" id="HRemark" autocomplete="off" style=" width: 75%;">
+ </div>
</div>
</div>
</div>
- </div>
- </form>
+</form>
</div>
</div>
</div>
@@ -204,7 +218,7 @@
//#region 杩涘叆椤甸潰鍗冲姞杞�
-
+ Organ();
//鍒ゆ柇鏄惁鐧诲綍 鏈櫥褰曞垯璺冲埌鐧诲綍椤�
get_LoginIs();
@@ -222,6 +236,8 @@
$("#HItemID").val(0);
}
else if (OperationType == 3) {//缂栬緫
+ //绂佺敤缁勭粐閫夐」
+ $("#HUSEORGID").attr("disabled", true);
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
//缂栬緫鐘舵�佹椂锛屾牴鎹唴鐮侊紝鑾峰彇淇℃伅骞跺啓鍏ョ晫闈�
RoadBillMain(linterid);
@@ -291,6 +307,28 @@
}
//#endregion
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ var Organization = '';
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HUSEORGID").append(Organization);
+ $("#HUSEORGID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鍔犺浇琛ㄥご
function RoadBillMain(linterid){
//鏌ヨ妫�楠屾柟妗堝崟鏄惁瀛樺湪
@@ -332,6 +370,7 @@
, "HStopflag": data.绂佺敤鏍囪
, "HType": data.绫诲瀷
, "HRemark": data.澶囨敞
+ , "HUSEORGID": data.HUSEORGID
});
layer.close(ajaxLoad);
} else {
@@ -356,7 +395,6 @@
data: { "msg": sMainStr },
dataType: "json",
success: function (data) {
- console.log(JSON.stringify(data))
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
layer.msg(data.Message, { icon: 1 });
$('#set_SaveBill').addClass("layui-btn-disabled").attr("disabled", true);
@@ -369,7 +407,6 @@
layer.closeAll("loading");
},
error: function (err) {
- console.log(JSON.stringify(err))
layer.alert("閿欒:" + err, { icon: 5 });
console.log("Reason" + sMainStr);
}
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
index d9d7463..c2b3348 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Process.html"
@@ -40,6 +40,14 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -121,7 +129,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//#endregion
@@ -134,7 +142,8 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery(1);
+ Organ();
}
//#endregion
@@ -153,6 +162,7 @@
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '宸ュ簭浠ｇ爜', title: '宸ュ簭浠ｇ爜' }
, { field: '宸ュ簭鍚嶇О', title: '宸ュ簭鍚嶇О' }
+ , { field: '缁勭粐', title: '缁勭粐' }
, { field: '绛夌骇', title: '绛夌骇' }
, { field: '娴佽浆鏍囪', title: '娴佽浆鏍囪' }
, { field: '鏍哥畻鏍囪', title: '鏍哥畻鏍囪' }
@@ -175,6 +185,30 @@
}
//#endregion
+
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鏌ヨ
function get_Display(sWhere) {
@@ -204,14 +238,26 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
+ var HOrgID = "";
var HNumber = $("#HNumber").val();//宸ュ簭浠ｇ爜
var HName = $("#HName").val();//宸ュ簭鍚嶇О
+
+ if (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
+
if (HNumber) {
sWhere += " and 宸ュ簭浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
sWhere += " and 宸ュ簭鍚嶇О like '%" + HName + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -222,6 +268,8 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
index 2107cd0..03cc9a5 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\347\224\237\344\272\247\345\237\272\347\241\200\350\265\204\346\226\231/Gy_Source.html"
@@ -35,6 +35,14 @@
<input type="text" class="layui-input" name="HName" id="HName">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">缁勭粐</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HOrgID" id="HOrgID" lay-verify="HOrgID">
+ <!--鍔ㄦ�佹覆鏌撶粍缁�-->
+ </select>
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -118,7 +126,7 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//#endregion
@@ -135,12 +143,36 @@
//#region 鍒濆鍖栫晫闈�
function set_ClearBill() {
+ Organ();
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery(1);
}
//#endregion
+
+ //鑾峰彇缁勭粐
+ function Organ() {
+ //鑾峰彇鐧诲綍椤电粍缁囧垪
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "/Web/GetOrganizations",
+ success: function (result) {
+ var Organization = "";
+ if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
+ var data = result.data;
+ for (var i = 0; i < data.length; i++) {
+ Organization += '<option style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';
+ }
+ $("#HOrgID").append(Organization);
+ $("#HOrgID").val(sessionStorage["OrganizationID"])
+ form.render('select');
+ }
+ layer.closeAll("loading");
+ }
+ })
+ }
+
//#region 鍒濆鍖栬〃鏍兼柟娉�
function set_InitGrid() {
@@ -157,6 +189,7 @@
, { field: 'HItemID', title: 'HItemID', sort: true, hide: true }
, { field: '鐢熶骇璧勬簮浠ｇ爜', title: '鐢熶骇璧勬簮浠ｇ爜' }
, { field: '鐢熶骇璧勬簮鍚嶇О', title: '鐢熶骇璧勬簮鍚嶇О' }
+ , { field: '缁勭粐', title: '缁勭粐' }
, { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿' }
, { field: 'Hprocid', title: 'Hprocid', hide: true }
, { field: '宸ュ簭', title: '宸ュ簭' }
@@ -268,14 +301,26 @@
//#endregion
//#region 蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
+ var HOrgID = "";
var HNumber = $("#HNumber").val();
var HName = $("#HName").val();
+ if (number == 1) {
+ HOrgID = sessionStorage["OrganizationID"];
+ }
+ else {
+ HOrgID = $("#HOrgID").val();//缁勭粐
+ }
+
+
if (HNumber) {
sWhere += " and 鐢熶骇璧勬簮浠ｇ爜 like '%" + HNumber + "%'";
}
if (HName) {
sWhere += " and 鐢熶骇璧勬簮鍚嶇О like '%" + HName + "%'";
+ }
+ if (HOrgID) {
+ sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
@@ -286,6 +331,8 @@
function set_ClearQuery() {
$("#HNumber").val("");
$("#HName").val("");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html" "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
index b39da7d..b042216 100644
--- "a/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
+++ "b/WebTM/views/\350\256\241\345\210\222\347\256\241\347\220\206/\345\267\245\350\211\272\350\267\257\347\272\277/Gy_RoutingBillList.html"
@@ -253,6 +253,8 @@
$("#HOrderProcNO").val("");//鍗曟嵁绫诲瀷
$("#btnSearch").click();
$("#HName").val("");
+ $("#HOrgID").val(sessionStorage["OrganizationID"]);
+ form.render('select');
sWhere = "";
}
//#endregion
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
index 78ffc8b..5522e9d 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\346\265\201\350\275\254\345\215\241/Sc_ProcessExchangeBill.html"
@@ -646,7 +646,7 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
}];
table.render(option);
}
@@ -688,7 +688,7 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
}];
table.render(option);
}
@@ -782,7 +782,7 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
};
switch (obj.event) {
case 'btn-AddLine':
@@ -1252,47 +1252,51 @@
if (checkStatus.data.length === 0) {
return layer.msg('璇烽�夋嫨鏁版嵁');
}
-
- $.ajax({
- type: "get",
- url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
- async: true,
- data: { "sWhere": " and 鍗曟嵁鍙�='" + checkStatus.data[0].鍗曟嵁鍙� + "'", "user": sessionStorage["HUserName"] },
- success: function (result) {
- var data = result.data;
- var Tablerow = [];
-
- $("#RoutingBill").val(data[0].鍗曟嵁鍙�)
- for (var i = 0; i < data.length; i++) {
- Tablerow.push({
- "HProcNo": data[i].宸ュ簭鍙�, "HProcID": data[i].hprocid, "HProcNumber": data[i].宸ュ簭浠ｇ爜, "HProcName": data[i].宸ュ簭, "HWorkRemark": data[i].琛ㄤ綋澶囨敞,
- "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].宸ヤ綔涓績浠ｇ爜, "HCenterName": data[i].宸ヤ綔涓績鍚嶇О,
- "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
- "HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "isEntrust": data[i].濮斿鏍囪 == 0 ? "false" : "true",
- "HQty": data[i].鍔犲伐鏁伴噺, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
- "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
- });
- }
- option.data = Tablerow;
- table.render(option);
- for (var i = 1; i <= data.length; i++) {
- $('#isEntrust' + i + '').find("option[value='" + (checkStatus.data[i - 1].濮斿鏍囪 == 0 ? "false" : "true") + "']").attr("selected", true);
- }
- form.render('select');
- },
- error: function (result) {
- layer.close(index);
- console.log(result);
- //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
- }
- })
+ getRoutingBill(checkStatus.data[0].鍗曟嵁鍙�);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
})
});
+ function getRoutingBill(HBillNo) {
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "LEMS/MES_Gy_RoutingBillList_Json",
+ async: true,
+ data: { "sWhere": " and 鍗曟嵁鍙�='" + HBillNo + "'", "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ var data = result.data;
+ var Tablerow = [];
+
+ $("#RoutingBill").val(data[0].鍗曟嵁鍙�)
+
+ for (var i = 0; i < data.length; i++) {
+ Tablerow.push({
+ "HProcNo": data[i].宸ュ簭鍙�, "HProcID": data[i].hprocid, "HProcNumber": data[i].宸ュ簭浠ｇ爜, "HProcName": data[i].宸ュ簭, "HWorkRemark": data[i].琛ㄤ綋澶囨敞,
+ "HCenterID": data[i].HCenterID, "HCenterNumber": data[i].宸ヤ綔涓績浠ｇ爜, "HCenterName": data[i].宸ヤ綔涓績鍚嶇О,
+ "HDeptID": 0, "HDeptNumber": "", "HDeptName": "",
+ "HSupID": data[i].HSupID, "HSupNumber": data[i].渚涘簲鍟嗕唬鐮�, "HSupName": data[i].渚涘簲鍟�, "isEntrust": data[i].濮斿鏍囪 == 0 ? "false" : "true",
+ "HQty": data[i].鍔犲伐鏁伴噺, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
+ "HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": data[i].宸ヨ壓鍙傛暟, "HPicNum": data[i].鍥剧焊缂栧彿, "HProcCheckNote": data[i].鏈伐搴忕‘璁よ褰�
+ });
+ }
+ option.data = Tablerow;
+ table.render(option);
+ for (var i = 1; i <= data.length; i++) {
+ $('#isEntrust' + i + '').find("option[value='" + (data[i - 1].濮斿鏍囪 == "0" ? "false" : "true") + "']").attr("selected", true);
+ }
+ form.render('select');
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ })
+ }
//淇濆瓨鎻愪氦
@@ -1408,7 +1412,7 @@
"HSupID": 0, "HSupNumber": "", "HSupName": "", "isEntrust": "false",
"HQty": 0, "HOutPrice": 0, "HRemark": "", "HRelationQty_In": 0, "HRelationQty_Out": 0,
"HRelationQty_WWOrder": 0, "HRelationQty_Bad": 0, "HOverRate": 0, "HMaxQty": 0,
- "HPassRate": "", "HSumPassRate": "", "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
+ "HPassRate": 0, "HSumPassRate": 0, "HTechnologyParameter": "", "HPicNum": "", "HProcCheckNote": ""
}];
table.render(option);
}
@@ -1566,7 +1570,7 @@
$("#HOrderProcNO").val(data.璁㈠崟璺熻釜鍙�);
$("#HMaterID").val(data.hmaterid);
$("#HMaterName").val(data.鐗╂枡鍚嶇О);
- $("#HMaterID2").val(data.HMaterID);
+ $("#HMaterID2").val(data.hmaterid);
$("#HMaterName2").val(data.鐗╂枡鍚嶇О);
$("#HMaterNumber").val(data.鐗╂枡浠ｇ爜);
$("#HMaterNumber2").val(data.鐗╂枡浠ｇ爜);
@@ -1597,7 +1601,26 @@
$("#HProductNum").val(data.鎴愬搧缂栧彿);
$("#HVerNum").val(data.鐗堟湰);
$("input[name='HBLFlag']").prop("checked", result.data[0].HBLFlag == 0 ? false : true);//true:閫変腑 false:涓嶉�変腑
- btnHMaterID= data.hmaterid;
+ btnHMaterID = data.hmaterid;
+
+ $.ajax({
+ type: "get",
+ url: GetWEBURL() + "LEMS/Gy_RoutingBillList",
+ async: true,
+ data: { "sWhere": "and HMaterID=" + btnHMaterID + " and HOrgID = " + sessionStorage["OrganizationID"], "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.data != null) {
+ var hbillno = result.data[0].鍗曟嵁鍙�
+ getRoutingBill(hbillno);
+ }
+
+ },
+ error: function (result) {
+ layer.close(index);
+ console.log(result);
+ //layer.msg('鑾峰彇閲囪喘璁㈠崟鍑虹幇寮傚父', { icon: 2, time: 2000 });
+ }
+ })
}
else {
layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -1605,7 +1628,8 @@
}
})
//txtHBillNo.Text = sBillNo;
- GetICMOBillDetail(hmainid, HEntryID);
+ //GetICMOBillDetail(hmainid, HEntryID);
+
}
function GetICMOBillDetail(hmainid, HEntryID) {
--
Gitblit v1.9.1