From e4f24e81dc1f484cd91b965ed3eada9865b0bf85 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期一, 17 三月 2025 17:03:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/公共页面/Kf_SourceBillEditDlg_PDA.html | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html" "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
index 1af7cc6..4637da9 100644
--- "a/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
+++ "b/WebTM/views/\345\205\254\345\205\261\351\241\265\351\235\242/Kf_SourceBillEditDlg_PDA.html"
@@ -229,15 +229,16 @@
//#region 鏄剧ず鐗╂枡鍒楄〃淇℃伅
function DisBillEntryList() {
+ layer.load(3)
$.ajax({
type: "GET",
url: GetWEBURL() + '/WEBSController/GetSourceBillList_Json',
async: true, //async鐢ㄤ簬鎺у埗锛坒alse锛夊悓姝ュ拰锛坱rue锛夊紓姝ワ紝榛樿鐨勬槸true锛屽嵆璇锋眰榛樿鐨勬槸寮傛璇锋眰
data: { "HBillType": HBillType, "HSourceBillType": HSourceBillType, "HStockOrgID": HStockOrgID, "HSourceBillNo": HSourceBillNo, "HMater": HMater, "HCustom": HCustom },
success: function (result) {
+ var data = [];
+ var col = [];
if (result.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
- var data = [];
- var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in result.list) {
//鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
@@ -273,9 +274,15 @@
table.render(listOption);
}
else {
- listOption.cols = [columns];
- listOption.data = result.data;
- table.cache['dj-table'] = null; //娓呯┖琛ㄦ牸缂撳瓨鏁版嵁
+ listOption.cols = [[
+ { field: '鏃ユ湡', title: '鏃ユ湡', width: 100 }
+ , { field: '鍗曟嵁鍙�', title: '鍗曟嵁鍙�', width: 100 }
+ , { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 100 }
+ , { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 100 }
+ , { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 100 }
+ , { field: '鏁伴噺', title: '鏁伴噺', width: 100 }
+ ]];
+ listOption.data = data;
table.render(listOption);
//layer.msg(result.Message);
//layer.msg(result.Message, { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
@@ -283,6 +290,7 @@
},
complete: function (XHR, TS) { XHR = null }//鍥炴敹璧勬簮
});
+ layer.closeAll("loading");
}
//#endregion
--
Gitblit v1.9.1