From 154a567cfbe53193b58e93a24e18ae5e582d02a4 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 10 二月 2025 08:26:03 +0800
Subject: [PATCH] 生产班组，生产资源，工序，工作中心，添加其他页面打开过滤和工作中心下拉列表搜索
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 52 ++++++++++++++++-
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 12 ++++
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 13 ++++
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 54 ++++++++++++++++-
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 28 +++++++++
5 files changed, 151 insertions(+), 8 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 8012cd9..553c4fe 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"
@@ -684,7 +684,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
- sWhere += " and 绂佺敤鏍囪 != 'Y'";
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1267,8 +1267,34 @@
}
//#endregion
+
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = getUrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (typeof (openType) != "undefined") {
+ return " and 绂佺敤鏍囪 != 'Y'";
+ }
+ return "";
+ }
+ //#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
+
+ //#region 鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
+ //#endregion
+
//#region 銆愯繃婊ゆ柟妗堣繑鍥炴暟鎹��
function HFilterScheme(obj) //杩斿洖杩囨护鏂规
{
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 43196b0..902eddf 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"
@@ -659,6 +659,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1217,6 +1218,18 @@
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[0]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡
+ if (typeof (openType) != "undefined") {
+ return " and 绂佺敤鏍囪 != 'Y'";
+ }
+ return "";
+ }
+ //#endregion
+
//#endregion
//浠ヤ笂鏄痩ayui妯″潡
});
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 812c87e..f55543d 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"
@@ -64,7 +64,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヤ綔涓績*</label>
<div class="layui-input-inline">
- <input type="text" name="HWorkCenterName" id="HWorkCenterName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" readonly>
+ <input type="text" name="HWorkCenterName" id="HWorkCenterName" class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;" autocomplete="off">
<input type="hidden" name="HWorkCenterID" id="HWorkCenterID" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkCenterID-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -374,7 +374,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -382,7 +382,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
@@ -493,6 +494,51 @@
form.on('submit(HWorkCenterID-BT)', function () {
get_checkWorkCenter();
});
+
+ //宸ヤ綔涓績杈撳叆妗�
+ tableSelect.render({
+ elem: '#HWorkCenterName',//杈撳叆妗哾om閫夋嫨
+ searchKey: '宸ヤ綔涓績鍚嶇О,宸ヤ綔涓績浠ｇ爜',//鏌ヨ鐨勫垪鍚�
+ sWhere: " and 绂佺敤鏍囪 != 'Y' and HUSEORGID = '100038' ",//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_WorkCenter/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": '缈佹稕娑�' },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ //url: GetWEBURL() + 'Gy_Supplier/page',
+ //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝ｇ‘鐐瑰嚮
+ //{ field: 'HItemID', title: 'HItemID' },
+ { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' },
+ { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' },
+ ]],
+ page: true,
+ limit: 5,
+ limits: [5]
+ },
+ done: function (elem, data) {
+ if (data != []) {
+ $("#HWorkCenterName").val(data.data[0]['宸ヤ綔涓績鍚嶇О']);
+ $("#HWorkCenterID").val(data.data[0]['HItemID']);
+ }
+
+ }
+ })
//閫夋嫨宸ユ鎸夐挳
form.on('submit(HProcMulID-BT)', function () {
@@ -816,7 +862,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ヤ綔涓績鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_WorkCenter.html?Type=2', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
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 9b21987..54f308d 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"
@@ -60,7 +60,7 @@
<div class="layui-col-xs4 layui-inline">
<label class="layui-form-label">宸ヤ綔涓績*</label>
<div class="layui-input-inline">
- <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;" readonly>
+ <input type="text" name="HCenter" id="HCenter" class="layui-input" value="" style="float:left;width:150px; background-color:#efefef4d;">
<input type="hidden" name="HCenterID" id="HCenterID" value="0">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HWorkingProcedure-BT" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
@@ -229,7 +229,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index' //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
+ }).use(['index', 'form', 'laydate', 'table', 'element', 'tableSelect'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
@@ -237,7 +237,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element
+ , tableSelect = layui.tableSelect;
var date = new Date();
var day = date.getDate();
var month = date.getMonth() + 1;
@@ -313,6 +314,51 @@
get_checkWorkCenter();
});
+ //宸ヤ綔涓績杈撳叆妗�
+ tableSelect.render({
+ elem: '#HCenter',//杈撳叆妗哾om閫夋嫨
+ searchKey: '宸ヤ綔涓績鍚嶇О,宸ヤ綔涓績浠ｇ爜',//鏌ヨ鐨勫垪鍚�
+ sWhere: " and 绂佺敤鏍囪 != 'Y' and HUSEORGID = '100038' ",//table鎼滅储sWhere鏉′欢 //榛樿绛涢�夐」
+ ajaxSelect: function (sWhere) {
+ var data = '';
+ $.ajax({
+ url: GetWEBURL() + '/Gy_WorkCenter/list',
+ type: "GET",
+ data: { "sWhere": sWhere, "user": '缈佹稕娑�' },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ data = data1.data
+ }
+ },
+ error: function () {
+ layer.alert('鑾峰彇鍒楄〃澶辫触锛�', { icon: 15, title: '閫氫俊閿欒' });
+ }
+ });
+ return data;
+ },//璁剧疆鍓嶇鍒嗛〉鏃跺彲浠ヨ缃殑
+ table: {
+ //url: GetWEBURL() + 'Gy_Supplier/page',
+ //where: { user: '缈佹稕娑�', Organization: '娴欐睙鏅轰簯杩堟��' },
+ cols: [[
+ { type: 'radio', fixed: 'left' },//闇�瑕佸姞杩欎釜fixed灞炴�т笉鐒剁偣鍑籧heckbox浼氳Е鍙戣鐐瑰嚮瀵艰嚧鏃犳硶姝ｇ‘鐐瑰嚮
+ //{ field: 'HItemID', title: 'HItemID' },
+ { field: '宸ヤ綔涓績鍚嶇О', title: '宸ヤ綔涓績鍚嶇О' },
+ { field: '宸ヤ綔涓績浠ｇ爜', title: '宸ヤ綔涓績浠ｇ爜' },
+ ]],
+ page: true,
+ limit: 5,
+ limits: [5]
+ },
+ done: function (elem, data) {
+ if (data != []) {
+ $("#HCenter").val(data.data[0]['宸ヤ綔涓績鍚嶇О']);
+ $("#HCenterID").val(data.data[0]['HItemID']);
+ }
+
+ }
+ })
+
//閫夋嫨鐝粍鎸夐挳
form.on('submit(ProductionTeam-BT)', function () {
get_checkGroup();
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 1fbf2eb..278acfc 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"
@@ -804,6 +804,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -1056,6 +1057,17 @@
}
//#endregion
+ //#region 鍒ゆ柇鏄洿鎺ユ墦寮�椤甸潰杩樻槸鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑锛屽苟鏄剧ず鐩稿簲鏁版嵁
+ function addSWhereByOpenType() {
+ //鑾峰彇鍙傛暟
+ var params = get_UrlVars();
+ var openType = params[params[1]]; //浠庡弬鏁颁腑鑾峰彇 鎵撳紑鏂瑰紡 1鐩存帴鎵撳紑 2鍏跺畠椤甸潰閫氳繃閫夋嫨鎸夐挳鎵撳紑
+ if (typeof (openType) != "undefined") {
+ return " and 绂佺敤鏍囪 != 'Y'";
+ }
+ return "";
+ }
+ //#endregion
function get_UrlVars() {
var vars = [], hash;
--
Gitblit v1.9.1