From 3ccf32f224519ba7e1f38b8d5b0f4d1e7a8cffaf Mon Sep 17 00:00:00 2001
From: yusijie <ysj@hz-kingdee.com>
Date: 星期一, 27 十一月 2023 10:09:14 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/PublicPage/MouldMaintainRuleInterList.html | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/WebTM/views/PublicPage/MouldMaintainRuleInterList.html b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
index b752646..5940cfb 100644
--- a/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
+++ b/WebTM/views/PublicPage/MouldMaintainRuleInterList.html
@@ -87,8 +87,8 @@
, laydate = layui.laydate
, util = layui.util
, tree = layui.tree
- var sWhere = " where HStopFlag=0 and HEndFlag<>'1' "; //鏍戝瀷100046 sessionStorage["OrganizationID"]
- var sWhere1 = " where HStopFlag=0 and HEndFlag=1 "; //鍒楄〃
+ var sWhere = " "; //鏍戝瀷100046 sessionStorage["OrganizationID"]
+ var sWhere1 = ""; //鍒楄〃
var option = {
elem: '#mainTable'
@@ -98,16 +98,15 @@
, cellMinWidth: 90
, cols: [[
{ type: 'radio', fixed: 'left' }
- , { field: 'hmainid', title: 'HInterID', sort: true, hide: true }
+ , { field: 'hmainid', title: 'HInterID' }
, { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�' }
- , { field: 'HCycleUnit', title: '鍛ㄦ湡鍗曚綅' }
]]
};
var index = layer.load(0, { shade: false });
//杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
$.ajax({
- url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+ url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
type: "GET",
data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
@@ -130,7 +129,7 @@
form.on('submit(btnSearch)', function (data) {
$.ajax({
- url: GetWEBURL() + '/Sc_MouldMaintainPlanBill/GetMouldMaintainPlanBillList',
+ url: GetWEBURL() + '/Sc_MouldMaintainRuleBill/GetMouldMaintainRuleList',
type: "GET",
data: { "sWhere": SeachFilter(sWhere1) },
success: function (data1) {
--
Gitblit v1.9.1