From 362059272e497dcb0f5eb28f09f6bbba875ecee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 05 九月 2024 13:46:42 +0800
Subject: [PATCH] 生产日,月汇报,良率统计,任务单通过率报表修改页面, 设备工艺参数根据采集来源判断单元格是否可以编辑 完善人机料法环报表
---
WebTM/WebTM.csproj.user | 2
WebTM/views/质量管理/质量报表/QC_ProcessPerformanceFirstPass.html | 20 --
WebTM/views/车间管理/报表分析/Sc_HMaterYieldStatisticsList.html | 13 +
WebTM/views/质量管理/质量报表/QC_FiveMenOneRingList.html | 127 +++++++++++++--
WebTM/views/质量管理/质量报表/QC_ProcessPerformancePass.html | 14 -
WebTM/views/车间管理/报表分析/Sc_HICMMaterStatisticsList.html | 13 +
WebTM/views/生产管理/生产报表/Sc_QualityReportBillMonth.html | 136 ++++++++++++----
WebTM/views/设备管理/设备工艺参数订单点检表/SB_EquipICMOTechParamBillEdit.html | 53 ++++--
WebTM/views/生产管理/生产报表/Sc_QualityReportBillDay.html | 47 +++++
9 files changed, 311 insertions(+), 114 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 9f5f7b5..e39639b 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <NameOfLastUsedPublishProfile>D:\vs\椤圭洰浠ｇ爜\MES-WEB-TM\MESWMS-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+ <NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
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_QualityReportBillDay.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_QualityReportBillDay.html"
index d3a6d61..e3aa308 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_QualityReportBillDay.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_QualityReportBillDay.html"
@@ -53,10 +53,30 @@
<input type="date" class="layui-input" id="HEndDate" style="width:190px;">
</div>
</div>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HProcName" id="HProcName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">璁惧</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HEquipName" id="HEquipName">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">鎵规鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input ForFilteringSchemes" name="HBactNo" id="HBactNo">
+ </div>
+ </div>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
+ </div>
</div>
</div>
<table class="" id="mainTable" lay-filter="mainTable"></table>
@@ -182,6 +202,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -211,15 +232,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
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')}}</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: 200 });
@@ -234,6 +260,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -270,13 +297,19 @@
var HBeginDate = $("#HBeginDate").val();
var HEndDate = $("#HEndDate").val();
var HNumber = $("#HNumber").val();
- var HName = $("#HName").val();
+ var HName = $("#HName").val();
+ var HProcName = $("#HProcName").val();
+ var HEquipName = $("#HEquipName").val();
+ var HBactNo = $("#HBactNo").val();
sWhere = {
HBeginDate: HBeginDate
, HEndDate: HEndDate
, HNumber: HNumber
, HName: HName
+ , HProcName: HProcName
+ , HEquipName: HEquipName
+ , HBactNo: HBactNo
}
get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
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_QualityReportBillMonth.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_QualityReportBillMonth.html"
index 6c615ff..52d9572 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_QualityReportBillMonth.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_QualityReportBillMonth.html"
@@ -42,7 +42,7 @@
</select>
</div>
</div>
- <div class="layui-inline "style="display:none">
+ <div class="layui-inline " style="display:none">
<label class="layui-form-label" style="width: 85px;">宸ヤ綔涓績</label>
<div class="layui-input-block" style="margin-left: 120px; width: 120px;">
<select name="HWorkCenter" id="HWorkCenter" lay-verify="HWorkCenter">
@@ -57,6 +57,18 @@
<input type="text" class="layui-input" id="HName" style="width:190px;">
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HBeginDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input" id="HEndDate" style="width:190px;">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
@@ -69,12 +81,13 @@
<div id="histogram" style="width:99.5%;height:calc(68vh);margin-top:10px;">
</div>
- <div style="width:99%;height:calc(30vh);">
+ <div style="width:99%;height:calc(50vh);">
<table class="" id="mainTable" lay-filter="mainTable"></table>
</div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
+ <button type="button" class="layui-btn layui-btn-sm" lay-event="get_export" id="get_export"><i class="layui-icon layui-icon-export"></i>瀵煎嚭</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>閫�鍑�</button>
<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>闅愯棌鍒楄缃�</button>
</div>
@@ -107,6 +120,7 @@
var option = [];
var HModName = "Sc_QualityReportBillMonth";
var HDeptID = 0;
+ var ins;
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -161,7 +175,7 @@
// 濉厖鏁版嵁
for (let i = 0; i < H_X.length; i++) {
let month = i + 1; // 1鍒�12鐨勬湀浠�
- let year = $("#Hyear").val(); // 褰撳墠骞翠唤
+ let year = $("#HYear").val(); // 褰撳墠骞翠唤
// 灏� monthlyTotals 涓殑鏁伴噺濉厖鍒� HProcSumNum 涓�
if (monthlyTotals[year] && monthlyTotals[year][month]) {
@@ -257,10 +271,7 @@
yAxis: [
{
type: 'value',
- name: '鐢熶骇鏁伴噺',
- //min: 0,
- //max: 200000,
- //interval: 10000,
+ name: '鐢熶骇鏁伴噺',
axisLabel: {
formatter: '{value}'
}
@@ -279,24 +290,44 @@
series: [
{
name: '娉ㄥ鏁伴噺',
- type: 'bar',
+ type: 'bar',
tooltip: {
valueFormatter: function (value) {
return value;
}
+ },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true, //寮�鍚樉绀�
+ textStyle: { //鏁板�兼牱寮�
+ color: 'black',
+ fontSize: 16
+ }
+ }
+ },
+ color: '#0000FF' // 璁剧疆鏌辩姸鍥鹃粦鑹�
},
data: HProcSumNum
},
{
name: '娉ㄥ鑹巼',
type: 'line',
- yAxisIndex: 1,
+ yAxisIndex: 1,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
data: HQualifiedNum
},
{
name: '鍏ㄦ鑹巼',
type: 'line',
- yAxisIndex: 1,
+ yAxisIndex: 1,
+ label: {
+ show: true,
+ formatter: '{c}%'
+ },
data: HFirstPassRate
}
]
@@ -313,6 +344,10 @@
//閫�鍑�
case 'btn-exit': Pub_Close(2);
break;
+ //瀵煎嚭excel
+ case 'get_export':
+ get_Export();
+ break;
//闅愯棌鍒楄缃�
case 'HideColumn':
get_HideColumn();
@@ -326,7 +361,7 @@
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
- get_FastQuery();
+ get_FastQuery(2);
});
//閫�鍑烘寜閽�
@@ -345,11 +380,12 @@
//鍒濆鍖栫晫闈�
function set_ClearBill() {
Year();
-
+ $("#HBeginDate").val(Format(new Date(new Date().setMonth(new Date().getMonth() - 6)), "yyyy-MM-dd"));
+ $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鍔犺浇鏁版嵁鍒扮綉鏍�
- get_FastQuery();
+ get_FastQuery(1);
//鍔犺浇鏌辩姸鍥�
set_Graphics();
@@ -372,13 +408,12 @@
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo'
- , height: '200px'
+ , height: '600px'
, totalRow: true
, page: true
, cellMinWidth: 90
, limit: 50
, limits: [50, 500, 5000, 20000]
-
}
}
@@ -390,10 +425,10 @@
type: "GET",
async: false,
data: { "sWhere": sWhere ,"user": sessionStorage["HUserName"] },
- success: function (data1) {
- var col = [];
+ success: function (data1) {
if (data1.count == 1) {
var data = [];
+ var col = [];
//缁欑┖鐨勬暟缁勮祴鍊�
for (var key in data1.list) {
data.push({ "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
@@ -410,28 +445,33 @@
case 'DateTime':
col.push({ field: data[i].name, 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')}}</div>", width: 120 });
break;
+ case 'long':
+ case 'Int32':
+ case 'Int64':
+ case 'double':
+ case 'Decimal':
+ col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, width: 120, totalRow: true });
+ break;
default:
col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
}
}
}
- //if (data1.data.length>0) {
- // for (let i = 1; i <= 12; i++) {
- // if (data1.data[0][i + "鏈�"] != 0) {
- // data1.data[3][i + "鏈�"] = (data1.data[3][i + "鏈�"]).toFixed(2) + '%'
- // }
- // else {
- // data1.data[3][i + "鏈�"] = (0.00).toFixed(2) + '%'
- // }
- // }
- // data1.data[3].鍚堣 = (data1.data[3].鍚堣).toFixed(2) + '%'
- //}
-
-
- option.cols = [col];
- option.data = data1.data;
-
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ , toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 'full-80'
+ , totalRow: true
+ , page: true
+ , limits: [50, 500, 5000, 50000]
+ , limit: 50
+ , cellMinWidth: 90
+ }
table.render(option);
+ ins = table.render(option);
layer.close(wait);
} else {
layer.close(wait);
@@ -445,17 +485,21 @@
}
//蹇�熻繃婊�
- function get_FastQuery() {
+ function get_FastQuery(number) {
var HYear = $("#HYear").val(); //骞翠唤
var HWorkCenter = $("#HWorkCenter").val() != null ? '': $("#HWorkCenter").val(); //宸ヤ綔涓績
var HName = $("#HName").val();//鐗╂枡鍚嶇О
-
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val(); //缁撴潫鏃ユ湡
sWhere = {
HYear: HYear
, HWorkCenter: HWorkCenter
, HName: HName
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
}
get_Display(JSON.stringify(sWhere));
+
//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
sWhere = "";
//鍔犺浇鏌辩姸鍥�
@@ -468,6 +512,28 @@
get_Display(JSON.stringify(sWhere));
}
+ //#region 瀵煎嚭Execel
+ function get_Export() {
+ var ModRightNameCheck = "Gy_ProjectMoney_ExportExcel";
+
+ //閫昏緫瀹℃牳鏂规硶
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/LMES/getReportByModRightNameCheck", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "ModRightNameCheck": ModRightNameCheck, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ table.exportFile(ins.config.id, option.data, "xls");
+ } else {
+ layer.alert("褰撳墠妯″潡娌℃湁瀵煎嚭鏉冮檺!", { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //#endregion
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
diff --git "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html" "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
index 8dad322..737032d 100644
--- "a/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
+++ "b/WebTM/views/\350\256\276\345\244\207\347\256\241\347\220\206/\350\256\276\345\244\207\345\267\245\350\211\272\345\217\202\346\225\260\350\256\242\345\215\225\347\202\271\346\243\200\350\241\250/SB_EquipICMOTechParamBillEdit.html"
@@ -604,7 +604,7 @@
, { field: 'HTechParamIDStd', title: 'HTechParamIDStd', width: 100, hide: true, style: 'background-color:#efefef4d;' }
, { field: 'HTechParamIDStdName', title: '璁惧璁惧畾鍊煎伐鑹哄弬鏁�', width: 130, edit: 'text', event: "HTechParamIDStdName" }
, { field: 'HResultStd', title: '璁惧璁惧畾鍊�', width: 130, edit: 'text' }
- , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: 'text', event: "HVaule" }
+ , { field: 'HVaule', title: '宸ヨ壓鍙傛暟鍊�', width: 100, edit: false, event: "HVaule" }
, { field: 'HStd', title: '鏍囧噯鍊�', width: 100, edit: 'text' }
, { field: 'HMax', title: '涓婇檺', width: 100, edit: 'text' }
, { field: 'HMin', title: '涓嬮檺', width: 100, edit: 'text' }
@@ -1227,32 +1227,47 @@
//#region 琛屽唴浜嬩欢
table.on('tool(mainTable)', function (obj) {
- set_GridDelete(obj); //琛屽唴鍒犻櫎
- set_GridCellCheck(obj); //琛屽唴蹇嵎閿瓫閫�
+ set_GridDelete(obj); // 琛屽唴鍒犻櫎
+ set_GridCellCheck(obj); // 琛屽唴蹇嵎閿瓫閫�
- var data = obj.data;
- if (obj.event == 'HVaule') {
- var field = $(this).data('field');
+ if (obj.event === 'HVaule') {
+ var field = obj.event; // 鑾峰彇瀛楁
var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
+ var cell = obj.tr.find('td[data-field="' + field + '"]'); // 鑾峰彇鍗曞厓鏍煎厓绱�
+
if (row['HRemark'] === '璁惧閲囬泦') {
layer.msg('姝ゅ崟鍏冩牸鐨勫�间负鈥滆澶囬噰闆嗏��,鏃犳硶缂栬緫'); // 鎻愮ず淇℃伅
+ cell.removeAttr('contenteditable'); // 纭繚鍗曞厓鏍间笉琚紪杈�
} else {
- // 鍏佽缂栬緫鍗曞厓鏍�
- $(this).attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
- $(this).focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
+ cell.attr('contenteditable', 'true'); // 浣垮崟鍏冩牸鍙紪杈�
+ cell.focus(); // 鑱氱劍鍒扮紪杈戠殑鍗曞厓鏍�
}
}
- // 鐩戝惉鍗曞厓鏍肩紪杈戠粨鏉熶簨浠�
- $(document).on('blur', '[contenteditable]', function () {
- var newValue = $(this).text(); // 鑾峰彇鏂板��
- var field = $(this).data('field');
- var row = obj.data; // 鑾峰彇褰撳墠琛屾暟鎹�
- row[field] = newValue; // 鏇存柊鏁版嵁
- obj.update(row); // 鏇存柊琛屾暟鎹�
- $(this).removeAttr('contenteditable'); // 鍙栨秷缂栬緫鐘舵��
+ });
+
+ // 鐩戝惉鍗曞厓鏍肩紪杈戠粨鏉熶簨浠�
+ $(document).on('blur', '[contenteditable]', function () {
+ var cell = $(this);
+ var newValue = cell.text(); // 鑾峰彇鏂板��
+ var field = cell.data('field'); // 鑾峰彇瀛楁
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
+
+ // 浣跨敤 layui 鐨勮〃鏍兼柟娉曟洿鏂版暟鎹�
+ var updatedData = table.cache['mainTable'].map(function (item) {
+ if (item.LAY_TABLE_INDEX === rowIndex) { // 浣跨敤 numbers 鍒楃储寮曞畾浣�
+ item[field] = newValue;
+ }
+ return item;
});
- });
- //#endregion
+
+ layui.table.reload('mainTable', {
+ data: updatedData
+ });
+
+ // 鍙栨秷缂栬緫鐘舵��
+ cell.removeAttr('contenteditable');
+ });
+
//#region 琛屽唴鍒犻櫎
function set_GridDelete(obj) {
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
index 1900430..4e17246 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_FiveMenOneRingList.html"
@@ -759,23 +759,116 @@
table.on('tool(mainTable_Man)', function (obj) {
var data = obj.data;
if (obj.event == '鍗曟嵁鍙�') {
- var linterid = data.鍗曟嵁涓籭d;
- var HBillNo = data.鍗曟嵁鍙�;
- layer.open({
- type: 2
- , area: ['100%', '100%']
- , title: '鏌ョ湅鍑虹珯鍗�'
- , closeBtn: 1
- , shade: 0.6 //閬僵閫忔槑搴�
- , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
- , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
- , resize: false,
- end: function () {
- }
- , cancel: function () {
- }
- })
+ if (data.鍗曟嵁绫诲瀷=="宸ュ簭鍑虹珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍑虹珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭鍑虹珯姹囨姤鍗�/Cj_StationOutBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "宸ュ簭杩涚珯鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅杩涚珯鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../杞﹂棿绠＄悊/宸ュ簭杩涚珯鎺ユ敹鍗�/Cj_StationInBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0&HBillNo=' + HBillNo + '&closeType=1'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍙栨牱鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../璐ㄩ噺绠＄悊/妫�楠屽彇鏍疯繕鏍峰崟/QC_Add_TakeSampleCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "寮�宸ュ崟") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅寮�宸ュ崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/寮�宸�/Sc_Add_MESBeginStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "鍋滃伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/鍋滃伐/Sc_MESStopStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ } else if (data.鍗曟嵁绫诲瀷 == "瀹屽伐鍗�") {
+ var linterid = data.鍗曟嵁涓籭d;
+ var HBillNo = data.鍗曟嵁鍙�;
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鍙栨牱鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../../鐢熶骇绠＄悊/鎶ュ伐鍙板伐搴�/瀹屽伐/Sc_Add_MESEndStepWorkBillList.html?OperationType=3&linterid=' + linterid + '&HSouceBillType='
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+
} else if (obj.event == '鑱屽憳') {
var linterid = data.鑱屽憳id;
layer.open({
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
index bcef798..e4d973b 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformanceFirstPass.html"
@@ -38,15 +38,7 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
- <div class="layui-inline" style="display:none">
- <label class="layui-form-label">杞﹂棿</label>
- <div class="layui-input-block" style="width: 190px;">
- <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
- <!--鍔ㄦ�佹覆鏌撻儴闂�-->
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -208,8 +200,7 @@
//#region 姝ら〉闈㈡墍鏈夋柟娉�
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
- Year(); //鍒濆鍖栧勾
- DeptName();//鍒濆鍖栬溅闂�
+ Year(); //鍒濆鍖栧勾
Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -321,7 +312,6 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
- var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProject = $("#HProject").val();//椤圭洰鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -329,8 +319,7 @@
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
sWhere = {
- HYear: HYear
- , HDeptName: HDeptName
+ HYear: HYear
, HProject: HProject
, HMaterNumber: HMaterNumber
, HMaterName: HMaterName
@@ -345,8 +334,7 @@
}
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
- $("#HYear").val(new Date().getFullYear());
- $("#HDeptName").val("0");
+ $("#HYear").val(new Date().getFullYear());
$("#HProject").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
index 9fc4509..d4d9940 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_ProcessPerformancePass.html"
@@ -38,15 +38,7 @@
<!--鍔ㄦ�佹覆鏌撳勾浠�-->
</select>
</div>
- </div>
- <div class="layui-inline" style="display:none">
- <label class="layui-form-label">杞﹂棿</label>
- <div class="layui-input-block" style="width: 190px;">
- <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
- <!--鍔ㄦ�佹覆鏌撻儴闂�-->
- </select>
- </div>
- </div>
+ </div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鏄惁閲忎骇</label>
<div class="layui-input-block" style="margin-left: 120px; width: 185px;">
@@ -209,7 +201,6 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
Year(); //鍒濆鍖栧勾
- DeptName();//鍒濆鍖栬溅闂�
Get_HProject(); //鑾峰彇椤圭洰鍙�
GetGy_Division();//鑾峰彇浜嬩笟閮�
set_InitGrid(); //鍒濆鍖栬〃鏍�
@@ -319,7 +310,6 @@
//蹇�熸煡璇�
function get_FastQuery() {
var HYear = $("#HYear").val();
- var HDeptName = $("#HDeptName").val();//杞﹂棿
var HProject = $("#HProject").val();//椤圭洰鍙�
var HMaterNumber = $("#HMaterNumber").val();//鐗╂枡浠ｇ爜
var HMaterName = $("#HMaterName").val();//鐗╂枡鍚嶇О
@@ -328,7 +318,6 @@
sWhere = {
HYear: HYear
- , HDeptName: HDeptName
, HProject: HProject
, HMaterNumber: HMaterNumber
, HMaterName: HMaterName
@@ -344,7 +333,6 @@
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HYear").val(new Date().getFullYear());
- $("#HDeptName").val("0");
$("#HProject").val("");
$("#HMaterNumber").val("");
$("#HMaterName").val("");
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HICMMaterStatisticsList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HICMMaterStatisticsList.html"
index b35ac8b..ca9035c 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HICMMaterStatisticsList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HICMMaterStatisticsList.html"
@@ -263,6 +263,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -292,15 +293,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
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
+ switch (data[i].Type) {
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')}}</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: 200 });
@@ -315,6 +321,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HMaterYieldStatisticsList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HMaterYieldStatisticsList.html"
index 080c030..b265493 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HMaterYieldStatisticsList.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Sc_HMaterYieldStatisticsList.html"
@@ -265,6 +265,7 @@
elem: '#mainTable'
, toolbar: '#toolbarDemo'
, height: 'full-50'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
@@ -294,15 +295,20 @@
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left' });
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
+ switch (data[i].Type) {
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')}}</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: 200 });
@@ -317,6 +323,7 @@
, cols: [col]
, data: data1.data
, height: 'full-80'
+ , totalRow: true
, page: true
, limits: [50, 500, 5000, 50000]
, limit: 50
--
Gitblit v1.9.1