From 9f7ad8647536939300596d8b0a36c15c35e408ca Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期四, 13 一月 2022 17:52:46 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/模治具管理/模治具管理/Sc_MouldOtherInBillList.html | 6 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldProdBackBillList.html | 6 +-
WebTM/views/生产管理/生产包装单/Sc_PackUnionBill.html | 59 ++++++++++++++++++++++++++---
3 files changed, 59 insertions(+), 12 deletions(-)
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
index 04ba33a..875ec0f 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\344\273\223\345\272\223\347\256\241\347\220\206/Sc_MouldProdBackBillList.html"
@@ -181,9 +181,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
- , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
- //, { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', width: 125 }
- //, { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
+ , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
+ , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125 }
, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 125 }
, { field: '浠撲綅', title: '浠撲綅', width: 125 }
diff --git "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html" "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
index 5ed8e76..86b6e7c 100644
--- "a/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
+++ "b/WebTM/views/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/\346\250\241\346\262\273\345\205\267\347\256\241\347\220\206/Sc_MouldOtherInBillList.html"
@@ -176,9 +176,9 @@
, { field: 'Hunitid', title: 'Hunitid', width: 200, hide: true }
//, { field: '璁￠噺鍗曚綅浠ｇ爜', title: '璁￠噺鍗曚綅浠ｇ爜', width: 125 }
//, { field: '璁￠噺鍗曚綅', title: '璁￠噺鍗曚綅', width: 125 }
- , { field: 'HWHSonID', title: 'HWHSonID', width: 200, hide: true }
- , { field: '鍙戞枡浠撳簱浠ｇ爜', title: '鍙戞枡浠撳簱浠ｇ爜', width: 125 }
- , { field: '鍙戞枡浠撳簱', title: '鍙戞枡浠撳簱', width: 125 }
+ , { field: '鏀舵枡浠撳簱ID', title: '鏀舵枡浠撳簱ID', width: 200, hide: true }
+ , { field: '鏀舵枡浠撳簱浠ｇ爜', title: '鏀舵枡浠撳簱浠ｇ爜', width: 125 }
+ , { field: '鏀舵枡浠撳簱', title: '鏀舵枡浠撳簱', width: 125 }
, { field: 'HSPID', title: 'HSPID', width: 200, hide: true }
, { field: '浠撲綅浠ｇ爜', title: '浠撲綅浠ｇ爜', width: 125 }
, { field: '浠撲綅', title: '浠撲綅', width: 125 }
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
index 6fa8b02..3f1021f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\345\214\205\350\243\205\345\215\225/Sc_PackUnionBill.html"
@@ -122,8 +122,10 @@
var pageIndex = 1;//褰撳墠椤电爜鍊�
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+ //鍒濆鍖栬〃鍗曟彃浠�
+ set_InitFrom();
//鍒濆鍖栫晫闈�
- set_ClearBill();
+ set_ClearBill(sWhere);
//#endregion
@@ -174,12 +176,17 @@
get_FastQuery();
});
+ //鍒濆鍖栬〃鍗�
+ function set_InitFrom() {
+ laydate.render({
+ elem: '#HDate'
+ });
+ }
//鍒濆鍖栫晫闈�
- function set_ClearBill() {
+ function set_ClearBill(sWhere) {
resultTableHead = []; //娓呯┖琛ㄥご鍒楋紝闃叉閲嶅娓叉煋
//鍒濆鏌ヨ
get_Display(sWhere);
-
}
//鍔犺浇缃戞牸
function get_Display(sWhere) {
@@ -201,7 +208,7 @@
});
}
//鍒濆鍖栬〃鏍�
- function set_InitGrid() {
+ function set_InitGrid(sWhere) {
//濉厖琛ㄦ牸澶存暟缁�
var data = resultTableHead;
cols_arr[0] = [];
@@ -229,6 +236,7 @@
table.render({
elem: '#mainTable',
url: GetWEBURL() + '/Sc_PackUnionBill/Get_PackUnionBillList',
+ toolbar: '#toolbarDemo',
title: '缁勬墭鍗曞垪琛�',
cols: cols_arr, //濉厖琛ㄦ牸澶存暟鎹�,
id: 'mainTable', //琛ㄦ牸id
@@ -246,6 +254,45 @@
layer.close(layer.index); //杩斿洖鏁版嵁鍏抽棴loading
}
});
+ }
+ //鍒犻櫎
+ function set_DeleteBill() {
+ var checkStatus = table.checkStatus('mainTable')
+ , data = checkStatus.data;
+ if (checkStatus.data.length === 1) {
+ var InterID = data[0].hmainid.toString();
+ //閫昏緫鍒犻櫎鏂规硶
+ layer.confirm("纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠", { title: "鍒犻櫎纭" }, function (index) {
+ var wait = layer.load();
+ $.ajax({
+ type: "GET",
+ url: GetWEBURL() + "/Sc_PackUnionBill/set_DeleteBill", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ data: { "HInterID": InterID, "user": sessionStorage["HUserName"] },
+ success: function (result) {
+ if (result.count == 1) {
+ layer.msg(result.Message, { time: 1 * 1000, icon: 1 }, function () {
+ // 寰楀埌frame绱㈠紩
+ var index = layer.getFrameIndex(window.name);
+ //鍏抽棴褰撳墠frame
+ layer.close(index);
+ //淇敼涓哄姛鍚庡埛鏂扮晫闈�
+ window.location.reload();
+ });
+
+ } else {
+ layer.alert(result.code + result.Message, { icon: 5 });
+ }
+ layer.close(wait);
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ })
+ }
+ else {
+ layer.msg('璇烽�夋嫨涓�琛屾暟鎹垹闄わ紒');
+ }
}
//蹇�熻繃婊�
function get_FastQuery() {
@@ -284,8 +331,8 @@
$("#HMaterNumber").val("");
$("#HMaterName").val("");
$("#HMakerMan").val("");
- sWhere = " ";
- get_FastQuery();
+ sWhere = "";
+ get_Display(sWhere);
}
//鍒锋柊
function set_Refresh() {
--
Gitblit v1.9.1