From ae96bf12f34774cd2fcad88991ff0bc9158fc6b2 Mon Sep 17 00:00:00 2001
From: zgq <519541279@qq.com>
Date: 星期三, 21 七月 2021 18:31:44 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/产量汇报单/Sc_ProductReportBillList.html | 33 +++++++++++++++++++++------------
WebTM/views/IpadIndex.html | 26 ++++++++++++++++++++++++--
2 files changed, 45 insertions(+), 14 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index 975644c..743a0b6 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -717,7 +717,9 @@
"HSourceName": HSourceName1,
"HICMOInterID": HICMOInterID,
"HICMOEntryID": HICMOEntryID,
- "HMaker": "Admin" //sessionStorage["HUserName"]
+ "HMaker": "Admin", //sessionStorage["HUserName"]
+ //"HEmpID": "0", //sessionStorage["HEmpID"]
+ "HSourceBillType": HSourceBillType
});
//閫氳繃绱㈠紩鑾峰彇鍒板綋鍓峣frame寮瑰嚭灞�
@@ -726,6 +728,26 @@
iframe.edit(data);
},
});
+ }
+
+ function OpenFistCheck(event, obj)
+ {
+ layer.open({
+ type: 2
+ , area: ['100%', '100%']
+ , title: '棣栦欢妫�楠屽崟-缂栬緫'
+ , shade: 0.6
+ , maxmin: false
+ , anim: 0
+ , content: ['../../璐ㄩ噺绠＄悊/棣栦欢妫�楠屽崟/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=2&linterid=' + HSourceInterID + '&HSouceBillType=' + HSourceBillType, 'yes']
+ , resize: false
+ , cancel: function () {
+ btnIs();
+ }
+ , end: function () {
+ get_FastQuery(table, option);
+ }
+ })
}
//鍗曟嵁鐘舵�侀獙璇�
@@ -866,7 +888,7 @@
</div>
</div>
<div class="layui-row layui-col-space10">
- <div class="layui-col-sm12 layui-col-md4">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenFistCheck(event,this)">
<div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">棣栨</span>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
index aa9c437..5e63ff1 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\344\272\247\351\207\217\346\261\207\346\212\245\345\215\225/Sc_ProductReportBillList.html"
@@ -119,6 +119,7 @@
var HSourceID = ""; //璧勬簮ID
var HICMOInterID = ""; //鐢熶骇璁㈠崟涓籌D
var HICMOEntryID = ""; //鐢熶骇璁㈠崟瀛怚D
+ var HSourceBillType = ""; //婧愬崟绫诲瀷
var SchWhere = ""; //鎸夐挳鏌ヨ鍙傛暟
function getUrlVars() {
var vars = [], hash;
@@ -142,6 +143,7 @@
HICMOInterID = data[0].HICMOInterID;
HICMOEntryID = data[0].HICMOEntryID;
HMaker = data[0].HMaker;
+ HSourceBillType = data[0].HSourceBillType;
}
layui.config({
@@ -269,18 +271,13 @@
//鐢宠妫�楠�
form.on('submit(AskReport)', function (data)
{
- var sSubStr = JSON.stringify(table.cache['mainTable']);
- //if (!AllowLoadData(sSubStr))//鏁版嵁楠岃瘉
- //{
- // return false;
- //}
-
+ var ScMaxWork = ScMaxWork(); //鑾峰彇鏈�澶х敓浜ф眹鎶ュ崟鍙�
$.ajax(
{
- type: "POST",
- url: GetWEBURL() + "/Sc_ICMOReportBill/SaveGetICMOReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
+ type: "GET",
+ url: GetWEBURL() + "/Sc_MESBeginWorkBill/SaveGetMESProductReportBillList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainSub },
+ data: { "ScMaxWork": ScMaxWork,"HSourceBillType": HSourceBillType, "workcode": workcode, "HSourceID": HSourceID, "HICMOInterID": (HICMOInterID == "null" ? 0 : HICMOInterID), "HICMOEntryID": (HICMOEntryID == "null" ? 0 : HICMOEntryID), "HMaker": HMaker },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -364,9 +361,21 @@
//浠ヤ笂鏄痩ayui妯″潡
});
-
-
-
+ //鑾峰彇鏈�澶х敓浜ф眹鎶ュ崟鍙�
+ function ScMaxWork()
+ {
+ var ScMaxWork = "";
+ $.ajax({
+ url: GetWEBURL() + "/Web/GetMAXNum",
+ type: "GET",
+ async: false,
+ data: { "HBillType": '3711' },
+ success: function (d) {
+ ScMaxWork = d.data[0].HBillNo;
+ }
+ });
+ return ScMaxWork;
+ }
</script>
</body>
--
Gitblit v1.9.1