From 4a7d15387c3289fab0306fb3e6357af53ca7dcb7 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 05 八月 2024 10:11:44 +0800
Subject: [PATCH] 当前工单汇报优化
---
WebTM/views/生产管理/报工台工序/防错/Sc_MaterToSourceStepBillList.html | 2
WebTM/views/车间管理/工序出站汇报单/Cj_StationOutBill_CurrentWork.html | 39 +++++++++++--
WebTM/views/生产管理/生产报表/Sc_NutInspectionCCDPassRate.html | 97 +++++++++++++++++---------------
3 files changed, 85 insertions(+), 53 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
index fb90343..eae9a1c 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\212\245\345\267\245\345\217\260\345\267\245\345\272\217/\351\230\262\351\224\231/Sc_MaterToSourceStepBillList.html"
@@ -410,7 +410,7 @@
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', sort: true }
, { field: '鐗╂枡鎵规', title: '鐗╂枡鎵规', sort: true }
, { field: '娴佽浆鍗℃壒娆�', title: '娴佽浆鍗℃壒娆�', sort: true }
- , { field: '鏁伴噺', title: '鏁伴噺', sort: true }
+ , { field: '鏁伴噺', title: '鏁伴噺', sort: true, totalRow: true }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', sort: true }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>", sort: true }
, { field: '瀹℃牳浜�', title: '瀹℃牳浜�', sort: true }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
index fb88583..e6d172f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\346\212\245\350\241\250/Sc_NutInspectionCCDPassRate.html"
@@ -208,9 +208,9 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- set_InitGrid();
+
//鏌ヨ
- //get_FastQuery();
+ get_FastQuery();
}
function set_InitGrid() {
@@ -242,7 +242,6 @@
, { field: '澶囨敞', title: '澶囨敞', sort: true }
]]
};
- table.render(option);
}
// 鏌ヨ
@@ -256,56 +255,62 @@
data: { "HBatchNo": $("#HBatchNo").val(), "user": sessionStorage["HUserName"] },
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: 'checkbox', fixed: 'left' });
- col.push({ type: 'numbers', title: '搴忓彿' });
- for (var i = 0; i < data.length; i++) {
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ if (data1.list.length>0) {
+ 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 });
}
- 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: 180 });
- break;
- case 'long':
- case 'Int32':
- case 'Int64':
- case 'double':
- case 'Decimal':
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
- break;
- default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 150 });
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ col.push({ type: 'checkbox', fixed: 'left' });
+ col.push({ type: 'numbers', title: '搴忓彿' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -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;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 180 });
+ }
}
}
- }
- //鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo1'
- , cols: [col]
- , data: data1.data
- , height: 800
- , page: true
- , totalRow: true
- , cellMinWidth: 90
- , limit: 50
- , limits: [50, 500, 5000, 20000]
- , done: function (res, curr, count) {
- soulTable.render(this);
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: data1.data
+ , height: 800
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
}
+ } else {
+ set_InitGrid();
}
+
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
index c20d4df..06ae8d3 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\267\245\345\272\217\345\207\272\347\253\231\346\261\207\346\212\245\345\215\225/Cj_StationOutBill_CurrentWork.html"
@@ -23,7 +23,7 @@
<div class="layui-card" style="padding: 1px">
<div class="layui-card-body" style="padding: 1px;">
<form class="layui-form" action="" lay-filter="component-form-group">
- <div style="width: 65%; height: calc(95vh); float: left; background-color: rgb(255 255 255) ">
+ <div style="width: 65%; height: calc(105vh); float: left; background-color: rgb(255 255 255) ">
<div id="top" style="width:100%;height:calc(40vh);">
<div id="top-left" style="width: 30%; height: calc(40vh); float: left;">
<div class="layui-inline">
@@ -230,9 +230,37 @@
</div>
</div>
</div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鎶ュ簾鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HWasterQty" id="HWasterQty" value="0" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">杩斿伐鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HBackWorkQty" id="HBackWorkQty" value="0" style="width: 150px;">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-bottom: 15px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">宸ュ簾鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HWasterQty_Work" id="HWasterQty_Work" value="0" style="width: 150px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 65px;">鏂欏簾鏁伴噺</label>
+ <div class="layui-input-block" style="margin-left: 95px;">
+ <input type="text" class="layui-input" name="HWasterQty_Mater" id="HWasterQty_Mater" value="0" style="width: 150px;">
+ </div>
+ </div>
+ </div>
</div>
</div>
- <div id="center" style="width: 100%; height: calc(40vh); margin-top: 1%;">
+ <div id="center" style="width: 100%; height: calc(55vh); margin-top: 1%;">
<div id="center-left" style="width: 30%; height: calc(40vh); float: left;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 30px;"><span style="font-weight:bolder">浜哄憳</span></label>
@@ -252,8 +280,7 @@
<div id="chart2" style="width: 75%; height: calc(40vh); left: 2%; float: left;"></div>
</div>
</div>
-
- <div id="bottom" style="width: 100%; height: calc(10vh);float:left;">
+ <div id="bottom" style="width: 100%; height: calc(10vh);">
<div id="bottom-left" style="width: 100%; height: calc(10vh);">
<div style="text-align: left; width: 100%; height: calc(10vh); ">
<button type="button" lay-submit="" lay-filter="tg" class="layui-btn layui-btn-radius " style="margin-left: 15%;" id="tg">鍋滃伐鎸傝捣</button>
@@ -265,7 +292,7 @@
</div>
</div>
</div>
- <div id="center-right-maintable" style="width: 34%; height: calc(95vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
+ <div id="center-right-maintable" style="width: 34%; height: calc(105vh); float: left; margin-left: 0.2%; background-color: rgb(255 255 255) ">
<div class="layui-tab" lay-filter="tab-POStockInBill">
<ul class="layui-tab-title" lay-filter="tab-all">
<li lay-id="1" style="padding:1px;" class="layui-this">鎵爜璁板綍</li>
@@ -813,7 +840,7 @@
, totalRow: true
//, cellMinWidth: 120
, data: []
- , height: 700
+ , height: 780
, limit: Number.MAX_VALUE
, cols: [[
{ type: 'checkbox', fixed: 'left' }
--
Gitblit v1.9.1