From 51f5c344625ed6e8d703b23b50d794014a650d96 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 01 四月 2022 17:41:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/生产管理/拣料配送单/JIT_ComplementGoodsList.html | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
index aeba0f6..f78867f 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\213\243\346\226\231\351\205\215\351\200\201\345\215\225/JIT_ComplementGoodsList.html"
@@ -212,6 +212,11 @@
set_Sc();
})
+ //涓嬫煡
+ form.on('submit(Xc)', function () {
+ set_Xc();
+ })
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -263,6 +268,7 @@
, { field: '閰嶉�佷汉', title: '閰嶉�佷汉', width: 170 }
, { field: '鍒跺崟浜�', title: '鍒跺崟浜�', width: 260, }
, { field: '鍒跺崟鏃ユ湡', title: '鍒跺崟鏃ユ湡', width: 160, templet: "<div>{{d.鍒跺崟鏃ユ湡 ==null ?'':layui.util.toDateString(d.鍒跺崟鏃ユ湡, 'yyyy-MM-dd')}}</div>" }
+ , { field: 'HMaterID', title: 'HMaterID', width: 160, hide: true }
, { field: '鐗╂枡浠ｇ爜', title: '鐗╂枡浠ｇ爜', width: 160 }
, { field: '鐗╂枡鍚嶇О', title: '鐗╂枡鍚嶇О', width: 160 }
, { field: '瑙勬牸鍨嬪彿', title: '瑙勬牸鍨嬪彿', width: 160 }
@@ -541,14 +547,35 @@
} else {
var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
- var HEntryID = CheckStatus.data[0].Hsubid;
+ var HMaterID = CheckStatus.data[0].HMaterID;
layer.open({
type: 2
, area: ['80%', '80%']
, title: '鍙枡鍗曟竻鍗�'
, shift: 0//寮瑰嚭鍔ㄧ敾
- , content: '../鎷ｆ枡閰嶉�佸崟/JIT_ComplementGoodsBill_Sc.html?HSourceInterID=' + HInterID + '&&HEntryID=' + HEntryID
+ , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=2'
+ })
+ }
+ }
+
+ //涓嬫煡
+ function set_Xc() {
+ var CheckStatus = table.checkStatus("mainTable");
+
+ if (CheckStatus.data.length != 1) {
+ return layer.msg("璇烽�夋嫨涓�鏉℃暟鎹�!")
+ } else {
+
+ var HInterID = CheckStatus.data[0].hmainid; //鑾峰彇缂栧彿
+ var HMaterID = CheckStatus.data[0].HMaterID;
+
+ layer.open({
+ type: 2
+ , area: ['80%', '80%']
+ , title: '閰嶉�佸崟娓呭崟'
+ , shift: 0//寮瑰嚭鍔ㄧ敾
+ , content: '../鐢熶骇鍙枡骞冲彴/JIT_HlpBillList.html?HSourceInterID=' + HInterID + '&HMaterID=' + HMaterID + '&Type=3'
})
}
}
--
Gitblit v1.9.1