From 47617b6de6cf73760d0ffc4fdb21cd5c4f877430 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期一, 29 七月 2024 09:32:16 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/生产管理/生产任务单/Sc_ICMOBillEdit_NoTable.html | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
index 59b25e3..c6ae4fa 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\347\224\237\344\272\247\344\273\273\345\212\241\345\215\225/Sc_ICMOBillEdit_NoTable.html"
@@ -101,7 +101,7 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="width: 60px;">閿�鍞鍗曠被鍨�</label>
+ <label class="layui-form-label" style="width: 60px;">閿�鍞鍗曠被鍨�</label>
<div class="layui-input-inline">
<select name="HMainSourceBillSubType" id="HMainSourceBillSubType" lay-filter="HMainSourceBillSubType" disabled="disabled" style="width: 180px; ">
<option style="color:blue;" selected="selected" value=""></option>
@@ -207,13 +207,13 @@
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">骞呭</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWidth" lay-verify="HWidth" id="HWidth" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;">鍏嬮噸</label>
<div class="layui-input-block" style="margin-left: 120px;">
- <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" style="background-color:#efefef4d;display: inline-block;" readonly>
+ <input type="text" class="layui-input" name="HWeight" lay-verify="HWeight" id="HWeight" value="0" style="background-color:#efefef4d;display: inline-block;" readonly>
</div>
</div>
</div>
@@ -266,6 +266,24 @@
<label class="layui-form-label" style="width: 85px;">鐢熶骇鍏嬮噸</label>
<div class="layui-input-block" style="margin-left: 120px;">
<input type="text" class="layui-input" name="HWeight_New" lay-verify="HWeight_New" id="HWeight_New" style="display: inline-block;" value="0">
+ </div>
+ </div>
+ </div>
+ <div class="layui-row">
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 50px;">杈呮暟閲�2</label>
+ <div class="layui-input-inline" style="margin-left: 1px;">
+ <input type="text" class="layui-input" name="HAuxQty2" lay-verify="HAuxQty2" style="width:70px" id="HAuxQty2" value="0">
+ </div>
+ </div>
+ <div class="layui-inline" style="margin-left:-140px;">
+ <label class="layui-form-label" style="width: 30px;">杈呭姪鍗曚綅2</label>
+ <div class="layui-input-inline" style="margin-left: 1px;margin-top:10px;">
+ <input type="text" class="layui-input" lay-verify="HAuxUnitName2" name="HAuxUnitName2" id="HAuxUnitName2" style="background-color:#efefef4d;width: 30%;display: inline-block;" readonly>
+ <input type="hidden" name="HAuxUnit2" id="HAuxUnit2" lay-verify="HAuxUnit2" value="0">
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHAuxUnit2" id="btnHAuxUnit2" style="padding: 0 10px;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
</div>
</div>
</div>
@@ -613,6 +631,11 @@
//閫夋嫨杈呭姪鍗曚綅鎸夐挳
form.on('submit(btnHAuxUnit)', function () {
get_btnHAuxUnit();
+ });
+
+ //閫夋嫨杈呭姪鍗曚綅2鎸夐挳
+ form.on('submit(btnHAuxUnit2)', function () {
+ get_btnHAuxUnit2();
});
//閫夋嫨BOM鎸夐挳
@@ -998,6 +1021,32 @@
})
}
+ //杈呭姪鍗曚綅2
+ function get_btnHAuxUnit2() {
+ layer.open({
+ type: 2//寮圭獥绫诲瀷
+ , skin: 'layui-layer-rim' //鍔犱笂杈规
+ , area: ['90%', '90%']//澶у皬
+ , title: "璁￠噺鍗曚綅鍒楄〃" //鏍囬
+ , shift: 2//寮瑰嚭鍔ㄧ敾
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_Unit.html?type=AuxiliaryUnit2', 'yes']
+ , btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ //鑾峰彇鏁版嵁
+ $("#HAuxUnit2").val(checkStatus.data[0].HItemID);
+ $("#HAuxUnitName2").val(checkStatus.data[0].璁￠噺鍗曚綅鍚嶇О);
+
+ layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) { }
+ })
+ }
+
//BOM
function get_btnBom() {
layer.open({
@@ -1239,6 +1288,11 @@
, "HAuxQty": d.data[0].HAuxQty
, "HAuxUnit": d.data[0].HAuxUnit
, "HAuxUnitName": d.data[0].HAuxUnitName
+
+ , "HAuxQty2": d.data[0].HAuxQty2
+ , "HAuxUnit2": d.data[0].HAuxUnit2
+ , "HAuxUnitName2": d.data[0].HAuxUnitName2
+
, "HWidth": d.data[0].HWidth
, "HWeight": d.data[0].HWeight
, "HColorRemark": d.data[0].鏌撹壊瑕佹眰
@@ -1692,6 +1746,13 @@
$("#HAuxUnit").val(obj[0].HItemID);
$("#HAuxUnitName").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
}
+
+ //杈呭姪璁￠噺鍗曚綅2
+ function GetAuxiliaryUnit2Value(obj) {
+ $("#HAuxUnit2").val(obj[0].HItemID);
+ $("#HAuxUnitName2").val(obj[0].璁￠噺鍗曚綅鍚嶇О);
+ }
+
//宸ヤ綔涓績
function GetWorkCenterValue(obj) {
$("#HCenterID").val(obj[0].HItemID);
--
Gitblit v1.9.1