From af307e0510176fd125da44829c9346b0bef92bf9 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 15 十二月 2022 14:59:45 +0800
Subject: [PATCH] 维护
---
WebTM/views/PublicPage/HSourceReportHtml.html | 39 +++++++++++++++++++--------------------
WebTM/views/仓存管理/条码生成/Gy_BarCodeBill.html | 4 ++--
2 files changed, 21 insertions(+), 22 deletions(-)
diff --git a/WebTM/views/PublicPage/HSourceReportHtml.html b/WebTM/views/PublicPage/HSourceReportHtml.html
index 8cb53a7..0fe673e 100644
--- a/WebTM/views/PublicPage/HSourceReportHtml.html
+++ b/WebTM/views/PublicPage/HSourceReportHtml.html
@@ -199,10 +199,11 @@
async: false,
dataType: "json",//鏁版嵁绫诲瀷鍙互涓� text xml json script jsonp
success: function (data1) {
+ layer.close(ajaxLoad);
for (var key in data1.list) {
resultTableHead.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
}
- set_InitGrid(sWhere);
+ set_InitGrid(data1);
}, error: function (err) {
layer.alert(err.Message, { icon: 5 });
}
@@ -212,7 +213,7 @@
//#endregion
//#region 鍒濆鍖栬〃鏍兼柟娉�
- function set_InitGrid(sWhere) {
+ function set_InitGrid(data1) {
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
@@ -238,24 +239,22 @@
}
//濉厖琛ㄦ牸鏁版嵁
table.render({
- elem: '#layTable',
- url: GetWEBURL() + '/Sc_BarCode/ReportFromBillList',
- //toolbar: '#toolbarDemo', //寮�鍚ご閮ㄥ伐鍏锋爮锛屽苟涓哄叾缁戝畾宸︿晶妯℃澘
- title: '' + HSouceBillType + '',
- cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
- id: 'layTable', //琛ㄦ牸id
- where: { sWhere: sWhere, HSouceBillType: HSouceBillType, HOrgID: linterid }, //鎵╁睍鍙傛暟,鍙互浼犳暟鎹埌鍚庡彴
- page: true, //寮�鍚垎椤�
- totalRow: false, //寮�鍚悎璁�
- limit: 50, //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
- limits: [50, 500, 2000, 20000], //鎺у埗澶氬皯琛屼竴椤碉紙榛樿浜旀潯涓�椤碉級
- method: 'get', //鎻愪氦鏂瑰紡
- layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'],
- height:600,
- response: {
- statusCode: 1 //閲嶆柊瑙勫畾鎴愬姛鐨勭姸鎬佺爜涓� 1锛宼able 缁勪欢榛樿涓� 0
- },
- done: function (res) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
+ id: 'layTable'
+ , elem: '#layTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [cols_arr[0]]
+ , data: data1.data == null ? [] : data1.data
+ , title: '' + HSouceBillType + ''
+ , page: true //寮�鍚垎椤�
+ , totalRow: false //寮�鍚悎璁�
+ , cellMinWidth: 120
+ , height: 520
+ , limit: 50 //涓�椤佃兘澶熸樉绀虹殑鏈�澶ф暟鐩�
+ , limits: [50, 500, 5000, 20000]
+ , method: 'get' //鎻愪氦鏂瑰紡
+ , layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
+ , loading: false
+ , done: function (res, curr, count) { //杩斿洖鏁版嵁鎵ц鍥炶皟鍑芥暟
layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
}
});
diff --git "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html" "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
index 95abda5..1ae50ff 100644
--- "a/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
+++ "b/WebTM/views/\344\273\223\345\255\230\347\256\241\347\220\206/\346\235\241\347\240\201\347\224\237\346\210\220/Gy_BarCodeBill.html"
@@ -99,7 +99,7 @@
<div class="layui-inline">
<label class="layui-form-label">閫夊崟鍙�<label style="color:red"> * </label></label>
<div class="layui-input-inline">
- <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float:left;width:150px;">
+ <input type="text" name="HSourceBillNo" id="HSourceBillNo" readonly class="layui-input" value="" style="float: left; width: 150px; background-color: #efefef4d;">
<button type="button" lay-submit="" class="layui-btn" lay-filter="HSourceBillNoList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
@@ -606,7 +606,7 @@
$("#HOrgID").append(Organization);
form.render('select');
}
- $('#HOrgID').find("option[value=" + result.data[0].ID + "]").attr("selected", true);
+ $('#HOrgID').find("option[value=" + sessionStorage["OrganizationID"] + "]").attr("selected", true);
form.render('select') //鍐嶆娓叉煋
layer.closeAll("loading");
}
--
Gitblit v1.9.1