From ab2b5e20b54d748a6f58c4a3aecf882f9a26f630 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 07 十一月 2022 14:18:31 +0800
Subject: [PATCH] 代码上传
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html | 8 ++------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 10 ++--------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html | 2 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 4 ++--
WebSRM/App_Data/MssqlReportData.cs | 5 ++++-
8 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index d4a083d..1019e7a 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -16,7 +16,10 @@
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
//public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//鍑礉
- public const string SqlConnStr = "Data Source=192.168.1.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //public const string SqlConnStr = "Data Source=192.168.1.253;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //瀹夌憺
+ public const string SqlConnStr = "Data Source=192.168.80.91;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ //
//澶忓疂
//public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//瀹夌憺
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
index e6a7f20..0b4e5cf 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html
@@ -197,7 +197,7 @@
//鍘熺敓鎴愭潯鐮佹柟娉�(閫佽揣鍗曢粯璁�)
var mainUrl = "GetHBarCodeShowBillMain"; //琛ㄥご鏁版嵁鍔犺浇ajax
var subUrl = "GetHBarCodeShowBillSub";//琛ㄤ綋鏁版嵁鍔犺浇ajax h_v_SRM_POInStockBillSub_ForWeb2
- var saveBarCode = "GetBarcodeSaveBillOnlyInnerBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax GetBarcodeSaveBillBox GetBarcodeSaveBillOnlyInnerBox
+ var saveBarCode = "GetBarcodeSaveBillBox";//鏉＄爜鐢熸垚淇濆瓨鏂规硶ajax GetBarcodeSaveBillBox GetBarcodeSaveBillOnlyInnerBox
var openTmpListType = "HBarCodePrint"; //鏉＄爜鎵撳嵃鎸夐挳 寮瑰嚭鐣岄潰
//閲囪喘璁㈠崟鏉＄爜鐢熸垚瑙勫垯
if (type == 'SRM_POOrderBillList') {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
index db3bab7..cfc0b96 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html
@@ -137,7 +137,7 @@
//CreateReport("Report"); //鎵撳嵃
// Report.LoadFromURL("鐗╂枡鏉＄爜(涓冭绾稿ぇ)_浜斾簯.grf");
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
@@ -396,7 +396,7 @@
});
};
form.on('submit(f_Query)', function (data) {//鏌ヨ
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = "";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBarCode").val() != "")
@@ -429,12 +429,6 @@
RoadHBillNo(sqlWhere);
});
var $ = layui.$, active = {
- //f_Query: function () { //鏌ヨ
- // var sqlWhere = " and 1=1 ";
- // if ($("#HBarCode").val() != "")
- // sqlWhere += " and 鏉＄爜缂栧彿 like ''%" + $("#HBarCode").val() + "%''";
- // RoadHBillNo(sqlWhere);
- //},
};
$('.test-table-reload-btn .layui-btn').on('click', function () {
var type = $(this).data('type');
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
index 9370e35..4f8c85b 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html
@@ -166,7 +166,7 @@
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -441,7 +441,7 @@
});
//鏌ヨ鏉′欢
function get_FastQuery(table, option) {
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = "";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
index e1dab34..93e508c 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html
@@ -168,7 +168,7 @@
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -487,7 +487,7 @@
});
};
form.on('submit(f_Query)', function (data) {//鏌ヨ
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = "";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
index bbfb7b0..9487434 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html
@@ -132,7 +132,7 @@
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -324,7 +324,7 @@
});
};
form.on('submit(f_Query)', function (data) {//鏌ヨ
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = " ";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
@@ -367,10 +367,6 @@
});
},
f_Query: function () { //鏌ヨ
- //var sqlWhere = " and 1=1 ";
- //if ($("#HBillNo").val() != "")
- // sqlWhere += " and 鍗曟嵁鍙� like ''%" + $("#HBillNo").val() + "%''";
- //RoadHBillNo(sqlWhere);
},
};
$('.test-table-reload-btn .layui-btn').on('click', function () {
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
index bb747a6..e987ee5 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html
@@ -132,7 +132,7 @@
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -402,7 +402,7 @@
});
//鏌ヨ鏉′欢
function get_FastQuery(table, option) {
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = "";
if ($("#HStatus").val() != "")
if ($("#HStatus").val() == "鏈敓鎴愭潯鐮�") {
sqlWhere += " and 鏈敓鎴愭潯鐮佹暟閲� > 0";
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
index 0984ac8..43fa55d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html
@@ -164,7 +164,7 @@
<script src="../../../../Scripts/webConfig.js"></script>
<script>
var _cur_page = 1;
- var sql = " and 1=1";
+ var sql = "";
var options = document.getElementById('HStatus').children;
function getUrlVars() {
var vars = [], hash;
@@ -439,7 +439,7 @@
});
//鏌ヨ鏉′欢
function get_FastQuery(table, option) {
- var sqlWhere = " and 1=1 ";
+ var sqlWhere = "";
if ($("#HStatus").val() != "")
sqlWhere += " and 鐘舵�� like ^^%" + $("#HStatus").val() + "%^^";
if ($("#HBillNo").val() != "")
--
Gitblit v1.9.1