From 5de3b6fb03ea7538b05bc51ec5fc0191fc1aaba2 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 02 十一月 2022 13:52:51 +0800
Subject: [PATCH] 代码上传
---
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBackBillList.html | 2 +-
WebSRM/WebSRM.csproj.user | 2 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_PODemandPlanBillList.html | 2 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/基础资料/隐藏列设置/Gy_GridView_Hide.html | 21 +++++++++++----------
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html | 2 +-
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html | 4 ++--
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html | 6 ++----
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_EntrustOrderBillList.html | 4 ++--
8 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/WebSRM/WebSRM.csproj.user b/WebSRM/WebSRM.csproj.user
index b439ccf..41665a9 100644
--- a/WebSRM/WebSRM.csproj.user
+++ b/WebSRM/WebSRM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<NameOfLastUsedPublishProfile>D:\椤圭洰\鍑礉濂堢壒\zymesSrmLayUi\WebSRM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ShowAllFiles</ProjectView>
<UseIISExpress>true</UseIISExpress>
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 52db6b0..db3bab7 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
@@ -371,7 +371,7 @@
function RoadHBillNo(sqlWhere) {
where = sqlWhere;
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL() + "GetBarCodeShowList",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
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 9532dc2..9370e35 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
@@ -344,7 +344,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < dataCol.length; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -415,7 +415,7 @@
function get_Display(sqlWhere) {
var wait = layer.load();//閬僵
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL() + "GetEntrustOrderBill",
async: false,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
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 ec19c1b..e1dab34 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
@@ -462,7 +462,7 @@
function RoadHBillNo(sqlWhere) {
where = sqlWhere;
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL()+"GetPODemandPlanBill",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
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 817eae9..bbfb7b0 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
@@ -299,7 +299,7 @@
function RoadHBillNo(sqlWhere) {
where = sqlWhere;
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL()+"GetPOInStockBackBillList",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
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 e2c9263..bb747a6 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
@@ -305,7 +305,7 @@
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < dataCol.length; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -376,7 +376,7 @@
function get_Display(sqlWhere) {
var wait = layer.load();//閬僵
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL() + "GetPOInStockBill",
async: false,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
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 83316d8..0984ac8 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
@@ -341,10 +341,8 @@
if (data1.data.length != 0) {
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
var titleData = [];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
-
dataCol = data1.data[0].HGridString.split(',');
-
- for (var i = 0; i < option.cols[0].length - 2; i++) {
+ for (var i = 0; i < dataCol.length; i++) {
var dataCols = dataCol[i].split('|');
//闅愯棌鍒�
if (dataCols[1] == 1) {
@@ -415,7 +413,7 @@
function get_Display(sqlWhere) {
var wait = layer.load();//閬僵
$.ajax({
- type: "get",
+ type: "POST",
url: GetWEBURL() + "GetPOOrderBill",
async: true,
data: { "HSupNo": sessionStorage["HUserName"], "sqlWhere": sqlWhere },
diff --git "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html" "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
index 2985097..f58e068 100644
--- "a/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
+++ "b/WebSRM/layuiAdmin.std-v1.2.1/src/views/\345\237\272\347\241\200\350\265\204\346\226\231/\351\232\220\350\227\217\345\210\227\350\256\276\347\275\256/Gy_GridView_Hide.html"
@@ -204,7 +204,6 @@
get_Display();
}
- //鏌ヨ
function get_Display() {
var ajaxLoad = layer.load();
$.ajax({
@@ -214,10 +213,16 @@
success: function (data1) {
var colNames = [];//鐩稿鍗曟嵁浼犺繃鏉ョ殑鍒楀悕
var cols = [];//瑕佷紶杩涜〃鏍肩殑鏁版嵁
-
- colNames = colName.split(',');
+ var dataCol = [];
if (data1.data.length != 0) {
+ //鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
+ dataCol = data1.data[0].HGridString.split(',');
+ }
+
+ colNames = colName.split(',');
+
+ if (data1.data.length != 0 && dataCol.length == colNames.length) {
//鍐荤粨鍒�
$("#HFixCols").val(data1.data[0].HFixCols);
//瀛椾綋澶у皬
@@ -225,14 +230,10 @@
//鍒楀
$("#HColumnWidth").val(data1.data[0].HColumnWidth);
- var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
-
- dataCol = data1.data[0].HGridString.split(',');
-
//琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
var dataCols = dataCol[i].split('|');
- cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3]})
+ cols.push({ "ColumnName": colNames[i], "IsHide": dataCols[1] == 1 ? true : false, "Alignment": dataCols[2], "ColumnWidth": dataCols[3] })
}
option.data = cols;
table.render(option);
@@ -251,7 +252,7 @@
} else {
//榛樿涓嶉�変腑 鏄剧ず瀛椾綋灞呭乏 琛ㄦ牸鐨勬暟鎹～鍏�
for (var i = 0; i < colNames.length; i++) {
- cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth":120})
+ cols.push({ "ColumnName": colNames[i], "IsHide": false, "Alignment": "L", "ColumnWidth": 120 })
}
option.data = cols;
table.render(option);
@@ -284,7 +285,7 @@
{ field: 'ColumnName', title: '鍒楀悕', width: 100 }
, { file: 'IsHide', title: '鏄惁闅愯棌', width: 100, templet: '#IsHide' }
, { field: 'Alignment', title: '瀵归綈鏂瑰紡', width: 100, templet: '#Alignment' }
- , { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text'}
+ , { field: 'ColumnWidth', title: '鍒楀', width: 100, edit: 'text' }
]]
};
}
--
Gitblit v1.9.1