From b7b9cc48f289e910f4b92cad8cd77da6e02ec2a9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期三, 11 十二月 2024 14:41:51 +0800
Subject: [PATCH] 1
---
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBill.html | 4 +-
WebTM/views/质量管理/出厂检验单/QC_OutCompCheckBillList.html | 102 +++++++++++++++++++++++----------------------------
WebTM/layuiadmin/Scripts/webConfig.js | 6 +-
3 files changed, 51 insertions(+), 61 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 6a95f87..ba22e4e 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -5,9 +5,9 @@
//var WEBURL = "http://61.164.86.218:8099/ABAPI/";
/*var WEBURL = "http://localhost/API/"; //棰滄檽鍐涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
- var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
- //var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+/* var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�
+/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/*var WEBURL = "http://localhost:8082/LuBaoAPI/";*/ //浣欐�濇澃鏈湴閰嶇疆
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
index 5b6a2bb..8d6a050 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBill.html"
@@ -787,10 +787,10 @@
//閫�鍑�
form.on('submit(Exit)', function (data) {
if (OperationType == 1) {
- Pub_Close(closeType);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
+ Pub_Close(1);//鐩存帴鏂板closeType鍊间负2锛屽垪琛ㄨ皟鏂板closeType鍊间粠鍒楄〃浼犻��
}
else if (OperationType == 3) {
- Pub_Close(closeType);
+ Pub_Close(1);
}
else {
Pub_Close(2);
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
index 4a0fe7e..7785f0a 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\207\272\345\216\202\346\243\200\351\252\214\345\215\225/QC_OutCompCheckBillList.html"
@@ -430,55 +430,53 @@
async: false,
data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],"page": page, "size": size },
success: function (data1) {
- if (data1.count == 1) {
- var data = [];//鍒楀瓧娈垫暟鎹�
+ if (data1.code == 1) {
+ optionPage.count = data1.count;//鏀瑰彉鍒楄〃鏁版嵁鎬绘暟
+ var data = [];
var col = [];
- var totalArray = [];
//缁欑┖鐨勬暟缁勮祴鍊�
- for (var key in data1.list) { //寰簭閬嶅巻鏁扮粍
- data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType }); //浠庢瘡涓璞′腑鎻愬彇鏁版嵁
+ for (var key in data1.list) {
+ //鍔ㄦ�佽幏鍙栧垪琛ㄦ墍鏈夊垪鍚�
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ //鑾峰彇涓嶉渶瑕佹樉绀虹殑鍒楋紙H寮�澶寸殑鍒椾笉鏄剧ず锛�
+ var patrn = new RegExp(/^h/i);
+ if (patrn.test(data1.list[key].ColmCols)) {
+ titleData[key] = data1.list[key].ColmCols;
+ }
}
//鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
- for (var i = 0; i < data.length; i++) { //閬嶅巻data鏁扮粍閲嶇殑鏁版嵁
- // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
- if ($.inArray(data[i].name, titleData) > -1) { //妫�鏌ata銆恑銆�.name鏄惁鍦ㄦ暟缁勪腑 璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ 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 ($.inArray(data[i].name, totalArray) > -1) { //璁＄畻鍒�
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
- } else if (data[i].name == '鍗曟嵁鍙�') {
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
- } else {
+ 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 == "琛屽叧闂棩鏈�" ? "琛屽叧闂汉" : data[i].name) + " ==''?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 160 });
+ break;
+ case 'Decimal':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
+ break;
+ case 'Int32':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140, totalRow: true });
break;
default:
- col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: false, width: 140 });
}
}
}
//鍔ㄦ�佹樉绀哄垪鍚�
- option = {
- elem: '#mainTable'
- , toolbar: '#toolbarDemo'
- , 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);
- }
- }
- DisPlay_HideColumn();
+ columns = col;
+ option.cols = [col];
option.data = data1.data;
+ option.totalRow = true;
table.render(option);
+ laypage.render(optionPage);
+
+ DisPlay_HideColumn();
+
layer.close(ajaxLoad);
} else {
layer.close(ajaxLoad);
@@ -491,12 +489,6 @@
});
}
- ////閲嶇疆鎸夐挳
- //form.on('submit(btnReSearch)', function (data) {
- // $("#HNumber").val("");
- // $("#HName").val("");
- // $("#btnSearch").click();
- //});
//#region 鏂板
function set_AddNew() {
@@ -536,14 +528,14 @@
var checkStatus = table.checkStatus('mainTable')
, data = checkStatus.data;
if (checkStatus.data.length === 1) {
- var HItemID = data[0];
+ var HInterID = data[0].hmainid.toString();
layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
var wait = layer.load();
//閫昏緫鍒犻櫎鏂规硶
$.ajax({
url: GetWEBURL() + 'QC_OutCompCheckBill/DeltetOutCompCheckBill',
type: "GET",
- data: { "HItemID": HItemID, "user": sessionStorage["HUserName"]},
+ data: { "HInterID": HInterID, "user": sessionStorage["HUserName"]},
success: function (result) {
console.log('gouba' + result);
if (result.count == 1) {
@@ -826,11 +818,11 @@
- //闅愯棌鍒楄缃�
+ //#region 闅愯棌鍒楄缃�
function get_HideColumn() {
var colName = "";
var contentUrl = "";
- for (var i = 1; i < option.cols[0].length - 1; i++) {
+ for (var i = 1; i < option.cols[0].length; i++) {
colName += option.cols[0][i]["title"] + ",";
}
var urlStr = window.document.location.pathname;//鑾峰彇鏂囦欢璺緞
@@ -860,8 +852,8 @@
}
})
}
-
- //鏄剧ず鍒楁暟鎹�
+ //#endregion
+ //#region 鏄剧ず鍒楁暟鎹�
function DisPlay_HideColumn() {
$.ajax({
url: GetWEBURL() + '/Xt_grdAlignment_WMES/grdAlignmentWMESList',
@@ -870,14 +862,14 @@
success: function (data1) {
if (data1.data.length != 0) {
-
var dataCol = [];//鏁版嵁搴撴煡璇㈠嚭鐨勫垪鏁版嵁
- var titleData = ["hmainid", "hsubid", "HProcCheckEmpID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
dataCol = data1.data[0].HGridString.split(',');
- for (var i = 0; i < option.cols[0].length - 2; i++) {
- var dataCols = dataCol[i].split('|');
+ for (var i = 0; i < option.cols[0].length - 1; i++) {
+ if (dataCol[i]) {
+ var dataCols = dataCol[i].split('|');
+ }
//闅愯棌鍒�
if (dataCols[1] == 1) {
option.cols[0][i + 1]["hide"] = true;
@@ -938,20 +930,18 @@
} else {
table.render(option);
}
+
+ //鍒锋柊鎸夐挳鏄剧ず
+ var btns = document.getElementsByTagName("button"); //鑾峰彇鏈〉鎵�鏈夋寜閽璞�
+ var HBillType = "7504";
+ Display_HideButton(btns, HBillType, HModName, sessionStorage["HUserName"]);
}, error: function () {
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
})
}
+ //#endregion
- ////#region 娓呯┖杩囨护鏉′欢
- //function set_ClearQuery() {
- // $("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
- // $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- // $("#HBillNo").val("");
-
- //}
- ////#endregion
//#region 浠绘剰瀛楁杩囨护锛氬垪鍚嶆樉绀轰笅鎷夋
function ColFilter() {
var Organization = '<option value="0" selected="selected" ></option>';
--
Gitblit v1.9.1