From f7e000f067bff879bc5cc70f7fb55e721bdd4a72 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 17 十一月 2022 16:10:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
---
WebTM/views/基础资料/公用基础资料/Add_Edit_Gy_Material.html | 124 +++++++++++++++++++++++++++--------------
1 files changed, 81 insertions(+), 43 deletions(-)
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
index 2c66164..b2bb764 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Add_Edit_Gy_Material.html"
@@ -12,12 +12,15 @@
.layui-form-label {
width: 85px;
}
+
.layui-form-item .layui-input-inline {
width: 50%;
}
+
.layui-inline {
width: 290px;
}
+
.layui-form-item .layui-inline {
margin-right: 0px;
}
@@ -32,11 +35,10 @@
<form id="form0" class="layui-form" lay-filter="component-form-group" action="">
<div class="layui-card-header">
<div class="layui-btn-group">
- <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">澶嶅埗</button>
- <button type="button" id="addnew-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">鏂板</button>
+ <button type="button" id="copy-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Copy">澶嶅埗</button>
<button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">淇濆瓨</button>
<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">閫�鍑�</button>
- <button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>
+ <!--<button type="button" id="print-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">棰勮</button>-->
</div>
</div>
@@ -94,22 +96,22 @@
</div>
</div>
<!--<div class="layui-inline">
- <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
- <div class="layui-input-inline">
- <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
- <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
- <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>
- </div>
- </div>-->
+ <label class="layui-form-label">涓昏閲忓崟浣嶏細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" type="text" name="HUnitName" id="HUnitName" value="0" readonly>
+ <input class="layui-input" type="hidden" name="HUnitID" id="HUnitID" value="0" readonly>
+ <button type="button" lay-submit="" class="layui-btn" lay-filter="Department" style="width:40px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>-->
</div>
<div class="layui-inline">
<!--<label class="layui-form-label"> 璁￠噺鍗曚綅缁勶細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HUnitGroupID" lay-verify="HUnitGroupID" id="HUnitGroupID">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">璁￠噺鍗曚綅缁�</label>
<div class="layui-input-inline">
@@ -174,9 +176,9 @@
<div class="layui-inline">
<!--<label class="layui-form-label"> 榛樿浠撳簱锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HWhID" lay-verify="HWhID " id="HWhID " autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">榛樿浠撳簱</label>
<div class="layui-input-inline">
@@ -230,9 +232,9 @@
<div class="layui-row">
<div class="layui-inline">
<!--<label class="layui-form-label"> 杈呭姪璁￠噺鍗曚綅锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
- </div>-->
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HSecUnitID" lay-verify="HSecUnitID" id="HSecUnitID" autocomplete="off" value="0">
+ </div>-->
<div class="layui-inline">
<label class="layui-form-label">杈呭姪璁￠噺鍗曚綅</label>
<div class="layui-input-inline">
@@ -250,8 +252,8 @@
<div class="layui-input-inline">
<input class="layui-input" name="HSecUnitRate" lay-verify="HSecUnitRate" id="HSecUnitRate" autocomplete="off" value="0">
<!--<button type="button" lay-submit="" class="layui-btn" lay-filter="HDormID-BT">
- <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
- </button>-->
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>-->
<!--<input id="HDormID" name="HDormID" type="hidden" />-->
</div>
</div>
@@ -346,19 +348,19 @@
</div>
</div>
- <div class="layui-inline">
- <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
- </div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 鑻辨枃瑙勬牸锛�</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HEngModel" lay-verify="HEngModel" id="HEngModel" autocomplete="off">
+ </div>
+ </div>
- <div class="layui-inline">
- <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
- <div class="layui-input-inline">
- <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
- </div>
- </div>
+ <div class="layui-inline">
+ <label class="layui-form-label"> 杈呭姪灞炴�э細</label>
+ <div class="layui-input-inline">
+ <input class="layui-input" name="HPropertyTypeID" lay-verify="HPropertyTypeID" id="HPropertyTypeID" autocomplete="off" value="0">
+ </div>
+ </div>
</div>
</div>
<div class="layui-form-item">
@@ -557,6 +559,7 @@
, "HUnitID": data.涓昏閲忓崟浣�
, "HUnitName": data.涓昏閲忓崟浣嶅悕绉�
, "HUnitGroupID": data.璁￠噺鍗曚綅缁�
+ , "HUnitGroupName": data.璁￠噺鍗曚綅缁勫悕绉�
, "HSubjoin": data.闄勫姞灞炴��1
, "HSubjoin2": data.闄勫姞灞炴��2
, "HColor": data.棰滆壊
@@ -589,7 +592,7 @@
, "HEndFlag": data.鏄庣粏鏍囪
, "HStopFlag": data.绂佺敤鏍囪
});
-
+ console.log($('#HUnitGroupID').val());
} else {
layer.alert(result.msg, { icon: 5, btn: ['閫�鍑�'], time: 100000, offset: 't' });
}
@@ -604,12 +607,36 @@
var sMainStr = JSON.stringify(data.field);
//var sSubStr = JSON.stringify(table.cache['mainTable']);
//var sMainSub = sMainStr + ';' + sSubStr;
+ if ($("#HNumber").val() == 0) {
+ layer.msg("璇烽�夋嫨鐗╂枡浠ｇ爜锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HName").val() == 0) {
+ layer.msg("璇烽�夋嫨鐗╂枡鍚嶇О锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HUnitName").val() == 0) {
+ layer.msg("璇烽�夋嫨涓昏閲忓崟浣嶏紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HUnitGroupName").val() == 0) {
+ layer.msg("璇烽�夋嫨璁￠噺鍗曚綅缁勶紒", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HWhName").val() == 0) {
+ layer.msg("璇烽�夋嫨榛樿浠撳簱锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
+ if ($("#HSecUnitName").val() == 0) {
+ layer.msg("璇烽�夋嫨杈呭姪璁￠噺鍗曚綅锛�", { icon: 5, btn: ['纭'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ return;
+ }
$.ajax(
{
type: "POST",
url: GetWEBURL() + "Gy_Material/SaveGy_MaterialList", //鏂规硶鎵�鍦ㄩ〉闈㈠拰鏂规硶鍚�
async: true,
- data: { "msg": sMainStr + ';' + sessionStorage["HUserName"]},
+ data: { "msg": sMainStr + ';' + sessionStorage["HUserName"] + ';' + sessionStorage["OrganizationID"] },
dataType: "json",
success: function (data) {
if (data.count == 1) { // 璇存槑楠岃瘉鎴愬姛浜嗭紝
@@ -630,6 +657,12 @@
}
});
});
+
+ //澶嶅埗鎸夐挳
+ form.on('submit(Copy)', function (data) {
+ $('#HNumber').val('');
+ });
+
function f_alert(sMsg) {
layer.alert(sMsg, { icon: 5 });
@@ -647,7 +680,7 @@
$("#UnitType").val(1);
layer.open({
type: 2
- , area: ['666px', '666px']
+ , area: ['90%', '90%']//澶у皬
, title: '鍗曚綅鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -664,7 +697,7 @@
$("#UnitType").val(2);
layer.open({
type: 2
- , area: ['666px', '666px']
+ , area: ['90%', '90%']//澶у皬
, title: '鍗曚綅鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -679,15 +712,15 @@
//閫夋嫨璁￠噺鍗曚綅缁�
- form.on('submit(HUnitGroupList)', function () {//閫夋嫨宸ョ
+ form.on('submit(HUnitGroupList)', function () {//閫夋嫨璁￠噺鍗曚綅缁�
layer.open({
type: 2
- , area: ['666px', '666px']
+ , area: ['90%', '90%']//澶у皬
, title: '宸ョ鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
, anim: 0 //0-6鐨勫姩鐢诲舰寮忥紝-1涓嶅紑鍚�
- , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_WorkTypeList.html', 'yes']
+ , content: ['../../../views/Baseset/鍩虹璧勬枡/Gy_UnitGroup.html', 'yes']
, resize: false
, cancel: function () {
//$(".layui-btn").removeClass("layui-btn-disabled");
@@ -699,7 +732,7 @@
form.on('submit(HWhList)', function () {//閫夋嫨宸ョ
layer.open({
type: 2
- , area: ['666px', '666px']
+ , area: ['90%', '90%']//澶у皬
, title: '浠撳簱鍒楄〃'
, shade: 0.6 //閬僵閫忔槑搴�
, maxmin: true //鍏佽鍏ㄥ睆鏈�灏忓寲
@@ -727,6 +760,11 @@
$("#HWhName").val(obj[0].HName);
$("#HWhID").val(obj[0].HItemID);
}
+ //杩斿洖璁￠噺鍗曚綅缁�
+ function GetHUnitGroupNameValue(obj) {
+ $("#HUnitGroupName").val(obj[0].璁￠噺鍗曚綅缁�);
+ $("#HUnitGroupID").val(obj[0].HItemID);
+ }
//杩斿洖璁￠噺鍗曚綅
function GetHUnitNameValue(obj) {
if ($("#UnitType").val() == 1) {
--
Gitblit v1.9.1