From b76333164df502f2d9a07e16354a1ad74427d748 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期一, 27 十二月 2021 15:08:09 +0800
Subject: [PATCH] 添加物料编码字段
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 94 +++++++++++++++---------------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 31 +++++-----
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 4
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 7 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 7 +-
WebSRM/App_Data/MssqlReportData.cs | 6 +-
6 files changed, 76 insertions(+), 73 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index d08e38b..75fe363 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -14,9 +14,9 @@
//杩炴帴SQL Server鏁版嵁搴撶殑杩炴帴涓诧紝搴旇淇敼涓轰笌瀹為檯涓�鑷淬�傚鏋滄槸杩愯Grid++Report鏈韩鐨勪緥瀛愶紝搴旇棣栧厛闄勫姞渚嬪瓙鏁版嵁搴撳埌
//SQL Server2000/2005鏁版嵁搴撲笂銆�
//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=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ 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.239;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
//public string sDataBase;
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 c51b5fc..c749e5d 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
@@ -182,12 +182,12 @@
index: 'lib/index' //涓诲叆鍙ｆā鍧�
}).use(['index', 'form', 'laydate', 'code', 'table', 'element', 'layer'], function () {
var $ = layui.$
- , admin = layui.admin
- , layer = layui.layer
- , laydate = layui.laydate
- , table = layui.table
- , form = layui.form
- , element = layui.element;
+ , admin = layui.admin
+ , layer = layui.layer
+ , laydate = layui.laydate
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element;
//甯歌鐢ㄦ硶
laydate.render({
elem: '#HDate1'
@@ -208,36 +208,37 @@
, toolbar: '#toolbarDemo' //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
, defaultToolbar: ['filter', 'exports', 'print']
// , where: { msg: "", NowPage: 1, OnePage: 10 }
- , cellMinWidth: 100
- , cols: [[
- { checkbox: true/*, fixed: true*/ }
- , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
- , { field: 'HItemID', title: '涓婚敭', width: 100, hide: true }
- , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true/*, fixed: true*/ }
- , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 180, sort: true/*, fixed: true*/ }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true/*, fixed: true*/ }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
- , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', width: 100, sort: true }
- , { field: '鎵规', title: '鎵规', width: 100 }
- , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180 }
- , { field: '鏃ユ湡', title: '鐢熸垚鏃ユ湡', width: 150, sort: true }
- , { field: '婧愬崟涓籌D', title: '婧愬崟涓籌D', width: 100, hide: true }
- , { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D', width: 100, hide: true }
- , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 180 }
- , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
+ , cellMinWidth: 100
+ , cols: [[
+ { checkbox: true/*, fixed: true*/ }
+ , { field: 'sorderid', title: '搴忓彿', width: 80/*, fixed: true*/ }
+ , { field: 'HItemID', title: '涓婚敭', width: 100, hide: true }
+ , { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true/*, fixed: true*/ }
+ , { field: '鏉＄爜缂栧彿', title: '鏉＄爜缂栧彿', width: 180, sort: true/*, fixed: true*/ }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true/*, fixed: true*/ }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true/*, fixed: true*/ }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
+ , { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100, sort: true }
+ , { field: '鎵规', title: '鎵规', width: 100 }
+ , { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180 }
+ , { field: '鏃ユ湡', title: '鐢熸垚鏃ユ湡', width: 150, sort: true }
+ , { field: '婧愬崟涓籌D', title: '婧愬崟涓籌D', width: 100, hide: true }
+ , { field: '婧愬崟瀛怚D', title: '婧愬崟瀛怚D', width: 100, hide: true }
+ , { field: '婧愬崟鍗曞彿', title: '婧愬崟鍗曞彿', width: 180 }
+ , { field: '婧愬崟绫诲瀷', title: '婧愬崟绫诲瀷', width: 100 }
+ ]]
//, skin: 'row' //琛ㄦ牸椋庢牸
// , even: true
- , page: true //鏄惁鏄剧ず鍒嗛〉
- , limits: [10, 20, 50, 100]
- , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
+ , page: true //鏄惁鏄剧ず鍒嗛〉
+ , limits: [10, 20, 50, 100]
+ , limit: 50 //姣忛〉榛樿鏄剧ず鐨勬暟閲�
//, height: 500
- , done: function (res, curr, count) {
- _cur_page = curr;
- layer.closeAll("loading");
- }
+ , done: function (res, curr, count) {
+ _cur_page = curr;
+ layer.closeAll("loading");
+ }
});
//澶村伐鍏锋爮浜嬩欢
@@ -248,15 +249,15 @@
var data = checkStatus.data;
layer.alert(JSON.stringify(data));
break;
- //case 'getCheckLength':
- // var data = checkStatus.data;
- // layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
- // break;
- //case 'isAll':
- // layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
- // break;
+ //case 'getCheckLength':
+ // var data = checkStatus.data;
+ // layer.msg('閫変腑浜嗭細' + data.length + ' 涓�');
+ // break;
+ //case 'isAll':
+ // layer.msg(checkStatus.isAll ? '鍏ㄩ��' : '鏈叏閫�');
+ // break;
- //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
+ //鑷畾涔夊ご宸ュ叿鏍忓彸渚у浘鏍� - 鎻愮ず
case 'btn-reload':
_cur_page = $(".layui-laypage-em").next().html();
RoadHBillNo(sql);
@@ -264,7 +265,7 @@
break;
case "btn-print":
var checkStatus = table.checkStatus('mainTable')
- , data = checkStatus.data;
+ , data = checkStatus.data;
var rows = '';
var rows2 = '';
for (var i = 0; i < data.length; i++) {
@@ -273,11 +274,10 @@
}
rows = rows.substring(rows.length - 1, 0);
rows2 = rows2.substring(rows2.length - 1, 0);
- if(rows=="")
- {
+ if (rows == "") {
layer.msg("鑷冲皯閫夋嫨涓�琛岃褰曪紒")
}
- else{
+ else {
layer.open({
type: 2
, area: ['50%', '50%']
@@ -327,7 +327,7 @@
where = sqlWhere;
$.ajax({
type: "get",
- url: GetWEBURL()+"GetBarCodeShowList",
+ url: GetWEBURL() + "GetBarCodeShowList",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
success: function (result) {
@@ -375,7 +375,7 @@
sqlWhere += " and 鏃ユ湡 <= ^^" + $("#HDate2").val() + "^^";
}
-
+
sql = sqlWhere;
//浠庣涓�椤靛紑濮�
_cur_page = 1;
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 f010a24..0f03e51 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
@@ -242,9 +242,10 @@
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 180, sort: true/*, fixed: 'left' */ }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */ }
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
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 c93c925..679d74a 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
@@ -140,7 +140,7 @@
<div class="layui-btn-container">
<!--<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-Audit"><i class="layui-icon layui-icon-radio"></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-confirm"><i class="layui-icon layui-icon-ok-circle"></i>纭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="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>
@@ -252,19 +252,20 @@
, { field: 'hsubid', title: 'hsubid', sort: true/*, fixed: true*/, hide: true }
, { field: '鐘舵��', title: '鐘舵��', width: 100, sort: true/*, fixed: true*/ }
, { field: '鍗曟嵁鐘舵��', title: '鍗曟嵁鐘舵��', sort: true/*, fixed: true*/ }
- , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 180, sort: true/*, fixed: true*/ }
- , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿', width: 180, sort: true/*, fixed: true*/ }
- , { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 180, sort: true/*, fixed: true*/ }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 150, sort: true/*, fixed: true*/ }
+ , { field: '閫佽揣鍗曞彿', title: '閫佽揣鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
+ , { field: '鐗╂祦鍗曞彿', title: '鐗╂祦鍗曞彿', width: 150, sort: true/*, fixed: true*/ }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', width: 100, sort: true }
, { field: '鏈敓鎴愭潯鐮佹暟閲�', title: '鏈敓鎴愭潯鐮佹暟閲�', width: 100, sort: true }
, { field: '鍚堟牸鏁伴噺', title: '鍚堟牸鏁伴噺', width: 100, sort: true }
, { field: '涓嶅悎鏍兼暟閲�', title: '涓嶅悎鏍兼暟閲�', width: 100, sort: true }
- , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100, sort: true }
- , { field: '閲戦', title: '閲戦', width: 100, sort: true }
+ , { field: '鍚◣鍗曚环', title: '鍚◣鍗曚环', width: 100, sort: true, hide: true }
+ , { field: '閲戦', title: '閲戦', width: 100, sort: true, hide: true }
, { field: '鏃ユ湡', title: '鏃ユ湡', width: 150, sort: true }
, { field: '鎵规', title: '鎵规', width: 150, sort: true }
, { field: '鐢熶骇鏃ユ湡', title: '鐢熶骇鏃ユ湡', width: 150, sort: true }
@@ -400,12 +401,12 @@
layer.msg("璇烽�夋嫨鏁版嵁", { icon: 5 });
return;
}
- for (var i = 0; i < data.length; i++) {
- if (data[i].鍗曟嵁鐘舵�� != "瀹℃牳") {
- layer.msg("閫変腑琛屾湭瀹℃牳", { icon: 5 });
- return;
- }
- }
+ //for (var i = 0; i < data.length; i++) {
+ // if (data[i].鍗曟嵁鐘舵�� != "瀹℃牳") {
+ // layer.msg("閫変腑琛屾湭瀹℃牳", { icon: 5 });
+ // return;
+ // }
+ //}
layer.open({
type: 2
, area: ['50%', '50%']
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index 677c4e6..7544ce3 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -304,8 +304,8 @@
, { field: 'HKFDate', title: '鐢熶骇鏃ユ湡', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
, { field: 'HKFPeriod', title: '淇濊川鏈�', width: 100 }
, { field: 'HDate', title: '棰勮鍒拌揣鏃ユ湡', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
- , { field: 'HPrice', title: '鍗曚环', width: 100 }
- , { field: 'HMoney', title: '閲戦', width: 100 }
+ , { field: 'HPrice', title: '鍗曚环', width: 100, hide: true }
+ , { field: 'HMoney', title: '閲戦', width: 100, hide: true}
//, { field: 'HRemark', title: '澶囨敞', width: 100 }
, { field: 'HPOOrderInterID', title: '閲囪喘璁㈠崟涓诲唴鐮�', width: 150, hide: true }
, { field: 'HPOOrderEntryID', title: '閲囪喘璁㈠崟瀛愬唴鐮�', width: 150, hide: true }
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 da67084..cb61616 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
@@ -248,9 +248,10 @@
, { field: 'HSupID', title: 'HSupID', width: 180, hide: true }
, { field: '渚涘簲鍟�', title: '渚涘簲鍟�', width: 180, sort: true/*, fixed: 'left' */}
, { field: '璁″垝璺熻釜鍗曞彿', title: '璁″垝璺熻釜鍗曞彿', sort: true, hide: true }
- , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 180, sort: true }
- , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 180, sort: true }
- , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 180, sort: true }
+ , { field: '鐗╂枡缂栫爜', title: '鐗╂枡缂栫爜', width: 120, sort: true }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 120, sort: true }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 120, sort: true }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 120, sort: true }
, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 80, sort: true }
, { field: '鏁伴噺', title: '璁㈣揣鏁伴噺', sort: true }
, { field: '浜よ揣鍦扮偣', title: '浜よ揣鍦扮偣', sort: true }
--
Gitblit v1.9.1