From 54ddbb9eba145dfdcee0c3d28bdd1a91aec34122 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 31 一月 2024 15:50:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/日计划报表/MaterialShorAnalysisReport.html | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
index 35796f3..6648e73 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\346\212\245\350\241\250/MaterialShorAnalysisReport.html"
@@ -11,6 +11,7 @@
<script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
<script src="../../../layuiadmin/Scripts/webConfig.js"></script>
<script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
</head>
<body>
@@ -50,7 +51,7 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch">閲嶇疆</button>
<div class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
<div class="layui-row" style="margin-top:10px;">
-
+
</div>
</div>
</div>
@@ -76,7 +77,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util'], function () {
+ }).use(['tree', 'index', 'form', 'table', 'element', 'laypage', 'laydate', 'util','soulTable'], function () {
//#region 鍏敤鍙橀噺
var $ = layui.$
, admin = layui.admin
@@ -89,6 +90,7 @@
, util = layui.util
, tree = layui.tree
, util = layui.util
+ , soulTable = layui.soulTable
var sWhere = "";
var option = [];
var HModName = "MaterialShorAnalysisReport";
@@ -126,6 +128,11 @@
});
//#endregion
+ //鍙屽嚮琛ㄦ牸浜嬩欢
+ table.on('rowDouble(mainTable)', function (obj) {
+ btnrowDouble(obj.data);
+ })
+
//#endregion
//#region 鏈〉闈㈣璋冪敤鐨勬墍鏈夋柟娉�
@@ -149,13 +156,13 @@
function set_InitGrid() {
var columns = [];
- columns.push({ type: 'checkbox', fixed: 'left' });
- columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐' });
- columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜' });
- columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О' });
- columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸' });
- columns.push({ field: 'CountHQty', title: '鍚堣' });
- columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺' });
+ columns.push({ field: 'HOrgName', title: '閲囪喘缁勭粐', sort: true });
+ columns.push({ field: 'FNUMBER', title: '鐗╂枡缂栫爜', sort: true });
+ columns.push({ field: 'HMaterName', title: '鐗╂枡鍚嶇О', sort: true });
+ columns.push({ field: 'HMaterModel', title: '鐗╂枡瑙勬牸', sort: true });
+ columns.push({ field: '鍦ㄩ�旀暟閲�', title: '鍦ㄩ�旀暟閲�' });
+ columns.push({ field: 'CountHQty', title: '鍚堣', sort: true });
+ columns.push({ field: 'FBASEQTY', title: '鍗虫椂搴撳瓨鏁伴噺', sort: true });
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBEGINDATE").val()));//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HENDDATE").val()));//缁撴潫鏃堕棿
@@ -199,6 +206,7 @@
, loading: false
, cols: [columns]
, done: function (res, page, count) {
+ soulTable.render(this);
var that = this.elem.next();
res.data.forEach(function (item, index) {
var NumCount = item.FBASEQTY;//鑾峰彇鎬诲簱瀛樻暟閲�
@@ -208,7 +216,7 @@
if (NumCount > parseFloat(item[dateNowTime])) {
NumCount -= parseFloat(item[dateNowTime]);
} else {
- var num = 6;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
+ var num = 7;//鍗虫椂搴撳瓨涓庢棩鏈熸尐鐫� 浠庡嵆鏃跺簱瀛樺紑濮嬬畻
tr = that.find(".layui-table-box tbody tr[data-index='" + index + "']");
rq = tr.children()[num + 1 + i];
rq.style.color = '#f66161';//鐒跺悗鍙樿壊
@@ -224,6 +232,21 @@
}
//#endregion
+ //鍙屽嚮璺宠浆榻愬鍒嗘瀽鏄庣粏琛�
+ function btnrowDouble(obj) {
+
+ var HMaterID = obj["鐗╂枡ID"];
+
+ layer.open({
+ type: 2 //绫诲瀷
+ , skin: 'layui-layer-rim'//鍔犱笂杈规
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , area: ['90%', '90%']//澶у皬
+ , title: '榻愬鐗╂枡鍒嗘瀽鏄庣粏琛�'//鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鐢熶骇绠＄悊/榻愬鍒嗘瀽/JIT_CompleteMaterlDetailList.html?OperationType=1&HMaterID=' + HMaterID, 'yes']
+ })
+ }
//鑾峰彇缁勭粐
function Organ() {
--
Gitblit v1.9.1