From 7de00c5824ecfd39fec748386298ba0cedd4504e Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期二, 16 一月 2024 16:06:10 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/基础资料/基础资料/InventoryAnalysis.html | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
index 667ac68..6a55a1a 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\237\272\347\241\200\350\265\204\346\226\231/InventoryAnalysis.html"
@@ -9,6 +9,7 @@
<link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
<link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
<script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
<style type="text/css">
input.layui-input.layui-unselect {
padding-right: 0;
@@ -172,7 +173,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
// #region 鍏ㄥ眬鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -191,6 +192,7 @@
, laypage = layui.laypage
, laydate = layui.laydate
, util = layui.util
+ , soulTable = layui.soulTable
//鏌ヨ鏉′欢
var sWhere = " HRealPotType=HBookPotType and HRealPot=HBookPot";
var option1 = [];
@@ -202,16 +204,16 @@
var option7 = [];
var col = [
{ type: 'checkbox', fixed: 'left' }
- , { field: 'HItemID', title: 'HItemID', width: 200,hide: true}
- , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200 }
- , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200 }
- , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200 }
- , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200 }
- , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200 }
- , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200 }
- , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200 }
- , { field: 'HOWNERName', title: '鐩樼偣缁勭粐', width: 200 }
- , { field: 'HMakeDate', title: '鐩樼偣鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>" }
+ , { field: 'HItemID', title: 'HItemID', width: 200, hide: true, sort: true}
+ , { field: 'HBarCode', title: '鍣ㄥ叿鏉＄爜', width: 200, sort: true}
+ , { field: 'HMouldNo', title: '鍣ㄥ叿缂栧彿', width: 200, sort: true}
+ , { field: 'HStockCheck', title: '鐩樼偣鏂规', width: 200, sort: true}
+ , { field: 'HRealPotType', title: '瀹為檯浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HRealPot', title: '瀹為檯浣嶇疆', width: 200, sort: true}
+ , { field: 'HBookPotType', title: '璐﹂潰浣嶇疆绫诲瀷', width: 200, sort: true}
+ , { field: 'HBookPot', title: '璐﹂潰浣嶇疆', width: 200, sort: true}
+ , { field: 'HOWNERName', title: '鐩樼偣缁勭粐', width: 200, sort: true}
+ , { field: 'HMakeDate', title: '鐩樼偣鏃ユ湡', width: 200, templet: "<div>{{d.HMakeDate ==null ?'':layui.util.toDateString(d.HMakeDate, 'yyyy-MM-dd')}}</div>", sort: true }
];
//#endregion
@@ -547,6 +549,9 @@
, limit: 50
, limits: [50, 500, 5000, 20000]
, cols: [col]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
};
option1.data = [];
table1.render(option1);
--
Gitblit v1.9.1