From 43e741c8377b555f4e5ed287bee724e71a11540f Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 22 一月 2024 12:41:01 +0800
Subject: [PATCH] 期初余额报表：查询过滤报错“客户名称无效”问题解决
---
WebTM/views/验收入库/委外入库/Kf_EntrustInBill_FastList.html | 143 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 102 insertions(+), 41 deletions(-)
diff --git "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html" "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
index d40a165..eca6199 100644
--- "a/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
+++ "b/WebTM/views/\351\252\214\346\224\266\345\205\245\345\272\223/\345\247\224\345\244\226\345\205\245\345\272\223/Kf_EntrustInBill_FastList.html"
@@ -120,7 +120,8 @@
, layer = layui.layer
, table = layui.table
, form = layui.form
- , element = layui.element;
+ , element = layui.element;
+ var option = {};
//娓呯┖鐣岄潰 new
var sBillType = '1210'
//鍔ㄦ�佸姞杞芥簮鍗曠被鍨嬪垪琛� new
@@ -160,27 +161,7 @@
});
//鍒锋柊
form.on('submit(cmdRefresh)', function () {//
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
- }
- }),
+ table.render(option);
table.render({
elem: '#yd-table'
, url: GetWEBURL() + '/Web/DisBillUpdateLoad_Json'
@@ -322,29 +303,109 @@
- table.render({
- elem: '#dj-table'
- , url: GetWEBURL() + '/Web/chanpinruk'
- , toolbar: '#toolbarDemo'
- , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
- , cols: [[
- { type: 'radio' }
- , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
- , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
- , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
- , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
- , { field: 'HQty', title: '鏁伴噺', width: 100 }
- , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
- , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
- , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
- ]]
- , height: 500
- , done: function () {
- layer.closeAll("loading");
+ //table.render({
+ // elem: '#dj-table'
+ // , url: GetWEBURL() + '/Web/chanpinruk'
+ // , toolbar: '#toolbarDemo'
+ // , where: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] }
+ // , cols: [[
+ // { type: 'radio' }
+ // , { field: 'HInterID', title: '鍗曟嵁鍐呯爜', width: 120 }
+ // , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ // , { field: 'HMaker', title: '鍒跺崟浜�', width: 120 }
+ // , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ // , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ // , { field: 'HSourceBillNo', title: '婧愬崟鍗曞彿', width: 150 }
+ // , { field: 'HRedBlueFlag', title: '绾㈣摑瀛�', width: 120 }
+ // , { field: 'HSourceBillType', title: '婧愬崟绫诲瀷', width: 100 }
+ // ]]
+ // , height: 500
+ // , done: function () {
+ // layer.closeAll("loading");
+ // }
+ //})
+
+
+
+ //鍔ㄦ�佸垪
+ $.ajax({
+ url: GetWEBURL() + "/Web/chanpinruk1",
+ type: "GET",
+ async: false,
+ data: { HBillType: sBillType, sHMaker: sessionStorage["HUserName"], HOrgID: sessionStorage["OrganizationID"] },
+ //async: false,
+ success: function (data1) {
+
+ if (data1.count == 1) {
+
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'radio', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [col]
+ , data: data1.data
+ };
+ table.render(option);
+ } else {
+ option = {
+ elem: '#dj-table'
+ , toolbar: '#toolbarDemo'
+ , height: 500
+ , page: true //寮�鍚垎椤�
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: [[
+ { type: 'radio' }
+ , { field: 'HMakeDate', title: '鍒跺崟鏃ユ湡', width: 150 }
+ , { field: 'HBillNo', title: '鍗曟嵁鍙�', width: 150 }
+ , { field: 'HMaterName', title: '鐗╂枡鍚嶇О', width: 150 }
+ , { field: 'HQty', title: '鏁伴噺', width: 100 }
+ ]]
+ , data: []
+ };
+ table.render(option);
+ }
+ },
+ error: function (err) {
+ layer.msg('閿欒' + err, {
+ icon: 5,
+ time: 20000
+ }, function () {
+ //do something
+ });
}
})
+
+
//宸蹭笂浼犲垪琛�
table.render({
elem: '#yd-table'
--
Gitblit v1.9.1