From 2669d87e2ec277f7695266d703b9cff6d3455769 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 11 二月 2025 13:09:20 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Source.html | 77 ++++++++++
WebTM/views/基础资料/生产基础资料/Gy_Process.html | 6
WebTM/views/基础资料/生产基础资料/Gy_Source.html | 23 +++
WebTM/views/基础资料/公用基础资料/Gy_EmployeeList.html | 8 +
WebTM/views/基础资料/工资基础资料/Gy_Group.html | 19 ++
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html | 28 ++-
WebTM/views/生产管理/生产投料单/Sc_PPBomBillList.html | 14 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html | 22 +-
WebTM/views/计划管理/工艺路线/Gy_RoutingBillCloseList.html | 8
WebTM/views/基础资料/工资基础资料/Gy_Group_Add_Edit.html | 10 +
WebTM/views/基础资料/生产基础资料/Add_Edit_Gy_Process.html | 65 ++++++++
WebTM/views/基础资料/公用基础资料/Gy_Employee_Add_Edit_.html | 83 ++++++++++-
WebTM/views/基础资料/公用基础资料/Gy_WorkCenter.html | 42 +++++
13 files changed, 346 insertions(+), 59 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_EmployeeList.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_EmployeeList.html"
index 424da0a..66af211 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_EmployeeList.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_EmployeeList.html"
@@ -91,6 +91,7 @@
<div class="layui-btn-container">
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-add-1"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Refresh" id="Refresh"><i class="layui-icon layui-icon-refresh-3"></i>鍒锋柊</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-form"></i>鍒犻櫎</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
@@ -180,6 +181,9 @@
break;
case 'btn-Delete':
set_DeleteBill();
+ break;
+ //鍒锋柊
+ case 'btn_Refresh': get_FastQuery();
break;
//淇濆瓨鏂规
case 'set_SaveScheme': set_SaveScheme();
@@ -564,6 +568,10 @@
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
}
+ ,end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery(table, option);
+ }
})
} else {
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_Employee_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_Employee_Add_Edit_.html"
index 9ccb0f0..5bcc6ab 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_Employee_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_Employee_Add_Edit_.html"
@@ -793,6 +793,16 @@
PicUpload();
}
});
+
+ $("#HAge").val(0);
+ $("#HGradDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HInComDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HInsuranceDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HContractEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HContractBDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HContractYear").val(0);
+ $("#HDimissionDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
+ $("#HStayCardEDate").val(Format(9999 - 13 - 01, "yyyy-MM-dd"));
}
else if (OperationType == 3) {//缂栬緫
$("#HItemID").val(linterid);//淇敼鏃朵富琛↖D
@@ -813,15 +823,7 @@
}
//$("#HGradDate").val(Format(2022-11-06, "yyyy-MM-dd"));
- $("#HAge").val(0);
- $("#HGradDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HInComDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HInsuranceDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HContractEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HContractBDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HContractYear").val(0);
- $("#HDimissionDate").val(Format(9999-13-01, "yyyy-MM-dd"));
- $("#HStayCardEDate").val(Format(9999-13-01, "yyyy-MM-dd"));
+
//#endregion
@@ -958,7 +960,7 @@
, area: ['90%', '90%']//澶у皬
, title: '宸ョ鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_WorkTypeList.html?Type=HWorkType', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -983,7 +985,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鏍哥畻鏂瑰紡鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html', 'yes']
+ , content: ['../../../views/鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_ClassTimePrjList.html?Type=HClassTimePrj', 'yes']
//, content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_ClassTimePrjGroupList.html', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
@@ -1063,7 +1065,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -1681,6 +1683,63 @@
}
//#endregion
+ //#region 杩斿洖鑱屽姟
+ function GetDutyValue(obj) { //杩斿洖鑱屽姟
+ $("#HDutyName").val(obj[0].鑱屽姟);
+ $("#HDutyID").val(obj[0].hitemid);
+ $("#HDutyNumber").val(obj[0].缁勭粐鏋舵瀯浠ｇ爜);
+ }
+ //#endregion
+
+ //#region 杩斿洖瀹胯垗
+ function GetHDormNameValue(obj) { //杩斿洖瀹胯垗
+ $("#HDormName").val(obj[0].HName);
+ $("#HDormID").val(obj[0].HItemID);
+ $("#HDormNumber").val(obj[0].HNumber);
+ }
+ //#endregion
+
+ //#region 杩斿洖宸ョ
+ function GetHWorkTypeValue(obj) { //杩斿洖宸ョ
+ console.log(obj)
+ $("#HWorkTypeName").val(obj[0].宸ョ鍚嶇О);
+ $("#HWorkTypeID").val(obj[0].HItemID);
+ $("#HWorkTypeNumber").val(obj[0].宸ョ浠ｇ爜);
+ }
+ //#endregion
+
+ //#region 杩斿洖鏍哥畻鏂瑰紡
+ function GetHClassTimePrjValue(obj) { //杩斿洖鏍哥畻鏂瑰紡
+ $("#HCTPrjName").val(obj[0].鏍哥畻鏂瑰紡鍚嶇О);
+ $("#HCTPrjID").val(obj[0].HItemID);
+ $("#HCTPrjNumber").val(obj[0].鏍哥畻鏂瑰紡浠ｇ爜);
+ }
+ //#endregion
+
+ //#region 杩斿洖閮ㄩ棬
+ function GetHDeptNameValue(obj) { //杩斿洖閮ㄩ棬
+ console.log(obj)
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
+ }
+ //#endregion
+
+ //#region 杩斿洖宀椾綅
+ function GetGyPostValue(obj) { //杩斿洖宀椾綅
+ $("#HPostName").val(obj[0].宀椾綅鍚嶇О);
+ $("#HPostID").val(obj[0].HItemID);
+ $("#HPostNumber").val(obj[0].宀椾綅浠ｇ爜);
+ }
+ //#endregion
+
+ //鐝粍
+ function GetHGroupValue(obj) {
+ $("#HGroupName").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ $("#HGroupNumber").val(obj[0].鐝粍浠ｇ爜);
+ }
</script>
+
</body>
</html>
\ No newline at end of file
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..14ba589 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"
@@ -312,14 +312,14 @@
//浠ｇ爜鍥炶溅鏂规硶
$('#HNumber').on('keydown', function (event) {
if (event.keyCode == 13) {
- get_FastQuery();
+ get_FastQuery(2);
}
});
//鍚嶇О鍥炶溅鏂规硶
$('#HName').on('keydown', function (event) {
if (event.keyCode == 13) {
- get_FastQuery();
+ get_FastQuery(2);
}
});
@@ -684,7 +684,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
- sWhere += " and 绂佺敤鏍囪 != 'Y'";
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -720,6 +720,9 @@
, title: '宸ヤ綔涓績-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+ ,end: function () {
+ get_FastQuery(2);
+ }
})
}
//#endregion
@@ -738,6 +741,9 @@
, title: '宸ヤ綔涓績-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鍏敤鍩虹璧勬枡/Gy_WorkCenter_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -908,7 +914,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_Display(sWhere);
+ get_FastQuery(2);
}
//#endregion
@@ -1092,7 +1098,7 @@
}
}
//鏌ヨ
- get_FastQuery();
+ get_FastQuery(2);
form.render("select");
} else {
//褰撳墠鐢ㄦ埛娌℃湁璁剧疆榛樿鐨勮繃婊ゆ柟妗�
@@ -1267,8 +1273,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..cba7058 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缂撳瓨
}
@@ -714,6 +715,9 @@
, title: '鐢熶骇鐝粍-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
}
//#endregion
@@ -731,6 +735,9 @@
, title: '鐢熶骇鐝粍-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../宸ヨ祫鍩虹璧勬枡/Gy_Group_Add_Edit.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -1217,6 +1224,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/\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 73b6879..9f98a00 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"
@@ -526,6 +526,16 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
+ }
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ }
</script>
</body>
</html>
\ No newline at end of file
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..4e289ca 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 () {
@@ -610,7 +656,7 @@
, "HFixPrice": data.鐝骇瀹氶
, "HLevel": data.绛夌骇
, "HProcMulName": data.宸ユ鍚嶇О
- , "HProcMulID": data.HProMulID
+ , "HProcMulID": data.宸ユID
, "HBarCodeForBase": data.鏉″舰鐮�
, "HHelpCode": data.鍔╄鐮�
, "HDeptName": data.閮ㄩ棬
@@ -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] //鑾峰彇寮规椤甸潰
@@ -1156,6 +1202,15 @@
$("#HProcMulName").val(obj[0].宸ユ鍚嶇О);
$("#HProcMulID").val(obj[0].HItemID);
}
+ function GetWorkCenterValue(obj) {
+ $("#HWorkCenterName").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ $("#HWorkCenterID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ $("#HDeptNumber").val(obj[0].閮ㄩ棬浠ｇ爜);
+ }
</script>
</body>
</html>
\ No newline at end of file
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..5a20f21 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;
@@ -312,6 +313,51 @@
form.on('submit(HWorkingProcedure-BT)', function () {
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 () {
@@ -627,7 +673,7 @@
, area: ['90%', '90%']//澶у皬
, title: '鐝粍鍒楄〃'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/宸ヨ祫鍩虹璧勬枡/Gy_Group.html?Type=HGroup', 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -655,7 +701,7 @@
shift: 2,
area: ['80%', '80%'],
maxmin: true,
- content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html', 'yes'],
+ content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_EmployeeList.html?Type=HEmp', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
@@ -689,6 +735,27 @@
//浠ヤ笂鏄痩ayui妯″潡
});
+ function GetWorkCenterValue(obj) {
+ $("#HCenter").val(obj[0].宸ヤ綔涓績鍚嶇О);
+ $("#HCenterID").val(obj[0].HItemID);
+ }
+ function GetHEmpValue(obj) {
+ $("#HEmpName").val(obj[0].鑱屽憳鍚嶇О);
+ $("#HEmpID").val(obj[0].HItemID);
+ }
+ function GetHDeptNameValue(obj) {
+ $("#HDeptName").val(obj[0].閮ㄩ棬鍚嶇О);
+ $("#HDeptID").val(obj[0].HItemID);
+ }
+ function GetProcessValue(obj) {
+ $("#HProcName").val(obj[0].宸ュ簭鍚嶇О);
+ $("#HProcID").val(obj[0].HItemID);
+ $("#HProcNumber").val(obj[0].宸ュ簭浠ｇ爜);
+ }
+ function GetHGroupValue(obj) {
+ $("#HGroup").val(obj[0].鐝粍鍚嶇О);
+ $("#HGroupID").val(obj[0].HItemID);
+ }
</script>
</body>
</html>
\ No newline at end of file
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 87c8864..dbaa1ec 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"
@@ -670,6 +670,9 @@
, title: '宸ュ簭鍒楄〃-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
}
//#endregion
@@ -687,6 +690,9 @@
, title: '宸ュ簭鍒楄〃-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Process.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ ,end: function () {
+ get_FastQuery(2);
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
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..91145fd 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"
@@ -307,9 +307,10 @@
//#region 鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery(2);
//瀛樺偍鏉′欢
get_WriteConfigFile();
+ get_FastQuery(2);
+
});
//#endregion
@@ -596,6 +597,9 @@
, title: '鐢熶骇璧勬簮-缂栬緫'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
} else {
layer.msg('璇烽�夋嫨涓�琛屾暟鎹紪杈戯紒');
@@ -804,6 +808,7 @@
if (HOrgID) {
sWhere += " and HUSEORGID = '" + HOrgID + "'";
}
+ sWhere += addSWhereByOpenType();
get_Display(sWhere);
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
@@ -838,6 +843,9 @@
, title: '鐢熶骇璧勬簮-鏂板'
, shift: 0//寮瑰嚭鍔ㄧ敾
, content: '../鐢熶骇鍩虹璧勬枡/Add_Edit_Gy_Source.html?OperationType=1&linterid=&HSouceBillType='
+ , end: function () {
+ get_FastQuery(2);
+ }
})
}
//#endregion
@@ -845,7 +853,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_FastQuery(1);
+ get_FastQuery(2);
}
//#endregion
@@ -1056,6 +1064,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;
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
index 8e66f5f..73ae227 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\225\346\226\231\345\215\225/Sc_PPBomBillList.html"
@@ -212,15 +212,15 @@
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-getCheckData"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-reload"><i class="layui-icon layui-icon-refresh"></i>鍒锋柊</button>
<!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-confirm" id="btn_confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
- <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-back" id="btn_back"><i class="layui-icon layui-icon-close-fill"></i>椹冲洖</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>璇︽儏</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>鐢熸垚閫佽揣鍗�</button>-->
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Add"><i class="layui-icon layui-icon-file-b"></i>鏂板</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Edit"><i class="layui-icon layui-icon-form"></i>缂栬緫</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>鍒犻櫎</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
- <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
+ <!--<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Audit"><i class="layui-icon layui-icon-radio"></i>瀹℃牳</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-DeAudit"><i class="layui-icon layui-icon-circle"></i>鍙嶅鏍�</button>
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-view"><i class="layui-icon layui-icon-tips"></i>棰勮</button>-->
<button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>鎵撳嵃</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
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_RoutingBill.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_RoutingBill.html"
index ab09f35..8d343d3 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_RoutingBill.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_RoutingBill.html"
@@ -432,7 +432,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-block" style="margin-left: 185px;">
- <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�">
+ <input type="checkbox" name="checkboxIsProNo" id="checkboxIsProNo" lay-skin="primary" lay-filter="checkboxIsProNo" title="杞伐搴�" disabled="disabled">
<input type="hidden" value="1" name="IsProNo" id="IsProNo" lay-verify="IsProNo">
</div>
</div>
@@ -1832,9 +1832,9 @@
var wait = layer.load();
var HInterID = $("#HInterID").val();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": HInterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "3301"},
success: function (result) {
if (result.count == 1) {
//妫�鏌ユ槸鍚﹀叿澶囧惎鐢ㄩ粯璁ゅ伐鑹鸿矾绾跨殑鏉冮檺锛屽瓨鍦紝鍒欏脊绐楁彁闂�
@@ -1888,11 +1888,12 @@
//鍙嶅鏍�
function set_AbandonCheck() {
layer.confirm("纭瑕佸弽瀹℃牳鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/AuditGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CheckGy_RoutingBill',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 2, "user": sessionStorage["HUserName"], "HBillSubType": "3301" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1912,11 +1913,12 @@
//鍏抽棴
function set_CloseBill() {
layer.confirm("纭瑕佸叧闂悧?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -1936,11 +1938,12 @@
//鍙嶅叧闂�
function set_CancelCloseBill() {
layer.confirm("纭瑕佸弽鍏抽棴鍚�?", function (index) {
+ var HInterID = $("#HInterID").val();
var wait = layer.load();
$.ajax({
- url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill',
+ url: GetWEBURL() + '/Gy_RoutingBill/CloseGy_RoutingBill_1',
type: "GET",
- data: { "HInterID": $("#HInterID").val(), "IsAudit": 1, "CurUserName": sessionStorage["HUserName"] },
+ data: { "HInterID": HInterID, "Type": 1, "user": sessionStorage["HUserName"], "HBillSubType": "" },
success: function (result) {
if (result.count == 1) {
layer.msg(result.Message, { icon: 1 });
@@ -2059,6 +2062,7 @@
//#region 澶嶅埗
function set_Copy() {
+ $('#btnSave').removeClass("layui-btn-disabled").attr("disabled", false);
//鍒跺崟浜�
$("#HMaker").val(sessionStorage["HUserName"]);
$("#hmakers").val(sessionStorage["HUserName"]);
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_RoutingBillCloseList.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_RoutingBillCloseList.html"
index 692633e..e56fa33 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_RoutingBillCloseList.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_RoutingBillCloseList.html"
@@ -421,9 +421,9 @@
soulTable.render(this);
}
, cols: [[
- { type: 'checkbox', fixed: 'left' }
+ /*{ type: 'checkbox', fixed: 'left' }*/
/* { field: 'hmainid', title: 'hmainid', width: 110 }*/
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
+ { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', sort: true, width: 165 }
, { field: '宸ヨ壓鍚嶇О', title: '宸ヨ壓鍚嶇О', width: 170, sort: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160, sort: true }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160, sort: true }
@@ -765,7 +765,7 @@
data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
- col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣', hide: true });
for (var i = 0; i < data.length; i++) {
// if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
if ($.inArray(data[i].name, titleData) > -1) {
@@ -1036,7 +1036,7 @@
//#region 鍒锋柊
function get_Refresh() {
set_ClearQuery();
- get_DisplayPage(sWhere);
+ get_FastQuery();
}
//鍚敤榛樿
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 0b0275e..1a0d87c 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"
@@ -1132,7 +1132,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=3301&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
}
@@ -1149,7 +1149,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=1&linterid=&HSouceBillType=SUB&linteridSub=-1'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
}
@@ -1171,7 +1171,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
} else {
@@ -1203,7 +1203,7 @@
//鍏抽棴褰撳墠frame
layer.close(wait);
//淇敼涓哄姛鍚庡埛鏂扮晫闈�
- window.location.reload();
+ get_FastQuery(2);
});
} else {
layer.alert(result.code + result.Message, { icon: 5 });
@@ -1314,7 +1314,7 @@
, content: '../宸ヨ壓璺嚎/Gy_RoutingBill.html?OperationType=2&linterid=' + linterid + '&HSouceBillType=3301'
, end: function () {
//鍒锋柊椤甸潰,
- location.reload();
+ get_FastQuery(2);
}
})
} else {
@@ -1324,8 +1324,8 @@
//#region 鍒锋柊
function get_Refresh() {
- set_ClearQuery();
- get_DisplayPage(sWhere);
+
+ get_FastQuery(2);
}
//鍚敤榛樿
@@ -1333,7 +1333,7 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (data.length == 1) {
+ if (data.length == 1 && data[0].鐘舵��!="鍏抽棴") {
layer.confirm("纭瑕佸惎鐢ㄨ宸ヨ壓璺嚎涓虹墿鏂欓粯璁ゅ伐鑹鸿矾绾垮悧?", function (index) {
var wait = layer.load();
var HInterID = data[0].hmainid;
@@ -1357,7 +1357,7 @@
});
})
} else {
- layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!");
+ layer.msg("璇烽�夋嫨涓�鏉℃湭鍏抽棴鐨勬暟鎹�!");
}
}
@@ -1365,7 +1365,7 @@
function set_closeOtherRoute() {
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
- if (checkStatus.data.length === 1 && checkStatus.data[0]["瀹℃牳浜�"]=="") {
+ if (checkStatus.data.length === 1 && data[0].鐘舵�� != "鍏抽棴") {
var hmainid = data[0].hmainid.toString();
var HName = data[0]["宸ヨ壓鍚嶇О"].toString();
var HMaterID = data[0]["HMaterID"].toString();
@@ -1523,6 +1523,14 @@
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
layer.close(wait);
}
+ , end: function () {
+ ////淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ //if (get_needClose_Bar == 0) {
+ $("#btnSearch").trigger('click');
+ //} else if (get_needClose_Bar == 1) {
+ // $("#get_needClose").trigger('click');
+ //}
+ }
});
})
}
--
Gitblit v1.9.1