From 7091d926cd65404a8f7d5c14fb32ff306b85682b Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 01 十一月 2022 10:24:37 +0800
Subject: [PATCH] 1
---
WebTM/views/车间管理/报表分析/ProductionPlanReportList.html | 35 ++++++++++++++++++++++++++++++-----
WebTM/layuiadmin/Scripts/webConfig.js | 4 ++--
2 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 05c4506..02450a3 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -1,14 +1,14 @@
锘�
function GetWEBURL() {
//var WEBURL = "http://192.168.16.80:8011/"; //鍔炲叕瀹ゆ湇鍔″櫒
- var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
+ //var WEBURL = "http://localhost:8081/SWEAPI/"; //ch鏈湴*/
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
//var WEBURL = "http://localhost:8085/API/"; //zgq鏈湴
//var WEBURL = "http://localhost:8080/API/"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/lubao"; //棰滄檽鍐涙湰鍦伴厤缃�
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄩ湶鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //绔犵传鏌旀湰鍦伴厤缃�
- //var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
index 3cb8141..918fbd8 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/ProductionPlanReportList.html"
@@ -34,9 +34,13 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鎵瑰彿</label>
- <div class="layui-input-block">
- <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block" style="margin-left: 120px;width: 184px;">
+ <select name="HState" lay-verify="HState" id="HState">
+ <option value="0" selected="selected">鍏ㄩ儴</option>
+ <option value="1">鏈紑宸�</option>
+ <option value="3">宸插叆搴�</option>
+ </select>
</div>
</div>
<div class="layui-inline">
@@ -55,12 +59,17 @@
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-inline">
+ <div style="padding-left: 10px;">
+ <input type="checkbox" name="checkWRuku" id="checkWRuku" lay-skin="primary" lay-filter="checkWRuku" title="鏈笅鎺ㄥ強宸插叆搴�">
+ </div>
+ </div>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
<!--鍏朵粬鏉′欢-->
<div class="layui-inline">
<label class="layui-form-label">鐗╂枡浠ｇ爜</label>
- <div class="layui-input-inline">
+ <div class="layui-input-inline">
<input type="hidden" class="layui-input" lay-verify="HMaterID" name="HMaterID" id="HMaterID" value="0">
<input type="text" class="layui-input" lay-verify="HMaterNumber" name="HMaterNumber" id="HMaterNumber" value="" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="width: 40px;">
@@ -96,6 +105,12 @@
<label class="layui-form-label" style="width: 85px;">鍞竴ID</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="F_BSV_WYID" id="F_BSV_WYID">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鎵瑰彿</label>
+ <div class="layui-input-block">
+ <input type="text" class="layui-input" id="HICMOBillNo" style="width:190px;">
</div>
</div>
</div>
@@ -291,7 +306,15 @@
var HWorkShopID = $("#HWorkShopID").val();//鐝粍
var F_BSV_WYID = $("#F_BSV_WYID").val();//鍞竴ID
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
+ var HState = $("#HState").val();//鐘舵��
var HOrgID = sessionStorage["OrganizationID"];
+ var checkWRuku = $("input[name='checkWRuku']").prop("checked");//澶嶉�夋
+
+ if (checkWRuku) {
+ checkWRuku = 1;
+ } else {
+ checkWRuku = 0;
+ }
sWhere = {
HBeginDate: HBeginDate
@@ -302,6 +325,8 @@
, HMaterNumber: HMaterNumber
, HOrgID: HOrgID
, HBillNo: HBillNo
+ , IsTrue: checkWRuku
+ , HState: HState
}
get_Display(JSON.stringify(sWhere));
@@ -317,7 +342,7 @@
$("#HName").val("");
$("#HBillNo").val("");
$("#F_BSV_WYID").val("");
- sWhere = " where 1 = 1 ";
+ sWhere = "";
get_Display(sWhere);
}
--
Gitblit v1.9.1