From 099d8afe529be948bcc010c67c5e0da7c2559fc5 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期五, 22 十月 2021 17:25:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/采购管理/采购订单/Cg_POOrderBillList.html | 2 +-
WebTM/views/模治具管理/模治具仓库管理/Sc_MouldRepairChangeBillEdit.html | 29 +++++++++++++++++++++++++++--
2 files changed, 28 insertions(+), 3 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_MouldRepairChangeBillEdit.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_MouldRepairChangeBillEdit.html"
index 51ce9d2..f88e3d9 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_MouldRepairChangeBillEdit.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_MouldRepairChangeBillEdit.html"
@@ -146,6 +146,15 @@
</select>
</div>
</div>
+ <div class="layui-inline">
+ <label class="layui-form-label">鏀瑰瀷妯″紡</label>
+ <div class="layui-input-block">
+ <select name="HChangeType" lay-filter="HChangeType" id="HChangeType">
+ <option value="涓嶆敼鍨�" selected="selected">涓嶆敼鍨�</option>
+ <option value="鏀瑰瀷">鏀瑰瀷</option>
+ </select>
+ </div>
+ </div>
</div>
<div class="layui-row">
<div class=" layui-inline">
@@ -182,7 +191,7 @@
<div class="layui-input-inline">
<input type="text" name="HNewMaterName" id="HNewMaterName" readonly class="layui-input" value="" style="float:left;width:150px;">
<input type="hidden" name="HNewMaterID" id="HNewMaterID" class="layui-input" value="" style="float:left;width:150px;">
- <button type="button" lay-submit="" class="layui-btn" lay-filter="HNewMaterList" style="width:40px;">
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="HNewMaterList" id="HNewMaterList" style="width:40px;">
<i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>
</button>
</div>
@@ -584,6 +593,17 @@
});
});
+ //琛ㄥご鏀瑰瀷妯″紡鐐瑰嚮浜嬩欢
+ form.on('select(HChangeType)', function (data) {
+ if (data.value == "鏀瑰瀷") {
+ $('#HNewMaterList').removeClass("layui-btn-disabled").attr("disabled", false);
+ form.render('select');
+ } else {
+ $('#HNewMaterList').addClass("layui-btn-disabled").attr("disabled", true);
+ form.render('select');//select鏄浐瀹氬啓娉� 涓嶆槸閫夋嫨鍣�
+ }
+ });
+
//鏂板
form.on('submit(set_AddNew)', function (data) {
$("#component-form-group")[0].reset();
@@ -601,6 +621,9 @@
}
//debugger;
data.field.HMaker = sessionStorage["HUserName"];//鍒跺崟浜�
+ if (data.field.HNewMaterID=="") {
+ data.field.HNewMaterID = "0";
+ }
var sMainStr = JSON.stringify(data.field);
var sMainSub = sMainStr + ';' + refSav + ';' + sessionStorage["HUserName"];
if (!AllowLoadData(sMainStr))//鏁版嵁楠岃瘉
@@ -754,6 +777,7 @@
, elem: '#HRepairBeginDate'
, elem: '#HRepairEndDate'
});
+ $('#HNewMaterList').addClass("layui-btn-disabled").attr("disabled", true);
}
//鏃犳簮鍗曟柊澧�
function set_AddFNew() {
@@ -815,6 +839,7 @@
, "HRepairBeginDate": formatDate(data.寮�濮嬫棩鏈�)
, "HRepairEndDate": formatDate(data.缁撴潫鏃ユ湡)
, "HCycleUnit": data.鏃堕棿鍗曚綅
+ , "HChangeType": data.鏀瑰瀷妯″紡
, "HPlanTimes": data.璁″垝宸ユ椂
, "HTimes": data.瀹為檯宸ユ椂
, "HChangeNum": data.鏀瑰埗鏁伴噺
@@ -891,7 +916,7 @@
layer.msg("璐熻矗浜轰笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
- if ($("#HNewMaterID").val() == '' || $("#HNewMaterID").val() == null) {
+ if ($("#HChangeType").val() == "鏀瑰瀷" && ($("#HNewMaterID").val() == null || $("#HNewMaterID").val() == '')) {
layer.msg("鏂扮墿鏂欎笉鑳戒负绌猴紒", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
return Result = false;
}
diff --git "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html" "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
index a7f2b77..b323663 100644
--- "a/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
+++ "b/WebTM/views/\351\207\207\350\264\255\347\256\241\347\220\206/\351\207\207\350\264\255\350\256\242\345\215\225/Cg_POOrderBillList.html"
@@ -331,7 +331,7 @@
$.ajax({
url: GetWEBURL() + '/Cg_POOrderBill/list',
type: "GET",
- data: { "sWhere": sWhere},
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"],},
success: function (data1) {
if (data1.count == 1) {
DataList = data1.data;
--
Gitblit v1.9.1