From 07cf94734c36d4eae6ddbc4dd338bf5af81a2193 Mon Sep 17 00:00:00 2001
From: wtt <1985833171@qq.com>
Date: 星期一, 28 十月 2024 16:11:39 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_RegistrationForTestingReport.html | 98 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 15 deletions(-)
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_RegistrationForTestingReport.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_RegistrationForTestingReport.html"
index d17a999..318c4f1 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_RegistrationForTestingReport.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_RegistrationForTestingReport.html"
@@ -117,7 +117,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -216,20 +216,20 @@
var columns = [];
columns.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- columns.push({ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 180});
+ columns.push({ field: '鏃ユ湡', title: '鏃ユ湡', sort: true, width: 180 });
columns.push({ field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', sort: true, width: 180 });
columns.push({ field: '鐗╂枡', title: '鐗╂枡', sort: true, width: 110 });
columns.push({ field: '宸ュ簭', title: '宸ュ簭', sort: true, width: 110 });
columns.push({ field: '鎵规鍙�', title: '鎵规鍙�', sort: true, width: 110 });
- columns.push({ field: '(1)浜у搧鍗曢噸/g', title: '(1)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '(2)浜у搧鍗曢噸/g', title: '(2)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '(3)浜у搧鍗曢噸/g', title: '(3)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140});
- columns.push({ field: '閫佹祴鍐呭', title: '閫佹祴鍐呭', sort: true, width: 110});
- columns.push({ field: '閫佹祴鏁伴噺', title: '閫佹祴鏁伴噺', sort: true, totalRow: true, width: 110});
- columns.push({ field: '閫佹祴鏃堕棿', title: '閫佹祴鏃堕棿', sort: true, width: 180});
- columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, width: 110});
- columns.push({ field: '鍥炴敹鏁伴噺', title: '鍥炴敹鏁伴噺', sort: true, totalRow: true, width: 110});
- columns.push({ field: '鍥炴敹鏃堕棿', title: '鍥炴敹鏃堕棿', sort: true, width: 180});
+ columns.push({ field: '(1)浜у搧鍗曢噸/g', title: '(1)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '(2)浜у搧鍗曢噸/g', title: '(2)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '(3)浜у搧鍗曢噸/g', title: '(3)浜у搧鍗曢噸/g', sort: true, totalRow: true, width: 140 });
+ columns.push({ field: '閫佹祴鍐呭', title: '閫佹祴鍐呭', sort: true, width: 110 });
+ columns.push({ field: '閫佹祴鏁伴噺', title: '閫佹祴鏁伴噺', sort: true, totalRow: true, width: 110 });
+ columns.push({ field: '閫佹祴鏃堕棿', title: '閫佹祴鏃堕棿', sort: true, width: 180 });
+ columns.push({ field: '鍒ゅ畾缁撴灉', title: '鍒ゅ畾缁撴灉', sort: true, width: 110 });
+ columns.push({ field: '鍥炴敹鏁伴噺', title: '鍥炴敹鏁伴噺', sort: true, totalRow: true, width: 110 });
+ columns.push({ field: '鍥炴敹鏃堕棿', title: '鍥炴敹鏃堕棿', sort: true, width: 180 });
option = {
elem: '#mainTable'
, toolbar: '#toolbarDemo1'
@@ -238,7 +238,7 @@
//, cellMinWidth: 'auto'
, totalRow: true
, limit: 500
- , data:[]
+ , data: []
, limits: [50, 500, 5000, 20000]
//, done: function (res, curr, count) {
// soulTable.render(this);
@@ -272,6 +272,13 @@
for (var i = 0; i < data.length; i++) {
if ($.inArray(data[i].name, titleData) > -1) {
col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else if (data[i].name == '妫�楠屽崟鍗曞彿') {//娣诲姞瓒呴摼鎺�
+ col.push({
+ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '妫�楠屽崟鍗曞彿', templet: function (d) {
+ return '<span style="color: blue;">' + d.妫�楠屽崟鍗曞彿 + '</span>'
+ }, style: 'cursor: pointer;'
+ });
}
else {
switch (data[i].Type) {
@@ -311,7 +318,7 @@
option.data = data1.data
}
-
+
table.render(option);
//鍒锋柊琛ㄦ牸鏁版嵁
@@ -343,10 +350,10 @@
var HProject = $("#HProject").val();//椤圭洰鍙�
var HBatchWork = $("#HBatchWork").val();//鏄惁閲忎骇
var HDivisionName = $("#HDivisionName").val();//浜嬩笟閮�
-
+
sWhere = {
HBeginDate: HBeginDate
- ,HEndDate: HEndDate
+ , HEndDate: HEndDate
, HMaterID: HMaterID
, HBatchNo: HBatchNo
, HProject: HProject
@@ -422,6 +429,67 @@
//#endregion
+ table.on('tool(mainTable)', function (obj) {
+ var data = obj.data;
+ if (obj.event == '妫�楠屽崟鍗曞彿') {
+ const HBillNo = data.妫�楠屽崟鍗曞彿.substring(0, 2);
+ var linterid = data.HInterID;
+ if (HBillNo == "SJ") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅棣栦欢妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (HBillNo == "XJ") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅宸℃璁板綍鍗�'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸℃璁板綍鍗�/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ else if (HBillNo == "GX") {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '鏌ョ湅鏈妫�楠屽崟'
+ , closeBtn: 1
+ , shade: 0.6 //閬僵閫忔槑搴�
+ , maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
+ , anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
+ , content: '../宸ュ簭妫�楠屽崟/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
+ , resize: false,
+ end: function () {
+ }
+ , cancel: function () {
+ }
+ })
+ }
+ }
+ });
+
+
+
//闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
--
Gitblit v1.9.1